@codefast/theme 0.7.0 → 0.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +22 -0
- package/README.md +2 -2
- package/dist/appearance-provider.d.ts +6 -6
- package/dist/appearance-provider.d.ts.map +1 -1
- package/dist/appearance-provider.js +3 -1
- package/dist/appearance-provider.js.map +1 -1
- package/dist/appearance-script.d.ts +3 -3
- package/dist/appearance-script.d.ts.map +1 -1
- package/dist/appearance-script.js +4 -2
- package/dist/appearance-script.js.map +1 -1
- package/dist/appearance.d.ts +1 -1
- package/dist/appearance.d.ts.map +1 -1
- package/dist/appearance.js.map +1 -1
- package/dist/dom.d.ts.map +1 -1
- package/dist/dom.js +3 -0
- package/dist/dom.js.map +1 -1
- package/package.json +2 -2
- package/src/appearance-provider.tsx +9 -7
- package/src/appearance-script.tsx +8 -5
- package/src/appearance.ts +1 -1
- package/src/dom.ts +4 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# @codefast/theme
|
|
2
2
|
|
|
3
|
+
## 0.8.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [#745](https://github.com/codefastlabs/codefast/pull/745) [`5cbb93a`](https://github.com/codefastlabs/codefast/commit/5cbb93aa42a63f2baa320eb1684267d310018741) Thanks [@thevuong](https://github.com/thevuong)! - fix(theme): harden appearance provider/script and tighten public types
|
|
8
|
+
|
|
9
|
+
Three correctness fixes plus two type-safety tightenings:
|
|
10
|
+
|
|
11
|
+
- Overlapping `setAppearance` calls with `disableTransition` enabled could orphan a transition-suppression `<style>` —
|
|
12
|
+
`enableTransitionsRef` was overwritten before the previous cleanup ran — leaving `*{transition:none}` in `<head>`
|
|
13
|
+
forever and permanently disabling CSS transitions. Each call now flushes the pending suppression before injecting a
|
|
14
|
+
new one.
|
|
15
|
+
- `AppearanceScript` now runtime-validates its `appearance` prop (as `AppearanceProvider` already did), so an invalid
|
|
16
|
+
value can no longer be written to `<html>` before first paint or diverge from the provider's fallback.
|
|
17
|
+
- `applyColorScheme` no-ops during SSR instead of throwing on `window` access, matching its sibling
|
|
18
|
+
`suppressTransitions`.
|
|
19
|
+
- Public props on `AppearanceProvider` and `AppearanceScript` now accept explicit `undefined` (`?: T | undefined`) under
|
|
20
|
+
`exactOptionalPropertyTypes`, so JSX callers can pass possibly-undefined expressions such as `nonce` and `appearance`.
|
|
21
|
+
|
|
22
|
+
Breaking (type surface only, no runtime behavior change): `appearances` is now `ReadonlyArray<Appearance>` (was
|
|
23
|
+
`Array<Appearance>`), so assigning it to a mutable `Appearance[]` is now a compile error.
|
|
24
|
+
|
|
3
25
|
## 0.7.0
|
|
4
26
|
|
|
5
27
|
## 0.6.2
|
package/README.md
CHANGED
|
@@ -24,8 +24,8 @@ pnpm add @codefast/theme
|
|
|
24
24
|
# yarn add @codefast/theme
|
|
25
25
|
```
|
|
26
26
|
|
|
27
|
-
Requires `react` and `react-dom` version 19 or later as peer dependencies. Published on `0.x`
|
|
28
|
-
breaking changes ship as minor versions.
|
|
27
|
+
Requires `react` and `react-dom` version 19 or later as peer dependencies. Published on `0.x` and versioned on its own
|
|
28
|
+
track — breaking changes ship as minor versions.
|
|
29
29
|
|
|
30
30
|
## Quick Start
|
|
31
31
|
|
|
@@ -10,24 +10,24 @@ export type AppearanceProviderProps = {
|
|
|
10
10
|
* Prevents jarring color animations when switching appearances.
|
|
11
11
|
* Default: false
|
|
12
12
|
*/
|
|
13
|
-
readonly disableTransition?: boolean;
|
|
13
|
+
readonly disableTransition?: boolean | undefined;
|
|
14
14
|
/**
|
|
15
15
|
* CSP nonce for inline styles when `disableTransition` is enabled.
|
|
16
16
|
*/
|
|
17
|
-
readonly nonce?: string;
|
|
17
|
+
readonly nonce?: string | undefined;
|
|
18
18
|
/**
|
|
19
19
|
* Custom async persistence for appearance changes; replaces the `localStorage` auto-persist.
|
|
20
20
|
*/
|
|
21
|
-
readonly persistAppearance?: (value: Appearance) => Promise<void
|
|
21
|
+
readonly persistAppearance?: ((value: Appearance) => Promise<void>) | undefined;
|
|
22
22
|
/**
|
|
23
23
|
* Callback invoked when `persistAppearance` rejects.
|
|
24
24
|
*/
|
|
25
|
-
readonly onPersistError?: (error: unknown, attemptedAppearance: Appearance) => void;
|
|
25
|
+
readonly onPersistError?: ((error: unknown, attemptedAppearance: Appearance) => void) | undefined;
|
|
26
26
|
/**
|
|
27
27
|
* Fallback preference when storage has no valid entry — also what SSR renders.
|
|
28
28
|
* Defaults to {@link DEFAULT_APPEARANCE}.
|
|
29
29
|
*/
|
|
30
|
-
readonly appearance?: Appearance;
|
|
30
|
+
readonly appearance?: Appearance | undefined;
|
|
31
31
|
/**
|
|
32
32
|
* `localStorage` key the preference is restored from and persisted under.
|
|
33
33
|
* Defaults to {@link STORAGE_KEY}; pair with `<AppearanceScript>` using the **same key**.
|
|
@@ -41,7 +41,7 @@ export type AppearanceProviderProps = {
|
|
|
41
41
|
* prop. For a returning visitor whose stored preference differs, components that render
|
|
42
42
|
* preference-dependent markup hydrate-reconcile once; gate them behind a mounted flag to avoid that.
|
|
43
43
|
*/
|
|
44
|
-
readonly storageKey?: string;
|
|
44
|
+
readonly storageKey?: string | undefined;
|
|
45
45
|
};
|
|
46
46
|
/**
|
|
47
47
|
* Provider component for appearance state management.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appearance-provider.d.ts","sourceRoot":"","sources":["../src/appearance-provider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAa5C,OAAO,KAAK,EAAE,UAAU,EAAuC,MAAM,cAAc,CAAC;AAsEpF;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;IAC7B;;;;OAIG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"appearance-provider.d.ts","sourceRoot":"","sources":["../src/appearance-provider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAa5C,OAAO,KAAK,EAAE,UAAU,EAAuC,MAAM,cAAc,CAAC;AAsEpF;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;IAC7B;;;;OAIG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjD;;OAEG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC;;OAEG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;IAChF;;OAEG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,UAAU,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAClG;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC7C;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1C,CAAC;AAIF;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,QAAQ,EACR,iBAAyB,EACzB,KAAK,EACL,cAAc,EACd,iBAAiB,EACjB,UAAwB,EACxB,UAAU,EAAE,iBAAsC,GACnD,EAAE,uBAAuB,GAAG,GAAG,CAAC,OAAO,CA+MvC"}
|
|
@@ -181,8 +181,10 @@ export function AppearanceProvider({ children, disableTransition = false, nonce,
|
|
|
181
181
|
if (value === committedAppearanceRef.current) {
|
|
182
182
|
return;
|
|
183
183
|
}
|
|
184
|
-
// Store the cleanup; it will be called after applyColorScheme runs in the colorScheme effect
|
|
184
|
+
// Store the cleanup; it will be called after applyColorScheme runs in the colorScheme effect.
|
|
185
|
+
// Flush any pending suppression first so an overlapping call cannot orphan its injected <style>.
|
|
185
186
|
if (disableTransition) {
|
|
187
|
+
enableTransitionsRef.current?.();
|
|
186
188
|
enableTransitionsRef.current = suppressTransitions(nonce);
|
|
187
189
|
}
|
|
188
190
|
startTransition(async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appearance-provider.js","sourceRoot":"","sources":["../src/appearance-provider.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"appearance-provider.js","sourceRoot":"","sources":["../src/appearance-provider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -8,17 +8,17 @@ export type AppearanceScriptProps = {
|
|
|
8
8
|
* Fallback preference when the storage entry is absent or unrecognised.
|
|
9
9
|
* Defaults to {@link DEFAULT_APPEARANCE}.
|
|
10
10
|
*/
|
|
11
|
-
readonly appearance?: Appearance;
|
|
11
|
+
readonly appearance?: Appearance | undefined;
|
|
12
12
|
/**
|
|
13
13
|
* CSP nonce applied to the inline script element.
|
|
14
14
|
*/
|
|
15
|
-
readonly nonce?: string;
|
|
15
|
+
readonly nonce?: string | undefined;
|
|
16
16
|
/**
|
|
17
17
|
* `localStorage` key the script reads before first paint — a recognised value (`"light"`,
|
|
18
18
|
* `"dark"`, or `"automatic"`) wins over `appearance`.
|
|
19
19
|
* Defaults to {@link STORAGE_KEY}; pair with `<AppearanceProvider>` using the **same key**.
|
|
20
20
|
*/
|
|
21
|
-
readonly storageKey?: string;
|
|
21
|
+
readonly storageKey?: string | undefined;
|
|
22
22
|
};
|
|
23
23
|
/**
|
|
24
24
|
* Inline script that prevents Flash of Unstyled Content (FOUC).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appearance-script.d.ts","sourceRoot":"","sources":["../src/appearance-script.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAGjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAe/C;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"appearance-script.d.ts","sourceRoot":"","sources":["../src/appearance-script.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAGjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAe/C;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC7C;;OAEG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC;;;;OAIG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1C,CAAC;AAIF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,gBAAgB,CAAC,EAC/B,KAAK,EACL,UAAwB,EACxB,UAA+B,GAChC,EAAE,qBAAqB,GAAG,GAAG,CAAC,OAAO,CAWrC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
-
import { appearances } from "#/appearance";
|
|
2
|
+
import { appearances, appearanceSchema } from "#/appearance";
|
|
3
3
|
import { DEFAULT_APPEARANCE, MEDIA, STORAGE_KEY } from "#/constants";
|
|
4
4
|
/* JSON.stringify does not escape </script>, so we replace the three characters that
|
|
5
5
|
* can form a closing tag: < > /. Unicode escapes are valid JS and safe in HTML. */
|
|
@@ -39,10 +39,12 @@ const APPEARANCE_VALID_CHECK = appearances.map((s) => `s===${toScriptSafe(s)}`).
|
|
|
39
39
|
* @since 0.5.0-canary.2
|
|
40
40
|
*/
|
|
41
41
|
export function AppearanceScript({ nonce, storageKey = STORAGE_KEY, appearance = DEFAULT_APPEARANCE, }) {
|
|
42
|
+
// Guard against invalid values bypassing TypeScript so the fallback matches AppearanceProvider.
|
|
43
|
+
const safeAppearance = appearanceSchema.safeParse(appearance).success ? appearance : DEFAULT_APPEARANCE;
|
|
42
44
|
// toScriptSafe = JSON.stringify + escape <>/ so </script> cannot break out of the tag.
|
|
43
45
|
// The script reads localStorage before first paint so the stored preference applies
|
|
44
46
|
// without FOUC; an absent or invalid entry falls back to fb.
|
|
45
|
-
const appearanceScript = `(function(){try{var sk=${toScriptSafe(storageKey)},fb=${toScriptSafe(
|
|
47
|
+
const appearanceScript = `(function(){try{var sk=${toScriptSafe(storageKey)},fb=${toScriptSafe(safeAppearance)},s=localStorage.getItem(sk),appearance=(${APPEARANCE_VALID_CHECK})?s:fb,colorScheme=appearance;"automatic"===appearance&&(colorScheme=window.matchMedia(${toScriptSafe(MEDIA)}).matches?"dark":"light"),document.documentElement.classList.remove(${APPEARANCE_REMOVE_ARGS}),document.documentElement.classList.add(colorScheme),document.documentElement.style.colorScheme=colorScheme,document.documentElement.dataset.appearance=appearance}catch(e){}})()`;
|
|
46
48
|
const nonceProps = nonce === undefined ? {} : { nonce };
|
|
47
49
|
return _jsx("script", { dangerouslySetInnerHTML: { __html: appearanceScript }, suppressHydrationWarning: true, ...nonceProps });
|
|
48
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appearance-script.js","sourceRoot":"","sources":["../src/appearance-script.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"appearance-script.js","sourceRoot":"","sources":["../src/appearance-script.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAE7D,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAErE;mFACmF;AACnF,SAAS,YAAY,CAAC,KAAc;IAClC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;AAChH,CAAC;AAED,yFAAyF;AACzF,MAAM,sBAAsB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACjF,MAAM,sBAAsB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAyB3F,wHAAwH;AAExH;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,UAAU,gBAAgB,CAAC,EAC/B,KAAK,EACL,UAAU,GAAG,WAAW,EACxB,UAAU,GAAG,kBAAkB,GACT;IACtB,gGAAgG;IAChG,MAAM,cAAc,GAAG,gBAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC;IAExG,wFAAwF;IACxF,oFAAoF;IACpF,6DAA6D;IAC7D,MAAM,gBAAgB,GAAG,0BAA0B,YAAY,CAAC,UAAU,CAAC,OAAO,YAAY,CAAC,cAAc,CAAC,2CAA2C,sBAAsB,0FAA0F,YAAY,CAAC,KAAK,CAAC,uEAAuE,sBAAsB,oLAAoL,CAAC;IAC9iB,MAAM,UAAU,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;IAExD,OAAO,iBAAQ,uBAAuB,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,wBAAwB,WAAK,UAAU,GAAI,CAAC;AACpH,CAAC"}
|
package/dist/appearance.d.ts
CHANGED
|
@@ -37,7 +37,7 @@ export type ColorScheme = Exclude<Appearance, "automatic">;
|
|
|
37
37
|
*
|
|
38
38
|
* @since 0.5.0-canary.2
|
|
39
39
|
*/
|
|
40
|
-
export declare const appearances:
|
|
40
|
+
export declare const appearances: ReadonlyArray<Appearance>;
|
|
41
41
|
/**
|
|
42
42
|
* Shape of the context value provided by AppearanceProvider.
|
|
43
43
|
*
|
package/dist/appearance.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appearance.d.ts","sourceRoot":"","sources":["../src/appearance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,EAAE,CAAC,CAAC,OAAO,CAAC;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,WAAW,CAAA;CAAE,CAI/F,CAAC;AAEH;;;;;;;;GAQG;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;AAE3D;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"appearance.d.ts","sourceRoot":"","sources":["../src/appearance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,EAAE,CAAC,CAAC,OAAO,CAAC;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,WAAW,CAAA;CAAE,CAI/F,CAAC;AAEH;;;;;;;;GAQG;AACH,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;AAE3D;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,UAAU,CAA4B,CAAC;AAE/E;;;;;;;;;GASG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;CACjC,CAAC"}
|
package/dist/appearance.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appearance.js","sourceRoot":"","sources":["../src/appearance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;;;gFAOgF;AAEhF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAwE,CAAC,CAAC,IAAI,CAAC;IAC1G,OAAO;IACP,MAAM;IACN,WAAW;CACZ,CAAC,CAAC;AAsBH;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"appearance.js","sourceRoot":"","sources":["../src/appearance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;;;;gFAOgF;AAEhF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAwE,CAAC,CAAC,IAAI,CAAC;IAC1G,OAAO;IACP,MAAM;IACN,WAAW;CACZ,CAAC,CAAC;AAsBH;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,WAAW,GAA8B,gBAAgB,CAAC,OAAO,CAAC"}
|
package/dist/dom.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dom.d.ts","sourceRoot":"","sources":["../src/dom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAIhD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"dom.d.ts","sourceRoot":"","sources":["../src/dom.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAIhD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAU/D;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,IAAI,CAyC9D"}
|
package/dist/dom.js
CHANGED
|
@@ -9,6 +9,9 @@
|
|
|
9
9
|
* @since 0.3.16-canary.0
|
|
10
10
|
*/
|
|
11
11
|
export function applyColorScheme(colorScheme) {
|
|
12
|
+
if (typeof globalThis.window === "undefined") {
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
12
15
|
const root = window.document.documentElement;
|
|
13
16
|
root.classList.remove("light", "dark", "automatic");
|
|
14
17
|
root.classList.add(colorScheme);
|
package/dist/dom.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dom.js","sourceRoot":"","sources":["../src/dom.ts"],"names":[],"mappings":"AAEA,wHAAwH;AAExH;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB,CAAC,WAAwB;IACvD,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC;IAE7C,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACpD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAChC,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;AACvC,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAc;IAChD,IAAI,OAAO,UAAU,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;QAC7C,OAAO,GAAG,EAAE;YACV,UAAU;QACZ,CAAC,CAAC;IACJ,CAAC;IAED,oCAAoC;IACpC,MAAM,oBAAoB,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,kCAAkC,CAAC,CAAC,OAAO,CAAC;IAEtG,IAAI,oBAAoB,EAAE,CAAC;QACzB,OAAO,GAAG,EAAE;YACV,UAAU;QACZ,CAAC,CAAC;IACJ,CAAC;IAED,2CAA2C;IAC3C,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAE5C,IAAI,KAAK,EAAE,CAAC;QACV,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,0EAA0E;IAC1E,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,iDAAiD,CAAC,CAAC,CAAC;IAEvF,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAE1B,OAAO,GAAG,EAAE;QACV,4DAA4D;QAC5D,KAAK,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE5C,+DAA+D;QAC/D,qBAAqB,CAAC,GAAG,EAAE;YACzB,qBAAqB,CAAC,GAAG,EAAE;gBACzB,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;oBACnB,GAAG,CAAC,MAAM,EAAE,CAAC;gBACf,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"dom.js","sourceRoot":"","sources":["../src/dom.ts"],"names":[],"mappings":"AAEA,wHAAwH;AAExH;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB,CAAC,WAAwB;IACvD,IAAI,OAAO,UAAU,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;QAC7C,OAAO;IACT,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC;IAE7C,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACpD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAChC,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;AACvC,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAc;IAChD,IAAI,OAAO,UAAU,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;QAC7C,OAAO,GAAG,EAAE;YACV,UAAU;QACZ,CAAC,CAAC;IACJ,CAAC;IAED,oCAAoC;IACpC,MAAM,oBAAoB,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,kCAAkC,CAAC,CAAC,OAAO,CAAC;IAEtG,IAAI,oBAAoB,EAAE,CAAC;QACzB,OAAO,GAAG,EAAE;YACV,UAAU;QACZ,CAAC,CAAC;IACJ,CAAC;IAED,2CAA2C;IAC3C,MAAM,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAE5C,IAAI,KAAK,EAAE,CAAC;QACV,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,0EAA0E;IAC1E,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,iDAAiD,CAAC,CAAC,CAAC;IAEvF,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAE1B,OAAO,GAAG,EAAE;QACV,4DAA4D;QAC5D,KAAK,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE5C,+DAA+D;QAC/D,qBAAqB,CAAC,GAAG,EAAE;YACzB,qBAAqB,CAAC,GAAG,EAAE;gBACzB,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;oBACnB,GAAG,CAAC,MAAM,EAAE,CAAC;gBACf,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codefast/theme",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.8.0",
|
|
4
4
|
"description": "Appearance management for React 19 with HIG-inspired vocabulary - optimistic updates, cross-tab sync, and FOUC-free SSR",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"dark-mode",
|
|
@@ -120,7 +120,7 @@
|
|
|
120
120
|
"typescript": "^7.0.2",
|
|
121
121
|
"vite": "^8.2.1",
|
|
122
122
|
"vitest": "^4.1.10",
|
|
123
|
-
"@codefast/typescript-config": "0.
|
|
123
|
+
"@codefast/typescript-config": "0.8.0"
|
|
124
124
|
},
|
|
125
125
|
"peerDependencies": {
|
|
126
126
|
"@types/react": ">=19.0.0",
|
|
@@ -91,24 +91,24 @@ export type AppearanceProviderProps = {
|
|
|
91
91
|
* Prevents jarring color animations when switching appearances.
|
|
92
92
|
* Default: false
|
|
93
93
|
*/
|
|
94
|
-
readonly disableTransition?: boolean;
|
|
94
|
+
readonly disableTransition?: boolean | undefined;
|
|
95
95
|
/**
|
|
96
96
|
* CSP nonce for inline styles when `disableTransition` is enabled.
|
|
97
97
|
*/
|
|
98
|
-
readonly nonce?: string;
|
|
98
|
+
readonly nonce?: string | undefined;
|
|
99
99
|
/**
|
|
100
100
|
* Custom async persistence for appearance changes; replaces the `localStorage` auto-persist.
|
|
101
101
|
*/
|
|
102
|
-
readonly persistAppearance?: (value: Appearance) => Promise<void
|
|
102
|
+
readonly persistAppearance?: ((value: Appearance) => Promise<void>) | undefined;
|
|
103
103
|
/**
|
|
104
104
|
* Callback invoked when `persistAppearance` rejects.
|
|
105
105
|
*/
|
|
106
|
-
readonly onPersistError?: (error: unknown, attemptedAppearance: Appearance) => void;
|
|
106
|
+
readonly onPersistError?: ((error: unknown, attemptedAppearance: Appearance) => void) | undefined;
|
|
107
107
|
/**
|
|
108
108
|
* Fallback preference when storage has no valid entry — also what SSR renders.
|
|
109
109
|
* Defaults to {@link DEFAULT_APPEARANCE}.
|
|
110
110
|
*/
|
|
111
|
-
readonly appearance?: Appearance;
|
|
111
|
+
readonly appearance?: Appearance | undefined;
|
|
112
112
|
/**
|
|
113
113
|
* `localStorage` key the preference is restored from and persisted under.
|
|
114
114
|
* Defaults to {@link STORAGE_KEY}; pair with `<AppearanceScript>` using the **same key**.
|
|
@@ -122,7 +122,7 @@ export type AppearanceProviderProps = {
|
|
|
122
122
|
* prop. For a returning visitor whose stored preference differs, components that render
|
|
123
123
|
* preference-dependent markup hydrate-reconcile once; gate them behind a mounted flag to avoid that.
|
|
124
124
|
*/
|
|
125
|
-
readonly storageKey?: string;
|
|
125
|
+
readonly storageKey?: string | undefined;
|
|
126
126
|
};
|
|
127
127
|
|
|
128
128
|
// ── Component ────────────────────────────────────────────────────────────────────────────────────────────────────────
|
|
@@ -294,8 +294,10 @@ export function AppearanceProvider({
|
|
|
294
294
|
return;
|
|
295
295
|
}
|
|
296
296
|
|
|
297
|
-
// Store the cleanup; it will be called after applyColorScheme runs in the colorScheme effect
|
|
297
|
+
// Store the cleanup; it will be called after applyColorScheme runs in the colorScheme effect.
|
|
298
|
+
// Flush any pending suppression first so an overlapping call cannot orphan its injected <style>.
|
|
298
299
|
if (disableTransition) {
|
|
300
|
+
enableTransitionsRef.current?.();
|
|
299
301
|
enableTransitionsRef.current = suppressTransitions(nonce);
|
|
300
302
|
}
|
|
301
303
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { JSX } from "react";
|
|
2
2
|
|
|
3
|
-
import { appearances } from "#/appearance";
|
|
3
|
+
import { appearances, appearanceSchema } from "#/appearance";
|
|
4
4
|
import type { Appearance } from "#/appearance";
|
|
5
5
|
import { DEFAULT_APPEARANCE, MEDIA, STORAGE_KEY } from "#/constants";
|
|
6
6
|
|
|
@@ -24,17 +24,17 @@ export type AppearanceScriptProps = {
|
|
|
24
24
|
* Fallback preference when the storage entry is absent or unrecognised.
|
|
25
25
|
* Defaults to {@link DEFAULT_APPEARANCE}.
|
|
26
26
|
*/
|
|
27
|
-
readonly appearance?: Appearance;
|
|
27
|
+
readonly appearance?: Appearance | undefined;
|
|
28
28
|
/**
|
|
29
29
|
* CSP nonce applied to the inline script element.
|
|
30
30
|
*/
|
|
31
|
-
readonly nonce?: string;
|
|
31
|
+
readonly nonce?: string | undefined;
|
|
32
32
|
/**
|
|
33
33
|
* `localStorage` key the script reads before first paint — a recognised value (`"light"`,
|
|
34
34
|
* `"dark"`, or `"automatic"`) wins over `appearance`.
|
|
35
35
|
* Defaults to {@link STORAGE_KEY}; pair with `<AppearanceProvider>` using the **same key**.
|
|
36
36
|
*/
|
|
37
|
-
readonly storageKey?: string;
|
|
37
|
+
readonly storageKey?: string | undefined;
|
|
38
38
|
};
|
|
39
39
|
|
|
40
40
|
// ── Component ────────────────────────────────────────────────────────────────────────────────────────────────────────
|
|
@@ -72,10 +72,13 @@ export function AppearanceScript({
|
|
|
72
72
|
storageKey = STORAGE_KEY,
|
|
73
73
|
appearance = DEFAULT_APPEARANCE,
|
|
74
74
|
}: AppearanceScriptProps): JSX.Element {
|
|
75
|
+
// Guard against invalid values bypassing TypeScript so the fallback matches AppearanceProvider.
|
|
76
|
+
const safeAppearance = appearanceSchema.safeParse(appearance).success ? appearance : DEFAULT_APPEARANCE;
|
|
77
|
+
|
|
75
78
|
// toScriptSafe = JSON.stringify + escape <>/ so </script> cannot break out of the tag.
|
|
76
79
|
// The script reads localStorage before first paint so the stored preference applies
|
|
77
80
|
// without FOUC; an absent or invalid entry falls back to fb.
|
|
78
|
-
const appearanceScript = `(function(){try{var sk=${toScriptSafe(storageKey)},fb=${toScriptSafe(
|
|
81
|
+
const appearanceScript = `(function(){try{var sk=${toScriptSafe(storageKey)},fb=${toScriptSafe(safeAppearance)},s=localStorage.getItem(sk),appearance=(${APPEARANCE_VALID_CHECK})?s:fb,colorScheme=appearance;"automatic"===appearance&&(colorScheme=window.matchMedia(${toScriptSafe(MEDIA)}).matches?"dark":"light"),document.documentElement.classList.remove(${APPEARANCE_REMOVE_ARGS}),document.documentElement.classList.add(colorScheme),document.documentElement.style.colorScheme=colorScheme,document.documentElement.dataset.appearance=appearance}catch(e){}})()`;
|
|
79
82
|
const nonceProps = nonce === undefined ? {} : { nonce };
|
|
80
83
|
|
|
81
84
|
return <script dangerouslySetInnerHTML={{ __html: appearanceScript }} suppressHydrationWarning {...nonceProps} />;
|
package/src/appearance.ts
CHANGED
|
@@ -50,7 +50,7 @@ export type ColorScheme = Exclude<Appearance, "automatic">;
|
|
|
50
50
|
*
|
|
51
51
|
* @since 0.5.0-canary.2
|
|
52
52
|
*/
|
|
53
|
-
export const appearances:
|
|
53
|
+
export const appearances: ReadonlyArray<Appearance> = appearanceSchema.options;
|
|
54
54
|
|
|
55
55
|
/**
|
|
56
56
|
* Shape of the context value provided by AppearanceProvider.
|
package/src/dom.ts
CHANGED
|
@@ -12,6 +12,10 @@ import type { ColorScheme } from "#/appearance";
|
|
|
12
12
|
* @since 0.3.16-canary.0
|
|
13
13
|
*/
|
|
14
14
|
export function applyColorScheme(colorScheme: ColorScheme): void {
|
|
15
|
+
if (typeof globalThis.window === "undefined") {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
|
|
15
19
|
const root = window.document.documentElement;
|
|
16
20
|
|
|
17
21
|
root.classList.remove("light", "dark", "automatic");
|