From ae337ed3c7db44b27232e5efdec8af767d1d4b12 Mon Sep 17 00:00:00 2001 From: Yangshun Date: Sat, 23 Oct 2021 12:37:32 +0800 Subject: [PATCH] chore: upgrade website to docusaurus@2.0.0-beta.8 --- website/package.json | 10 +- website/src/theme/DocSidebar/index.js | 33 +- website/src/theme/DocSidebarItem/index.js | 42 +- website/yarn.lock | 2108 +++++++++++++++------ 4 files changed, 1622 insertions(+), 571 deletions(-) diff --git a/website/package.json b/website/package.json index ff17c85cd..497360976 100755 --- a/website/package.json +++ b/website/package.json @@ -10,12 +10,12 @@ "deploy": "docusaurus deploy" }, "dependencies": { - "@docusaurus/core": "^2.0.0-beta.6", - "@docusaurus/plugin-client-redirects": "^2.0.0-beta.6", - "@docusaurus/preset-classic": "^2.0.0-beta.6", + "@docusaurus/core": "^2.0.0-beta.8", + "@docusaurus/plugin-client-redirects": "^2.0.0-beta.8", + "@docusaurus/preset-classic": "^2.0.0-beta.8", "classnames": "^2.2.6", - "react": "^16.13.1", - "react-dom": "^16.13.1" + "react": "^17.0.2", + "react-dom": "^17.0.2" }, "browserslist": { "production": [ diff --git a/website/src/theme/DocSidebar/index.js b/website/src/theme/DocSidebar/index.js index e01a983bc..b39bf1e19 100644 --- a/website/src/theme/DocSidebar/index.js +++ b/website/src/theme/DocSidebar/index.js @@ -10,9 +10,10 @@ import { useThemeConfig, useAnnouncementBar, MobileSecondaryMenuFiller, + ThemeClassNames, + useScrollPosition, } from '@docusaurus/theme-common'; import useWindowSize from '@theme/hooks/useWindowSize'; -import useScrollPosition from '@theme/hooks/useScrollPosition'; import Logo from '@theme/Logo'; import IconArrow from '@theme/IconArrow'; import {translate} from '@docusaurus/Translate'; @@ -21,14 +22,17 @@ import styles from './styles.module.css'; import SidebarAd from '../../components/SidebarAd'; function useShowAnnouncementBar() { - const {isClosed} = useAnnouncementBar(); - const [showAnnouncementBar, setShowAnnouncementBar] = useState(!isClosed); - useScrollPosition(({scrollY}) => { - if (!isClosed) { - setShowAnnouncementBar(scrollY === 0); - } - }); - return showAnnouncementBar; + const {isActive} = useAnnouncementBar(); + const [showAnnouncementBar, setShowAnnouncementBar] = useState(isActive); + useScrollPosition( + ({scrollY}) => { + if (isActive) { + setShowAnnouncementBar(scrollY === 0); + } + }, + [isActive], + ); + return isActive && showAnnouncementBar; } function HideableSidebarButton({onClick}) { @@ -61,7 +65,6 @@ function DocSidebarDesktop({path, sidebar, onCollapse, isHidden}) { navbar: {hideOnScroll}, hideableSidebar, } = useThemeConfig(); - const {isClosed: isAnnouncementBarClosed} = useAnnouncementBar(); return (
}