pixelize-design-library 2.4.2-beta.9 → 3.0.0

package/dist/esm/Theme/index.js

@@ -1,27 +1,20 @@
 import createBrandTheme from "./chakra/createBrandTheme.js";
 import { lightPalettes, darkPalettes } from "./tokens/brands/index.js";
-/**
- * Chakra themes per brand, built from the pure palettes in `tokens/brands`.
- *
- * These used to be seven near-identical `<Brand>/theme.ts` files that differed only in
- * which palette they imported; `createBrandTheme` is that shared body.
- */
+import { lazyObject } from "./tokens/builders/lazy.js";
+// NOTE: lavender is built at import as the shape template — every light theme shares its keys.
 const lavender = createBrandTheme(lightPalettes.lavender);
-const meadow = createBrandTheme(lightPalettes.meadow);
-const radiant = createBrandTheme(lightPalettes.radiant);
-const skyline = createBrandTheme(lightPalettes.skyline);
-const slate = createBrandTheme(lightPalettes.slate);
-const emerald = createBrandTheme(lightPalettes.emerald);
-const rosewood = createBrandTheme(lightPalettes.rosewood);
-const storefront = createBrandTheme(lightPalettes.storefront);
-const zinc = createBrandTheme(lightPalettes.zinc);
+const lightThemeKeys = Object.keys(lavender);
+const lazyLightTheme = (brand) => lazyObject(lightThemeKeys, () => createBrandTheme(lightPalettes[brand]));
+const meadow = lazyLightTheme("meadow");
+const radiant = lazyLightTheme("radiant");
+const skyline = lazyLightTheme("skyline");
+const slate = lazyLightTheme("slate");
+const emerald = lazyLightTheme("emerald");
+const rosewood = lazyLightTheme("rosewood");
+const storefront = lazyLightTheme("storefront");
+const zinc = lazyLightTheme("zinc");
 export { skyline, meadow, radiant, lavender, slate, emerald, rosewood, storefront, zinc };
-/**
- * Published contract — consumers iterate this to render theme pickers, so both the keys
- * and their order are load-bearing. Stays light-only: these are the exact theme objects
- * apps already pass to `withTheme`, and dark is opt-in via `PixelizeThemeProvider`.
- * `storefront`/`zinc` are appended at the end — additive, doesn't reorder existing entries.
- */
+// NOTE: consumers iterate this to render theme pickers — key order is load-bearing. Stays light-only.
 export const ThemesList = {
     lavender: lavender,
     meadow: meadow,
@@ -33,12 +26,7 @@ export const ThemesList = {
     storefront: storefront,
     zinc: zinc,
 };
-/**
- * `dark` is built on first read, not at import. Nine `createBrandTheme` calls measure ~15ms on a
- * dev machine, and a light-only app (tickets, and every app before it opts in) never reads one.
- * A getter — rather than a lazy map — keeps `Object.keys(brandThemes)` and its order intact,
- * which `ThemeSwitcher` iterates to render the brand picker.
- */
+// NOTE: dark is built on first read via a getter, not at import — keeps Object.keys() order intact for ThemeSwitcher.
 const withLazyDark = (brand, light) => {
     let dark;
     return {

package/dist/esm/Theme/provider/PixelizeThemeProvider.js

@@ -1,26 +1,14 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { createContext, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, } from "react";
+import { createContext, useCallback, useDeferredValue, useEffect, useLayoutEffect, useMemo, useRef, useState, } from "react";
 import { ChakraProvider, extendTheme } from "@chakra-ui/react";
 import { brandThemes } from "../index.js";
 import ToasterProvider from "../../Components/Toaster/Toaster.js";
+import { reducedMotionGlobalStyles } from "../chakra/motion.js";
 import { getSystemColorMode, readStoredTheme, subscribeToSystemColorMode, writeStoredTheme, } from "./colorModeStorage.js";
 const DEFAULT_BRAND = "lavender";
 const DEFAULT_MODE = "system";
 const DEFAULT_STORAGE_KEY = "pixelize-theme";
-/**
- * Chakra's default `colorModeManager` reads/writes its OWN `localStorage["chakra-ui-color-mode"]`
- * key — entirely separate from this app's `storageKey` above — and that stored value wins over
- * `theme.config.initialColorMode` on every load. `createBrandTheme` sets `initialColorMode: "light"`
- * on every theme object specifically so Chakra's native dark mode (and every un-migrated built-in
- * `_dark:` block — Card's "elevated" variant reaches for `gray.700`, which our reversed dark ramp
- * makes LIGHT) never fires. But a stale `"dark"` value in that key — from Chakra's own toggle ever
- * having been used on this origin, by this app or a prior version of it — silently overrides that
- * default and reintroduces exactly the bug `initialColorMode: "light"` was meant to prevent: a
- * washed-out light Card on an otherwise-correct dark canvas, while everything reading the palette
- * directly (i.e. everything else) stays right. Forcing this manager to always report `"light"` and
- * never persist removes Chakra's native color mode from the equation entirely, so no stray
- * `_dark:` block anywhere (present or future) can ever fire, regardless of what's in storage.
- */
+// NOTE: forces Chakra's own color mode to "light" always — a stale chakra-ui-color-mode key would otherwise re-fire un-migrated `_dark:` blocks.
 const forcedLightColorModeManager = {
     type: "localStorage",
     ssr: false,
@@ -28,27 +16,10 @@ const forcedLightColorModeManager = {
     set: () => { },
 };
 export const ThemeModeContext = createContext(undefined);
-/**
- * Chakra's own color mode is deliberately NOT synced to `resolvedMode`, and must not be.
- *
- * This provider adapts for dark by swapping the palette, so `theme.colors` is already correct for
- * the active mode. Putting Chakra into dark mode on top of that adapts a second time: its built-in
- * `_dark` blocks reach for `gray.700`/`gray.800` expecting those rungs to be dark, but our dark
- * ramp runs dark -> light, so they resolve LIGHT — a white Card/Skeleton/Menu on a dark canvas.
- * A previous revision synced it to keep `useColorModeValue()` working and shipped exactly that.
- *
- * Consequence for consumers: `useColorModeValue(light, dark)` always returns its LIGHT argument.
- * That is correct here — the palette has already resolved the mode, so the "light" argument is
- * whatever the active palette says. Read the mode from `useThemeMode()` instead. Existing apps are
- * unaffected: they are light-only, where that argument was always the one returned anyway.
- */
-export const PixelizeThemeProvider = ({ children, brand: brandProp = DEFAULT_BRAND, onBrandChange, defaultMode = DEFAULT_MODE, onModeChange, storageKey = DEFAULT_STORAGE_KEY, disablePersistence = false, themeOverrides, }) => {
-    // Seed from storage during the first render: StrictMode re-runs the persist effect, and a
-    // ref guard cannot stop that second pass writing defaults over the stored value.
+// NOTE: Chakra's own color mode stays unsynced from resolvedMode — its built-in `_dark:` blocks assume the opposite ramp direction. Read mode via useThemeMode(), not useColorModeValue().
+export const PixelizeThemeProvider = ({ children, brand: brandProp = DEFAULT_BRAND, onBrandChange, defaultMode = DEFAULT_MODE, onModeChange, storageKey = DEFAULT_STORAGE_KEY, disablePersistence = false, themeOverrides, reducedMotion = "components", }) => {
     const [mode, setModeState] = useState(() => { var _a; return (_a = (disablePersistence ? undefined : readStoredTheme(storageKey).mode)) !== null && _a !== void 0 ? _a : defaultMode; });
     const [brand, setBrandState] = useState(() => { var _a; return (_a = (disablePersistence ? undefined : readStoredTheme(storageKey).brand)) !== null && _a !== void 0 ? _a : brandProp; });
-    // Read synchronously: seeding "light" made every `system` user on a dark OS paint a light
-    // frame before the effect corrected it. SSR-safe — returns "light" with no window.
     const [systemMode, setSystemMode] = useState(getSystemColorMode);
     useEffect(() => {
         setSystemMode(getSystemColorMode());
@@ -63,12 +34,6 @@ export const PixelizeThemeProvider = ({ children, brand: brandProp = DEFAULT_BRA
         if (stored.brand)
             setBrandState(stored.brand);
     }, [disablePersistence, storageKey]);
-    // `brandProp` only seeds initial state above, so a consumer that re-renders with a new
-    // `brand` prop after mount (e.g. persisting the pick through its own store, like tickets'
-    // Settings page dispatching Redux instead of calling `setBrand`) would otherwise never see
-    // it applied. Sync it here instead so every consumer gets it for free.
-    // Compare the previous prop, never a "first run" flag: StrictMode double-invokes effects while
-    // refs survive, so a flag guard lets pass 2 reset state to the prop and clobber stored values.
     const prevBrandProp = useRef(brandProp);
     useEffect(() => {
         if (prevBrandProp.current === brandProp)
@@ -76,8 +41,6 @@ export const PixelizeThemeProvider = ({ children, brand: brandProp = DEFAULT_BRA
         prevBrandProp.current = brandProp;
         setBrandState(brandProp);
     }, [brandProp]);
-    // Same prop-sync for the mode, so an app owning it in its own store no longer needs the
-    // `mode` -> store mirror effect that deadlocks against this one.
     const prevModeProp = useRef(defaultMode);
     useEffect(() => {
         if (prevModeProp.current === defaultMode)
@@ -85,8 +48,6 @@ export const PixelizeThemeProvider = ({ children, brand: brandProp = DEFAULT_BRA
         prevModeProp.current = defaultMode;
         setModeState(defaultMode);
     }, [defaultMode]);
-    // Skipping the mount run keeps the defaults from being written over a stored value before
-    // the rehydrate effect above has applied it.
     const isFirstPersistRun = useRef(true);
     useEffect(() => {
         if (isFirstPersistRun.current) {
@@ -98,26 +59,17 @@ export const PixelizeThemeProvider = ({ children, brand: brandProp = DEFAULT_BRA
         writeStoredTheme(storageKey, { mode, brand });
     }, [mode, brand, disablePersistence, storageKey]);
     const resolvedMode = mode === "system" ? systemMode : mode;
-    /**
-     * Native browser UI (the `<select>` dropdown popup chrome, the `<input type="date">` calendar
-     * picker) is painted by the browser's own UA stylesheet keyed off the CSS `color-scheme`
-     * property, entirely separate from Chakra/React theming — no component style or palette swap
-     * above can reach it. Without this, that chrome always renders light, even on an otherwise dark
-     * page. Scoped to this provider (not a global stylesheet) so `withTheme` consumers — deliberately
-     * light-only, see the module doc's "Key rules" — are untouched.
-     */
+    // NOTE: the page re-themes in an interruptible second commit; the switcher paints first.
+    const appliedMode = useDeferredValue(resolvedMode);
+    const appliedBrand = useDeferredValue(brand);
+    // NOTE: sets CSS color-scheme so native chrome (select popups, date pickers) matches the mode.
     useLayoutEffect(() => {
-        document.documentElement.style.colorScheme = resolvedMode;
-    }, [resolvedMode]);
-    // Chakra's ColorModeProvider re-writes color-scheme in a passive effect, after the layout
-    // effect above, and forcedLightColorModeManager pins it to "light". Re-assert after it.
+        document.documentElement.style.colorScheme = appliedMode;
+    }, [appliedMode]);
+    // NOTE: re-asserted after Chakra's own ColorModeProvider effect overwrites it back to "light".
     useEffect(() => {
-        document.documentElement.style.colorScheme = resolvedMode;
-    }, [resolvedMode]);
-    // Held in refs so a caller's inline arrow never re-creates `setMode`/`setBrand`, which would
-    // invalidate the context value on every render of the consuming app. Written in a layout
-    // effect, not during render — a render-phase write is unsafe under StrictMode's double
-    // invocation, and this still lands before any click handler can fire.
+        document.documentElement.style.colorScheme = appliedMode;
+    }, [appliedMode]);
     const onModeChangeRef = useRef(onModeChange);
     const onBrandChangeRef = useRef(onBrandChange);
     useLayoutEffect(() => {
@@ -134,33 +86,23 @@ export const PixelizeThemeProvider = ({ children, brand: brandProp = DEFAULT_BRA
         setBrandState(next);
         (_a = onBrandChangeRef.current) === null || _a === void 0 ? void 0 : _a.call(onBrandChangeRef, next);
     }, []);
-    // From "system", flip to the opposite of what the OS currently gives, so a click always
-    // visibly changes the UI.
     const toggle = useCallback(() => setMode(resolvedMode === "dark" ? "light" : "dark"), [resolvedMode, setMode]);
     const value = useMemo(() => ({ mode, resolvedMode, setMode, toggle, brand, setBrand }), [mode, resolvedMode, setMode, toggle, brand, setBrand]);
-    // `themeOverrides` is caller-supplied, and the idiomatic way to pass it is an inline object
-    // literal — a new identity every render. Keying the memo on identity would re-run `extendTheme`
-    // and hand `ChakraProvider` a new theme on every render of the consuming app, invalidating
-    // emotion's style resolution for everything beneath it. Compare by value instead.
+    // NOTE: keyed by value, not identity — themeOverrides is usually an inline literal.
     const overridesKey = themeOverrides ? JSON.stringify(themeOverrides) : "";
     const resolvedTheme = useMemo(() => {
-        const base = brandThemes[brand][resolvedMode];
-        return themeOverrides ? extendTheme(base, themeOverrides) : base;
-        // Keyed on the serialized overrides, not their identity. `brand`/`resolvedMode` must stay:
-        // overrides re-layer onto the CURRENT palette (see the prop's doc comment above).
+        const base = brandThemes[appliedBrand][appliedMode];
+        const extensions = [
+            ...(reducedMotion === "global" ? [{ styles: { global: reducedMotionGlobalStyles } }] : []),
+            ...(themeOverrides ? [themeOverrides] : []),
+        ];
+        return extensions.length ? extendTheme(base, ...extensions) : base;
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [brand, resolvedMode, overridesKey]);
-    /**
-     * The library ships its `var(--color-*)` tokens light-only on `:root` (global.css), so any
-     * consumer that styles with those CSS vars rather than Chakra tokens stays light in dark mode —
-     * invisible text on the dark canvas, white panels. In dark, re-point every used var at the
-     * already-dark-correct resolved palette; in light, clear them so the static `:root` values apply
-     * unchanged (so a light-only app is byte-identical to before). Also mirror the mode to
-     * `data-mode` for consumers that want to hook their own dark CSS.
-     */
+    }, [appliedBrand, appliedMode, overridesKey, reducedMotion]);
+    // NOTE: global.css ships var(--color-*) light-only — re-point them here in dark, clear in light.
     useLayoutEffect(() => {
         const root = document.documentElement;
-        root.dataset.mode = resolvedMode;
+        root.dataset.mode = appliedMode;
         const { colors } = resolvedTheme;
         const { gray, semantic } = colors;
         const HUE_SCALES = [
@@ -169,8 +111,6 @@ export const PixelizeThemeProvider = ({ children, brand: brandProp = DEFAULT_BRA
         ];
         const SEMANTIC_SCALES = ["success", "error", "warning", "info"];
         const RUNGS = [50, 100, 200, 300, 400, 500, 600, 700, 800, 900];
-        // The dark gray ramp runs dark(50) → light(900), so low rungs read as surfaces
-        // and high rungs as text — correct in dark, cleared in light.
         const SEMANTIC_VARS = {
             "text-heading": gray[900], "text-body": gray[700],
             "text-subtle": gray[500], "text-input": gray[500],
@@ -186,7 +126,7 @@ export const PixelizeThemeProvider = ({ children, brand: brandProp = DEFAULT_BRA
         const set = (name, val) => root.style.setProperty(`--color-${name}`, val);
         const clear = (name) => root.style.removeProperty(`--color-${name}`);
         const allRampNames = [...HUE_SCALES, ...SEMANTIC_SCALES].flatMap((s) => RUNGS.map((r) => `${s}-${r}`));
-        if (resolvedMode === "dark") {
+        if (appliedMode === "dark") {
             for (const s of HUE_SCALES)
                 for (const r of RUNGS)
                     set(`${s}-${r}`, colors[s][r]);
@@ -202,6 +142,7 @@ export const PixelizeThemeProvider = ({ children, brand: brandProp = DEFAULT_BRA
             for (const name of Object.keys(SEMANTIC_VARS))
                 clear(name);
         }
-    }, [resolvedMode, resolvedTheme]);
-    return (_jsx(ThemeModeContext.Provider, { value: value, children: _jsx(ChakraProvider, { theme: resolvedTheme, colorModeManager: forcedLightColorModeManager, children: _jsx(ToasterProvider, { children: children }) }) }));
+    }, [appliedMode, resolvedTheme]);
+    const themedTree = useMemo(() => (_jsx(ChakraProvider, { theme: resolvedTheme, colorModeManager: forcedLightColorModeManager, children: _jsx(ToasterProvider, { children: children }) })), [resolvedTheme, children]);
+    return _jsx(ThemeModeContext.Provider, { value: value, children: themedTree });
 };

package/dist/esm/Theme/provider/ThemeSwitcher.js

@@ -1,10 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useRef } from "react";
+import { useRef, useState } from "react";
 import { Box, Button, HStack, IconButton, Menu, MenuButton, MenuDivider, MenuItemOption, MenuList, MenuOptionGroup, Text, Tooltip, } from "@chakra-ui/react";
 import { Monitor, Moon, Sun } from "lucide-react";
 import { brandThemes } from "../index.js";
+import { lightPalettes } from "../tokens/brands/index.js";
 import { useCustomTheme } from "../useCustomTheme.js";
 import { useThemeMode } from "./useThemeMode.js";
+import { focusGlowShadow, focusVisibleRing } from "../chakra/focusRing.styles.js";
+import { AA_NON_TEXT, liftToContrast } from "../tokens/builders/outlineRung.js";
 const MODE_OPTIONS = [
     { value: "light", label: "Light", Icon: Sun },
     { value: "system", label: "System", Icon: Monitor },
@@ -16,21 +19,13 @@ const SIZES = {
     lg: { control: "lg", icon: 18 },
 };
 const toBrandLabel = (brand) => brand.charAt(0).toUpperCase() + brand.slice(1);
-/**
- * Same swatch each brand's own theme carries at `colors.primary[500]` (the
- * anchor a filled button reads) — resolved per brand from its OWN palette so
- * the dot always matches what selecting that brand actually looks like,
- * regardless of which brand/mode is currently active.
- */
-const brandSwatchColor = (brand) => brandThemes[brand].light.colors.primary[500];
+// NOTE: reads the brand's own palette, not its Chakra theme, so the picker builds no themes.
+const brandSwatchColor = (brand) => lightPalettes[brand].primary[500];
 const BrandSwatch = ({ brand }) => {
     const { colors } = useCustomTheme();
     return (_jsx(Box, { as: "span", display: "inline-block", w: "0.625rem", h: "0.625rem", borderRadius: "full", bg: brandSwatchColor(brand), border: "1px solid", borderColor: colors.boxborder[200], flexShrink: 0 }));
 };
-/**
- * Palette values already differ per color mode (`brandThemes[brand].light|dark`), so tokens
- * are read straight from the active theme — no `useColorModeValue` pairing needed here.
- */
+// Palette already differs per mode, so tokens read straight from the active theme — no useColorModeValue needed.
 const useSwitcherColors = () => {
     const { colors } = useCustomTheme();
     return {
@@ -42,25 +37,30 @@ const useSwitcherColors = () => {
         borderColor: colors.boxborder[200],
         // NOTE: menuBg lives in Menu.styles.ts — re-pushing it via `sx` flickers on every render.
         menuColor: colors.text[900],
+        focusRing: focusVisibleRing(colors),
     };
 };
 const BrandMenu = ({ size }) => {
     const { brand, setBrand } = useThemeMode();
-    const { mutedColor, menuColor } = useSwitcherColors();
+    const { mutedColor, menuColor, focusRing } = useSwitcherColors();
     const brands = Object.keys(brandThemes);
-    return (_jsxs(Menu, { children: [_jsx(MenuButton, { as: Button, size: SIZES[size].control, variant: "ghost", color: mutedColor, borderRadius: "full", fontWeight: 500, "aria-label": `Brand theme, current ${toBrandLabel(brand)}`, _focusVisible: { boxShadow: "outline" }, children: _jsxs(HStack, { spacing: 2, children: [_jsx(BrandSwatch, { brand: brand }), _jsx(Text, { as: "span", children: toBrandLabel(brand) })] }) }), _jsx(MenuList, { minW: "9rem", color: menuColor, children: _jsx(MenuOptionGroup, { title: "Brand", type: "radio", value: brand, onChange: (value) => setBrand(value), children: brands.map((option) => (_jsx(MenuItemOption, { value: option, children: _jsxs(HStack, { spacing: 2, children: [_jsx(BrandSwatch, { brand: option }), _jsx(Text, { as: "span", children: toBrandLabel(option) })] }) }, option))) }) })] }));
+    return (_jsxs(Menu, { children: [_jsx(MenuButton, { as: Button, size: SIZES[size].control, variant: "ghost", color: mutedColor, borderRadius: "full", fontWeight: 500, "aria-label": `Brand theme, current ${toBrandLabel(brand)}`, _focusVisible: focusRing, children: _jsxs(HStack, { spacing: 2, children: [_jsx(BrandSwatch, { brand: brand }), _jsx(Text, { as: "span", children: toBrandLabel(brand) })] }) }), _jsx(MenuList, { minW: "9rem", color: menuColor, children: _jsx(MenuOptionGroup, { title: "Brand", type: "radio", value: brand, onChange: (value) => setBrand(value), children: brands.map((option) => (_jsx(MenuItemOption, { value: option, children: _jsxs(HStack, { spacing: 2, children: [_jsx(BrandSwatch, { brand: option }), _jsx(Text, { as: "span", children: toBrandLabel(option) })] }) }, option))) }) })] }));
 };
 const IconVariant = ({ size, label, }) => {
     const { resolvedMode, toggle } = useThemeMode();
-    const { mutedColor, hoverBg } = useSwitcherColors();
+    const { mutedColor, hoverBg, focusRing } = useSwitcherColors();
     const isDark = resolvedMode === "dark";
     const Icon = isDark ? Moon : Sun;
     const accessibleLabel = label !== null && label !== void 0 ? label : `Switch to ${isDark ? "light" : "dark"} mode`;
-    return (_jsx(Tooltip, { label: accessibleLabel, openDelay: 400, children: _jsx(IconButton, { "aria-label": accessibleLabel, "aria-pressed": isDark, icon: _jsx(Icon, { size: SIZES[size].icon, "aria-hidden": true }), onClick: toggle, size: SIZES[size].control, variant: "ghost", color: mutedColor, borderRadius: "full", _hover: { bg: hoverBg }, _focusVisible: { boxShadow: "outline" } }) }));
+    return (_jsx(Tooltip, { label: accessibleLabel, openDelay: 400, children: _jsx(IconButton, { "aria-label": accessibleLabel, "aria-pressed": isDark, icon: _jsx(Icon, { size: SIZES[size].icon, "aria-hidden": true }), onClick: toggle, size: SIZES[size].control, variant: "ghost", color: mutedColor, borderRadius: "full", _hover: { bg: hoverBg }, _focusVisible: focusRing }) }));
 };
 const SegmentedVariant = ({ size, label, showBrandPicker, }) => {
     const { mode, setMode } = useThemeMode();
     const { trackBg, activeBg, activeColor, mutedColor, borderColor } = useSwitcherColors();
+    const { colors } = useCustomTheme();
+    // One tab stop, so the group wears the indicator: brand border plus the field bloom.
+    const focusBorder = liftToContrast(colors.primary[500], trackBg, AA_NON_TEXT);
+    const [showFocus, setShowFocus] = useState(false);
     const optionRefs = useRef([]);
     // APG radiogroup behavior: arrows move focus and selection together.
     const handleKeyDown = (event, index) => {
@@ -74,20 +74,20 @@ const SegmentedVariant = ({ size, label, showBrandPicker, }) => {
         setMode(MODE_OPTIONS[next].value);
         (_a = optionRefs.current[next]) === null || _a === void 0 ? void 0 : _a.focus();
     };
-    return (_jsxs(HStack, { role: "radiogroup", "aria-label": label !== null && label !== void 0 ? label : "Color mode", display: "inline-flex", spacing: 1, p: "0.25rem", bg: trackBg, border: "0.063rem solid", borderColor: borderColor, borderRadius: "full", children: [MODE_OPTIONS.map(({ value, label: optionLabel, Icon }, index) => {
+    return (_jsxs(HStack, { role: "radiogroup", "aria-label": label !== null && label !== void 0 ? label : "Color mode", display: "inline-flex", spacing: 1, p: "0.25rem", bg: trackBg, border: "0.063rem solid", borderColor: showFocus ? focusBorder : borderColor, boxShadow: showFocus ? focusGlowShadow(colors) : undefined, borderRadius: "full", onFocus: (event) => setShowFocus(event.target.matches(":focus-visible")), onBlur: () => setShowFocus(false), children: [MODE_OPTIONS.map(({ value, label: optionLabel, Icon }, index) => {
                 const isSelected = mode === value;
                 return (_jsx(Button, { ref: (node) => {
                         optionRefs.current[index] = node;
-                    }, role: "radio", "aria-checked": isSelected, "aria-label": optionLabel, onClick: () => setMode(value), onKeyDown: (event) => handleKeyDown(event, index), size: SIZES[size].control, variant: "ghost", borderRadius: "full", bg: isSelected ? activeBg : "transparent", color: isSelected ? activeColor : mutedColor, boxShadow: isSelected ? "sm" : "none", _hover: { color: activeColor }, _focusVisible: { boxShadow: "outline" }, children: _jsx(Icon, { size: SIZES[size].icon, "aria-hidden": true }) }, value));
+                    }, role: "radio", "aria-checked": isSelected, "aria-label": optionLabel, tabIndex: isSelected ? 0 : -1, onClick: () => setMode(value), onKeyDown: (event) => handleKeyDown(event, index), size: SIZES[size].control, variant: "ghost", borderRadius: "full", bg: isSelected ? activeBg : "transparent", color: isSelected ? activeColor : mutedColor, boxShadow: isSelected ? "sm" : "none", _hover: { color: activeColor }, _focusVisible: { outline: "2px solid transparent", outlineOffset: "2px" }, children: _jsx(Icon, { size: SIZES[size].icon, "aria-hidden": true }) }, value));
             }), showBrandPicker && _jsx(BrandMenu, { size: size })] }));
 };
 const MenuVariant = ({ size, label, showBrandPicker, }) => {
     var _a;
     const { mode, brand, setMode, setBrand } = useThemeMode();
-    const { mutedColor, hoverBg, menuColor } = useSwitcherColors();
+    const { mutedColor, hoverBg, menuColor, focusRing } = useSwitcherColors();
     const active = (_a = MODE_OPTIONS.find((option) => option.value === mode)) !== null && _a !== void 0 ? _a : MODE_OPTIONS[0];
     const brands = Object.keys(brandThemes);
-    return (_jsxs(Menu, { children: [_jsx(MenuButton, { as: IconButton, "aria-label": label !== null && label !== void 0 ? label : `Color mode, current ${active.label}`, icon: _jsx(active.Icon, { size: SIZES[size].icon, "aria-hidden": true }), size: SIZES[size].control, variant: "ghost", color: mutedColor, borderRadius: "full", _hover: { bg: hoverBg }, _focusVisible: { boxShadow: "outline" } }), _jsxs(MenuList, { minW: "10rem", color: menuColor, children: [_jsx(MenuOptionGroup, { title: "Appearance", type: "radio", value: mode, onChange: (value) => setMode(value), children: MODE_OPTIONS.map(({ value, label: optionLabel, Icon }) => (_jsx(MenuItemOption, { value: value, children: _jsxs(HStack, { spacing: 2, children: [_jsx(Icon, { size: SIZES[size].icon, "aria-hidden": true }), _jsx(Text, { as: "span", children: optionLabel })] }) }, value))) }), showBrandPicker && (_jsxs(_Fragment, { children: [_jsx(MenuDivider, {}), _jsx(MenuOptionGroup, { title: "Brand", type: "radio", value: brand, onChange: (value) => setBrand(value), children: brands.map((option) => (_jsx(MenuItemOption, { value: option, children: _jsxs(HStack, { spacing: 2, children: [_jsx(BrandSwatch, { brand: option }), _jsx(Text, { as: "span", children: toBrandLabel(option) })] }) }, option))) })] }))] })] }));
+    return (_jsxs(Menu, { children: [_jsx(MenuButton, { as: IconButton, "aria-label": label !== null && label !== void 0 ? label : `Color mode, current ${active.label}`, icon: _jsx(active.Icon, { size: SIZES[size].icon, "aria-hidden": true }), size: SIZES[size].control, variant: "ghost", color: mutedColor, borderRadius: "full", _hover: { bg: hoverBg }, _focusVisible: focusRing }), _jsxs(MenuList, { minW: "10rem", color: menuColor, children: [_jsx(MenuOptionGroup, { title: "Appearance", type: "radio", value: mode, onChange: (value) => setMode(value), children: MODE_OPTIONS.map(({ value, label: optionLabel, Icon }) => (_jsx(MenuItemOption, { value: value, children: _jsxs(HStack, { spacing: 2, children: [_jsx(Icon, { size: SIZES[size].icon, "aria-hidden": true }), _jsx(Text, { as: "span", children: optionLabel })] }) }, value))) }), showBrandPicker && (_jsxs(_Fragment, { children: [_jsx(MenuDivider, {}), _jsx(MenuOptionGroup, { title: "Brand", type: "radio", value: brand, onChange: (value) => setBrand(value), children: brands.map((option) => (_jsx(MenuItemOption, { value: option, children: _jsxs(HStack, { spacing: 2, children: [_jsx(BrandSwatch, { brand: option }), _jsx(Text, { as: "span", children: toBrandLabel(option) })] }) }, option))) })] }))] })] }));
 };
 export const ThemeSwitcher = ({ variant = "icon", showBrandPicker = false, size = "md", "aria-label": ariaLabel, }) => {
     if (variant === "segmented") {

package/dist/esm/Theme/provider/colorModeStorage.js

@@ -1,8 +1,5 @@
 const DARK_QUERY = "(prefers-color-scheme: dark)";
-/**
- * Stored values are untrusted input — a stale or hand-edited entry must never reach
- * `brandThemes[brand]` and hand Chakra an `undefined` theme.
- */
+// NOTE: stored values are untrusted — a stale/hand-edited entry must never reach brandThemes[brand] as undefined.
 const VALID_MODES = ["light", "dark", "system"];
 const VALID_BRANDS = [
     "lavender",

package/dist/esm/Theme/tokens/brands/emerald/palette.dark.js

@@ -1,8 +1,5 @@
 import { buildDarkPalette } from "../../builders/buildDarkPalette.js";
+import { lazyPalette } from "../../builders/lazy.js";
 import light from "./palette.light.js";
-/**
- * Dark palette for the emerald brand, derived from its own light palette so the brand hue
- * carries through. Override individual tokens here if this brand needs a bespoke dark value.
- */
-const palette = buildDarkPalette(light);
+const palette = lazyPalette(light, () => buildDarkPalette(light));
 export default palette;

package/dist/esm/Theme/tokens/brands/emerald/palette.light.js

@@ -18,10 +18,7 @@ const primary = {
 const palette = {
     ...neutralTokens,
     ...buildBrandInk(PRIMARY_500),
-    // Stops retuned so white gradient-button text (onGradient, accentText.ts) clears AA at both
-    // ends — the original pair let white drop to 3.38/2.43 against from/to. Same hue, darker.
-    // Both nudged one step further (4.537/4.515 -> 4.618/4.616): the first pass cleared AA by
-    // <0.02, too thin a margin to trust against rounding/rendering variance.
+    // NOTE: stops retuned so white gradient-button text clears AA at both ends — original let it drop to 3.38/2.43.
     gradient: { from: "#0d8474", to: "#048096" }, // teal → cyan
     primary,
     // 🌫️ Neutral gray (slightly cool to match teal)
@@ -31,12 +28,7 @@ const palette = {
         200: "#dce5e5",
         300: "#c3d2d2",
         400: "#9fb3b3",
-        // Retuned to clear AA with a safe >=4.6 margin (not the bare 4.5 cutoff — a value that
-        // clears AA by <0.02 is treated as failing, see Wave D QA follow-up) against every
-        // backgroundColor surface it's actually rendered on (main/secondary/light/subtle —
-        // verified via usage grep). muted/accent/tertiary/etc. have 0-1 live call sites today and
-        // none pair them with gray[500] text; going dark enough to also clear those would push
-        // past gray[600]'s own lightness and break the ramp order.
+        // NOTE: retuned to clear AA with a safe >=4.6 margin (not the bare 4.5 cutoff) against live backgroundColor surfaces.
         500: "#617474",
         600: "#5e7070",
         700: "#475555",

package/dist/esm/Theme/tokens/brands/index.js

@@ -22,22 +22,46 @@ import { withSidebarTokens } from "../builders/sidebarAccent.js";
 import { buildMutedText } from "../builders/mutedText.js";
 import { buildSemanticText, buildOnSemantic } from "../builders/semanticText.js";
 import { withPlaceholderRung, withTableHoverRung } from "../builders/resolvedRungs.js";
+import { buildFocusRing, withFocusRing } from "../builders/focusRing.js";
 import { withSurfaceRungs } from "../builders/surfaceRungs.js";
+import { buildSurfaceRaised, withSurfaceRaised } from "../builders/surfaceRaised.js";
+import { buildStar } from "../builders/star.js";
+import { lazyPalette } from "../builders/lazy.js";
+import { contrastRatio, mix } from "../builders/color.js";
+export const LIGHT_CANVAS_STEP = 1.09;
+const CANVAS_MIX_STEP = 0.0025;
+const CANVAS_MIX_MAX = 0.5;
+const lightCanvas = (canvas, card, ink) => {
+    for (let weight = 0; weight < CANVAS_MIX_MAX; weight += CANVAS_MIX_STEP) {
+        const next = mix(canvas, ink, weight);
+        if (contrastRatio(next, card) >= LIGHT_CANVAS_STEP)
+            return next;
+    }
+    return mix(canvas, ink, CANVAS_MIX_MAX);
+};
 /** Derived, never hand-written: a copied hex goes stale the moment a canvas moves. */
 export const finalizeLightPalette = (source) => ({
     ...source,
+    backgroundColor: {
+        ...source.backgroundColor,
+        base: lightCanvas(source.backgroundColor.base, source.background[50], source.text[900]),
+    },
     sidebar: withSidebarTokens(source),
     accentText: pickAccentText(source.primary, source.backgroundColor.main),
     textMuted: buildMutedText(source.text, source.backgroundColor.main),
     semanticText: buildSemanticText(source.semantic, source.backgroundColor.main),
     onPrimary: onFilled(source.primary[500], source.white, source.black),
     onSemantic: buildOnSemantic(source.semantic, source.white, source.black),
+    focusRing: buildFocusRing(source),
+    surfaceRaised: buildSurfaceRaised(source),
+    star: buildStar(source.backgroundColor.main),
 });
 export { lavender, meadow, radiant, skyline, slate, emerald, rosewood, storefront, zinc };
 export { lavenderDark, meadowDark, radiantDark, skylineDark, slateDark, emeraldDark, rosewoodDark, storefrontDark, zincDark, };
-const resolveRungs = (palette) => withSurfaceRungs(withTableHoverRung(withPlaceholderRung(withOutlineRung(palette))));
-const lightBrand = (source) => resolveRungs(finalizeLightPalette(source));
-/** Light palette per brand. `lavender` is the base the other six extend. */
+// NOTE: withFocusRing is outermost — it must see primary and surfaces together, after every earlier step.
+const resolveRungs = (palette) => withFocusRing(withSurfaceRungs(withSurfaceRaised(withTableHoverRung(withPlaceholderRung(withOutlineRung(palette))))));
+const lightBrand = (source) => lazyPalette(source, () => resolveRungs(finalizeLightPalette(source)));
+/** Light palette per brand, derived on first read. `lavender` is the base the other eight extend. */
 export const lightPalettes = {
     lavender: lightBrand(lavender),
     meadow: lightBrand(meadow),
@@ -49,18 +73,18 @@ export const lightPalettes = {
     storefront: lightBrand(storefront),
     zinc: lightBrand(zinc),
 };
-/** Dark palette per brand, derived from the matching light palette. */
-const darkBrand = (dark) => resolveRungs(dark);
+/** Dark palette per brand, derived from the matching light palette on first read. */
+const darkBrand = (source, dark) => lazyPalette(source, () => resolveRungs(dark));
 export const darkPalettes = {
-    lavender: darkBrand(lavenderDark),
-    meadow: darkBrand(meadowDark),
-    radiant: darkBrand(radiantDark),
-    skyline: darkBrand(skylineDark),
-    slate: darkBrand(slateDark),
-    emerald: darkBrand(emeraldDark),
-    rosewood: darkBrand(rosewoodDark),
-    storefront: darkBrand(storefrontDark),
-    zinc: darkBrand(zincDark),
+    lavender: darkBrand(lavender, lavenderDark),
+    meadow: darkBrand(meadow, meadowDark),
+    radiant: darkBrand(radiant, radiantDark),
+    skyline: darkBrand(skyline, skylineDark),
+    slate: darkBrand(slate, slateDark),
+    emerald: darkBrand(emerald, emeraldDark),
+    rosewood: darkBrand(rosewood, rosewoodDark),
+    storefront: darkBrand(storefront, storefrontDark),
+    zinc: darkBrand(zinc, zincDark),
 };
 // Built from lightPalettes/darkPalettes (not the raw literals) so accentText can never be
 // present on one map and missing on the other.

package/dist/esm/Theme/tokens/brands/lavender/palette.dark.js

@@ -1,8 +1,5 @@
 import { buildDarkPalette } from "../../builders/buildDarkPalette.js";
+import { lazyPalette } from "../../builders/lazy.js";
 import light from "./palette.light.js";
-/**
- * Dark palette for the lavender brand, derived from its own light palette so the brand hue
- * carries through. Override individual tokens here if this brand needs a bespoke dark value.
- */
-const palette = buildDarkPalette(light);
+const palette = lazyPalette(light, () => buildDarkPalette(light));
 export default palette;

package/dist/esm/Theme/tokens/brands/lavender/palette.light.js

@@ -1,4 +1,5 @@
 import { buildPrimaryOpacity, buildPrimaryShadowTint } from "../../builders/buildBrandTokens.js";
+import { rotateScaleHue } from "../../builders/brandInk.js";
 import { neutralTokens, sharedBoxShadow } from "../neutrals.js";
 const PRIMARY_500 = "#8B3FC8";
 const SECONDARY_ANCHOR = "#1e0f30";
@@ -28,19 +29,14 @@ const secondary = {
     900: "#08030b",
     opacity: buildPrimaryOpacity(SECONDARY_ANCHOR),
 };
-const tertiary = { ...secondary };
+const tertiary = { ...rotateScaleHue(secondary), opacity: secondary.opacity };
 const gray = {
     50: "#f9f7fb",
     100: "#f0eaf6",
     200: "#e4d9f0",
     300: "#cdbde3",
     400: "#a897cc",
-    // Retuned to clear AA with a safe >=4.6 margin (not the bare 4.5 cutoff — a value that
-    // clears AA by <0.02 is treated as failing, see Wave D QA follow-up) against every
-    // backgroundColor surface it's actually rendered on (main/secondary/light/subtle —
-    // verified via usage grep). muted/accent/tertiary/etc. have 0-1 live call sites today and
-    // none pair them with gray[500] text; going dark enough to also clear those would push
-    // past gray[600]'s own lightness and break the ramp order.
+    // NOTE: retuned to clear AA with a safe >=4.6 margin (not the bare 4.5 cutoff) against live backgroundColor surfaces.
     500: "#746499",
     600: "#5e527a",
     700: "#4a4060",
@@ -142,12 +138,7 @@ const boxborder = {
     800: "#6d6879",
     900: "#52505b",
 };
-/**
- * The low rungs sat two steps too pale to draw anything: `200` — the default hairline for
- * cards, dividers and inputs — was L94 against a L98 canvas, so a card had no visible edge.
- * It now lands at L88, contrast 1.22 against a white card, matching Chakra's gray.200 hairline.
- * Rungs 700+ are unchanged; they were never the problem.
- */
+// NOTE: 200 lifted to L88 (was L94, invisible against an L98 canvas) — matches Chakra's gray.200 hairline.
 const border = {
     50: "#f6f4f9",
     100: "#ede9f4",

package/dist/esm/Theme/tokens/brands/meadow/palette.dark.js

@@ -1,8 +1,5 @@
 import { buildDarkPalette } from "../../builders/buildDarkPalette.js";
+import { lazyPalette } from "../../builders/lazy.js";
 import light from "./palette.light.js";
-/**
- * Dark palette for the meadow brand, derived from its own light palette so the brand hue
- * carries through. Override individual tokens here if this brand needs a bespoke dark value.
- */
-const palette = buildDarkPalette(light);
+const palette = lazyPalette(light, () => buildDarkPalette(light));
 export default palette;

package/dist/esm/Theme/tokens/brands/meadow/palette.light.js

@@ -18,25 +18,16 @@ const primary = {
 const palette = {
     ...neutralTokens,
     ...buildBrandInk(PRIMARY_500),
-    // `to` stop retuned so white gradient-button text (onGradient, accentText.ts) clears AA — the
-    // original let white drop to 2.49 there (`from` already passed at 6.39, unchanged).
-    // Nudged one step further (4.519 -> 4.627): the first pass cleared AA by <0.02, too thin a
-    // margin to trust against rounding/rendering variance.
+    // NOTE: `to` stop retuned so white gradient-button text clears AA — original let it drop to 2.49.
     gradient: { from: "#2d6a4f", to: "#0f8376" }, // forest green → teal
     primary,
-    tertiary: { ...primary },
     gray: {
         50: "#f6f9f7",
         100: "#ecf1ee",
         200: "#dce5e0",
         300: "#c4d2cb",
         400: "#93a99f",
-        // Retuned to clear AA with a safe >=4.6 margin (not the bare 4.5 cutoff — a value that
-        // clears AA by <0.02 is treated as failing, see Wave D QA follow-up) against every
-        // backgroundColor surface it's actually rendered on (main/secondary/light/subtle —
-        // verified via usage grep). muted/accent/tertiary/etc. have 0-1 live call sites today and
-        // none pair them with gray[500] text; going dark enough to also clear those would push
-        // past gray[600]'s own lightness and break the ramp order.
+        // NOTE: retuned to clear AA with a safe >=4.6 margin (not the bare 4.5 cutoff) against live backgroundColor surfaces.
         500: "#5c7369",
         600: "#445f52",
         700: "#344a3f",

package/dist/esm/Theme/tokens/brands/radiant/palette.dark.js

@@ -1,8 +1,5 @@
 import { buildDarkPalette } from "../../builders/buildDarkPalette.js";
+import { lazyPalette } from "../../builders/lazy.js";
 import light from "./palette.light.js";
-/**
- * Dark palette for the radiant brand, derived from its own light palette so the brand hue
- * carries through. Override individual tokens here if this brand needs a bespoke dark value.
- */
-const palette = buildDarkPalette(light);
+const palette = lazyPalette(light, () => buildDarkPalette(light));
 export default palette;