fix: hydrated

This commit is contained in:
Dogtiti
2024-09-03 20:29:01 +08:00
parent 886ffc0af8
commit ed9aae531e
3 changed files with 14 additions and 5 deletions

View File

@@ -14,9 +14,11 @@ type SecondParam<T> = T extends (
type MakeUpdater<T> = {
lastUpdateTime: number;
_hasHydrated: boolean;
markUpdate: () => void;
update: Updater<T>;
setHasHydrated: (state: boolean) => void;
};
type SetStoreState<T> = (
@@ -33,12 +35,18 @@ export function createPersistStore<T extends object, M>(
persistOptions: SecondParam<typeof persist<T & M & MakeUpdater<T>>>,
) {
persistOptions.storage = createJSONStorage(() => indexedDBStorage);
persistOptions.onRehydrateStorage = persistOptions.onRehydrateStorage
? persistOptions.onRehydrateStorage
: (state) => {
return () => state.setHasHydrated(true);
};
return create(
persist(
combine(
{
...state,
lastUpdateTime: 0,
_hasHydrated: false,
},
(set, get) => {
return {
@@ -57,6 +65,9 @@ export function createPersistStore<T extends object, M>(
lastUpdateTime: Date.now(),
});
},
setHasHydrated: (state: boolean) => {
set({ _hasHydrated: state } as Partial<T & M & MakeUpdater<T>>);
},
} as M & MakeUpdater<T>;
},
),