diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-11-13 14:30:44 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-11-13 14:30:44 +0100 |
| commit | 6308f657a0e766ae22001889a21ef600e2c0bd75 (patch) | |
| tree | 8e40c9fc7accebd0b753cade733b7284c56ebe67 /gui/src | |
| parent | c9a5a5f87a466848755415ce15a49b21934f4386 (diff) | |
| parent | ff8eab807411bd4d21fe4e7c5d2cc6884b1c29cc (diff) | |
| download | mullvadvpn-6308f657a0e766ae22001889a21ef600e2c0bd75.tar.xz mullvadvpn-6308f657a0e766ae22001889a21ef600e2c0bd75.zip | |
Merge branch 'fix-restore-scroll-position'
Diffstat (limited to 'gui/src')
| -rw-r--r-- | gui/src/renderer/components/NavigationBar.tsx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gui/src/renderer/components/NavigationBar.tsx b/gui/src/renderer/components/NavigationBar.tsx index cc1a02de50..0e242ef3c4 100644 --- a/gui/src/renderer/components/NavigationBar.tsx +++ b/gui/src/renderer/components/NavigationBar.tsx @@ -1,11 +1,4 @@ -import React, { - useCallback, - useContext, - useEffect, - useLayoutEffect, - useRef, - useState, -} from 'react'; +import React, { useCallback, useContext, useLayoutEffect, useRef, useState } from 'react'; import { useSelector } from 'react-redux'; import { useHistory } from 'react-router'; import { colors } from '../../config.json'; @@ -136,7 +129,7 @@ export const NavigationScrollbars = React.forwardRef(function NavigationScrollba (state: IReduxState) => state.userInterface.scrollPosition[history.location.pathname], ); - useEffect(() => { + useLayoutEffect(() => { const path = history.location.pathname; if (history.action === 'POP' && scrollPosition) { |