@wisdomgarden/torque 0.2.1 → 0.2.3

package/dist/components/popover/hooks.js

@@ -1,41 +1,40 @@
 "use client";
-import { useEffect as l, useState as b, useRef as p, useCallback as y, useMemo as E } from "react";
-import { registerOpenPopover as A, isTopmostOpenPopover as x } from "./popover-stack.js";
-function k(u, t = !1) {
-  const [n, e] = b(t || u), [r, o] = b(
+import { useState as m, useRef as A, useEffect as b, useCallback as x, useMemo as E } from "react";
+function F(u, n = !1) {
+  const [t, r] = m(n || u), [s, f] = m(
     u ? "open" : "closing"
-  ), s = p(0);
-  l(() => (u ? (e(!0), s.current = requestAnimationFrame(() => {
-    s.current = requestAnimationFrame(() => {
-      o("open");
+  ), o = A(0);
+  b(() => (u ? (r(!0), o.current = requestAnimationFrame(() => {
+    o.current = requestAnimationFrame(() => {
+      f("open");
     });
-  })) : (o("closing"), t && e(!0)), () => {
-    s.current && cancelAnimationFrame(s.current);
-  }), [t, u]);
-  const i = y(() => {
-    r === "closing" && !t && e(!1);
-  }, [r, t]);
-  return { mounted: n, animState: r, handleTransitionEnd: i };
+  })) : (f("closing"), n && r(!0)), () => {
+    o.current && cancelAnimationFrame(o.current);
+  }), [n, u]);
+  const i = x(() => {
+    s === "closing" && !n && r(!1);
+  }, [s, n]);
+  return { mounted: t, animState: s, handleTransitionEnd: i };
 }
-function q(u, t, n, e, r, o, s, i) {
-  const f = p(null);
-  l(() => {
-    u === "click" && (t ? f.current = document.activeElement : o().some(
-      (a) => a.contains(document.activeElement)
-    ) && f.current?.focus());
-  }, [t, u, o]), l(() => {
-    if (u !== "click" || n !== "open" || !e || i) return;
-    if (s?.current) {
-      s.current.focus();
+function q(u, n, t, r, s, f, o, i) {
+  const e = A(null);
+  b(() => {
+    u === "click" && (n ? e.current = document.activeElement : f().some(
+      (c) => c.contains(document.activeElement)
+    ) && e.current?.focus());
+  }, [n, u, f]), b(() => {
+    if (u !== "click" || t !== "open" || !r || i) return;
+    if (o?.current) {
+      o.current.focus();
       return;
     }
-    (L([r.current])[0] ?? r.current)?.focus();
+    (y([s.current])[0] ?? s.current)?.focus();
   }, [
-    n,
-    e,
-    u,
+    t,
     r,
+    u,
     s,
+    o,
     i
   ]);
 }
@@ -47,85 +46,72 @@ const h = [
   "textarea:not([disabled])",
   '[tabindex]:not([tabindex="-1"])'
 ].join(",");
-function L(u) {
-  const t = u.flatMap((n) => !n || n.inert || n.getAttribute("aria-hidden") === "true" ? [] : Array.from(
-    n.querySelectorAll(h)
+function y(u) {
+  const n = u.flatMap((t) => !t || t.inert || t.getAttribute("aria-hidden") === "true" ? [] : Array.from(
+    t.querySelectorAll(h)
   ));
-  return Array.from(new Set(t)).filter(
-    (n) => !n.hasAttribute("data-focus-sentinel")
+  return Array.from(new Set(n)).filter(
+    (t) => !t.hasAttribute("data-focus-sentinel")
   );
 }
-function v(u, t, n, e, r, o, s) {
-  l(() => {
-    if (t)
-      return A(r, o);
-  }, [o, r, t]), l(() => {
-    if (!u || !t) return;
-    const i = (f) => {
-      f.key !== "Escape" || !x(r) || (f.preventDefault(), f.stopImmediatePropagation(), n(), s ? s() : e.current?.focus());
-    };
-    return document.addEventListener("keydown", i), () => document.removeEventListener("keydown", i);
-  }, [u, t, n, e, r, s]);
-}
-function B(u, t, n, e) {
+function C(u, n, t, r) {
   return E(() => {
-    if (!u || !t) return {};
-    const r = e / 2, o = {
-      "--t-arrow-size": `${e}px`,
-      width: e,
-      height: e
+    if (!u || !n) return {};
+    const s = r / 2, f = {
+      "--t-arrow-size": `${r}px`,
+      width: r,
+      height: r
     };
-    return n === "bottom" ? { ...o, top: -r - 1, left: t.x ?? "", bottom: "" } : n === "top" ? { ...o, bottom: -r - 1, left: t.x ?? "", top: "" } : n === "right" ? { ...o, left: -r - 1, top: t.y ?? "" } : n === "left" ? { ...o, right: -r - 1, top: t.y ?? "" } : o;
-  }, [u, t, n, e]);
+    return t === "bottom" ? { ...f, top: -s - 1, left: n.x ?? "", bottom: "" } : t === "top" ? { ...f, bottom: -s - 1, left: n.x ?? "", top: "" } : t === "right" ? { ...f, left: -s - 1, top: n.y ?? "" } : t === "left" ? { ...f, right: -s - 1, top: n.y ?? "" } : f;
+  }, [u, n, t, r]);
 }
-function F(u, t, n, e, r, o, s, i, f, a, m) {
-  return E(() => u ? { ref: n } : t === "none" ? {
-    ref: n,
-    "aria-expanded": o,
-    onKeyDown: m
-  } : t === "hover" ? {
-    ref: n,
+function L(u, n, t, r, s, f, o, i, e, c, l) {
+  return E(() => u ? { ref: t } : n === "none" ? {
+    ref: t,
+    "aria-expanded": f,
+    onKeyDown: l
+  } : n === "hover" ? {
+    ref: t,
     onMouseEnter: () => i(!0),
     onMouseLeave: () => {
-      o ? i(!1) : f();
+      f ? i(!1) : e();
     },
     // 键盘聚焦不走 openDelay：延迟打开对读屏 / 键盘用户只有负作用
     onFocus: () => {
-      f(), s(!0);
+      e(), o(!0);
     },
     onBlur: () => i(!1),
-    "aria-describedby": e,
-    onKeyDown: m
+    "aria-describedby": r,
+    onKeyDown: l
   } : {
-    ref: n,
-    onClick: (c) => {
-      r(), a?.(c);
+    ref: t,
+    onClick: (a) => {
+      s(), c?.(a);
     },
-    onKeyDown: (c) => {
-      c.key === "Enter" && (c.preventDefault(), r()), m?.(c);
+    onKeyDown: (a) => {
+      a.key === "Enter" && (a.preventDefault(), s()), l?.(a);
     },
-    "aria-expanded": o,
+    "aria-expanded": f,
     "aria-haspopup": "dialog",
-    "aria-controls": e
+    "aria-controls": r
   }, [
     u,
-    t,
     n,
-    e,
+    t,
     r,
-    o,
     s,
-    i,
     f,
-    a,
-    m
+    o,
+    i,
+    e,
+    c,
+    l
   ]);
 }
 export {
-  L as getFocusableElements,
-  k as useAnimatedMount,
-  B as useArrowStyle,
-  v as useEscapeClose,
+  y as getFocusableElements,
+  F as useAnimatedMount,
+  C as useArrowStyle,
   q as usePopoverFocus,
-  F as useTriggerProps
+  L as useTriggerProps
 };

package/dist/components/popover/popover-context.d.ts

@@ -1,4 +1,3 @@
 import { PopoverContextValue } from './popover.types';
 export declare const PopoverContext: import("react").Context<PopoverContextValue | null>;
-export declare const PopoverLayerContext: import("react").Context<number | null>;
 export declare function usePopoverContext(): PopoverContextValue;

package/dist/components/popover/popover-context.js

@@ -1,7 +1,7 @@
 "use client";
 import { createContext as e, useContext as t } from "react";
-const n = e(null), p = e(null);
-function s() {
+const n = e(null);
+function p() {
   const o = t(n);
   if (!o)
     throw new Error(
@@ -11,6 +11,5 @@ function s() {
 }
 export {
   n as PopoverContext,
-  p as PopoverLayerContext,
-  s as usePopoverContext
+  p as usePopoverContext
 };

package/dist/components/popover/popover-dropdown.js

@@ -1,144 +1,163 @@
 "use client";
-import { jsxs as E, jsx as c } from "react/jsx-runtime";
-import { getDefaultZIndex as te, Portal as re } from "@mantine/core";
-import { useMergedRef as ne } from "@mantine/hooks";
-import { clsx as S } from "clsx";
-import { useContext as ie, useRef as ae, useCallback as se } from "react";
-import { useAnimatedMount as le, usePopoverFocus as de, useArrowStyle as ce, getFocusableElements as ue } from "./hooks.js";
-import { PopoverLayerContext as I, usePopoverContext as fe } from "./popover-context.js";
+import { jsxs as I, jsx as c } from "react/jsx-runtime";
+import { useMergedRef as ae } from "@mantine/hooks";
+import { clsx as O } from "clsx";
+import { useRef as se, useCallback as le } from "react";
+import { Portal as de } from "../_inner/portal/portal.js";
+import { OverlayParentProvider as ce } from "../overlay-layer/overlay-parent-context.js";
+import { useOverlayLayerInternal as fe } from "../overlay-layer/use-overlay-layer.js";
+import { useAnimatedMount as ue, usePopoverFocus as pe, useArrowStyle as me, getFocusableElements as ve } from "./hooks.js";
+import { usePopoverContext as ge } from "./popover-context.js";
 import M from "./styles/popover.module.css.js";
-const Fe = ({
-  children: A,
-  arrowClassName: C,
-  zIndex: D,
+const Me = ({
+  children: z,
+  arrowClassName: A,
+  zIndex: N,
   width: t,
   maxHeight: a,
-  matchTargetWidth: N = !1,
-  radius: z = "sm",
-  withinPortal: H = !0,
-  keepMounted: L = !1,
-  ref: T,
-  ...e
+  matchTargetWidth: k = !1,
+  radius: C = "sm",
+  withinPortal: D = !0,
+  keepMounted: H = !1,
+  ref: L,
+  ...o
 }) => {
-  const u = ie(I), {
+  const {
     opened: r,
+    setOpen: T,
+    referenceRef: f,
+    restoreFocus: u,
+    closeOnEscape: j,
+    closeOnClickOutside: W,
     trigger: n,
-    strategy: Z,
-    x: j,
-    y: k,
-    resolvedSide: f,
+    strategy: $,
+    x: P,
+    y: V,
+    resolvedSide: p,
     middlewareData: s,
     floatingRef: l,
-    setFloating: W,
-    registerNestedFloatingElement: p,
+    setFloating: Z,
+    registerNestedFloatingElement: m,
     getFloatingScopeElements: v,
-    withArrow: m,
-    arrowSize: $,
-    arrowRef: P,
-    scheduleHover: V,
-    cancelHoverTimer: q,
-    id: B,
-    initialFocusRef: G,
-    trapFocus: g,
-    preventAutoFocus: J,
-    ariaLabelledby: K
-  } = fe(), { mounted: h, animState: x, handleTransitionEnd: O } = le(
+    withArrow: g,
+    arrowSize: q,
+    arrowRef: B,
+    scheduleHover: G,
+    cancelHoverTimer: J,
+    id: K,
+    initialFocusRef: Q,
+    trapFocus: h,
+    preventAutoFocus: U,
+    ariaLabelledby: X
+  } = ge(), { mounted: y, animState: x, handleTransitionEnd: Y } = ue(
     r,
-    L
-  ), y = ae(null), Q = se(
-    (o) => {
-      y.current?.(), y.current = o ? p(o) : null;
+    H
+  ), F = se(null), _ = le(
+    (e) => {
+      F.current?.(), F.current = e ? m(e) : null;
+    },
+    [m]
+  ), d = fe({
+    opened: r,
+    zIndex: N,
+    closeOnEscape: j,
+    closeOnClickOutside: W,
+    // 触发按钮算"里面"：否则点它会先被当成点外面关掉，紧接着它自己的 onClick 又打开
+    insideRefs: [f],
+    close: (e) => {
+      T(!1), e === "escape" && (u ? u() : f.current?.focus());
     },
-    [p]
-  ), U = ne(
+    name: "popover"
+  }), b = d.zIndex, ee = ae(
     l,
-    W,
-    Q,
-    T
-  ), d = D ?? (u === null ? te("popover") : u + 1);
-  de(
+    Z,
+    _,
+    d.ref,
+    L
+  );
+  pe(
     n,
     r,
     x,
-    h,
+    y,
     l,
     v,
-    G,
-    J
+    Q,
+    U
   );
-  const b = (o) => /* @__PURE__ */ c(
+  const w = (e) => /* @__PURE__ */ c(
     "span",
     {
       tabIndex: 0,
-      "data-focus-sentinel": o,
+      "data-focus-sentinel": e,
       "aria-hidden": "true",
       style: { position: "fixed", width: 0, height: 0, opacity: 0 },
       onFocus: () => {
-        const i = ue(v());
+        const i = ve(v());
         if (i.length === 0) {
           l.current?.focus();
           return;
         }
-        (o === "start" ? i[i.length - 1] : i[0]).focus();
+        (e === "start" ? i[i.length - 1] : i[0]).focus();
       }
     }
-  ), X = ce(
-    m,
+  ), oe = me(
+    g,
     s.arrow,
-    f,
-    $
-  ), Y = typeof t == "number" ? `${t}px` : t, _ = t ? Y : void 0, ee = typeof a == "number" ? `${a}px` : a, oe = N ? "var(--t-popover-reference-width)" : _;
-  if (!h) return null;
-  const w = "role" in e ? e.role : n === "click" ? "dialog" : void 0, F = w === "dialog", R = /* @__PURE__ */ E(
+    p,
+    q
+  ), re = typeof t == "number" ? `${t}px` : t, te = t ? re : void 0, ne = typeof a == "number" ? `${a}px` : a, ie = k ? "var(--t-popover-reference-width)" : te;
+  if (!y) return null;
+  const R = "role" in o ? o.role : n === "click" ? "dialog" : void 0, E = R === "dialog", S = /* @__PURE__ */ I(
     "div",
     {
-      id: B,
-      role: w,
-      "aria-modal": F ? !1 : void 0,
-      "aria-labelledby": F ? K : void 0,
-      ref: U,
+      id: K,
+      role: R,
+      "aria-modal": E ? !1 : void 0,
+      "aria-labelledby": E ? X : void 0,
+      ref: ee,
       tabIndex: -1,
       "data-state": x,
-      "data-radius": z,
-      "data-side": f,
+      "data-radius": C,
+      "data-side": p,
       style: {
-        position: Z,
-        left: j ?? 0,
-        top: k ?? 0,
-        zIndex: d,
-        "--t-popover-z": d,
-        "--t-popover-width": oe,
-        "--t-popover-max-height": ee,
+        position: $,
+        left: P ?? 0,
+        top: V ?? 0,
+        zIndex: b,
+        "--t-popover-z": b,
+        "--t-popover-width": ie,
+        "--t-popover-max-height": ne,
         visibility: s.hide?.referenceHidden ? "hidden" : void 0,
         pointerEvents: s.hide?.referenceHidden ? "none" : void 0
       },
-      onTransitionEnd: O,
-      onMouseEnter: n === "hover" ? () => q() : void 0,
-      onMouseLeave: n === "hover" ? () => V(!1) : void 0,
-      ...e,
-      "aria-hidden": r ? e["aria-hidden"] : !0,
-      inert: r ? e.inert : !0,
-      className: S(M.popover, e.className),
+      onTransitionEnd: Y,
+      onMouseEnter: n === "hover" ? () => J() : void 0,
+      onMouseLeave: n === "hover" ? () => G(!1) : void 0,
+      ...o,
+      "aria-hidden": r ? o["aria-hidden"] : !0,
+      inert: r ? o.inert : !0,
+      className: O(M.popover, o.className),
       children: [
-        /* @__PURE__ */ E(I.Provider, { value: d, children: [
-          g && b("start"),
-          A,
-          g && b("end")
+        /* @__PURE__ */ I(ce, { id: d.id, children: [
+          h && w("start"),
+          z,
+          h && w("end")
         ] }),
-        m && /* @__PURE__ */ c(
+        g && /* @__PURE__ */ c(
           "div",
           {
-            ref: P,
+            ref: B,
             "aria-hidden": "true",
-            className: S(M.arrow, C),
-            style: { ...X }
+            className: O(M.arrow, A),
+            style: { ...oe }
           }
         )
       ]
     }
   );
-  return H ? /* @__PURE__ */ c(re, { children: R }) : R;
+  return D ? /* @__PURE__ */ c(de, { children: S }) : S;
 };
 export {
-  Fe as PopoverDropdown
+  Me as PopoverDropdown
 };