@astryxdesign/core 0.7.7 → 0.7.8-canary.0588a13

package/dist/ComplexSelector/ComplexSelector.js

@@ -20,6 +20,7 @@ import * as stylex from '@stylexjs/stylex';
 import { useFieldInputStyling } from "../Field/fieldParts.js";
 import { useDevWarning } from "../hooks/useDevWarning.js";
 import { mergeRefs } from "../utils/mergeRefs.js";
+import { isFocusLost } from "../utils/focusReturn.js";
 import { useMergedRefs } from "../hooks/useMergedRefs.js";
 import { useBusyAnnouncement } from "../hooks/useBusyAnnouncement.js";
 import { Field, inputWrapperStyles } from "../Field/index.js";
@@ -312,12 +313,20 @@ export function ComplexSelector({
   const handlePopoverShow = useCallback(() => {
     onOpenChange?.(true);
   }, [onOpenChange]);
+
+  // The popup's content element, read when it closes.
+  const popupContentRef = useRef(null);
+  const hasCallerTrigger = renderTrigger != null;
   const handlePopoverHide = useCallback(() => {
-    // Focus is restored first so a consumer that moves focus elsewhere from
-    // the callback wins, instead of being overwritten a line later.
-    triggerRef.current?.focus();
+    const trigger = triggerRef.current;
+    // A press that moved focus to another control keeps it there. A caller's
+    // control always gets focus back. Focus moves before the callback, so a
+    // consumer that moves it from the callback wins.
+    if (hasCallerTrigger || isFocusLost(popupContentRef.current, trigger?.ownerDocument)) {
+      trigger?.focus();
+    }
     onOpenChange?.(false);
-  }, [onOpenChange]);
+  }, [hasCallerTrigger, onOpenChange]);
   const popover = usePopover({
     dialogLabel: label,
     hasCloseButton: false,
@@ -326,6 +335,7 @@ export function ComplexSelector({
     onShow: handlePopoverShow,
     onHide: handlePopoverHide
   });
+  popupContentRef.current = popover.contentRef.current;
   const isOpen = popover.isOpen;
   const handleTriggerClick = useCallback(() => {
     if (isDisabled) {

package/dist/ContextMenu/ContextMenu.js

@@ -528,11 +528,11 @@ export function ContextMenu({
     onTouchMoveProp?.(event);
   }, [handleLongPressTouchMove, onTouchMoveProp]);
   const handleTriggerTouchEnd = useCallback(event => {
-    handleLongPressTouchEnd();
+    handleLongPressTouchEnd(event);
     onTouchEndProp?.(event);
   }, [handleLongPressTouchEnd, onTouchEndProp]);
   const handleTriggerTouchCancel = useCallback(event => {
-    handleLongPressTouchCancel();
+    handleLongPressTouchCancel(event);
     onTouchCancelProp?.(event);
   }, [handleLongPressTouchCancel, onTouchCancelProp]);
   const popoverXstyle = menuWidth ? styles.popoverCustomWidth(menuWidth) : styles.popover;

package/dist/DateInput/MonthScroller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MonthScroller.d.ts","sourceRoot":"","sources":["../../src/DateInput/MonthScroller.tsx"],"names":[],"mappings":"AAsDA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,SAAS,EAOf,MAAM,UAAU,CAAC;AAqNlB,MAAM,WAAW,mBAAmB;IAClC,0DAA0D;IAC1D,aAAa,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;CACxE;AAED,MAAM,WAAW,kBAAkB;IACjC,yEAAyE;IACzE,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC;IACxD,+CAA+C;IAC/C,aAAa,EAAE,MAAM,CAAC;IACtB,8CAA8C;IAC9C,aAAa,EAAE,MAAM,CAAC;IACtB,iCAAiC;IACjC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,+DAA+D;IAC/D,oBAAoB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IACnD,+BAA+B;IAC/B,YAAY,EAAE,SAAS,GAAG,IAAI,CAAC;IAC/B,4CAA4C;IAC5C,KAAK,EAAE,SAAS,CAAC;IACjB,2DAA2D;IAC3D,cAAc,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAO,CAAC;IAC7C,gCAAgC;IAChC,YAAY,EAAE,SAAS,CAAC;IACxB,kCAAkC;IAClC,QAAQ,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC1C;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAC5B,SAAS,EACT,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,YAAY,EACZ,KAAK,EACL,cAAc,EACd,YAAY,EACZ,QAAQ,GACT,EAAE,kBAAkB,+BA0iBpB;yBArjBe,aAAa"}
+{"version":3,"file":"MonthScroller.d.ts","sourceRoot":"","sources":["../../src/DateInput/MonthScroller.tsx"],"names":[],"mappings":"AAyDA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,SAAS,EAOf,MAAM,UAAU,CAAC;AAqNlB,MAAM,WAAW,mBAAmB;IAClC,0DAA0D;IAC1D,aAAa,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;CACxE;AAED,MAAM,WAAW,kBAAkB;IACjC,yEAAyE;IACzE,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC;IACxD,+CAA+C;IAC/C,aAAa,EAAE,MAAM,CAAC;IACtB,8CAA8C;IAC9C,aAAa,EAAE,MAAM,CAAC;IACtB,iCAAiC;IACjC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,+DAA+D;IAC/D,oBAAoB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IACnD,+BAA+B;IAC/B,YAAY,EAAE,SAAS,GAAG,IAAI,CAAC;IAC/B,4CAA4C;IAC5C,KAAK,EAAE,SAAS,CAAC;IACjB,2DAA2D;IAC3D,cAAc,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAO,CAAC;IAC7C,gCAAgC;IAChC,YAAY,EAAE,SAAS,CAAC;IACxB,kCAAkC;IAClC,QAAQ,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC1C;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAC5B,SAAS,EACT,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,YAAY,EACZ,KAAK,EACL,cAAc,EACd,YAAY,EACZ,QAAQ,GACT,EAAE,kBAAkB,+BA6iBpB;yBAxjBe,aAAa"}

package/dist/DateInput/MonthScroller.js

@@ -37,7 +37,7 @@ import { useDirection, useLocale } from "../i18n/index.js";
 import "../theme/tokens.stylex.js";
 import { colorVars, radiusVars, fontWeightVars, typeScaleVars, durationVars, borderVars } from "../theme/tokens.stylex.js";
 import { focusOutlineStyles } from "../utils/index.js";
-import { plainDateFormatStandaloneMonthYear } from "../utils/plainDate.js";
+import { plainDateFormatDayNumber, plainDateFormatStandaloneMonthYear } from "../utils/plainDate.js";
 import { plainDateAddDays, plainDateDayOfWeek, plainDateFormat, plainDateIsEqual, plainDateToISO, DATE_FORMAT_WITH_WEEKDAY } from "../utils/index.js";
 import { playReducedMotionDip, reducedMotionFade } from "../motion/reducedMotion.js";
 import "./tokens.stylex.js";
@@ -408,6 +408,7 @@ export function MonthScroller({
    * it cannot oscillate.
    */
   const settleFrameRef = useRef(undefined);
+  // Releases the settle frame on unmount.
   useEffect(() => () => {
     if (settleFrameRef.current != null) {
       cancelAnimationFrame(settleFrameRef.current);
@@ -480,6 +481,8 @@ export function MonthScroller({
   // rAF-throttled: a touch scroll fires far more scroll events than frames,
   // and all this does is move a label and widen a window.
   const frameRef = useRef(undefined);
+  // Syncs scroll, touch and wheel listeners on the scroller with its measured
+  // height.
   useEffect(() => {
     const scroller = scrollerRef.current;
     // Not before the height is known. A listener attached while it was zero
@@ -799,7 +802,7 @@ function MonthPane({
                   className: "x78zum5 x6s0dn4 xl56j7k x1y2t9nm xw1wawg xjspbzw x1litavf x1y0btm7 xzo0q3i xuedmi6 x1ewilqj x1spg45b xad5do x17wrial x2mo6ok"
                 }
               }[!!!isDisabled << 2 | !!isToday << 1 | !!isSelected << 0],
-              children: day.dayNumber
+              children: plainDateFormatDayNumber(day.dayNumber, locale)
             })
           })
         }, day.iso);

package/dist/DateInput/PickerWheel.d.ts

@@ -0,0 +1,19 @@
+import { type WheelProps } from './wheelOptions.js';
+/**
+ * One UIPickerView column: the Wheel under a finger. It does not scroll
+ * natively. WebKit gives every scroll-snapping scroller the fast deceleration
+ * rate, and a scroller's momentum cannot be caught or measured. A busy main
+ * thread does not stop or jump a motion here. Under Reduce Motion a throw's
+ * momentum still plays, as iOS scrolling does. Every other motion
+ * cross-fades onto its row.
+ *
+ * @example
+ * ```
+ * <PickerWheel label="Month" options={monthOptions} value={month} onChange={setMonth} />
+ * ```
+ */
+export declare function PickerWheel({ label, options, value, onChange, isActive, ref, }: WheelProps): import("react").JSX.Element;
+export declare namespace PickerWheel {
+    var displayName: string;
+}
+//# sourceMappingURL=PickerWheel.d.ts.map

package/dist/DateInput/PickerWheel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"PickerWheel.d.ts","sourceRoot":"","sources":["../../src/DateInput/PickerWheel.tsx"],"names":[],"mappings":"AA2DA,OAAO,EAML,KAAK,UAAU,EAChB,MAAM,gBAAgB,CAAC;AA2HxB;;;;;;;;;;;;GAYG;AACH,wBAAgB,WAAW,CAAC,EAC1B,KAAK,EACL,OAAO,EACP,KAAK,EACL,QAAQ,EACR,QAAe,EACf,GAAG,GACJ,EAAE,UAAU,+BAuiBZ;yBA9iBe,WAAW"}