@astryxdesign/core 0.7.6-canary.f73623d → 0.7.6-canary.f77aaf2

package/dist/SideNav/railMotion.d.ts

@@ -1,4 +1,4 @@
-import { type AnimatedLayout, type LayoutSwap } from '../motion/animatedLayout.js';
+import { type AnimatedLayout, type LayoutEdgeHold, type LayoutSwap } from '../motion/animatedLayout.js';
 /** What AppShell lends its SideNav; outside AppShell, nothing. */
 export interface SideNavShell {
     /** AppShell's own handle, whose area holds the rail and the content. */
@@ -26,12 +26,12 @@ export interface RailShown {
     readonly collapsed: number;
 }
 export interface RailSnapshot {
-    readonly rail: HTMLElement;
-    readonly railRect: DOMRect;
+    /** The old rail, held for the module's edge reveal. */
+    readonly hold: LayoutEdgeHold;
+    /** The old rail as one transient copy, or null when it cannot be held. */
+    readonly swap: LayoutSwap | null;
     /** What the rail shows when the change lands. */
     readonly shown: RailShown;
-    /** The old rail, held by the swap. */
-    readonly swap: LayoutSwap | null;
 }
 /** A playing rail motion. */
 export interface RailMotion {

package/dist/SideNav/railMotion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"railMotion.d.ts","sourceRoot":"","sources":["../../src/SideNav/railMotion.ts"],"names":[],"mappings":"AA4CA,OAAO,EAML,KAAK,cAAc,EACnB,KAAK,UAAU,EAChB,MAAM,0BAA0B,CAAC;AAElC,kEAAkE;AAClE,MAAM,WAAW,YAAY;IAC3B,wEAAwE;IACxE,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,6DAA6D;IAC7D,IAAI,IAAI,WAAW,GAAG,IAAI,CAAC;IAC3B,wDAAwD;IACxD,MAAM,IAAI,WAAW,GAAG,IAAI,CAAC;IAC7B,0EAA0E;IAC1E,gBAAgB,IAAI,IAAI,CAAC;IACzB,uEAAuE;IACvE,eAAe,IAAI,MAAM,IAAI,CAAC;IAC9B,wEAAwE;IACxE,WAAW,IAAI,IAAI,CAAC;CACrB;AAED,eAAO,MAAM,mBAAmB,8CAA2C,CAAC;AAG5E,uEAAuE;AACvE,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,WAAW,GAAG,IAAI,GAC7B,cAAc,CAEhB;AAED,+DAA+D;AAC/D,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,2BAA2B;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,gDAAgD;IAChD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,iDAAiD;IACjD,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,sCAAsC;IACtC,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;CAClC;AAED,6BAA6B;AAC7B,MAAM,WAAW,UAAU;IACzB,kDAAkD;IAClD,GAAG,IAAI,IAAI,CAAC;IACZ,4DAA4D;IAC5D,KAAK,IAAI,SAAS,GAAG,IAAI,CAAC;CAC3B;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,WAAW,GAAG,IAAI,EACxB,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,SAAS,GAAG,IAAI,EACzB,WAAW,EAAE,OAAO,GACnB,YAAY,GAAG,IAAI,CAerB;AAwBD;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,WAAW,GAAG,IAAI,EAC3B,MAAM,EAAE,cAAc,EACtB,MAAM,GAAE,WAAW,GAAG,IAAW,GAChC,UAAU,CAsJZ"}
+{"version":3,"file":"railMotion.d.ts","sourceRoot":"","sources":["../../src/SideNav/railMotion.ts"],"names":[],"mappings":"AA8CA,OAAO,EAIL,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,UAAU,EAChB,MAAM,0BAA0B,CAAC;AAElC,kEAAkE;AAClE,MAAM,WAAW,YAAY;IAC3B,wEAAwE;IACxE,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,6DAA6D;IAC7D,IAAI,IAAI,WAAW,GAAG,IAAI,CAAC;IAC3B,wDAAwD;IACxD,MAAM,IAAI,WAAW,GAAG,IAAI,CAAC;IAC7B,0EAA0E;IAC1E,gBAAgB,IAAI,IAAI,CAAC;IACzB,uEAAuE;IACvE,eAAe,IAAI,MAAM,IAAI,CAAC;IAC9B,wEAAwE;IACxE,WAAW,IAAI,IAAI,CAAC;CACrB;AAED,eAAO,MAAM,mBAAmB,8CAA2C,CAAC;AAG5E,uEAAuE;AACvE,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,WAAW,GAAG,IAAI,GAC7B,cAAc,CAEhB;AAED,+DAA+D;AAC/D,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,2BAA2B;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,gDAAgD;IAChD,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,YAAY;IAC3B,uDAAuD;IACvD,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,0EAA0E;IAC1E,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IACjC,iDAAiD;IACjD,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;CAC3B;AAED,6BAA6B;AAC7B,MAAM,WAAW,UAAU;IACzB,kDAAkD;IAClD,GAAG,IAAI,IAAI,CAAC;IACZ,4DAA4D;IAC5D,KAAK,IAAI,SAAS,GAAG,IAAI,CAAC;CAC3B;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,WAAW,GAAG,IAAI,EACxB,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,SAAS,GAAG,IAAI,EACzB,WAAW,EAAE,OAAO,GACnB,YAAY,GAAG,IAAI,CAkBrB;AAaD;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,WAAW,GAAG,IAAI,EAC3B,MAAM,EAAE,cAAc,EACtB,MAAM,GAAE,WAAW,GAAG,IAAW,GAChC,UAAU,CAmDZ"}

package/dist/SideNav/railMotion.js

@@ -5,7 +5,7 @@
 /**
  * @file railMotion.ts
  * @input The rail's outer element, the animated-layout module's handle,
- *   motion and in-place swap (motion/animatedLayout.ts)
+ *   motion and two-state edge reveal (motion/animatedLayout.ts)
  * @output Exports `SideNavShellContext` (what AppShell lends its SideNav),
  *   `createRailLayout`, `snapshotRail` and `playRail`: the rail's collapse
  *   motion
@@ -14,34 +14,36 @@
  *
  * Collapsing or expanding the rail plays one motion on one clock, the
  * `springs.settle` role the animated-layout module reads (`spec:AST-105`
- * FR4):
- * - Layout snaps to the final rail width at once; nothing animates a width.
- * - A collapse covers the old rail by a clip: the module's in-place swap
- *   (`spec:AST-105` FR8) holds the old, expanded rail as one transient copy
- *   and the clip closes it to the new width. The copy's text fades over the
- *   first 40%; the real collapsed rail, raised above the copy, fades in over
- *   the last 30%, so the real rail, icons only, is all that remains.
- * - An expand reveals the real rail by a clip from the old width, its text
- *   fading in over the last 60% so no label shows at the collapsed width,
- *   under the old, collapsed rail held by the same swap, which fades over the
- *   first 60%: the first frame is the frame before the click.
- * - In AppShell the rail's edge rides the content column's glide, frame by
- *   frame, so the two never part, also when a change interrupts a running
- *   one; the copy is laid in the row that holds both.
+ * FR4). The rail is FR9's edge reveal in its inline two-state form, which
+ * the module produces (`architecture:react-component-runtime` INV12): layout
+ * snaps to the final rail width at once, nothing animates a width, and the
+ * module clips the rail's inline-end edge from the width it shows to the new
+ * one. A collapse covers the old, expanded rail, held as one transient copy,
+ * with the real collapsed rail raised above it; an expand reveals the real
+ * rail under the old, collapsed one. In AppShell that edge rides the content
+ * column's glide, frame by frame, so the two never part, also when a change
+ * interrupts a running one. Every starting clip applies in the commit's
+ * layout effect, before the first frame paints. Under Reduce Motion it
+ * follows `design:reduced-motion`: opacity only under a coarse primary
+ * pointer (DR2), an immediate change otherwise (DR3). Without Web
+ * Animations, the change lands at once.
+ *
+ * What this file adds is the rail's own fades, on the same progress:
+ * - A collapse fades the copy's text over the first 40% and the copy over
+ *   the last 30%, while the real collapsed rail, its icons, fades in over the
+ *   last 30%, so the real rail, icons only, is all that remains.
+ * - An expand fades the real rail's text in over the last 60%, so no label
+ *   shows at the collapsed width, while the old, collapsed rail fades over
+ *   the first 60%: the first frame is the frame before the click.
  * - A change made during a running motion starts from what the rail shows:
  *   its width, its labels' opacity and its collapsed icons' opacity, so the
  *   rail stays continuous.
- * - Every starting clip applies in the commit's layout effect, before the
- *   first frame paints.
- * - Under Reduce Motion it follows `design:reduced-motion`: opacity only
- *   under a coarse primary pointer (DR2), an immediate change otherwise
- *   (DR3). Without Web Animations, the change lands at once.
  *
  * SYNC: When modified, update SideNav.tsx, AppShell.tsx and
  * SideNavRailMotion.test.tsx.
  */
 import { createContext } from 'react';
-import { createAnimatedLayout, holdLayoutSwap, layoutMotionFor, playLayoutFrames, playLayoutSwap } from "../motion/animatedLayout.js";
+import { createAnimatedLayout, holdLayoutEdge, playLayoutEdge } from "../motion/animatedLayout.js";
 
 /** What AppShell lends its SideNav; outside AppShell, nothing. */
 
@@ -62,19 +64,22 @@ export function createRailLayout(rail) {
  * from a running motion or at rest.
  */
 export function snapshotRail(rail, handle, running, isCollapsed) {
-  if (rail == null || typeof rail.animate !== 'function') {
+  // The rail's edge is the one beside the content, its inline end.
+  const hold = holdLayoutEdge(handle, rail, {
+    edge: 'inline-end',
+    shown: running?.width ?? null
+  });
+  if (hold == null) {
     return null;
   }
-  const railRect = rail.getBoundingClientRect();
   return {
-    rail,
-    railRect,
+    hold,
+    swap: hold.swap,
     shown: running ?? {
-      width: railRect.width,
+      width: hold.extent,
       labels: isCollapsed ? 0 : 1,
       collapsed: isCollapsed ? 1 : 0
-    },
-    swap: holdLayoutSwap(handle, rail)
+    }
   };
 }
 const clamp = value => Math.min(1, Math.max(0, value));
@@ -84,19 +89,6 @@ function textElements(rail) {
   return Array.from(rail.querySelectorAll('*')).filter(element => Array.from(element.childNodes).some(node => node.nodeType === 3 && node.textContent?.trim()));
 }
 
-/** `element`'s ancestor (or itself) that sits directly in `host`. */
-function childOf(host, element) {
-  let node = element;
-  while (node != null && node.parentElement !== host) {
-    node = node.parentElement;
-  }
-  return node;
-}
-const AT_REST = {
-  end: () => {},
-  shown: () => null
-};
-
 /**
  * After the change commits, before paint: play the rail's motion from the
  * snapshot, on the module's motion. With a `column` (in AppShell), the rail's
@@ -104,150 +96,50 @@ const AT_REST = {
  */
 export function playRail(snapshot, current, handle, column = null) {
   const {
-    railRect,
-    swap,
     shown: from
   } = snapshot;
-  // The rail as it is now: a resizable rail's nav remounts when its resize
-  // wrapper comes and goes with the collapse.
-  const rail = current?.isConnected === true ? current : snapshot.rail;
-  if (!rail.isConnected) {
-    return AT_REST;
-  }
-  const motion = layoutMotionFor(rail);
-  const next = rail.getBoundingClientRect();
-  if (motion.kind === 'instant' || Math.abs(next.width - from.width) < 0.5) {
-    return AT_REST;
-  }
-  const isCollapse = next.width < from.width;
+  let isCollapse = false;
   // The labels and the collapsed icons over the motion's progress, from what
   // the rail showed.
   const labelsAt = p => isCollapse ? from.labels * (1 - clamp(p / 0.4)) : from.labels + (1 - from.labels) * clamp((p - 0.4) / 0.6);
   const collapsedAt = p => isCollapse ? from.collapsed + (1 - from.collapsed) * clamp((p - 0.7) / 0.3) : from.collapsed * (1 - clamp(p / 0.6));
-  const rtl = getComputedStyle(rail).direction === 'rtl';
-  const sign = rtl ? -1 : 1;
-  const inset = px => rtl ? `inset(0px 0px 0px ${px}px)` : `inset(0px ${px}px 0px 0px)`;
-  // The row that holds the rail and the column, or the rail's parent.
-  const host = column?.parentElement != null && column.parentElement.contains(rail) ? column.parentElement : rail.parentElement;
-  // Riding needs the swap: its frames carry the column's travel. Without one
-  // (old content that cannot be copied) the clip follows the motion's curve.
-  const rides = host != null && column?.parentElement === host && swap != null;
-  // The width the rail shows over the motion: on the column's glide (its
-  // travel so far added to where it started), or on the motion's curve.
-  const widthAt = (p, ride) => rides ? from.width + sign * ride.x : from.width + (next.width - from.width) * p;
-  const now = () => Number(rail.ownerDocument.timeline?.currentTime ?? 0);
-  const startedAt = now();
-  const durationMs = motion.kind === 'spring' ? motion.progress.durationMs : motion.durationMs;
-  const shown = () => {
-    const elapsed = now() - startedAt;
-    if (elapsed >= durationMs) {
-      return null;
+  const motion = playLayoutEdge(snapshot.hold, current, handle, {
+    edge: 'inline-end',
+    rideWith: column,
+    parts: (isConceal, rail) => {
+      isCollapse = isConceal;
+      return isConceal ? {
+        // The old rail's text fades early, the copy late, as the real
+        // collapsed rail, raised above it, fades in.
+        copyOpacity: p => 1 - clamp((p - 0.7) / 0.3),
+        copyText: labelsAt,
+        incoming: [{
+          element: rail,
+          frames: p => ({
+            opacity: collapsedAt(p)
+          })
+        }]
+      } : {
+        // The old, collapsed rail fades early; the real rail's text, late.
+        copyOpacity: collapsedAt,
+        incoming: textElements(rail).map(element => ({
+          element,
+          frames: p => ({
+            opacity: labelsAt(p)
+          })
+        }))
+      };
     }
-    const p = motion.kind === 'spring' ? 1 - motion.progress.remaining(elapsed) : 0;
-    let width = from.width + (next.width - from.width) * p;
-    if (rides && column != null) {
-      // The rail's edge is the column's: read it where it shows.
-      const edge = column.getBoundingClientRect();
-      const own = rail.getBoundingClientRect();
-      width = rtl ? own.right - edge.right : edge.left - own.left;
-    }
-    return {
-      width,
-      labels: labelsAt(p),
-      collapsed: collapsedAt(p)
-    };
-  };
-  const rideWith = rides && column != null ? {
-    element: column,
-    travel: {
-      x: sign * (from.width - next.width),
-      y: 0
-    },
-    isCopyMoved: false
-  } : undefined;
-  // The copy keeps the rail's inline-start edge where the rail is now, so it
-  // meets the real rail wherever SideNav sits (a centered rail moves).
-  const at = DOMRect.fromRect({
-    x: rtl ? next.right - railRect.width : next.left,
-    y: next.top,
-    width: railRect.width,
-    height: railRect.height
   });
-  if (isCollapse) {
-    // A collapse covers the old rail, held by the swap, from the width it
-    // shows down to the new one; the real, collapsed rail fades in above it.
-    if (swap == null || host == null) {
-      return AT_REST;
-    }
-    const raised = childOf(host, rail);
-    const restore = raised == null ? null : {
-      position: raised.style.position,
-      zIndex: raised.style.zIndex
-    };
-    if (raised != null) {
-      if (getComputedStyle(raised).position === 'static') {
-        raised.style.position = 'relative';
-      }
-      raised.style.zIndex = '2';
-    }
-    const end = playLayoutSwap({
-      ...swap,
-      rect: at
-    }, {
-      host,
-      isOpaque: true,
-      copy: (p, ride) => ({
-        clipPath: inset(railRect.width - widthAt(p, ride)),
-        opacity: 1 - clamp((p - 0.7) / 0.3)
-      }),
-      copyText: labelsAt,
-      rideWith,
-      onEnd: () => {
-        if (raised != null && restore != null) {
-          raised.style.position = restore.position;
-          raised.style.zIndex = restore.zIndex;
-        }
-      },
-      incoming: [{
-        element: rail,
-        frames: p => ({
-          opacity: collapsedAt(p)
-        })
-      }]
-    });
-    return {
-      end,
-      shown
-    };
-  }
-
-  // An expand reveals the real rail from the width it showed, its text fading
-  // in late, under the old, collapsed rail fading early.
-  const incoming = [{
-    element: rail,
-    frames: (p, ride) => ({
-      clipPath: inset(next.width - widthAt(p, ride))
-    })
-  }, ...textElements(rail).map(element => ({
-    element,
-    frames: p => ({
-      opacity: labelsAt(p)
-    })
-  }))];
-  const end = swap != null && host != null ? playLayoutSwap({
-    ...swap,
-    rect: at
-  }, {
-    host,
-    isOpaque: true,
-    copy: p => ({
-      opacity: collapsedAt(p)
-    }),
-    rideWith,
-    incoming
-  }) : playLayoutFrames(handle, incoming);
   return {
-    end,
-    shown
+    end: motion.end,
+    shown: () => {
+      const now = motion.shown();
+      return now == null ? null : {
+        width: now.extent,
+        labels: labelsAt(now.progress),
+        collapsed: collapsedAt(now.progress)
+      };
+    }
   };
 }

package/dist/Slider/Slider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Slider.d.ts","sourceRoot":"","sources":["../../src/Slider/Slider.tsx"],"names":[],"mappings":"AA2CA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAShD,OAAO,EACL,KAAK,mBAAmB,EAEzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAU9C,MAAM,WAAW,eAAgB,SAAQ,IAAI,CAC3C,mBAAmB,CAAC,cAAc,CAAC,EACnC,UAAU,CACX;IACC,mDAAmD;IACnD,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC,qEAAqE;IACrE,KAAK,EAAE,MAAM,CAAC;IACd,8FAA8F;IAC9F,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,kDAAkD;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,qDAAqD;IACrD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;;;;;;;;;;;;;;;OAmBG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oDAAoD;IACpD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,oDAAoD;IACpD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,uCAAuC;IACvC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;OAIG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,uEAAuE;IACvE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gCAAgC;IAChC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,kCAAkC;IAClC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,iCAAiC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uDAAuD;IACvD,WAAW,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC;IACxC,uEAAuE;IACvE,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACxC,6DAA6D;IAC7D,YAAY,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;IAC3C,8DAA8D;IAC9D,KAAK,CAAC,EAAE;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAC,EAAE,CAAC;IAC1C;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oCAAoC;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,yCAAyC;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,kDAAkD;IAClD,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,iEAAiE;IACjE,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC;AAED,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,8CAA8C;IAC9C,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxB,kDAAkD;IAClD,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAC7C,iEAAiE;IACjE,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAChD,8CAA8C;IAC9C,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,MAAM,WAAW,GAAG,iBAAiB,GAAG,gBAAgB,CAAC;AAmT/D;;;;;;;;GAQG;AACH,wBAAgB,MAAM,CAAC,EAAC,GAAG,EAAE,GAAG,KAAK,EAAC,EAAE,WAAW,+BA6zBlD;yBA7zBe,MAAM"}
+{"version":3,"file":"Slider.d.ts","sourceRoot":"","sources":["../../src/Slider/Slider.tsx"],"names":[],"mappings":"AA2CA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAMhD,OAAO,EACL,KAAK,mBAAmB,EAEzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAU9C,MAAM,WAAW,eAAgB,SAAQ,IAAI,CAC3C,mBAAmB,CAAC,cAAc,CAAC,EACnC,UAAU,CACX;IACC,mDAAmD;IACnD,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC,qEAAqE;IACrE,KAAK,EAAE,MAAM,CAAC;IACd,8FAA8F;IAC9F,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,kDAAkD;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,qDAAqD;IACrD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;;;;;;;;;;;;;;;;;OAmBG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oDAAoD;IACpD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,oDAAoD;IACpD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,uCAAuC;IACvC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;OAIG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,uEAAuE;IACvE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gCAAgC;IAChC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,kCAAkC;IAClC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,iCAAiC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uDAAuD;IACvD,WAAW,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC;IACxC,uEAAuE;IACvE,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACxC,6DAA6D;IAC7D,YAAY,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,MAAM,CAAC;IAC3C,8DAA8D;IAC9D,KAAK,CAAC,EAAE;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAC,EAAE,CAAC;IAC1C;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oCAAoC;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,yCAAyC;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,kDAAkD;IAClD,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,iEAAiE;IACjE,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC;AAED,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,8CAA8C;IAC9C,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxB,kDAAkD;IAClD,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAC7C,iEAAiE;IACjE,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAChD,8CAA8C;IAC9C,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,MAAM,WAAW,GAAG,iBAAiB,GAAG,gBAAgB,CAAC;AAmT/D;;;;;;;;GAQG;AACH,wBAAgB,MAAM,CAAC,EAAC,GAAG,EAAE,GAAG,KAAK,EAAC,EAAE,WAAW,+BAi6BlD;yBAj6Be,MAAM"}

package/dist/Slider/Slider.js

@@ -5,7 +5,7 @@
 /**
  * @file Slider.tsx
  * @input Uses React, useId, useRef, useCallback, useEffect, Field, Tooltip, useTooltip, VisuallyHidden
- * @output Exports Slider and its props; unfilled marks share the track token; modifier-only key presses do not restore the thumb focus ring; a drag belongs to the pointer that started it
+ * @output Exports Slider and its props; unfilled marks share the track token; modifier-only key presses do not restore the thumb focus ring; a drag belongs to the pointer that started it; two coincident range thumbs separate toward the press or the first movement
  * @position Core implementation; consumed by index.ts, tested by Slider.test.tsx
  *
  * SYNC: When modified, update these files to stay in sync:
@@ -26,7 +26,7 @@ import { VisuallyHidden } from "../VisuallyHidden/index.js";
 import { mergeProps, rtlStyles } from "../utils/index.js";
 import { focusOutlineStyles } from "../utils/focusOutline.stylex.js";
 import { joinAriaIDs } from "../utils/inputAria.js";
-import { getInteractionModality, useInteractionModalityTracking } from "../utils/interactionModality.js";
+import { useInteractionModalityTracking } from "../utils/interactionModality.js";
 import { isRtlElement } from "../hooks/isRtlElement.js";
 import { useFieldInputStyling } from "../Field/fieldParts.js";
 import { themeProps } from "../utils/themeProps.js";
@@ -330,11 +330,14 @@ export function Slider({
   // true on pointerdown). Gate the ring on how the user last interacted; the
   // CSS condition stays `:focus-visible`, this only narrows it.
   const [keyboardFocusThumb, setKeyboardFocusThumb] = useState(null);
-  useInteractionModalityTracking();
+  const {
+    ref: modalityRef,
+    readModality
+  } = useInteractionModalityTracking();
   const handleThumbFocus = useCallback((thumbIndex, _e) => {
     // A focused disabled thumb still shows the ring (spec:AST-085 FR6).
-    setKeyboardFocusThumb(getInteractionModality() === 'keyboard' ? thumbIndex : null);
-  }, []);
+    setKeyboardFocusThumb(readModality() === 'keyboard' ? thumbIndex : null);
+  }, [readModality]);
   const handleThumbBlur = useCallback(_e => {
     setKeyboardFocusThumb(null);
   }, []);
@@ -422,7 +425,19 @@ export function Slider({
     // Prefer the lower thumb if equidistant
     return d0 <= d1 ? 0 : 1;
   }, [isRange, values]);
-  const updateValue = useCallback((thumbIndex, newVal, snap = true) => {
+
+  // The pointer's value at a press on two coincident thumbs, while no
+  // movement has said which way the drag goes; the first value off it picks
+  // the thumb that can travel that way (see handlePointerMove).
+  const coincidentDragRef = useRef(null);
+  // Whether the drag in progress began on two coincident thumbs: such a drag
+  // can always follow the pointer, so when the dragged thumb is held against
+  // the other one and the pointer passes it, the other thumb takes the drag.
+  const coincidentOriginRef = useRef(false);
+  const updateValue = useCallback((thumbIndex, newVal, snap = true,
+  // The other thumb's values to start from, when one event moves both
+  // (a drag handed from one coincident thumb to the other).
+  from = values) => {
     if (isDisabled) {
       return;
     }
@@ -431,7 +446,7 @@ export function Slider({
     // grid (max 100 with step 3 snapped End to 99, not 100).
     const clamped = clamp(snap ? snapToStep(newVal, min, step) : newVal, min, max);
     if (isRange) {
-      const currentValues = [...values];
+      const currentValues = [...from];
       currentValues[thumbIndex] = clamped;
 
       // Enforce minStepsBetweenThumbs
@@ -479,6 +494,8 @@ export function Slider({
       detachLostCaptureRef.current = null;
       draggingThumbRef.current = null;
       dragPointerRef.current = null;
+      coincidentDragRef.current = null;
+      coincidentOriginRef.current = false;
       setDraggingThumb(null);
       fireChangeEnd();
     }
@@ -505,12 +522,37 @@ export function Slider({
     const thumbs = track?.querySelectorAll('[role="slider"]');
     const pressedThumb = e.target.closest('[role="slider"]');
     const pressedThumbIndex = pressedThumb == null || thumbs == null ? -1 : Array.from(thumbs).indexOf(pressedThumb);
-    // A direct thumb press owns that thumb even when range values coincide.
-    // Track and mark presses still choose the nearest value.
-    const thumbIndex = pressedThumbIndex >= 0 ? pressedThumbIndex : getClosestThumb(newVal);
+    // A direct thumb press owns that thumb; track and mark presses choose
+    // the nearest value. Two thumbs on one value are the exception: only
+    // one of them can travel toward where the pointer goes. A track press
+    // beside them picks the thumb on its side. A press on the thumbs
+    // themselves (or on their shared value) moves nothing: the pressed
+    // thumb holds the press until the pointer moves, and the direction of
+    // that first movement from the press picks the thumb.
+    const isCoincident = isRange && values[0] === values[1];
+    let thumbIndex = pressedThumbIndex >= 0 ? pressedThumbIndex : getClosestThumb(newVal);
+    const parks = isCoincident && (pressedThumbIndex >= 0 || newVal === values[0]);
+    // Until the first movement, a parked press is held by the upper thumb,
+    // the one drawn over the lower one, wherever it landed: on the thumbs
+    // (which the upper thumb covers) or on their shared value elsewhere,
+    // such as its mark label. So its pressed paint shows, and a press that
+    // never moves leaves focus on the same thumb.
+    if (parks && pressedThumbIndex < 0) {
+      thumbIndex = 1;
+    }
+    // The first movement is measured from the pointer itself, not from a
+    // mark it pressed (a wide label sits away from its mark's value).
+    coincidentDragRef.current = parks ? getValueFromPosition(e.clientX, e.clientY) : null;
+    // Only a drag that began on the shared thumbs, the press that waited for
+    // the first movement, hands itself to the other thumb (FR6); a track
+    // press beside them already picked its thumb.
+    coincidentOriginRef.current = parks;
+    if (isCoincident && !parks) {
+      thumbIndex = newVal > values[0] ? 1 : 0;
+    }
     draggingThumbRef.current = thumbIndex;
     setDraggingThumb(thumbIndex);
-    updateValue(thumbIndex, newVal);
+    updateValue(thumbIndex, parks ? values[thumbIndex] : newVal);
 
     // Focus the thumb that owns this drag.
     thumbs?.[thumbIndex]?.focus();
@@ -533,12 +575,50 @@ export function Slider({
     if (typeof e.currentTarget.setPointerCapture === 'function') {
       e.currentTarget.setPointerCapture(e.pointerId);
     }
-  }, [isDisabled, getValueFromPosition, getClosestThumb, updateValue, endDrag]);
+  }, [isDisabled, isRange, values, getValueFromPosition, getClosestThumb, updateValue, endDrag]);
   const handlePointerMove = useCallback(e => {
     if (draggingThumbRef.current === null || e.pointerId !== dragPointerRef.current || isDisabled) {
       return;
     }
     const newVal = getValueFromPosition(e.clientX, e.clientY);
+    // Hands the drag to a thumb, with its focus and pressed paint.
+    const handTo = thumbIndex => {
+      if (thumbIndex === draggingThumbRef.current) {
+        return;
+      }
+      draggingThumbRef.current = thumbIndex;
+      setDraggingThumb(thumbIndex);
+      const thumbs = trackRef.current?.querySelectorAll('[role="slider"]');
+      thumbs?.[thumbIndex]?.focus();
+      setKeyboardFocusThumb(null);
+    };
+    const pressValue = coincidentDragRef.current;
+    if (pressValue !== null) {
+      if (newVal === pressValue) {
+        return;
+      }
+      // The first movement from a press on coincident thumbs hands the
+      // drag to the thumb that can travel that way.
+      coincidentDragRef.current = null;
+      handTo(newVal > pressValue ? 1 : 0);
+    } else if (coincidentOriginRef.current) {
+      // A drag that began on coincident thumbs follows the pointer either
+      // way: once the pointer passes the other thumb, the dragged one stops
+      // against it and the other takes the drag (a first step that drifted
+      // the wrong way never sticks the drag).
+      const current = valuesRef.current;
+      const dragging = draggingThumbRef.current;
+      const other = dragging === 0 ? 1 : 0;
+      if (dragging === 0 && newVal > current[1] || dragging === 1 && newVal < current[0]) {
+        // The dragged thumb ends against the other one, as if it had
+        // followed the pointer there, and the other follows the pointer on.
+        const from = [...current];
+        from[dragging] = current[other];
+        handTo(other);
+        updateValue(other, newVal, true, from);
+        return;
+      }
+    }
     updateValue(draggingThumbRef.current, newVal);
   }, [isDisabled, getValueFromPosition, updateValue]);
   const handlePointerUp = useCallback(e => endDrag(e.pointerId), [endDrag]);
@@ -554,7 +634,7 @@ export function Slider({
     // navigation for the thumb. Check this event's modifier flags too: a
     // later chord must not restore the ring using that keyboard history.
     // Shift+Tab and Shift+Arrow still count because their key is not Shift.
-    if (e.key !== 'Shift' && !e.metaKey && !e.altKey && !e.ctrlKey && getInteractionModality() === 'keyboard') {
+    if (e.key !== 'Shift' && !e.metaKey && !e.altKey && !e.ctrlKey && readModality() === 'keyboard') {
       setKeyboardFocusThumb(thumbIndex);
     }
     const currentVal = values[thumbIndex];
@@ -612,7 +692,7 @@ export function Slider({
     } else {
       fireChangeEnd([clamped]);
     }
-  }, [isDisabled, isHorizontal, isRange, values, step, min, max, minStepsBetweenThumbs, updateValue, fireChangeEnd]);
+  }, [isDisabled, isHorizontal, isRange, values, step, min, max, minStepsBetweenThumbs, updateValue, fireChangeEnd, readModality]);
 
   // Format display value
   const displayValue = val => {
@@ -685,8 +765,11 @@ export function Slider({
         content: displayValue(val),
         placement: tooltipPlacement,
         delay: 0,
-        focusTrigger: "always",
-        isOpen: draggingThumb === thumbIndex ? true : undefined,
+        focusTrigger: "always"
+        // A drag keeps its own thumb's value showing and closes the other
+        // thumb's, which a drag handed over from it may have forced open.
+        ,
+        isOpen: draggingThumb === null ? undefined : draggingThumb === thumbIndex,
         children: thumbElement
       }, thumbIndex);
     }
@@ -777,7 +860,7 @@ export function Slider({
           onBlur,
           'aria-describedby': ariaDescribedByProp
         } : undefined),
-        ref: useMergedRefs(isRange ? ref : undefined, trackRef, disabledMessageTooltip.ref),
+        ref: useMergedRefs(isRange ? ref : undefined, trackRef, modalityRef, disabledMessageTooltip.ref),
         ...(isRange ? {
           role: 'group',
           'aria-labelledby': joinAriaIDs(labelID, ariaLabelledByProp)

package/dist/Table/BaseTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseTable.d.ts","sourceRoot":"","sources":["../../src/Table/BaseTable.tsx"],"names":[],"mappings":"AAGA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAe,KAAK,YAAY,EAAkB,KAAK,GAAG,EAAC,MAAM,OAAO,CAAC;AAGhF,OAAO,KAAK,EACV,cAAc,EAYf,MAAM,SAAS,CAAC;AA8mBjB;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,SAAS,EAAqB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3E,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG;IAAC,GAAG,CAAC,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAA;CAAC,KACrD,YAAY,CAAC"}
+{"version":3,"file":"BaseTable.d.ts","sourceRoot":"","sources":["../../src/Table/BaseTable.tsx"],"names":[],"mappings":"AAGA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAe,KAAK,YAAY,EAAkB,KAAK,GAAG,EAAC,MAAM,OAAO,CAAC;AAIhF,OAAO,KAAK,EACV,cAAc,EAYf,MAAM,SAAS,CAAC;AAinBjB;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,SAAS,EAAqB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3E,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG;IAAC,GAAG,CAAC,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAA;CAAC,KACrD,YAAY,CAAC"}

package/dist/Table/BaseTable.js

@@ -15,6 +15,7 @@
  * - /packages/cli/assets/templates/blocks/components/Table/ (showcase blocks)
  */
 import { memo, useRef } from 'react';
+import { isRenderable } from "../utils/isRenderable.js";
 import * as stylex from '@stylexjs/stylex';
 import "../theme/tokens.stylex.js";
 import { spacingVars } from "../theme/tokens.stylex.js";
@@ -184,16 +185,16 @@ function TableRowInner({
  * Compares TableRowProps to determine if re-render is needed.
  * Shallow compares the item object and checks if columns/plugins references changed.
  *
- * Includes rowIndex in the comparison so that plugins using the index
- * (e.g. for row numbering or conditional formatting) get correct values
- * after insertions/deletions. This also future-proofs for tree grid
- * index paths where structural position matters.
+ * The row index reaches a row's output only through a plugin's
+ * `transformBodyRow` (cells get no index), so it is compared only when some
+ * plugin has one: a re-sort that moves rows then re-renders none of them
+ * unless a plugin can show the index (row numbering, conditional formatting).
  */
 function areRowPropsEqual(prevProps, nextProps) {
   if (prevProps.rowKey !== nextProps.rowKey) {
     return false;
   }
-  if (prevProps.rowIndex !== nextProps.rowIndex) {
+  if (prevProps.rowIndex !== nextProps.rowIndex && nextProps.plugins.some(plugin => plugin.transformBodyRow != null)) {
     return false;
   }
   if (prevProps.ariaRowIndex !== nextProps.ariaRowIndex) {
@@ -365,7 +366,7 @@ function BaseTableInner({
     } = cellRenderProps;
     const hasSlots = before != null || after != null || overlay != null || below != null;
     const headerInner = hasSlots ? /*#__PURE__*/_jsxs(_Fragment, {
-      children: [before, after != null ? /*#__PURE__*/_jsxs("div", {
+      children: [before, isRenderable(after) ? /*#__PURE__*/_jsxs("div", {
         ...{
           className: "x3nfvp2 x6s0dn4 xzye2dw xeuugli"
         },

package/dist/Table/glidingDivider.d.ts

@@ -4,7 +4,8 @@
  *   computed borders, StyleX
  * @output Exports `glidingDividerStyles` (a row's stand-in divider while it
  *   glides), `markGlidingRows` (marks the moving rows for that glide and
- *   carries each row's own border onto the stand-in) and `rowEdge`
+ *   carries each row's own border onto the stand-in), `rowEdge`, and the
+ *   row and pinned-cell attribute names plugins/stickyColumns reads
  * @position Table internals. With collapsed borders the table paints every
  *   border at its cell's static place, so a row that moves leaves its divider
  *   behind. For the glide only, the moving row's cells are marked: their
@@ -21,6 +22,12 @@ import { type BottomEdge } from './rowDivider.js';
 export type { BottomEdge } from './rowDivider.js';
 /** On a row while a glide moves it. */
 export declare const GLIDING_ATTRIBUTE = "data-astryx-row-gliding";
+/**
+ * On a pinned (sticky) cell, written by plugins/stickyColumns. Named here
+ * because that plugin already imports this module; naming it there would make
+ * the two import each other.
+ */
+export declare const PINNED_ATTRIBUTE = "data-astryx-table-pinned";
 /**
  * A row's divider, carried on the row for its glide. Names no cell sets, so
  * a pinned cell's own carry (plugins/stickyColumns) cannot shadow them.

package/dist/Table/glidingDivider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glidingDivider.d.ts","sourceRoot":"","sources":["../../src/Table/glidingDivider.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,MAAM,MAAM,kBAAkB,CAAC;AAE3C,OAAO,EAAkB,KAAK,UAAU,EAAC,MAAM,cAAc,CAAC;AAE9D,YAAY,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAE7C,uCAAuC;AACvC,eAAO,MAAM,iBAAiB,4BAA4B,CAAC;AAc3D;;;GAGG;AACH,eAAO,MAAM,mBAAmB,6BAA6B,CAAC;AAC9D,eAAO,MAAM,mBAAmB,6BAA6B,CAAC;AAC9D,eAAO,MAAM,mBAAmB,6BAA6B,CAAC;AAE9D,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+D/B,CAAC;AAwDH,wBAAgB,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,GAAG,IAAI,CAKvD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,EACvC,QAAQ,EAAE;IAAC,GAAG,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE,SAAS,CAAA;CAAC,GAAG,IAAI,EACzD,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,SAAS,GAAG,IAAI,GAC9C,OAAO,CAAC,IAAI,CAAC,CA+If"}
+{"version":3,"file":"glidingDivider.d.ts","sourceRoot":"","sources":["../../src/Table/glidingDivider.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,MAAM,MAAM,kBAAkB,CAAC;AAE3C,OAAO,EAAkB,KAAK,UAAU,EAAC,MAAM,cAAc,CAAC;AAE9D,YAAY,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAE7C,uCAAuC;AACvC,eAAO,MAAM,iBAAiB,4BAA4B,CAAC;AAW3D;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,6BAA6B,CAAC;AAE3D;;;GAGG;AACH,eAAO,MAAM,mBAAmB,6BAA6B,CAAC;AAC9D,eAAO,MAAM,mBAAmB,6BAA6B,CAAC;AAC9D,eAAO,MAAM,mBAAmB,6BAA6B,CAAC;AAE9D,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+D/B,CAAC;AAwDH,wBAAgB,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,GAAG,IAAI,CAKvD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,EACvC,QAAQ,EAAE;IAAC,GAAG,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE,SAAS,CAAA;CAAC,GAAG,IAAI,EACzD,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,SAAS,GAAG,IAAI,GAC9C,OAAO,CAAC,IAAI,CAAC,CA+If"}