@astryxdesign/core 0.7.8-canary.fbb81c6 → 0.7.8

package/dist/hooks/menuPressGesture.js

@@ -4,7 +4,7 @@
  * @file menuPressGesture.ts
  * @input A menu press gesture and one pointer event, both as plain data
  * @output The pure `menuPressStep` state machine, its state, event and effect
- *   types, the settle constant, and the finger's handoff distance
+ *   types, and the settle constant
  * @position Pure module under `useMenuPress`. It has no DOM and no React, so
  *   a unit test can check each transition without a browser.
  *
@@ -13,28 +13,8 @@
  * - /packages/core/src/hooks/useMenuPress.ts
  */
 
-import { MENU_PRESS_HANDOFF_PX as UIKIT_MENU_PRESS_HANDOFF_PX } from "./menuPressValues.js";
-
-/**
- * How long the opening press must last before its release may act, unless a
- * finger's handoff applies.
- */
+/** How long the opening press must last before its release may act. */
 export const MENU_PRESS_SETTLE_MS = 300;
-
-/**
- * How far a finger that opened the menu travels, from the first sample the
- * menu sees, before it starts picking (UIMenu's scrub handoff).
- */
-export const MENU_PRESS_HANDOFF_PX = UIKIT_MENU_PRESS_HANDOFF_PX;
-
-/** @internal The machine's own shape, with the finger's handoff; not public contract. */
-
-/** @internal The machine's own shape, with the finger's handoff; not public contract. */
-
-/** @internal The machine's own shape, with the finger's handoff; not public contract. */
-
-/** @internal The machine's own shape, with the finger's handoff; not public contract. */
-
 export const IDLE_MENU_PRESS = {
   phase: 'idle'
 };
@@ -58,23 +38,6 @@ function highlightEffect(row) {
   };
 }
 
-/** A finger or a pen: UIKit's touch rules apply. */
-function isFinger(pointerType) {
-  return pointerType !== 'mouse';
-}
-function hasPosition(event) {
-  return event.x != null && event.y != null;
-}
-
-/**
- * Whether a finger has travelled the handoff distance from `from`. The
- * distance is a straight line, as UIMenu measures it: a diagonal 7 pt each
- * way does not hand off, 9 pt each way does.
- */
-function hasPassedHandoff(from, to) {
-  return Math.hypot(to.x - from.x, to.y - from.y) >= MENU_PRESS_HANDOFF_PX;
-}
-
 /**
  * Resolve a release while the highlight is tracking the pointer: over an
  * enabled row it acts, over the menu's chrome it acts on nothing, outside the
@@ -110,15 +73,10 @@ function release(pointerType, event) {
  * - `idle`: no gesture is live.
  * - `triggerPress`: a finger rests on the trigger, and the menu is not open
  *   yet. A mouse press on the trigger skips this state and opens at once.
- * - `open`: the menu opened under a held pointer, and the pointer does not
- *   pick yet.
+ * - `open`: the menu opened under a held pointer, and the pointer has not
+ *   entered it yet.
  * - `tracking`: the pointer is held, and the highlight follows it.
  *
- * A finger or a pen that opened the menu picks only after it travels
- * `MENU_PRESS_HANDOFF_PX` from the first position the menu sees. UIMenu
- * hands off the same way. Until then nothing lights, and its lift acts on
- * nothing. A host that reports no positions keeps the settle rule.
- *
  * The settle rule: the release of the opening gesture acts only after the
  * pointer entered the menu or the press lasted `MENU_PRESS_SETTLE_MS`. Else a
  * menu that opens under the pointer would pick a row that nobody chose.
@@ -126,11 +84,8 @@ function release(pointerType, event) {
  * Rows are opaque (`T`). The hook feeds in the enabled row under the
  * pointer, or `null` over a divider, a heading, a disabled row, or outside
  * the menu.
- *
- * @internal The machine's own shape, with the finger's handoff; not public
- * contract.
  */
-export function menuPressTransition(gesture, event) {
+export function menuPressStep(gesture, event) {
   switch (gesture.phase) {
     case 'idle':
       return stepIdle(gesture, event);
@@ -221,67 +176,23 @@ function stepTriggerPress(gesture, event) {
 function stepOpen(gesture, event) {
   switch (event.type) {
     case 'move':
-      {
-        if (isFinger(gesture.pointerType) && hasPosition(event)) {
-          // UIMenu counts from the first sample after the open, not from the
-          // open point.
-          const from = gesture.handoffFrom;
-          if (from == null) {
-            return {
-              gesture: {
-                ...gesture,
-                handoffFrom: {
-                  x: event.x,
-                  y: event.y
-                }
-              },
-              effect: NONE
-            };
-          }
-          if (!hasPassedHandoff(from, event)) {
-            return {
-              gesture,
-              effect: NONE
-            };
-          }
-          return {
-            gesture: {
-              phase: 'tracking',
-              pointerType: gesture.pointerType,
-              origin: 'trigger',
-              row: event.row
-            },
-            effect: highlightEffect(event.row)
-          };
-        }
-        if (!event.isInMenu) {
-          return {
-            gesture,
-            effect: NONE
-          };
-        }
+      if (!event.isInMenu) {
         return {
-          gesture: {
-            phase: 'tracking',
-            pointerType: gesture.pointerType,
-            origin: 'trigger',
-            row: event.row
-          },
-          effect: highlightEffect(event.row)
+          gesture,
+          effect: NONE
         };
       }
+      return {
+        gesture: {
+          phase: 'tracking',
+          pointerType: gesture.pointerType,
+          origin: 'trigger',
+          row: event.row
+        },
+        effect: highlightEffect(event.row)
+      };
     case 'up':
       {
-        if (isFinger(gesture.pointerType) && hasPosition(event)) {
-          // The finger never travelled the handoff distance, so the row under it
-          // appeared under a press nobody moved. Nothing acts, the menu stays,
-          // and the trigger's click for this press is spent.
-          return idle({
-            type: 'settle',
-            stray: true,
-            dismiss: false
-          });
-        }
         const hasSettled = event.time - gesture.openedAt >= MENU_PRESS_SETTLE_MS;
         if (!hasSettled) {
           // The pointer never entered the menu and the press was short: the
@@ -297,7 +208,7 @@ function stepOpen(gesture, event) {
       }
     case 'cancel':
       // As above: the gesture ends, so its document listeners come off. The
-      // menu stays open: a cancelled pointer did not ask to close it.
+      // menu stays open — a cancelled pointer did not ask to close it.
       return idle({
         type: 'settle',
         stray: false,
@@ -314,19 +225,21 @@ function stepOpen(gesture, event) {
 function stepTracking(gesture, event) {
   switch (event.type) {
     case 'move':
-      if (event.row === gesture.row) {
+      {
+        if (event.row === gesture.row) {
+          return {
+            gesture,
+            effect: NONE
+          };
+        }
         return {
-          gesture,
-          effect: NONE
+          gesture: {
+            ...gesture,
+            row: event.row
+          },
+          effect: highlightEffect(event.row)
         };
       }
-      return {
-        gesture: {
-          ...gesture,
-          row: event.row
-        },
-        effect: highlightEffect(event.row)
-      };
     case 'up':
       return release(gesture.pointerType, event);
     case 'cancel':
@@ -344,42 +257,4 @@ function stepTracking(gesture, event) {
         effect: NONE
       };
   }
-}
-
-// ---------------------------------------------------------------------------
-// The released public shape (`@astryxdesign/core/hooks`). The handoff
-// positions and `handoffFrom` stay internal: a caller of
-// `menuPressStep` keeps the settle rule, as released.
-// ---------------------------------------------------------------------------
-
-/**
- * The menu press machine, as released: one step from a gesture and an event
- * to the next gesture and the effect to apply. Pure.
- */
-export function menuPressStep(gesture, event) {
-  // The released machine keeps the settle rule. Positions start the handoff,
-  // so a caller's event reaches the transition without them.
-  const {
-    x: _x,
-    y: _y,
-    ...released
-  } = event;
-  const {
-    gesture: next,
-    effect
-  } = menuPressTransition(gesture, released);
-  return {
-    gesture: publicGesture(next),
-    effect
-  };
-}
-function publicGesture(gesture) {
-  if (gesture.phase !== 'open') {
-    return gesture;
-  }
-  return {
-    phase: 'open',
-    pointerType: gesture.pointerType,
-    openedAt: gesture.openedAt
-  };
 }

package/dist/hooks/useClickableContainer.d.ts

@@ -1,18 +1,16 @@
 /**
  * @file useClickableContainer.ts
  * @input Container ref, interactive element ref, click/href handlers
- * @output onClick, onMouseUp and onPointerDown handlers for the container;
- *   INTERACTIVE_SELECTORS list;
+ * @output onClick and onMouseUp handlers for the container; INTERACTIVE_SELECTORS list;
  *   hasInteractiveAncestor and the shared innermostInteractive walk
  * @position Core hook for clickable containers with nested interactive
  *   elements. A click on a nested button or link does not run the card's
- *   action, and a finger press there shows no press on the card. Each navigation
- *   passes the rule in utils/safeUrl.ts first.
+ *   action. Each navigation passes the rule in utils/safeUrl.ts first.
  *
  * SYNC: When modified, update:
  * - /packages/core/src/hooks/index.ts (export)
  */
-import { type RefObject, type MouseEvent, type PointerEvent } from 'react';
+import { type RefObject, type MouseEvent } from 'react';
 /**
  * The attribute this hook sets on the container it makes clickable. A click
  * inside a nested marked container belongs to that container (see
@@ -89,14 +87,6 @@ export interface UseClickableContainerOptions {
 export interface ClickableContainerResult {
     onClick: (event: MouseEvent<HTMLElement>) => void;
     onMouseUp: (event: MouseEvent<HTMLElement>) => void;
-    /**
-     * Spread on the container with `onClick`. A press that starts on a nested
-     * interactive element does not activate the container. On a container that
-     * paints its press with `usePressFeedback`, this drops that touch press.
-     * A mouse `:active` press paint is unchanged. A container without it keeps
-     * its activation rule and shows its pressed state for every press.
-     */
-    onPointerDown: (event: PointerEvent<HTMLElement>) => void;
 }
 /**
  * Hook that makes a container element clickable while preserving
@@ -113,16 +103,12 @@ export interface ClickableContainerResult {
  * @example
  * ```
  * const containerRef = useRef<HTMLDivElement>(null);
- * const { onClick, onMouseUp, onPointerDown } = useClickableContainer({
+ * const { onClick, onMouseUp } = useClickableContainer({
  *   containerRef,
  *   onClick: () => console.log('card clicked'),
  * });
  * return (
- *   <div
- *     ref={containerRef}
- *     onClick={onClick}
- *     onMouseUp={onMouseUp}
- *     onPointerDown={onPointerDown}>
+ *   <div ref={containerRef} onClick={onClick} onMouseUp={onMouseUp}>
  *     <p>Click anywhere on this card</p>
  *     <button onClick={() => alert('button')}>Nested button</button>
  *   </div>

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

@@ -1 +1 @@
-{"version":3,"file":"useClickableContainer.d.ts","sourceRoot":"","sources":["../../src/hooks/useClickableContainer.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAGL,KAAK,SAAS,EACd,KAAK,UAAU,EACf,KAAK,YAAY,EAClB,MAAM,OAAO,CAAC;AAKf;;;;GAIG;AACH,eAAO,MAAM,6BAA6B,6BAA6B,CAAC;AAExE;;;;;;;;;;GAUG;AACH,eAAO,MAAM,qBAAqB,QAmBvB,CAAC;AAIZ;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAKrE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,OAAO,EACX,MAAM,EAAE,OAAO,GAAG,IAAI,EACtB,aAAa,GAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAqC,GACzE,OAAO,GAAG,IAAI,CAShB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAE5E;AASD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CASvD;AAED,MAAM,WAAW,4BAA4B;IAC3C,yCAAyC;IACzC,YAAY,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC5C,mEAAmE;IACnE,cAAc,CAAC,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC/C,oBAAoB;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IACnD;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wCAAwC;IACxC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IAClD,SAAS,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IACpD;;;;;;OAMG;IACH,aAAa,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;CAC3D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,YAAY,EACZ,cAAc,EACd,OAAO,EAAE,WAAW,EACpB,IAAI,EACJ,MAAM,EACN,QAAgB,GACjB,EAAE,4BAA4B,GAAG,wBAAwB,CAwIzD"}
+{"version":3,"file":"useClickableContainer.d.ts","sourceRoot":"","sources":["../../src/hooks/useClickableContainer.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAyB,KAAK,SAAS,EAAE,KAAK,UAAU,EAAC,MAAM,OAAO,CAAC;AAI9E;;;;GAIG;AACH,eAAO,MAAM,6BAA6B,6BAA6B,CAAC;AAExE;;;;;;;;;;GAUG;AACH,eAAO,MAAM,qBAAqB,QAmBvB,CAAC;AAIZ;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAKrE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,OAAO,EACX,MAAM,EAAE,OAAO,GAAG,IAAI,EACtB,aAAa,GAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAqC,GACzE,OAAO,GAAG,IAAI,CAShB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAE5E;AASD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CASvD;AAED,MAAM,WAAW,4BAA4B;IAC3C,yCAAyC;IACzC,YAAY,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC5C,mEAAmE;IACnE,cAAc,CAAC,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC/C,oBAAoB;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IACnD;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wCAAwC;IACxC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IAClD,SAAS,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;CACrD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,YAAY,EACZ,cAAc,EACd,OAAO,EAAE,WAAW,EACpB,IAAI,EACJ,MAAM,EACN,QAAgB,GACjB,EAAE,4BAA4B,GAAG,wBAAwB,CA+GzD"}

package/dist/hooks/useClickableContainer.js

@@ -5,13 +5,11 @@
 /**
  * @file useClickableContainer.ts
  * @input Container ref, interactive element ref, click/href handlers
- * @output onClick, onMouseUp and onPointerDown handlers for the container;
- *   INTERACTIVE_SELECTORS list;
+ * @output onClick and onMouseUp handlers for the container; INTERACTIVE_SELECTORS list;
  *   hasInteractiveAncestor and the shared innermostInteractive walk
  * @position Core hook for clickable containers with nested interactive
  *   elements. A click on a nested button or link does not run the card's
- *   action, and a finger press there shows no press on the card. Each navigation
- *   passes the rule in utils/safeUrl.ts first.
+ *   action. Each navigation passes the rule in utils/safeUrl.ts first.
  *
  * SYNC: When modified, update:
  * - /packages/core/src/hooks/index.ts (export)
@@ -19,7 +17,6 @@
 import { useCallback, useEffect } from 'react';
 import { isLayerSurface } from "../Layer/layerSurfacePress.js";
 import { isSafeUrl } from "../utils/safeUrl.js";
-import { cancelPress } from "../utils/pressFeedback.js";
 
 /**
  * The attribute this hook sets on the container it makes clickable. A click
@@ -126,16 +123,12 @@ export function hasTextSelection(node) {
  * @example
  * ```
  * const containerRef = useRef<HTMLDivElement>(null);
- * const { onClick, onMouseUp, onPointerDown } = useClickableContainer({
+ * const { onClick, onMouseUp } = useClickableContainer({
  *   containerRef,
  *   onClick: () => console.log('card clicked'),
  * });
  * return (
- *   <div
- *     ref={containerRef}
- *     onClick={onClick}
- *     onMouseUp={onMouseUp}
- *     onPointerDown={onPointerDown}>
+ *   <div ref={containerRef} onClick={onClick} onMouseUp={onMouseUp}>
  *     <p>Click anywhere on this card</p>
  *     <button onClick={() => alert('button')}>Nested button</button>
  *   </div>
@@ -233,24 +226,8 @@ export function useClickableContainer({
       window.open(href, '_blank', 'noopener');
     }
   }, [containerRef, href, disabled]);
-
-  // The press-state counterpart of onClick's rule, for touch: a finger press
-  // that would not activate the container shows no press on it. A mouse or
-  // pen press keeps its `:active` paint.
-  const onPointerDown = useCallback(event => {
-    const containerEl = containerRef.current;
-    const eventTarget = event.target;
-    if (event.pointerType !== 'touch' || disabled || containerEl == null || !(eventTarget instanceof Element) || eventTarget === event.currentTarget || !hasInteractiveAncestor(eventTarget, containerEl) ||
-    // The control the container delegates to is the container's own
-    // action: a press on it activates the container.
-    interactiveRef?.current?.contains(eventTarget) === true) {
-      return;
-    }
-    cancelPress(containerEl);
-  }, [containerRef, interactiveRef, disabled]);
   return {
     onClick,
-    onMouseUp,
-    onPointerDown
+    onMouseUp
   };
 }

package/dist/hooks/useMenuPress.d.ts

@@ -2,8 +2,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.
@@ -120,30 +119,6 @@ export interface UseMenuPressReturn {
     /** End the gesture in flight with nothing acting (the menu closed). */
     cancel: () => void;
 }
-/**
- * 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;
 /**
  * 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.
@@ -180,12 +155,4 @@ export type DropdownMenuPressReturn = UseMenuPressReturn;
  * ```
  */
 export declare function useMenuPress(options: UseMenuPressOptions): UseMenuPressReturn;
-/**
- * The press model with DropdownMenu's touch model
- * ({@link DropdownMenuPressOptions.touchModel}). Not exported from the hooks
- * entry point.
- *
- * @internal
- */
-export declare function useDropdownMenuPress(options: DropdownMenuPressOptions): DropdownMenuPressReturn;
 //# sourceMappingURL=useMenuPress.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useMenuPress.d.ts","sourceRoot":"","sources":["../../src/hooks/useMenuPress.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAML,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAEf,OAAO,EAML,KAAK,oBAAoB,EAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAuBpD,OAAO,EAAC,iBAAiB,EAAC,CAAC;AAE3B;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,mCAAmC,CAAC;AAExE;;;GAGG;AACH,eAAO,MAAM,yBAAyB,MAAwB,CAAC;AAC/D,iFAAiF;AACjF,eAAO,MAAM,wBAAwB,MAAyB,CAAC;AAC/D;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAM9C,oFAAoF;AACpF,eAAO,MAAM,6BAA6B,KAAK,CAAC;AAUhD;;;;;GAKG;AACH,wBAAgB,qBAAqB,IAAI,OAAO,CAE/C;AAED,4DAA4D;AAC5D,wBAAgB,uBAAuB,IAAI,IAAI,CAE9C;AAED,MAAM,WAAW,mBAAmB;IAClC,+EAA+E;IAC/E,OAAO,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IACvC,uEAAuE;IACvE,UAAU,CAAC,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC3C;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE,oBAAoB,KAAK,OAAO,CAAC;IAChE;;;;;OAKG;IACH,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,CAAC;IAChD;;;;OAIG;IACH,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;IAC/D,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,WAAW,GAAG,IAAI,CAAC;IACvC;;;;OAIG;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,OAAO,GAAG,IAAI,CAAC;IACnD,mBAAmB;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,+CAA+C;IAC/C,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,kBAAkB;IACjC,sEAAsE;IACtE,SAAS,EAAE;QACT,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;QAChE,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC;KACzB,CAAC;IACF,yEAAyE;IACzE,YAAY,EAAE;QACZ,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;QAChE,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;KAC/D,CAAC;IACF;;;;OAIG;IACH,uBAAuB,EAAE,MAAM,OAAO,CAAC;IACvC,uEAAuE;IACvE,MAAM,EAAE,MAAM,IAAI,CAAC;CACpB;AA0DD;;;;;;GAMG;AACH,MAAM,WAAW,wBAAyB,SAAQ,mBAAmB;IACnE;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC;CAClC;AAED;;;;;GAKG;AACH,MAAM,MAAM,uBAAuB,GAAG,kBAAkB,CAAC;AAczD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,kBAAkB,CAM7E;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,wBAAwB,GAChC,uBAAuB,CA6nBzB"}
+{"version":3,"file":"useMenuPress.d.ts","sourceRoot":"","sources":["../../src/hooks/useMenuPress.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAML,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAEf,OAAO,EAML,KAAK,oBAAoB,EAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAiBpD,OAAO,EAAC,iBAAiB,EAAC,CAAC;AAE3B;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,mCAAmC,CAAC;AAExE;;;GAGG;AACH,eAAO,MAAM,yBAAyB,MAAwB,CAAC;AAC/D,iFAAiF;AACjF,eAAO,MAAM,wBAAwB,MAAyB,CAAC;AAC/D;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAM9C,oFAAoF;AACpF,eAAO,MAAM,6BAA6B,KAAK,CAAC;AAUhD;;;;;GAKG;AACH,wBAAgB,qBAAqB,IAAI,OAAO,CAE/C;AAED,4DAA4D;AAC5D,wBAAgB,uBAAuB,IAAI,IAAI,CAE9C;AAED,MAAM,WAAW,mBAAmB;IAClC,+EAA+E;IAC/E,OAAO,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IACvC,uEAAuE;IACvE,UAAU,CAAC,EAAE,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC3C;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;;;OAOG;IACH,cAAc,CAAC,EAAE,CAAC,WAAW,EAAE,oBAAoB,KAAK,OAAO,CAAC;IAChE;;;;;OAKG;IACH,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI,KAAK,IAAI,CAAC;IAChD;;;;OAIG;IACH,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;IAC/D,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;IACvB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,WAAW,GAAG,IAAI,CAAC;IACvC;;;;OAIG;IACH,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,OAAO,GAAG,IAAI,CAAC;IACnD,mBAAmB;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,+CAA+C;IAC/C,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,kBAAkB;IACjC,sEAAsE;IACtE,SAAS,EAAE;QACT,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;QAChE,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC;KACzB,CAAC;IACF,yEAAyE;IACzE,YAAY,EAAE;QACZ,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;QAChE,aAAa,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;KAC/D,CAAC;IACF;;;;OAIG;IACH,uBAAuB,EAAE,MAAM,OAAO,CAAC;IACvC,uEAAuE;IACvE,MAAM,EAAE,MAAM,IAAI,CAAC;CACpB;AA0DD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,kBAAkB,CAglB7E"}

package/dist/hooks/useMenuPress.js

@@ -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.
@@ -20,14 +19,13 @@
  */
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { currentGesture } from "../Layer/gestureCounter.js";
-import { IDLE_MENU_PRESS, menuPressTransition } from "./menuPressGesture.js";
+import { IDLE_MENU_PRESS, menuPressStep } from "./menuPressGesture.js";
 import { MENU_PRESS_MARKER } from "./menuPressMarker.js";
 import { useLongPressDetector } from "./useLongPress.js";
 import { edgeAutoscroll } from "../utils/edgeAutoscroll.js";
 import { focusForLastInput } from "../utils/focusReturn.js";
 import { useInteractionModalityTrackingFor } from "../utils/interactionModality.js";
 import { LONG_PRESS_DURATION_MS } from "../motion/uikit/longPress.js";
-import { clearMenuPressLit, holdMenuPressPaint, markMenuPressLit, releaseMenuPressPaint } from "../privateAttributes/menuPressLit.stylex.js";
 import { __resetClickGuardForTest, armClickGuard, CLICK_GUARD_WINDOW_MS, withoutClickGuard } from "../utils/clickGuard.js";
 export { MENU_PRESS_MARKER };
 const MENU_PRESS_ROOT_SELECTOR = `[${MENU_PRESS_MARKER}]`;
@@ -126,34 +124,6 @@ function isInMenuTree(element, root) {
   const owner = element.closest(MENU_PRESS_ROOT_SELECTOR);
   return owner != null && getOutermostRoot(owner) === root;
 }
-
-/**
- * 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
- */
-
-/**
- * What core's own menus get from {@link useDropdownMenuPress}: the public
- * return. Not exported from the hooks entry point.
- *
- * @internal
- */
-
-/**
- * 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, hasHandoff) {
-  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.
@@ -190,26 +160,6 @@ function handoffPosition(event, hasHandoff) {
  * ```
  */
 export function useMenuPress(options) {
-  // The touch model is DropdownMenu's alone; an untyped caller's
-  // `touchModel` does not reach the model.
-  const {
-    touchModel: _touchModel,
-    ...publicOptions
-  } = options;
-  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) {
   const optionsRef = useRef(options);
   optionsRef.current = options;
   // The highlight, and the hover focus of the rows in this menu, follow the
@@ -297,18 +247,8 @@ export function useDropdownMenuPress(options) {
     autoscroll.stop();
     autoscrollRef.current = null;
   }, [autoscroll]);
-  const litRowRef = useRef(null);
-  const heldMenuRef = useRef(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();
@@ -319,36 +259,10 @@ export function useDropdownMenuPress(options) {
     gestureRef.current = IDLE_MENU_PRESS;
   }, [stopAutoscroll]);
   const highlight = useCallback(row => {
-    // 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;
@@ -455,7 +369,7 @@ export function useDropdownMenuPress(options) {
     }
   }, [activate, endGesture, getDocument, highlight]);
   const step = useCallback((event, native) => {
-    const result = menuPressTransition(gestureRef.current, event);
+    const result = menuPressStep(gestureRef.current, event);
     gestureRef.current = result.gesture;
     applyEffect(result.effect, result.gesture, native);
   }, [applyEffect]);
@@ -552,8 +466,7 @@ export function useDropdownMenuPress(options) {
         type: 'move',
         row: point.row,
         isInMenu: point.isInMenu,
-        time: Date.now(),
-        ...handoffPosition(event, optionsRef.current.touchModel === 'uikit')
+        time: Date.now()
       }, event);
       updateAutoscroll(event);
     };
@@ -567,8 +480,7 @@ export function useDropdownMenuPress(options) {
         row: point.row,
         isInMenu: point.isInMenu,
         isOnTrigger: point.isOnTrigger,
-        time: Date.now(),
-        ...handoffPosition(event, optionsRef.current.touchModel === 'uikit')
+        time: Date.now()
       }, event);
     };
     const onCancel = event => {

package/dist/motion/transientCopy.d.ts

@@ -4,8 +4,7 @@ export declare function isCopyable(element: Element): boolean;
  * 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 declare function inertCopy(element: HTMLElement): HTMLElement | null;
 /** The background `element` shows: its own, or the nearest ancestor's. */
@@ -13,8 +12,7 @@ export declare 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 declare function placeOver(element: HTMLElement, host: Element, rect: DOMRect): void;
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"transientCopy.d.ts","sourceRoot":"","sources":["../../src/motion/transientCopy.ts"],"names":[],"mappings":"AA0CA,iDAAiD;AACjD,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAEpD;AA+HD;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI,CA8ClE;AAED,0EAA0E;AAC1E,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAQ1D;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CACvB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,GACZ,IAAI,CAiEN;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,WAAW,GAAG;IACrD,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;CACf,GAAG,IAAI,CAoDP;AAID;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,EAAE,CA6BrD"}
+{"version":3,"file":"transientCopy.d.ts","sourceRoot":"","sources":["../../src/motion/transientCopy.ts"],"names":[],"mappings":"AAiCA,iDAAiD;AACjD,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAEpD;AAqHD;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI,CA0ClE;AAED,0EAA0E;AAC1E,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAQ1D;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CACvB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,OAAO,GACZ,IAAI,CAwDN;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,WAAW,GAAG;IACrD,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;CACf,GAAG,IAAI,CA8CP;AAID;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,EAAE,CA6BrD"}