diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-11-04 10:54:07 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-11-07 10:46:07 +0100 |
| commit | 40bc4e6bbd51fd78ff67e376a5fbe921cd4c4964 (patch) | |
| tree | cc3833ddeefa03f5979883bb77464098fa9b32aa /gui/src/renderer/redux | |
| parent | f5037f6fbc93148569210f18dfa24be4be1e0a6a (diff) | |
| download | mullvadvpn-40bc4e6bbd51fd78ff67e376a5fbe921cd4c4964.tar.xz mullvadvpn-40bc4e6bbd51fd78ff67e376a5fbe921cd4c4964.zip | |
Add view state to history location state
Diffstat (limited to 'gui/src/renderer/redux')
| -rw-r--r-- | gui/src/renderer/redux/userinterface/actions.ts | 46 | ||||
| -rw-r--r-- | gui/src/renderer/redux/userinterface/reducers.ts | 17 |
2 files changed, 1 insertions, 62 deletions
diff --git a/gui/src/renderer/redux/userinterface/actions.ts b/gui/src/renderer/redux/userinterface/actions.ts index 19ae7380bc..46da6bdc3d 100644 --- a/gui/src/renderer/redux/userinterface/actions.ts +++ b/gui/src/renderer/redux/userinterface/actions.ts @@ -1,5 +1,5 @@ import { MacOsScrollbarVisibility } from '../../../shared/ipc-schema'; -import { IChangelog, ScrollPositions } from '../../../shared/ipc-types'; +import { IChangelog } from '../../../shared/ipc-types'; export interface IUpdateLocaleAction { type: 'UPDATE_LOCALE'; @@ -20,22 +20,6 @@ export interface ISetWindowFocusedAction { focused: boolean; } -export interface ISetScrollPositions { - type: 'SET_SCROLL_POSITIONS'; - scrollPositions: ScrollPositions; -} - -export interface IAddScrollPosition { - type: 'ADD_SCROLL_POSITION'; - path: string; - scrollPosition: [number, number]; -} - -export interface IRemoveScrollPosition { - type: 'REMOVE_SCROLL_POSITION'; - path: string; -} - export interface ISetMacOsScrollbarVisibility { type: 'SET_MACOS_SCROLLBAR_VISIBILITY'; visibility: MacOsScrollbarVisibility; @@ -66,9 +50,6 @@ export type UserInterfaceAction = | IUpdateWindowArrowPositionAction | IUpdateConnectionInfoOpenAction | ISetWindowFocusedAction - | ISetScrollPositions - | IAddScrollPosition - | IRemoveScrollPosition | ISetMacOsScrollbarVisibility | ISetConnectedToDaemon | ISetChangelog @@ -102,28 +83,6 @@ function setWindowFocused(focused: boolean): ISetWindowFocusedAction { }; } -function setScrollPositions(scrollPositions: ScrollPositions): ISetScrollPositions { - return { - type: 'SET_SCROLL_POSITIONS', - scrollPositions, - }; -} - -function addScrollPosition(path: string, scrollPosition: [number, number]): IAddScrollPosition { - return { - type: 'ADD_SCROLL_POSITION', - path, - scrollPosition, - }; -} - -function removeScrollPosition(path: string): IRemoveScrollPosition { - return { - type: 'REMOVE_SCROLL_POSITION', - path, - }; -} - function setMacOsScrollbarVisibility( visibility: MacOsScrollbarVisibility, ): ISetMacOsScrollbarVisibility { @@ -166,9 +125,6 @@ export default { updateWindowArrowPosition, toggleConnectionPanel, setWindowFocused, - setScrollPositions, - addScrollPosition, - removeScrollPosition, setMacOsScrollbarVisibility, setConnectedToDaemon, setChangelog, diff --git a/gui/src/renderer/redux/userinterface/reducers.ts b/gui/src/renderer/redux/userinterface/reducers.ts index 2ab684b377..96d8bc03e6 100644 --- a/gui/src/renderer/redux/userinterface/reducers.ts +++ b/gui/src/renderer/redux/userinterface/reducers.ts @@ -7,7 +7,6 @@ export interface IUserInterfaceReduxState { arrowPosition?: number; connectionPanelVisible: boolean; windowFocused: boolean; - scrollPosition: Record<string, [number, number]>; macOsScrollbarVisibility?: MacOsScrollbarVisibility; connectedToDaemon: boolean; changelog: IChangelog; @@ -19,7 +18,6 @@ const initialState: IUserInterfaceReduxState = { locale: 'en', connectionPanelVisible: false, windowFocused: false, - scrollPosition: {}, macOsScrollbarVisibility: undefined, connectedToDaemon: false, changelog: [], @@ -44,21 +42,6 @@ export default function ( case 'SET_WINDOW_FOCUSED': return { ...state, windowFocused: action.focused }; - case 'SET_SCROLL_POSITIONS': - return { ...state, scrollPosition: action.scrollPositions }; - - case 'ADD_SCROLL_POSITION': - return { - ...state, - scrollPosition: { ...state.scrollPosition, [action.path]: action.scrollPosition }, - }; - - case 'REMOVE_SCROLL_POSITION': { - const scrollPosition = { ...state.scrollPosition }; - delete scrollPosition[action.path]; - return { ...state, scrollPosition }; - } - case 'SET_MACOS_SCROLLBAR_VISIBILITY': return { ...state, macOsScrollbarVisibility: action.visibility }; |
