-
-
Notifications
You must be signed in to change notification settings - Fork 9.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(#750): add themestore and usetheme #881
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
f7835b8
add tailwind config and global css
Jshen123 d35b870
implement useTheme hook and themeStore
Jshen123 3a40576
Revert "add tailwind config and global css"
Jshen123 d8deb40
refactor useTheme so its more readable
Jshen123 623416b
rename matchObj to event
Jshen123 a010891
remove unused comment
Jshen123 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
import { type Theme, THEMES } from "../types"; | ||
import { useEffect } from "react"; | ||
const DARK_THEME = "dark"; | ||
|
||
export const handleTheme = (theme, event?) => { | ||
if (typeof document === "undefined" || typeof window === "undefined") { | ||
return; | ||
} | ||
|
||
const classList = document.documentElement.classList; | ||
|
||
// true if user's system has dark theme | ||
const isSystemThemeDark = (event || window?.matchMedia(`(prefers-color-scheme: ${DARK_THEME})`)) | ||
.matches; | ||
|
||
// determine whether App should have dark theme | ||
const shouldAppThemeBeDark = theme === DARK_THEME || (theme === "system" && isSystemThemeDark); | ||
|
||
if (shouldAppThemeBeDark && !classList.contains(DARK_THEME)) { | ||
classList.add(DARK_THEME); | ||
} else { | ||
classList.remove(DARK_THEME); | ||
} | ||
}; | ||
|
||
export const useTheme = (theme: Theme) => { | ||
theme = THEMES.includes(theme) ? theme : "system"; | ||
|
||
useEffect(() => { | ||
const prefersDark = window.matchMedia(`(prefers-color-scheme: ${DARK_THEME})`); | ||
|
||
prefersDark.addEventListener("change", (event) => { | ||
handleTheme(theme, event); | ||
}); | ||
}, []); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
export * from "./messageStore"; | ||
export * from "./agentStore"; | ||
export * from "./modelSettingsStore"; | ||
export * from "./themeStore"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
import type { StateCreator } from "zustand"; | ||
import { createSelectors } from "./helpers"; | ||
import { create } from "zustand"; | ||
import { createJSONStorage, persist } from "zustand/middleware"; | ||
import type { Theme } from "../types"; | ||
import { handleTheme } from "../hooks/useTheme"; | ||
|
||
const resetters: (() => void)[] = []; | ||
|
||
interface ThemeSlice { | ||
theme: Theme; | ||
setTheme: (theme: Theme) => void; | ||
} | ||
|
||
const initialThemeState = { | ||
theme: "system" as const, | ||
}; | ||
|
||
const createThemeSlice: StateCreator<ThemeSlice> = (set) => { | ||
resetters.push(() => set(initialThemeState)); | ||
|
||
return { | ||
...initialThemeState, | ||
setTheme: (theme: Theme) => { | ||
set(() => ({ | ||
theme, | ||
})); | ||
|
||
handleTheme(theme); | ||
}, | ||
}; | ||
}; | ||
|
||
export const useThemeStore = createSelectors( | ||
create<ThemeSlice>()( | ||
persist( | ||
(...a) => ({ | ||
...createThemeSlice(...a), | ||
}), | ||
{ | ||
name: "theme", | ||
storage: createJSONStorage(() => localStorage), | ||
onRehydrateStorage: () => { | ||
return (state, error) => { | ||
if (error) { | ||
console.error("an error happened during hydration. ", error); | ||
} else { | ||
handleTheme(state ? state.theme : "system"); | ||
} | ||
}; | ||
}, | ||
} | ||
) | ||
) | ||
); | ||
|
||
export const resetAllThemeSlices = () => resetters.forEach((resetter) => resetter()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
export * from "./propTypes"; | ||
export * from "./modelSettings"; | ||
export * from "./userSettings"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
export const THEMES = ["dark" as const, "light" as const, "system" as const]; | ||
export type Theme = "dark" | "light" | "system"; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Neat, so this way even if we have local storage we won't run into rehydration issues with SSR? If so, could also use these in the other stores (Had to use a separate hook for them to ensure there were no issues)