@astryxdesign/core 0.3.0 → 0.4.0

package/dist/CheckboxInput/CheckboxInput.js

@@ -15,20 +15,21 @@
  * - /apps/storybook/stories/CheckboxInput.stories.tsx (storybook stories)
  * - /packages/cli/assets/templates/blocks/components/CheckboxInput/ (showcase blocks)
  */
-import { useId, useCallback, use, useOptimistic, useTransition } from 'react';
+import { useId, useCallback, use, useOptimistic, useRef, useTransition } from 'react';
 import * as stylex from '@stylexjs/stylex';
 import "../theme/tokens.stylex.js";
-import { colorVars, spacingVars, radiusVars, durationVars, easeVars, typographyVars, typeScaleVars, fontWeightVars, borderVars } from "../theme/tokens.stylex.js";
+import { colorVars, spacingVars, typographyVars, typeScaleVars, fontWeightVars } from "../theme/tokens.stylex.js";
 import { FieldLabel } from "../Field/FieldLabel.js";
 import { FieldStatus } from "../FieldStatus/FieldStatus.js";
 import { Spinner } from "../Spinner/index.js";
 import { useTooltip } from "../Tooltip/index.js";
 import { mergeProps, mergeRefs } from "../utils/index.js";
-import "./checkbox.markers.stylex.js";
-import { checkboxScope } from "./checkbox.markers.stylex.js";
+import { indicatorScope } from "../Indicator/indicator.markers.stylex.js";
+import { useIndicatorFocusRing } from "../hooks/useIndicatorFocusRing.js";
+import { useIndicator } from "../Indicator/index.js";
 import { themeProps } from "../utils/themeProps.js";
 import { CheckboxListContext } from "../CheckboxList/CheckboxListContext.js";
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const styles = {
   container: {
     k1xSpc: "x78zum5",
@@ -61,63 +62,6 @@ const styles = {
   inputDisabled: {
     kkrTdU: "x1h6gzvc",
     $$css: true
-  },
-  checkbox: {
-    k1xSpc: "x78zum5",
-    kGNEyG: "x6s0dn4",
-    kjj79g: "xl56j7k",
-    kMzoRj: "x1litavf",
-    ksu8eU: "x1y0btm7",
-    kaIpWk: "xx3sua9",
-    k1ekBW: "xts7igz",
-    kIyJzY: "xuedmi6 x12w9bfk",
-    kAMwcw: "xlr8y92",
-    $$css: true
-  },
-  checkboxFocus: {
-    kI3sdo: "x1a2a7pz xkri23q",
-    kInvED: "x81n7kt",
-    $$css: true
-  },
-  checkboxUnchecked: {
-    kMwMTN: "xqwr325",
-    kVAM5u: "xvy26l8 x1jtjlen",
-    kWkggS: "x10xzikg xrsv7h",
-    $$css: true
-  },
-  checkboxChecked: {
-    kMwMTN: "x17wrial",
-    kVAM5u: "xad5do x1od6ugu",
-    kWkggS: "x1ewilqj x6aeo4j",
-    $$css: true
-  },
-  checkboxDisabled: {
-    kSiTet: "xbyyjgo",
-    kVAM5u: "x14i3s5s xmt8yqp",
-    $$css: true
-  },
-  checkboxDisabledUnchecked: {
-    kWkggS: "xwmxj5m x1cjfj8k",
-    $$css: true
-  },
-  checkmark: {
-    k1xSpc: "x1s85apg",
-    kMwMTN: "x17wrial xs5hli",
-    $$css: true
-  },
-  checkmarkVisible: {
-    k1xSpc: "x1lliihq",
-    $$css: true
-  },
-  indeterminateMark: {
-    k1xSpc: "x1s85apg",
-    kWkggS: "x1azo05 xwvh9j7",
-    kaIpWk: "xjspbzw",
-    $$css: true
-  },
-  indeterminateMarkVisible: {
-    k1xSpc: "x1lliihq",
-    $$css: true
   }
 };
 const wrapperSizeStyles = {
@@ -132,42 +76,6 @@ const wrapperSizeStyles = {
     $$css: true
   }
 };
-const checkboxSizeStyles = {
-  sm: {
-    kzqmXN: "xw4jnvo",
-    kZKoxP: "x1qx5ct2",
-    $$css: true
-  },
-  md: {
-    kzqmXN: "xvy4d1p",
-    kZKoxP: "xxk0z11",
-    $$css: true
-  }
-};
-const checkmarkSizeStyles = {
-  sm: {
-    kzqmXN: "xsmyaan",
-    kZKoxP: "x1kpxq89",
-    $$css: true
-  },
-  md: {
-    kzqmXN: "x6jxa94",
-    kZKoxP: "x1v9usgg",
-    $$css: true
-  }
-};
-const indeterminateSizeStyles = {
-  sm: {
-    kzqmXN: "x1fsd2vl",
-    kZKoxP: "x36qwtl",
-    $$css: true
-  },
-  md: {
-    kzqmXN: "xsmyaan",
-    kZKoxP: "x36qwtl",
-    $$css: true
-  }
-};
 // Dynamic field width (number -> px, string used as-is).
 const dynamicWidthStyles = {
   width: width => [{
@@ -248,9 +156,19 @@ export function CheckboxInput({
     focusTrigger: 'always',
     isEnabled: showsDisabledMessage
   });
+
+  // The checkbox visual is an indicator: a theme can restyle it through the
+  // `checkbox` target or replace the component outright.
+  const CheckboxControl = useIndicator('checkbox');
+  // The ring is drawn on the indicator itself: the native input is
+  // `opacity: 0`, and only the indicator's own element can shape the outline
+  // to match it. See useIndicatorFocusRing.
+  const indicatorRef = useRef(null);
+  const {
+    focusProps
+  } = useIndicatorFocusRing(indicatorRef, isDisabled);
   const isIndeterminate = optimisticValue === 'indeterminate';
   const isChecked = optimisticValue === true;
-  const isCheckedOrIndeterminate = isChecked || isIndeterminate;
 
   // Sync the native indeterminate DOM property (can't be set via JSX
   // attribute). On a native checkbox this is the authoritative way to expose
@@ -291,9 +209,13 @@ export function CheckboxInput({
         // unconditionally is safe.
         disabledMessageTooltip.interactionRef(el);
       },
-      ...stylex.props(styles.container, isLabelHidden && styles.containerLabelHidden, !isDisabled && checkboxScope),
+      ...stylex.props(styles.container, isLabelHidden && styles.containerLabelHidden,
+      // Hover and focus reach the checkbox visual through this ancestor
+      // marker rather than props, so the whole row drives it.
+      !isDisabled && indicatorScope),
       children: [/*#__PURE__*/_jsxs("div", {
         ...stylex.props(styles.checkboxWrapper, wrapperSizeStyles[size]),
+        ...focusProps,
         children: [/*#__PURE__*/_jsx("input", {
           ...rest,
           ref: mergeRefs(ref, indeterminateRef, disabledMessageTooltip.positionRef),
@@ -311,6 +233,7 @@ export function CheckboxInput({
           ,
           disabled: isDisabled && !isFocusableDisabled,
           "aria-disabled": isFocusableDisabled ? 'true' : undefined,
+          form: isFocusableDisabled ? '' : undefined,
           readOnly: isReadOnly,
           required: isRequired,
           onChange: e => {
@@ -333,31 +256,19 @@ export function CheckboxInput({
           "aria-invalid": status?.type === 'error' ? true : undefined,
           "aria-busy": isBusy || undefined,
           ...stylex.props(styles.input, wrapperSizeStyles[size], isDisabled && styles.inputDisabled)
-        }), /*#__PURE__*/_jsx("div", {
-          "aria-hidden": "true",
-          ...mergeProps(themeProps('checkbox', {
-            size,
-            checked: isChecked ? 'checked' : isIndeterminate ? 'indeterminate' : null,
-            disabled: isDisabled ? 'disabled' : null
-          }), stylex.props(styles.checkbox, checkboxSizeStyles[size], !isDisabled && styles.checkboxFocus, isCheckedOrIndeterminate ? styles.checkboxChecked : styles.checkboxUnchecked, isDisabled && styles.checkboxDisabled, isDisabled && !isCheckedOrIndeterminate && styles.checkboxDisabledUnchecked)),
-          children: isBusy ? /*#__PURE__*/_jsx(Spinner, {
-            size: "sm",
-            shade: "inherit"
-          }) : /*#__PURE__*/_jsxs(_Fragment, {
-            children: [/*#__PURE__*/_jsx("svg", {
-              viewBox: "0 0 10 10",
-              ...stylex.props(styles.checkmark, checkmarkSizeStyles[size], isChecked && styles.checkmarkVisible),
-              children: /*#__PURE__*/_jsx("path", {
-                d: "M8.5 2.5L4 7.5L1.5 5",
-                stroke: "currentColor",
-                strokeWidth: "1.5",
-                fill: "none",
-                strokeLinecap: "round",
-                strokeLinejoin: "round"
-              })
-            }), /*#__PURE__*/_jsx("div", {
-              ...stylex.props(styles.indeterminateMark, indeterminateSizeStyles[size], isIndeterminate && styles.indeterminateMarkVisible)
-            })]
+        }), /*#__PURE__*/_jsx("span", {
+          ref: indicatorRef,
+          ...{
+            className: "xjp7ctv"
+          },
+          children: /*#__PURE__*/_jsx(CheckboxControl, {
+            state: isIndeterminate ? 'indeterminate' : isChecked ? 'checked' : 'unchecked',
+            size: size,
+            isDisabled: isDisabled,
+            children: isBusy ? /*#__PURE__*/_jsx(Spinner, {
+              size: "sm",
+              shade: "inherit"
+            }) : null
           })
         })]
       }), /*#__PURE__*/_jsx("div", {

package/dist/ClickableCard/ClickableCard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClickableCard.d.ts","sourceRoot":"","sources":["../../src/ClickableCard/ClickableCard.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,EAAC,KAAK,SAAS,EAAE,KAAK,UAAU,EAAU,KAAK,GAAG,EAAC,MAAM,OAAO,CAAC;AASxE,OAAO,KAAK,EAAC,SAAS,EAAE,WAAW,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAGtE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AAE9C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAmG5C,MAAM,WAAW,kBAAmB,SAAQ,SAAS;IACnD,yCAAyC;IACzC,GAAG,CAAC,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;IAE1B;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IAEnD;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;OAGG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC;IAEtB;;;OAGG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC;IAEtB;;;;OAIG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB,yBAAyB;IACzB,KAAK,CAAC,EAAE,SAAS,CAAC;IAElB,0BAA0B;IAC1B,MAAM,CAAC,EAAE,SAAS,CAAC;IAEnB,iCAAiC;IACjC,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAMD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,aAAa,CAAC,EAC5B,KAAK,EACL,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,aAAa,EACxB,IAAI,EACJ,MAAM,EACN,UAAkB,EAClB,QAAQ,EACR,OAAO,EACP,OAAmB,EACnB,SAAkB,EAClB,KAAK,EACL,MAAM,EACN,QAAQ,EACR,GAAG,EACH,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,aAAa,EACxB,KAAK,EACL,GAAG,KAAK,EACT,EAAE,kBAAkB,+BA+EpB;yBAlGe,aAAa"}
+{"version":3,"file":"ClickableCard.d.ts","sourceRoot":"","sources":["../../src/ClickableCard/ClickableCard.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,EAAC,KAAK,SAAS,EAAE,KAAK,UAAU,EAAU,KAAK,GAAG,EAAC,MAAM,OAAO,CAAC;AASxE,OAAO,KAAK,EAAC,SAAS,EAAE,WAAW,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAGtE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AAE9C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AA6F5C,MAAM,WAAW,kBAAmB,SAAQ,SAAS;IACnD,yCAAyC;IACzC,GAAG,CAAC,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;IAE1B;;;;;OAKG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IAEnD;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;OAGG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC;IAEtB;;;OAGG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC;IAEtB;;;;OAIG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB,yBAAyB;IACzB,KAAK,CAAC,EAAE,SAAS,CAAC;IAElB,0BAA0B;IAC1B,MAAM,CAAC,EAAE,SAAS,CAAC;IAEnB,iCAAiC;IACjC,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB;AAMD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,aAAa,CAAC,EAC5B,KAAK,EACL,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,aAAa,EACxB,IAAI,EACJ,MAAM,EACN,UAAkB,EAClB,QAAQ,EACR,OAAO,EACP,OAAmB,EACnB,SAAkB,EAClB,KAAK,EACL,MAAM,EACN,QAAQ,EACR,GAAG,EACH,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,aAAa,EACxB,KAAK,EACL,GAAG,KAAK,EACT,EAAE,kBAAkB,+BAgFpB;yBAnGe,aAAa"}

package/dist/ClickableCard/ClickableCard.js

@@ -37,6 +37,7 @@ import { Card } from "../Card/Card.js";
 import { useClickableContainer } from "../hooks/useClickableContainer.js";
 import { useLinkComponent } from "../Link/useLinkComponent.js";
 import { themeProps } from "../utils/themeProps.js";
+import { focusOutlineProps } from "../utils/focusOutline.stylex.js";
 
 // =============================================================================
 // Styles — only the interactive layer, Card handles everything else
@@ -48,12 +49,6 @@ const styles = {
     kkrTdU: "x1ypdohk",
     kybGjl: "x1hl2dhg",
     kMwMTN: "x1heor9g",
-    kInvED: "x1hl8ikr",
-    $$css: true
-  },
-  focusWithin: {
-    kRYL1X: "x1irc7jg",
-    koJ47v: "xdjuwb3",
     $$css: true
   },
   overlay: {
@@ -192,11 +187,8 @@ export function ClickableCard({
     elevation: elevation,
     ...mergeProps(themeProps('clickable-card', {
       variant
-    }), {
-      className: classNameProp,
-      style
-    }),
-    xstyle: [styles.interactive, styles.focusWithin, hasBorder ? styles.bordered : styles.borderless, !isDisabled && styles.overlay, !isDisabled && styles.hoverOnPointer, !isDisabled && hasBorder && styles.borderedHoverOnPointer, isDisabled && styles.disabled, xstyleProp],
+    }), focusOutlineProps.focusWithin(), classNameProp, style),
+    xstyle: [styles.interactive, hasBorder ? styles.bordered : styles.borderless, !isDisabled && styles.overlay, !isDisabled && styles.hoverOnPointer, !isDisabled && hasBorder && styles.borderedHoverOnPointer, isDisabled && styles.disabled, xstyleProp],
     onClick: !isDisabled ? onClick : undefined,
     onMouseUp: !isDisabled ? handleMouseUp : undefined,
     ...props,

package/dist/CodeBlock/CodeBlock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CodeBlock.d.ts","sourceRoot":"","sources":["../../src/CodeBlock/CodeBlock.tsx"],"names":[],"mappings":"AAoBA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AA2B5C,OAAO,EAAc,KAAK,qBAAqB,EAAC,MAAM,iBAAiB,CAAC;AAuXxE,MAAM,WAAW,cAAe,SAAQ,SAAS,CAAC,cAAc,CAAC;IAC/D,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACnB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;;;;OAQG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,CAAC,EAAE,CACV,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,KACb;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAC,EAAE,CAAC;IAClD,aAAa,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC5C;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,qBAAqB,CAAC;CACrC;AAqPD;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,EACxB,IAAI,EACJ,QAAsB,EACtB,KAAK,EACL,gBAAuB,EACvB,cAAsB,EACtB,cAAc,EACd,aAAoB,EACpB,MAAM,EACN,SAAiB,EACjB,SAAS,EACT,aAAqB,EACrB,oBAAyB,EACzB,IAAW,EACX,KAAK,EAAE,SAAyB,EAChC,SAAkB,EAClB,SAAS,EAAE,eAAe,EAC1B,aAAsB,EACtB,WAAW,EACX,MAAM,EACN,SAAS,EACT,KAAK,EACL,GAAG,EACH,GAAG,KAAK,EACT,EAAE,cAAc,qBAuOhB;yBA/Pe,SAAS"}
+{"version":3,"file":"CodeBlock.d.ts","sourceRoot":"","sources":["../../src/CodeBlock/CodeBlock.tsx"],"names":[],"mappings":"AAoBA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AA6B5C,OAAO,EAAc,KAAK,qBAAqB,EAAC,MAAM,iBAAiB,CAAC;AAwWxE,MAAM,WAAW,cAAe,SAAQ,SAAS,CAAC,cAAc,CAAC;IAC/D,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;IACnB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;;;;OAQG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,CAAC,EAAE,CACV,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,KACb;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAC,EAAE,CAAC;IAClD,aAAa,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC5C;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,qBAAqB,CAAC;CACrC;AAqPD;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,EACxB,IAAI,EACJ,QAAsB,EACtB,KAAK,EACL,gBAAuB,EACvB,cAAsB,EACtB,cAAc,EACd,aAAoB,EACpB,MAAM,EACN,SAAiB,EACjB,SAAS,EACT,aAAqB,EACrB,oBAAyB,EACzB,IAAW,EACX,KAAK,EAAE,SAAyB,EAChC,SAAkB,EAClB,SAAS,EAAE,eAAe,EAC1B,aAAsB,EACtB,WAAW,EACX,MAAM,EACN,SAAS,EACT,KAAK,EACL,GAAG,EACH,GAAG,KAAK,EACT,EAAE,cAAc,qBA6NhB;yBArPe,SAAS"}

package/dist/CodeBlock/CodeBlock.js

@@ -14,12 +14,14 @@ import * as stylex from '@stylexjs/stylex';
 import "../theme/tokens.stylex.js";
 import { colorVars, spacingVars, radiusVars, typographyVars, fontWeightVars, typeScaleVars, borderVars, durationVars, easeVars } from "../theme/tokens.stylex.js";
 import { mergeProps } from "../utils/index.js";
-import { useAnnounce } from "../hooks/useAnnounce.js";
+import { useClipboard } from "../hooks/useClipboard.js";
 import { Icon } from "../Icon/index.js";
+import { IconButton } from "../IconButton/index.js";
 import { tokenize, tokenizeAsync, flatTokensToLines, SYNC_TOKENIZE_THRESHOLD } from "./tokenizer.js";
 import { ensureHighlightStyles } from "./highlightStyles.js";
 import { applyHighlightRangesChunked } from "./highlightRanges.js";
 import { themeProps } from "../utils/themeProps.js";
+import { focusOutlineProps } from "../utils/focusOutline.stylex.js";
 import { useTranslator } from "../i18n/index.js";
 import { SyntaxTheme } from "../theme/syntax/index.js";
 
@@ -80,6 +82,33 @@ const styles = {
     kVQacm: "xb3r6kr",
     $$css: true
   },
+  header: {
+    k1xSpc: "x78zum5",
+    kGNEyG: "x6s0dn4",
+    kUk6DE: "x98rzlu",
+    k7Eaqz: "xeuugli",
+    kmVPX3: "x1717udv",
+    kWkggS: "xjbqb8w",
+    kMwMTN: "x1heor9g",
+    kVVagm: "xln7xf2",
+    k9WMMc: "x1yc453h",
+    $$css: true
+  },
+  collapseChevronIcon: {
+    k1ekBW: "x11xpdln",
+    kIyJzY: "xuedmi6",
+    kAMwcw: "xlr8y92",
+    $$css: true
+  },
+  collapseChevronExpanded: {
+    k3aq6I: "x1iffjtl",
+    $$css: true
+  },
+  headerCollapsible: {
+    kkrTdU: "x1ypdohk",
+    kfSwDN: "x87ps6o",
+    $$css: true
+  },
   code: {
     k1xSpc: "x1lliihq",
     kUk6DE: "x98rzlu",
@@ -120,6 +149,16 @@ const styles = {
   sizeMd: {
     kGuDYH: "xp03k98",
     $$css: true
+  },
+  copyButton: {
+    kMwMTN: "x1mjzq1q",
+    $$css: true
+  },
+  copyButtonAbsolute: {
+    kVAEAm: "x10l6tqk",
+    k87sOh: "xctzyg",
+    kt4wiu: "x72tfeb",
+    $$css: true
   }
 };
 
@@ -409,18 +448,15 @@ export function CodeBlock({
   ...props
 }) {
   const t = useTranslator();
-  const [copied, setCopied] = useState(false);
-  const copyResetTimerRef = useRef(null);
-  const announce = useAnnounce();
-
-  // Clear a pending "copied" reset when the block unmounts.
-  useEffect(() => {
-    return () => {
-      if (copyResetTimerRef.current != null) {
-        clearTimeout(copyResetTimerRef.current);
-      }
-    };
-  }, []);
+  // Owns the clipboard write, the transient copied flag, its reset timer, and
+  // the polite copy announcement (a swapped aria-label alone is not reliably
+  // announced) — shared with Timestamp via the same hook.
+  const {
+    copy,
+    isCopied: copied
+  } = useClipboard({
+    announce: t('@astryx.codeBlock.copied')
+  });
   const useSpans = highlightMode === 'spans' || highlightMode === 'auto' && !hasHighlightAPI() || highlightMode === 'auto' && isSafari();
   const lines = useMemo(() => {
     const l = code.split('\n');
@@ -432,26 +468,11 @@ export function CodeBlock({
   const tokenLines = useTokenLines(code, language, customTokenizer);
   const highlightSet = useMemo(() => highlightLines ? new Set(highlightLines) : null, [highlightLines]);
   const handleCopy = useCallback(async () => {
-    try {
-      await navigator.clipboard.writeText(code);
-      setCopied(true);
-      // Swapping the button's aria-label alone isn't reliably announced by
-      // screen readers, so confirm the copy via a polite live region.
-      announce(t('@astryx.codeBlock.copied'));
+    const didCopy = await copy(code);
+    if (didCopy) {
       onCopy?.();
-      // Restart the reset timer on every copy — otherwise a rapid re-copy
-      // is reverted early by the previous click's timer.
-      if (copyResetTimerRef.current != null) {
-        clearTimeout(copyResetTimerRef.current);
-      }
-      copyResetTimerRef.current = setTimeout(() => {
-        copyResetTimerRef.current = null;
-        setCopied(false);
-      }, 2000);
-    } catch {
-      // Clipboard failures leave the copied state unchanged.
     }
-  }, [code, onCopy, announce, t]);
+  }, [code, copy, onCopy]);
   const sizeStyle = size === 'sm' ? styles.sizeSm : styles.sizeMd;
   // Digits in the largest line number — sizes the gutter column width.
   const maxLineDigits = String(lines.length).length;
@@ -468,38 +489,42 @@ export function CodeBlock({
   const scrollStyle = maxHeight ? {
     maxHeight: typeof maxHeight === 'number' ? `${maxHeight}px` : maxHeight
   } : undefined;
-  const copyIcon = /*#__PURE__*/_jsx(Icon, {
-    icon: copied ? 'check' : 'copy',
+  const copyButtonEl = hasCopyButton ? /*#__PURE__*/_jsx(IconButton, {
+    variant: "ghost",
     size: "sm",
-    color: "inherit"
-  });
-  const copyButtonEl = hasCopyButton ? /*#__PURE__*/_jsx("button", {
-    type: "button",
+    icon: /*#__PURE__*/_jsx(Icon, {
+      icon: copied ? 'check' : 'copy',
+      size: "sm",
+      color: "inherit"
+    })
+    // A visible "Copy" hover/focus hint via Button's built-in tooltip. It
+    // stays "Copy" after copying — the copy → check icon flip is the
+    // confirmation, not a tooltip change. The aria-label still swaps to the
+    // localized "Copied" for assistive tech, backed by the announcement.
+    ,
+    tooltip: t('@astryx.codeBlock.copyCode'),
+    label: copied ? t('@astryx.codeBlock.copied') : t('@astryx.codeBlock.copyCode'),
     onClick: e => {
       // Stop propagation so copying does not toggle the collapsible header.
       e.stopPropagation();
       void handleCopy();
     },
-    "aria-label": copied ? t('@astryx.codeBlock.copied') : t('@astryx.codeBlock.copyCode'),
-    ...{
-      0: {
-        className: "x3nfvp2 x6s0dn4 xl56j7k x9epnlk x3kzqx6 xx3sua9 xjbqb8w xe9uy6x x1mjzq1q x1ypdohk x14ju556"
-      },
-      1: {
-        className: "x3nfvp2 x6s0dn4 xl56j7k x9epnlk x3kzqx6 xx3sua9 xjbqb8w xe9uy6x x1mjzq1q x1ypdohk x14ju556 x10l6tqk xctzyg x72tfeb"
-      }
-    }[!!!showHeader << 0],
-    children: copyIcon
+    xstyle: [styles.copyButton, !showHeader && styles.copyButtonAbsolute],
+    ...themeProps('codeblock-copy-button')
   }) : null;
   const headerEl = showHeader ? /*#__PURE__*/_jsxs("div", {
-    ...{
+    ...mergeProps(themeProps('codeblock-header', {
+      size,
+      language,
+      container
+    }), {
       0: {
         className: "x78zum5 x6s0dn4 x1qughib x1pzlopt xzyc27v x7wzq59 x13vifvy x1vjfegm xce4md1"
       },
       1: {
         className: "x78zum5 x6s0dn4 x1qughib x1pzlopt xzyc27v x7wzq59 x13vifvy x1vjfegm xce4md1 x92x3c3 x1q0q8m5 xw8gpjh"
       }
-    }[!!hasLineNumbers << 0],
+    }[!!hasLineNumbers << 0]),
     children: [/*#__PURE__*/_jsx("div", {
       role: canCollapse ? 'button' : undefined,
       tabIndex: canCollapse ? 0 : undefined,
@@ -512,31 +537,23 @@ export function CodeBlock({
           setIsCollapsed(prev => !prev);
         }
       } : undefined,
-      ...{
-        0: {
-          className: "x78zum5 x6s0dn4 x98rzlu xeuugli x1717udv xjbqb8w x1heor9g xln7xf2 x1yc453h"
-        },
-        1: {
-          className: "x78zum5 x6s0dn4 x98rzlu xeuugli x1717udv xjbqb8w x1heor9g xln7xf2 x1yc453h x1ypdohk x87ps6o x17nn4n9 x1wfwxd8 x7s97pk"
-        }
-      }[!!canCollapse << 0],
+      ...focusOutlineProps.focusVisible(styles.header, canCollapse && styles.headerCollapsible),
       children: /*#__PURE__*/_jsxs("span", {
-        ...{
+        ...mergeProps(themeProps('codeblock-title', {
+          size,
+          language
+        }), {
           className: "x78zum5 x6s0dn4 x141an7d x9m5x89 x1e4wzip x1mjzq1q x1ghz6dp x1ltkj2j"
-        },
+        }),
         children: [canCollapse && /*#__PURE__*/_jsx("span", {
           ...{
-            0: {
-              className: "x3nfvp2 x6s0dn4 xl56j7k x2lah0s x6jxa94 x1v9usgg xnur1sd xb3r6kr x1mjzq1q x1gbn2au x1aquc0h x12wqnr7 x128ha8g x11xpdln xuedmi6 xlr8y92"
-            },
-            1: {
-              className: "x3nfvp2 x6s0dn4 xl56j7k x2lah0s x6jxa94 x1v9usgg xnur1sd xb3r6kr x1mjzq1q x1gbn2au x1aquc0h x12wqnr7 x128ha8g x11xpdln xuedmi6 xlr8y92 x1iffjtl"
-            }
-          }[!!!isCollapsed << 0],
+            className: "x3nfvp2 x6s0dn4 xl56j7k x2lah0s x6jxa94 x1v9usgg xnur1sd xb3r6kr x1mjzq1q x1gbn2au x1aquc0h x12wqnr7 x128ha8g"
+          },
           children: /*#__PURE__*/_jsx(Icon, {
             icon: "chevronRight",
             size: "xsm",
-            color: "inherit"
+            color: "inherit",
+            xstyle: [styles.collapseChevronIcon, !isCollapsed && styles.collapseChevronExpanded]
           })
         }), title, title && languageLabel ? ' — ' : '', languageLabel]
       })

package/dist/Collapsible/Collapsible.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Collapsible.d.ts","sourceRoot":"","sources":["../../src/Collapsible/Collapsible.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAa,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAiBjD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAuH5C,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD,wCAAwC;IACxC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC;;;OAGG;IACH,OAAO,EAAE,SAAS,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;;;;OAQG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAEzC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,QAAQ,EACR,aAAa,EACb,MAAM,EAAE,gBAAgB,EACxB,UAAkB,EAClB,YAAY,EACZ,KAAK,EACL,GAAG,EACH,MAAM,EACN,SAAS,EACT,KAAK,EACL,GAAG,KAAK,EACT,EAAE,gBAAgB,+BAkGlB;yBA/Ge,WAAW"}
+{"version":3,"file":"Collapsible.d.ts","sourceRoot":"","sources":["../../src/Collapsible/Collapsible.tsx"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAa,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAiBjD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAuH5C,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD,wCAAwC;IACxC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC;;;OAGG;IACH,OAAO,EAAE,SAAS,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;;;;OAQG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAEzC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,QAAQ,EACR,aAAa,EACb,MAAM,EAAE,gBAAgB,EACxB,UAAkB,EAClB,YAAY,EACZ,KAAK,EACL,GAAG,EACH,MAAM,EACN,SAAS,EACT,KAAK,EACL,GAAG,KAAK,EACT,EAAE,gBAAgB,+BAsGlB;yBAnHe,WAAW"}

package/dist/Collapsible/Collapsible.js

@@ -32,9 +32,10 @@ import "../theme/tokens.stylex.js";
 import { borderVars, colorVars, typographyVars, fontWeightVars, spacingVars, typeScaleVars, durationVars, easeVars } from "../theme/tokens.stylex.js";
 import { useCollapsible } from "./useCollapsible.js";
 import { CollapsibleGroupPresentationContext } from "./CollapsibleGroupContext.js";
-import { useIcon } from "../Icon/index.js";
+import { Icon } from "../Icon/index.js";
 import { mergeProps } from "../utils/index.js";
 import { themeProps } from "../utils/themeProps.js";
+import { focusOutlineProps } from "../utils/focusOutline.stylex.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const styles = {
   root: {
@@ -54,8 +55,6 @@ const styles = {
     kMwMTN: "x1tgivj0",
     k9WMMc: "x1yc453h",
     k8WAf4: "xt970qd",
-    kI3sdo: "x17nn4n9",
-    kInvED: "x1wfwxd8 x7s97pk",
     $$css: true
   },
   triggerDisabled: {
@@ -63,6 +62,27 @@ const styles = {
     kSiTet: "xbyyjgo",
     $$css: true
   },
+  chevron: {
+    k1xSpc: "x3nfvp2",
+    kGNEyG: "x6s0dn4",
+    kjj79g: "xl56j7k",
+    kmuXW: "x2lah0s",
+    kzqmXN: "xta46cu",
+    kZKoxP: "x1seg80s",
+    kGuDYH: "x18juvz8",
+    k1ekBW: "x11xpdln",
+    kIyJzY: "xuedmi6",
+    kAMwcw: "xlr8y92",
+    $$css: true
+  },
+  chevronOpen: {
+    k3aq6I: "x19jd1h0",
+    $$css: true
+  },
+  chevronClosed: {
+    k3aq6I: "x7p49u4",
+    $$css: true
+  },
   contentHidden: {
     k1xSpc: "x1s85apg",
     $$css: true
@@ -203,7 +223,6 @@ export function Collapsible({
   const presentation = use(CollapsibleGroupPresentationContext);
   const isDivided = presentation?.hasDividers ?? false;
   const density = presentation?.density ?? null;
-  const chevronIcon = useIcon('chevronDown');
 
   // Links the trigger to the region it shows/hides so assistive tech can move
   // from the button to its controlled content (disclosure pattern).
@@ -229,22 +248,23 @@ export function Collapsible({
       tabIndex: isDisabled ? -1 : undefined,
       ...mergeProps(themeProps('collapsible-trigger', {
         density: density ?? undefined
-      }), stylex.props(styles.trigger, density != null && triggerDensity[density], isDisabled && styles.triggerDisabled)),
+      }), focusOutlineProps.focusVisible(styles.trigger, density != null && triggerDensity[density], isDisabled && styles.triggerDisabled)),
       children: [/*#__PURE__*/_jsx("span", {
         ...{
           className: "x1b2iylo xwgcxoh"
         },
         children: trigger
-      }), /*#__PURE__*/_jsx("span", {
-        ...{
-          0: {
-            className: "x3nfvp2 x6s0dn4 xl56j7k x2lah0s x11xpdln xuedmi6 xlr8y92 xv9yike x7p49u4"
-          },
-          1: {
-            className: "x3nfvp2 x6s0dn4 xl56j7k x2lah0s x11xpdln xuedmi6 xlr8y92 xv9yike x19jd1h0"
-          }
-        }[!!isOpen << 0],
-        children: chevronIcon
+      }), /*#__PURE__*/_jsx(Icon, {
+        icon: "chevronDown"
+        // Nearest size to the trigger's 17px type step; `chevron` re-pins the
+        // exact box (see the style) so the glyph does not resize.
+        ,
+        size: "sm"
+        // Was `--color-icon-secondary` on the old wrapper span; `secondary`
+        // is the same token, expressed as an Icon color.
+        ,
+        color: "secondary",
+        xstyle: [styles.chevron, isOpen ? styles.chevronOpen : styles.chevronClosed]
       })]
     }), /*#__PURE__*/_jsx("div", {
       id: contentId,

package/dist/CommandPalette/CommandPaletteItem.d.ts

@@ -52,7 +52,7 @@ export interface CommandPaletteItemProps extends Omit<BaseProps<HTMLDivElement>,
  * </CommandPaletteItem>
  * ```
  */
-export declare function CommandPaletteItem({ value, onSelect, isHighlighted: controlledHighlighted, isSelected: controlledSelected, isDisabled, children, ref, xstyle, className, style, ...props }: CommandPaletteItemProps): import("react").JSX.Element;
+export declare function CommandPaletteItem({ value, onSelect, isHighlighted: controlledHighlighted, isSelected: controlledSelected, isDisabled, children, ref, xstyle, className, style, onClick: onClickProp, onMouseEnter: onMouseEnterProp, ...props }: CommandPaletteItemProps): import("react").JSX.Element;
 export declare namespace CommandPaletteItem {
     var displayName: string;
 }

package/dist/CommandPalette/CommandPaletteItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommandPaletteItem.d.ts","sourceRoot":"","sources":["../../src/CommandPalette/CommandPaletteItem.tsx"],"names":[],"mappings":"AAGA;;;;;;;;GAQG;AAEH,OAAO,EAA0C,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAE9E,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAwD5C,MAAM,WAAW,uBAAwB,SAAQ,IAAI,CACnD,SAAS,CAAC,cAAc,CAAC,EACzB,UAAU,GAAG,UAAU,CACxB;IACC,yCAAyC;IACzC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC,qDAAqD;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,+EAA+E;IAC/E,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,KAAK,EACL,QAAQ,EACR,aAAa,EAAE,qBAAqB,EACpC,UAAU,EAAE,kBAAkB,EAC9B,UAAkB,EAClB,QAAQ,EACR,GAAG,EACH,MAAM,EACN,SAAS,EACT,KAAK,EACL,GAAG,KAAK,EACT,EAAE,uBAAuB,+BAkFzB;yBA9Fe,kBAAkB"}
+{"version":3,"file":"CommandPaletteItem.d.ts","sourceRoot":"","sources":["../../src/CommandPalette/CommandPaletteItem.tsx"],"names":[],"mappings":"AAGA;;;;;;;;GAQG;AAEH,OAAO,EAA0C,KAAK,SAAS,EAAC,MAAM,OAAO,CAAC;AAE9E,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AAyD5C,MAAM,WAAW,uBAAwB,SAAQ,IAAI,CACnD,SAAS,CAAC,cAAc,CAAC,EACzB,UAAU,GAAG,UAAU,CACxB;IACC,yCAAyC;IACzC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC,qDAAqD;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,+EAA+E;IAC/E,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,KAAK,EACL,QAAQ,EACR,aAAa,EAAE,qBAAqB,EACpC,UAAU,EAAE,kBAAkB,EAC9B,UAAkB,EAClB,QAAQ,EACR,GAAG,EACH,MAAM,EACN,SAAS,EACT,KAAK,EACL,OAAO,EAAE,WAAW,EACpB,YAAY,EAAE,gBAAgB,EAC9B,GAAG,KAAK,EACT,EAAE,uBAAuB,+BAkFzB;yBAhGe,kBAAkB"}

package/dist/CommandPalette/CommandPaletteItem.js

@@ -14,6 +14,7 @@
 import { useCallback, useEffect, useMemo, useRef } from 'react';
 import * as stylex from '@stylexjs/stylex';
 import { mergeProps, mergeRefs } from "../utils/index.js";
+import { composeEventHandlers } from "../utils/composeEventHandlers.js";
 import "../theme/tokens.stylex.js";
 import { colorVars, spacingVars, radiusVars, typographyVars, typeScaleVars } from "../theme/tokens.stylex.js";
 import { useCommandPaletteContext } from "./CommandPaletteContext.js";
@@ -87,6 +88,8 @@ export function CommandPaletteItem({
   xstyle,
   className,
   style,
+  onClick: onClickProp,
+  onMouseEnter: onMouseEnterProp,
   ...props
 }) {
   const ctx = useCommandPaletteContext();
@@ -135,15 +138,15 @@ export function CommandPaletteItem({
   }, [isDisabled, itemIndex, ctx]);
   return /*#__PURE__*/_jsx("div", {
     ref: mergeRefs(ref, itemRef),
+    ...props,
     id: ctx && itemIndex >= 0 ? ctx.getItemId(itemIndex) : undefined,
     role: "option",
     "aria-selected": isSelected,
     "aria-disabled": isDisabled || undefined,
     "data-value": value,
-    onClick: handleClick,
-    onMouseEnter: handleMouseEnter,
+    onClick: composeEventHandlers(onClickProp, handleClick),
+    onMouseEnter: composeEventHandlers(onMouseEnterProp, handleMouseEnter),
     ...mergeProps(themeProps('command-palette-item'), stylex.props(styles.item, !isDisabled && styles.itemHover, isHighlighted && styles.itemHighlighted, isSelected && styles.itemSelected, isDisabled && styles.itemDisabled, xstyle), className, style),
-    ...props,
     children: children
   });
 }