fix(v2): various minor bugs with location hash (#4200)

* fix(v2): various minor bugs with location hash * Fix for disabled hideScroll
facebook · Feb 9, 2021 · 74a58ef · 74a58ef
1 parent c5d3a86
commit 74a58ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/index.tsx
@@ -83,7 +83,7 @@ function Navbar(): JSX.Element {
         'navbar--primary': style === 'primary',
         'navbar-sidebar--show': sidebarShown,
         [styles.navbarHideable]: hideOnScroll,
-        [styles.navbarHidden]: !isNavbarVisible,
+        [styles.navbarHidden]: hideOnScroll && !isNavbarVisible,
       })}>
       <div className="navbar__inner">
         <div className="navbar__items">

diff --git a/packages/docusaurus-theme-classic/src/theme/SkipToContent/index.tsx b/packages/docusaurus-theme-classic/src/theme/SkipToContent/index.tsx
@@ -33,7 +33,9 @@ function SkipToContent(): JSX.Element {
   };
 
   useEffect(() => {
-    programmaticFocus(containerRef.current);
+    if (!location.hash) {
+      programmaticFocus(containerRef.current);
+    }
   }, [location.pathname]);
 
   return (

diff --git a/packages/docusaurus-theme-classic/src/theme/hooks/useHideableNavbar.ts b/packages/docusaurus-theme-classic/src/theme/hooks/useHideableNavbar.ts
@@ -75,6 +75,10 @@ const useHideableNavbar = (hideOnScroll: boolean): useHideableNavbarReturns => {
       return;
     }
 
+    if (!location.hash) {
+      return;
+    }
+
     isFocusedAnchor.current = true;
   }, [location.hash]);
-Original file line number
+Diff line change
@@ Expand Up @@
           return;
         }
+        if (!location.hash) {
+          return;
+        }
         isFocusedAnchor.current = true;
       }, [location.hash]);
@@ Expand Down @@