feat: move scroll to top from link to middleware

Author: colinmeinke

src/actions/changePageTo.js

@@ -1,7 +1,7 @@
 import { CHANGE_PAGE_TO } from '../constants';
 
-const changePageTo = ( to, { shouldAddToHistory = true } = {}) => ({
-  options: { shouldAddToHistory },
+const changePageTo = ( to, { shouldAddToHistory = true, shouldScrollToTop = true } = {}) => ({
+  options: { shouldAddToHistory, shouldScrollToTop },
   type: CHANGE_PAGE_TO,
   to,
 });

src/components/Link.js

@@ -5,22 +5,14 @@ import changePageTo from '../actions/changePageTo';
 import getLocation from '../helpers/getLocation';
 
 const defaultProps = {
+  shouldAddToHistory: true,
   shouldScrollToTop: true,
 };
 
-const scrollToTop = () => {
-  document.documentElement.scrollTop = document.body.scrollTop = 0;
-};
-
-const Link = ({ children, dispatch, shouldScrollToTop, to, ...props }) => {
+const Link = ({ children, dispatch, shouldAddToHistory, shouldScrollToTop, to, ...props }) => {
   const onClick = e => {
     e.preventDefault();
-
-    dispatch( changePageTo( to ));
-
-    if ( shouldScrollToTop ) {
-      scrollToTop();
-    }
+    dispatch( changePageTo( to, { shouldAddToHistory, shouldScrollToTop }));
   };
 
   return (

src/middleware/router.js

@@ -2,6 +2,10 @@ import getAction from '../helpers/getAction';
 import popStateListener from '../helpers/popStateListener';
 import { CHANGE_PAGE_TO } from '../constants';
 
+const scrollToTop = () => {
+  document.documentElement.scrollTop = document.body.scrollTop = 0;
+};
+
 const router = ( routes, { isServer = false } = {}) => ({ dispatch }) => {
   if ( !isServer ) {
     popStateListener( dispatch );
@@ -11,14 +15,18 @@ const router = ( routes, { isServer = false } = {}) => ({ dispatch }) => {
     const { type } = initialAction;
 
     if ( type === CHANGE_PAGE_TO ) {
-      const { options: { shouldAddToHistory }, to } = initialAction;
+      const { options: { shouldAddToHistory, shouldScrollToTop }, to } = initialAction;
 
       const action = getAction( to, routes );
 
       if ( !isServer && shouldAddToHistory ) {
         window.history.pushState({}, '', action.url );
       }
 
+      if ( shouldScrollToTop ) {
+        scrollToTop();
+      }
+
       return next( action );
     }