add setThemeSet to set both light and dark theme simultaneously

react18-tools · Dec 8, 2023 · 9849240 · 9849240
1 parent 6f17cce
commit 9849240
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/nextjs-themes/src/client/theme-switcher/theme-switcher.tsx b/lib/nextjs-themes/src/client/theme-switcher/theme-switcher.tsx
@@ -33,8 +33,7 @@ export function useThemeSwitcher(props: ThemeSwitcherProps) {
       const restoreTransitions = disableAnimation(props.themeTransition);
 
       const resolvedData = resolveTheme(media.matches, themeState, props);
-      const { resolvedColorScheme, resolvedTheme } = resolvedData;
-      themeState.setResolved({ resolvedColorScheme, resolvedTheme });
+      themeState.setResolved(resolvedData);
       updateDOM(resolvedData, media.matches, props.targetSelector);
 
       restoreTransitions();

diff --git a/lib/nextjs-themes/src/store.ts b/lib/nextjs-themes/src/store.ts
@@ -16,8 +16,9 @@ export type ThemeStoreType = {
 
 export type ThemeStoreActionsType = {
   setTheme: (theme: string) => void;
-  setDarkTheme: (defaultDarkTheme: string) => void;
-  setLightTheme: (defaultLightTheme: string) => void;
+  setDarkTheme: (darkTheme: string) => void;
+  setLightTheme: (lightTheme: string) => void;
+  setThemeSet: (themeSet: { darkTheme: string; lightTheme: string }) => void;
   setColorSchemePref: (colorSchemePref: ColorSchemeType) => void;
   setForcedTheme: (forcedTheme?: string) => void;
   setForcedColorScheme: (forcedColorScheme?: ColorSchemeType) => void;
@@ -43,7 +44,8 @@ export const useTheme = create<ThemeStoreType & ThemeStoreActionsType>()(
       setForcedTheme: forcedTheme => set({ ...get(), forcedTheme }),
       setForcedColorScheme: forcedColorScheme => set({ ...get(), forcedColorScheme }),
       setColorSchemePref: colorSchemePref => set({ ...get(), colorSchemePref }),
-      setResolved: resolved => set({ ...get(), ...resolved }),
+      setResolved: ({ resolvedColorScheme, resolvedTheme }) => set({ ...get(), resolvedColorScheme, resolvedTheme }),
+      setThemeSet: ({ lightTheme, darkTheme }) => set({ ...get(), lightTheme, darkTheme }),
     }),
     { name: "nextjs-themes", exclude: [/forced/, /resolved/], storage: "cookies" },
   ),