Skip to content

Update theme signal along with cookie #1063

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

Open
jacob-kofoed wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update theme signal along with cookie #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbd30be
Update theme signal along with cookie
jacob-kofoed May 21, 2026
3709052
Simplified editor signal setup
jacob-kofoed May 22, 2026
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
6 changes: 6 additions & 0 deletions packages/core/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ export type ActionHandler<Args = unknown[]> = (
) => void
env: ToddleEnv
abortSignal: AbortSignal
stores?: {
theme: {
set: (value: string | null) => void
get: () => string | null
}
}
},
event?: Nullable<Event>,
) => void
Expand Down
2 changes: 2 additions & 0 deletions packages/lib/actions/setTheme/handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ const handler: ActionHandler = async function ([name], ctx) {
expires: shouldDelete ? 0 : Date.now() + ONE_YEAR,
sameSite: 'none',
})
// Also update the theme store directly for cases where cookies are not supported or delayed.
ctx.stores?.theme.set(name)
ctx.triggerActionEvent('Success', undefined)
} catch (error) {
ctx.triggerActionEvent('Error', error as Error)
Expand Down
46 changes: 27 additions & 19 deletions packages/runtime/src/editor-preview.main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ import {
getThemeEntries,
renderThemeValues,
} from '@nordcraft/core/dist/styling/theme'
import { THEME_DATA_ATTRIBUTE } from '@nordcraft/core/dist/styling/theme.const'
import {
THEME_COOKIE_NAME,
THEME_DATA_ATTRIBUTE,
} from '@nordcraft/core/dist/styling/theme.const'
import type { StyleVariant } from '@nordcraft/core/dist/styling/variantSelector'
import type {
ActionHandler,
Expand Down Expand Up @@ -244,6 +247,20 @@ export const createRoot = (
testMode: false,
})
const themeSignal = signal<string | null>(null)
themeSignal.subscribe((theme) => {
if (isDefined(theme)) {
document.documentElement.setAttribute(THEME_DATA_ATTRIBUTE, theme)
} else {
document.documentElement.removeAttribute(THEME_DATA_ATTRIBUTE)
}
dataSignal.update((data) => ({
...data,
Page: {
...(data.Page ?? {}),
Theme: theme ?? null,
},
}))
})
const resizeCanvasOptions: {
viewport?: { height: number | null }
enabled?: boolean
Expand Down Expand Up @@ -1166,11 +1183,15 @@ body[data-mode="design"] [data-id="${animationState.animatedElementId}"], body[d
}
case 'preview_theme': {
const { theme } = message.data
if (theme) {
document.body.setAttribute(THEME_DATA_ATTRIBUTE, theme)
} else {
document.body.removeAttribute(THEME_DATA_ATTRIBUTE)
}
themeSignal.set(theme)
const shouldDelete = theme === null || theme === ''
await cookieStore.set({
name: THEME_COOKIE_NAME,
value: theme ?? '',
path: '/',
expires: shouldDelete ? 0 : Date.now() + 1000 * 60 * 60 * 24, // 1 day
sameSite: 'none',
})
requestResizeCanvas(resizeCanvasOptions)
break
}
Expand Down Expand Up @@ -2104,19 +2125,6 @@ function setupThemeSubscription(
) {
_themeRootSignal?.destroy()
_themeRootSignal = getThemeSignal(component, dataSignal, env)
_themeRootSignal.subscribe((theme) => {
if (isDefined(theme)) {
document.documentElement.setAttribute(THEME_DATA_ATTRIBUTE, theme)
} else {
document.documentElement.removeAttribute(THEME_DATA_ATTRIBUTE)
}
dataSignal.update((data) => ({
...data,
Page: {
Theme: theme ?? null,
},
}))
})

return _themeRootSignal
}
Loading