1
0
mirror of https://github.com/Unleash/unleash.git synced 2024-12-22 19:07:54 +01:00

Keep scroll postion.

closes #27
This commit is contained in:
ivaosthu 2016-12-29 11:55:25 +01:00
parent 109fe8302b
commit c5b6f8b808
2 changed files with 6 additions and 6 deletions

View File

@ -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')}
</Navigation>
</Drawer>
<ScrollContainer scrollKey="main">
<Content>
<Grid shadow={1} style={{ maxWidth: '1200px', margin: '0 auto' }}>
<Cell col={12}>
@ -161,6 +159,7 @@ export default class App extends Component {
</FooterSection>
</Footer>
</Content>
</ScrollContainer>
</Layout>
</div>
);

View File

@ -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(
<Provider store={unleashStore}>
<Router history={hashHistory}>
<Router history={hashHistory} render={applyRouterMiddleware(useScroll())}>
<Route path="/" component={App}>
<IndexRedirect to="/features" />