refactor(theme): keep scroll position after browser navigated

umijs · Nov 26, 2020 · 1611012 · 1611012
1 parent f95a790
commit 1611012
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/packages/preset-dumi/src/theme/components/Link.tsx b/packages/preset-dumi/src/theme/components/Link.tsx
@@ -45,6 +45,15 @@ export const LinkWrapper = (Component: React.FC<LinkProps | NavLinkProps>) => {
             : undefined
         }
         {...props}
+        {...(isExternal ? {} : {
+          // scroll to top while change url
+          onClick(...args) {
+            window.scrollTo({
+              top: 0,
+            });
+            props.onClick?.apply(this, args);
+          }
+        })}
       />
     );
   };

diff --git a/packages/theme-default/src/layout.tsx b/packages/theme-default/src/layout.tsx
@@ -57,13 +57,6 @@ const Layout: React.FC<IRouteComponentProps> = ({ children, location }) => {
     (repoUrl || '').match(/(github|gitlab)/)?.[1] || 'nothing'
   ];
 
-  // set scroller to top while change url
-  useEffect(() => {
-    window.scrollTo({
-      top: 0,
-    });
-  }, [location.pathname]);
-
   return (
     <div
       className="__dumi-default-layout"