@univerjs/docs-thread-comment-ui 0.10.12-nightly.202510221114 → 0.10.12-nightly.202510251119

package/lib/index.js

@@ -1,23 +1,23 @@
-var Oe = Object.defineProperty;
-var Me = (e, t, r) => t in e ? Oe(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var K = (e, t, r) => Me(e, typeof t != "symbol" ? t + "" : t, r);
-import { CommandType as P, ICommandService as b, CustomDecorationType as Y, sequenceExecute as ne, Inject as _, Disposable as B, UniverInstanceType as p, SHEET_EDITOR_UNITS as be, IUniverInstanceService as w, Injector as re, isInternalEditorID as oe, UserManagerService as De, BuildTextUtils as ye, DependentOn as xe, IConfigService as Te, Plugin as Ue, merge as Re } from "@univerjs/core";
-import { addCustomDecorationBySelectionFactory as Ee, deleteCustomDecorationFactory as Pe, DocSelectionRenderService as we, DocBackScrollRenderController as Ae, DocRenderController as Ne } from "@univerjs/docs-ui";
-import { IThreadCommentDataSourceService as Ve, AddCommentMutation as $e, getDT as je, ThreadCommentModel as ie } from "@univerjs/thread-comment";
-import { SetActiveCommentOperation as de, ThreadCommentPanelService as U, ThreadCommentPanel as Be, UniverThreadCommentUIPlugin as Fe } from "@univerjs/thread-comment-ui";
-import { DocSelectionManagerService as F, DocSkeletonManagerService as He, RichTextEditingMutation as se, SetTextSelectionsOperation as Le, DocInterceptorService as We, DOC_INTERCEPTOR_POINT as Ze } from "@univerjs/docs";
-import { IRenderManagerService as H, withCurrentTypeOfRenderer as Ke, DocumentEditArea as X } from "@univerjs/engine-render";
-import { ISidebarService as L, getMenuHiddenObservable as ce, MenuItemType as ae, useDependency as E, useObservable as G, ContextMenuPosition as Ge, ContextMenuGroup as ke, RibbonInsertGroup as Je, IMenuManagerService as qe, ComponentManager as Ye } from "@univerjs/ui";
-import { BehaviorSubject as ze, Observable as me, debounceTime as le, filter as Qe } from "rxjs";
-import { jsx as Xe } from "react/jsx-runtime";
-import { useMemo as k, useState as et, useEffect as tt, forwardRef as ue, useRef as nt, createElement as fe } from "react";
-const rt = "DOC_THREAD_COMMENT_UI_PLUGIN", S = "default_doc", he = {
+var Ie = Object.defineProperty;
+var Se = (e, t, r) => t in e ? Ie(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
+var Z = (e, t, r) => Se(e, typeof t != "symbol" ? t + "" : t, r);
+import { CommandType as E, ICommandService as M, CustomDecorationType as Y, sequenceExecute as te, Inject as p, Disposable as j, UniverInstanceType as _, SHEET_EDITOR_UNITS as Oe, IUniverInstanceService as A, Injector as ne, isInternalEditorID as re, UserManagerService as Me, BuildTextUtils as De, DependentOn as be, IConfigService as Te, Plugin as xe, merge as Ue } from "@univerjs/core";
+import { addCustomDecorationBySelectionFactory as Re, deleteCustomDecorationFactory as ye, DocSelectionRenderService as Ee, DocBackScrollRenderController as Ae, DocRenderController as $e } from "@univerjs/docs-ui";
+import { IThreadCommentDataSourceService as Pe, AddCommentMutation as we, getDT as Ne, ThreadCommentModel as oe } from "@univerjs/thread-comment";
+import { SetActiveCommentOperation as ie, ThreadCommentPanelService as U, ThreadCommentPanel as Ve, UniverThreadCommentUIPlugin as je } from "@univerjs/thread-comment-ui";
+import { DocSelectionManagerService as B, DocSkeletonManagerService as Be, RichTextEditingMutation as se, SetTextSelectionsOperation as Fe, DocInterceptorService as He, DOC_INTERCEPTOR_POINT as Le } from "@univerjs/docs";
+import { IRenderManagerService as F, withCurrentTypeOfRenderer as We, DocumentEditArea as X } from "@univerjs/engine-render";
+import { ISidebarService as H, getMenuHiddenObservable as de, MenuItemType as ce, useDependency as y, useObservable as K, ContextMenuPosition as Ze, ContextMenuGroup as Ke, RibbonInsertGroup as Ge, IMenuManagerService as Je, ComponentManager as qe } from "@univerjs/ui";
+import { BehaviorSubject as Ye, Observable as ae, debounceTime as me, filter as ze } from "rxjs";
+import { jsx as Qe } from "react/jsx-runtime";
+import { useMemo as G, useState as Xe, useEffect as ke, useRef as et, createElement as le, forwardRef as tt } from "react";
+const nt = "DOC_THREAD_COMMENT_UI_PLUGIN", I = "default_doc", ue = {
   id: "docs.command.add-comment",
-  type: P.COMMAND,
+  type: E.COMMAND,
   async handler(e, t) {
     if (!t)
       return !1;
-    const { comment: r, unitId: n } = t, i = await e.get(Ve).addComment(r), d = e.get(b), s = Ee(
+    const { comment: r, unitId: n } = t, i = await e.get(Pe).addComment(r), s = e.get(M), d = Re(
       e,
       {
         id: i.threadId,
@@ -25,49 +25,49 @@ const rt = "DOC_THREAD_COMMENT_UI_PLUGIN", S = "default_doc", he = {
         unitId: n
       }
     );
-    if (s) {
+    if (d) {
       const l = {
-        id: $e.id,
+        id: we.id,
         params: {
           unitId: n,
-          subUnitId: S,
+          subUnitId: I,
           comment: i
         }
-      }, f = {
-        id: de.id,
+      }, C = {
+        id: ie.id,
         params: {
           unitId: n,
-          subUnitId: S,
+          subUnitId: I,
           commentId: i.id
         }
       };
-      return (await ne([l, s, f], d)).result;
+      return (await te([l, d, C], s)).result;
     }
     return !1;
   }
 }, Ce = {
   id: "docs.command.delete-comment",
-  type: P.COMMAND,
+  type: E.COMMAND,
   async handler(e, t) {
     if (!t)
       return !1;
-    const { commentId: r, unitId: n } = t, o = e.get(b), i = Pe(e, {
+    const { commentId: r, unitId: n } = t, o = e.get(M), i = ye(e, {
       id: r,
       unitId: n
     });
-    return i ? (await ne([i], o)).result : !1;
+    return i ? (await te([i], o)).result : !1;
   }
 };
-var ot = Object.getOwnPropertyDescriptor, it = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? ot(t, r) : t, i = e.length - 1, d; i >= 0; i--)
-    (d = e[i]) && (o = d(o) || o);
+var rt = Object.getOwnPropertyDescriptor, ot = (e, t, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? rt(t, r) : t, i = e.length - 1, s; i >= 0; i--)
+    (s = e[i]) && (o = s(o) || o);
   return o;
-}, ee = (e, t) => (r, n) => t(r, n, e);
-let T = class extends B {
+}, k = (e, t) => (r, n) => t(r, n, e);
+let x = class extends j {
   constructor(t, r) {
     super();
-    K(this, "_addingComment$", new ze(void 0));
-    K(this, "addingComment$", this._addingComment$.asObservable());
+    Z(this, "_addingComment$", new Ye(void 0));
+    Z(this, "addingComment$", this._addingComment$.asObservable());
     this._sidebarService = t, this._threadCommentPanelService = r, this.disposeWithMe(() => {
       this._addingComment$.complete();
     });
@@ -82,34 +82,34 @@ let T = class extends B {
     this._addingComment$.next(void 0);
   }
 };
-T = it([
-  ee(0, L),
-  ee(1, _(U))
-], T);
-const ve = (e) => {
-  var d;
-  const t = e.get(H), r = e.get(F), n = (d = Ke(
-    p.UNIVER_DOC,
-    He,
-    e.get(w),
+x = ot([
+  k(0, H),
+  k(1, p(U))
+], x);
+const he = (e) => {
+  var s;
+  const t = e.get(F), r = e.get(B), n = (s = We(
+    _.UNIVER_DOC,
+    Be,
+    e.get(A),
     t
-  )) == null ? void 0 : d.getSkeleton(), o = n == null ? void 0 : n.getViewModel().getEditArea();
+  )) == null ? void 0 : s.getSkeleton(), o = n == null ? void 0 : n.getViewModel().getEditArea();
   if (o === X.FOOTER || o === X.HEADER)
     return !0;
   const i = r.getActiveTextRange();
   return !!(i == null || i.collapsed);
 };
-function dt(e) {
+function it(e) {
   return {
-    id: W.id,
-    type: ae.BUTTON,
+    id: L.id,
+    type: ce.BUTTON,
     icon: "CommentIcon",
     title: "threadCommentUI.panel.addComment",
     tooltip: "threadCommentUI.panel.addComment",
-    hidden$: ce(e, p.UNIVER_DOC, void 0, be),
-    disabled$: new me(function(t) {
-      const n = e.get(F).textSelection$.pipe(le(16)).subscribe(() => {
-        t.next(ve(e));
+    hidden$: de(e, _.UNIVER_DOC, void 0, Oe),
+    disabled$: new ae(function(t) {
+      const n = e.get(B).textSelection$.pipe(me(16)).subscribe(() => {
+        t.next(he(e));
       });
       return () => {
         n.unsubscribe();
@@ -120,73 +120,73 @@ function dt(e) {
 function st(e) {
   return {
     id: Q.id,
-    type: ae.BUTTON,
+    type: ce.BUTTON,
     icon: "CommentIcon",
     title: "threadCommentUI.panel.addComment",
     tooltip: "threadCommentUI.panel.addComment",
-    hidden$: ce(e, p.UNIVER_DOC)
+    hidden$: de(e, _.UNIVER_DOC)
   };
 }
-const M = () => {
-  const e = E(w), t = E(re), r = k(() => e.getCurrentTypeOfUnit$(p.UNIVER_DOC).pipe(Qe((c) => !!c && !oe(c.getUnitId()))), [e]), n = G(r), o = k(() => new me((c) => c.next(S)), []), i = E(F), d = k(
-    () => i.textSelection$.pipe(le(16)),
+const O = () => {
+  const e = y(A), t = y(ne), r = G(() => e.getCurrentTypeOfUnit$(_.UNIVER_DOC).pipe(ze((c) => !!c && !re(c.getUnitId()))), [e]), n = K(r), o = G(() => new ae((c) => c.next(I)), []), i = y(B), s = G(
+    () => i.textSelection$.pipe(me(16)),
     [i.textSelection$]
   );
-  G(d);
-  const s = E(b), l = E(T), f = G(l.addingComment$), [a, h] = et([]);
-  if (tt(() => {
+  K(s);
+  const d = y(M), l = y(x), C = K(l.addingComment$), [a, h] = Xe([]);
+  if (ke(() => {
     var D;
     const c = /* @__PURE__ */ new Set(), m = n == null ? void 0 : n.getCustomDecorations();
     h((D = m == null ? void 0 : m.map((u) => u.id).filter((u) => {
-      const O = c.has(u);
-      return c.add(u), !O;
+      const S = c.has(u);
+      return c.add(u), !S;
     })) != null ? D : []);
-    const I = s.onCommandExecuted((u) => {
-      var O;
+    const v = d.onCommandExecuted((u) => {
+      var S;
       if (u.id === se.id) {
-        const R = /* @__PURE__ */ new Set(), Z = n == null ? void 0 : n.getCustomDecorations();
-        h((O = Z == null ? void 0 : Z.map((A) => A.id).filter((A) => {
-          const Se = R.has(A);
-          return R.add(A), !Se;
-        })) != null ? O : []);
+        const R = /* @__PURE__ */ new Set(), W = n == null ? void 0 : n.getCustomDecorations();
+        h((S = W == null ? void 0 : W.map(($) => $.id).filter(($) => {
+          const ve = R.has($);
+          return R.add($), !ve;
+        })) != null ? S : []);
       }
     });
     return () => {
-      I.dispose();
+      v.dispose();
     };
-  }, [s, n]), !n)
+  }, [d, n]), !n)
     return null;
-  const v = ve(t), C = n.getUnitId();
-  return /* @__PURE__ */ Xe(
-    Be,
+  const g = he(t), f = n.getUnitId();
+  return /* @__PURE__ */ Qe(
+    Ve,
     {
-      unitId: C,
+      unitId: f,
       subUnitId$: o,
-      type: p.UNIVER_DOC,
+      type: _.UNIVER_DOC,
       onAdd: () => {
-        s.executeCommand(W.id);
+        d.executeCommand(L.id);
       },
       getSubUnitName: () => "",
-      disableAdd: v,
-      tempComment: f,
+      disableAdd: g,
+      tempComment: C,
       onAddComment: (c) => {
         if (!c.parentId) {
           const m = {
-            unitId: C,
-            range: f,
+            unitId: f,
+            range: C,
             comment: c
           };
-          return s.executeCommand(he.id, m), l.endAdd(), !1;
+          return d.executeCommand(ue.id, m), l.endAdd(), !1;
         }
         return !0;
       },
       onDeleteComment: (c) => {
         if (!c.parentId) {
           const m = {
-            unitId: C,
+            unitId: f,
             commentId: c.id
           };
-          return s.executeCommand(Ce.id, m), !1;
+          return d.executeCommand(Ce.id, m), !1;
         }
         return !0;
       },
@@ -194,52 +194,52 @@ const M = () => {
     }
   );
 };
-M.componentKey = "univer.doc.thread-comment-panel";
-const N = {
+O.componentKey = "univer.doc.thread-comment-panel";
+const P = {
   id: "docs.operation.show-comment-panel",
-  type: P.OPERATION,
+  type: E.OPERATION,
   handler(e, t) {
     var o;
-    const r = e.get(U), n = e.get(L);
-    return (!r.panelVisible || ((o = n.options.children) == null ? void 0 : o.label) !== M.componentKey) && (n.open({
+    const r = e.get(U), n = e.get(H);
+    return (!r.panelVisible || ((o = n.options.children) == null ? void 0 : o.label) !== O.componentKey) && (n.open({
       header: { title: "threadCommentUI.panel.title" },
-      children: { label: M.componentKey },
+      children: { label: O.componentKey },
       width: 320,
       onClose: () => r.setPanelVisible(!1)
     }), r.setPanelVisible(!0)), t && r.setActiveComment(t == null ? void 0 : t.activeComment), !0;
   }
 }, Q = {
   id: "docs.operation.toggle-comment-panel",
-  type: P.OPERATION,
+  type: E.OPERATION,
   handler(e) {
     var n;
-    const t = e.get(U), r = e.get(L);
-    return !t.panelVisible || ((n = r.options.children) == null ? void 0 : n.label) !== M.componentKey ? (r.open({
+    const t = e.get(U), r = e.get(H);
+    return !t.panelVisible || ((n = r.options.children) == null ? void 0 : n.label) !== O.componentKey ? (r.open({
       header: { title: "threadCommentUI.panel.title" },
-      children: { label: M.componentKey },
+      children: { label: O.componentKey },
       width: 320,
       onClose: () => t.setPanelVisible(!1)
     }), t.setPanelVisible(!0)) : (r.close(), t.setPanelVisible(!1), t.setActiveComment(null)), !0;
   }
-}, W = {
+}, L = {
   id: "docs.operation.start-add-comment",
-  type: P.OPERATION,
+  type: E.OPERATION,
   handler(e) {
-    var u, O, R;
-    const t = e.get(U), n = e.get(w).getCurrentUnitForType(p.UNIVER_DOC), o = e.get(F), i = e.get(H), d = e.get(De), s = e.get(T), l = e.get(b), f = e.get(L), a = o.getActiveTextRange();
+    var u, S, R;
+    const t = e.get(U), n = e.get(A).getCurrentUnitForType(_.UNIVER_DOC), o = e.get(B), i = e.get(F), s = e.get(Me), d = e.get(x), l = e.get(M), C = e.get(H), a = o.getActiveTextRange();
     if (!n || !a)
       return !1;
-    const h = (u = i.getRenderById(n.getUnitId())) == null ? void 0 : u.with(we);
+    const h = (u = i.getRenderById(n.getUnitId())) == null ? void 0 : u.with(Ee);
     if (h == null || h.setReserveRangesStatus(!0), a.collapsed)
-      return t.panelVisible ? (t.setPanelVisible(!1), f.close()) : l.executeCommand(N.id), !0;
-    l.executeCommand(N.id);
-    const v = n.getUnitId(), C = ((R = (O = n.getBody()) == null ? void 0 : O.dataStream) != null ? R : "").slice(a.startOffset, a.endOffset), c = ye.transform.getPlainText(C), m = S, I = "", D = {
-      unitId: v,
+      return t.panelVisible ? (t.setPanelVisible(!1), C.close()) : l.executeCommand(P.id), !0;
+    l.executeCommand(P.id);
+    const g = n.getUnitId(), f = ((R = (S = n.getBody()) == null ? void 0 : S.dataStream) != null ? R : "").slice(a.startOffset, a.endOffset), c = De.transform.getPlainText(f), m = I, v = "", D = {
+      unitId: g,
       subUnitId: m,
-      id: I,
+      id: v,
       ref: c,
-      dT: je(),
-      personId: d.getCurrentUser().userID,
+      dT: Ne(),
+      personId: s.getCurrentUser().userID,
       text: {
         dataStream: `\r
 `
@@ -247,21 +247,21 @@ const N = {
       startOffset: a.startOffset,
       endOffset: a.endOffset,
       collapsed: !0,
-      threadId: I
+      threadId: v
     };
-    return h == null || h.blur(), s.startAdd(D), t.setActiveComment({
-      unitId: v,
+    return h == null || h.blur(), d.startAdd(D), t.setActiveComment({
+      unitId: g,
       subUnitId: m,
-      commentId: I
+      commentId: v
     }), !0;
   }
-}, ct = "docs-thread-comment-ui.config", te = {};
-var at = Object.getOwnPropertyDescriptor, mt = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? at(t, r) : t, i = e.length - 1, d; i >= 0; i--)
-    (d = e[i]) && (o = d(o) || o);
+}, dt = "docs-thread-comment-ui.config", ee = {};
+var ct = Object.getOwnPropertyDescriptor, at = (e, t, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? ct(t, r) : t, i = e.length - 1, s; i >= 0; i--)
+    (s = e[i]) && (o = s(o) || o);
   return o;
-}, y = (e, t) => (r, n) => t(r, n, e);
-let V = class extends B {
+}, b = (e, t) => (r, n) => t(r, n, e);
+let w = class extends j {
   constructor(e, t, r, n, o, i) {
     super(), this._threadCommentPanelService = e, this._univerInstanceService = t, this._commandService = r, this._docThreadCommentService = n, this._renderManagerService = o, this._threadCommentModel = i, this._initSelectionChange(), this._initActiveCommandChange();
   }
@@ -270,21 +270,21 @@ let V = class extends B {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((t) => {
         var r, n, o, i;
-        if (t.id === Le.id) {
-          const d = t.params, { unitId: s, ranges: l } = d;
-          if (oe(s)) return;
-          const f = this._univerInstanceService.getUnit(s, p.UNIVER_DOC), a = l[0];
+        if (t.id === Fe.id) {
+          const s = t.params, { unitId: d, ranges: l } = s;
+          if (re(d)) return;
+          const C = this._univerInstanceService.getUnit(d, _.UNIVER_DOC), a = l[0];
           if ((e == null ? void 0 : e.startOffset) === (a == null ? void 0 : a.startOffset) && (e == null ? void 0 : e.endOffset) === (a == null ? void 0 : a.endOffset))
             return;
-          if (e = a, a && f) {
-            const { startOffset: h, endOffset: v, collapsed: C } = a;
+          if (e = a, a && C) {
+            const { startOffset: h, endOffset: g, collapsed: f } = a;
             let c;
-            if (C ? c = (n = (r = f.getBody()) == null ? void 0 : r.customDecorations) == null ? void 0 : n.find((m) => m.startIndex <= h && m.endIndex >= v - 1) : c = (i = (o = f.getBody()) == null ? void 0 : o.customDecorations) == null ? void 0 : i.find((m) => m.startIndex <= h && m.endIndex >= v - 1), c) {
-              const m = this._threadCommentModel.getComment(s, S, c.id);
-              m && !m.resolved && this._commandService.executeCommand(N.id, {
+            if (f ? c = (n = (r = C.getBody()) == null ? void 0 : r.customDecorations) == null ? void 0 : n.find((m) => m.startIndex <= h && m.endIndex >= g - 1) : c = (i = (o = C.getBody()) == null ? void 0 : o.customDecorations) == null ? void 0 : i.find((m) => m.startIndex <= h && m.endIndex >= g - 1), c) {
+              const m = this._threadCommentModel.getComment(d, I, c.id);
+              m && !m.resolved && this._commandService.executeCommand(P.id, {
                 activeComment: {
-                  unitId: s,
-                  subUnitId: S,
+                  unitId: d,
+                  subUnitId: I,
                   commentId: c.id
                 }
               });
@@ -293,7 +293,7 @@ let V = class extends B {
           }
           if (!this._threadCommentPanelService.activeCommentId)
             return;
-          this._commandService.executeCommand(de.id);
+          this._commandService.executeCommand(ie.id);
         }
       })
     );
@@ -304,10 +304,10 @@ let V = class extends B {
       if (e) {
         const i = this._univerInstanceService.getUnit(e.unitId);
         if (i) {
-          const d = (t = this._renderManagerService.getRenderById(e.unitId)) == null ? void 0 : t.with(Ae), s = (n = (r = i.getBody()) == null ? void 0 : r.customDecorations) == null ? void 0 : n.find((l) => l.id === e.commentId);
-          s && d && d.scrollToRange({
-            startOffset: s.startIndex,
-            endOffset: s.endIndex,
+          const s = (t = this._renderManagerService.getRenderById(e.unitId)) == null ? void 0 : t.with(Ae), d = (n = (r = i.getBody()) == null ? void 0 : r.customDecorations) == null ? void 0 : n.find((l) => l.id === e.commentId);
+          d && s && s.scrollToRange({
+            startOffset: d.startIndex,
+            endOffset: d.endIndex,
             collapsed: !1
           });
         }
@@ -316,110 +316,160 @@ let V = class extends B {
     }));
   }
 };
-V = mt([
-  y(0, _(U)),
-  y(1, w),
-  y(2, b),
-  y(3, _(T)),
-  y(4, H),
-  y(5, _(ie))
-], V);
-var g = function() {
-  return g = Object.assign || function(e) {
-    for (var t, r = 1, n = arguments.length; r < n; r++) {
-      t = arguments[r];
-      for (var o in t) Object.prototype.hasOwnProperty.call(t, o) && (e[o] = t[o]);
-    }
-    return e;
-  }, g.apply(this, arguments);
-}, lt = function(e, t) {
-  var r = {};
-  for (var n in e) Object.prototype.hasOwnProperty.call(e, n) && t.indexOf(n) < 0 && (r[n] = e[n]);
-  if (e != null && typeof Object.getOwnPropertySymbols == "function")
-    for (var o = 0, n = Object.getOwnPropertySymbols(e); o < n.length; o++)
-      t.indexOf(n[o]) < 0 && Object.prototype.propertyIsEnumerable.call(e, n[o]) && (r[n[o]] = e[n[o]]);
-  return r;
-}, ge = ue(function(e, t) {
-  var r = e.icon, n = e.id, o = e.className, i = e.extend, d = lt(e, ["icon", "id", "className", "extend"]), s = "univerjs-icon univerjs-icon-".concat(n, " ").concat(o || "").trim(), l = nt("_".concat(ht()));
-  return _e(r, "".concat(n), { defIds: r.defIds, idSuffix: l.current }, g({ ref: t, className: s }, d), i);
-});
-function _e(e, t, r, n, o) {
-  return fe(e.tag, g(g({ key: t }, ut(e, r, o)), n), (ft(e, r).children || []).map(function(i, d) {
-    return _e(i, "".concat(t, "-").concat(e.tag, "-").concat(d), r, void 0, o);
-  }));
+w = at([
+  b(0, p(U)),
+  b(1, A),
+  b(2, M),
+  b(3, p(x)),
+  b(4, F),
+  b(5, p(oe))
+], w);
+function fe({ ref: e, ...t }) {
+  const { icon: r, id: n, className: o, extend: i, ...s } = t, d = `univerjs-icon univerjs-icon-${n} ${o || ""}`.trim(), l = et(`_${ut()}`);
+  return ge(r, `${n}`, {
+    defIds: r.defIds,
+    idSuffix: l.current
+  }, {
+    ref: e,
+    className: d,
+    ...s
+  }, i);
 }
-function ut(e, t, r) {
-  var n = g({}, e.attrs);
-  r != null && r.colorChannel1 && n.fill === "colorChannel1" && (n.fill = r.colorChannel1), e.tag === "mask" && n.id && (n.id = n.id + t.idSuffix), Object.entries(n).forEach(function(i) {
-    var d = i[0], s = i[1];
-    d === "mask" && typeof s == "string" && (n[d] = s.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
+function ge(e, t, r, n, o) {
+  return le(e.tag, {
+    key: t,
+    ...mt(e, r, o),
+    ...n
+  }, (lt(e, r).children || []).map((i, s) => ge(i, `${t}-${e.tag}-${s}`, r, void 0, o)));
+}
+function mt(e, t, r) {
+  const n = { ...e.attrs };
+  r != null && r.colorChannel1 && n.fill === "colorChannel1" && (n.fill = r.colorChannel1), e.tag === "mask" && n.id && (n.id = n.id + t.idSuffix), Object.entries(n).forEach(([i, s]) => {
+    i === "mask" && typeof s == "string" && (n[i] = s.replace(/url\(#(.*)\)/, `url(#$1${t.idSuffix})`));
   });
-  var o = t.defIds;
-  return !o || o.length === 0 || (e.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + t.idSuffix), Object.entries(n).forEach(function(i) {
-    var d = i[0], s = i[1];
-    typeof s == "string" && (n[d] = s.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
+  const { defIds: o } = t;
+  return !o || o.length === 0 || (e.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + t.idSuffix), Object.entries(n).forEach(([i, s]) => {
+    typeof s == "string" && (n[i] = s.replace(/url\(#(.*)\)/, `url(#$1${t.idSuffix})`));
   })), n;
 }
-function ft(e, t) {
-  var r, n = t.defIds;
-  return !n || n.length === 0 ? e : e.tag === "defs" && (!((r = e.children) === null || r === void 0) && r.length) ? g(g({}, e), { children: e.children.map(function(o) {
-    return typeof o.attrs.id == "string" && n && n.includes(o.attrs.id) ? g(g({}, o), { attrs: g(g({}, o.attrs), { id: o.attrs.id + t.idSuffix }) }) : o;
-  }) }) : e;
+function lt(e, t) {
+  var n;
+  const { defIds: r } = t;
+  return !r || r.length === 0 ? e : e.tag === "defs" && ((n = e.children) != null && n.length) ? {
+    ...e,
+    children: e.children.map((o) => typeof o.attrs.id == "string" && r && r.includes(o.attrs.id) ? {
+      ...o,
+      attrs: {
+        ...o.attrs,
+        id: o.attrs.id + t.idSuffix
+      }
+    } : o)
+  } : e;
 }
-function ht() {
+function ut() {
   return Math.random().toString(36).substring(2, 8);
 }
-ge.displayName = "UniverIcon";
-var Ct = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 17 17", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521C5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345ZM8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521C8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345ZM11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521C11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521C5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521C8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521C11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M1.84351 3.41861C1.84351 3.01861 2.15531 2.69434 2.53993 2.69434H14.9381C15.3228 2.69434 15.6346 3.01861 15.6346 3.41861V12.4611C15.6346 12.8612 15.3228 13.1854 14.9381 13.1854H8.82117L6.06643 14.6179C5.85054 14.7301 5.59416 14.7181 5.38884 14.5862C5.18352 14.4542 5.05855 14.2211 5.05855 13.9701V13.1854H2.53993C2.15531 13.1854 1.84351 12.8612 1.84351 12.4611L1.84351 3.41861ZM6.45141 12.7982L8.34531 12.0135C8.44201 11.9632 8.54864 11.9371 8.65676 11.9371H14.2417C14.3522 11.9371 14.4417 11.8475 14.4417 11.7371V4.14271C14.4417 4.03225 14.3522 3.94271 14.2417 3.94271H3.23636C3.12591 3.94271 3.03636 4.03225 3.03636 4.14271L3.03636 11.7371C3.03636 11.8475 3.12591 11.9371 3.23636 11.9371L5.75498 11.9371C6.1396 11.9371 6.45141 12.0611 6.45141 12.4611V12.7982Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, pe = ue(function(e, t) {
-  return fe(ge, Object.assign({}, e, {
+fe.displayName = "UniverIcon";
+const Ct = {
+  tag: "svg",
+  attrs: {
+    xmlns: "http://www.w3.org/2000/svg",
+    fill: "none",
+    viewBox: "0 0 17 17",
+    width: "1em",
+    height: "1em"
+  },
+  children: [
+    {
+      tag: "path",
+      attrs: {
+        fill: "currentColor",
+        d: "M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521C5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345ZM8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521C8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345ZM11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521C11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345Z",
+        fillRule: "evenodd",
+        clipRule: "evenodd"
+      }
+    },
+    {
+      tag: "path",
+      attrs: {
+        fill: "currentColor",
+        d: "M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521C5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345Z"
+      }
+    },
+    {
+      tag: "path",
+      attrs: {
+        fill: "currentColor",
+        d: "M8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521C8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345Z"
+      }
+    },
+    {
+      tag: "path",
+      attrs: {
+        fill: "currentColor",
+        d: "M11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521C11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345Z"
+      }
+    },
+    {
+      tag: "path",
+      attrs: {
+        fill: "currentColor",
+        d: "M1.84351 3.41861C1.84351 3.01861 2.15531 2.69434 2.53993 2.69434H14.9381C15.3228 2.69434 15.6346 3.01861 15.6346 3.41861V12.4611C15.6346 12.8612 15.3228 13.1854 14.9381 13.1854H8.82117L6.06643 14.6179C5.85054 14.7301 5.59416 14.7181 5.38884 14.5862C5.18352 14.4542 5.05855 14.2211 5.05855 13.9701V13.1854H2.53993C2.15531 13.1854 1.84351 12.8612 1.84351 12.4611L1.84351 3.41861ZM6.45141 12.7982L8.34531 12.0135C8.44201 11.9632 8.54864 11.9371 8.65676 11.9371H14.2417C14.3522 11.9371 14.4417 11.8475 14.4417 11.7371V4.14271C14.4417 4.03225 14.3522 3.94271 14.2417 3.94271H3.23636C3.12591 3.94271 3.03636 4.03225 3.03636 4.14271L3.03636 11.7371C3.03636 11.8475 3.12591 11.9371 3.23636 11.9371L5.75498 11.9371C6.1396 11.9371 6.45141 12.0611 6.45141 12.4611V12.7982Z",
+        fillRule: "evenodd",
+        clipRule: "evenodd"
+      }
+    }
+  ]
+}, pe = tt(function(t, r) {
+  return le(fe, Object.assign({}, t, {
     id: "comment-icon",
-    ref: t,
+    ref: r,
     icon: Ct
   }));
 });
 pe.displayName = "CommentIcon";
-const vt = {
-  [Je.MEDIA]: {
+const ht = {
+  [Ge.MEDIA]: {
     [Q.id]: {
       order: 3,
       menuItemFactory: st
     }
   },
-  [Ge.MAIN_AREA]: {
-    [ke.DATA]: {
-      [W.id]: {
+  [Ze.MAIN_AREA]: {
+    [Ke.DATA]: {
+      [L.id]: {
         order: 1,
-        menuItemFactory: dt
+        menuItemFactory: it
       }
     }
   }
 };
-var gt = Object.getOwnPropertyDescriptor, _t = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? gt(t, r) : t, i = e.length - 1, d; i >= 0; i--)
-    (d = e[i]) && (o = d(o) || o);
+var ft = Object.getOwnPropertyDescriptor, gt = (e, t, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? ft(t, r) : t, i = e.length - 1, s; i >= 0; i--)
+    (s = e[i]) && (o = s(o) || o);
   return o;
 }, J = (e, t) => (r, n) => t(r, n, e);
-let $ = class extends B {
+let N = class extends j {
   constructor(e, t, r) {
     super(), this._commandService = e, this._menuManagerService = t, this._componentManager = r, this._initCommands(), this._initMenus(), this._initComponents();
   }
   _initCommands() {
     [
-      he,
+      ue,
       Ce,
-      N,
-      W,
+      P,
+      L,
       Q
     ].forEach((e) => {
       this.disposeWithMe(this._commandService.registerCommand(e));
     });
   }
   _initMenus() {
-    this._menuManagerService.mergeMenu(vt);
+    this._menuManagerService.mergeMenu(ht);
   }
   _initComponents() {
     [
-      [M.componentKey, M],
+      [O.componentKey, O],
       ["CommentIcon", pe]
     ].forEach(([e, t]) => {
       this.disposeWithMe(
@@ -428,19 +478,19 @@ let $ = class extends B {
     });
   }
 };
-$ = _t([
-  J(0, b),
-  J(1, qe),
-  J(2, _(Ye))
-], $);
-var pt = Object.getOwnPropertyDescriptor, It = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? pt(t, r) : t, i = e.length - 1, d; i >= 0; i--)
-    (d = e[i]) && (o = d(o) || o);
+N = gt([
+  J(0, M),
+  J(1, Je),
+  J(2, p(qe))
+], N);
+var pt = Object.getOwnPropertyDescriptor, _t = (e, t, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? pt(t, r) : t, i = e.length - 1, s; i >= 0; i--)
+    (s = e[i]) && (o = s(o) || o);
   return o;
-}, x = (e, t) => (r, n) => t(r, n, e);
-let z = class extends B {
-  constructor(e, t, r, n, o, i, d) {
-    super(), this._context = e, this._docInterceptorService = t, this._threadCommentPanelService = r, this._docRenderController = n, this._univerInstanceService = o, this._threadCommentModel = i, this._commandService = d, this._interceptorViewModel(), this._initReRender(), this._initSyncComments();
+}, T = (e, t) => (r, n) => t(r, n, e);
+let z = class extends j {
+  constructor(e, t, r, n, o, i, s) {
+    super(), this._context = e, this._docInterceptorService = t, this._threadCommentPanelService = r, this._docRenderController = n, this._univerInstanceService = o, this._threadCommentModel = i, this._commandService = s, this._interceptorViewModel(), this._initReRender(), this._initSyncComments();
   }
   _initReRender() {
     this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe((e) => {
@@ -449,112 +499,112 @@ let z = class extends B {
         this._docRenderController.reRender(e.unitId);
         return;
       }
-      const t = (r = this._univerInstanceService.getCurrentUnitForType(p.UNIVER_DOC)) == null ? void 0 : r.getUnitId();
+      const t = (r = this._univerInstanceService.getCurrentUnitForType(_.UNIVER_DOC)) == null ? void 0 : r.getUnitId();
       t && this._docRenderController.reRender(t);
     })), this.disposeWithMe(this._threadCommentModel.commentUpdate$.subscribe((e) => {
       e.type === "resolve" && this._docRenderController.reRender(e.unitId);
     }));
   }
   _interceptorViewModel() {
-    this._docInterceptorService.intercept(Ze.CUSTOM_DECORATION, {
+    this._docInterceptorService.intercept(Le.CUSTOM_DECORATION, {
       handler: (e, t, r) => {
         if (!e)
           return r(e);
-        const { unitId: n, index: o, customDecorations: i } = t, d = this._threadCommentPanelService.activeCommentId, { commentId: s, unitId: l } = d || {}, f = i.find((C) => C.id === s), a = this._threadCommentModel.getComment(n, S, e.id);
+        const { unitId: n, index: o, customDecorations: i } = t, s = this._threadCommentPanelService.activeCommentId, { commentId: d, unitId: l } = s || {}, C = i.find((f) => f.id === d), a = this._threadCommentModel.getComment(n, I, e.id);
         if (!a)
           return r({
             ...e,
             show: !1
           });
-        const h = f && o >= f.startIndex && o <= f.endIndex, v = l === n && e.id === s;
+        const h = C && o >= C.startIndex && o <= C.endIndex, g = l === n && e.id === d;
         return r({
           ...e,
-          active: v || h,
+          active: g || h,
           show: !a.resolved
         });
       }
     });
   }
   _initSyncComments() {
-    var o, i, d;
-    const e = this._context.unit.getUnitId(), t = S, r = (d = (i = (o = this._context.unit.getBody()) == null ? void 0 : o.customDecorations) == null ? void 0 : i.filter((s) => s.type === Y.COMMENT).map((s) => s.id)) != null ? d : [];
-    r.forEach((s) => {
-      this._threadCommentModel.getComment(e, t, s) || this._threadCommentModel.addComment(e, t, { id: s, threadId: s, ref: "", dT: "", personId: "", text: { dataStream: "" }, unitId: e, subUnitId: t });
-    }), r.length && this._threadCommentModel.syncThreadComments(this._context.unit.getUnitId(), S, r);
+    var o, i, s;
+    const e = this._context.unit.getUnitId(), t = I, r = (s = (i = (o = this._context.unit.getBody()) == null ? void 0 : o.customDecorations) == null ? void 0 : i.filter((d) => d.type === Y.COMMENT).map((d) => d.id)) != null ? s : [];
+    r.forEach((d) => {
+      this._threadCommentModel.getComment(e, t, d) || this._threadCommentModel.addComment(e, t, { id: d, threadId: d, ref: "", dT: "", personId: "", text: { dataStream: "" }, unitId: e, subUnitId: t });
+    }), r.length && this._threadCommentModel.syncThreadComments(this._context.unit.getUnitId(), I, r);
     let n = r.sort();
-    this.disposeWithMe(this._commandService.onCommandExecuted((s) => {
-      var l, f, a;
-      if (s.id === se.id) {
-        if (s.params.unitId !== this._context.unit.getUnitId())
+    this.disposeWithMe(this._commandService.onCommandExecuted((d) => {
+      var l, C, a;
+      if (d.id === se.id) {
+        if (d.params.unitId !== this._context.unit.getUnitId())
           return;
-        const v = (a = (f = (l = this._context.unit.getBody()) == null ? void 0 : l.customDecorations) == null ? void 0 : f.filter((c) => c.type === Y.COMMENT).map((c) => c.id)) != null ? a : [], C = v.sort();
-        if (JSON.stringify(n) !== JSON.stringify(C)) {
-          const c = new Set(n), m = new Set(C), I = /* @__PURE__ */ new Set(), D = /* @__PURE__ */ new Set();
-          v.forEach((u) => {
-            c.has(u) || I.add(u);
+        const g = (a = (C = (l = this._context.unit.getBody()) == null ? void 0 : l.customDecorations) == null ? void 0 : C.filter((c) => c.type === Y.COMMENT).map((c) => c.id)) != null ? a : [], f = g.sort();
+        if (JSON.stringify(n) !== JSON.stringify(f)) {
+          const c = new Set(n), m = new Set(f), v = /* @__PURE__ */ new Set(), D = /* @__PURE__ */ new Set();
+          g.forEach((u) => {
+            c.has(u) || v.add(u);
           }), n.forEach((u) => {
             m.has(u) || D.add(u);
-          }), n = C, I.forEach((u) => {
+          }), n = f, v.forEach((u) => {
             this._threadCommentModel.getComment(e, t, u) || this._threadCommentModel.addComment(e, t, { id: u, threadId: u, ref: "", dT: "", personId: "", text: { dataStream: "" }, unitId: e, subUnitId: t });
-          }), this._threadCommentModel.syncThreadComments(e, t, [...I]);
+          }), this._threadCommentModel.syncThreadComments(e, t, [...v]);
         }
       }
     }));
   }
 };
-z = It([
-  x(1, _(We)),
-  x(2, _(U)),
-  x(3, _(Ne)),
-  x(4, w),
-  x(5, _(ie)),
-  x(6, b)
+z = _t([
+  T(1, p(He)),
+  T(2, p(U)),
+  T(3, p($e)),
+  T(4, A),
+  T(5, p(oe)),
+  T(6, M)
 ], z);
-var St = Object.defineProperty, Ot = Object.getOwnPropertyDescriptor, Mt = (e, t, r) => t in e ? St(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, bt = (e, t, r, n) => {
-  for (var o = n > 1 ? void 0 : n ? Ot(t, r) : t, i = e.length - 1, d; i >= 0; i--)
-    (d = e[i]) && (o = d(o) || o);
+var vt = Object.defineProperty, It = Object.getOwnPropertyDescriptor, St = (e, t, r) => t in e ? vt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, Ot = (e, t, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? It(t, r) : t, i = e.length - 1, s; i >= 0; i--)
+    (s = e[i]) && (o = s(o) || o);
   return o;
-}, q = (e, t) => (r, n) => t(r, n, e), Ie = (e, t, r) => Mt(e, typeof t != "symbol" ? t + "" : t, r);
-let j = class extends Ue {
-  constructor(e = te, t, r, n) {
+}, q = (e, t) => (r, n) => t(r, n, e), _e = (e, t, r) => St(e, typeof t != "symbol" ? t + "" : t, r);
+let V = class extends xe {
+  constructor(e = ee, t, r, n) {
     super(), this._config = e, this._injector = t, this._renderManagerSrv = r, this._configService = n;
-    const { menu: o, ...i } = Re(
+    const { menu: o, ...i } = Ue(
       {},
-      te,
+      ee,
       this._config
     );
-    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(ct, i);
+    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(dt, i);
   }
   onStarting() {
     [
-      [$],
-      [V],
-      [T]
+      [N],
+      [w],
+      [x]
     ].forEach((e) => {
       this._injector.add(e);
     });
   }
   onRendered() {
-    this._initRenderModule(), this._injector.get(V), this._injector.get($);
+    this._initRenderModule(), this._injector.get(w), this._injector.get(N);
   }
   _initRenderModule() {
     [z].forEach((e) => {
-      this._renderManagerSrv.registerRenderModule(p.UNIVER_DOC, e);
+      this._renderManagerSrv.registerRenderModule(_.UNIVER_DOC, e);
     });
   }
 };
-Ie(j, "pluginName", rt);
-Ie(j, "type", p.UNIVER_DOC);
-j = bt([
-  xe(Fe),
-  q(1, _(re)),
-  q(2, H),
+_e(V, "pluginName", nt);
+_e(V, "type", _.UNIVER_DOC);
+V = Ot([
+  be(je),
+  q(1, p(ne)),
+  q(2, F),
   q(3, Te)
-], j);
+], V);
 export {
-  he as AddDocCommentComment,
+  ue as AddDocCommentComment,
   Ce as DeleteDocCommentComment,
-  N as ShowCommentPanelOperation,
-  W as StartAddCommentOperation,
-  j as UniverDocsThreadCommentUIPlugin
+  P as ShowCommentPanelOperation,
+  L as StartAddCommentOperation,
+  V as UniverDocsThreadCommentUIPlugin
 };