feat(website): restore scrol position when pathname changes

plouc · May 19, 2018 · 49b7ffc · 49b7ffc
1 parent a360e44
commit 49b7ffc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/website/src/components/ScrollToTop.js b/website/src/components/ScrollToTop.js
@@ -3,8 +3,7 @@ import { withRouter } from 'react-router-dom'
 
 class ScrollToTop extends Component {
     componentDidUpdate(prevProps) {
-        console.log(this.props.location !== prevProps.location)
-        if (this.props.location !== prevProps.location) {
+        if (this.props.location.pathname !== prevProps.location.pathname) {
             window.scrollTo(0, 0)
         }
     }

diff --git a/website/src/index.js b/website/src/index.js
@@ -16,7 +16,7 @@ import Nav from './components/nav/Nav'
 import MiniNav from './components/nav/MiniNav'
 import Home from './components/pages/Home'
 import Header from './components/Header'
-//import ScrollToTop from './components/ScrollToTop'
+import ScrollToTop from './components/ScrollToTop'
 //import MobileNav from './components/nav/mobile/MobileNav'
 import { getRoutes } from './SiteMap'
 import registerServiceWorker from './registerServiceWorker'
@@ -60,12 +60,12 @@ class App extends Component {
 
 render(
     <Router>
-        <div>
+        <ScrollToTop>
             <Switch>
                 <Route exact path="/" component={Home} />
                 <Route path="*" component={App} />
             </Switch>
-        </div>
+        </ScrollToTop>
     </Router>,
     document.getElementById('root')
 )