diff --git a/frontend/src/component/app.jsx b/frontend/src/component/app.jsx index 838a00b2ab..2b86b29716 100644 --- a/frontend/src/component/app.jsx +++ b/frontend/src/component/app.jsx @@ -9,6 +9,7 @@ import ErrorContainer from './error/error-container'; import UserContainer from './user/user-container'; import ShowUserContainer from './user/show-user-container'; +import { ScrollContainer } from 'react-router-scroll'; const base = { name: 'Unleash', @@ -42,10 +43,6 @@ export default class App extends Component { if (this.props.location.pathname !== nextProps.location.pathname) { clearTimeout(this.timer); this.timer = setTimeout(() => { - window.requestAnimationFrame(() => { - document.querySelector('.mdl-layout__content').scrollTop = 0; - }); - const layout = document.querySelector('.mdl-js-layout'); const drawer = document.querySelector('.mdl-layout__drawer'); // hack, might get a built in alternative later @@ -122,6 +119,7 @@ export default class App extends Component { {createListItem('/applications', 'Applications', 'apps')} + @@ -161,6 +159,7 @@ export default class App extends Component { + ); diff --git a/frontend/src/index.jsx b/frontend/src/index.jsx index cba21bf2f7..8a2993bcec 100644 --- a/frontend/src/index.jsx +++ b/frontend/src/index.jsx @@ -4,7 +4,8 @@ import 'react-mdl/extra/material.js'; import React from 'react'; import ReactDOM from 'react-dom'; -import { Router, Route, IndexRedirect, hashHistory } from 'react-router'; +import { applyRouterMiddleware, Router, Route, IndexRedirect, hashHistory } from 'react-router'; +import { useScroll } from 'react-router-scroll'; import { Provider } from 'react-redux'; import thunkMiddleware from 'redux-thunk'; import { createStore, applyMiddleware } from 'redux'; @@ -35,7 +36,7 @@ const unleashStore = createStore( ReactDOM.render( - +