matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into ditto-auth

Browse Source
This commit is contained in:
Alex Gleason
2024-02-16 15:57:45 -06:00
parent a0a37b7296 0f6a4a0744
commit 603e2cc2ce
41 changed files with 111 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/hooks/useSettings.ts
View File

@ -1,10 +1,12 @@
import { useMemo } from 'react';
import { getSettings } from 'soapbox/actions/settings';
import { settingsSchema } from 'soapbox/schemas/soapbox/settings';
import { useAppSelector } from './useAppSelector';
import type { Map as ImmutableMap } from 'immutable';
/** Get the user settings from the store */
export const useSettings = (): ImmutableMap<string, any> => {
return useAppSelector((state) => getSettings(state));
export const useSettings = () => {
const data = useAppSelector((state) => getSettings(state));
return useMemo(() => settingsSchema.parse(data.toJS()), [data]);
};

6
src/hooks/useTheme.ts
View File

@ -8,12 +8,10 @@ type Theme = 'light' | 'dark';
* regardless of whether that's by system theme or direct setting.
*/
const useTheme = (): Theme => {
const settings = useSettings();
const { themeMode } = useSettings();
const systemTheme = useSystemTheme();
const userTheme = settings.get('themeMode');
const darkMode = userTheme === 'dark' || (userTheme === 'system' && systemTheme === 'dark');
const darkMode = themeMode === 'dark' || (themeMode === 'system' && systemTheme === 'dark');
return darkMode ? 'dark' : 'light';
};