refactor: settingsState relies on main storageState

This commit is contained in:
sethburkart123
2024-06-19 09:47:33 +10:00
parent 2d4e02d0df
commit 9d13879936
4 changed files with 23 additions and 17 deletions
+2 -1
View File
@@ -23,7 +23,8 @@ export const SettingsContextProvider: React.FC<{ children: ReactNode }> = ({ chi
shortcuts: [],
customshortcuts: [],
transparencyEffects: false,
selectedTheme: ''
selectedTheme: '',
animations: true
});
const [showPicker, setShowPicker] = useState<boolean>(false);
+8 -6
View File
@@ -1,7 +1,7 @@
import browser from 'webextension-polyfill'
import { useEffect, useMemo } from "react";
import { SettingsProps } from "../types/SettingsProps";
import { MainConfig, SettingsState } from "../types/AppProps";
import { SettingsState } from "../types/AppProps";
import { SettingsState as StorageSettingsState } from '../../types/storage';
let RanOnce = false;
@@ -25,7 +25,8 @@ const useSettingsState = ({ settingsState, setSettingsState }: SettingsProps) =>
customshortcuts: result.customshortcuts,
transparencyEffects: result.transparencyEffects,
selectedTheme: result.selectedTheme,
timeFormat: result.timeFormat
timeFormat: result.timeFormat,
animations: result.animations
});
});
});
@@ -41,7 +42,8 @@ const useSettingsState = ({ settingsState, setSettingsState }: SettingsProps) =>
"customshortcuts": "customshortcuts",
"transparencyEffects": "transparencyEffects",
"selectedTheme": "selectedTheme",
"timeFormat": "timeFormat"
"timeFormat": "timeFormat",
"animations": "animations"
}), []);
const storageChangeListener = (changes: browser.Storage.StorageChange) => {
@@ -55,7 +57,7 @@ const useSettingsState = ({ settingsState, setSettingsState }: SettingsProps) =>
}
// @ts-expect-error - TODO: Fix this
const stateKey = keyToStateMap[key as keyof MainConfig];
const stateKey = keyToStateMap[key as keyof StorageSettingsState];
if (stateKey) {
setSettingsState((prevState: SettingsState) => ({
...prevState,
@@ -73,7 +75,7 @@ const useSettingsState = ({ settingsState, setSettingsState }: SettingsProps) =>
};
});
const setStorage = (key: keyof MainConfig, value: any) => {
const setStorage = (key: keyof StorageSettingsState, value: any) => {
browser.storage.local.set({ [key]: value });
}
@@ -84,7 +86,7 @@ const useSettingsState = ({ settingsState, setSettingsState }: SettingsProps) =>
const storageKey = Object.keys(keyToStateMap).find(k => keyToStateMap[k] === key);
// @ts-expect-error - TODO: Fix this
if (storageKey && value !== previousSettingsState[key]) {
setStorage(storageKey as keyof MainConfig, value);
setStorage(storageKey as keyof StorageSettingsState, value);
}
}
}
+3 -2
View File
@@ -10,6 +10,7 @@ export interface SettingsState {
customshortcuts: CustomShortcut[];
transparencyEffects: boolean;
timeFormat?: string;
animations: boolean;
}
interface ToggleItem {
@@ -27,7 +28,7 @@ export interface CustomShortcut {
icon: string;
}
export interface MainConfig {
/* export interface MainConfig {
DarkMode: boolean;
animatedbk: boolean;
bksliderinput: string;
@@ -60,4 +61,4 @@ export interface MainConfig {
subjectfilters: Record<string, any>;
transparencyEffects: boolean;
selectedTheme: string;
}
} */