vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-06-18 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "split settings store to multiple localstorage keys"

Browse Source 
This reverts commit 4862a65b21.
This commit is contained in:
jeffvli
2025-12-07 18:24:34 -08:00
parent 20aa65f16a
commit 3c8054c93b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/store/settings.store.ts
+5 -6
View File
@@ -1,7 +1,7 @@
import isElectron from 'is-electron'; import isElectron from 'is-electron';
import { generatePath } from 'react-router'; import { generatePath } from 'react-router';
import { z } from 'zod'; import { z } from 'zod';
import { createJSONStorage, devtools, persist } from 'zustand/middleware'; import { devtools, persist } from 'zustand/middleware';
import { immer } from 'zustand/middleware/immer'; import { immer } from 'zustand/middleware/immer';
import { shallow } from 'zustand/shallow'; import { shallow } from 'zustand/shallow';
import { createWithEqualityFn } from 'zustand/traditional'; import { createWithEqualityFn } from 'zustand/traditional';
@@ -18,7 +18,7 @@ import {
SONG_TABLE_COLUMNS, SONG_TABLE_COLUMNS,
} from '/@/renderer/components/item-list/item-table-list/default-columns'; } from '/@/renderer/components/item-list/item-table-list/default-columns';
import { AppRoute } from '/@/renderer/router/routes'; import { AppRoute } from '/@/renderer/router/routes';
import { mergeOverridingColumns, splitSettingsStorage } from '/@/renderer/store/utils'; import { mergeOverridingColumns } from '/@/renderer/store/utils';
import { FontValueSchema } from '/@/renderer/types/fonts'; import { FontValueSchema } from '/@/renderer/types/fonts';
import { randomString } from '/@/renderer/utils'; import { randomString } from '/@/renderer/utils';
import { sanitizeCss } from '/@/renderer/utils/sanitize'; import { sanitizeCss } from '/@/renderer/utils/sanitize';
@@ -1405,7 +1405,7 @@ export const useSettingsStore = createWithEqualityFn<SettingsSlice>()(
), ),
{ {
merge: mergeOverridingColumns, merge: mergeOverridingColumns,
migrate(persistedState, version): SettingsSlice { migrate(persistedState, version) {
const state = persistedState as SettingsSlice; const state = persistedState as SettingsSlice;
if (version === 8) { if (version === 8) {
@@ -1453,7 +1453,7 @@ export const useSettingsStore = createWithEqualityFn<SettingsSlice>()(
} }
if (version <= 11) { if (version <= 11) {
return getInitialState() as SettingsSlice; return {};
} }
if (version <= 12) { if (version <= 12) {
@@ -1472,10 +1472,9 @@ export const useSettingsStore = createWithEqualityFn<SettingsSlice>()(
}); });
} }
return state; return persistedState;
}, },
name: 'store_settings', name: 'store_settings',
storage: createJSONStorage(() => splitSettingsStorage),
version: 14, version: 14,
}, },
), ),