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

Merge pull request #532 from pmysl/theme-reset-fix

Browse Source 
nicolium: fix theme reset
This commit is contained in:
nicole mikołajczyk
2026-03-07 19:56:12 +01:00
committed by GitHub
parent 9960c52fd3 1a5355ba4b
commit 4ef1bc5062
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/nicolium/src/features/preferences/index.tsx
View File

@ -17,7 +17,7 @@ import { useFeatures } from '@/hooks/use-features';
import { useFrontendConfig } from '@/hooks/use-frontend-config';
import { useInstance } from '@/hooks/use-instance';
import { PaletteListItem } from '@/pages/dashboard/theme-editor';
import { useSettings } from '@/stores/settings';
import { useDefaultSettings, useSettings } from '@/stores/settings';
import sourceCode from '@/utils/code';
import colors from '@/utils/colors';
import { isStandalone } from '@/utils/state';
@ -158,6 +158,7 @@ const Preferences = () => {
const dispatch = useAppDispatch();
const features = useFeatures();
const settings = useSettings();
const defaultSettings = useDefaultSettings();
const frontendConfig = useFrontendConfig();
const instance = useInstance();
const standalone = useAppSelector(isStandalone);
@ -218,10 +219,8 @@ const Preferences = () => {
};
const onThemeReset = () => {
dispatch(
changeSetting(['themeMode'], frontendConfig.defaultSettings.themeMode, { save: false }),
);
dispatch(changeSetting(['theme'], frontendConfig.defaultSettings.theme, { showAlert: true }));
dispatch(changeSetting(['themeMode'], defaultSettings.themeMode, { save: false }));
dispatch(changeSetting(['theme'], defaultSettings.theme, { showAlert: true }));
};
const displayMediaOptions = React.useMemo(

2
packages/nicolium/src/features/ui/components/theme-selector.tsx
View File

@ -37,7 +37,7 @@ const ThemeSelector: React.FC<IThemeSelector> = ({ id, value, onChange }) => {
<Icon src={themeIconSrc} className='size-4 text-gray-600 dark:text-gray-700' />
</div>
<Select id={id} onChange={handleChange} defaultValue={value} className='!pl-10'>
<Select key={value} id={id} onChange={handleChange} defaultValue={value} className='!pl-10'>
<option value='system'>
<FormattedMessage id='theme_toggle.system' defaultMessage='System' />
</option>

3
packages/nicolium/src/stores/settings.ts
View File

@ -279,6 +279,7 @@ const useSettingsStore = create<State>()(
);
const useSettings = () => useSettingsStore((state) => state.settings);
const useDefaultSettings = () => useSettingsStore((state) => state.defaultSettings);
const useSettingsStoreActions = () => useSettingsStore((state) => state.actions);
export { useSettingsStore, useSettings, useSettingsStoreActions };
export { useSettingsStore, useSettings, useDefaultSettings, useSettingsStoreActions };