@astryxdesign/core 0.4.1 → 0.4.2-canary.356d2f9

package/dist/hooks/useMenuHover.js

@@ -4,26 +4,53 @@
 
 /**
  * @file useMenuHover.ts
- * @input Uses React hooks, useListFocus
+ * @input Uses React hooks, useListFocus, useMediaQuery
  * @output Exports useMenuHover hook
- * @position Internal hook; used by nav heading components and TopNavMenu
+ * @position Internal hook; used by nav heading components, TopNavMenu,
+ *           TopNavMegaMenu and DropdownMenuSubMenu
  *
- * Hover as a progressive enhancement on top of standard popover behavior:
+ * Hover as a progressive enhancement over standard popover behavior: click
+ * toggles, Escape and outside-click close, arrows navigate; on top of that,
+ * mouseenter opens after a delay and mouseleave closes one that hover opened.
  *
- * 1. Default popover: click toggles, Escape closes, outside-click closes,
- *    arrow keys navigate menu items.
+ * Three behaviors here are not obvious and are load-bearing:
  *
- * 2. Hover add-on:
- *    - mouseenter activates "hover mode" and opens after delay
- *    - While in hover mode, mouseleave closes after delay
- *    - Any close (click, Escape, outside-click) resets hover mode
- *    - Click-to-close additionally skips the next mouseenter
+ * 1. Hover→click guard (#3121). A hover-opened menu is already open under the
+ *    cursor when the pointer arrives, so the click that naturally follows would
+ *    toggle it shut. Within `clickGuardMs` a click instead confirms it: the menu
+ *    pins and behaves like a click-open from then on.
  *
- * Only uses mouseenter/mouseleave (not mouseover).
+ * 2. Focus moves synchronously. `useLayer.show()` calls `showPopover()` in the
+ *    same tick and the layer's children are always mounted, so items are
+ *    focusable the moment `show()` returns — a `requestAnimationFrame` here
+ *    lands after paint and races anything else moving focus. Hover-opens are the
+ *    exception: the pointer is driving, so focus stays on the trigger. The hook
+ *    always passes `skipAutoFocus` and owns focus itself, because the popover's
+ *    auto-focus targets the first *tabbable* node while a menu wants its first
+ *    item — under roving tabindex those are different elements.
+ *
+ * 3. Native light dismiss. A `popover="auto"` is dismissed by the browser on
+ *    pointer interaction outside the panel, and a trigger outside the panel
+ *    counts — before React's click handler runs. `popoverId` makes the trigger
+ *    the panel's invoker, which exempts it. jsdom implements neither light
+ *    dismiss nor invokers, so that wiring is only verifiable in a browser.
  */
 import { useCallback, useEffect, useRef } from 'react';
+import { useIsomorphicLayoutEffect } from "./useIsomorphicLayoutEffect.js";
 import { useListFocus } from "./useListFocus.js";
 import { useMediaQuery } from "./useMediaQuery.js";
+const DEFAULT_CLICK_GUARD_MS = 500;
+
+/**
+ * How long after a close a mouseenter on the trigger is ignored.
+ *
+ * A panel positioned over its own trigger puts that trigger back under a
+ * stationary pointer when it closes, and the browser fires a fresh mouseenter —
+ * which reopened the menu the user had just dismissed. Time-bounded rather than
+ * a one-shot flag, so a deliberate re-hover seconds later still opens; a real
+ * mouseleave clears it early.
+ */
+const REOPEN_SUPPRESS_MS = 300;
 export function useMenuHover(options) {
   const {
     show,
@@ -31,23 +58,35 @@ export function useMenuHover(options) {
     isOpen,
     isEnabled,
     showDelay = 150,
-    hideDelay = 200
+    hideDelay = 200,
+    clickGuardMs = DEFAULT_CLICK_GUARD_MS,
+    itemSelector,
+    popoverId,
+    ownsFocus = true
   } = options;
   const hasHover = useMediaQuery('(hover: hover)');
   const showTimerRef = useRef(null);
   const hideTimerRef = useRef(null);
   const triggerElRef = useRef(null);
-  // Whether the menu was opened/interacted via hover (enables mouseleave-to-close)
+  /** Menu was hover-opened, so mouseleave may close it. */
   const hoverModeRef = useRef(false);
-  // One-shot: skip the next mouseenter after click-to-close
-  const skipNextEnterRef = useRef(false);
+  const closedAtRef = useRef(0);
+  /** When the current open began as a hover-open; 0 once confirmed or closed. */
+  const hoverOpenedAtRef = useRef(0);
   const prevIsOpenRef = useRef(isOpen);
 
-  // When popover closes (any reason), reset hover mode
-  if (prevIsOpenRef.current && !isOpen) {
-    hoverModeRef.current = false;
-  }
-  prevIsOpenRef.current = isOpen;
+  // Catches every close, whatever caused it. A layout effect, not render: it
+  // must land before the browser hit-tests the vanished panel and fires the
+  // mouseenter REOPEN_SUPPRESS_MS exists to swallow.
+  useIsomorphicLayoutEffect(() => {
+    const wasOpen = prevIsOpenRef.current;
+    prevIsOpenRef.current = isOpen;
+    if (wasOpen && !isOpen) {
+      hoverModeRef.current = false;
+      hoverOpenedAtRef.current = 0;
+      closedAtRef.current = Date.now();
+    }
+  }, [isOpen]);
   const clearTimeouts = useCallback(() => {
     if (showTimerRef.current) {
       clearTimeout(showTimerRef.current);
@@ -58,59 +97,133 @@ export function useMenuHover(options) {
       hideTimerRef.current = null;
     }
   }, []);
+
+  // useListFocus needs an onEscape that is defined in terms of its own listRef;
+  // the indirection avoids the use-before-declare.
+  const escapeHandlerRef = useRef(() => {});
   const {
     listRef: menuRef,
     handleKeyDown: handleListKeyDown,
     focusFirst
   } = useListFocus({
-    onEscape: () => {
-      clearTimeouts();
-      hide();
-    }
+    itemSelector,
+    onEscape: () => escapeHandlerRef.current()
   });
+  const hideAndRestoreFocus = useCallback(() => {
+    // Read before hiding: closing the layer moves focus itself.
+    const menuHadFocus = menuRef.current?.contains(document.activeElement) ?? false;
+    hide();
+    if (menuHadFocus) {
+      triggerElRef.current?.focus();
+    }
+  }, [hide, menuRef]);
+  useEffect(() => {
+    escapeHandlerRef.current = () => {
+      clearTimeouts();
+      hideAndRestoreFocus();
+    };
+  }, [clearTimeouts, hideAndRestoreFocus]);
   useEffect(() => {
     return () => clearTimeouts();
   }, [clearTimeouts]);
-
-  // Click: always toggle
-  const handleClick = useCallback(() => {
-    clearTimeouts();
-    if (isOpen) {
-      skipNextEnterRef.current = true;
-      hide();
-    } else {
-      skipNextEnterRef.current = false;
+  const focusMenu = useCallback(() => {
+    // An empty or still-loading menu has no focusable item; focus the container
+    // so keyboard ownership still transfers off the trigger's list.
+    if (!focusFirst()) {
+      menuRef.current?.focus();
+    }
+  }, [focusFirst, menuRef]);
+  const openAndFocus = useCallback(() => {
+    if (!ownsFocus) {
       show();
-      requestAnimationFrame(() => focusFirst());
+      return;
     }
-  }, [isOpen, clearTimeouts, show, hide, focusFirst]);
+    show({
+      skipAutoFocus: true
+    });
+    focusMenu();
+  }, [ownsFocus, show, focusMenu]);
+  const confirmHoverOpen = useCallback(() => {
+    const isConfirming = clickGuardMs > 0 && hoverOpenedAtRef.current > 0 && Date.now() - hoverOpenedAtRef.current < clickGuardMs;
+    if (!isConfirming) {
+      return false;
+    }
+    hoverModeRef.current = false;
+    hoverOpenedAtRef.current = 0;
+    return true;
+  }, [clickGuardMs]);
+  const handleClick = useCallback(event => {
+    // Cancel the invoker's default toggle so this handler stays the single
+    // source of truth; popoverTarget still exempts the trigger from dismissal.
+    if (popoverId) {
+      event?.preventDefault();
+    }
+    clearTimeouts();
 
-  // Hover: mouseenter activates hover mode and opens
+    // Enter/Space arrive as a click with detail 0, and always open. A keyboard
+    // user reaches the trigger of an open menu only because a hover-open left
+    // focus behind; closing there would stranded them outside a visible menu.
+    const isKeyboardActivation = event != null && event.detail === 0;
+    if (isKeyboardActivation) {
+      closedAtRef.current = 0;
+      hoverModeRef.current = false;
+      hoverOpenedAtRef.current = 0;
+      if (isOpen) {
+        if (ownsFocus) {
+          focusMenu();
+        }
+      } else {
+        openAndFocus();
+      }
+      return;
+    }
+    if (!isOpen) {
+      closedAtRef.current = 0;
+      hoverModeRef.current = false;
+      hoverOpenedAtRef.current = 0;
+      openAndFocus();
+      return;
+    }
+    if (confirmHoverOpen()) {
+      if (ownsFocus) {
+        focusMenu();
+      }
+      return;
+    }
+    hideAndRestoreFocus();
+  }, [popoverId, clearTimeouts, isOpen, ownsFocus, confirmHoverOpen, openAndFocus, focusMenu, hideAndRestoreFocus]);
   const handleMouseEnter = useCallback(() => {
     if (!hasHover) {
       return;
     }
-    if (skipNextEnterRef.current) {
-      skipNextEnterRef.current = false;
+    if (closedAtRef.current > 0 && Date.now() - closedAtRef.current < REOPEN_SUPPRESS_MS) {
+      return;
+    }
+    // Re-entering an open menu's trigger must not un-pin it or re-arm the
+    // guard, which would make the next deliberate click another "confirm" and
+    // leave the menu undismissable.
+    if (isOpen) {
+      clearTimeouts();
       return;
     }
     hoverModeRef.current = true;
     clearTimeouts();
-    if (showDelay > 0) {
-      showTimerRef.current = setTimeout(() => {
-        show({
-          skipAutoFocus: true
-        });
-      }, showDelay);
-    } else {
+    const openByHover = () => {
+      hoverOpenedAtRef.current = Date.now();
       show({
         skipAutoFocus: true
       });
+    };
+    if (showDelay > 0) {
+      showTimerRef.current = setTimeout(openByHover, showDelay);
+    } else {
+      openByHover();
     }
-  }, [hasHover, clearTimeouts, show, showDelay]);
-
-  // Hover: mouseleave only closes if in hover mode
+  }, [hasHover, isOpen, clearTimeouts, show, showDelay]);
   const handleMouseLeave = useCallback(() => {
+    // A real leave ends the stationary-pointer case the suppression window
+    // exists for, so the next enter is deliberate whenever it arrives.
+    closedAtRef.current = 0;
     if (!hoverModeRef.current) {
       return;
     }
@@ -119,8 +232,6 @@ export function useMenuHover(options) {
       hide();
     }, hideDelay);
   }, [clearTimeouts, hide, hideDelay]);
-
-  // Content: mouseenter cancels pending hide
   const handleContentMouseEnter = useCallback(() => {
     clearTimeouts();
   }, [clearTimeouts]);
@@ -144,6 +255,9 @@ export function useMenuHover(options) {
       },
       menuRef,
       focusFirst,
+      focusMenu,
+      confirmHoverOpen,
+      close: hideAndRestoreFocus,
       setTriggerEl: noopRef
     };
   }
@@ -151,7 +265,10 @@ export function useMenuHover(options) {
     triggerProps: {
       onClick: handleClick,
       onMouseEnter: handleMouseEnter,
-      onMouseLeave: handleMouseLeave
+      onMouseLeave: handleMouseLeave,
+      ...(popoverId ? {
+        popoverTarget: popoverId
+      } : null)
     },
     contentProps: {
       onMouseEnter: handleContentMouseEnter,
@@ -160,6 +277,9 @@ export function useMenuHover(options) {
     },
     menuRef,
     focusFirst,
+    focusMenu,
+    confirmHoverOpen,
+    close: hideAndRestoreFocus,
     setTriggerEl: setTriggerRef
   };
 }

package/dist/theme/defineTheme.d.ts

@@ -26,19 +26,25 @@
  *   <App />
  * </Theme>
  * ```
+ *
+ * SYNC: `DefineThemeInput` is the theme surface. Adding, removing, or renaming
+ * a field means updating:
+ * - /packages/cli/assets/theme.template.ts (documents every field; the
+ *   drift guard is scripts/check-theme-template.test.mjs)
+ * - /packages/cli/assets/docs/theme.doc.mjs (`astryx docs theme`)
  */
 import type { IconRegistry } from '../Icon/globalIconRegistry';
 import type { IndicatorRegistry } from '../Indicator/types';
 import type { TypographyConfig } from './types';
 import { type OnMediaOverrides, type ResolvedOnMedia } from './onMediaTokens';
-import { colorDefaults, spacingDefaults, sizeDefaults, focusDefaults, radiusDefaults, shadowDefaults, durationDefaults, easeDefaults, typographyDefaults, textSizeDefaults, fontWeightDefaults, typeScaleDefaults } from './tokens.stylex';
+import { colorDefaults, spacingDefaults, sizeDefaults, borderDefaults, focusDefaults, radiusDefaults, shadowDefaults, durationDefaults, easeDefaults, typographyDefaults, textSizeDefaults, fontWeightDefaults, typeScaleDefaults } from './tokens.stylex';
 import { type MotionScaleConfig } from './expandMotionScale';
 import { type RadiusScaleConfig } from './expandRadiusScale';
 import { type ColorScaleConfig } from './expandColorScale';
 import type { DomainTokenName } from './domainTokens';
 import type { SyntaxThemeDefinition } from './syntax';
 /** All valid Astryx core token names */
-export type CoreTokenName = keyof typeof colorDefaults | keyof typeof spacingDefaults | keyof typeof sizeDefaults | keyof typeof focusDefaults | keyof typeof radiusDefaults | keyof typeof shadowDefaults | keyof typeof durationDefaults | keyof typeof easeDefaults | keyof typeof typographyDefaults | keyof typeof textSizeDefaults | keyof typeof fontWeightDefaults | keyof typeof typeScaleDefaults;
+export type CoreTokenName = keyof typeof colorDefaults | keyof typeof spacingDefaults | keyof typeof sizeDefaults | keyof typeof borderDefaults | keyof typeof focusDefaults | keyof typeof radiusDefaults | keyof typeof shadowDefaults | keyof typeof durationDefaults | keyof typeof easeDefaults | keyof typeof typographyDefaults | keyof typeof textSizeDefaults | keyof typeof fontWeightDefaults | keyof typeof typeScaleDefaults;
 /** All valid Astryx token names — core + domain tokens */
 export type TokenName = CoreTokenName | DomainTokenName;
 /**
@@ -106,9 +112,14 @@ export interface DefineThemeInput {
     /** Theme name — used for data-astryx-theme attribute and identification */
     name: string;
     /**
-     * Base theme to extend. When provided, the new theme starts with the
-     * base theme's tokens, components, and fonts, then applies overrides
-     * from this input on top. The base theme's values have lowest precedence.
+     * Base theme to extend. When provided, the new theme starts with everything
+     * the base resolved to — tokens, component overrides, icons, indicators, and
+     * its `onDark`/`onLight` surfaces — then applies this input on top. The base
+     * theme's values have lowest precedence.
+     *
+     * The result is flat: an extended theme carries its inheritance in its own
+     * resolved output, so `astryx theme build` emits one self-contained
+     * stylesheet and the base's CSS does not need to be loaded alongside it.
      *
      * Use this to create variant themes that customize only a few aspects
      * (e.g. icons, accent color) without re-specifying the full theme.

package/dist/theme/defineTheme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defineTheme.d.ts","sourceRoot":"","sources":["../../src/theme/defineTheme.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"defineTheme.d.ts","sourceRoot":"","sources":["../../src/theme/defineTheme.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAEH,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAC,gBAAgB,EAAa,MAAM,SAAS,CAAC;AAC1D,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,aAAa,EACb,eAAe,EACf,YAAY,EACZ,cAAc,EACd,aAAa,EACb,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EAAoB,KAAK,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAoB,KAAK,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAmB,KAAK,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAE3E,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;AAEpD,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,UAAU,CAAC;AAQpD,wCAAwC;AACxC,MAAM,MAAM,aAAa,GACrB,MAAM,OAAO,aAAa,GAC1B,MAAM,OAAO,eAAe,GAC5B,MAAM,OAAO,YAAY,GACzB,MAAM,OAAO,cAAc,GAC3B,MAAM,OAAO,aAAa,GAC1B,MAAM,OAAO,cAAc,GAC3B,MAAM,OAAO,cAAc,GAC3B,MAAM,OAAO,gBAAgB,GAC7B,MAAM,OAAO,YAAY,GACzB,MAAM,OAAO,kBAAkB,GAC/B,MAAM,OAAO,gBAAgB,GAC7B,MAAM,OAAO,kBAAkB,GAC/B,MAAM,OAAO,iBAAiB,CAAC;AAEnC,0DAA0D;AAC1D,MAAM,MAAM,SAAS,GAAG,aAAa,GAAG,eAAe,CAAC;AAExD;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AAEhE;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAE7E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;AAE/E,2BAA2B;AAC3B,MAAM,WAAW,gBAAgB;IAC/B,2EAA2E;IAC3E,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB;;;;;;;;;;;;;;;;;;OAkBG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B;;;;;;;;;;;;;;;OAeG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B;;;;;;;;;;;;;;;;;OAiBG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B;;;;;;;;;;;;;;;;;;OAkBG;IACH,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB;;4EAEwE;IACxE,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;IAChD;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,8DAA8D;IAC9D,KAAK,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAC9B;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B;;;;;;;;;;OAUG;IACH,MAAM,CAAC,EAAE,qBAAqB,CAAC;IAC/B;;;;;;;;;;;;;;;;;;OAkBG;IACH,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B;;;OAGG;IACH,OAAO,CAAC,EAAE,gBAAgB,CAAC;CAC5B;AAED,iDAAiD;AACjD,MAAM,WAAW,YAAY;IAC3B,iBAAiB;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,+DAA+D;IAC/D,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,gCAAgC;IAChC,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,oBAAoB;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAC9B,sEAAsE;IACtE,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,kEAAkE;IAClE,OAAO,CAAC,EAAE,IAAI,CAAC;IACf;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;IACpD;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B;;;OAGG;IACH,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B;AAMD,qFAAqF;AACrF,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAehD,CAAC;AAoEF;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,YAAY,CAyLjE;AAMD,OAAO,EACL,kBAAkB,EAClB,uBAAuB,EACvB,kBAAkB,EAClB,gBAAgB,EAChB,KAAK,eAAe,EACpB,KAAK,cAAc,GACpB,MAAM,sBAAsB,CAAC;AAM9B,2DAA2D;AAC3D,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,YAAY,CAQpE"}

package/dist/theme/defineTheme.js

@@ -28,16 +28,23 @@
  *   <App />
  * </Theme>
  * ```
+ *
+ * SYNC: `DefineThemeInput` is the theme surface. Adding, removing, or renaming
+ * a field means updating:
+ * - /packages/cli/assets/theme.template.ts (documents every field; the
+ *   drift guard is scripts/check-theme-template.test.mjs)
+ * - /packages/cli/assets/docs/theme.doc.mjs (`astryx docs theme`)
  */
 
 import { resolveOnMedia } from "./onMediaTokens.js";
-import { colorDefaults, spacingDefaults, sizeDefaults, focusDefaults, radiusDefaults, shadowDefaults, durationDefaults, easeDefaults, typographyDefaults, textSizeDefaults, fontWeightDefaults, typeScaleDefaults } from "./tokens.stylex.js";
+import { colorDefaults, spacingDefaults, sizeDefaults, borderDefaults, focusDefaults, radiusDefaults, shadowDefaults, durationDefaults, easeDefaults, typographyDefaults, textSizeDefaults, fontWeightDefaults, typeScaleDefaults } from "./tokens.stylex.js";
 import { expandTypeScale, generateTypeScaleComponents } from "./expandTypeScale.js";
 import { expandMotionScale } from "./expandMotionScale.js";
 import { expandRadiusScale } from "./expandRadiusScale.js";
 import { expandColorScale } from "./expandColorScale.js";
 import { domainTokenDefaults } from "./domainTokens/index.js";
 import { registerTheme } from "./themeRegistry.js";
+import { deepMergeComponents } from "./mergeComponents.js";
 
 // =============================================================================
 // Types
@@ -120,6 +127,7 @@ export const tokenDefaults = {
   ...colorDefaults,
   ...spacingDefaults,
   ...sizeDefaults,
+  ...borderDefaults,
   ...focusDefaults,
   ...radiusDefaults,
   ...shadowDefaults,
@@ -148,48 +156,6 @@ function resolveTokenValue(value) {
   return value;
 }
 
-/**
- * Deep-merge two component style maps.
- * Properties in `overrides` take precedence over `base`.
- * This allows typeScale-generated rules to be overridden by explicit components.
- */
-function deepMergeComponents(base, overrides) {
-  if (!base && !overrides) {
-    return undefined;
-  }
-  if (!base) {
-    return overrides;
-  }
-  if (!overrides) {
-    return base;
-  }
-  const result = {};
-
-  // Start with all base entries
-  for (const [component, rules] of Object.entries(base)) {
-    result[component] = {
-      ...rules
-    };
-  }
-
-  // Merge overrides on top
-  for (const [component, rules] of Object.entries(overrides)) {
-    if (!result[component]) {
-      result[component] = {
-        ...rules
-      };
-    } else {
-      for (const [key, styles] of Object.entries(rules)) {
-        result[component][key] = {
-          ...result[component][key],
-          ...styles
-        };
-      }
-    }
-  }
-  return result;
-}
-
 /**
  * Resolve a FontWeight name to a var() reference.
  * Named weights map to var(--font-weight-*); raw values pass through.
@@ -219,6 +185,24 @@ function buildFontFamily(family, fallbacks) {
   return quoted;
 }
 
+/**
+ * Describe a rejected `extends` value for the error message — enough to tell a
+ * missed import (`undefined`) from a module namespace or a plain object.
+ */
+function describeBadBase(value) {
+  if (value === undefined) {
+    return 'undefined';
+  }
+  if (value === null) {
+    return 'null';
+  }
+  if (typeof value !== 'object') {
+    return typeof value;
+  }
+  const keys = Object.keys(value);
+  return `an object with keys [${keys.slice(0, 4).join(', ')}${keys.length > 4 ? ', …' : ''}]`;
+}
+
 /**
  * Create an Astryx theme.
  *
@@ -232,7 +216,15 @@ function buildFontFamily(family, fallbacks) {
 export function defineTheme(input) {
   const tokens = {};
 
-  // 0. Pre-seed from base theme when `extends` is provided (lowest precedence)
+  // 0. Pre-seed from base theme when `extends` is provided (lowest precedence).
+  // A base that is not a theme is refused rather than ignored: `extends` used
+  // to inherit nothing when its value was undefined, which is what a named
+  // import silently resolving to the wrong module hands over, and the theme
+  // then built into a plausible-looking stylesheet missing everything it was
+  // supposed to inherit.
+  if ('extends' in input && !isDefinedTheme(input.extends)) {
+    throw new Error(`defineTheme("${input.name}"): \`extends\` must be a theme from defineTheme(), got ${describeBadBase(input.extends)}. ` + `Check that the import naming your base theme resolves to its source and exports that name — ` + `a generated \`<theme>.js\` artifact sitting next to the source exports \`<name>Theme\`, not the source's own export.`);
+  }
   const base = input.extends;
   if (base) {
     for (const [key, value] of Object.entries(base.tokens)) {
@@ -363,9 +355,10 @@ export function defineTheme(input) {
     components = deepMergeComponents(base.components, components);
   }
 
-  // 4. Resolve on-media token overrides (defaults + user overrides)
-  const __onDark = resolveOnMedia('dark', input.onDark);
-  const __onLight = resolveOnMedia('light', input.onLight);
+  // 4. Resolve on-media token overrides (base's resolved surface, then
+  // defaults, then this theme's own overrides)
+  const __onDark = resolveOnMedia('dark', input.onDark, base?.__onDark);
+  const __onLight = resolveOnMedia('light', input.onLight, base?.__onLight);
 
   // 5. Merge icons — input icons override base icons
   const icons = input.icons && base?.icons ? {
@@ -385,7 +378,10 @@ export function defineTheme(input) {
     components,
     icons,
     indicators,
-    __inputTokens: input.tokens,
+    __inputTokens: base?.__inputTokens || input.tokens ? {
+      ...base?.__inputTokens,
+      ...input.tokens
+    } : undefined,
     __onDark,
     __onLight
   };

package/dist/theme/derivedVarRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derivedVarRegistry.d.ts","sourceRoot":"","sources":["../../src/theme/derivedVarRegistry.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,WAAW,eAAe;IAC9B,2EAA2E;IAC3E,QAAQ,EAAE,MAAM,CAAC;IACjB,2EAA2E;IAC3E,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,iFAAiF;IACjF,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAsChE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,eAAe,EAAE,CAMnB"}
+{"version":3,"file":"derivedVarRegistry.d.ts","sourceRoot":"","sources":["../../src/theme/derivedVarRegistry.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,WAAW,eAAe;IAC9B,2EAA2E;IAC3E,QAAQ,EAAE,MAAM,CAAC;IACjB,2EAA2E;IAC3E,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,iFAAiF;IACjF,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CA0ChE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,eAAe,EAAE,CAMnB"}

package/dist/theme/derivedVarRegistry.js

@@ -55,6 +55,13 @@ export const derivedVarRegistry = {
     property: 'padding',
     expand: 'container'
   }],
+  'context-menu': [{
+    property: 'borderRadius',
+    vars: ['--_dropdown-menu-radius']
+  }, {
+    property: 'padding',
+    vars: ['--_dropdown-menu-padding']
+  }],
   'dropdown-menu': [{
     property: 'borderRadius',
     vars: ['--_dropdown-menu-radius']

package/dist/theme/expandColorScale.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expandColorScale.d.ts","sourceRoot":"","sources":["../../src/theme/expandColorScale.ts"],"names":[],"mappings":"AAuCA;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAE3C;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC;CAChC;AAED,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAyCtD;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,EACZ,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,MAAM,CAYR;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAoI3E"}
+{"version":3,"file":"expandColorScale.d.ts","sourceRoot":"","sources":["../../src/theme/expandColorScale.ts"],"names":[],"mappings":"AAwCA;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAE3C;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC;CAChC;AAED,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAyCtD;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,EACZ,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,MAAM,CAYR;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAoI3E"}

package/dist/theme/expandColorScale.js

@@ -28,6 +28,7 @@
  *
  * SYNC: When modified, update:
  * - /packages/core/src/theme/defineTheme.ts
+ * - /packages/cli/assets/theme.template.ts (the annotated field reference)
  */
 
 import { contrastRatio } from "./contrast.js";

package/dist/theme/expandMotionScale.d.ts

@@ -16,6 +16,7 @@
  * SYNC: When modified, update:
  * - /packages/core/src/theme/expandMotionScale.test.ts
  * - /packages/core/src/theme/defineTheme.ts
+ * - /packages/cli/assets/theme.template.ts (the annotated field reference)
  */
 /**
  * Motion scale configuration.

package/dist/theme/expandMotionScale.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expandMotionScale.d.ts","sourceRoot":"","sources":["../../src/theme/expandMotionScale.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;GAkBG;AAMH;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,WAAW,iBAAiB;IAChC,4EAA4E;IAC5E,IAAI,EAAE,MAAM,CAAC;IACb,gFAAgF;IAChF,MAAM,EAAE,MAAM,CAAC;IACf,8EAA8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IACd,0DAA0D;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qDAAqD;AACrD,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAavD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,iBAAiB,GACxB,iBAAiB,CA0BnB"}
+{"version":3,"file":"expandMotionScale.d.ts","sourceRoot":"","sources":["../../src/theme/expandMotionScale.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;GAmBG;AAMH;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,WAAW,iBAAiB;IAChC,4EAA4E;IAC5E,IAAI,EAAE,MAAM,CAAC;IACb,gFAAgF;IAChF,MAAM,EAAE,MAAM,CAAC;IACf,8EAA8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IACd,0DAA0D;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qDAAqD;AACrD,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAavD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,iBAAiB,GACxB,iBAAiB,CA0BnB"}

package/dist/theme/expandMotionScale.js

@@ -18,6 +18,7 @@
  * SYNC: When modified, update:
  * - /packages/core/src/theme/expandMotionScale.test.ts
  * - /packages/core/src/theme/defineTheme.ts
+ * - /packages/cli/assets/theme.template.ts (the annotated field reference)
  */
 
 // =============================================================================

package/dist/theme/expandRadiusScale.d.ts

@@ -20,6 +20,7 @@
  * SYNC: When modified, update:
  * - /packages/core/src/theme/expandRadiusScale.test.ts
  * - /packages/core/src/theme/defineTheme.ts
+ * - /packages/cli/assets/theme.template.ts (the annotated field reference)
  */
 /**
  * Radius scale configuration.

package/dist/theme/expandRadiusScale.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expandRadiusScale.d.ts","sourceRoot":"","sources":["../../src/theme/expandRadiusScale.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAMH;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,iBAAiB;IAChC,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,yFAAyF;IACzF,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAMvD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,iBAAiB,GACxB,iBAAiB,CAanB"}
+{"version":3,"file":"expandRadiusScale.d.ts","sourceRoot":"","sources":["../../src/theme/expandRadiusScale.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAMH;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,iBAAiB;IAChC,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,yFAAyF;IACzF,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAMvD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,iBAAiB,GACxB,iBAAiB,CAanB"}

package/dist/theme/expandRadiusScale.js

@@ -22,6 +22,7 @@
  * SYNC: When modified, update:
  * - /packages/core/src/theme/expandRadiusScale.test.ts
  * - /packages/core/src/theme/defineTheme.ts
+ * - /packages/cli/assets/theme.template.ts (the annotated field reference)
  */
 
 // =============================================================================

package/dist/theme/expandTypeScale.d.ts

@@ -42,6 +42,7 @@
  * SYNC: When modified, update:
  * - /packages/core/src/theme/expandTypeScale.test.ts
  * - /packages/core/src/theme/defineTheme.ts
+ * - /packages/cli/assets/theme.template.ts (the annotated field reference)
  */
 /** Font weight value — either a CSS string or a var() reference. */
 export type FontWeightValue = string;

package/dist/theme/expandTypeScale.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expandTypeScale.d.ts","sourceRoot":"","sources":["../../src/theme/expandTypeScale.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AAMH,oEAAoE;AACpE,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC;AAErC;;;;GAIG;AACH,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAC1C,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,eAAe,CAAC,CAC/C,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,GAAG,OAAO,CACvC,MAAM,CACF,MAAM,GACN,OAAO,GACP,OAAO,GACP,MAAM,GACN,YAAY,GACZ,WAAW,GACX,WAAW,GACX,WAAW,GACX,CAAC,MAAM,GAAG,EAAE,CAAC,EACf,eAAe,CAChB,CACF,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,WAAW,eAAe;IAC9B,0DAA0D;IAC1D,IAAI,EAAE,MAAM,CAAC;IACb,mDAAmD;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,6DAA6D;IAC7D,OAAO,CAAC,EAAE;QACR,yEAAyE;QACzE,OAAO,CAAC,EAAE,sBAAsB,CAAC;QACjC,oEAAoE;QACpE,IAAI,CAAC,EAAE,mBAAmB,CAAC;KAC5B,CAAC;CACH;AAED;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAwIrD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe,CA+CxE;AAiBD;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,eAAe,GACvB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAmDxD"}
+{"version":3,"file":"expandTypeScale.d.ts","sourceRoot":"","sources":["../../src/theme/expandTypeScale.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAMH,oEAAoE;AACpE,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC;AAErC;;;;GAIG;AACH,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAC1C,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,eAAe,CAAC,CAC/C,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,GAAG,OAAO,CACvC,MAAM,CACF,MAAM,GACN,OAAO,GACP,OAAO,GACP,MAAM,GACN,YAAY,GACZ,WAAW,GACX,WAAW,GACX,WAAW,GACX,CAAC,MAAM,GAAG,EAAE,CAAC,EACf,eAAe,CAChB,CACF,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,WAAW,eAAe;IAC9B,0DAA0D;IAC1D,IAAI,EAAE,MAAM,CAAC;IACb,mDAAmD;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,6DAA6D;IAC7D,OAAO,CAAC,EAAE;QACR,yEAAyE;QACzE,OAAO,CAAC,EAAE,sBAAsB,CAAC;QACjC,oEAAoE;QACpE,IAAI,CAAC,EAAE,mBAAmB,CAAC;KAC5B,CAAC;CACH;AAED;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAwIrD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe,CA+CxE;AAiBD;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,eAAe,GACvB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAmDxD"}

package/dist/theme/expandTypeScale.js

@@ -44,6 +44,7 @@
  * SYNC: When modified, update:
  * - /packages/core/src/theme/expandTypeScale.test.ts
  * - /packages/core/src/theme/defineTheme.ts
+ * - /packages/cli/assets/theme.template.ts (the annotated field reference)
  */
 
 // =============================================================================