Skip to content

fix(website): remove js execution on load by assigning themes sig on click #939

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 19, 2024
Merged

fix(website): remove js execution on load by assigning themes sig on click #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/website/src/components/copy-css-config/copy-css-config.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ export default component$(() => {

const cssThemeOutput = useSignal<string>('');

const { themeSig } = useTheme();
const { themeSig, defaultTheme, storageKey } = useTheme();

return (
<Modal.Root bind:show={showSig}>
<Button
onClick$={() => {
themeSig.value = localStorage.getItem(storageKey) ?? defaultTheme;
cssThemeOutput.value = extractThemeCSS(
themeSig.value === 'dark' || themeSig.value === 'light'
? 'border-radius-0 simple primary-cyan-600 light base-slate'
Expand Down
6 changes: 2 additions & 4 deletions packages/themes/src/lib/provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,9 @@ export const ThemeProvider = component$<ThemeProviderProps>(
}
});

// DO NOT UNCOMMENT. THIS CAUSES BUNDLE ISSUE ACROSS SITE -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
// eslint-disable-next-line qwik/no-use-visible-task -- not possible atm to useOnWindow for a MediaQueryList event
useVisibleTask$(
({ cleanup }) => {
setTimeout(() => {
themeSig.value = localStorage.getItem(storageKey) || defaultTheme;
}, 2000);
const media = window.matchMedia('(prefers-color-scheme: dark)');

const handleMediaQuery = $(async (e: MediaQueryListEvent | MediaQueryList) => {
Expand Down Expand Up @@ -133,9 +129,11 @@ export const ThemeProvider = component$<ThemeProviderProps>(
});

useContextProvider(ThemeContext, {
defaultTheme,
themeSig,
resolvedThemeSig,
forcedTheme,
storageKey,
systemTheme: (enableSystem ? resolvedThemeSig.value : undefined) as
| SystemTheme
| undefined,
Expand Down
4 changes: 4 additions & 0 deletions packages/themes/src/lib/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,16 @@ export type SystemTheme = 'dark' | 'light';
export type Theme = 'dark' | 'light' | string | string[] | undefined;

export interface UseThemeProps {
// system or light
defaultTheme: string;
/** theme signal */
themeSig: Signal<Theme>;
/** Forced theme name for the current page */
resolvedThemeSig: Signal<Theme>;
/** If enableSystem is true, returns the System theme preference ("dark" or "light"), regardless what the active theme is */
forcedTheme: string | undefined;
// localStorage key
storageKey: string;
/** If `enableSystem` is true and the active theme is "system", this returns whether the system preference resolved to "dark" or "light". Otherwise, identical to `theme` */
systemTheme: SystemTheme | undefined;
/** List of all available theme names */
Expand Down