@astryxdesign/core 0.4.3 → 0.4.4-canary.0f4d45f

package/src/Tooltip/useTooltip.tsx

@@ -28,6 +28,7 @@ import {
 } from '../Layer/useLayer';
 import {layerAnimations} from '../Layer/layerAnimations.stylex';
 import {themeProps} from '../utils/themeProps';
+import {isImeKeyEvent} from '../utils/ime';
 import {
   colorVars,
   radiusVars,
@@ -454,7 +455,9 @@ export function useTooltip(options: TooltipOptions = {}): TooltipReturn {
       if (e.key !== 'Escape') {
         return;
       }
-      if (e.isComposing || e.keyCode === 229) {
+      if (isImeKeyEvent(e)) {
+        // Ignore Escape that is committing/cancelling an IME composition;
+        // see utils/ime.ts for why.
         return;
       }
       clearTimeouts();

package/src/Typeahead/BaseTypeahead.tsx

@@ -30,7 +30,7 @@ import * as stylex from '@stylexjs/stylex';
 import type {StyleXStyles} from '@stylexjs/stylex';
 import {usePopover} from '../Popover/usePopover';
 import {useAnnounce} from '../hooks/useAnnounce';
-import {isImeKeyEvent} from '../hooks/useFocusTrap';
+import {isImeKeyEvent} from '../utils/ime';
 import {TypeaheadItem} from './TypeaheadItem';
 import {Icon} from '../Icon';
 import {
@@ -449,7 +449,7 @@ export const BaseTypeahead = function BaseTypeahead<T extends SearchableItem>({
           announce(
             shown.length === 0
               ? emptySearchResultsText
-              : `${shown.length} ${shown.length === 1 ? 'result' : 'results'}`,
+              : t('@astryx.typeahead.resultCount', {count: shown.length}),
           );
         }
       } catch {
@@ -464,7 +464,14 @@ export const BaseTypeahead = function BaseTypeahead<T extends SearchableItem>({
         }
       }
     },
-    [searchSource, maxMenuItems, showLayer, announce, emptySearchResultsText],
+    [
+      searchSource,
+      maxMenuItems,
+      showLayer,
+      announce,
+      emptySearchResultsText,
+      t,
+    ],
   );
 
   // Perform bootstrap

package/src/Typeahead/Typeahead.test.tsx

@@ -23,6 +23,7 @@ import userEvent from '@testing-library/user-event';
 import {Typeahead} from './Typeahead';
 import {BaseTypeahead} from './BaseTypeahead';
 import type {SearchSource, SearchableItem} from './types';
+import {InternationalizationProvider} from '../i18n';
 
 // Store original matches to restore later
 const originalMatches = HTMLElement.prototype.matches;
@@ -132,21 +133,94 @@ describe('BaseTypeahead', () => {
 
   it('announces the result count to a live region (comboboxes-6)', async () => {
     render(
-      <BaseTypeahead
-        searchSource={fruitSource}
-        value={null}
-        onChange={() => {}}
-        debounceMs={0}
-      />,
+      <InternationalizationProvider
+        locale="fr"
+        overrides={{
+          fr: {
+            '@astryx.typeahead.resultCount':
+              '{count, number} {count, plural, one {résultat} other {résultats}}',
+          },
+        }}>
+        <BaseTypeahead
+          searchSource={fruitSource}
+          value={null}
+          onChange={() => {}}
+          debounceMs={0}
+        />
+      </InternationalizationProvider>,
     );
     const input = screen.getByRole('combobox');
+    // "Ap" matches Apple only — the singular ICU branch.
     fireEvent.change(input, {target: {value: 'Ap'}});
 
     await waitFor(() => {
       const region = document.querySelector(
         '[data-astryx-live-region="polite"]',
       );
-      expect(region?.textContent).toMatch(/\d+ results?/);
+      // Exact, so the plural branch ("1 résultats") would fail.
+      expect(region?.textContent).toBe('1 résultat');
+    });
+  });
+
+  it('announces the plural result count', async () => {
+    render(
+      <InternationalizationProvider
+        locale="fr"
+        overrides={{
+          fr: {
+            '@astryx.typeahead.resultCount':
+              '{count, number} {count, plural, one {résultat} other {résultats}}',
+          },
+        }}>
+        <BaseTypeahead
+          searchSource={fruitSource}
+          value={null}
+          onChange={() => {}}
+          debounceMs={0}
+        />
+      </InternationalizationProvider>,
+    );
+    const input = screen.getByRole('combobox');
+    // "err" matches Cherry and Elderberry.
+    fireEvent.change(input, {target: {value: 'err'}});
+
+    await waitFor(() => {
+      const region = document.querySelector(
+        '[data-astryx-live-region="polite"]',
+      );
+      expect(region?.textContent).toBe('2 résultats');
+    });
+  });
+
+  it('speaks the result count from a provider catalog', async () => {
+    render(
+      <InternationalizationProvider
+        locale="fr"
+        messages={{
+          fr: {
+            '@astryx.typeahead.resultCount': {
+              defaultMessage:
+                '{count, number} {count, plural, one {résultat} other {résultats}}',
+            },
+          },
+        }}>
+        <BaseTypeahead
+          searchSource={fruitSource}
+          value={null}
+          onChange={() => {}}
+          debounceMs={0}
+        />
+      </InternationalizationProvider>,
+    );
+    const input = screen.getByRole('combobox');
+    fireEvent.change(input, {target: {value: 'err'}});
+
+    await waitFor(() => {
+      const region = document.querySelector(
+        '[data-astryx-live-region="polite"]',
+      );
+      // Same key through the catalog path rather than `overrides`.
+      expect(region?.textContent).toBe('2 résultats');
     });
   });
 
@@ -796,6 +870,41 @@ describe('Typeahead edit mode', () => {
     // onChange should not have been called — value restored
     expect(onChange).not.toHaveBeenCalled();
   });
+
+  it('does not exit edit mode on a composing Escape (IME)', async () => {
+    const onChange = vi.fn();
+    render(
+      <Typeahead
+        label="Fruit"
+        searchSource={fruitSource}
+        value={fruits[0]}
+        onChange={onChange}
+      />,
+    );
+
+    // Enter edit mode by clicking the token; the input uncollapses and
+    // rejoins the Tab order (tabindex is cleared).
+    const tokenText = screen.getByText(fruits[0].label);
+    fireEvent.click(tokenText.closest('div')!);
+    await act(async () => {
+      await new Promise(r => requestAnimationFrame(r));
+    });
+    const input = screen.getByRole('combobox');
+    expect(input).not.toHaveAttribute('tabindex', '-1');
+
+    // BaseTypeahead invokes this external handler before its own IME guard, so
+    // a composing Escape (isComposing / legacy keyCode 229) — which an IME uses
+    // to cancel the pending candidate — must not exit edit mode here.
+    fireEvent.keyDown(input, {key: 'Escape', isComposing: true});
+    expect(screen.getByRole('combobox')).not.toHaveAttribute('tabindex', '-1');
+    fireEvent.keyDown(input, {key: 'Escape', keyCode: 229});
+    expect(screen.getByRole('combobox')).not.toHaveAttribute('tabindex', '-1');
+
+    // A real, non-composing Escape still exits edit mode: the token is
+    // restored and the collapsed input drops back out of the Tab order.
+    fireEvent.keyDown(input, {key: 'Escape'});
+    expect(screen.getByRole('combobox')).toHaveAttribute('tabindex', '-1');
+  });
 });
 
 describe('Typeahead collapsed input tab order', () => {

package/src/Typeahead/Typeahead.tsx

@@ -45,7 +45,7 @@ import {VisuallyHidden} from '../VisuallyHidden';
 import {spacingVars, sizeVars} from '../theme/tokens.stylex';
 import {groupStyles} from '../InputGroup/groupStyles';
 import {useInputGroup} from '../InputGroup/InputGroupContext';
-import {getInputARIA, mergeProps, mergeRefs} from '../utils';
+import {getInputARIA, isImeKeyEvent, mergeProps, mergeRefs} from '../utils';
 import type {BaseProps} from '../BaseProps';
 import type {SizeValue} from '../utils/types';
 import type {SearchableItem, SearchSource} from './types';
@@ -369,6 +369,15 @@ export function Typeahead<T extends SearchableItem>({
   // Handle Escape during edit mode — restore token
   const handleKeyDown = useCallback(
     (e: React.KeyboardEvent<HTMLInputElement>) => {
+      // BaseTypeahead invokes this external handler *before* its own IME
+      // guard, so we must guard here too: an IME candidate window uses Escape
+      // to cancel the pending composition, and that composing Escape fires
+      // before compositionend. Without this, a Korean/Japanese/Chinese user
+      // cancelling a candidate would instead exit edit mode and blur the
+      // field. See utils/ime.ts.
+      if (isImeKeyEvent(e.nativeEvent)) {
+        return;
+      }
       if (e.key === 'Escape' && editingValue) {
         e.preventDefault();
         setIsEditing(false);

package/src/__tests__/stubMatchMedia.test.ts

@@ -0,0 +1,79 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file stubMatchMedia.test.ts
+ * @input Uses vitest, stubMatchMedia
+ * @output Unit coverage for the shared query-aware matchMedia stub
+ * @position Testing; guards the helper other suites trust to route queries
+ *
+ * The helper exists because a stub that ignores its query silently reroutes
+ * code branching on a different one — the failure mode leaves every test
+ * green. A helper sold on that promise has to be held to it, so these assert
+ * the routing itself rather than any component behaviour.
+ */
+
+import {describe, it, expect, afterEach, vi} from 'vitest';
+import {stubMatchMedia} from './stubMatchMedia';
+
+afterEach(() => {
+  vi.unstubAllGlobals();
+});
+
+describe('stubMatchMedia', () => {
+  it('routes prefers-reduced-motion independently of every other query', () => {
+    // The exact combination the blanket stub could not express: below a
+    // breakpoint (matches) while motion is NOT reduced.
+    stubMatchMedia({reduceMotion: false, matches: true});
+
+    expect(matchMedia('(prefers-reduced-motion: reduce)').matches).toBe(false);
+    expect(matchMedia('(max-width: 768px)').matches).toBe(true);
+  });
+
+  it('answers no-preference as the opposite of reduce', () => {
+    // Two spellings, opposite meanings. A substring test on
+    // 'prefers-reduced-motion' alone would hand both the same answer.
+    stubMatchMedia({reduceMotion: true});
+
+    expect(matchMedia('(prefers-reduced-motion: reduce)').matches).toBe(true);
+    expect(matchMedia('(prefers-reduced-motion: no-preference)').matches).toBe(
+      false,
+    );
+  });
+
+  it('treats the bare preference query as reduce', () => {
+    stubMatchMedia({reduceMotion: true});
+    expect(matchMedia('(prefers-reduced-motion)').matches).toBe(true);
+
+    stubMatchMedia({reduceMotion: false});
+    expect(matchMedia('(prefers-reduced-motion)').matches).toBe(false);
+  });
+
+  it('defaults to full motion and matching everything else', () => {
+    stubMatchMedia();
+
+    expect(matchMedia('(prefers-reduced-motion: reduce)').matches).toBe(false);
+    expect(matchMedia('(max-width: 768px)').matches).toBe(true);
+  });
+
+  it('lets a non-motion query be answered false', () => {
+    // Above the breakpoint, motion still reduced — the other axis of the
+    // combination, so neither knob can be quietly driving both.
+    stubMatchMedia({reduceMotion: true, matches: false});
+
+    expect(matchMedia('(prefers-reduced-motion: reduce)').matches).toBe(true);
+    expect(matchMedia('(max-width: 768px)').matches).toBe(false);
+  });
+
+  it('echoes the query and exposes the listener API components subscribe to', () => {
+    stubMatchMedia();
+    const mql = matchMedia('(max-width: 768px)');
+
+    // useMediaQuery subscribes; a stub without these throws on mount rather
+    // than failing an assertion, which reads as an unrelated crash.
+    expect(mql.media).toBe('(max-width: 768px)');
+    expect(typeof mql.addEventListener).toBe('function');
+    expect(typeof mql.removeEventListener).toBe('function');
+    expect(typeof mql.addListener).toBe('function');
+    expect(typeof mql.removeListener).toBe('function');
+  });
+});

package/src/__tests__/stubMatchMedia.ts

@@ -0,0 +1,95 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file stubMatchMedia.ts
+ * @input Uses vitest
+ * @output stubMatchMedia — a query-aware window.matchMedia stub
+ * @position Shared test helper; imported by component tests that render below
+ *   a breakpoint while also exercising motion-sensitive behaviour
+ *
+ * jsdom has no matchMedia, so tests stub it. The usual stub answers every query
+ * with one boolean:
+ *
+ *   vi.stubGlobal('matchMedia', vi.fn().mockReturnValue({matches: true, ...}))
+ *
+ * That is enough to put AppShell below its breakpoint — and it silently also
+ * matches `prefers-reduced-motion`, rerouting any code that branches on motion.
+ * MobileNav's close delay is capped at 0 under reduced motion, so a suite using
+ * the blanket stub runs against an immediate close while its test names claim
+ * it is exercising the real delay. The failure mode is invisible: every test
+ * still passes.
+ *
+ * So the two answers are separate knobs here. `reduceMotion` answers
+ * `prefers-reduced-motion` only; `matches` answers everything else (breakpoint
+ * width queries, which tests below a breakpoint want to be true).
+ *
+ * SYNC: When modified, update this header.
+ */
+
+import {vi} from 'vitest';
+
+export interface StubMatchMediaOptions {
+  /** Whether the user prefers reduced motion. */
+  reduceMotion?: boolean;
+  /** Answer for every other query — width breakpoints, hover, etc. */
+  matches?: boolean;
+}
+
+/**
+ * Answer a `prefers-reduced-motion` query, or null if it isn't one.
+ *
+ * The preference has two spellings and they are opposites, so a single
+ * `includes('prefers-reduced-motion')` would answer `no-preference` with the
+ * value meant for `reduce` — the same answer-without-reading mistake this
+ * helper exists to prevent. Core only queries `reduce` today (MobileNav,
+ * Carousel); handling both is what keeps that true if one changes.
+ */
+function answerReducedMotion(
+  query: string,
+  reduceMotion: boolean,
+): boolean | null {
+  if (query.includes('prefers-reduced-motion: reduce')) {
+    return reduceMotion;
+  }
+  if (query.includes('prefers-reduced-motion: no-preference')) {
+    return !reduceMotion;
+  }
+  // Bare `(prefers-reduced-motion)` is true for any value other than
+  // no-preference, i.e. the same as `reduce`.
+  if (query.includes('prefers-reduced-motion')) {
+    return reduceMotion;
+  }
+  return null;
+}
+
+/**
+ * Install a `window.matchMedia` stub whose answer depends on the query.
+ *
+ * Call from `beforeEach` (or inside a test that needs different motion
+ * settings) and pair with `vi.unstubAllGlobals()` in `afterEach`.
+ *
+ * @example
+ * ```
+ * beforeEach(() => {
+ *   stubMatchMedia({reduceMotion: false});
+ * });
+ * ```
+ */
+export function stubMatchMedia({
+  reduceMotion = false,
+  matches = true,
+}: StubMatchMediaOptions = {}): void {
+  vi.stubGlobal(
+    'matchMedia',
+    vi.fn((query: string) => ({
+      matches: answerReducedMotion(query, reduceMotion) ?? matches,
+      media: query,
+      onchange: null,
+      addEventListener: vi.fn(),
+      removeEventListener: vi.fn(),
+      addListener: vi.fn(),
+      removeListener: vi.fn(),
+      dispatchEvent: vi.fn(),
+    })),
+  );
+}

package/src/hooks/index.ts

@@ -11,13 +11,17 @@
  * SYNC: When modified, update this header
  */
 
-export {
-  hasActiveFocusTrapEscape,
-  isImeKeyEvent,
-  useFocusTrap,
-} from './useFocusTrap';
+export {hasActiveFocusTrapEscape, useFocusTrap} from './useFocusTrap';
 export type {UseFocusTrapOptions, UseFocusTrapReturn} from './useFocusTrap';
 
+/**
+ * @deprecated Import from `@astryxdesign/core/utils` instead — this is a pure
+ * predicate, not a hook, and the `hooks` barrel is a `'use client'` boundary.
+ * Re-exported here for one release so consumers can move; will be removed in
+ * an upcoming major.
+ */
+export {isImeKeyEvent} from '../utils/ime';
+
 export {useAnnounce} from './useAnnounce';
 export type {AnnounceFn, AnnouncePoliteness} from './useAnnounce';
 

package/src/hooks/useFocusTrap.ts

@@ -19,6 +19,7 @@
 import {useCallback, useEffect, useRef} from 'react';
 
 import {FOCUSABLE_SELECTOR} from './focusableSelector';
+import {isImeKeyEvent} from '../utils/ime';
 
 /**
  * Module-level stack of active focus-trap Escape handlers.
@@ -94,20 +95,6 @@ export function hasActiveFocusTrapEscape(): boolean {
   return escapeStack.length > 0;
 }
 
-/**
- * Whether an Escape keydown should be ignored because it is cancelling an
- * in-progress IME composition. CJK/IME users press Escape to cancel
- * composition; that must not close the surrounding overlay. `keyCode === 229`
- * covers browsers that fire keydown before `isComposing` is set. Exported so
- * other overlays (Dialog, Drawer, CommandPalette) share one definition.
- */
-export function isImeKeyEvent(event: {
-  isComposing?: boolean;
-  keyCode?: number;
-}): boolean {
-  return event.isComposing === true || event.keyCode === 229;
-}
-
 /**
  * Whether an element is currently perceivable/focusable — excludes ones hidden
  * via `display:none`/`visibility:hidden` or inside an `inert`/`hidden` subtree,

package/src/hooks/useInputStatusIcon.test.tsx

@@ -159,6 +159,25 @@ describe('useInputStatusIcon — no dangling aria-describedby (WCAG 1.3.1)', ()
     ).not.toBeInTheDocument();
     expectNoDanglingDescribedBy(container);
   });
+
+  it('keeps the tooltip status button interactive inside a non-interactive trailing slot', () => {
+    // TextArea positions its trailing slot as an absolute overlay with
+    // `pointer-events: none` (correct for the decorative spinner/icon it was
+    // built for). The focusable status button owns its own interactivity so
+    // hover still opens the tooltip there — keyboard focus always worked, the
+    // pointer path did not until the button set `pointer-events: auto`.
+    render(
+      <TextArea
+        label="Field"
+        value=""
+        onChange={() => {}}
+        status={{type: 'error', message: 'Message'}}
+        statusVariant="tooltip"
+      />,
+    );
+    const statusButton = screen.getByRole('button', {name: 'Error details'});
+    expect(statusButton).toHaveStyle({pointerEvents: 'auto'});
+  });
 });
 
 describe('useInputStatusIcon — input-status-icon theme target', () => {

package/src/hooks/useInputStatusIcon.tsx

@@ -82,6 +82,13 @@ const styles = stylex.create({
     background: 'none',
     color: 'inherit',
     cursor: 'pointer',
+    // Own the interactivity so the tooltip opens on hover even when the field
+    // renders this affordance inside a non-interactive trailing slot. TextArea
+    // positions its end slot as an absolute overlay with `pointer-events: none`
+    // (right for the decorative spinner/icon it was built for), which otherwise
+    // swallows this button's hover — keyboard focus still worked, pointer did
+    // not.
+    pointerEvents: 'auto',
     borderRadius: radiusVars['--radius-full'],
     // Not the shared offset: this button sits inside the field, and measured at
     // the standard 3px its ring crosses the field border.

package/src/index.ts

@@ -22,6 +22,7 @@ export * from './AvatarGroup';
 export * from './Badge';
 export * from './Banner';
 export * from './Blockquote';
+export * from './BottomSheet';
 export * from './Breadcrumbs';
 export * from './Button';
 export * from './ButtonGroup';

package/src/theme/defineTheme.ts

@@ -248,20 +248,38 @@ export interface DefineThemeInput {
    */
   radius?: RadiusScaleConfig;
   /**
-   * Color scale configuration. Generates color token overrides from a
-   * single accent color using the HCT perceptual color model.
+   * Color scale configuration. Generates color token overrides from an
+   * accent seed using the HCT perceptual color model.
    *
    * Only generates tokens derivable from the accent — status colors,
    * categorical hues, and fixed tokens (on-dark/on-light) use defaults.
-   * Explicit `tokens` entries always take precedence.
+   *
+   * `accent` accepts a single hex (same seed for both color schemes) or a
+   * `[light, dark]` tuple, matching `TokenValue`. With a tuple, the light
+   * scheme's full palette derives from the light seed and the dark
+   * scheme's from the dark seed.
    *
    * `accent` is optional — omit it for a neutral-only theme, which keeps
    * the default accent tokens and only themes the neutrals.
    *
+   * Precedence vs `tokens`: explicit `tokens` entries win over generated
+   * values, token by token. Because `--color-accent-muted`,
+   * `--color-text-accent` and `--color-icon-accent` are generated as
+   * `var(--color-accent)` references, a `tokens['--color-accent']`
+   * override re-points them at runtime. `--color-on-accent` does NOT
+   * follow: it is baked from the `color.accent` seed (a contrast
+   * computation CSS cannot express), so overriding the accent through
+   * `tokens` without also overriding `--color-on-accent` leaves the two
+   * out of sync. To re-seat the whole palette per scheme, prefer a tuple
+   * `color.accent` over the `tokens['--color-accent']` workaround.
+   *
    * @example
-   * ```tsx
+   * ```
    * color: { accent: '#0064E0', neutralStyle: 'cool', contrast: 'standard' }
    *
+   * // Per-scheme accents — light palette from the first seed, dark from the second
+   * color: { accent: ['#0064E0', '#48CAE4'] }
+   *
    * // Neutral-only — accent tokens stay at their defaults
    * color: { neutralStyle: 'warm' }
    * ```