@fileverse-dev/ddoc 3.2.6-sg-5 → 3.2.6-sg-6

package/dist/index.es.js

@@ -187845,11 +187845,18 @@ const OGe = Number.POSITIVE_INFINITY, db = (e) => e.isVisible && e.isMeasured &&
   viewportBottom: n
 }) => {
   const r = e.flatMap(
-    (i) => Array.from(i.getClientRects())
+    (a) => Array.from(a.getClientRects())
   );
-  return r.length ? r.find(
-    (i) => i.bottom >= t && i.top <= n
-  ) ?? r[0] : null;
+  if (!r.length)
+    return null;
+  const o = r.some(
+    (a) => a.bottom >= t && a.top <= n
+  ), i = Math.min(...r.map((a) => a.top)), s = Math.max(...r.map((a) => a.bottom));
+  return {
+    top: i,
+    height: Math.max(1, s - i),
+    intersectsViewport: o
+  };
 }, VGe = (e, t) => e === t ? 0 : e === null ? 1 : t === null ? -1 : e - t, KGe = ({
   previousOrderedFloatingCardIds: e,
   nextFloatingCards: t,
@@ -188048,7 +188055,8 @@ const OGe = Number.POSITIVE_INFINITY, db = (e) => e.isVisible && e.isMeasured &&
     );
   }, []), p = Ae(
     (v, D) => {
-      u(v).invalidationFlags |= D;
+      const w = u(v);
+      w.invalidationFlags |= D;
     },
     [u]
   ), h = Ae(() => {
@@ -188114,9 +188122,12 @@ const OGe = Number.POSITIVE_INFINITY, db = (e) => e.isVisible && e.isMeasured &&
       });
     },
     []
-  ), y = Ae(() => t.current.map(
-    (v) => GGe(u(v))
-  ), [u]), F = Ae(() => {
+  ), y = Ae(
+    () => t.current.map(
+      (v) => GGe(u(v))
+    ),
+    [u]
+  ), F = Ae(() => {
     e.current.clear(), t.current = [], n.current.clear(), r.current = !0, o.current.clear(), i.current.recomputeFromIndex = 0, s.current = [], l([]);
   }, []);
   return {
@@ -188489,7 +188500,6 @@ const OGe = Number.POSITIVE_INFINITY, db = (e) => e.isVisible && e.isMeasured &&
       vr.Anchor
     ), O(G ?? 0), Y();
   }, [
-    R,
     s,
     y,
     v,
@@ -188741,16 +188751,16 @@ const OGe = Number.POSITIVE_INFINITY, db = (e) => e.isVisible && e.isMeasured &&
     floatingCards: l,
     scrollContainerRef: n
   }), f = Et(
-    () => p.map((g) => a.get(g)).filter(
-      (g) => g !== void 0
+    () => p.map((m) => a.get(m)).filter(
+      (m) => m !== void 0
     ),
     [p, a]
-  );
+  ), g = c && l.length > 0;
   return {
     floatingCardListContainerRef: d,
     mountedFloatingCards: f,
     registerCardNode: h,
-    shouldRender: c && l.length > 0
+    shouldRender: g
   };
 }, pte = 300, iXe = (e) => e instanceof Element ? !!e.closest(
   'button, [role="button"], a, [data-inline-comment-actions-menu], [data-radix-popper-content-wrapper]'
@@ -188781,24 +188791,27 @@ const sXe = ({
   isHidden: t,
   registerCardNode: n
 }) => {
-  const r = Ne((u) => u.focusFloatingCard), o = Ne((u) => u.inlineDrafts[e.draftId]), i = Ne((u) => u.username), s = Ne((u) => u.isConnected), a = je(null), l = Ys(i);
+  const r = Ne((c) => c.focusFloatingCard), o = Ne((c) => c.inlineDrafts[e.draftId]), i = Ne((c) => c.username), s = Ne((c) => c.isConnected), a = je(null), l = Ys(i), u = Ae(
+    (c) => {
+      a.current = c, n(e.floatingCardId, c);
+    },
+    [e.floatingCardId, n]
+  );
   return _e(() => {
     if (!o || !e.isFocused || t)
       return;
-    const u = window.requestAnimationFrame(() => {
-      var d;
-      const c = (d = a.current) == null ? void 0 : d.querySelector("textarea, input");
-      c == null || c.focus({ preventScroll: !0 });
+    const c = window.requestAnimationFrame(() => {
+      var p;
+      const d = (p = a.current) == null ? void 0 : p.querySelector("textarea, input");
+      d == null || d.focus({ preventScroll: !0 });
     });
     return () => {
-      window.cancelAnimationFrame(u);
+      window.cancelAnimationFrame(c);
     };
   }, [e.isFocused, o, t]), o ? /* @__PURE__ */ x.jsx(
     lm,
     {
-      ref: (u) => {
-        a.current = u, n(e.floatingCardId, u);
-      },
+      ref: u,
       floatingCardId: e.floatingCardId,
       isHidden: t,
       isFocused: e.isFocused,
@@ -188881,11 +188894,16 @@ const sXe = ({
   isHidden: t,
   registerCardNode: n
 }) => {
-  const r = Ne((f) => f.focusFloatingCard), o = Ne((f) => f.submitDraft), i = Ne((f) => f.discardDraft), s = Ne((f) => f.isConnected), a = !!e.selectedText, l = !!e.insertedText, u = !!e.linkHref, c = a || l || u, d = Ne((f) => f.username), p = Ys(d), h = u ? "link" : a ? l ? "replace" : "delete" : l ? "add" : null;
+  const r = Ne((g) => g.focusFloatingCard), o = Ne((g) => g.submitDraft), i = Ne((g) => g.discardDraft), s = Ne((g) => g.isConnected), a = !!e.selectedText, l = !!e.insertedText, u = !!e.linkHref, c = a || l || u, d = Ne((g) => g.username), p = Ys(d), h = Ae(
+    (g) => {
+      n(e.floatingCardId, g);
+    },
+    [e.floatingCardId, n]
+  ), f = u ? "link" : a ? l ? "replace" : "delete" : l ? "add" : null;
   return /* @__PURE__ */ x.jsx(
     lm,
     {
-      ref: (f) => n(e.floatingCardId, f),
+      ref: h,
       floatingCardId: e.floatingCardId,
       isHidden: t,
       isFocused: e.isFocused,
@@ -188926,7 +188944,7 @@ const sXe = ({
           ) })
         ] }),
         /* @__PURE__ */ x.jsxs("div", { className: "flex-1 ml-[32px]", children: [
-          h === "add" && /* @__PURE__ */ x.jsxs("p", { className: "text-body-sm break-words", children: [
+          f === "add" && /* @__PURE__ */ x.jsxs("p", { className: "text-body-sm break-words", children: [
             /* @__PURE__ */ x.jsx("span", { className: "font-semibold", children: "Add:" }),
             " ",
             /* @__PURE__ */ x.jsxs("span", { children: [
@@ -188935,7 +188953,7 @@ const sXe = ({
               "”"
             ] })
           ] }),
-          h === "delete" && /* @__PURE__ */ x.jsxs("p", { className: "text-body-sm", children: [
+          f === "delete" && /* @__PURE__ */ x.jsxs("p", { className: "text-body-sm", children: [
             /* @__PURE__ */ x.jsx("span", { className: "font-semibold", children: "Delete:" }),
             " ",
             /* @__PURE__ */ x.jsxs("span", { className: "line-through", children: [
@@ -188944,7 +188962,7 @@ const sXe = ({
               "”"
             ] })
           ] }),
-          h === "replace" && /* @__PURE__ */ x.jsxs("p", { className: "text-body-sm", children: [
+          f === "replace" && /* @__PURE__ */ x.jsxs("p", { className: "text-body-sm", children: [
             /* @__PURE__ */ x.jsx("span", { className: "font-semibold", children: "Replace:" }),
             " ",
             /* @__PURE__ */ x.jsxs("span", { className: "line-through", children: [
@@ -188961,7 +188979,7 @@ const sXe = ({
               "”"
             ] })
           ] }),
-          h === "link" && /* @__PURE__ */ x.jsxs("p", { className: "text-body-sm", children: [
+          f === "link" && /* @__PURE__ */ x.jsxs("p", { className: "text-body-sm", children: [
             /* @__PURE__ */ x.jsx("span", { className: "font-semibold", children: "Add link:" }),
             " ",
             /* @__PURE__ */ x.jsxs("span", { children: [
@@ -188970,7 +188988,7 @@ const sXe = ({
               '"'
             ] })
           ] }),
-          !h && /* @__PURE__ */ x.jsx("p", { className: "text-body-sm color-text-secondary italic", children: "Start typing to suggest a change" })
+          !f && /* @__PURE__ */ x.jsx("p", { className: "text-body-sm color-text-secondary italic", children: "Start typing to suggest a change" })
         ] }),
         /* @__PURE__ */ x.jsx("div", { className: "flex items-center justify-end", children: /* @__PURE__ */ x.jsx(
           It,
@@ -188991,33 +189009,38 @@ const sXe = ({
   isHidden: n,
   registerCardNode: r
 }) => {
-  const o = Ne((m) => m.focusFloatingCard), i = Ne((m) => m.focusCommentInEditor), s = Ne((m) => m.isDDocOwner), a = Ne((m) => m.username), l = Ne((m) => m.acceptSuggestion), u = Ne((m) => m.deleteComment);
+  const o = Ne((b) => b.focusFloatingCard), i = Ne((b) => b.focusCommentInEditor), s = Ne((b) => b.isDDocOwner), a = Ne((b) => b.username), l = Ne((b) => b.acceptSuggestion), u = Ne((b) => b.deleteComment), c = Ae(
+    (b) => {
+      r(e.floatingCardId, b);
+    },
+    [r, e.floatingCardId]
+  );
   if (!t) return null;
-  const c = () => {
+  const d = () => {
     o(e.floatingCardId), !e.isFocused && e.commentId && i(e.commentId);
-  }, d = !!(a && t.username && t.username === a), p = s, h = !s && d, f = () => {
+  }, p = !!(a && t.username && t.username === a), h = s, f = !s && p, g = () => {
     e.commentId && l(e.commentId);
-  }, g = () => {
+  }, m = () => {
     e.commentId && u(e.commentId);
   };
   return /* @__PURE__ */ x.jsx(
     lm,
     {
-      ref: (m) => r(e.floatingCardId, m),
+      ref: c,
       floatingCardId: e.floatingCardId,
       isHidden: n,
       isFocused: e.isFocused,
-      onFocus: c,
+      onFocus: d,
       children: /* @__PURE__ */ x.jsxs("div", { className: "flex group flex-col gap-2 p-3 pb-0", children: [
         /* @__PURE__ */ x.jsx(
           cXe,
           {
             username: t.username,
             createdAt: t.createdAt,
-            canAcceptReject: p,
-            canWithdraw: h,
-            onAccept: f,
-            onReject: g
+            canAcceptReject: h,
+            canWithdraw: f,
+            onAccept: g,
+            onReject: m
           }
         ),
         /* @__PURE__ */ x.jsx("div", { className: "ml-[32px]", children: /* @__PURE__ */ x.jsx(dXe, { comment: t }) }),
@@ -189026,7 +189049,7 @@ const sXe = ({
           {
             thread: e,
             comment: t,
-            onFocusRequest: c
+            onFocusRequest: d
           }
         ),
         /* @__PURE__ */ x.jsx(hXe, { thread: e, comment: t })
@@ -189058,7 +189081,7 @@ const sXe = ({
       s.isEns && /* @__PURE__ */ x.jsx("img", { src: df, alt: "verified", className: "w-3.5 h-3.5" })
     ] }),
     /* @__PURE__ */ x.jsx("span", { className: "text-helper-text-sm color-text-secondary whitespace-nowrap", children: t && m3(t) }),
-    /* @__PURE__ */ x.jsxs("div", { className: "ml-auto opacity-0 group-hover:opacity-100 items-center gap-1", children: [
+    /* @__PURE__ */ x.jsxs("div", { className: "ml-auto opacity-0 group-hover:opacity-100 flex items-center gap-1", children: [
       n && /* @__PURE__ */ x.jsxs(x.Fragment, { children: [
         /* @__PURE__ */ x.jsx(
           sn,
@@ -189272,7 +189295,7 @@ const sXe = ({
   registerCardNode: o,
   isCollaborationEnabled: i
 }) => {
-  const s = Ne((v) => v.focusFloatingCard), a = Ne((v) => v.focusCommentInEditor), l = Ne((v) => v.isConnected), u = Ne((v) => v.resolveComment), c = Ne((v) => v.username), d = Ne((v) => v.deleteComment), p = Ne((v) => v.isDDocOwner), [h, f] = Me(!1), g = !!(t != null && t.username && t.username === c) || p, m = () => {
+  const s = Ne((D) => D.focusFloatingCard), a = Ne((D) => D.focusCommentInEditor), l = Ne((D) => D.isConnected), u = Ne((D) => D.resolveComment), c = Ne((D) => D.username), d = Ne((D) => D.deleteComment), p = Ne((D) => D.isDDocOwner), [h, f] = Me(!1), g = !!(t != null && t.username && t.username === c) || p, m = () => {
     e.commentId && f(!0);
   }, b = () => {
     f(!1);
@@ -189280,11 +189303,16 @@ const sXe = ({
     e.commentId && (f(!1), d(e.commentId));
   }, F = () => {
     s(e.floatingCardId), !e.isFocused && e.commentId && a(e.commentId);
-  };
+  }, v = Ae(
+    (D) => {
+      o(e.floatingCardId, D);
+    },
+    [o, e.floatingCardId]
+  );
   return /* @__PURE__ */ x.jsx(
     lm,
     {
-      ref: (v) => o(e.floatingCardId, v),
+      ref: v,
       floatingCardId: e.floatingCardId,
       isHidden: r,
       isFocused: e.isFocused,

package/dist/package/components/inline-comment/floating-comment-layout-utils.d.ts

@@ -68,7 +68,11 @@ export declare const getRect: ({ elements, viewportTop, viewportBottom, }: {
     elements: HTMLElement[];
     viewportTop: number;
     viewportBottom: number;
-}) => DOMRect | null;
+}) => {
+    top: number;
+    height: number;
+    intersectsViewport: boolean;
+} | null;
 export declare const reconcileOrderedFloatingCardIds: ({ previousOrderedFloatingCardIds, nextFloatingCards, getPos, }: {
     previousOrderedFloatingCardIds: string[];
     nextFloatingCards: CommentFloatingCard[];

package/package.json

@@ -2,7 +2,7 @@
   "name": "@fileverse-dev/ddoc",
   "private": false,
   "description": "DDoc",
-  "version": "3.2.6-sg-5",
+  "version": "3.2.6-sg-6",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
   "exports": {