npm - @nivaro/react - Versions diffs - 0.3.26 → 0.3.27 - Mend

@nivaro/react 0.3.26 → 0.3.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/hooks/useSessionRecorder.js +1 -1
package/dist/shared/components/panels/ItemLockBanner.js +354 -307
package/package.json +1 -1

package/dist/hooks/useSessionRecorder.js CHANGED Viewed

@@ -9,7 +9,7 @@ import { noteReplayEvent as _e, createReplayCheckoutState as De } from "../share
 import { emitReplayTap as Te, setReplayRecorderMode as N, registerReplayCapture as qe, clipEndOffset as Le, withClipKind as Pe } from "../shared/lib/replay-capture.js";
 import { instrumentConsole as Ne, instrumentRequests as Fe, redactSecrets as Me } from "../shared/lib/replay-context.js";
 import { instrumentSocket as Oe } from "../shared/lib/replay-socket.js";
-const Ue = "nivaro-react@0.3.26", j = 1e4, We = 150, He = 3e3, Ke = 600, $e = (n) => `nvr_replay_resume${n ? `:${n}` : ""}`, G = () => typeof navigator > "u" || navigator.onLine !== !1;
+const Ue = "nivaro-react@0.3.27", j = 1e4, We = 150, He = 3e3, Ke = 600, $e = (n) => `nvr_replay_resume${n ? `:${n}` : ""}`, G = () => typeof navigator > "u" || navigator.onLine !== !1;
 function Be(n) {
   return typeof n.url != "string" || typeof fetch != "function" ? null : (f, a) => {
     const u = typeof n.getToken == "function" ? n.getToken() : void 0, d = { "Content-Type": "application/json" };

package/dist/shared/components/panels/ItemLockBanner.js CHANGED Viewed

@@ -1,218 +1,263 @@
-import { jsxs as y, jsx as k } from "react/jsx-runtime";
-import { QueryClientContext as Le } from "@tanstack/react-query";
-import { Lock as H, LockOpen as ne } from "lucide-react";
-import { useContext as Ee, useState as _, useRef as A, useCallback as w, useEffect as N } from "react";
+import { jsxs as v, jsx as m } from "react/jsx-runtime";
+import { QueryClientContext as Se } from "@tanstack/react-query";
+import { Lock as Z, LockOpen as ie } from "lucide-react";
+import { useContext as Ce, useState as x, useRef as A, useCallback as w, useEffect as N } from "react";
 import { toast as u } from "sonner";
-import { useNivaroClient as Re, useItemEditAuth as Ce } from "../../context.js";
-import { post as C, get as Se, del as K } from "../../lib/commands.js";
-import { idleState as qe } from "../../lib/idle.js";
-import { useOptionalRealtime as ae, updateTouches as Ae } from "../../lib/realtime.js";
-import { announceRecordTabs as se, useRecordTabsSignal as Te } from "../../lib/record-tabs.js";
-import { Button as O } from "../ui/button.js";
-import { Popover as oe, PopoverTrigger as ie, PopoverContent as le } from "../ui/popover.js";
-const Ie = 6e4, Ye = 2 * 6e4, Oe = 3e4, De = 6e4, Me = 15e3;
-function je() {
-  const [t, r] = _(
+import { useNivaroClient as qe, useItemEditAuth as Te } from "../../context.js";
+import { post as q, get as Ae, del as P } from "../../lib/commands.js";
+import { idleState as Ie } from "../../lib/idle.js";
+import { useOptionalRealtime as le, updateTouches as Oe } from "../../lib/realtime.js";
+import { announceRecordTabs as X, useRecordTabsSignal as Ye } from "../../lib/record-tabs.js";
+import { Button as Y } from "../ui/button.js";
+import { Popover as ue, PopoverTrigger as ce, PopoverContent as de } from "../ui/popover.js";
+const K = 1e4, De = 1500, Fe = 2e3, Me = 3e4, Be = 6e4, je = 15e3;
+function ze() {
+  const [e, r] = x(!0);
+  return N(() => {
+    if (typeof window > "u" || typeof document > "u") return;
+    let a = null, _ = null;
+    const g = () => typeof document.hasFocus == "function" ? document.hasFocus() : !0, p = () => {
+      _ && clearInterval(_), _ = null;
+    }, o = () => {
+      a && clearTimeout(a), a = setTimeout(() => {
+        if (a = null, !g()) {
+          p(), r(!1);
+          return;
+        }
+        p(), _ = setInterval(() => {
+          g() || (p(), r(!1));
+        }, Fe);
+      }, De);
+    }, L = () => {
+      a && clearTimeout(a), a = null, p(), r(!0);
+    };
+    return window.addEventListener("blur", o), window.addEventListener("focus", L), () => {
+      window.removeEventListener("blur", o), window.removeEventListener("focus", L), a && clearTimeout(a), p();
+    };
+  }, []), e;
+}
+function Pe() {
+  const [e, r] = x(
     () => typeof document > "u" || document.visibilityState !== "hidden"
   );
   return N(() => {
-    const i = () => r(document.visibilityState !== "hidden");
-    return document.addEventListener("visibilitychange", i), () => document.removeEventListener("visibilitychange", i);
-  }, []), t;
+    const a = () => r(document.visibilityState !== "hidden");
+    return document.addEventListener("visibilitychange", a), () => document.removeEventListener("visibilitychange", a);
+  }, []), e;
 }
-function Xe(t, r, i, S = {}) {
-  const { lazy: L = !1, active: T = !0 } = S, s = Re(), { isAdmin: E, userId: g } = Ce(), v = Ee(Le), [p, h] = _(null), [F, $] = _(!1), [D, J] = _(!1), [ce, ue] = _([]), [de, M] = _(null), [fe, G] = _(!1), [ke, X] = _(""), [me, P] = _(!1), [he, Z] = _(!1), j = A(null), l = A(!1), R = A(!1), Q = A(!1), V = A(0), q = A(!1), z = A(null), m = w(() => {
-    j.current && (clearInterval(j.current), j.current = null);
-  }, []), U = w(
-    (a) => {
-      var e, c;
-      const n = a, f = n.status ?? ((e = n.response) == null ? void 0 : e.status), o = ((c = n.response) == null ? void 0 : c.data) ?? n.response;
-      return f !== 403 || (o == null ? void 0 : o.code) !== "EDIT_LOCKED" ? !1 : (m(), l.current = !1, $(!1), u.warning(o.error || "You can no longer edit this record — your edit lock was let go"), v == null || v.invalidateQueries({ queryKey: ["pipeline-instance-lock", t, r] }), v == null || v.invalidateQueries({ queryKey: ["pipeline-instance", t, r] }), !0);
+function rt(e, r, a, _ = {}) {
+  const { lazy: g = !1, active: p = !0 } = _, o = qe(), { isAdmin: L, userId: k } = Te(), $ = Ce(Se), [R, b] = x(null), [Q, S] = x(!1), [D, ee] = x(!1), [fe, me] = x([]), [he, F] = x(null), [ke, te] = x(!1), [be, re] = x(""), [ye, U] = x(!1), [ve, ne] = x(!1), B = A(null), i = A(!1), C = A(!1), V = A(!1), W = A(0), T = A(!1), M = A(null), h = w(() => {
+    B.current && (clearInterval(B.current), B.current = null);
+  }, []), H = w(
+    (s) => {
+      var t, c;
+      const n = s, f = n.status ?? ((t = n.response) == null ? void 0 : t.status), l = ((c = n.response) == null ? void 0 : c.data) ?? n.response;
+      return f !== 403 || (l == null ? void 0 : l.code) !== "EDIT_LOCKED" ? !1 : (h(), i.current = !1, S(!1), u.warning(l.error || "You can no longer edit this record — your edit lock was let go"), $ == null || $.invalidateQueries({ queryKey: ["pipeline-instance-lock", e, r] }), $ == null || $.invalidateQueries({ queryKey: ["pipeline-instance", e, r] }), !0);
     },
-    [v, t, r, m]
+    [$, e, r, h]
   ), d = w(async () => {
-    var a, n;
-    if (!t || !r || q.current) return !1;
-    z.current = null;
+    var s, n;
+    if (!e || !r || T.current) return !1;
+    M.current = null;
     try {
-      return await s.request(C(`/item-locks/${t}/${r}/lock`, {})), l.current = !0, $(!0), P(!1), h(null), m(), j.current = setInterval(() => {
+      return await o.request(
+        q(`/item-locks/${e}/${r}/lock`, { beat_ms: K })
+      ), i.current = !0, S(!0), U(!1), b(null), h(), B.current = setInterval(() => {
         const f = Math.max(
           0,
-          Math.floor((Date.now() - new Date(qe().last_active).getTime()) / 1e3)
+          Math.floor((Date.now() - new Date(Ie().last_active).getTime()) / 1e3)
         );
-        s.request(C(`/item-locks/${t}/${r}/heartbeat`, { idle_seconds: f })).then((o) => {
-          if (!(o != null && o.idle_released)) return;
-          m(), l.current = !1, $(!1), u.info(
+        o.request(
+          q(`/item-locks/${e}/${r}/heartbeat`, {
+            idle_seconds: f,
+            beat_ms: K
+          })
+        ).then((l) => {
+          if (!(l != null && l.idle_released)) return;
+          h(), i.current = !1, S(!1), u.info(
             "Your edit lock was released after inactivity — it re-locks when you resume."
           );
-          const e = () => {
-            window.removeEventListener("pointerdown", e, !0), window.removeEventListener("keydown", e, !0), d();
+          const t = () => {
+            window.removeEventListener("pointerdown", t, !0), window.removeEventListener("keydown", t, !0), d();
           };
-          window.addEventListener("pointerdown", e, !0), window.addEventListener("keydown", e, !0);
-        }).catch((o) => {
-          var te, re;
-          const e = o, c = e.status ?? ((te = e.response) == null ? void 0 : te.status);
-          if (U(o) || c !== 404 && c !== 409) return;
-          const x = ((re = e.response) == null ? void 0 : re.data) ?? e.response;
-          if (c === 404 && !(x != null && x.locked_by)) {
+          window.addEventListener("pointerdown", t, !0), window.addEventListener("keydown", t, !0);
+        }).catch((l) => {
+          var ae, oe;
+          const t = l, c = t.status ?? ((ae = t.response) == null ? void 0 : ae.status);
+          if (H(l) || c !== 404 && c !== 409) return;
+          const E = ((oe = t.response) == null ? void 0 : oe.data) ?? t.response;
+          if (c === 404 && !(E != null && E.locked_by)) {
             d();
             return;
           }
-          m(), l.current = !1, $(!1), x != null && x.locked_by && (h({
-            locked_by: x.locked_by,
-            locked_by_name: x.locked_by_name ?? null
+          h(), i.current = !1, S(!1), E != null && E.locked_by && (b({
+            locked_by: E.locked_by,
+            locked_by_name: E.locked_by_name ?? null
           }), u.warning(
-            `${x.locked_by_name ?? "Another user"} took over editing — your changes are no longer being saved`
+            `${E.locked_by_name ?? "Another user"} took over editing — your changes are no longer being saved`
           ));
         });
-      }, Ie), !0;
+      }, K), !0;
     } catch (f) {
-      const o = f, e = o.status ?? ((a = o.response) == null ? void 0 : a.status), c = ((n = o.response) == null ? void 0 : n.data) ?? o.response;
-      return z.current = e ?? null, U(f) ? !1 : e === 404 ? (q.current = !0, m(), l.current = !1, $(!1), !1) : (e === 409 && (c != null && c.locked_by) && (l.current = !1, $(!1), h({
+      const l = f, t = l.status ?? ((s = l.response) == null ? void 0 : s.status), c = ((n = l.response) == null ? void 0 : n.data) ?? l.response;
+      return M.current = t ?? null, H(f) ? !1 : t === 404 ? (T.current = !0, h(), i.current = !1, S(!1), !1) : (t === 409 && (c != null && c.locked_by) && (i.current = !1, S(!1), b({
         locked_by: c.locked_by,
         locked_by_name: c.locked_by_name ?? null,
         ...typeof c.may_take_over == "boolean" ? { may_take_over: c.may_take_over } : {}
       })), !1);
     }
-  }, [s, t, r, m, U]), b = w(async () => {
-    if (!(!t || !r))
+  }, [o, e, r, h, H]), y = w(async () => {
+    if (!(!e || !r))
       try {
-        const a = await s.request(Se(`/item-locks/${t}/${r}/lock`)), n = a == null ? void 0 : a.data;
-        ue(Array.isArray(n == null ? void 0 : n.queue) ? n.queue : []), M(typeof (n == null ? void 0 : n.my_position) == "number" ? n.my_position : null);
-        const f = (n == null ? void 0 : n.is_mine) === !0 || !!g && String((n == null ? void 0 : n.locked_by) ?? "").toLowerCase() === g.toLowerCase(), o = typeof (n == null ? void 0 : n.may_take_over) == "boolean" ? { may_take_over: n.may_take_over } : {};
-        if (l.current) return;
+        const s = await o.request(Ae(`/item-locks/${e}/${r}/lock`)), n = s == null ? void 0 : s.data;
+        me(Array.isArray(n == null ? void 0 : n.queue) ? n.queue : []), F(typeof (n == null ? void 0 : n.my_position) == "number" ? n.my_position : null);
+        const f = (n == null ? void 0 : n.is_mine) === !0 || !!k && String((n == null ? void 0 : n.locked_by) ?? "").toLowerCase() === k.toLowerCase(), l = typeof (n == null ? void 0 : n.may_take_over) == "boolean" ? { may_take_over: n.may_take_over } : {};
+        if (i.current) return;
         if (!(n != null && n.locked_by) || f) {
-          h(null);
+          b(null);
           return;
         }
-        h(
-          (e) => e && e.locked_by === String(n.locked_by) ? {
-            ...e,
-            note: n.note ?? e.note ?? null,
-            idle_minutes: n.locked_by_idle_minutes ?? e.idle_minutes ?? null,
-            ...o
+        b(
+          (t) => t && t.locked_by === String(n.locked_by) ? {
+            ...t,
+            note: n.note ?? t.note ?? null,
+            idle_minutes: n.locked_by_idle_minutes ?? t.idle_minutes ?? null,
+            ...l
           } : {
             locked_by: String(n.locked_by),
             locked_by_name: n.locked_by_name ?? null,
             note: n.note ?? null,
             idle_minutes: n.locked_by_idle_minutes ?? null,
-            ...o
+            ...l
           }
-        ), P(!1);
-      } catch (a) {
-        (a == null ? void 0 : a.status) === 404 && (q.current = !0);
+        ), U(!1);
+      } catch (s) {
+        (s == null ? void 0 : s.status) === 404 && (T.current = !0);
       }
-  }, [s, t, r, g]), I = (p == null ? void 0 : p.locked_by) ?? null;
+  }, [o, e, r, k]), I = (R == null ? void 0 : R.locked_by) ?? null;
   N(() => {
-    I && b();
-  }, [I, b]), N(() => {
+    I && y();
+  }, [I, y]), N(() => {
     if (!I) return;
-    const a = setInterval(() => void b(), Oe);
-    return () => clearInterval(a);
-  }, [I, b]), N(() => {
-    if (!(!i || !t || !r))
-      return R.current = !1, q.current = !1, L ? b() : d(), () => {
-        m(), R.current = !1, l.current && (l.current = !1, s.request(K(`/item-locks/${t}/${r}/lock`)).then(() => se(g, "lock-released", t, r)).catch(() => {
+    const s = setInterval(() => void y(), Me);
+    return () => clearInterval(s);
+  }, [I, y]), N(() => {
+    if (!(!a || !e || !r))
+      return C.current = !1, T.current = !1, g ? y() : d(), () => {
+        h(), C.current = !1, i.current && (i.current = !1, o.request(P(`/item-locks/${e}/${r}/lock`)).then(() => X(k, "lock-released", e, r)).catch(() => {
         }));
       };
-  }, [i, t, r, d, s, m, g, L, b]);
-  const be = w(async () => {
-    if (!(!i || l.current || Q.current) && !(Date.now() < V.current)) {
-      Q.current = !0;
+  }, [a, e, r, d, o, h, k, g, y]);
+  const ge = w(async () => {
+    if (!(!a || i.current || V.current) && !(Date.now() < W.current)) {
+      V.current = !0;
       try {
-        const a = await d();
-        !a && z.current === 409 && u.warning("Someone else is editing this record — your change can’t be saved yet"), !a && z.current !== 409 && !q.current && (V.current = Date.now() + Me);
+        const s = await d();
+        !s && M.current === 409 && u.warning("Someone else is editing this record — your change can’t be saved yet"), !s && M.current !== 409 && !T.current && (W.current = Date.now() + je);
       } finally {
-        Q.current = !1;
+        V.current = !1;
       }
     }
-  }, [i, d]);
+  }, [a, d]);
   N(() => {
-    const a = () => {
-      V.current = 0;
+    const s = () => {
+      W.current = 0;
     };
-    return window.addEventListener("online", a), () => window.removeEventListener("online", a);
+    return window.addEventListener("online", s), () => window.removeEventListener("online", s);
   }, []);
-  const ye = je(), B = T && ye;
+  const j = w(() => {
+    var s;
+    if (!(!e || !r))
+      try {
+        const n = (s = o.getToken) == null ? void 0 : s.call(o), f = o.url ?? "";
+        fetch(
+          `${f}/api/item-locks/${encodeURIComponent(e)}/${encodeURIComponent(r)}/lock/release`,
+          {
+            method: "POST",
+            keepalive: !0,
+            credentials: n ? "omit" : "include",
+            headers: n ? { Authorization: `Bearer ${n}` } : {}
+          }
+        ).then(() => X(k, "lock-released", e, r)).catch(() => {
+        });
+      } catch {
+      }
+  }, [o, e, r, k]), J = Pe(), we = ze(), z = p && J && we;
   N(() => {
-    if (!i || !t || !r) return;
-    if (B) {
-      R.current && (R.current = !1, d());
-      return;
-    }
-    const a = setTimeout(() => {
-      l.current && (m(), l.current = !1, $(!1), R.current = !0, s.request(K(`/item-locks/${t}/${r}/lock`)).then(() => se(g, "lock-released", t, r)).catch(() => {
-      }));
-    }, Ye);
-    return () => clearTimeout(a);
-  }, [i, B, t, r, d, s, m, g]), N(() => {
-    if (!i || !L || !t || !r || I || !B) return;
-    const a = setInterval(() => {
-      !l.current && !q.current && b();
-    }, De);
-    return () => clearInterval(a);
-  }, [i, L, t, r, I, B, b]), N(() => {
-    if (!i || !t || !r) return;
-    const a = () => {
-      var f;
-      if (l.current) {
-        m(), l.current = !1, R.current = !0;
-        try {
-          const o = (f = s.getToken) == null ? void 0 : f.call(s), e = s.url ?? "";
-          fetch(
-            `${e}/api/item-locks/${encodeURIComponent(t)}/${encodeURIComponent(r)}/lock/release`,
-            {
-              method: "POST",
-              keepalive: !0,
-              credentials: o ? "omit" : "include",
-              headers: o ? { Authorization: `Bearer ${o}` } : {}
-            }
-          ).catch(() => {
-          });
-        } catch {
-        }
+    if (!(!a || !e || !r)) {
+      if (z) {
+        C.current && (C.current = !1, d().then((s) => {
+          !s && M.current === 409 && u.warning(
+            "Someone else started editing while you were away — your changes are still here, but can’t be saved until they release it"
+          );
+        }));
+        return;
       }
+      i.current && (h(), i.current = !1, S(!1), C.current = !0, J ? o.request(P(`/item-locks/${e}/${r}/lock`)).then(() => X(k, "lock-released", e, r)).catch(() => {
+      }) : j());
+    }
+  }, [
+    a,
+    z,
+    J,
+    e,
+    r,
+    d,
+    o,
+    h,
+    k,
+    j
+  ]), N(() => {
+    if (!a || !g || !e || !r || I || !z) return;
+    const s = setInterval(() => {
+      !i.current && !T.current && y();
+    }, Be);
+    return () => clearInterval(s);
+  }, [a, g, e, r, I, z, y]), N(() => {
+    if (!a || !e || !r) return;
+    const s = () => {
+      i.current && (h(), i.current = !1, C.current = !0, j());
     }, n = (f) => {
-      f.persisted && R.current && (R.current = !1, d());
+      f.persisted && C.current && (C.current = !1, d());
     };
-    return window.addEventListener("pagehide", a), window.addEventListener("pageshow", n), () => {
-      window.removeEventListener("pagehide", a), window.removeEventListener("pageshow", n);
+    return window.addEventListener("pagehide", s), window.addEventListener("pageshow", n), () => {
+      window.removeEventListener("pagehide", s), window.removeEventListener("pageshow", n);
     };
-  }, [i, t, r, s, m, d]), Te(g, "lock-released", t, r, () => {
-    i && l.current && d();
+  }, [a, e, r, h, d, j]), Ye(k, "lock-released", e, r, () => {
+    a && i.current && d();
   });
-  const W = ae();
+  const G = le();
   N(() => {
-    if (!(!i || !W || !t || !r))
-      return W.subscribeCollections([t], (a) => {
+    if (!(!a || !G || !e || !r))
+      return G.subscribeCollections([e], (s) => {
         var n;
-        l.current || q.current || !((n = a.changed_fields) != null && n.includes("$lock")) || !Ae(a, r) || b();
+        i.current || T.current || !((n = s.changed_fields) != null && n.includes("$lock")) || !Oe(s, r) || y();
       });
-  }, [i, W, t, r, b]);
-  const Y = ae(), [ge, ee] = _(!1), ve = w(async () => {
-    if (!(!t || !r)) {
-      ee(!0);
+  }, [a, G, e, r, y]);
+  const O = le(), [xe, se] = x(!1), _e = w(async () => {
+    if (!(!e || !r)) {
+      se(!0);
       try {
-        await s.request(C(`/item-locks/${t}/${r}/lock/request`, {})), u.success("Asked the current editor to release the lock");
+        await o.request(q(`/item-locks/${e}/${r}/lock/request`, {})), u.success("Asked the current editor to release the lock");
       } catch {
         u.error("Could not send the lock request");
       } finally {
-        ee(!1);
+        se(!1);
       }
     }
-  }, [s, t, r]);
+  }, [o, e, r]);
   N(() => {
-    if (!Y || !t || !r) return;
-    const a = Y.on("lock:requested", (e) => {
-      if ((e == null ? void 0 : e.collection) !== t || String(e == null ? void 0 : e.item) !== String(r) || !l.current) return;
-      const c = (e == null ? void 0 : e.from) ?? {};
+    if (!O || !e || !r) return;
+    const s = O.on("lock:requested", (t) => {
+      if ((t == null ? void 0 : t.collection) !== e || String(t == null ? void 0 : t.item) !== String(r) || !i.current) return;
+      const c = (t == null ? void 0 : t.from) ?? {};
       u(`${c.name ?? "Someone"} is asking you to release this record`, {
         duration: 3e4,
         action: {
           label: "Release",
           onClick: () => {
-            m(), l.current = !1, $(!1), s.request(
-              C(`/item-locks/${t}/${r}/lock/respond`, {
+            h(), i.current = !1, S(!1), o.request(
+              q(`/item-locks/${e}/${r}/lock/respond`, {
                 to: c.id,
                 action: "release"
               })
@@ -222,8 +267,8 @@ function Xe(t, r, i, S = {}) {
         cancel: {
           label: "Keep editing",
           onClick: () => {
-            s.request(
-              C(`/item-locks/${t}/${r}/lock/respond`, {
+            o.request(
+              q(`/item-locks/${e}/${r}/lock/respond`, {
                 to: c.id,
                 action: "decline"
               })
@@ -232,125 +277,127 @@ function Xe(t, r, i, S = {}) {
           }
         }
       });
-    }), n = Y.on("lock:response", (e) => {
-      var c, x;
-      (e == null ? void 0 : e.collection) !== t || String(e == null ? void 0 : e.item) !== String(r) || l.current || ((e == null ? void 0 : e.action) === "release" ? (u.success(`${((c = e == null ? void 0 : e.from) == null ? void 0 : c.name) ?? "The editor"} released the lock — it's yours`), d()) : u.warning(
-        `${((x = e == null ? void 0 : e.from) == null ? void 0 : x.name) ?? "The editor"} is keeping the lock${e != null && e.note ? `: "${e.note}"` : ""}`
+    }), n = O.on("lock:response", (t) => {
+      var c, E;
+      (t == null ? void 0 : t.collection) !== e || String(t == null ? void 0 : t.item) !== String(r) || i.current || ((t == null ? void 0 : t.action) === "release" ? (u.success(`${((c = t == null ? void 0 : t.from) == null ? void 0 : c.name) ?? "The editor"} released the lock — it's yours`), d()) : u.warning(
+        `${((E = t == null ? void 0 : t.from) == null ? void 0 : E.name) ?? "The editor"} is keeping the lock${t != null && t.note ? `: "${t.note}"` : ""}`
       ));
-    }), f = Y.on("lock:available", (e) => {
-      (e == null ? void 0 : e.collection) !== t || String(e == null ? void 0 : e.item) !== String(r) || l.current || (u.success("Your turn — the edit lock is yours"), M(null), d());
-    }), o = Y.on("lock:queued", (e) => {
-      (e == null ? void 0 : e.collection) !== t || String(e == null ? void 0 : e.item) !== String(r) || (l.current && u(`${(e == null ? void 0 : e.user_name) ?? "Someone"} is waiting to edit this record`, { duration: 8e3 }), b());
+    }), f = O.on("lock:available", (t) => {
+      (t == null ? void 0 : t.collection) !== e || String(t == null ? void 0 : t.item) !== String(r) || i.current || (u.success("Your turn — the edit lock is yours"), F(null), d());
+    }), l = O.on("lock:queued", (t) => {
+      (t == null ? void 0 : t.collection) !== e || String(t == null ? void 0 : t.item) !== String(r) || (i.current && u(`${(t == null ? void 0 : t.user_name) ?? "Someone"} is waiting to edit this record`, { duration: 8e3 }), y());
     });
     return () => {
-      a(), n(), f(), o();
+      s(), n(), f(), l();
     };
-  }, [Y, t, r, s, d, m, b]);
-  const xe = w(async () => {
-    if (!(!t || !r)) {
-      G(!0);
+  }, [O, e, r, o, d, h, y]);
+  const pe = w(async () => {
+    if (!(!e || !r)) {
+      te(!0);
       try {
-        const a = await s.request(
-          C(`/item-locks/${t}/${r}/lock/queue`, {})
-        ), n = a == null ? void 0 : a.data;
+        const s = await o.request(
+          q(`/item-locks/${e}/${r}/lock/queue`, {})
+        ), n = s == null ? void 0 : s.data;
         if (n != null && n.free) {
-          M(null), h(null), u.success("Nobody is editing this record now — go ahead");
+          F(null), b(null), u.success("Nobody is editing this record now — go ahead");
           return;
         }
         const f = n == null ? void 0 : n.position;
-        M(typeof f == "number" ? f : 1), u.success("You are in line — the lock comes to you automatically when it frees up"), b();
+        F(typeof f == "number" ? f : 1), u.success("You are in line — the lock comes to you automatically when it frees up"), y();
       } catch {
         u.error("Could not join the queue");
       } finally {
-        G(!1);
+        te(!1);
       }
     }
-  }, [s, t, r, b]), we = w(async () => {
-    if (!(!t || !r))
+  }, [o, e, r, y]), Le = w(async () => {
+    if (!(!e || !r))
       try {
-        await s.request(K(`/item-locks/${t}/${r}/lock/queue`)), M(null), b();
+        await o.request(P(`/item-locks/${e}/${r}/lock/queue`)), F(null), y();
       } catch {
       }
-  }, [s, t, r, b]), _e = w(
-    async (a) => {
-      if (!(!t || !r || !l.current)) {
-        X(a);
+  }, [o, e, r, y]), $e = w(
+    async (s) => {
+      if (!(!e || !r || !i.current)) {
+        re(s);
         try {
-          await s.request(C(`/item-locks/${t}/${r}/lock/note`, { note: a }));
+          await o.request(q(`/item-locks/${e}/${r}/lock/note`, { note: s }));
         } catch {
         }
       }
     },
-    [s, t, r]
-  ), pe = w(async () => {
-    if (!(!t || !r || !l.current)) {
-      Z(!0), m(), l.current = !1, $(!1);
+    [o, e, r]
+  ), Ee = w(async () => {
+    if (!(!e || !r || !i.current)) {
+      ne(!0), h(), i.current = !1, S(!1);
       try {
-        await s.request(K(`/item-locks/${t}/${r}/lock`)), P(!0), X(""), u.success("Lock released — anyone can edit this record now");
+        await o.request(P(`/item-locks/${e}/${r}/lock`)), U(!0), re(""), u.success("Lock released — anyone can edit this record now");
       } catch {
         u.error("Failed to release the lock"), d();
       } finally {
-        Z(!1);
+        ne(!1);
       }
     }
-  }, [s, t, r, m, d]), $e = w(async () => {
-    if (l.current) return !0;
-    const a = await d();
-    return a && u.success("You hold the edit lock again"), a;
-  }, [d]), Ne = w(async () => {
-    var a;
-    if (!(!t || !r)) {
-      J(!0);
+  }, [o, e, r, h, d]), Ne = w(async () => {
+    if (i.current) return !0;
+    const s = await d();
+    return s && u.success("You hold the edit lock again"), s;
+  }, [d]), Re = w(async () => {
+    var s;
+    if (!(!e || !r)) {
+      ee(!0);
       try {
-        await s.request(C(`/item-locks/${t}/${r}/lock/force`, {})), u.success("You now hold the edit lock"), await d();
+        await o.request(
+          q(`/item-locks/${e}/${r}/lock/force`, { beat_ms: K })
+        ), u.success("You now hold the edit lock"), await d();
       } catch (n) {
-        const f = ((a = n == null ? void 0 : n.response) == null ? void 0 : a.error) ?? "Failed to take over the lock";
-        u.error(f), (n == null ? void 0 : n.status) === 403 && h((o) => o && { ...o, may_take_over: !1 });
+        const f = ((s = n == null ? void 0 : n.response) == null ? void 0 : s.error) ?? "Failed to take over the lock";
+        u.error(f), (n == null ? void 0 : n.status) === 403 && b((l) => l && { ...l, may_take_over: !1 });
       } finally {
-        J(!1);
+        ee(!1);
       }
     }
-  }, [s, t, r, d]);
+  }, [o, e, r, d]);
   return {
-    lockHolder: p,
-    acquired: F,
-    isReadOnly: !!p,
-    takeOver: Ne,
+    lockHolder: R,
+    acquired: Q,
+    isReadOnly: !!R,
+    takeOver: Re,
     takingOver: D,
-    isAdmin: E,
-    requestLock: ve,
-    requesting: ge,
-    queue: ce,
-    myPosition: de,
-    joinQueue: xe,
-    leaveQueue: we,
-    joining: fe,
-    myNote: ke,
-    saveNote: _e,
-    release: pe,
-    releasing: he,
-    released: me,
-    relock: $e,
-    claim: be
+    isAdmin: L,
+    requestLock: _e,
+    requesting: xe,
+    queue: fe,
+    myPosition: he,
+    joinQueue: pe,
+    leaveQueue: Le,
+    joining: ke,
+    myNote: be,
+    saveNote: $e,
+    release: Ee,
+    releasing: ve,
+    released: ye,
+    relock: Ne,
+    claim: ge
   };
 }
-function Ze({
-  note: t,
+function nt({
+  note: e,
   onSave: r,
-  waiting: i,
-  onRelease: S,
-  releasing: L,
-  released: T,
-  onRelock: s
+  waiting: a,
+  onRelease: _,
+  releasing: g,
+  released: p,
+  onRelock: o
 }) {
-  var p;
-  const [E, g] = _(t);
-  N(() => g(t), [t]);
-  const v = () => {
-    E.trim() !== t && r(E.trim());
+  var R;
+  const [L, k] = x(e);
+  N(() => k(e), [e]);
+  const $ = () => {
+    L.trim() !== e && r(L.trim());
   };
-  return T ? /* @__PURE__ */ y(oe, { children: [
-    /* @__PURE__ */ k(ie, { asChild: !0, children: /* @__PURE__ */ k(
+  return p ? /* @__PURE__ */ v(ue, { children: [
+    /* @__PURE__ */ m(ce, { asChild: !0, children: /* @__PURE__ */ m(
       "button",
       {
         type: "button",
@@ -358,117 +405,117 @@ function Ze({
         title: "Lock released — anyone can edit this record",
         "data-lock-released": !0,
         className: "relative inline-flex h-8 w-8 items-center justify-center text-slate-400 transition-colors hover:bg-accent hover:text-accent-foreground dark:text-slate-500",
-        children: /* @__PURE__ */ k(ne, { className: "h-4 w-4", strokeWidth: 2 })
+        children: /* @__PURE__ */ m(ie, { className: "h-4 w-4", strokeWidth: 2 })
       }
     ) }),
-    /* @__PURE__ */ y(le, { align: "end", sideOffset: 6, className: "w-[300px] p-3", children: [
-      /* @__PURE__ */ k("p", { className: "text-[12px] font-semibold text-slate-700 dark:text-slate-200", children: "You released the edit lock" }),
-      /* @__PURE__ */ k("p", { className: "mt-0.5 text-[11px] text-slate-500 dark:text-slate-400", children: "Anyone can edit this record now. Your next edit locks it again — or lock it now." }),
-      /* @__PURE__ */ y(
-        O,
+    /* @__PURE__ */ v(de, { align: "end", sideOffset: 6, className: "w-[300px] p-3", children: [
+      /* @__PURE__ */ m("p", { className: "text-[12px] font-semibold text-slate-700 dark:text-slate-200", children: "You released the edit lock" }),
+      /* @__PURE__ */ m("p", { className: "mt-0.5 text-[11px] text-slate-500 dark:text-slate-400", children: "Anyone can edit this record now. Your next edit locks it again — or lock it now." }),
+      /* @__PURE__ */ v(
+        Y,
         {
           type: "button",
           size: "sm",
           className: "mt-2 h-7 w-full text-[12px]",
-          onClick: s,
+          onClick: o,
           "data-lock-relock": !0,
           children: [
-            /* @__PURE__ */ k(H, { className: "mr-1.5 h-3.5 w-3.5" }),
+            /* @__PURE__ */ m(Z, { className: "mr-1.5 h-3.5 w-3.5" }),
             " Lock again"
           ]
         }
       )
     ] })
-  ] }) : /* @__PURE__ */ y(oe, { children: [
-    /* @__PURE__ */ k(ie, { asChild: !0, children: /* @__PURE__ */ y(
+  ] }) : /* @__PURE__ */ v(ue, { children: [
+    /* @__PURE__ */ m(ce, { asChild: !0, children: /* @__PURE__ */ v(
       "button",
       {
         type: "button",
         "aria-label": "You hold the edit lock — add a note for others",
-        title: i.length > 0 ? `You hold the edit lock · ${i.length} waiting` : "You hold the edit lock",
+        title: a.length > 0 ? `You hold the edit lock · ${a.length} waiting` : "You hold the edit lock",
         "data-lock-holder": !0,
         className: "relative inline-flex h-8 w-8 items-center justify-center text-[#0e7490] transition-colors hover:bg-accent hover:text-accent-foreground dark:text-nvr-cyan",
         children: [
-          /* @__PURE__ */ k(H, { className: "h-4 w-4", strokeWidth: 2 }),
-          i.length > 0 && /* @__PURE__ */ k("span", { className: "absolute right-1 top-1 h-1.5 w-1.5 rounded-full bg-amber-500 ring-2 ring-background" })
+          /* @__PURE__ */ m(Z, { className: "h-4 w-4", strokeWidth: 2 }),
+          a.length > 0 && /* @__PURE__ */ m("span", { className: "absolute right-1 top-1 h-1.5 w-1.5 rounded-full bg-amber-500 ring-2 ring-background" })
         ]
       }
     ) }),
-    /* @__PURE__ */ y(le, { align: "end", sideOffset: 6, className: "w-[300px] p-3", children: [
-      /* @__PURE__ */ k("p", { className: "text-[12px] font-semibold text-slate-700 dark:text-slate-200", children: "You hold the edit lock" }),
-      /* @__PURE__ */ k("p", { className: "mt-0.5 text-[11px] text-slate-500 dark:text-slate-400", children: "Others see this record read-only. A note tells them what you’re doing." }),
-      /* @__PURE__ */ k(
+    /* @__PURE__ */ v(de, { align: "end", sideOffset: 6, className: "w-[300px] p-3", children: [
+      /* @__PURE__ */ m("p", { className: "text-[12px] font-semibold text-slate-700 dark:text-slate-200", children: "You hold the edit lock" }),
+      /* @__PURE__ */ m("p", { className: "mt-0.5 text-[11px] text-slate-500 dark:text-slate-400", children: "Others see this record read-only. A note tells them what you’re doing." }),
+      /* @__PURE__ */ m(
         "input",
         {
-          value: E,
-          onChange: (h) => g(h.target.value.slice(0, 300)),
-          onBlur: v,
-          onKeyDown: (h) => {
-            h.key === "Enter" && (h.preventDefault(), v());
+          value: L,
+          onChange: (b) => k(b.target.value.slice(0, 300)),
+          onBlur: $,
+          onKeyDown: (b) => {
+            b.key === "Enter" && (b.preventDefault(), $());
           },
           placeholder: "“editing lines, ~15 min”",
           "aria-label": "Lock note",
           className: "mt-2 h-7 w-full rounded-md border border-slate-200 bg-white px-2 text-[12px] dark:border-border dark:bg-card"
         }
       ),
-      i.length > 0 && /* @__PURE__ */ y("div", { className: "mt-2 rounded-md bg-amber-50 px-2 py-1.5 text-[11px] text-amber-800 dark:bg-amber-500/10 dark:text-amber-200", children: [
-        /* @__PURE__ */ y("span", { className: "font-semibold", children: [
-          i.length,
+      a.length > 0 && /* @__PURE__ */ v("div", { className: "mt-2 rounded-md bg-amber-50 px-2 py-1.5 text-[11px] text-amber-800 dark:bg-amber-500/10 dark:text-amber-200", children: [
+        /* @__PURE__ */ v("span", { className: "font-semibold", children: [
+          a.length,
           " waiting for the lock:"
         ] }),
         " ",
-        i.map((h) => h.name ?? "someone").join(", ")
+        a.map((b) => b.name ?? "someone").join(", ")
       ] }),
-      S && /* @__PURE__ */ y(
-        O,
+      _ && /* @__PURE__ */ v(
+        Y,
         {
           type: "button",
           variant: "outline",
           size: "sm",
           className: "mt-2 h-7 w-full text-[12px]",
-          onClick: S,
-          disabled: L,
+          onClick: _,
+          disabled: g,
           "data-lock-release": !0,
           children: [
-            /* @__PURE__ */ k(ne, { className: "mr-1.5 h-3.5 w-3.5" }),
-            L ? "Releasing…" : i.length > 0 ? `Release lock to ${((p = i[0]) == null ? void 0 : p.name) ?? "the next person"}` : "Release lock"
+            /* @__PURE__ */ m(ie, { className: "mr-1.5 h-3.5 w-3.5" }),
+            g ? "Releasing…" : a.length > 0 ? `Release lock to ${((R = a[0]) == null ? void 0 : R.name) ?? "the next person"}` : "Release lock"
           ]
         }
       )
     ] })
   ] });
 }
-function et({
-  lockHolder: t,
+function st({
+  lockHolder: e,
   onTakeOver: r,
-  takingOver: i,
-  isAdmin: S,
-  onRequestLock: L,
-  requesting: T,
-  queue: s,
-  myPosition: E,
-  onJoinQueue: g,
-  onLeaveQueue: v,
-  joining: p,
-  noun: h = "this item",
-  readOnlyText: F = "fields are read-only"
+  takingOver: a,
+  isAdmin: _,
+  onRequestLock: g,
+  requesting: p,
+  queue: o,
+  myPosition: L,
+  onJoinQueue: k,
+  onLeaveQueue: $,
+  joining: R,
+  noun: b = "this item",
+  readOnlyText: Q = "fields are read-only"
 }) {
-  if (!t) return null;
-  const $ = t.locked_by_name || "Another user", D = (s == null ? void 0 : s.length) ?? 0;
-  return /* @__PURE__ */ y(
+  if (!e) return null;
+  const S = e.locked_by_name || "Another user", D = (o == null ? void 0 : o.length) ?? 0;
+  return /* @__PURE__ */ v(
     "div",
     {
       className: "mb-4 flex flex-wrap items-center gap-3 rounded-lg border border-amber-200 bg-amber-50 px-4 py-3 text-sm text-amber-900 dark:border-amber-500/30 dark:bg-amber-500/10 dark:text-amber-100",
       "data-lock-banner": !0,
       children: [
-        /* @__PURE__ */ k(H, { className: "h-4 w-4 shrink-0 text-amber-500" }),
-        /* @__PURE__ */ y("span", { className: "min-w-0 flex-1", children: [
-          /* @__PURE__ */ k("span", { className: "font-medium", children: $ }),
+        /* @__PURE__ */ m(Z, { className: "h-4 w-4 shrink-0 text-amber-500" }),
+        /* @__PURE__ */ v("span", { className: "min-w-0 flex-1", children: [
+          /* @__PURE__ */ m("span", { className: "font-medium", children: S }),
           " is editing ",
-          h,
+          b,
           " — ",
-          F,
-          t.idle_minutes != null && t.idle_minutes >= 2 && /* @__PURE__ */ y(
+          Q,
+          e.idle_minutes != null && e.idle_minutes >= 2 && /* @__PURE__ */ v(
             "span",
             {
               className: "ml-1.5 rounded bg-amber-100 px-1 py-px text-[10px] font-semibold text-amber-700 dark:bg-amber-500/20 dark:text-amber-200",
@@ -476,74 +523,74 @@ function et({
               "data-tip": "How long since they last touched anything — they may have stepped away",
               children: [
                 "idle ",
-                t.idle_minutes,
+                e.idle_minutes,
                 "m"
               ]
             }
           ),
           " ",
           "until the lock is released.",
-          t.note && /* @__PURE__ */ y("span", { className: "mt-0.5 block text-[12.5px] text-amber-800/90 dark:text-amber-200/90", children: [
+          e.note && /* @__PURE__ */ v("span", { className: "mt-0.5 block text-[12.5px] text-amber-800/90 dark:text-amber-200/90", children: [
             "“",
-            t.note,
+            e.note,
             "”"
           ] }),
-          D > 0 && E == null && /* @__PURE__ */ y("span", { className: "mt-0.5 block text-[11.5px] text-amber-700/80 dark:text-amber-300/80", children: [
+          D > 0 && L == null && /* @__PURE__ */ v("span", { className: "mt-0.5 block text-[11.5px] text-amber-700/80 dark:text-amber-300/80", children: [
             D,
             " ",
             D === 1 ? "person is" : "people are",
             " already waiting."
           ] })
         ] }),
-        g && (E != null ? /* @__PURE__ */ y(
-          O,
+        k && (L != null ? /* @__PURE__ */ v(
+          Y,
           {
             size: "sm",
             variant: "outline",
             className: "h-7 shrink-0 border-amber-300 bg-white text-[12px] text-amber-800 hover:bg-amber-100 dark:border-amber-500/40 dark:bg-transparent dark:text-amber-200 dark:hover:bg-amber-500/15",
-            onClick: v,
+            onClick: $,
             "data-lock-queue-leave": !0,
             children: [
               "You’re #",
-              E,
+              L,
               " in line · Leave"
             ]
           }
-        ) : /* @__PURE__ */ k(
-          O,
+        ) : /* @__PURE__ */ m(
+          Y,
           {
             size: "sm",
             variant: "outline",
             className: "h-7 shrink-0 border-amber-300 bg-white text-[12px] text-amber-800 hover:bg-amber-100 dark:border-amber-500/40 dark:bg-transparent dark:text-amber-200 dark:hover:bg-amber-500/15",
-            onClick: g,
-            disabled: p,
+            onClick: k,
+            disabled: R,
             "data-lock-queue-join": !0,
-            children: p ? "Joining…" : "Ask to be next"
+            children: R ? "Joining…" : "Ask to be next"
           }
         )),
-        L && /* @__PURE__ */ k(
-          O,
+        g && /* @__PURE__ */ m(
+          Y,
           {
             size: "sm",
             variant: "outline",
             className: "h-7 shrink-0 border-amber-300 bg-white text-[12px] text-amber-800 hover:bg-amber-100 dark:border-amber-500/40 dark:bg-transparent dark:text-amber-200 dark:hover:bg-amber-500/15",
-            onClick: L,
-            disabled: T,
-            children: T ? "Asking…" : "Ask them to wrap up"
+            onClick: g,
+            disabled: p,
+            children: p ? "Asking…" : "Ask them to wrap up"
           }
         ),
         // Admins always; other roles only when the server says they may (the
         // takeover-role allowlist, #256) — unknown = offered, and a 403 then
         // hides it. A Take over that can only fail was a dead end.
-        (S || t.may_take_over !== !1) && /* @__PURE__ */ k(
-          O,
+        (_ || e.may_take_over !== !1) && /* @__PURE__ */ m(
+          Y,
           {
             size: "sm",
             variant: "outline",
-            className: S ? "h-7 shrink-0 border-amber-300 bg-white text-[12px] text-amber-800 hover:bg-amber-100 dark:border-amber-500/40 dark:bg-transparent dark:text-amber-200 dark:hover:bg-amber-500/15" : "h-7 shrink-0 border-amber-200 bg-white/60 text-[12px] text-amber-700/80 hover:bg-amber-100 dark:border-amber-500/30 dark:bg-transparent dark:text-amber-200/80 dark:hover:bg-amber-500/15",
+            className: _ ? "h-7 shrink-0 border-amber-300 bg-white text-[12px] text-amber-800 hover:bg-amber-100 dark:border-amber-500/40 dark:bg-transparent dark:text-amber-200 dark:hover:bg-amber-500/15" : "h-7 shrink-0 border-amber-200 bg-white/60 text-[12px] text-amber-700/80 hover:bg-amber-100 dark:border-amber-500/30 dark:bg-transparent dark:text-amber-200/80 dark:hover:bg-amber-500/15",
             onClick: r,
-            disabled: i,
-            children: i ? "Taking over…" : "Take over"
+            disabled: a,
+            children: a ? "Taking over…" : "Take over"
           }
         )
       ]
@@ -551,7 +598,7 @@ function et({
   );
 }
 export {
-  et as ItemLockBanner,
-  Ze as LockHolderButton,
-  Xe as useItemLock
+  st as ItemLockBanner,
+  nt as LockHolderButton,
+  rt as useItemLock
 };

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@nivaro/react",
-  "version": "0.3.26",
+  "version": "0.3.27",
   "description": "React hooks and components for Nivaro CMS forms",
   "type": "module",
   "main": "./dist/index.js",