-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: custom theme persisting after signing out (#1780)
* fix: custom theme persistence * chore: remove console logs * fix: build error * fix: change theme from command k
- Loading branch information
Showing
17 changed files
with
287 additions
and
307 deletions.
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
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
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,142 +1,161 @@ | ||
| import { useState, useEffect, Dispatch, SetStateAction } from "react"; | ||
| import { useState, useEffect } from "react"; | ||
|
|
||
| // next-themes | ||
| import { useTheme } from "next-themes"; | ||
|
|
||
| // services | ||
| import userService from "services/user.service"; | ||
| // hooks | ||
| import useUser from "hooks/use-user"; | ||
| // constants | ||
| import { THEMES_OBJ } from "constants/themes"; | ||
| // ui | ||
| import { CustomSelect } from "components/ui"; | ||
| // types | ||
| import { ICustomTheme, IUser } from "types"; | ||
| import { ICustomTheme } from "types"; | ||
| import { unsetCustomCssVariables } from "helpers/theme.helper"; | ||
|
|
||
| type Props = { | ||
| user: IUser | undefined; | ||
| setPreLoadedData: Dispatch<SetStateAction<ICustomTheme | null>>; | ||
| setPreLoadedData: React.Dispatch<React.SetStateAction<ICustomTheme | null>>; | ||
| customThemeSelectorOptions: boolean; | ||
| setCustomThemeSelectorOptions: Dispatch<SetStateAction<boolean>>; | ||
| setCustomThemeSelectorOptions: React.Dispatch<React.SetStateAction<boolean>>; | ||
| }; | ||
|
|
||
| export const ThemeSwitch: React.FC<Props> = ({ | ||
| user, | ||
| setPreLoadedData, | ||
| customThemeSelectorOptions, | ||
| setCustomThemeSelectorOptions, | ||
| }) => { | ||
| const [mounted, setMounted] = useState(false); | ||
|
|
||
| const { theme, setTheme } = useTheme(); | ||
|
|
||
| const { user, mutateUser } = useUser(); | ||
|
|
||
| const updateUserTheme = (newTheme: string) => { | ||
| if (!user) return; | ||
|
|
||
| setTheme(newTheme); | ||
|
|
||
| mutateUser((prevData) => { | ||
| if (!prevData) return prevData; | ||
|
|
||
| return { | ||
| ...prevData, | ||
| theme: { | ||
| ...prevData.theme, | ||
| theme: newTheme, | ||
| }, | ||
| }; | ||
| }, false); | ||
|
|
||
| userService.updateUser({ | ||
| theme: { | ||
| ...user.theme, | ||
| theme: newTheme, | ||
| }, | ||
| }); | ||
| }; | ||
|
|
||
| // useEffect only runs on the client, so now we can safely show the UI | ||
| useEffect(() => { | ||
| setMounted(true); | ||
| }, []); | ||
|
|
||
| if (!mounted) { | ||
| return null; | ||
| } | ||
| if (!mounted) return null; | ||
|
|
||
| const currentThemeObj = THEMES_OBJ.find((t) => t.value === theme); | ||
|
|
||
| return ( | ||
| <> | ||
| <CustomSelect | ||
| value={theme} | ||
| label={ | ||
| currentThemeObj ? ( | ||
| <div className="flex items-center gap-2"> | ||
| <CustomSelect | ||
| value={theme} | ||
| label={ | ||
| currentThemeObj ? ( | ||
| <div className="flex items-center gap-2"> | ||
| <div | ||
| className="border-1 relative flex h-4 w-4 rotate-45 transform items-center justify-center rounded-full border" | ||
| style={{ | ||
| borderColor: currentThemeObj.icon.border, | ||
| }} | ||
| > | ||
| <div | ||
| className="border-1 relative flex h-4 w-4 rotate-45 transform items-center justify-center rounded-full border" | ||
| className="h-full w-1/2 rounded-l-full" | ||
| style={{ | ||
| borderColor: currentThemeObj.icon.border, | ||
| background: currentThemeObj.icon.color1, | ||
| }} | ||
| > | ||
| <div | ||
| className="h-full w-1/2 rounded-l-full" | ||
| style={{ | ||
| background: currentThemeObj.icon.color1, | ||
| }} | ||
| /> | ||
| <div | ||
| className="h-full w-1/2 rounded-r-full border-l" | ||
| style={{ | ||
| borderLeftColor: currentThemeObj.icon.border, | ||
| background: currentThemeObj.icon.color2, | ||
| }} | ||
| /> | ||
| </div> | ||
| {currentThemeObj.label} | ||
| /> | ||
| <div | ||
| className="h-full w-1/2 rounded-r-full border-l" | ||
| style={{ | ||
| borderLeftColor: currentThemeObj.icon.border, | ||
| background: currentThemeObj.icon.color2, | ||
| }} | ||
| /> | ||
| </div> | ||
| ) : ( | ||
| "Select your theme" | ||
| ) | ||
| } | ||
| onChange={({ value, type }: { value: string; type: string }) => { | ||
| if (value === "custom") { | ||
| if (user?.theme.palette) { | ||
| setPreLoadedData({ | ||
| background: user.theme.background !== "" ? user.theme.background : "#0d101b", | ||
| text: user.theme.text !== "" ? user.theme.text : "#c5c5c5", | ||
| primary: user.theme.primary !== "" ? user.theme.primary : "#3f76ff", | ||
| sidebarBackground: | ||
| user.theme.sidebarBackground !== "" ? user.theme.sidebarBackground : "#0d101b", | ||
| sidebarText: user.theme.sidebarText !== "" ? user.theme.sidebarText : "#c5c5c5", | ||
| darkPalette: false, | ||
| palette: | ||
| user.theme.palette !== ",,,," | ||
| ? user.theme.palette | ||
| : "#0d101b,#c5c5c5,#3f76ff,#0d101b,#c5c5c5", | ||
| }); | ||
| } | ||
|
|
||
| if (!customThemeSelectorOptions) setCustomThemeSelectorOptions(true); | ||
| } else { | ||
| if (customThemeSelectorOptions) setCustomThemeSelectorOptions(false); | ||
|
|
||
| for (let i = 10; i <= 900; i >= 100 ? (i += 100) : (i += 10)) { | ||
| document.documentElement.style.removeProperty(`--color-background-${i}`); | ||
| document.documentElement.style.removeProperty(`--color-text-${i}`); | ||
| document.documentElement.style.removeProperty(`--color-border-${i}`); | ||
| document.documentElement.style.removeProperty(`--color-primary-${i}`); | ||
| document.documentElement.style.removeProperty(`--color-sidebar-background-${i}`); | ||
| document.documentElement.style.removeProperty(`--color-sidebar-text-${i}`); | ||
| document.documentElement.style.removeProperty(`--color-sidebar-border-${i}`); | ||
| } | ||
| {currentThemeObj.label} | ||
| </div> | ||
| ) : ( | ||
| "Select your theme" | ||
| ) | ||
| } | ||
| onChange={({ value, type }: { value: string; type: string }) => { | ||
| if (value === "custom") { | ||
| if (user?.theme.palette) { | ||
| setPreLoadedData({ | ||
| background: user.theme.background !== "" ? user.theme.background : "#0d101b", | ||
| text: user.theme.text !== "" ? user.theme.text : "#c5c5c5", | ||
| primary: user.theme.primary !== "" ? user.theme.primary : "#3f76ff", | ||
| sidebarBackground: | ||
| user.theme.sidebarBackground !== "" ? user.theme.sidebarBackground : "#0d101b", | ||
| sidebarText: user.theme.sidebarText !== "" ? user.theme.sidebarText : "#c5c5c5", | ||
| darkPalette: false, | ||
| palette: | ||
| user.theme.palette !== ",,,," | ||
| ? user.theme.palette | ||
| : "#0d101b,#c5c5c5,#3f76ff,#0d101b,#c5c5c5", | ||
| theme: "custom", | ||
| }); | ||
| } | ||
|
|
||
| setTheme(value); | ||
| document.documentElement.style.setProperty("color-scheme", type); | ||
| }} | ||
| input | ||
| width="w-full" | ||
| position="right" | ||
| > | ||
| {THEMES_OBJ.map(({ value, label, type, icon }) => ( | ||
| <CustomSelect.Option key={value} value={{ value, type }}> | ||
| <div className="flex items-center gap-2"> | ||
| if (!customThemeSelectorOptions) setCustomThemeSelectorOptions(true); | ||
| } else { | ||
| if (customThemeSelectorOptions) setCustomThemeSelectorOptions(false); | ||
| unsetCustomCssVariables(); | ||
| } | ||
|
|
||
| updateUserTheme(value); | ||
| document.documentElement.style.setProperty("--color-scheme", type); | ||
| }} | ||
| input | ||
| width="w-full" | ||
| position="right" | ||
| > | ||
| {THEMES_OBJ.map(({ value, label, type, icon }) => ( | ||
| <CustomSelect.Option key={value} value={{ value, type }}> | ||
| <div className="flex items-center gap-2"> | ||
| <div | ||
| className="border-1 relative flex h-4 w-4 rotate-45 transform items-center justify-center rounded-full border" | ||
| style={{ | ||
| borderColor: icon.border, | ||
| }} | ||
| > | ||
| <div | ||
| className="h-full w-1/2 rounded-l-full" | ||
| style={{ | ||
| background: icon.color1, | ||
| }} | ||
| /> | ||
| <div | ||
| className="border-1 relative flex h-4 w-4 rotate-45 transform items-center justify-center rounded-full border" | ||
| className="h-full w-1/2 rounded-r-full border-l" | ||
| style={{ | ||
| borderColor: icon.border, | ||
| borderLeftColor: icon.border, | ||
| background: icon.color2, | ||
| }} | ||
| > | ||
| <div | ||
| className="h-full w-1/2 rounded-l-full" | ||
| style={{ | ||
| background: icon.color1, | ||
| }} | ||
| /> | ||
| <div | ||
| className="h-full w-1/2 rounded-r-full border-l" | ||
| style={{ | ||
| borderLeftColor: icon.border, | ||
| background: icon.color2, | ||
| }} | ||
| /> | ||
| </div> | ||
| {label} | ||
| /> | ||
| </div> | ||
| </CustomSelect.Option> | ||
| ))} | ||
| </CustomSelect> | ||
| </> | ||
| {label} | ||
| </div> | ||
| </CustomSelect.Option> | ||
| ))} | ||
| </CustomSelect> | ||
| ); | ||
| }; |
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
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
Oops, something went wrong.
97c3fb4There 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.
Successfully deployed to the following URLs:
plane-dev – ./apps/app
plane-dev-plane.vercel.app
plane-dev.vercel.app
plane-dev-git-develop-plane.vercel.app