@univerjs/docs-thread-comment-ui 0.7.0 → 0.8.0-beta.1

package/lib/index.js

@@ -1,27 +1,27 @@
 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 G = (e, t, r) => Me(e, typeof t != "symbol" ? t + "" : t, r);
-import { Inject as _, Disposable as B, CommandType as P, ICommandService as M, CustomDecorationType as q, sequenceExecute as ne, UniverInstanceType as p, SHEET_EDITOR_UNITS as be, IUniverInstanceService as A, Injector as re, isInternalEditorID as ie, UserManagerService as De, BuildTextUtils as ye, DependentOn as xe, IConfigService as Te, Plugin as Ue, merge as Re } from "@univerjs/core";
+var K = (e, t, r) => Me(e, typeof t != "symbol" ? t + "" : t, r);
+import { Inject as _, Disposable as B, CommandType as P, ICommandService as b, CustomDecorationType as Y, sequenceExecute as ne, 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 { IRenderManagerService as F, withCurrentTypeOfRenderer as Ee, DocumentEditArea as X } from "@univerjs/engine-render";
-import { ThreadCommentPanelService as U, SetActiveCommentOperation as oe, ThreadCommentPanel as Pe, UniverThreadCommentUIPlugin as Ae } from "@univerjs/thread-comment-ui";
-import { DocSelectionManagerService as H, DocSkeletonManagerService as Ne, RichTextEditingMutation as se, SetTextSelectionsOperation as we, DocInterceptorService as Ve, DOC_INTERCEPTOR_POINT as $e } from "@univerjs/docs";
+import { ThreadCommentPanelService as U, SetActiveCommentOperation as ie, ThreadCommentPanel as Pe, UniverThreadCommentUIPlugin as we } from "@univerjs/thread-comment-ui";
+import { DocSelectionManagerService as H, DocSkeletonManagerService as Ae, RichTextEditingMutation as de, SetTextSelectionsOperation as Ne, DocInterceptorService as Ve, DOC_INTERCEPTOR_POINT as $e } from "@univerjs/docs";
 import { addCustomDecorationBySelectionFactory as je, deleteCustomDecorationFactory as Be, DocSelectionRenderService as Fe, DocBackScrollRenderController as He, DocRenderController as Le } from "@univerjs/docs-ui";
-import { IThreadCommentDataSourceService as We, AddCommentMutation as Ke, getDT as Ge, ThreadCommentModel as de } from "@univerjs/thread-comment";
-import { ISidebarService as L, getMenuHiddenObservable as ce, MenuItemType as ae, useDependency as E, useObservable as Z, ContextMenuPosition as Ze, ContextMenuGroup as ze, RibbonStartGroup as ke, IMenuManagerService as Je, ComponentManager as qe } from "@univerjs/ui";
-import { BehaviorSubject as Ye, Observable as me, debounceTime as le, filter as Qe } from "rxjs";
+import { IThreadCommentDataSourceService as We, AddCommentMutation as Ze, getDT as Ke, ThreadCommentModel as se } from "@univerjs/thread-comment";
+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 z, 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", it = "docs-thread-comment-ui.config", ee = {};
-var ot = Object.getOwnPropertyDescriptor, st = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? ot(t, r) : t, o = e.length - 1, s; o >= 0; o--)
-    (s = e[o]) && (i = s(i) || i);
-  return i;
+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", ot = "docs-thread-comment-ui.config", ee = {};
+var it = Object.getOwnPropertyDescriptor, dt = (e, t, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? it(t, r) : t, i = e.length - 1, d; i >= 0; i--)
+    (d = e[i]) && (o = d(o) || o);
+  return o;
 }, te = (e, t) => (r, n) => t(r, n, e);
-let x = class extends B {
+let T = class extends B {
   constructor(t, r) {
     super();
-    G(this, "_addingComment$", new Ye(void 0));
-    G(this, "addingComment$", this._addingComment$.asObservable());
+    K(this, "_addingComment$", new ze(void 0));
+    K(this, "addingComment$", this._addingComment$.asObservable());
     this._sidebarService = t, this._threadCommentPanelService = r, this.disposeWithMe(() => {
       this._addingComment$.complete();
     });
@@ -36,41 +36,41 @@ let x = class extends B {
     this._addingComment$.next(void 0);
   }
 };
-x = st([
+T = dt([
   te(0, L),
   te(1, _(U))
-], x);
+], T);
 const he = {
   id: "docs.command.add-comment",
   type: P.COMMAND,
   async handler(e, t) {
     if (!t)
       return !1;
-    const { comment: r, unitId: n } = t, o = await e.get(We).addComment(r), s = e.get(M), d = je(
+    const { comment: r, unitId: n } = t, i = await e.get(We).addComment(r), d = e.get(b), s = je(
       e,
       {
-        id: o.threadId,
-        type: q.COMMENT,
+        id: i.threadId,
+        type: Y.COMMENT,
         unitId: n
       }
     );
-    if (d) {
+    if (s) {
       const l = {
-        id: Ke.id,
+        id: Ze.id,
         params: {
           unitId: n,
           subUnitId: S,
-          comment: o
+          comment: i
         }
       }, f = {
-        id: oe.id,
+        id: ie.id,
         params: {
           unitId: n,
           subUnitId: S,
-          commentId: o.id
+          commentId: i.id
         }
       };
-      return (await ne([l, d, f], s)).result;
+      return (await ne([l, s, f], d)).result;
     }
     return !1;
   }
@@ -80,36 +80,36 @@ const he = {
   async handler(e, t) {
     if (!t)
       return !1;
-    const { commentId: r, unitId: n } = t, i = e.get(M), o = Be(e, {
+    const { commentId: r, unitId: n } = t, o = e.get(b), i = Be(e, {
       id: r,
       unitId: n
     });
-    return o ? (await ne([o], i)).result : !1;
+    return i ? (await ne([i], o)).result : !1;
   }
-}, ge = (e) => {
-  var s;
-  const t = e.get(F), r = e.get(H), n = (s = Ee(
+}, ve = (e) => {
+  var d;
+  const t = e.get(F), r = e.get(H), n = (d = Ee(
     p.UNIVER_DOC,
-    Ne,
-    e.get(A),
+    Ae,
+    e.get(w),
     t
-  )) == null ? void 0 : s.getSkeleton(), i = n == null ? void 0 : n.getViewModel().getEditArea();
-  if (i === X.FOOTER || i === X.HEADER)
+  )) == null ? void 0 : d.getSkeleton(), o = n == null ? void 0 : n.getViewModel().getEditArea();
+  if (o === X.FOOTER || o === X.HEADER)
     return !0;
-  const o = r.getActiveTextRange();
-  return !!(o == null || o.collapsed);
+  const i = r.getActiveTextRange();
+  return !!(i == null || i.collapsed);
 };
-function dt(e) {
+function st(e) {
   return {
     id: W.id,
     type: ae.BUTTON,
-    icon: "CommentSingle",
+    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(H).textSelection$.pipe(le(16)).subscribe(() => {
-        t.next(ge(e));
+        t.next(ve(e));
       });
       return () => {
         n.unsubscribe();
@@ -121,53 +121,53 @@ function ct(e) {
   return {
     id: Q.id,
     type: ae.BUTTON,
-    icon: "CommentSingle",
+    icon: "CommentIcon",
     title: "threadCommentUI.panel.addComment",
     tooltip: "threadCommentUI.panel.addComment",
     hidden$: ce(e, p.UNIVER_DOC)
   };
 }
-const T = () => {
-  const e = E(A), t = E(re), r = z(() => e.getCurrentTypeOfUnit$(p.UNIVER_DOC).pipe(Qe((c) => !!c && !ie(c.getUnitId()))), [e]), n = Z(r), i = z(() => new me((c) => c.next(S)), []), o = E(H), s = z(
-    () => o.textSelection$.pipe(le(16)),
-    [o.textSelection$]
+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(H), d = k(
+    () => i.textSelection$.pipe(le(16)),
+    [i.textSelection$]
   );
-  Z(s);
-  const d = E(M), l = E(x), f = Z(l.addingComment$), [a, h] = et([]);
+  G(d);
+  const s = E(b), l = E(T), f = G(l.addingComment$), [a, h] = et([]);
   if (tt(() => {
-    var b;
+    var D;
     const c = /* @__PURE__ */ new Set(), m = n == null ? void 0 : n.getCustomDecorations();
-    h((b = m == null ? void 0 : m.map((u) => u.id).filter((u) => {
+    h((D = m == null ? void 0 : m.map((u) => u.id).filter((u) => {
       const O = c.has(u);
       return c.add(u), !O;
-    })) != null ? b : []);
-    const I = d.onCommandExecuted((u) => {
+    })) != null ? D : []);
+    const I = s.onCommandExecuted((u) => {
       var O;
-      if (u.id === se.id) {
-        const R = /* @__PURE__ */ new Set(), K = n == null ? void 0 : n.getCustomDecorations();
-        h((O = K == null ? void 0 : K.map((N) => N.id).filter((N) => {
-          const Se = R.has(N);
-          return R.add(N), !Se;
+      if (u.id === de.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 : []);
       }
     });
     return () => {
       I.dispose();
     };
-  }, [d, n]), !n)
+  }, [s, n]), !n)
     return null;
-  const g = ge(t), C = n.getUnitId();
+  const v = ve(t), C = n.getUnitId();
   return /* @__PURE__ */ Xe(
     Pe,
     {
       unitId: C,
-      subUnitId$: i,
+      subUnitId$: o,
       type: p.UNIVER_DOC,
       onAdd: () => {
-        d.executeCommand(W.id);
+        s.executeCommand(W.id);
       },
       getSubUnitName: () => "",
-      disableAdd: g,
+      disableAdd: v,
       tempComment: f,
       onAddComment: (c) => {
         if (!c.parentId) {
@@ -176,7 +176,7 @@ const T = () => {
             range: f,
             comment: c
           };
-          return d.executeCommand(he.id, m), l.endAdd(), !1;
+          return s.executeCommand(he.id, m), l.endAdd(), !1;
         }
         return !0;
       },
@@ -186,7 +186,7 @@ const T = () => {
             unitId: C,
             commentId: c.id
           };
-          return d.executeCommand(Ce.id, m), !1;
+          return s.executeCommand(Ce.id, m), !1;
         }
         return !0;
       },
@@ -194,16 +194,16 @@ const T = () => {
     }
   );
 };
-T.componentKey = "univer.doc.thread-comment-panel";
-const w = {
+M.componentKey = "univer.doc.thread-comment-panel";
+const N = {
   id: "docs.operation.show-comment-panel",
   type: P.OPERATION,
   handler(e, t) {
-    var i;
+    var o;
     const r = e.get(U), n = e.get(L);
-    return (!r.panelVisible || ((i = n.options.children) == null ? void 0 : i.label) !== T.componentKey) && (n.open({
+    return (!r.panelVisible || ((o = n.options.children) == null ? void 0 : o.label) !== M.componentKey) && (n.open({
       header: { title: "threadCommentUI.panel.title" },
-      children: { label: T.componentKey },
+      children: { label: M.componentKey },
       width: 320,
       onClose: () => r.setPanelVisible(!1)
     }), r.setPanelVisible(!0)), t && r.setActiveComment(t == null ? void 0 : t.activeComment), !0;
@@ -214,9 +214,9 @@ const w = {
   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) !== T.componentKey ? (r.open({
+    return !t.panelVisible || ((n = r.options.children) == null ? void 0 : n.label) !== M.componentKey ? (r.open({
       header: { title: "threadCommentUI.panel.title" },
-      children: { label: T.componentKey },
+      children: { label: M.componentKey },
       width: 320,
       onClose: () => t.setPanelVisible(!1)
     }), t.setPanelVisible(!0)) : (r.close(), t.setPanelVisible(!1), t.setActiveComment(null)), !0;
@@ -226,20 +226,20 @@ const w = {
   type: P.OPERATION,
   handler(e) {
     var u, O, R;
-    const t = e.get(U), n = e.get(A).getCurrentUnitForType(p.UNIVER_DOC), i = e.get(H), o = e.get(F), s = e.get(De), d = e.get(x), l = e.get(M), f = e.get(L), a = i.getActiveTextRange();
+    const t = e.get(U), n = e.get(w).getCurrentUnitForType(p.UNIVER_DOC), o = e.get(H), i = e.get(F), d = e.get(De), s = e.get(T), l = e.get(b), f = e.get(L), a = o.getActiveTextRange();
     if (!n || !a)
       return !1;
-    const h = (u = o.getRenderById(n.getUnitId())) == null ? void 0 : u.with(Fe);
+    const h = (u = i.getRenderById(n.getUnitId())) == null ? void 0 : u.with(Fe);
     if (h == null || h.setReserveRangesStatus(!0), a.collapsed)
-      return t.panelVisible ? (t.setPanelVisible(!1), f.close()) : l.executeCommand(w.id), !0;
-    l.executeCommand(w.id);
-    const g = 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 = "", b = {
-      unitId: g,
+      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,
       subUnitId: m,
       id: I,
       ref: c,
-      dT: Ge(),
-      personId: s.getCurrentUser().userID,
+      dT: Ke(),
+      personId: d.getCurrentUser().userID,
       text: {
         dataStream: `\r
 `
@@ -249,41 +249,41 @@ const w = {
       collapsed: !0,
       threadId: I
     };
-    return h == null || h.blur(), d.startAdd(b), t.setActiveComment({
-      unitId: g,
+    return h == null || h.blur(), s.startAdd(D), t.setActiveComment({
+      unitId: v,
       subUnitId: m,
       commentId: I
     }), !0;
   }
 };
 var at = Object.getOwnPropertyDescriptor, mt = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? at(t, r) : t, o = e.length - 1, s; o >= 0; o--)
-    (s = e[o]) && (i = s(i) || i);
-  return i;
-}, D = (e, t) => (r, n) => t(r, n, e);
+  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);
+  return o;
+}, y = (e, t) => (r, n) => t(r, n, e);
 let V = class extends B {
-  constructor(e, t, r, n, i, o) {
-    super(), this._threadCommentPanelService = e, this._univerInstanceService = t, this._commandService = r, this._docThreadCommentService = n, this._renderManagerService = i, this._threadCommentModel = o, this._initSelectionChange(), this._initActiveCommandChange();
+  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();
   }
   _initSelectionChange() {
     let e;
     this.disposeWithMe(
       this._commandService.onCommandExecuted((t) => {
-        var r, n, i, o;
-        if (t.id === we.id) {
-          const s = t.params, { unitId: d, ranges: l } = s;
-          if (ie(d)) return;
-          const f = this._univerInstanceService.getUnit(d, p.UNIVER_DOC), a = l[0];
+        var r, n, o, i;
+        if (t.id === Ne.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 ((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: g, collapsed: C } = a;
+            const { startOffset: h, endOffset: v, collapsed: C } = 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 >= g - 1) : c = (o = (i = f.getBody()) == null ? void 0 : i.customDecorations) == null ? void 0 : o.find((m) => m.startIndex <= h && m.endIndex >= g - 1), c) {
-              const m = this._threadCommentModel.getComment(d, S, c.id);
-              m && !m.resolved && this._commandService.executeCommand(w.id, {
+            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, {
                 activeComment: {
-                  unitId: d,
+                  unitId: s,
                   subUnitId: S,
                   commentId: c.id
                 }
@@ -293,112 +293,112 @@ let V = class extends B {
           }
           if (!this._threadCommentPanelService.activeCommentId)
             return;
-          this._commandService.executeCommand(oe.id);
+          this._commandService.executeCommand(ie.id);
         }
       })
     );
   }
   _initActiveCommandChange() {
     this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe((e) => {
-      var t, r, n, i;
+      var t, r, n, o;
       if (e) {
-        const o = this._univerInstanceService.getUnit(e.unitId);
-        if (o) {
-          const s = (t = this._renderManagerService.getRenderById(e.unitId)) == null ? void 0 : t.with(He), d = (n = (r = o.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,
+        const i = this._univerInstanceService.getUnit(e.unitId);
+        if (i) {
+          const d = (t = this._renderManagerService.getRenderById(e.unitId)) == null ? void 0 : t.with(He), 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,
             collapsed: !1
           });
         }
       }
-      (!e || e.commentId !== ((i = this._docThreadCommentService.addingComment) == null ? void 0 : i.id)) && this._docThreadCommentService.endAdd();
+      (!e || e.commentId !== ((o = this._docThreadCommentService.addingComment) == null ? void 0 : o.id)) && this._docThreadCommentService.endAdd();
     }));
   }
 };
 V = mt([
-  D(0, _(U)),
-  D(1, A),
-  D(2, M),
-  D(3, _(x)),
-  D(4, F),
-  D(5, _(de))
+  y(0, _(U)),
+  y(1, w),
+  y(2, b),
+  y(3, _(T)),
+  y(4, F),
+  y(5, _(se))
 ], V);
-var v = function() {
-  return v = Object.assign || function(e) {
+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 i in t) Object.prototype.hasOwnProperty.call(t, i) && (e[i] = t[i]);
+      for (var o in t) Object.prototype.hasOwnProperty.call(t, o) && (e[o] = t[o]);
     }
     return e;
-  }, v.apply(this, arguments);
+  }, 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 i = 0, n = Object.getOwnPropertySymbols(e); i < n.length; i++)
-      t.indexOf(n[i]) < 0 && Object.prototype.propertyIsEnumerable.call(e, n[i]) && (r[n[i]] = e[n[i]]);
+    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;
-}, ve = ue(function(e, t) {
-  var r = e.icon, n = e.id, i = e.className, o = e.extend, s = lt(e, ["icon", "id", "className", "extend"]), d = "univerjs-icon univerjs-icon-".concat(n, " ").concat(i || "").trim(), l = nt("_".concat(ht()));
-  return _e(r, "".concat(n), { defIds: r.defIds, idSuffix: l.current }, v({ ref: t, className: d }, s), o);
+}, 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, i) {
-  return fe(e.tag, v(v({ key: t }, ut(e, r, i)), n), (ft(e, r).children || []).map(function(o, s) {
-    return _e(o, "".concat(t, "-").concat(e.tag, "-").concat(s), r, void 0, 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);
   }));
 }
 function ut(e, t, r) {
-  var n = v({}, 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(o) {
-    var s = o[0], d = o[1];
-    s === "mask" && typeof d == "string" && (n[s] = d.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
+  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, ")")));
   });
-  var i = t.defIds;
-  return !i || i.length === 0 || (e.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + t.idSuffix), Object.entries(n).forEach(function(o) {
-    var s = o[0], d = o[1];
-    typeof d == "string" && (n[s] = d.replace(/url\(#(.*)\)/, "url(#$1".concat(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, ")")));
   })), 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) ? v(v({}, e), { children: e.children.map(function(i) {
-    return typeof i.attrs.id == "string" && n && n.indexOf(i.attrs.id) > -1 ? v(v({}, i), { attrs: v(v({}, i.attrs), { id: i.attrs.id + t.idSuffix }) }) : i;
+  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 ht() {
   return Math.random().toString(36).substring(2, 8);
 }
-ve.displayName = "UniverIcon";
-var Ct = { tag: "svg", attrs: { 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.13521 5.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.13521 8.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.13521 11.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(ve, Object.assign({}, e, {
-    id: "comment-single",
+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, {
+    id: "comment-icon",
     ref: t,
     icon: Ct
   }));
 });
-pe.displayName = "CommentSingle";
-const gt = {
-  [ke.OTHERS]: {
+pe.displayName = "CommentIcon";
+const vt = {
+  [Je.MEDIA]: {
     [Q.id]: {
-      order: 1,
+      order: 3,
       menuItemFactory: ct
     }
   },
-  [Ze.MAIN_AREA]: {
-    [ze.DATA]: {
+  [Ge.MAIN_AREA]: {
+    [ke.DATA]: {
       [W.id]: {
         order: 1,
-        menuItemFactory: dt
+        menuItemFactory: st
       }
     }
   }
 };
-var vt = Object.getOwnPropertyDescriptor, _t = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? vt(t, r) : t, o = e.length - 1, s; o >= 0; o--)
-    (s = e[o]) && (i = s(i) || i);
-  return i;
-}, k = (e, t) => (r, n) => t(r, n, e);
+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);
+  return o;
+}, J = (e, t) => (r, n) => t(r, n, e);
 let $ = class extends B {
   constructor(e, t, r) {
     super(), this._commandService = e, this._menuManagerService = t, this._componentManager = r, this._initCommands(), this._initMenus(), this._initComponents();
@@ -407,7 +407,7 @@ let $ = class extends B {
     [
       he,
       Ce,
-      w,
+      N,
       W,
       Q
     ].forEach((e) => {
@@ -415,27 +415,32 @@ let $ = class extends B {
     });
   }
   _initMenus() {
-    this._menuManagerService.mergeMenu(gt);
+    this._menuManagerService.mergeMenu(vt);
   }
   _initComponents() {
-    [T].forEach((e) => {
-      this.disposeWithMe(this._componentManager.register(e.componentKey, e));
-    }), this.disposeWithMe(this._componentManager.register("CommentSingle", pe));
+    [
+      [M.componentKey, M],
+      ["CommentIcon", pe]
+    ].forEach(([e, t]) => {
+      this.disposeWithMe(
+        this._componentManager.register(e, t)
+      );
+    });
   }
 };
 $ = _t([
-  k(0, M),
-  k(1, Je),
-  k(2, _(qe))
+  J(0, b),
+  J(1, qe),
+  J(2, _(Ye))
 ], $);
 var pt = Object.getOwnPropertyDescriptor, It = (e, t, r, n) => {
-  for (var i = n > 1 ? void 0 : n ? pt(t, r) : t, o = e.length - 1, s; o >= 0; o--)
-    (s = e[o]) && (i = s(i) || i);
-  return i;
-}, y = (e, t) => (r, n) => t(r, n, e);
-let Y = class extends B {
-  constructor(e, t, r, n, i, o, s) {
-    super(), this._context = e, this._docInterceptorService = t, this._threadCommentPanelService = r, this._docRenderController = n, this._univerInstanceService = i, this._threadCommentModel = o, this._commandService = s, this._interceptorViewModel(), this._initReRender(), this._initSyncComments();
+  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);
+  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();
   }
   _initReRender() {
     this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe((e) => {
@@ -455,40 +460,40 @@ let Y = class extends B {
       handler: (e, t, r) => {
         if (!e)
           return r(e);
-        const { unitId: n, index: i, customDecorations: o } = t, s = this._threadCommentPanelService.activeCommentId, { commentId: d, unitId: l } = s || {}, f = o.find((C) => C.id === d), a = this._threadCommentModel.getComment(n, S, e.id);
+        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);
         if (!a)
           return r({
             ...e,
             show: !1
           });
-        const h = f && i >= f.startIndex && i <= f.endIndex, g = l === n && e.id === d;
+        const h = f && o >= f.startIndex && o <= f.endIndex, v = l === n && e.id === s;
         return r({
           ...e,
-          active: g || h,
+          active: v || h,
           show: !a.resolved
         });
       }
     });
   }
   _initSyncComments() {
-    var i, o, s;
-    const e = this._context.unit.getUnitId(), t = S, r = (s = (o = (i = this._context.unit.getBody()) == null ? void 0 : i.customDecorations) == null ? void 0 : o.filter((d) => d.type === q.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 });
+    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);
     let n = r.sort();
-    this.disposeWithMe(this._commandService.onCommandExecuted((d) => {
+    this.disposeWithMe(this._commandService.onCommandExecuted((s) => {
       var l, f, a;
-      if (d.id === se.id) {
-        if (d.params.unitId !== this._context.unit.getUnitId())
+      if (s.id === de.id) {
+        if (s.params.unitId !== this._context.unit.getUnitId())
           return;
-        const g = (a = (f = (l = this._context.unit.getBody()) == null ? void 0 : l.customDecorations) == null ? void 0 : f.filter((c) => c.type === q.COMMENT).map((c) => c.id)) != null ? a : [], C = g.sort();
+        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(), b = /* @__PURE__ */ new Set();
-          g.forEach((u) => {
+          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);
           }), n.forEach((u) => {
-            m.has(u) || b.add(u);
+            m.has(u) || D.add(u);
           }), n = C, I.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]);
@@ -497,34 +502,34 @@ let Y = class extends B {
     }));
   }
 };
-Y = It([
-  y(1, _(Ve)),
-  y(2, _(U)),
-  y(3, _(Le)),
-  y(4, A),
-  y(5, _(de)),
-  y(6, M)
-], Y);
+z = It([
+  x(1, _(Ve)),
+  x(2, _(U)),
+  x(3, _(Le)),
+  x(4, w),
+  x(5, _(se)),
+  x(6, b)
+], 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 i = n > 1 ? void 0 : n ? Ot(t, r) : t, o = e.length - 1, s; o >= 0; o--)
-    (s = e[o]) && (i = s(i) || i);
-  return i;
-}, J = (e, t) => (r, n) => t(r, n, e), Ie = (e, t, r) => Mt(e, typeof t != "symbol" ? t + "" : t, r);
+  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);
+  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 = ee, t, r, n) {
     super(), this._config = e, this._injector = t, this._renderManagerSrv = r, this._configService = n;
-    const { menu: i, ...o } = Re(
+    const { menu: o, ...i } = Re(
       {},
       ee,
       this._config
     );
-    i && this._configService.setConfig("menu", i, { merge: !0 }), this._configService.setConfig(it, o);
+    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(ot, i);
   }
   onStarting() {
     [
       [$],
       [V],
-      [x]
+      [T]
     ].forEach((e) => {
       this._injector.add(e);
     });
@@ -533,7 +538,7 @@ let j = class extends Ue {
     this._initRenderModule(), this._injector.get(V), this._injector.get($);
   }
   _initRenderModule() {
-    [Y].forEach((e) => {
+    [z].forEach((e) => {
       this._renderManagerSrv.registerRenderModule(p.UNIVER_DOC, e);
     });
   }
@@ -541,15 +546,15 @@ let j = class extends Ue {
 Ie(j, "pluginName", rt);
 Ie(j, "type", p.UNIVER_DOC);
 j = bt([
-  xe(Ae),
-  J(1, _(re)),
-  J(2, F),
-  J(3, Te)
+  xe(we),
+  q(1, _(re)),
+  q(2, F),
+  q(3, Te)
 ], j);
 export {
   he as AddDocCommentComment,
   Ce as DeleteDocCommentComment,
-  w as ShowCommentPanelOperation,
+  N as ShowCommentPanelOperation,
   W as StartAddCommentOperation,
   j as UniverDocsThreadCommentUIPlugin
 };