Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed issue where scrolling was preserved when navigating #227

Merged
merged 6 commits into from
Jul 6, 2020
Merged

Fixed issue where scrolling was preserved when navigating #227

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
01edf67
added scroll to top component
trulyronak Jun 26, 2020
66f83a4
Merge remote-tracking branch 'origin/develop' into fix/scroll-when-se…
trulyronak Jun 29, 2020
9bb08ed
changed scroll to allow for overriding
trulyronak Jun 29, 2020
88fd69e
moved scroll component into page component
trulyronak Jun 30, 2020
95b66c3
Adjusted scroll to use props
trulyronak Jul 1, 2020
b6a9881
Merge branch 'develop' into fix/scroll-when-selecting-docs
acunniffe Jul 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions workspaces/ui/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useCallback, useEffect } from 'react';
import './App.css';
import CssBaseline from '@material-ui/core/CssBaseline';
import { appTheme } from './theme';
import { BrowserRouter, Route } from 'react-router-dom';
import { BrowserRouter, Route, useLocation } from 'react-router-dom';
import { SnackbarProvider } from 'notistack';
import { ThemeProvider } from '@material-ui/core/styles';
import TopLevelRoutes from './entrypoints';
Expand All @@ -23,6 +23,7 @@ class App extends React.Component {
<ThemeProvider theme={appTheme}>
<SnackbarProvider maxSnack={1}>
<BrowserRouter>
<ScrollToTop/>
<>
<Route path="/" component={TopLevelRoutes} />
</>
Expand All @@ -32,7 +33,7 @@ class App extends React.Component {
</React.Fragment>
);
}
// Life cylce methods
// Life cycle methods
// ------------------
static getDerivedStateFromError(error) {
// Update state so the next render will show the fallback UI.
Expand Down Expand Up @@ -106,4 +107,16 @@ function AppError() {
);
}

// used to make sure we don't preserve scroll between pages

function ScrollToTop() {
const { pathname } = useLocation();

useEffect(() => {
window.scrollTo(0, 0);
}, [pathname]);

return null;
}

export default App;