@evinvest/uikit 0.29.4 → 0.31.0

package/dist/index.js

@@ -70,7 +70,6 @@ export { Calendar, } from "./components/calendar.js";
 export { DateTimePicker, } from "./components/date-time-picker.js";
 export { Toaster, toast, } from "./components/sonner.js";
 export { Form, FormControl, FormDescription, FormItem, FormLabel, FormMessage, } from "./components/form.js";
-export { OpenOrdersEmpty, OrderBook, OrderBookHead, OrderBookRow, OrderBookSpread, OrderForm, OrderFormRow, OrderFormSubmit, Terminal, TerminalChart, TerminalPane, TerminalPaneBody, TerminalPaneHeader, TerminalTicker, TickerStat, TradesTapeRow, } from "./components/terminal.js";
 export { AppShell } from "./components/app-shell.js";
 export { isNavItemActive, isPlainLeftClick, navItemMatch, resolveActiveNavItem, } from "./components/nav-model.js";
 export { usePendingNavigation } from "./components/use-shell-nav.js";
@@ -85,3 +84,24 @@ export { SectionNav } from "./components/section-nav.js";
 export { ResourceError } from "./components/resource-error.js";
 export { SystemBanner } from "./components/system-banner.js";
 export { Settled } from "./components/settled.js";
+export { AnimatedNumber } from "./components/animated-number.js";
+export { useCountTween } from "./components/use-count-tween.js";
+export { IconButton } from "./components/icon-button.js";
+export { StatusItem, StatusDot } from "./components/status-item.js";
+export { WorkspaceTabs, WorkspaceTab } from "./components/workspace-tab.js";
+export { KeyValue } from "./components/key-value.js";
+export { FormRow } from "./components/form-row.js";
+export { SettingsLayout, SettingsSection, SettingsRow } from "./components/settings.js";
+export { AccountSettingsDialog } from "./components/account-settings-dialog.js";
+export { ConfirmDialog } from "./components/confirm-dialog.js";
+export { AccountList, AccountListItem } from "./components/account-list.js";
+export { PopoverForm } from "./components/popover-form.js";
+export { CommandPalette, useCommandPaletteShortcut } from "./components/command-palette.js";
+export { HeaderBalance, HeaderSearch, NotificationBell } from "./components/header-controls.js";
+export { SmartHeader } from "./components/smart-header.js";
+export { AsideHeader, AsidePanel, AsideRail } from "./components/aside.js";
+export { ChatAttachment, ChatBubble, ChatMarker, ChatMessage } from "./components/chat-message.js";
+export { ChatStreamText } from "./components/chat-stream-text.js";
+export { ChatTyping } from "./components/chat-typing.js";
+export { ChatComposer, ModelChip } from "./components/chat-composer.js";
+export { ChatDock, ChatPanel } from "./components/chat-panel.js";

package/dist/lib/cn.js

@@ -1,5 +1,12 @@
 import { clsx } from "clsx";
-import { twMerge } from "tailwind-merge";
+import { extendTailwindMerge } from "tailwind-merge";
+const twMerge = extendTailwindMerge({
+  extend: {
+    classGroups: {
+      "font-size": [{ text: ["caption", "body-s", "body", "body-l", "h3", "h2", "h1", "figure-m", "figure-l"] }]
+    }
+  }
+});
 function cn(...inputs) {
   if (inputs.length === 2 && typeof inputs[0] === "string" && !inputs[1]) {
     return inputs[0];

package/dist/lib/cn.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/cn.ts"],"sourcesContent":["import { clsx, type ClassValue } from \"clsx\";\nimport { twMerge } from \"tailwind-merge\";\n\n/**\n * Fuses class fragments into one string with real Tailwind conflict resolution:\n * `clsx` drops falsy fragments and joins the rest, `tailwind-merge` resolves\n * conflicting utilities so the rightmost wins (`cn(\"p-4\", \"p-2\") === \"p-2\"`). A\n * caller's `className` override, passed last, therefore beats the base classes.\n *\n * `twMerge` parses every utility on every render, and the overwhelmingly common\n * call is one kit constant plus a `className` override that is absent — so that\n * call returns the constant untouched.\n *\n * The Rust mirror is the `cn!` macro in `ev_lib::uikit` (`tailwind_fuse::tw_merge!`).\n */\nexport function cn(...inputs: ClassValue[]): string {\n  if (inputs.length === 2 && typeof inputs[0] === \"string\" && !inputs[1]) {\n    return inputs[0];\n  }\n  return twMerge(clsx(inputs));\n}\n"],"mappings":"AAAA,SAAS,YAA6B;AACtC,SAAS,eAAe;AAcjB,SAAS,MAAM,QAA8B;AAClD,MAAI,OAAO,WAAW,KAAK,OAAO,OAAO,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,GAAG;AACtE,WAAO,OAAO,CAAC;AAAA,EACjB;AACA,SAAO,QAAQ,KAAK,MAAM,CAAC;AAC7B;","names":[]}
+{"version":3,"sources":["../../src/lib/cn.ts"],"sourcesContent":["import { clsx, type ClassValue } from \"clsx\";\nimport { extendTailwindMerge } from \"tailwind-merge\";\n\n// The kit's own type scale (theme.css `--text-*`). tailwind-merge only knows\n// t-shirt sizes as font sizes, so `text-body` would be filed under text colour\n// and dropped by a later `text-ink`. The Rust mirror is `fuse` in ev_lib_classes.\nconst twMerge = extendTailwindMerge({\n  extend: {\n    classGroups: {\n      \"font-size\": [{ text: [\"caption\", \"body-s\", \"body\", \"body-l\", \"h3\", \"h2\", \"h1\", \"figure-m\", \"figure-l\"] }],\n    },\n  },\n});\n\n/**\n * Fuses class fragments into one string with real Tailwind conflict resolution:\n * `clsx` drops falsy fragments and joins the rest, `tailwind-merge` resolves\n * conflicting utilities so the rightmost wins (`cn(\"p-4\", \"p-2\") === \"p-2\"`). A\n * caller's `className` override, passed last, therefore beats the base classes.\n *\n * `twMerge` parses every utility on every render, and the overwhelmingly common\n * call is one kit constant plus a `className` override that is absent — so that\n * call returns the constant untouched.\n *\n * The Rust mirror is the `cn!` macro in `ev_lib::uikit` (`tailwind_fuse::tw_merge!`).\n */\nexport function cn(...inputs: ClassValue[]): string {\n  if (inputs.length === 2 && typeof inputs[0] === \"string\" && !inputs[1]) {\n    return inputs[0];\n  }\n  return twMerge(clsx(inputs));\n}\n"],"mappings":"AAAA,SAAS,YAA6B;AACtC,SAAS,2BAA2B;AAKpC,MAAM,UAAU,oBAAoB;AAAA,EAClC,QAAQ;AAAA,IACN,aAAa;AAAA,MACX,aAAa,CAAC,EAAE,MAAM,CAAC,WAAW,UAAU,QAAQ,UAAU,MAAM,MAAM,MAAM,YAAY,UAAU,EAAE,CAAC;AAAA,IAC3G;AAAA,EACF;AACF,CAAC;AAcM,SAAS,MAAM,QAA8B;AAClD,MAAI,OAAO,WAAW,KAAK,OAAO,OAAO,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,GAAG;AACtE,WAAO,OAAO,CAAC;AAAA,EACjB;AACA,SAAO,QAAQ,KAAK,MAAM,CAAC;AAC7B;","names":[]}

package/dist/lib/number-parts.js

@@ -0,0 +1,90 @@
+function digitGlyphs(formatter) {
+  const { numberingSystem } = formatter.resolvedOptions();
+  const plain = new Intl.NumberFormat("en", { useGrouping: false, numberingSystem });
+  return Array.from({ length: 10 }, (_, d) => plain.format(d));
+}
+function splitNumber(formatter, value, glyphs) {
+  const values = new Map(glyphs.map((glyph, digit) => [glyph, digit]));
+  const raw = formatter.formatToParts(value);
+  const integerDigits = raw.filter((p) => p.type === "integer").reduce((n, p) => n + Array.from(p.value).length, 0);
+  const parts = [];
+  const seen = /* @__PURE__ */ new Map();
+  const textKey = (type, side2) => {
+    const id = `${type}:${side2}`;
+    const n = seen.get(id) ?? 0;
+    seen.set(id, n + 1);
+    return `${id}:${n}`;
+  };
+  let side = "pre";
+  let placed = 0;
+  let fractionAt = 0;
+  for (const { type, value: text } of raw) {
+    if (type === "integer") {
+      side = "post";
+      for (const char of Array.from(text)) {
+        const digit = values.get(char);
+        const place = integerDigits - 1 - placed;
+        placed += 1;
+        parts.push(
+          digit === void 0 ? { kind: "text", key: textKey("integer", side), text: char } : { kind: "digit", key: `int:${place}`, digit }
+        );
+      }
+    } else if (type === "fraction") {
+      for (const char of Array.from(text)) {
+        const digit = values.get(char);
+        const at = fractionAt;
+        fractionAt += 1;
+        parts.push(
+          digit === void 0 ? { kind: "text", key: textKey("fraction", side), text: char } : { kind: "digit", key: `frac:${at}`, digit }
+        );
+      }
+    } else if (type === "group") {
+      parts.push({ kind: "text", key: `group:${integerDigits - 1 - placed}`, text });
+    } else if (type === "decimal") {
+      side = "post";
+      parts.push({ kind: "text", key: "decimal", text });
+    } else {
+      parts.push({ kind: "text", key: textKey(type, side), text });
+    }
+  }
+  return parts;
+}
+function rollStep(from, to, direction) {
+  const up = ((to - from) % 10 + 10) % 10;
+  const down = (10 - up) % 10;
+  if (direction === 1) return up;
+  if (direction === -1) return -down;
+  return up <= down ? up : -down;
+}
+function resolveDirection(trend, from, to) {
+  if (trend !== void 0) return trend;
+  return to > from ? 1 : to < from ? -1 : 0;
+}
+function mergeItems(previous, next, animate) {
+  const known = new Set(previous.map((item) => item.part.key));
+  const result = next.map((part) => ({
+    part,
+    exiting: false,
+    fresh: animate && !known.has(part.key)
+  }));
+  if (!animate) return result;
+  const nextKeys = new Set(next.map((part) => part.key));
+  let anchor = -1;
+  for (const item of previous) {
+    if (nextKeys.has(item.part.key)) {
+      anchor = result.findIndex((r) => r.part.key === item.part.key);
+    } else {
+      anchor += 1;
+      result.splice(anchor, 0, { part: item.part, exiting: true, fresh: false });
+    }
+  }
+  return result;
+}
+export {
+  digitGlyphs,
+  mergeItems,
+  resolveDirection,
+  rollStep,
+  splitNumber
+};
+//# sourceMappingURL=number-parts.js.map

package/dist/lib/number-parts.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/lib/number-parts.ts"],"sourcesContent":["/** A digit column or a fixed piece of a formatted number, with a stable identity across values. */\nexport type NumberPart =\n  | { kind: \"digit\"; key: string; digit: number }\n  | { kind: \"text\"; key: string; text: string };\n\nexport type RollDirection = 1 | -1 | 0;\n\n/** The ten digit glyphs of the formatter's numbering system (\"٠\"..\"٩\" in Arabic locales). */\nexport function digitGlyphs(formatter: Intl.NumberFormat): readonly string[] {\n  const { numberingSystem } = formatter.resolvedOptions();\n  const plain = new Intl.NumberFormat(\"en\", { useGrouping: false, numberingSystem });\n  return Array.from({ length: 10 }, (_, d) => plain.format(d));\n}\n\n/**\n * Splits a formatted number into parts keyed by what they are, not where they\n * sit in the string. Integer digits are keyed by place value counted from the\n * right, fraction digits by position after the point: adding a leading digit\n * (9 -> 10) leaves every existing column's key alone, so React keeps those\n * nodes and only the new place enters. Everything else is keyed by type, the\n * side of the integer it sits on, and its order among same-type parts there.\n */\nexport function splitNumber(\n  formatter: Intl.NumberFormat,\n  value: number,\n  glyphs: readonly string[],\n): NumberPart[] {\n  const values = new Map(glyphs.map((glyph, digit) => [glyph, digit] as const));\n  const raw = formatter.formatToParts(value);\n  const integerDigits = raw\n    .filter((p) => p.type === \"integer\")\n    .reduce((n, p) => n + Array.from(p.value).length, 0);\n\n  const parts: NumberPart[] = [];\n  const seen = new Map<string, number>();\n  const textKey = (type: string, side: string): string => {\n    const id = `${type}:${side}`;\n    const n = seen.get(id) ?? 0;\n    seen.set(id, n + 1);\n    return `${id}:${n}`;\n  };\n  let side = \"pre\";\n  let placed = 0;\n  let fractionAt = 0;\n\n  for (const { type, value: text } of raw) {\n    if (type === \"integer\") {\n      side = \"post\";\n      for (const char of Array.from(text)) {\n        const digit = values.get(char);\n        const place = integerDigits - 1 - placed;\n        placed += 1;\n        parts.push(\n          digit === undefined\n            ? { kind: \"text\", key: textKey(\"integer\", side), text: char }\n            : { kind: \"digit\", key: `int:${place}`, digit },\n        );\n      }\n    } else if (type === \"fraction\") {\n      for (const char of Array.from(text)) {\n        const digit = values.get(char);\n        const at = fractionAt;\n        fractionAt += 1;\n        parts.push(\n          digit === undefined\n            ? { kind: \"text\", key: textKey(\"fraction\", side), text: char }\n            : { kind: \"digit\", key: `frac:${at}`, digit },\n        );\n      }\n    } else if (type === \"group\") {\n      parts.push({ kind: \"text\", key: `group:${integerDigits - 1 - placed}`, text });\n    } else if (type === \"decimal\") {\n      side = \"post\";\n      parts.push({ kind: \"text\", key: \"decimal\", text });\n    } else {\n      parts.push({ kind: \"text\", key: textKey(type, side), text });\n    }\n  }\n  return parts;\n}\n\n/**\n * Signed number of steps a digit column travels. `1` always goes up (9 -> 0\n * wraps forward), `-1` always down, `0` takes the shorter way (a tie goes up).\n */\nexport function rollStep(from: number, to: number, direction: RollDirection): number {\n  const up = (((to - from) % 10) + 10) % 10;\n  const down = (10 - up) % 10;\n  if (direction === 1) return up;\n  if (direction === -1) return -down;\n  return up <= down ? up : -down;\n}\n\n/** Which way the whole number moved: `trend` when given, else the sign of the change. */\nexport function resolveDirection(\n  trend: RollDirection | undefined,\n  from: number,\n  to: number,\n): RollDirection {\n  if (trend !== undefined) return trend;\n  return to > from ? 1 : to < from ? -1 : 0;\n}\n\nexport interface NumberItem {\n  part: NumberPart;\n  /** Still on screen only to finish its exit; no longer in the value. */\n  exiting: boolean;\n  /** Enters from zero width; false for the first render and for reduced motion. */\n  fresh: boolean;\n}\n\n/**\n * Carries the previous items into the next value. A key that is gone stays as\n * an exiting item in its old position (after the nearest surviving neighbour\n * to its left), so it can collapse instead of vanishing. A key that comes back\n * while exiting is reused, not remounted.\n */\nexport function mergeItems(\n  previous: readonly NumberItem[],\n  next: readonly NumberPart[],\n  animate: boolean,\n): NumberItem[] {\n  const known = new Set(previous.map((item) => item.part.key));\n  const result: NumberItem[] = next.map((part) => ({\n    part,\n    exiting: false,\n    fresh: animate && !known.has(part.key),\n  }));\n  if (!animate) return result;\n\n  const nextKeys = new Set(next.map((part) => part.key));\n  let anchor = -1;\n  for (const item of previous) {\n    if (nextKeys.has(item.part.key)) {\n      anchor = result.findIndex((r) => r.part.key === item.part.key);\n    } else {\n      anchor += 1;\n      result.splice(anchor, 0, { part: item.part, exiting: true, fresh: false });\n    }\n  }\n  return result;\n}\n"],"mappings":"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","names":["side"]}

package/dist/palette-cli.js

@@ -4,7 +4,7 @@ import {
   brandFromToml,
   readContract,
   renderPalette
-} from "./chunk-3IPB4QQJ.js";
+} from "./chunk-35SPIU4U.js";
 
 // src/palette/cli.ts
 import { readFileSync, writeFileSync } from "fs";

package/dist/palette.d.ts

@@ -13,7 +13,9 @@ interface Contract {
     derivedFrom: Readonly<Record<string, readonly string[]>>;
 }
 /** The rule the derived tokens live on — see `theme.css`, the contract half of `tokens.css`. */
-declare const DERIVED_SCOPE = ":where(:root, .dark, .light, [data-brand])";
+declare const DERIVED_SCOPE = ":where(:root, .dark, .light, [data-brand], [data-theme])";
+/** The same scopes in another order: the button faces and chips, derived the same way. */
+declare const FACES_SCOPE = ":where([data-theme], [data-brand], .light, .dark, :root)";
 interface CssRule {
     selector: string;
     /** Custom properties declared directly in the rule, in source order. */
@@ -38,7 +40,7 @@ interface BrandConfig {
     /** `--brand-font-<role>`: a family name per role; unset roles keep the kit's. */
     fonts?: Partial<Record<FontRole, string>>;
 }
-type FontRole = "sans" | "display" | "mono";
+type FontRole = "sans" | "serif" | "mono";
 declare const FONT_ROLES: readonly FontRole[];
 /** Every problem with a brand file at once, so one run fixes them all. */
 declare class PaletteError extends Error {
@@ -48,7 +50,7 @@ declare class PaletteError extends Error {
 /**
  * Reads the aquafix `brand.toml` shape: `[colors.light]` and `[colors.dark]`
  * keyed by contract name, optional top-level `mark` / `mark-aspect`, and the
- * family names in `[fonts]` (`sans` or `text`, `display`, `mono`). The rest of
+ * family names in `[fonts]` (`sans` or `text`, `serif`, `mono`). The rest of
  * `[fonts]` and every other table (`[print]`, …) belong to other tools and are
  * ignored — loading the font files is the site's job, not the palette's.
  */
@@ -77,4 +79,4 @@ interface TomlTable {
 }
 declare function parseToml(text: string): TomlTable;
 
-export { type BrandConfig, type Contract, type CssRule, DERIVED_SCOPE, FONT_ROLES, type FontRole, POLARITIES, PaletteError, type PolarityName, type TomlTable, type TomlValue, brandFromToml, parseToml, readContract, readRules, renderPalette, validateBrand };
+export { type BrandConfig, type Contract, type CssRule, DERIVED_SCOPE, FACES_SCOPE, FONT_ROLES, type FontRole, POLARITIES, PaletteError, type PolarityName, type TomlTable, type TomlValue, brandFromToml, parseToml, readContract, readRules, renderPalette, validateBrand };

package/dist/palette.js

@@ -1,5 +1,6 @@
 import {
   DERIVED_SCOPE,
+  FACES_SCOPE,
   FONT_ROLES,
   POLARITIES,
   PaletteError,
@@ -9,9 +10,10 @@ import {
   readRules,
   renderPalette,
   validateBrand
-} from "./chunk-3IPB4QQJ.js";
+} from "./chunk-35SPIU4U.js";
 export {
   DERIVED_SCOPE,
+  FACES_SCOPE,
   FONT_ROLES,
   POLARITIES,
   PaletteError,

package/dist/primitives/dismissable-layer.js

@@ -7,11 +7,15 @@ function isStore(value) {
 }
 function sharedStore() {
   const existing = Reflect.get(globalThis, STORE_KEY);
-  if (isStore(existing)) return existing;
+  if (isStore(existing)) {
+    existing.listeners ??= /* @__PURE__ */ new Set();
+    return existing;
+  }
   const store2 = {
     stack: [],
     info: /* @__PURE__ */ new WeakMap(),
     seen: /* @__PURE__ */ new WeakMap(),
+    listeners: /* @__PURE__ */ new Set(),
     snapshot: (event) => {
       if (!store2.seen.has(event)) store2.seen.set(event, store2.stack.slice());
     }
@@ -55,6 +59,10 @@ function push(layer) {
   const firstChild = stack.findIndex((other) => isDescendant(other, layer));
   if (firstChild < 0) stack.push(layer);
   else stack.splice(firstChild, 0, layer);
+  notify();
+}
+function notify() {
+  for (const listener of store.listeners) listener();
 }
 function pop(layer) {
   const { stack } = store;
@@ -64,21 +72,84 @@ function pop(layer) {
     window.removeEventListener("keydown", store.snapshot, true);
     window.removeEventListener("pointerdown", store.snapshot, true);
   }
+  notify();
 }
 const ParentLayerContext = React.createContext(null);
+const renderedModal = /* @__PURE__ */ new WeakMap();
+const waitingForParent = /* @__PURE__ */ new WeakMap();
+function liftAbove(child, parent) {
+  const node = child.current;
+  const parentNode = parent.current;
+  if (!node || !parentNode) return false;
+  if (!(parentNode.compareDocumentPosition(node) & Node.DOCUMENT_POSITION_PRECEDING)) return true;
+  const view = node.ownerDocument.defaultView;
+  if (!view) return true;
+  const parentZ = Number.parseInt(view.getComputedStyle(parentNode).zIndex, 10);
+  const ownZ = Number.parseInt(view.getComputedStyle(node).zIndex, 10);
+  if (Number.isNaN(parentZ) || Number.isNaN(ownZ) || ownZ > parentZ) return true;
+  node.style.zIndex = String(parentZ + 2);
+  const scrim = node.previousElementSibling;
+  if (renderedModal.get(child) && scrim instanceof HTMLElement && scrim.dataset["slot"]?.endsWith("overlay")) {
+    scrim.style.zIndex = String(parentZ + 1);
+  }
+  return true;
+}
+function modalBelow(layer) {
+  const { stack } = store;
+  const index = stack.indexOf(layer);
+  const below = index < 0 ? stack : stack.slice(0, index);
+  return below.some((other) => other !== layer && store.info.get(other)?.modal === true);
+}
+function subscribe(listener) {
+  store.listeners.add(listener);
+  return () => store.listeners.delete(listener);
+}
+const CLEAR_SCRIM = Object.freeze({ backgroundColor: "transparent" });
+function useModalScrimStyle(layer) {
+  const parent = React.useContext(ParentLayerContext);
+  const below = React.useSyncExternalStore(
+    subscribe,
+    () => modalBelow(layer),
+    () => false
+  );
+  return below || parent?.modalAbove === true ? CLEAR_SCRIM : void 0;
+}
 function DismissableLayerScope({ layer, children }) {
-  return /* @__PURE__ */ jsx(ParentLayerContext.Provider, { value: layer, children });
+  const outer = React.useContext(ParentLayerContext);
+  const outerModal = outer?.modalAbove ?? false;
+  const value = React.useMemo(
+    () => ({ layer, modalAbove: outerModal || renderedModal.get(layer) === true }),
+    [layer, outerModal]
+  );
+  return /* @__PURE__ */ jsx(ParentLayerContext.Provider, { value, children });
 }
 function useDismissableLayer(opts) {
   const { enabled, onDismiss, exclude, pointerOutside = true, modal = false } = opts;
-  const parent = React.useContext(ParentLayerContext);
+  const parent = React.useContext(ParentLayerContext)?.layer ?? null;
   const ref = React.useRef(null);
+  renderedModal.set(ref, modal);
   const onDismissRef = React.useRef(onDismiss);
   const excludeRef = React.useRef(exclude);
   React.useEffect(() => {
     onDismissRef.current = onDismiss;
     excludeRef.current = exclude;
   });
+  React.useLayoutEffect(() => {
+    if (!enabled) return;
+    const waiting = waitingForParent.get(ref);
+    if (waiting) {
+      waitingForParent.delete(ref);
+      for (const child of waiting) liftAbove(child, ref);
+    }
+    if (parent && !liftAbove(ref, parent)) {
+      const siblings = waitingForParent.get(parent) ?? /* @__PURE__ */ new Set();
+      siblings.add(ref);
+      waitingForParent.set(parent, siblings);
+    }
+    return () => {
+      if (parent) waitingForParent.get(parent)?.delete(ref);
+    };
+  }, [enabled, parent]);
   React.useEffect(() => {
     if (!enabled) return;
     store.info.set(ref, { parent, modal });
@@ -108,6 +179,7 @@ function useDismissableLayer(opts) {
 export {
   DismissableLayerScope,
   LAYER_IGNORE_ATTR,
-  useDismissableLayer
+  useDismissableLayer,
+  useModalScrimStyle
 };
 //# sourceMappingURL=dismissable-layer.js.map

package/dist/primitives/dismissable-layer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/primitives/dismissable-layer.tsx"],"sourcesContent":["\"use client\";\n\nimport * as React from \"react\";\n\ntype LayerRef = React.RefObject<HTMLDivElement | null>;\n\ninterface LayerInfo {\n  /** The layer this one was rendered inside, from context — not the one below it on the stack. */\n  parent: LayerRef | null;\n  modal: boolean;\n}\n\ninterface LayerStore {\n  // The open layers, bottom first. An overlay opened inside another (a Select\n  // in a Dialog, a Popover in a Drawer) is portaled out of its parent's\n  // subtree, so \"outside the parent\" would include it: the stack is what tells\n  // a nested layer from the rest of the page.\n  stack: LayerRef[];\n  info: WeakMap<LayerRef, LayerInfo>;\n  // The stack as it stood when an event started its trip. By the time the\n  // document hears an Escape, a React `onKeyDown` on the way (a Select's, a\n  // consumer's) may already have closed the top layer and — a discrete update\n  // commits synchronously — popped it, so the layer below would find itself\n  // on top and close on the same key; a pointer-down can close an upper modal\n  // the same way and lift its barrier mid-flight. Taken in the window's\n  // capture phase, which runs before any DOM listener, React's root included.\n  seen: WeakMap<Event, LayerRef[]>;\n  snapshot: (event: Event) => void;\n}\n\n// One stack per page, not per module copy: a micro-frontend that bundles its\n// own uikit must see the host's layers, and the host its. Versioned, so a copy\n// with a different store shape keeps to itself instead of misreading this one.\nconst STORE_KEY = Symbol.for(\"@evinvest/uikit/dismissable-layers@1\");\n\nfunction isStore(value: unknown): value is LayerStore {\n  return typeof value === \"object\" && value !== null && \"stack\" in value && Array.isArray(value.stack);\n}\n\nfunction sharedStore(): LayerStore {\n  const existing: unknown = Reflect.get(globalThis, STORE_KEY);\n  if (isStore(existing)) return existing;\n  const store: LayerStore = {\n    stack: [],\n    info: new WeakMap(),\n    seen: new WeakMap(),\n    snapshot: (event) => {\n      if (!store.seen.has(event)) store.seen.set(event, store.stack.slice());\n    },\n  };\n  Reflect.set(globalThis, STORE_KEY, store);\n  return store;\n}\n\nconst store = sharedStore();\n\n/**\n * Elements carrying this attribute are outside every layer without being a\n * click away from any: a press there dismisses nothing (the toaster).\n */\nexport const LAYER_IGNORE_ATTR = \"data-dismissable-layer-ignore\";\n\nfunction layersAt(event: Event): LayerRef[] {\n  // An event dispatched where the window never sees it falls back to the live stack.\n  return store.seen.get(event) ?? store.stack;\n}\n\nfunction isPointerOutside(own: LayerRef, event: PointerEvent): boolean {\n  const target = event.target;\n  if (!(target instanceof Node)) return false;\n  const el = target instanceof Element ? target : target.parentElement;\n  if (el?.closest(`[${LAYER_IGNORE_ATTR}]`)) return false;\n  const layers = layersAt(event);\n  const index = layers.indexOf(own);\n  // Not on the stack (a listener outliving its cleanup): nothing is above it.\n  if (index < 0) return true;\n  const above = layers.slice(index + 1);\n  // A modal above is a barrier: whatever the press landed on — its scrim, its\n  // panel, a toast over it — the modal answers for it, not the layers below.\n  if (above.some((layer) => store.info.get(layer)?.modal === true)) return false;\n  return !above.some((layer) => layer.current?.contains(target) ?? false);\n}\n\nfunction ownsEscape(own: LayerRef, event: KeyboardEvent): boolean {\n  const layers = layersAt(event);\n  return layers[layers.length - 1] === own;\n}\n\nfunction isDescendant(layer: LayerRef, ancestor: LayerRef): boolean {\n  for (let p = store.info.get(layer)?.parent ?? null; p; p = store.info.get(p)?.parent ?? null) {\n    if (p === ancestor) return true;\n  }\n  return false;\n}\n\nfunction push(layer: LayerRef) {\n  const { stack } = store;\n  if (stack.length === 0) {\n    window.addEventListener(\"keydown\", store.snapshot, true);\n    window.addEventListener(\"pointerdown\", store.snapshot, true);\n  }\n  // Children's effects run before their parent's, so a layer opened in the\n  // same commit as one nested in it (`defaultOpen` on both, a shared `open`)\n  // arrives second: it goes below its first descendant, not on top.\n  const firstChild = stack.findIndex((other) => isDescendant(other, layer));\n  if (firstChild < 0) stack.push(layer);\n  else stack.splice(firstChild, 0, layer);\n}\n\nfunction pop(layer: LayerRef) {\n  const { stack } = store;\n  const index = stack.indexOf(layer);\n  if (index >= 0) stack.splice(index, 1);\n  if (stack.length === 0) {\n    window.removeEventListener(\"keydown\", store.snapshot, true);\n    window.removeEventListener(\"pointerdown\", store.snapshot, true);\n  }\n}\n\nconst ParentLayerContext = React.createContext<LayerRef | null>(null);\n\n/**\n * Marks `children` as rendered inside `layer` (the ref `useDismissableLayer`\n * returned), so a layer among them always stacks above it — even when both\n * open in the same commit. Wrap the overlay's content in it.\n */\nexport function DismissableLayerScope({ layer, children }: { layer: LayerRef; children?: React.ReactNode }) {\n  return <ParentLayerContext.Provider value={layer}>{children}</ParentLayerContext.Provider>;\n}\n\n/** Why a layer is being dismissed: the event itself, for a caller that treats keys and pointers apart. */\nexport type DismissEvent = PointerEvent | KeyboardEvent;\n\n/**\n * Calls `onDismiss` on Escape or on a pointer-down outside the layer — the\n * dep-light core of every overlay's \"click away to close\". Pass refs to any\n * nodes that should NOT count as outside (e.g. the trigger), via `exclude`.\n *\n * Layers stack: a layer rendered inside another's `DismissableLayerScope`\n * sits above it, the rest in the order they opened. Escape dismisses only the\n * topmost layer, and a pointer-down inside a layer above this one is not\n * outside it — so a Select's list inside a Dialog closes the list, not the\n * Dialog. The Escape goes to the layer that was on top when the key was\n * pressed, even if a handler on its way closed that layer first.\n *\n * `modal: true` makes the layer a barrier: while it is open, the layers below\n * ignore every pointer-down — a press on its scrim closes it alone. Elements\n * marked with `LAYER_IGNORE_ATTR` (the toaster) are outside no layer.\n *\n * `pointerOutside: false` keeps the layer on the stack (it takes Escape, and\n * the layers below see a pointer-down inside it as inside) but leaves outside\n * clicks to the caller — for an overlay whose own scrim is what \"outside\"\n * means (Drawer, CommandDialog).\n *\n * The stack is shared through `globalThis`, so every copy of this module on\n * the page sees one stack; parent links need one React context, so they hold\n * within a copy only.\n *\n * Mirrors the dismiss behaviour Rust expresses with a full-screen backdrop.\n */\nexport function useDismissableLayer(opts: {\n  enabled: boolean;\n  onDismiss: (event: DismissEvent) => void;\n  exclude?: Array<React.RefObject<Element | null>>;\n  /** Dismiss on a pointer-down outside the layer. Default `true`. */\n  pointerOutside?: boolean;\n  /** Bar the layers below from pointer-downs while open. Default `false`. */\n  modal?: boolean;\n}): React.RefObject<HTMLDivElement | null> {\n  const { enabled, onDismiss, exclude, pointerOutside = true, modal = false } = opts;\n  const parent = React.useContext(ParentLayerContext);\n  const ref = React.useRef<HTMLDivElement | null>(null);\n  const onDismissRef = React.useRef(onDismiss);\n  // Callers pass `exclude` inline, a new array each render: read through a ref,\n  // or the effect would re-run and move this layer to the top of the stack.\n  const excludeRef = React.useRef(exclude);\n  React.useEffect(() => {\n    onDismissRef.current = onDismiss;\n    excludeRef.current = exclude;\n  });\n\n  React.useEffect(() => {\n    if (!enabled) return;\n    store.info.set(ref, { parent, modal });\n    push(ref);\n\n    function onPointerDown(event: PointerEvent) {\n      const target = event.target;\n      if (!(target instanceof Node)) return;\n      if (ref.current && ref.current.contains(target)) return;\n      for (const r of excludeRef.current ?? []) {\n        if (r.current && r.current.contains(target)) return;\n      }\n      if (isPointerOutside(ref, event)) onDismissRef.current(event);\n    }\n\n    function onKeyDown(event: KeyboardEvent) {\n      if (event.key === \"Escape\" && ownsEscape(ref, event)) onDismissRef.current(event);\n    }\n\n    if (pointerOutside) document.addEventListener(\"pointerdown\", onPointerDown, true);\n    document.addEventListener(\"keydown\", onKeyDown);\n    return () => {\n      pop(ref);\n      document.removeEventListener(\"pointerdown\", onPointerDown, true);\n      document.removeEventListener(\"keydown\", onKeyDown);\n    };\n  }, [enabled, pointerOutside, modal, parent]);\n\n  return ref;\n}\n"],"mappings":"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","names":["store"]}
+{"version":3,"sources":["../../src/primitives/dismissable-layer.tsx"],"sourcesContent":["\"use client\";\n\nimport * as React from \"react\";\n\ntype LayerRef = React.RefObject<HTMLDivElement | null>;\n\ninterface LayerInfo {\n  /** The layer this one was rendered inside, from context — not the one below it on the stack. */\n  parent: LayerRef | null;\n  modal: boolean;\n}\n\ninterface LayerStore {\n  // The open layers, bottom first. An overlay opened inside another (a Select\n  // in a Dialog, a Popover in a Drawer) is portaled out of its parent's\n  // subtree, so \"outside the parent\" would include it: the stack is what tells\n  // a nested layer from the rest of the page.\n  stack: LayerRef[];\n  info: WeakMap<LayerRef, LayerInfo>;\n  // The stack as it stood when an event started its trip. By the time the\n  // document hears an Escape, a React `onKeyDown` on the way (a Select's, a\n  // consumer's) may already have closed the top layer and — a discrete update\n  // commits synchronously — popped it, so the layer below would find itself\n  // on top and close on the same key; a pointer-down can close an upper modal\n  // the same way and lift its barrier mid-flight. Taken in the window's\n  // capture phase, which runs before any DOM listener, React's root included.\n  seen: WeakMap<Event, LayerRef[]>;\n  snapshot: (event: Event) => void;\n  // Who to tell when the stack changes (a modal asks whether another modal is\n  // below it, to decide whether it draws the scrim).\n  listeners: Set<() => void>;\n}\n\n// One stack per page, not per module copy: a micro-frontend that bundles its\n// own uikit must see the host's layers, and the host its. Versioned, so a copy\n// with an incompatible store shape keeps to itself instead of misreading this one.\nconst STORE_KEY = Symbol.for(\"@evinvest/uikit/dismissable-layers@1\");\n\nfunction isStore(value: unknown): value is LayerStore {\n  return typeof value === \"object\" && value !== null && \"stack\" in value && Array.isArray(value.stack);\n}\n\nfunction sharedStore(): LayerStore {\n  const existing: unknown = Reflect.get(globalThis, STORE_KEY);\n  if (isStore(existing)) {\n    // an older copy created the store: it never notifies, so only this copy's listeners hear changes\n    existing.listeners ??= new Set();\n    return existing;\n  }\n  const store: LayerStore = {\n    stack: [],\n    info: new WeakMap(),\n    seen: new WeakMap(),\n    listeners: new Set(),\n    snapshot: (event) => {\n      if (!store.seen.has(event)) store.seen.set(event, store.stack.slice());\n    },\n  };\n  Reflect.set(globalThis, STORE_KEY, store);\n  return store;\n}\n\nconst store = sharedStore();\n\n/**\n * Elements carrying this attribute are outside every layer without being a\n * click away from any: a press there dismisses nothing (the toaster).\n */\nexport const LAYER_IGNORE_ATTR = \"data-dismissable-layer-ignore\";\n\nfunction layersAt(event: Event): LayerRef[] {\n  // An event dispatched where the window never sees it falls back to the live stack.\n  return store.seen.get(event) ?? store.stack;\n}\n\nfunction isPointerOutside(own: LayerRef, event: PointerEvent): boolean {\n  const target = event.target;\n  if (!(target instanceof Node)) return false;\n  const el = target instanceof Element ? target : target.parentElement;\n  if (el?.closest(`[${LAYER_IGNORE_ATTR}]`)) return false;\n  const layers = layersAt(event);\n  const index = layers.indexOf(own);\n  // Not on the stack (a listener outliving its cleanup): nothing is above it.\n  if (index < 0) return true;\n  const above = layers.slice(index + 1);\n  // A modal above is a barrier: whatever the press landed on — its scrim, its\n  // panel, a toast over it — the modal answers for it, not the layers below.\n  if (above.some((layer) => store.info.get(layer)?.modal === true)) return false;\n  return !above.some((layer) => layer.current?.contains(target) ?? false);\n}\n\nfunction ownsEscape(own: LayerRef, event: KeyboardEvent): boolean {\n  const layers = layersAt(event);\n  return layers[layers.length - 1] === own;\n}\n\nfunction isDescendant(layer: LayerRef, ancestor: LayerRef): boolean {\n  for (let p = store.info.get(layer)?.parent ?? null; p; p = store.info.get(p)?.parent ?? null) {\n    if (p === ancestor) return true;\n  }\n  return false;\n}\n\nfunction push(layer: LayerRef) {\n  const { stack } = store;\n  if (stack.length === 0) {\n    window.addEventListener(\"keydown\", store.snapshot, true);\n    window.addEventListener(\"pointerdown\", store.snapshot, true);\n  }\n  // Children's effects run before their parent's, so a layer opened in the\n  // same commit as one nested in it (`defaultOpen` on both, a shared `open`)\n  // arrives second: it goes below its first descendant, not on top.\n  const firstChild = stack.findIndex((other) => isDescendant(other, layer));\n  if (firstChild < 0) stack.push(layer);\n  else stack.splice(firstChild, 0, layer);\n  notify();\n}\n\nfunction notify() {\n  for (const listener of store.listeners) listener();\n}\n\nfunction pop(layer: LayerRef) {\n  const { stack } = store;\n  const index = stack.indexOf(layer);\n  if (index >= 0) stack.splice(index, 1);\n  if (stack.length === 0) {\n    window.removeEventListener(\"keydown\", store.snapshot, true);\n    window.removeEventListener(\"pointerdown\", store.snapshot, true);\n  }\n  notify();\n}\n\ninterface ParentLayer {\n  layer: LayerRef;\n  /** This layer or one above it in the React tree is a modal. */\n  modalAbove: boolean;\n}\n\nconst ParentLayerContext = React.createContext<ParentLayer | null>(null);\n\n// Whether each layer asked for `modal`, known from its first render. The stack\n// learns it only in an effect, too late for the scope below a layer opened in\n// the same commit to tell its children that a modal is under them.\nconst renderedModal = new WeakMap<LayerRef, boolean>();\n\n// Layers waiting for their parent's node: a child's layout effect runs before\n// the parent's ref is attached when both open in one commit.\nconst waitingForParent = new WeakMap<LayerRef, Set<LayerRef>>();\n\n/**\n * Children's portals mount before their parent's when both open in one\n * commit, so with equal `z-index` the parent paints over the child and its\n * scrim. Lifts `child` (and the scrim rendered just before it) over `parent`\n * only in that case, so overlays that do not share a tree keep the stacking\n * their classes give them. Returns false while a node is still missing.\n */\nfunction liftAbove(child: LayerRef, parent: LayerRef): boolean {\n  const node = child.current;\n  const parentNode = parent.current;\n  if (!node || !parentNode) return false;\n  if (!(parentNode.compareDocumentPosition(node) & Node.DOCUMENT_POSITION_PRECEDING)) return true;\n  const view = node.ownerDocument.defaultView;\n  if (!view) return true;\n  const parentZ = Number.parseInt(view.getComputedStyle(parentNode).zIndex, 10);\n  const ownZ = Number.parseInt(view.getComputedStyle(node).zIndex, 10);\n  if (Number.isNaN(parentZ) || Number.isNaN(ownZ) || ownZ > parentZ) return true;\n  node.style.zIndex = String(parentZ + 2);\n  const scrim = node.previousElementSibling;\n  // Only a modal renders its own scrim just before its panel; for anything\n  // else that sibling belongs to someone else.\n  if (renderedModal.get(child) && scrim instanceof HTMLElement && scrim.dataset[\"slot\"]?.endsWith(\"overlay\")) {\n    scrim.style.zIndex = String(parentZ + 1);\n  }\n  return true;\n}\n\nfunction modalBelow(layer: LayerRef): boolean {\n  const { stack } = store;\n  const index = stack.indexOf(layer);\n  // Not on the stack yet (first render) or no longer (exiting): whatever modals\n  // are open are, or were, under it.\n  const below = index < 0 ? stack : stack.slice(0, index);\n  return below.some((other) => other !== layer && store.info.get(other)?.modal === true);\n}\n\nfunction subscribe(listener: () => void): () => void {\n  store.listeners.add(listener);\n  return () => store.listeners.delete(listener);\n}\n\nconst CLEAR_SCRIM: React.CSSProperties = Object.freeze({ backgroundColor: \"transparent\" });\n\n/**\n * The inline style for a modal's scrim. One scrim darkens the page however\n * many modals are stacked: the lowest draws it, the ones above get a clear\n * one (it still sits under their panel and catches presses for their layer),\n * so the panel below stays readable between the scrim and the top modal.\n * Pass the layer `useDismissableLayer` returned.\n */\nexport function useModalScrimStyle(layer: LayerRef): React.CSSProperties | undefined {\n  const parent = React.useContext(ParentLayerContext);\n  const below = React.useSyncExternalStore(\n    subscribe,\n    () => modalBelow(layer),\n    () => false,\n  );\n  return below || parent?.modalAbove === true ? CLEAR_SCRIM : undefined;\n}\n\n/**\n * Marks `children` as rendered inside `layer` (the ref `useDismissableLayer`\n * returned), so a layer among them always stacks above it — even when both\n * open in the same commit. Wrap the overlay's content in it.\n */\nexport function DismissableLayerScope({ layer, children }: { layer: LayerRef; children?: React.ReactNode }) {\n  const outer = React.useContext(ParentLayerContext);\n  const outerModal = outer?.modalAbove ?? false;\n  const value = React.useMemo<ParentLayer>(\n    () => ({ layer, modalAbove: outerModal || renderedModal.get(layer) === true }),\n    [layer, outerModal],\n  );\n  return <ParentLayerContext.Provider value={value}>{children}</ParentLayerContext.Provider>;\n}\n\n/** Why a layer is being dismissed: the event itself, for a caller that treats keys and pointers apart. */\nexport type DismissEvent = PointerEvent | KeyboardEvent;\n\n/**\n * Calls `onDismiss` on Escape or on a pointer-down outside the layer — the\n * dep-light core of every overlay's \"click away to close\". Pass refs to any\n * nodes that should NOT count as outside (e.g. the trigger), via `exclude`.\n *\n * Layers stack: a layer rendered inside another's `DismissableLayerScope`\n * sits above it, the rest in the order they opened. Escape dismisses only the\n * topmost layer, and a pointer-down inside a layer above this one is not\n * outside it — so a Select's list inside a Dialog closes the list, not the\n * Dialog. The Escape goes to the layer that was on top when the key was\n * pressed, even if a handler on its way closed that layer first.\n *\n * `modal: true` makes the layer a barrier: while it is open, the layers below\n * ignore every pointer-down — a press on its scrim closes it alone. Elements\n * marked with `LAYER_IGNORE_ATTR` (the toaster) are outside no layer.\n *\n * `pointerOutside: false` keeps the layer on the stack (it takes Escape, and\n * the layers below see a pointer-down inside it as inside) but leaves outside\n * clicks to the caller — for an overlay whose own scrim is what \"outside\"\n * means (Drawer, CommandDialog).\n *\n * The stack is shared through `globalThis`, so every copy of this module on\n * the page sees one stack; parent links need one React context, so they hold\n * within a copy only.\n *\n * Mirrors the dismiss behaviour Rust expresses with a full-screen backdrop.\n */\nexport function useDismissableLayer(opts: {\n  enabled: boolean;\n  onDismiss: (event: DismissEvent) => void;\n  exclude?: Array<React.RefObject<Element | null>>;\n  /** Dismiss on a pointer-down outside the layer. Default `true`. */\n  pointerOutside?: boolean;\n  /** Bar the layers below from pointer-downs while open. Default `false`. */\n  modal?: boolean;\n}): React.RefObject<HTMLDivElement | null> {\n  const { enabled, onDismiss, exclude, pointerOutside = true, modal = false } = opts;\n  const parent = React.useContext(ParentLayerContext)?.layer ?? null;\n  const ref = React.useRef<HTMLDivElement | null>(null);\n  // Idempotent per ref, so safe in render; see `renderedModal`.\n  renderedModal.set(ref, modal);\n  const onDismissRef = React.useRef(onDismiss);\n  // Callers pass `exclude` inline, a new array each render: read through a ref,\n  // or the effect would re-run and move this layer to the top of the stack.\n  const excludeRef = React.useRef(exclude);\n  React.useEffect(() => {\n    onDismissRef.current = onDismiss;\n    excludeRef.current = exclude;\n  });\n\n  React.useLayoutEffect(() => {\n    if (!enabled) return;\n    // Late children first (they ran before this layer's ref existed), then this\n    // layer against its own parent.\n    const waiting = waitingForParent.get(ref);\n    if (waiting) {\n      waitingForParent.delete(ref);\n      for (const child of waiting) liftAbove(child, ref);\n    }\n    if (parent && !liftAbove(ref, parent)) {\n      const siblings = waitingForParent.get(parent) ?? new Set<LayerRef>();\n      siblings.add(ref);\n      waitingForParent.set(parent, siblings);\n    }\n    return () => {\n      if (parent) waitingForParent.get(parent)?.delete(ref);\n    };\n  }, [enabled, parent]);\n\n  React.useEffect(() => {\n    if (!enabled) return;\n    store.info.set(ref, { parent, modal });\n    push(ref);\n\n    function onPointerDown(event: PointerEvent) {\n      const target = event.target;\n      if (!(target instanceof Node)) return;\n      if (ref.current && ref.current.contains(target)) return;\n      for (const r of excludeRef.current ?? []) {\n        if (r.current && r.current.contains(target)) return;\n      }\n      if (isPointerOutside(ref, event)) onDismissRef.current(event);\n    }\n\n    function onKeyDown(event: KeyboardEvent) {\n      if (event.key === \"Escape\" && ownsEscape(ref, event)) onDismissRef.current(event);\n    }\n\n    if (pointerOutside) document.addEventListener(\"pointerdown\", onPointerDown, true);\n    document.addEventListener(\"keydown\", onKeyDown);\n    return () => {\n      pop(ref);\n      document.removeEventListener(\"pointerdown\", onPointerDown, true);\n      document.removeEventListener(\"keydown\", onKeyDown);\n    };\n  }, [enabled, pointerOutside, modal, parent]);\n\n  return ref;\n}\n"],"mappings":"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","names":["store"]}

package/dist/primitives/focus-scope.js

@@ -16,6 +16,11 @@ function focusable(root) {
     (el) => el.offsetWidth > 0 || el.offsetHeight > 0 || el === document.activeElement
   );
 }
+let claimed = [];
+function claim(root, saved) {
+  if (claimed.length === 0) queueMicrotask(() => claimed = []);
+  claimed.push({ root, saved });
+}
 function usable(el) {
   return !!el && el !== document.body && el.isConnected;
 }
@@ -31,10 +36,18 @@ function useFocusScope(enabled, { initialFocus = "first", returnFocusTo } = {})
     if (!enabled) return;
     const root = ref.current;
     if (!root) return;
-    const previouslyFocused = document.activeElement;
-    const first = initialFocus === "first" ? focusable(root)[0] : void 0;
-    if (first) first.focus();
-    else focusRoot(root);
+    const inner = claimed.find((c) => c.root !== root && c.root.contains(document.activeElement));
+    const saved = {
+      el: inner ? inner.saved.el : document.activeElement,
+      behind: false
+    };
+    if (inner) inner.saved.behind = true;
+    else {
+      const first = initialFocus === "first" ? focusable(root)[0] : void 0;
+      if (first) first.focus();
+      else focusRoot(root);
+    }
+    claim(root, saved);
     function onKeyDown(event) {
       if (event.key !== "Tab" || !root) return;
       const items = focusable(root);
@@ -59,9 +72,11 @@ function useFocusScope(enabled, { initialFocus = "first", returnFocusTo } = {})
     root.addEventListener("keydown", onKeyDown);
     return () => {
       root.removeEventListener("keydown", onKeyDown);
+      claimed = claimed.filter((c) => c.root !== root);
       const active = document.activeElement;
       if (active && active !== document.body && !root.contains(active)) return;
-      const target = usable(previouslyFocused) ? previouslyFocused : fallbackRef.current?.current;
+      const anchor = fallbackRef.current?.current;
+      const target = saved.behind && usable(anchor) ? anchor : usable(saved.el) ? saved.el : anchor;
       if (usable(target)) target.focus({ preventScroll: true });
     };
   }, [enabled, initialFocus]);

package/dist/primitives/focus-scope.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/primitives/focus-scope.tsx"],"sourcesContent":["\"use client\";\n\nimport * as React from \"react\";\n\n// `tabindex=\"-1\"` opts an element out of Tab order whatever its tag, so the\n// exclusion goes on every branch — otherwise a roving-tabindex grid's parked\n// cells would count as tab stops.\nconst FOCUSABLE = [\n  \"a[href]\",\n  \"button:not([disabled])\",\n  \"textarea:not([disabled])\",\n  \"input:not([disabled])\",\n  \"select:not([disabled])\",\n  \"[tabindex]\",\n]\n  .map(sel => `${sel}:not([tabindex=\"-1\"])`)\n  .join(\",\");\n\n/**\n * Every enabled, Tab-reachable candidate under `root` in DOM (= Tab) order,\n * before the layout-based visibility filter; `tabindex=\"-1\"` is skipped on any\n * tag. For content that is fully visible while it exists (a popover), this is\n * the tab order itself. Internal to the kit.\n */\nexport function focusCandidates(root: HTMLElement): HTMLElement[] {\n  return Array.from(root.querySelectorAll<HTMLElement>(FOCUSABLE));\n}\n\nfunction focusable(root: HTMLElement): HTMLElement[] {\n  return focusCandidates(root).filter(\n    (el) => el.offsetWidth > 0 || el.offsetHeight > 0 || el === document.activeElement,\n  );\n}\n\n/**\n * Where focus lands when the scope opens. `first` is the first Tab stop inside\n * (an input, an alert dialog's least destructive action); `container` is the\n * scope root itself, so a reader starts at the top and the first Tab reaches the\n * first control — right for a panel of content, where the first stop may be an\n * action one keypress away from firing.\n */\nexport type InitialFocus = \"first\" | \"container\";\n\nexport interface FocusScopeOptions {\n  /** Default `first`; falls back to the container when nothing inside is focusable. */\n  initialFocus?: InitialFocus;\n  /**\n   * Where focus goes back on close when the element focused before opening is\n   * no use: `<body>` (Safari does not focus a clicked button), or detached (the\n   * opener was re-rendered away). Pass the overlay's trigger.\n   */\n  returnFocusTo?: React.RefObject<HTMLElement | null>;\n}\n\nfunction usable(el: HTMLElement | null | undefined): el is HTMLElement {\n  return !!el && el !== document.body && el.isConnected;\n}\n\n// A `<div>` without a tabindex ignores `.focus()`, so a scope with no Tab stops\n// used to leave focus on the trigger behind the scrim. `-1` makes the root\n// focusable by script (and by a click on its empty area, which keeps focus in\n// the scope) without adding it to the Tab order.\nfunction focusRoot(root: HTMLElement) {\n  if (!root.hasAttribute(\"tabindex\")) root.tabIndex = -1;\n  root.focus();\n}\n\n/**\n * Traps Tab focus inside the returned ref's subtree and restores focus to the\n * previously-focused element on unmount — the dep-light core of dialogs/menus,\n * replacing `@radix-ui/react-focus-scope`. On mount, focuses per\n * `initialFocus`; the root gets `tabindex=\"-1\"` whenever it is the target.\n *\n * Rust dialogs rely on the browser's native focus order within a fixed overlay;\n * see the README \"Limitations\".\n */\nexport function useFocusScope(\n  enabled: boolean,\n  { initialFocus = \"first\", returnFocusTo }: FocusScopeOptions = {},\n): React.RefObject<HTMLDivElement | null> {\n  const ref = React.useRef<HTMLDivElement | null>(null);\n  // Read at close, not captured at open: a trigger re-rendered while the\n  // overlay was up is a new node by then.\n  const fallbackRef = React.useRef(returnFocusTo);\n  fallbackRef.current = returnFocusTo;\n\n  React.useEffect(() => {\n    if (!enabled) return;\n    const root = ref.current;\n    if (!root) return;\n\n    const previouslyFocused = document.activeElement as HTMLElement | null;\n    const first = initialFocus === \"first\" ? focusable(root)[0] : undefined;\n    if (first) first.focus();\n    else focusRoot(root);\n\n    function onKeyDown(event: KeyboardEvent) {\n      if (event.key !== \"Tab\" || !root) return;\n      const items = focusable(root);\n      if (items.length === 0) {\n        event.preventDefault();\n        return;\n      }\n      const firstEl = items[0]!;\n      const lastEl = items[items.length - 1]!;\n      const active = document.activeElement;\n      // From the root itself Shift+Tab would leave the scope for whatever\n      // precedes the portal, so both directions are steered explicitly.\n      if (active === root) {\n        event.preventDefault();\n        (event.shiftKey ? lastEl : firstEl).focus();\n      } else if (event.shiftKey && active === firstEl) {\n        event.preventDefault();\n        lastEl.focus();\n      } else if (!event.shiftKey && active === lastEl) {\n        event.preventDefault();\n        firstEl.focus();\n      }\n    }\n\n    root.addEventListener(\"keydown\", onKeyDown);\n    return () => {\n      root.removeEventListener(\"keydown\", onKeyDown);\n      // Focus that already left the scope (a click outside landed on a field)\n      // is the user's; only focus still inside, or dropped to <body>, returns.\n      const active = document.activeElement;\n      if (active && active !== document.body && !root.contains(active)) return;\n      const target = usable(previouslyFocused) ? previouslyFocused : fallbackRef.current?.current;\n      if (usable(target)) target.focus({ preventScroll: true });\n    };\n  }, [enabled, initialFocus]);\n\n  return ref;\n}\n"],"mappings":";AAEA,YAAY,WAAW;AAKvB,MAAM,YAAY;AAAA,EAChB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,EACG,IAAI,SAAO,GAAG,GAAG,uBAAuB,EACxC,KAAK,GAAG;AAQJ,SAAS,gBAAgB,MAAkC;AAChE,SAAO,MAAM,KAAK,KAAK,iBAA8B,SAAS,CAAC;AACjE;AAEA,SAAS,UAAU,MAAkC;AACnD,SAAO,gBAAgB,IAAI,EAAE;AAAA,IAC3B,CAAC,OAAO,GAAG,cAAc,KAAK,GAAG,eAAe,KAAK,OAAO,SAAS;AAAA,EACvE;AACF;AAsBA,SAAS,OAAO,IAAuD;AACrE,SAAO,CAAC,CAAC,MAAM,OAAO,SAAS,QAAQ,GAAG;AAC5C;AAMA,SAAS,UAAU,MAAmB;AACpC,MAAI,CAAC,KAAK,aAAa,UAAU,EAAG,MAAK,WAAW;AACpD,OAAK,MAAM;AACb;AAWO,SAAS,cACd,SACA,EAAE,eAAe,SAAS,cAAc,IAAuB,CAAC,GACxB;AACxC,QAAM,MAAM,MAAM,OAA8B,IAAI;AAGpD,QAAM,cAAc,MAAM,OAAO,aAAa;AAC9C,cAAY,UAAU;AAEtB,QAAM,UAAU,MAAM;AACpB,QAAI,CAAC,QAAS;AACd,UAAM,OAAO,IAAI;AACjB,QAAI,CAAC,KAAM;AAEX,UAAM,oBAAoB,SAAS;AACnC,UAAM,QAAQ,iBAAiB,UAAU,UAAU,IAAI,EAAE,CAAC,IAAI;AAC9D,QAAI,MAAO,OAAM,MAAM;AAAA,QAClB,WAAU,IAAI;AAEnB,aAAS,UAAU,OAAsB;AACvC,UAAI,MAAM,QAAQ,SAAS,CAAC,KAAM;AAClC,YAAM,QAAQ,UAAU,IAAI;AAC5B,UAAI,MAAM,WAAW,GAAG;AACtB,cAAM,eAAe;AACrB;AAAA,MACF;AACA,YAAM,UAAU,MAAM,CAAC;AACvB,YAAM,SAAS,MAAM,MAAM,SAAS,CAAC;AACrC,YAAM,SAAS,SAAS;AAGxB,UAAI,WAAW,MAAM;AACnB,cAAM,eAAe;AACrB,SAAC,MAAM,WAAW,SAAS,SAAS,MAAM;AAAA,MAC5C,WAAW,MAAM,YAAY,WAAW,SAAS;AAC/C,cAAM,eAAe;AACrB,eAAO,MAAM;AAAA,MACf,WAAW,CAAC,MAAM,YAAY,WAAW,QAAQ;AAC/C,cAAM,eAAe;AACrB,gBAAQ,MAAM;AAAA,MAChB;AAAA,IACF;AAEA,SAAK,iBAAiB,WAAW,SAAS;AAC1C,WAAO,MAAM;AACX,WAAK,oBAAoB,WAAW,SAAS;AAG7C,YAAM,SAAS,SAAS;AACxB,UAAI,UAAU,WAAW,SAAS,QAAQ,CAAC,KAAK,SAAS,MAAM,EAAG;AAClE,YAAM,SAAS,OAAO,iBAAiB,IAAI,oBAAoB,YAAY,SAAS;AACpF,UAAI,OAAO,MAAM,EAAG,QAAO,MAAM,EAAE,eAAe,KAAK,CAAC;AAAA,IAC1D;AAAA,EACF,GAAG,CAAC,SAAS,YAAY,CAAC;AAE1B,SAAO;AACT;","names":[]}
+{"version":3,"sources":["../../src/primitives/focus-scope.tsx"],"sourcesContent":["\"use client\";\n\nimport * as React from \"react\";\n\n// `tabindex=\"-1\"` opts an element out of Tab order whatever its tag, so the\n// exclusion goes on every branch — otherwise a roving-tabindex grid's parked\n// cells would count as tab stops.\nconst FOCUSABLE = [\n  \"a[href]\",\n  \"button:not([disabled])\",\n  \"textarea:not([disabled])\",\n  \"input:not([disabled])\",\n  \"select:not([disabled])\",\n  \"[tabindex]\",\n]\n  .map(sel => `${sel}:not([tabindex=\"-1\"])`)\n  .join(\",\");\n\n/**\n * Every enabled, Tab-reachable candidate under `root` in DOM (= Tab) order,\n * before the layout-based visibility filter; `tabindex=\"-1\"` is skipped on any\n * tag. For content that is fully visible while it exists (a popover), this is\n * the tab order itself. Internal to the kit.\n */\nexport function focusCandidates(root: HTMLElement): HTMLElement[] {\n  return Array.from(root.querySelectorAll<HTMLElement>(FOCUSABLE));\n}\n\nfunction focusable(root: HTMLElement): HTMLElement[] {\n  return focusCandidates(root).filter(\n    (el) => el.offsetWidth > 0 || el.offsetHeight > 0 || el === document.activeElement,\n  );\n}\n\n/**\n * Where focus lands when the scope opens. `first` is the first Tab stop inside\n * (an input, an alert dialog's least destructive action); `container` is the\n * scope root itself, so a reader starts at the top and the first Tab reaches the\n * first control — right for a panel of content, where the first stop may be an\n * action one keypress away from firing.\n */\nexport type InitialFocus = \"first\" | \"container\";\n\nexport interface FocusScopeOptions {\n  /** Default `first`; falls back to the container when nothing inside is focusable. */\n  initialFocus?: InitialFocus;\n  /**\n   * Where focus goes back on close when the element focused before opening is\n   * no use: `<body>` (Safari does not focus a clicked button), or detached (the\n   * opener was re-rendered away). Pass the overlay's trigger.\n   */\n  returnFocusTo?: React.RefObject<HTMLElement | null>;\n}\n\ninterface Claim {\n  root: HTMLElement;\n  // Boxed so an outer scope opened in the same commit can mark it `behind`.\n  saved: { el: HTMLElement | null; behind: boolean };\n}\n\n// Scopes that took focus in the current task. Cleared in a microtask, so only\n// scopes opened in the same commit count, never one that has been open a while.\nlet claimed: Claim[] = [];\n\nfunction claim(root: HTMLElement, saved: Claim[\"saved\"]) {\n  if (claimed.length === 0) queueMicrotask(() => (claimed = []));\n  claimed.push({ root, saved });\n}\n\nfunction usable(el: HTMLElement | null | undefined): el is HTMLElement {\n  return !!el && el !== document.body && el.isConnected;\n}\n\n// A `<div>` without a tabindex ignores `.focus()`, so a scope with no Tab stops\n// used to leave focus on the trigger behind the scrim. `-1` makes the root\n// focusable by script (and by a click on its empty area, which keeps focus in\n// the scope) without adding it to the Tab order.\nfunction focusRoot(root: HTMLElement) {\n  if (!root.hasAttribute(\"tabindex\")) root.tabIndex = -1;\n  root.focus();\n}\n\n/**\n * Traps Tab focus inside the returned ref's subtree and restores focus to the\n * previously-focused element on unmount — the dep-light core of dialogs/menus,\n * replacing `@radix-ui/react-focus-scope`. On mount, focuses per\n * `initialFocus`; the root gets `tabindex=\"-1\"` whenever it is the target.\n *\n * Rust dialogs rely on the browser's native focus order within a fixed overlay;\n * see the README \"Limitations\".\n */\nexport function useFocusScope(\n  enabled: boolean,\n  { initialFocus = \"first\", returnFocusTo }: FocusScopeOptions = {},\n): React.RefObject<HTMLDivElement | null> {\n  const ref = React.useRef<HTMLDivElement | null>(null);\n  // Read at close, not captured at open: a trigger re-rendered while the\n  // overlay was up is a new node by then.\n  const fallbackRef = React.useRef(returnFocusTo);\n  fallbackRef.current = returnFocusTo;\n\n  React.useEffect(() => {\n    if (!enabled) return;\n    const root = ref.current;\n    if (!root) return;\n\n    // A scope opened in the same commit (a popover inside this dialog) has\n    // already run, since children's effects come first, and taken focus. This\n    // one must not pull focus out of it. Both saved the element focused before\n    // either opened; the inner scope sits inside this one, so on close it goes\n    // back to its own trigger first and to that element only as a fallback.\n    const inner = claimed.find((c) => c.root !== root && c.root.contains(document.activeElement));\n    const saved: Claim[\"saved\"] = {\n      el: inner ? inner.saved.el : (document.activeElement as HTMLElement | null),\n      behind: false,\n    };\n    if (inner) inner.saved.behind = true;\n    else {\n      const first = initialFocus === \"first\" ? focusable(root)[0] : undefined;\n      if (first) first.focus();\n      else focusRoot(root);\n    }\n    claim(root, saved);\n\n    function onKeyDown(event: KeyboardEvent) {\n      if (event.key !== \"Tab\" || !root) return;\n      const items = focusable(root);\n      if (items.length === 0) {\n        event.preventDefault();\n        return;\n      }\n      const firstEl = items[0]!;\n      const lastEl = items[items.length - 1]!;\n      const active = document.activeElement;\n      // From the root itself Shift+Tab would leave the scope for whatever\n      // precedes the portal, so both directions are steered explicitly.\n      if (active === root) {\n        event.preventDefault();\n        (event.shiftKey ? lastEl : firstEl).focus();\n      } else if (event.shiftKey && active === firstEl) {\n        event.preventDefault();\n        lastEl.focus();\n      } else if (!event.shiftKey && active === lastEl) {\n        event.preventDefault();\n        firstEl.focus();\n      }\n    }\n\n    root.addEventListener(\"keydown\", onKeyDown);\n    return () => {\n      root.removeEventListener(\"keydown\", onKeyDown);\n      claimed = claimed.filter((c) => c.root !== root);\n      // Focus that already left the scope (a click outside landed on a field)\n      // is the user's; only focus still inside, or dropped to <body>, returns.\n      const active = document.activeElement;\n      if (active && active !== document.body && !root.contains(active)) return;\n      const anchor = fallbackRef.current?.current;\n      const target = saved.behind && usable(anchor) ? anchor : usable(saved.el) ? saved.el : anchor;\n      if (usable(target)) target.focus({ preventScroll: true });\n    };\n  }, [enabled, initialFocus]);\n\n  return ref;\n}\n"],"mappings":"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","names":[]}

package/dist/primitives/use-floating.js

@@ -21,6 +21,12 @@ function toContainingBlock(floating, x, y) {
 function layoutSize(el) {
   return { width: el.offsetWidth, height: el.offsetHeight };
 }
+function hasRunningAnimationAbove(el) {
+  for (let node = el.parentElement; node; node = node.parentElement) {
+    if (node.getAnimations?.().some((a) => a.playState === "running")) return true;
+  }
+  return false;
+}
 function viewport() {
   const el = document.documentElement;
   return {
@@ -105,7 +111,15 @@ function useFloating(opts) {
       const { top, left } = ideal(a, f, placed);
       write(floating, f, top + shiftY, left + shiftX, true);
     }
-    place();
+    let frame = 0;
+    function follow() {
+      frame = 0;
+      place();
+      if (anchorRef.current && hasRunningAnimationAbove(anchorRef.current)) {
+        frame = requestAnimationFrame(follow);
+      }
+    }
+    follow();
     window.addEventListener("scroll", sync, true);
     window.addEventListener("resize", place);
     let observer;
@@ -115,6 +129,7 @@ function useFloating(opts) {
       if (floatingRef.current) observer.observe(floatingRef.current);
     }
     return () => {
+      if (frame) cancelAnimationFrame(frame);
       window.removeEventListener("scroll", sync, true);
       window.removeEventListener("resize", place);
       observer?.disconnect();