@astryxdesign/core 0.7.7-canary.fc68123 → 0.7.7

package/src/hooks/actionGroupTracker.ts

@@ -57,8 +57,7 @@ export interface ActionGroupTrackerOptions {
    * target past the group's ends commits the lift there wherever the finger
    * lifts.
    * @default the target whose rect, grown by `highlightExpansion`, holds the
-   *   point, the one the press landed on where several do; none between or
-   *   outside them
+   *   point; none between or outside them
    */
   resolveTarget?: (
     x: number,
@@ -84,13 +83,8 @@ export interface ActionGroupTracker {
   /**
    * A press began at viewport (x, y): read the actions' rects once and
    * highlight the one under it. An inert press is taken but tracks nothing.
-   * `landed` is the node the press landed on.
    */
-  begin(
-    x: number,
-    y: number,
-    options?: {inert?: boolean; landed?: Node | null},
-  ): void;
+  begin(x: number, y: number, options?: {inert?: boolean}): void;
   /** The finger moved to viewport (x, y). */
   move(x: number, y: number): void;
   /**
@@ -156,7 +150,6 @@ export function createActionGroupTracker(
   let actions: TrackedAction[] = [];
   let highlighted: HTMLElement | null = null;
   let beganOn: HTMLElement | null = null;
-  let landedOn: Node | null = null;
   let isTracking = false;
   let isInert = false;
   // The finger's last position: `remeasure` resolves it again.
@@ -248,9 +241,6 @@ export function createActionGroupTracker(
     if (resolveTarget != null) {
       return actions.length === 0 ? null : resolveTarget(x, y, actions);
     }
-    // Rects that share an edge, or that have no layout (a test renderer), can
-    // both hold the point: the one the press landed on wins.
-    let first: HTMLElement | null = null;
     for (const action of actions) {
       if (
         x >= action.left - margin &&
@@ -258,26 +248,22 @@ export function createActionGroupTracker(
         y >= action.top - margin &&
         y <= action.bottom + margin
       ) {
-        if (landedOn != null && action.element.contains(landedOn)) {
-          return action.element;
-        }
-        first ??= action.element;
+        return action.element;
       }
     }
-    return first;
+    return null;
   };
 
   const reset = () => {
     actions = [];
     highlighted = null;
     beganOn = null;
-    landedOn = null;
     isTracking = false;
     isInert = false;
   };
 
   return {
-    begin(x, y, {inert = false, landed = null} = {}) {
+    begin(x, y, {inert = false} = {}) {
       // A press can begin while another is tracked, when a second recognizer
       // takes over the finger (a trigger's held press, then the menu's): the
       // action the first one lit loses its paint.
@@ -290,7 +276,6 @@ export function createActionGroupTracker(
       highlighted = null;
       isTracking = true;
       isInert = inert;
-      landedOn = landed;
       lastX = x;
       lastY = y;
       getOptions().onMove?.(x, y);

package/src/hooks/index.ts

@@ -133,8 +133,6 @@ export type {
   UseInteractiveRoleOptions,
 } from './useInteractiveRole';
 
-export {useAnimator} from './useAnimator';
-
 export {useLongPress} from './useLongPress';
 export type {UseLongPressOptions, UseLongPressHandlers} from './useLongPress';
 

package/src/hooks/useAttachment.ts

@@ -9,7 +9,7 @@
  * @output Exports useAttachment and useAttachmentPair (two elements): they keep
  *   the attach function bound to the nodes the refs hold across commits
  * @position Internal React helper, not in hooks/index.ts: the one attach and
- *   release lifecycle of the gesture hooks, the pager and useAnimator
+ *   release lifecycle of the gesture hooks and the pager
  *
  * SYNC: When modified, update gestures/__tests__/useGestureRecognizer.test.tsx,
  * gestures/__tests__/useFingerScroll.test.tsx and

package/src/hooks/useInputStatusIcon.tsx

@@ -15,10 +15,9 @@
 import {useCallback, useEffect, useState} from 'react';
 import type {ReactNode} from 'react';
 import * as stylex from '@stylexjs/stylex';
-import {Icon, type IconSize} from '../Icon/Icon';
-import type {IconName} from '../Icon/globalIconRegistry';
+import {Icon, type IconName, type IconSize} from '../Icon';
 import type {InputStatus, InputStatusType} from '../Field/types';
-import {useTooltip} from '../Tooltip/useTooltip';
+import {useTooltip} from '../Tooltip';
 import {radiusVars} from '../theme/tokens.stylex';
 import {themeProps} from '../utils/themeProps';
 import {focusOutlineStyles} from '../utils/focusOutline.stylex';

package/src/hooks/useLongPress.doc.mjs

@@ -59,7 +59,7 @@ export const docs = {
   ],
   usage: {
     description:
-      'Detects a single-finger press-and-hold and reports where it happened, so touch users can reach affordances that a pointer gets from right-click. iOS Safari never synthesizes a contextmenu event on long-press, which makes this the only touch route into a cursor-positioned surface such as ContextMenu. The press cancels on movement, lift, multi-touch or unmount. The hold is timed on the touch events\u2019 own timestamps: when a busy page handles the lift late, a finger held for the full delay still reports its long press, before the lift acts.',
+      'Detects a single-finger press-and-hold and reports where it happened, so touch users can reach affordances that a pointer gets from right-click. iOS Safari never synthesizes a contextmenu event on long-press, which makes this the only touch route into a cursor-positioned surface such as ContextMenu. The press cancels on movement, lift, multi-touch or unmount.',
     bestPractices: [
       {
         guidance: true,
@@ -102,7 +102,7 @@ export const docsDense = {
   },
   usage: {
     description:
-      "Touch press-and-hold for affordances a pointer reaches by right-click (e.g. ContextMenu). Reports the point so the surface opens under the finger. Timed on the touch events' timestamps: a busy page delays the report, never drops it.",
+      'Touch press-and-hold for affordances a pointer reaches by right-click (e.g. ContextMenu). Reports the point so the surface opens under the finger.',
     bestPractices: [
       {
         guidance: true,

package/src/hooks/useLongPress.ts

@@ -25,11 +25,6 @@
 // its tolerance as a distance, as UIKit does. This hook measures it on each
 // axis. The context menu's own movement allowance is a guess and is not
 // measured yet (AST-094).
-//
-// The hold is a deadline on the touch events' timestamps, on the clock of the
-// touch's own window. A busy main thread can delay the timer past the
-// deadline. A touch stamped after the deadline then reports the press before
-// it acts.
 
 import {useCallback, useEffect, useRef} from 'react';
 import {
@@ -42,41 +37,6 @@ import {
 const DEFAULT_DELAY_MS = LONG_PRESS_DURATION_MS;
 const DEFAULT_MOVE_CANCEL_PX = LONG_PRESS_ALLOWABLE_MOVEMENT_PX;
 
-/** The part of a window's performance timeline a press reads. */
-type EventClock = Pick<Performance, 'now'>;
-
-function clockOf(e: React.TouchEvent): EventClock | null {
-  const view = e.view as unknown as {performance?: EventClock} | null;
-  return (
-    view?.performance ??
-    (typeof performance === 'undefined' ? null : performance)
-  );
-}
-
-/**
- * An event's time on its window's clock. jsdom stamps events with
- * `Date.now()`. The hook reads the age of such a stamp on that clock, so a
- * frozen system time keeps the hold's length. A stamp nearer `Date.now()` than
- * the window's clock is that kind of stamp.
- */
-function timeOn(
-  clock: EventClock | null,
-  timeStamp: number | undefined,
-): number | undefined {
-  // A stamp of 0 means the event carries no time, so the hold falls back to
-  // the full delay on the page's timer.
-  if (timeStamp == null || !Number.isFinite(timeStamp) || timeStamp <= 0) {
-    return undefined;
-  }
-  if (
-    clock != null &&
-    Math.abs(Date.now() - timeStamp) < Math.abs(clock.now() - timeStamp)
-  ) {
-    return clock.now() - (Date.now() - timeStamp);
-  }
-  return timeStamp;
-}
-
 export interface UseLongPressOptions {
   /** Fired with the touch start point once the press is held for `delayMs`. */
   onLongPress: (point: {x: number; y: number}) => void;
@@ -99,12 +59,8 @@ export interface LongPressTolerance {
 export interface UseLongPressHandlers {
   onTouchStart: (e: React.TouchEvent) => void;
   onTouchMove: (e: React.TouchEvent) => void;
-  /**
-   * The lift. Pass the event, so a press it is stamped past (its timer held
-   * back by a busy page) still reports first. Spreading the handlers does.
-   */
-  onTouchEnd: (e?: React.TouchEvent) => void;
-  onTouchCancel: (e?: React.TouchEvent) => void;
+  onTouchEnd: () => void;
+  onTouchCancel: () => void;
   /**
    * Begin detection at a point, for a caller driving this from its own
    * pointer events rather than the touch handlers above.
@@ -162,9 +118,6 @@ export function useLongPressDetector(
 
   const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const startRef = useRef<{x: number; y: number} | null>(null);
-  // The pending press's deadline and clock, when it started from a touch.
-  const deadlineRef = useRef<number | null>(null);
-  const clockRef = useRef<EventClock | null>(null);
   // The press in progress's tolerance, when its caller chose one at start.
   const pressToleranceRef = useRef<LongPressTolerance | null>(null);
   // Keep the latest callback without re-creating handlers on every render.
@@ -177,39 +130,10 @@ export function useLongPressDetector(
       timerRef.current = null;
     }
     startRef.current = null;
-    deadlineRef.current = null;
-    clockRef.current = null;
   }, []);
 
-  const fire = useCallback(() => {
-    const from = startRef.current;
-    if (from == null) {
-      return;
-    }
-    clear();
-    onLongPressRef.current({x: from.x, y: from.y});
-  }, [clear]);
-
-  // A touch stamped at or past the deadline: the finger was down for the
-  // whole delay, so the press reports before the touch acts.
-  const fireIfDue = useCallback(
-    (e: React.TouchEvent | undefined) => {
-      const deadline = deadlineRef.current;
-      const eventTime =
-        e == null ? undefined : timeOn(clockRef.current, e.timeStamp);
-      if (deadline != null && eventTime != null && eventTime >= deadline) {
-        fire();
-      }
-    },
-    [fire],
-  );
-
-  const begin = useCallback(
-    (
-      point: {x: number; y: number},
-      tolerance: LongPressTolerance | undefined,
-      started: {at: number; clock: EventClock} | undefined,
-    ) => {
+  const start = useCallback(
+    (point: {x: number; y: number}, tolerance?: LongPressTolerance) => {
       if (disabled) {
         return;
       }
@@ -218,40 +142,15 @@ export function useLongPressDetector(
       clear();
       startRef.current = {x: point.x, y: point.y};
       pressToleranceRef.current = tolerance ?? null;
-      const clock = started?.clock ?? null;
-      const deadline = started == null ? null : started.at + delayMs;
-      clockRef.current = clock;
-      deadlineRef.current = deadline;
-      // Wait only for the rest of the hold, so a touch handled late does not
-      // lengthen it, and never past the delay.
-      const remaining =
-        clock == null || deadline == null
-          ? delayMs
-          : Math.min(delayMs, Math.max(0, deadline - clock.now()));
-      // A late timer yields to queued input once, so a lift stamped before
-      // the deadline still cancels the press. The gesture arena does the same.
-      const run = (mayYield: boolean) => {
-        timerRef.current = null;
-        if (
-          mayYield &&
-          clock != null &&
-          deadline != null &&
-          clock.now() > deadline
-        ) {
-          timerRef.current = setTimeout(() => run(false), 0);
+      timerRef.current = setTimeout(() => {
+        const from = startRef.current;
+        if (from == null) {
           return;
         }
-        fire();
-      };
-      timerRef.current = setTimeout(() => run(true), remaining);
+        onLongPressRef.current({x: from.x, y: from.y});
+      }, delayMs);
     },
-    [disabled, delayMs, clear, fire],
-  );
-
-  const start = useCallback(
-    (point: {x: number; y: number}, tolerance?: LongPressTolerance) =>
-      begin(point, tolerance, undefined),
-    [begin],
+    [disabled, delayMs, clear],
   );
 
   const moveTo = useCallback(
@@ -280,29 +179,17 @@ export function useLongPressDetector(
         return;
       }
       if (e.touches.length !== 1) {
-        // A second finger ends the press, unless the press was already due.
-        fireIfDue(e);
         clear();
         return;
       }
       const touch = e.touches[0];
-      const clock = clockOf(e);
-      const at = timeOn(clock, e.timeStamp);
-      begin(
-        {x: touch.clientX, y: touch.clientY},
-        undefined,
-        clock == null || at == null ? undefined : {at, clock},
-      );
+      start({x: touch.clientX, y: touch.clientY});
     },
-    [disabled, clear, begin, fireIfDue],
+    [disabled, clear, start],
   );
 
   const onTouchMove = useCallback(
     (e: React.TouchEvent) => {
-      if (startRef.current == null) {
-        return;
-      }
-      fireIfDue(e);
       if (startRef.current == null) {
         return;
       }
@@ -313,15 +200,7 @@ export function useLongPressDetector(
       const touch = e.touches[0];
       moveTo({x: touch.clientX, y: touch.clientY});
     },
-    [clear, moveTo, fireIfDue],
-  );
-
-  const onTouchEnd = useCallback(
-    (e?: React.TouchEvent) => {
-      fireIfDue(e);
-      clear();
-    },
-    [clear, fireIfDue],
+    [clear, moveTo],
   );
 
   useEffect(() => clear, [clear]);
@@ -329,8 +208,8 @@ export function useLongPressDetector(
   return {
     onTouchStart,
     onTouchMove,
-    onTouchEnd,
-    onTouchCancel: onTouchEnd,
+    onTouchEnd: clear,
+    onTouchCancel: clear,
     start,
     moveTo,
     cancel: clear,

package/src/i18n/generated-english/PowerSearch/PowerSearchValueEditor.generated.ts

@@ -7,12 +7,6 @@
  */
 
 const english: Readonly<Record<string, string>> = {
-  "@astryx.powersearch.sheet.relativeDaysAgo": "{count, number} {count, plural, one {day} other {days}} ago",
-  "@astryx.powersearch.sheet.relativeDaysFromNow": "{count, number} {count, plural, one {day} other {days}} from now",
-  "@astryx.powersearch.sheet.relativeMonthsAgo": "{count, number} {count, plural, one {month} other {months}} ago",
-  "@astryx.powersearch.sheet.relativeMonthsFromNow": "{count, number} {count, plural, one {month} other {months}} from now",
-  "@astryx.powersearch.sheet.relativeWeeksAgo": "{count, number} {count, plural, one {week} other {weeks}} ago",
-  "@astryx.powersearch.sheet.relativeWeeksFromNow": "{count, number} {count, plural, one {week} other {weeks}} from now",
   "@astryx.powersearch.valueEditor.addValuesPlaceholder": "Add values…",
   "@astryx.powersearch.valueEditor.date": "Date",
   "@astryx.powersearch.valueEditor.dateRange": "date range",

package/src/i18n/generated-locales/en.generated.ts

@@ -78,47 +78,6 @@ const runtimeCatalog: Readonly<Record<string, string>> = {
     '{count, number} {count, plural, one {filter} other {filters}}',
   '@astryx.powersearch.resultCount':
     '{count, number} {count, plural, one {result} other {results}}',
-  '@astryx.powersearch.sheet.filtersTitle': 'Filters',
-  '@astryx.powersearch.sheet.addFilter': 'Add filter',
-  '@astryx.powersearch.sheet.noFilters': 'No filters applied',
-  '@astryx.powersearch.sheet.noFiltersDescription':
-    'Add a filter to narrow your results and find what you need faster.',
-  '@astryx.powersearch.sheet.clearAll': 'Clear all',
-  '@astryx.powersearch.sheet.clearAllTitle': 'Clear all filters?',
-  '@astryx.powersearch.sheet.clearAllDescription':
-    'This removes all editable filters from this search.',
-  '@astryx.powersearch.sheet.clearAllConfirm': 'Clear filters',
-  '@astryx.powersearch.sheet.clearAllCancel': 'Keep filters',
-  '@astryx.powersearch.sheet.done': 'Done',
-  '@astryx.powersearch.sheet.search': 'Search',
-  '@astryx.powersearch.sheet.searchResults': 'Search results',
-  '@astryx.powersearch.sheet.searchFields': 'Search filters',
-  '@astryx.powersearch.sheet.searchFieldsPlaceholder': 'Search filters…',
-  '@astryx.powersearch.sheet.ungroupedFields': 'General',
-  '@astryx.powersearch.sheet.noMatchingFields': 'No filters match your search',
-  '@astryx.powersearch.sheet.tryDifferentSearch': 'Try a different search.',
-  '@astryx.powersearch.sheet.noResults': 'No results found',
-  '@astryx.powersearch.sheet.filterUnavailable':
-    'This filter is no longer available',
-  '@astryx.powersearch.sheet.removeFilter': 'Remove {field} filter',
-  '@astryx.powersearch.sheet.relativeDaysAgo':
-    '{count, number} {count, plural, one {day} other {days}} ago',
-  '@astryx.powersearch.sheet.relativeDaysFromNow':
-    '{count, number} {count, plural, one {day} other {days}} from now',
-  '@astryx.powersearch.sheet.relativeWeeksAgo':
-    '{count, number} {count, plural, one {week} other {weeks}} ago',
-  '@astryx.powersearch.sheet.relativeWeeksFromNow':
-    '{count, number} {count, plural, one {week} other {weeks}} from now',
-  '@astryx.powersearch.sheet.relativeMonthsAgo':
-    '{count, number} {count, plural, one {month} other {months}} ago',
-  '@astryx.powersearch.sheet.relativeMonthsFromNow':
-    '{count, number} {count, plural, one {month} other {months}} from now',
-  '@astryx.powersearch.sheet.fieldOperator': '{field} {operator}',
-  '@astryx.powersearch.sheet.labelValue': '{label} {value}',
-  '@astryx.powersearch.sheet.filtersClearedWithCount':
-    'All filters removed. {resultCount}',
-  '@astryx.powersearch.sheet.editableFiltersClearedWithCount':
-    'Editable filters removed. {resultCount}',
   '@astryx.alertDialog.cancel': 'Cancel',
   '@astryx.appShell.mobileNavigation': 'Mobile navigation',
   '@astryx.appShell.skipToContent': 'Skip to content',

package/src/i18n/generated-locales/pseudo.generated.ts

@@ -80,48 +80,6 @@ const runtimeCatalog: Readonly<Record<string, string>> = {
     '⟦{count, number} {count, plural, one {filter} other {filters}}⟧',
   '@astryx.powersearch.resultCount':
     '⟦{count, number} {count, plural, one {result} other {results}}⟧',
-  '@astryx.powersearch.sheet.filtersTitle': '⟦Ƒíłţéřš⟧',
-  '@astryx.powersearch.sheet.addFilter': '⟦Àðð ƒíłţéř⟧',
-  '@astryx.powersearch.sheet.noFilters': '⟦Ñó ƒíłţéřš àþþłíéð⟧',
-  '@astryx.powersearch.sheet.noFiltersDescription':
-    '⟦Àðð à ƒíłţéř ţó ñàřřóŵ ýóúř řéšúłţš àñð ƒíñð ŵĥàţ ýóú ñééð ƒàšţéř.⟧',
-  '@astryx.powersearch.sheet.clearAll': '⟦Çłéàř àłł⟧',
-  '@astryx.powersearch.sheet.clearAllTitle': '⟦Çłéàř àłł ƒíłţéřš?⟧',
-  '@astryx.powersearch.sheet.clearAllDescription':
-    '⟦Ţĥíš řéɱóṽéš àłł éðíţàƀłé ƒíłţéřš ƒřóɱ ţĥíš šéàřçĥ.⟧',
-  '@astryx.powersearch.sheet.clearAllConfirm': '⟦Çłéàř ƒíłţéřš⟧',
-  '@astryx.powersearch.sheet.clearAllCancel': '⟦Ķééþ ƒíłţéřš⟧',
-  '@astryx.powersearch.sheet.done': '⟦Ðóñé⟧',
-  '@astryx.powersearch.sheet.search': '⟦Šéàřçĥ⟧',
-  '@astryx.powersearch.sheet.searchResults': '⟦Šéàřçĥ řéšúłţš⟧',
-  '@astryx.powersearch.sheet.searchFields': '⟦Šéàřçĥ ƒíłţéřš⟧',
-  '@astryx.powersearch.sheet.searchFieldsPlaceholder': '⟦Šéàřçĥ ƒíłţéřš…⟧',
-  '@astryx.powersearch.sheet.ungroupedFields': '⟦Ĝéñéřàł⟧',
-  '@astryx.powersearch.sheet.noMatchingFields':
-    '⟦Ñó ƒíłţéřš ɱàţçĥ ýóúř šéàřçĥ⟧',
-  '@astryx.powersearch.sheet.tryDifferentSearch': '⟦Ţřý à ð탃éřéñţ šéàřçĥ.⟧',
-  '@astryx.powersearch.sheet.noResults': '⟦Ñó řéšúłţš ƒóúñð⟧',
-  '@astryx.powersearch.sheet.filterUnavailable':
-    '⟦Ţĥíš ƒíłţéř íš ñó łóñĝéř àṽàíłàƀłé⟧',
-  '@astryx.powersearch.sheet.removeFilter': '⟦Řéɱóṽé {field} ƒíłţéř⟧',
-  '@astryx.powersearch.sheet.relativeDaysAgo':
-    '⟦{count, number} {count, plural, one {day} other {days}} àĝó⟧',
-  '@astryx.powersearch.sheet.relativeDaysFromNow':
-    '⟦{count, number} {count, plural, one {day} other {days}} ƒřóɱ ñóŵ⟧',
-  '@astryx.powersearch.sheet.relativeWeeksAgo':
-    '⟦{count, number} {count, plural, one {week} other {weeks}} àĝó⟧',
-  '@astryx.powersearch.sheet.relativeWeeksFromNow':
-    '⟦{count, number} {count, plural, one {week} other {weeks}} ƒřóɱ ñóŵ⟧',
-  '@astryx.powersearch.sheet.relativeMonthsAgo':
-    '⟦{count, number} {count, plural, one {month} other {months}} àĝó⟧',
-  '@astryx.powersearch.sheet.relativeMonthsFromNow':
-    '⟦{count, number} {count, plural, one {month} other {months}} ƒřóɱ ñóŵ⟧',
-  '@astryx.powersearch.sheet.fieldOperator': '⟦{field} {operator}⟧',
-  '@astryx.powersearch.sheet.labelValue': '⟦{label} {value}⟧',
-  '@astryx.powersearch.sheet.filtersClearedWithCount':
-    '⟦Àłł ƒíłţéřš řéɱóṽéð. {resultCount}⟧',
-  '@astryx.powersearch.sheet.editableFiltersClearedWithCount':
-    '⟦Éðíţàƀłé ƒíłţéřš řéɱóṽéð. {resultCount}⟧',
   '@astryx.alertDialog.cancel': '⟦Çàñçéł⟧',
   '@astryx.appShell.mobileNavigation': '⟦Ṁóƀíłé ñàṽíĝàţíóñ⟧',
   '@astryx.appShell.skipToContent': '⟦Šķíþ ţó çóñţéñţ⟧',

package/src/index.ts

@@ -173,19 +173,6 @@ export * from './Outline';
 // Overflow list
 export * from './OverflowList';
 
-// Animating one element: from the package root only, since one API has one
-// entry. Its hook ships from './hooks'.
-export {
-  createAnimator,
-  type Animator,
-  type AnimatorAnimateOptions,
-  type AnimatorChannel,
-  type AnimatorDecayVelocity,
-  type AnimatorHandle,
-  type AnimatorSnapshot,
-  type AnimatorValues,
-} from './animator/createAnimator';
-
 // Hooks
 export * from './hooks';
 

package/src/motion/README.md

@@ -19,7 +19,6 @@ roles through `resolveMotion`.
 | `uikit/scroll.ts`                                | UIScrollView: deceleration rates, rubber band, bounce-back spring, `delaysContentTouches`, scroll to top.                                                            |
 | `uikit/timing.ts`                                | Non-spring clocks and curves: press highlight, Core Animation's named curves, keyboard, Reduced Motion cross-fade.                                                   |
 | `uikit/paging.ts`                                | A paging UIScrollView: the integrator that settles a release on its page, the page rule, the catch, `setContentOffset(animated:)`.                                   |
-| `uikit/alert.ts`                                 | UIAlertController: how a finger is tracked across the actions (highlight onset and bounds).                                                                          |
 | `uikit/navigation.ts`                            | UINavigationController: push velocity, parallax, dimming, transition clock, interactive pop finish rule.                                                             |
 | `uikit/progressBar.ts`                           | UIProgressView's fill: the whole-track duration and curve, its minimum length and empty alpha; the reduced-motion pulse (three roles).                               |
 | `uikit/gestures.ts`                              | Gesture recognizer thresholds, the velocity filter and haptic stand-ins, as `{value, unit}` entries (sources in JSDoc).                                              |
@@ -38,7 +37,6 @@ roles through `resolveMotion`.
 | `resolveSnapPoint.ts`                            | Release policy: the snap point a release lands on (flick, back-out cancel, step limit), on `selectSnapPoint`. Internal.                                              |
 | `bezier.ts`                                      | Cubic-bézier timing functions (Core Animation's named curves).                                                                                                       |
 | `animator.ts`                                    | Compositor animator: springs, coasts and any closed-form curve compiled to Web Animations, read back analytically.                                                   |
-| `progress.ts`                                    | A spring's progress, one curve mapped from another (companions, clamped ranges), the velocity that continues a motion.                                               |
 | `presentation.ts`                                | Where each moving element is drawn relative to where the engine hit-tests it, reported by the animator while translate runs; read by the gesture host at touch-down. |
 | `reducedMotionPlan.ts`                           | The animator's Reduce Motion planner: what one call becomes, a cross-fade whose travel lands while transparent or at once.                                           |
 | `__tests__/animator.interaction.browser.spec.ts` | Browser proofs on the interaction harness (Chromium and WebKit): busy main thread, end state through a block, no Layout / Paint, seeked curves, a dialog's backdrop. |
@@ -66,7 +64,7 @@ the timings that decide who gets a touch are not roles.
 ## Animator
 
 ```
-import {createMotionAnimator} from '../motion/animator';
+import {createAnimator} from '../motion/animator';
 import {coast} from '../motion/coast';
 import {solveSpringTowardRamp, toSpring} from '../motion/spring';
 import {resolveMotion} from '../motion/resolveMotion';
@@ -75,7 +73,7 @@ import {registerSpringsTable, springs} from '../motion/uikit';
 // Once, so the springs are registered as their roles:
 registerSpringsTable();
 
-const animator = createMotionAnimator(sheet);
+const animator = createAnimator(sheet);
 // The animator plays a motion role (spec:AST-094 FR4), its table value, as the
 // per-role tables stay internal (DEC-15); math on a spring reads the role with
 // resolveMotion.
@@ -140,10 +138,8 @@ await handle.finished; // true if it ran to the end, false if interrupted
   presented call's second frame) runs on over two frames, the start moves to
   the call's first read after it, with every call of that task. Everything
   the call starts shares that start
-  (`handle.started`); a retarget of a curve that still moves keeps an
-  explicit one, while one on a tail that already shows as at rest (within two
-  sample tolerances of its target, and slower than one a frame) counts as a
-  call from rest. `{at}` puts several animators on one clock. `{start: 'commit'}` lets the browser date
+  (`handle.started`); a retarget keeps an explicit one, and `{at}` puts
+  several animators on one clock. `{start: 'commit'}` lets the browser date
   a retarget too; `{start: 'presented'}` waits two frames, until the
   element at rest has been presented. `handle.curve(property)` is the curve
   a call plays, for a companion to follow. `{additive: true}` retargets the
@@ -172,7 +168,7 @@ await handle.finished; // true if it ran to the end, false if interrupted
 - `animatorFor(element)` returns the one animator for an element, so code
   that animates it from several places (a swipe on x, a removal on y)
   composes in one `translate` track.
-- `createMotionAnimator(dialog, {pseudoElement: '::backdrop'})` drives a
+- `createAnimator(dialog, {pseudoElement: '::backdrop'})` drives a
   pseudo-element; with no inline style to hold it, a static filling animation
   holds its end value until the next animation replaces it, while the
   pseudo-element exists. A dialog's `::backdrop` is made again each time the

package/src/motion/animatedLayout.ts

@@ -89,8 +89,7 @@ import {
   wrapText,
 } from './transientCopy';
 import {isSpring} from './roleValue';
-import {progressCurve} from './progress';
-import type {SpringDescription} from './spring';
+import {solveSpring, toSpring, type SpringDescription} from './spring';
 import {registerSpringsTable, SETTLE_SPRING} from './uikit/springs';
 import {reducedMotionCrossFade} from './uikit/timing';
 
@@ -143,11 +142,11 @@ function settleSpring(): SpringDescription {
 }
 
 function springProgress(description: SpringDescription): SpringProgress {
-  const curve = progressCurve(description, {epsilon: 0.001});
-  const durationMs = Math.max(1, curve.duration * 1000);
+  const curve = solveSpring(toSpring(description), {from: 1, to: 0});
+  const durationMs = Math.max(1, curve.settleTime(0.001) * 1000);
   return {
     durationMs,
-    remaining: t => (t >= durationMs ? 0 : 1 - curve.at(t / 1000)),
+    remaining: t => (t >= durationMs ? 0 : curve.value(t / 1000)),
   };
 }