@astryxdesign/core 0.7.8-canary.fbb81c6 → 0.7.8

package/src/hooks/useMenuPress.ts

@@ -6,8 +6,7 @@
  * @file useMenuPress.ts
  * @input The menu root, its trigger, the enabled-row selector, and callbacks
  *   for opening, highlighting, activating and dismissing
- * @output useMenuPress, the marker attributes, the activation mark, and the
- *   internal useDropdownMenuPress entry with its touch model
+ * @output useMenuPress, the marker attributes, and the activation mark
  * @position Core hook for DropdownMenu, ContextMenu, DropdownMenuSubMenu,
  *   Selector and MenuBottomSheetActionList. The transition table lives in
  *   menuPressGesture.ts.
@@ -30,10 +29,10 @@ import {
 import {currentGesture} from '../Layer/gestureCounter';
 import {
   IDLE_MENU_PRESS,
-  menuPressTransition,
-  type MenuPressOutcome,
-  type MenuPressInput,
-  type MenuPressState,
+  menuPressStep,
+  type MenuPressEffect,
+  type MenuPressEvent,
+  type MenuPressGesture,
   type MenuPressPointerType,
 } from './menuPressGesture';
 import {MENU_PRESS_MARKER} from './menuPressMarker';
@@ -46,12 +45,6 @@ import {edgeAutoscroll} from '../utils/edgeAutoscroll';
 import {focusForLastInput} from '../utils/focusReturn';
 import {useInteractionModalityTrackingFor} from '../utils/interactionModality';
 import {LONG_PRESS_DURATION_MS} from '../motion/uikit/longPress';
-import {
-  clearMenuPressLit,
-  holdMenuPressPaint,
-  markMenuPressLit,
-  releaseMenuPressPaint,
-} from '../privateAttributes/menuPressLit.stylex';
 import {
   __resetClickGuardForTest,
   armClickGuard,
@@ -242,44 +235,6 @@ interface ResolvedPoint {
   isOnTrigger: boolean;
 }
 
-/**
- * DropdownMenu's options for the press model: everything the public hook
- * takes, plus its touch model. DropdownMenu reaches the touch model through
- * its `presentation`, so the public hook has no such option.
- *
- * @internal
- */
-export interface DropdownMenuPressOptions extends UseMenuPressOptions {
-  /**
-   * How the finger that opened the menu from the trigger picks.
-   * `'pointer'`: its opening press follows the settle rule. `'uikit'`: it
-   * picks only after UIMenu's handoff distance, so the row that appeared
-   * under it never acts on a still lift. A mouse is unaffected.
-   * @default 'pointer'
-   */
-  touchModel?: 'pointer' | 'uikit';
-}
-
-/**
- * What core's own menus get from {@link useDropdownMenuPress}: the public
- * return. Not exported from the hooks entry point.
- *
- * @internal
- */
-export type DropdownMenuPressReturn = UseMenuPressReturn;
-
-/**
- * Where a pointer is, for a finger's handoff distance. Positions reach the
- * machine only under `touchModel: 'uikit'`. Without them, it keeps the settle
- * rule.
- */
-function handoffPosition(
-  event: PointerEvent,
-  hasHandoff: boolean,
-): {x?: number; y?: number} {
-  return hasHandoff ? {x: event.clientX, y: event.clientY} : {};
-}
-
 /**
  * The press model for a menu: the row under the release acts, the highlight
  * follows a held pointer, and a mouse opens the menu on press.
@@ -316,30 +271,13 @@ function handoffPosition(
  * ```
  */
 export function useMenuPress(options: UseMenuPressOptions): UseMenuPressReturn {
-  // The touch model is DropdownMenu's alone; an untyped caller's
-  // `touchModel` does not reach the model.
-  const {touchModel: _touchModel, ...publicOptions} =
-    options as DropdownMenuPressOptions;
-  return useDropdownMenuPress({...publicOptions, touchModel: 'pointer'});
-}
-
-/**
- * The press model with DropdownMenu's touch model
- * ({@link DropdownMenuPressOptions.touchModel}). Not exported from the hooks
- * entry point.
- *
- * @internal
- */
-export function useDropdownMenuPress(
-  options: DropdownMenuPressOptions,
-): DropdownMenuPressReturn {
   const optionsRef = useRef(options);
   optionsRef.current = options;
   // The highlight, and the hover focus of the rows in this menu, follow the
   // last input, which this tracks for the menu's own document.
   useInteractionModalityTrackingFor(options.menuRef);
 
-  const gestureRef = useRef<MenuPressState<HTMLElement>>(IDLE_MENU_PRESS);
+  const gestureRef = useRef<MenuPressGesture<HTMLElement>>(IDLE_MENU_PRESS);
   const pointerIdRef = useRef<number | null>(null);
   const detachRef = useRef<(() => void) | null>(null);
   // `useLongPress` detects the held finger, as in ContextMenu, so the hold
@@ -436,18 +374,8 @@ export function useDropdownMenuPress(
     autoscrollRef.current = null;
   }, [autoscroll]);
 
-  const litRowRef = useRef<HTMLElement | null>(null);
-  const heldMenuRef = useRef<HTMLElement | null>(null);
   const endGesture = useCallback(() => {
     longPressApiRef.current?.cancel();
-    if (litRowRef.current != null) {
-      clearMenuPressLit(litRowRef.current);
-      litRowRef.current = null;
-    }
-    if (heldMenuRef.current != null) {
-      releaseMenuPressPaint(heldMenuRef.current);
-      heldMenuRef.current = null;
-    }
     touchMovePreventerRef.current?.();
     touchMovePreventerRef.current = null;
     stopAutoscroll();
@@ -460,34 +388,7 @@ export function useDropdownMenuPress(
 
   const highlight = useCallback(
     (row: HTMLElement | null) => {
-      // A held finger or pen marks the row it lights, for the row's pressed
-      // paint. A held mouse keeps the hover tint, as on a desktop.
-      const gesture = gestureRef.current;
-      const isHeld =
-        gesture.phase !== 'idle' && gesture.pointerType !== 'mouse';
-      const lit = isHeld ? row : null;
-      if (litRowRef.current !== lit) {
-        if (litRowRef.current != null) {
-          clearMenuPressLit(litRowRef.current);
-        }
-        litRowRef.current = lit;
-        if (lit != null) {
-          markMenuPressLit(lit);
-        }
-      }
       const {onHighlight, menuRef} = optionsRef.current;
-      // The row the press began on stays :active where a pointer hovers, so
-      // the menu holds every row but the lit one off that paint.
-      const held = isHeld ? menuRef.current : null;
-      if (heldMenuRef.current !== held) {
-        if (heldMenuRef.current != null) {
-          releaseMenuPressPaint(heldMenuRef.current);
-        }
-        heldMenuRef.current = held;
-        if (held != null) {
-          holdMenuPressPaint(held);
-        }
-      }
       if (onHighlight != null) {
         onHighlight(row);
         return;
@@ -548,13 +449,13 @@ export function useDropdownMenuPress(
 
   // Declared before `step` so the mutual recursion through refs type-checks.
   const stepRef = useRef<
-    (event: MenuPressInput<HTMLElement>, native?: PointerEvent) => void
+    (event: MenuPressEvent<HTMLElement>, native?: PointerEvent) => void
   >(() => {});
 
   const applyEffect = useCallback(
     (
-      effect: MenuPressOutcome<HTMLElement>,
-      gesture: MenuPressState<HTMLElement>,
+      effect: MenuPressEffect<HTMLElement>,
+      gesture: MenuPressGesture<HTMLElement>,
       native: PointerEvent | undefined,
     ) => {
       const doc = getDocument();
@@ -610,8 +511,8 @@ export function useDropdownMenuPress(
   );
 
   const step = useCallback(
-    (event: MenuPressInput<HTMLElement>, native?: PointerEvent) => {
-      const result = menuPressTransition(gestureRef.current, event);
+    (event: MenuPressEvent<HTMLElement>, native?: PointerEvent) => {
+      const result = menuPressStep(gestureRef.current, event);
       gestureRef.current = result.gesture;
       applyEffect(result.effect, result.gesture, native);
     },
@@ -718,10 +619,6 @@ export function useDropdownMenuPress(
             row: point.row,
             isInMenu: point.isInMenu,
             time: Date.now(),
-            ...handoffPosition(
-              event,
-              optionsRef.current.touchModel === 'uikit',
-            ),
           },
           event,
         );
@@ -739,10 +636,6 @@ export function useDropdownMenuPress(
             isInMenu: point.isInMenu,
             isOnTrigger: point.isOnTrigger,
             time: Date.now(),
-            ...handoffPosition(
-              event,
-              optionsRef.current.touchModel === 'uikit',
-            ),
           },
           event,
         );

package/src/motion/MEASUREMENTS.md

@@ -314,14 +314,3 @@ scroll view coasts with 0.25 × the pan's velocity plus 0.75 × its value one
 event earlier (four HID releases; `velocity.scrollReleaseWeight`, which a
 pan's `scrollVelocity()` reads). On UIKit, Reduce Motion with Prefer Cross-Fade changes
 nothing on a picker; the Wheel follows design:reduced-motion instead.
-
-## Menus (UIMenu)
-
-Probe: the UIKit lab host app with a UIButton whose `UIMenu` is its primary
-action (`showsMenuAsPrimaryAction`), three to twelve items, on a plain view
-and inside a UIScrollView; the gesture-state, presentation-modifier,
-display-link and feedback hooks; real HID touches.
-
-| ID    | Scene                  | Gesture                                                                                                                                                 | Extract                                                                                                                                 | Method |
-| ----- | ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | ------ |
-| M-MN2 | button on a plain view | hold until the menu is open, then lift still; move 8 pt down, 8 pt right, 12 pt down, (7, 7), (8, 8) and lift; move 6 pt before the open and 6 pt after | row picked or not; handoff and list-selection recognizer states; highlighted row per frame: threshold, metric, where it is counted from | C      |

package/src/motion/transientCopy.ts

@@ -15,12 +15,9 @@
  * technology, carries no ids or test ids, joins no form or radio group (a
  * copied checked radio would uncheck the live one), and its frames and media
  * load nothing. Laying it out changes no ancestor's position, and a scaled
- * host draws it at the old size. A clone restarts each CSS animation and runs
- * no transition but a `@starting-style` one; the copy carries on its
- * element's from where they were.
- * Laid in a host outside the element's own ancestors, it keeps what it
- * inherited from them: its inherited properties and custom properties that
- * differ from the host's are written on it.
+ * host draws it at the old size. Laid in a host outside the element's own
+ * ancestors, it keeps what it inherited from them: its inherited properties
+ * and custom properties that differ from the host's are written on it.
  * Limits: a rule keyed on a removed `id`, or matched through an ancestor
  * between the host and the element (`.collapsed .label`), does not style the
  * copy as it styled the element; and content holding a canvas whose pixels read back
@@ -31,12 +28,6 @@
  * SYNC: When modified, update /packages/core/src/motion/animatedLayout.ts
  */
 
-import {
-  carryAnimations,
-  saveAnimations,
-  type SavedAnimations,
-} from './carryAnimations';
-
 /** Above this many elements, old content is not copied: the new one enters. */
 const MAX_COPIED_ELEMENTS = 1500;
 
@@ -160,22 +151,11 @@ const scrollOffsets = new WeakMap<
   ReadonlyArray<readonly [Element, number, number]>
 >();
 
-/**
- * The CSS animations and transitions a copy's element ran, and the copy of
- * each element in the copied subtree. The copy carries them on once laid out
- * (`placeOver`).
- */
-const carriedMotion = new WeakMap<
-  HTMLElement,
-  {saved: SavedAnimations; copyOf: ReadonlyMap<Element, Element>}
->();
-
 /**
  * A copy that takes no part: no ids or test ids, no form or radio group (a
  * copied checked radio would uncheck the live one), no label for a live
  * control, and copied frames and media load nothing. Scrolled descendants
- * keep their offsets. The CSS animations and transitions running in it carry
- * on from where they were, once the copy is laid out (`placeOver`).
+ * keep their offsets once the copy is laid out (`placeOver`).
  */
 export function inertCopy(element: HTMLElement): HTMLElement | null {
   const copy = element.cloneNode(true) as HTMLElement;
@@ -189,10 +169,6 @@ export function inertCopy(element: HTMLElement): HTMLElement | null {
   });
   scrollOffsets.set(copy, offsets);
   inheritedValues.set(copy, readInherited(element));
-  carriedMotion.set(copy, {
-    saved: saveAnimations(element),
-    copyOf: new Map(sourceNodes.map((node, index) => [node, copyNodes[index]])),
-  });
   for (const node of copyNodes) {
     for (const name of [
       'id',
@@ -239,8 +215,7 @@ export function paintedBackground(element: Element): string {
 /**
  * Lay `element` over `rect` (viewport coordinates), absolutely, as the last
  * child of `host`, wherever its containing block is: no ancestor's position
- * changes. A copy's scrolled descendants then restore their offsets, and the
- * CSS animations and transitions its element ran carry on in it.
+ * changes.
  */
 export function placeOver(
   element: HTMLElement,
@@ -302,15 +277,6 @@ export function placeOver(
       node.scrollLeft = left;
     }
   }
-  const carried = carriedMotion.get(element);
-  if (carried != null) {
-    carriedMotion.delete(element);
-    carryAnimations(
-      carried.saved,
-      element,
-      node => carried.copyOf.get(node) ?? null,
-    );
-  }
 }
 
 /**
@@ -357,12 +323,6 @@ export function visiblePartCopy(element: HTMLElement): {
   if (values != null) {
     inheritedValues.set(holder, values);
   }
-  // The content's CSS motion carries on when the holder is laid out.
-  const carried = carriedMotion.get(content);
-  if (carried != null) {
-    carriedMotion.set(holder, carried);
-    carriedMotion.delete(content);
-  }
   const box = element.getBoundingClientRect();
   return {
     copy: holder,

package/src/motion/uikit/gestures.ts

@@ -251,27 +251,6 @@ export const UIKIT_PRESS = {
   momentumMemory: {value: 3000, unit: 'ms'},
 } as const satisfies Record<string, GestureConstant>;
 
-/**
- * UIMenu presented by a button whose menu is its primary action: how far the
- * finger that opened it travels before it picks. DropdownMenu's press model
- * reads a copy in `hooks/menuPressValues.ts`.
- */
-export const UIKIT_MENU_PRESS = {
-  /**
-   * After the menu opens under a still-held finger, the finger travels this
-   * far before it starts picking. The distance is a straight line from the
-   * first sample the menu receives after it opened. Until then nothing is
-   * lit, and lifting acts on nothing.
-   * @source measured: UIKit lab (injected host app), iOS 26.2 simulator,
-   *   iPhone 17 Pro, gesture-state hook, steps 150 ms apart, Oct 23 2026
-   *   (M-MN2): with the menu open under a held finger and a 1 pt first step,
-   *   moves of (0, 9) and (7, 7) picked nothing; (0, 10), (0, 11), (10, 0),
-   *   (9, 9) and (10, 10) picked; a 9 pt step followed by 3 pt more picked
-   *   nothing
-   */
-  handoff: {value: 10, unit: 'px'},
-} as const satisfies Record<string, GestureConstant>;
-
 export const UIKIT_VELOCITY = {
   /**
    * UIPanGestureRecognizer.velocity(in:) is this times the newest event's
@@ -339,7 +318,6 @@ export const UIKIT_GESTURES = {
   screenEdgePan: UIKIT_SCREEN_EDGE_PAN,
   control: UIKIT_CONTROL,
   press: UIKIT_PRESS,
-  menuPress: UIKIT_MENU_PRESS,
   velocity: UIKIT_VELOCITY,
 } as const;
 

package/src/motion/uikit/index.ts

@@ -27,7 +27,6 @@ export {
   UIKIT_CONTROL,
   UIKIT_GESTURES,
   UIKIT_LONG_PRESS,
-  UIKIT_MENU_PRESS,
   UIKIT_PAN,
   UIKIT_PINCH,
   UIKIT_PRESS,

package/src/utils/pressFeedback.ts

@@ -6,7 +6,7 @@
  *   press-group markers and the document's pointer, keyboard, scroll and
  *   visibility events
  * @output PRESSABLE_ATTRIBUTE, PRESSED_ATTRIBUTE, pressableProps,
- *   pressFadeMs, installPressFeedback and cancelPress
+ *   pressFadeMs and installPressFeedback
  * @position The DOM half of the touch press model. usePressFeedback installs
  *   it, and the CSS arms live in interactionOverlay.stylex.ts.
  *
@@ -381,21 +381,6 @@ function finish(slot: Slot): void {
   }
 }
 
-/**
- * Ends the press the controller follows on `element`, and its paint, at once.
- * A clickable container calls it when a press starts on an interactive
- * element inside it: that press does not activate the container, so the
- * container shows no press.
- */
-export function cancelPress(element: Element): void {
-  if (finger.live?.element === element) {
-    finish(finger);
-  }
-  if (button.live?.element === element) {
-    finish(button);
-  }
-}
-
 /** A new press on an element owns its paint: the other slot's gesture there ends. */
 function takeOver(other: Slot, element: HTMLElement): void {
   if (other.live?.element === element) {

package/dist/hooks/menuPressValues.d.ts

@@ -1,16 +0,0 @@
-/**
- * @file menuPressValues.ts
- * @input None
- * @output The UIKit value the menu press model reads
- * @position A copy of one UIKit table entry, motion/uikit gestures.ts
- *   `UIKIT_MENU_PRESS.handoff`. A menu then bundles this number, not the
- *   table with its measurement records. The table stays the source and
- *   documents the measurement. menuPressValues.test.ts fails when the copy
- *   drifts.
- *
- * SYNC: When modified, update:
- * - /packages/core/src/motion/uikit/gestures.ts
- */
-/** How far the opening finger travels after the menu opens before it picks. */
-export declare const MENU_PRESS_HANDOFF_PX = 10;
-//# sourceMappingURL=menuPressValues.d.ts.map

package/dist/hooks/menuPressValues.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"menuPressValues.d.ts","sourceRoot":"","sources":["../../src/hooks/menuPressValues.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AAEH,+EAA+E;AAC/E,eAAO,MAAM,qBAAqB,KAAK,CAAC"}

package/dist/hooks/menuPressValues.js

@@ -1,18 +0,0 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
-
-/**
- * @file menuPressValues.ts
- * @input None
- * @output The UIKit value the menu press model reads
- * @position A copy of one UIKit table entry, motion/uikit gestures.ts
- *   `UIKIT_MENU_PRESS.handoff`. A menu then bundles this number, not the
- *   table with its measurement records. The table stays the source and
- *   documents the measurement. menuPressValues.test.ts fails when the copy
- *   drifts.
- *
- * SYNC: When modified, update:
- * - /packages/core/src/motion/uikit/gestures.ts
- */
-
-/** How far the opening finger travels after the menu opens before it picks. */
-export const MENU_PRESS_HANDOFF_PX = 10;

package/dist/motion/carryAnimations.d.ts

@@ -1,58 +0,0 @@
-type Writable = Record<string, unknown>;
-/** One animation's state, read before the browser starts it afresh. */
-export interface SavedAnimation {
-    animation: Animation;
-    name: string;
-    target: Element | null;
-    pseudoElement: string | null;
-    values: Writable;
-    effectValues: Writable;
-    timing: EffectTiming | null;
-    keyframes: ComputedKeyframe[] | null;
-    playState: AnimationPlayState;
-    replaceState: AnimationReplaceState;
-}
-/**
- * Reads one animation's state generically, from what the platform exposes.
- * That is every accessor with a setter on the animation's and its effect's
- * prototype chains, every field of the effect's timing, and its keyframes. Only values
- * that differ from the recreated animation's are written back, so a value the
- * stylesheet controls stays under its control. A few members are not plain
- * state and are written in their own step (`ORDERED`). The Animation and
- * effect objects themselves cannot be carried over: the old ones keep their
- * listeners and promises.
- */
-export declare function saveAnimation(animation: Animation): SavedAnimation;
-/**
- * Puts each state `saved` holds on the CSS animations and transitions of
- * `root` and its subtree that are not among `survivors`. Each CSS animation
- * the browser started afresh takes the state of the one it replaces. It is
- * matched by element, pseudo-element and name, in order, and then by name
- * alone (an effect script moved to another element or pseudo-element). Each
- * transition whose animation no longer runs resumes as a script animation in
- * its state. One started afresh that replaces none is finished: an entrance
- * that had played and been dropped, or a transition from `@starting-style`.
- * Script animations are left as they are.
- */
-export declare function restoreAnimations(root: Element, saved: ReadonlyArray<SavedAnimation>, survivors: ReadonlySet<Animation>): void;
-/** The CSS animations and transitions `saveAnimations` read. */
-export type SavedAnimations = ReadonlyArray<SavedAnimation>;
-/**
- * Reads the state of every CSS animation and transition of `root` and its
- * subtree, for `carryAnimations` to give a copy of it.
- */
-export declare function saveAnimations(root: Element): SavedAnimations;
-/**
- * Carries on in `copy`, a clone of the root `saved` was read from, now laid
- * out, the CSS animations and transitions its element ran. A clone starts
- * each CSS animation again and runs no transition but a `@starting-style`
- * one. So each CSS animation the clone started takes the state of its
- * element's, and each transition runs on as a script animation. One the
- * clone started that its element no longer ran is finished: an entrance that
- * had played, or a `@starting-style` transition. `copyOf` maps each element
- * of the cloned subtree to its copy. The element's own animations keep
- * running, so the copy's take no id or event handler.
- */
-export declare function carryAnimations(saved: SavedAnimations, copy: Element, copyOf: (element: Element) => Element | null): void;
-export {};
-//# sourceMappingURL=carryAnimations.d.ts.map

package/dist/motion/carryAnimations.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"carryAnimations.d.ts","sourceRoot":"","sources":["../../src/motion/carryAnimations.ts"],"names":[],"mappings":"AA+BA,KAAK,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAsDxC,uEAAuE;AACvE,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IACvB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,QAAQ,CAAC;IACjB,YAAY,EAAE,QAAQ,CAAC;IACvB,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B,SAAS,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;IACrC,SAAS,EAAE,kBAAkB,CAAC;IAC9B,YAAY,EAAE,qBAAqB,CAAC;CACrC;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,cAAc,CAyBlE;AAsJD;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,aAAa,CAAC,cAAc,CAAC,EACpC,SAAS,EAAE,WAAW,CAAC,SAAS,CAAC,GAChC,IAAI,CA8CN;AAED,gEAAgE;AAChE,MAAM,MAAM,eAAe,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC;AAE5D;;;GAGG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,eAAe,CAQ7D;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,eAAe,EACtB,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,GAAG,IAAI,GAC3C,IAAI,CASN"}