@univerjs/sheets-thread-comment 0.1.16 → 0.2.0

package/lib/es/index.js

@@ -1,50 +1,50 @@
-var Re = Object.defineProperty;
-var $e = (t, e, n) => e in t ? Re(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
-var E = (t, e, n) => $e(t, typeof e != "symbol" ? e + "" : e, n);
-import { Inject as p, Injector as de } from "@wendellhu/redi";
-import { Inject as vn, Injector as _n } from "@wendellhu/redi";
-import { Disposable as U, DisposableCollection as Ne, IUniverInstanceService as R, Tools as me, UniverInstanceType as b, CommandType as xe, ICommandService as ee, OnLifecycle as x, LifecycleStages as D, LocaleService as De, Range as je, DependentOn as Ae, Plugin as Ve } from "@univerjs/core";
-import { ICommandService as Cn, Plugin as Sn, UniverInstanceType as In } from "@univerjs/core";
-import { ThreadCommentTree as He, ThreadCommentPanelService as te, ThreadCommentPanel as Le, ToggleSheetCommentPanelOperation as Be, SetActiveCommentOperation as oe, THREAD_COMMENT_PANEL as Fe, UniverThreadCommentUIPlugin as ke } from "@univerjs/thread-comment-ui";
-import { IThreadCommentMentionDataService as Pn, UniverThreadCommentUIPlugin as Tn } from "@univerjs/thread-comment-ui";
-import { IZenZoneService as We, useObservable as W, KeyCode as Ze, MetaKeys as ie, MenuItemType as he, MenuPosition as pe, getMenuHiddenObservable as le, MenuGroup as ze, ComponentManager as Ge, IMenuService as Ke, IShortcutService as Ye } from "@univerjs/ui";
-import { SelectionManagerService as qe, getSheetCommandTarget as Xe, WorkbookCommentPermission as K, WorksheetViewPermission as Y, RangeProtectionPermissionViewPoint as q, SetSelectionsOperation as Je, SelectionMoveType as Qe, SetWorksheetActiveOperation as et, SheetInterceptorService as ve, INTERCEPTOR_POINT as tt, RemoveSheetCommand as nt } from "@univerjs/sheets";
-import { singleReferenceToGrid as Z, serializeRange as rt } from "@univerjs/engine-formula";
-import { ThreadCommentModel as _e, DeleteCommentMutation as z, AddCommentMutation as Q } from "@univerjs/thread-comment";
-import { IThreadCommentDataSourceService as wn } from "@univerjs/thread-comment";
-import { SheetCanvasPopManagerService as ot, IMarkSelectionService as it, whenSheetEditorFocused as st, getCurrentRangeDisable$ as fe, SheetPermissionInterceptorBaseController as Ce, ScrollToRangeOperation as at, SheetSkeletonManagerService as ct, ISheetClipboardService as ut, COPY_TYPE as dt, HoverManagerService as mt } from "@univerjs/sheets-ui";
-import { SheetsThreadCommentModel as $, UniverSheetsThreadCommentBasePlugin as ht } from "@univerjs/sheets-thread-comment-base";
-import { SheetsThreadCommentModel as yn } from "@univerjs/sheets-thread-comment-base";
+var De = Object.defineProperty;
+var xe = (t, e, n) => e in t ? De(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
+var U = (t, e, n) => xe(t, typeof e != "symbol" ? e + "" : e, n);
+import { Inject as p, Injector as he } from "@wendellhu/redi";
+import { Inject as Cn, Injector as fn } from "@wendellhu/redi";
+import { Disposable as R, DisposableCollection as Ae, IUniverInstanceService as $, Tools as pe, UniverInstanceType as b, CommandType as je, ICommandService as re, OnLifecycle as j, LifecycleStages as V, Range as Ve, DependentOn as He, Plugin as Be } from "@univerjs/core";
+import { ICommandService as In, Plugin as gn, UniverInstanceType as Pn } from "@univerjs/core";
+import { ThreadCommentTree as Le, ThreadCommentPanelService as oe, ThreadCommentPanel as Fe, ToggleSheetCommentPanelOperation as ke, SetActiveCommentOperation as ae, THREAD_COMMENT_PANEL as We, UniverThreadCommentUIPlugin as Ze } from "@univerjs/thread-comment-ui";
+import { IThreadCommentMentionDataService as bn, UniverThreadCommentUIPlugin as Mn } from "@univerjs/thread-comment-ui";
+import { IZenZoneService as ze, useObservable as z, KeyCode as Ge, MetaKeys as ce, MenuItemType as le, MenuPosition as ve, getMenuHiddenObservable as _e, MenuGroup as Ke, ComponentManager as Ye, IMenuService as qe, IShortcutService as Xe } from "@univerjs/ui";
+import { SelectionManagerService as Je, getSheetCommandTarget as Qe, WorkbookCommentPermission as q, WorksheetViewPermission as X, RangeProtectionPermissionViewPoint as J, SetSelectionsOperation as et, SelectionMoveType as tt, SetWorksheetActiveOperation as nt, SheetInterceptorService as Ce, INTERCEPTOR_POINT as rt, RemoveSheetCommand as ot } from "@univerjs/sheets";
+import { singleReferenceToGrid as G, serializeRange as it } from "@univerjs/engine-formula";
+import { ThreadCommentModel as fe, DeleteCommentMutation as K, IThreadCommentDataSourceService as Se, AddCommentMutation as ne } from "@univerjs/thread-comment";
+import { IThreadCommentDataSourceService as yn } from "@univerjs/thread-comment";
+import { SheetCanvasPopManagerService as st, IMarkSelectionService as at, whenSheetEditorFocused as ct, getCurrentRangeDisable$ as Ie, SheetPermissionInterceptorBaseController as ge, ScrollToRangeOperation as ut, SheetSkeletonManagerService as dt, ISheetClipboardService as mt, COPY_TYPE as ht, HoverManagerService as pt } from "@univerjs/sheets-ui";
+import { SheetsThreadCommentModel as N, UniverSheetsThreadCommentBasePlugin as lt } from "@univerjs/sheets-thread-comment-base";
+import { SheetsThreadCommentModel as En } from "@univerjs/sheets-thread-comment-base";
 import { useDependency as M } from "@wendellhu/redi/react-bindings";
-import Se, { forwardRef as Ie, useRef as ge, createElement as Pe, useMemo as pt, useCallback as se, useEffect as lt } from "react";
-import { BehaviorSubject as vt, map as _t, debounceTime as ft } from "rxjs";
-import { IRenderManagerService as Ct } from "@univerjs/engine-render";
-var f = function() {
-  return f = Object.assign || function(t) {
+import Pe, { forwardRef as Te, useRef as be, createElement as Me, useMemo as vt, useCallback as ue, useEffect as _t } from "react";
+import { BehaviorSubject as Ct, map as ft, debounceTime as St } from "rxjs";
+import { IRenderManagerService as It } from "@univerjs/engine-render";
+var I = function() {
+  return I = Object.assign || function(t) {
     for (var e, n = 1, r = arguments.length; n < r; n++) {
       e = arguments[n];
       for (var o in e) Object.prototype.hasOwnProperty.call(e, o) && (t[o] = e[o]);
     }
     return t;
-  }, f.apply(this, arguments);
-}, St = function(t, e) {
+  }, I.apply(this, arguments);
+}, gt = function(t, e) {
   var n = {};
   for (var r in t) Object.prototype.hasOwnProperty.call(t, r) && e.indexOf(r) < 0 && (n[r] = t[r]);
   if (t != null && typeof Object.getOwnPropertySymbols == "function")
     for (var o = 0, r = Object.getOwnPropertySymbols(t); o < r.length; o++)
       e.indexOf(r[o]) < 0 && Object.prototype.propertyIsEnumerable.call(t, r[o]) && (n[r[o]] = t[r[o]]);
   return n;
-}, Te = Ie(function(t, e) {
-  var n = t.icon, r = t.id, o = t.className, i = t.extend, s = St(t, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(r, " ").concat(o || "").trim(), d = ge("_".concat(Pt()));
-  return be(n, "".concat(r), { defIds: n.defIds, idSuffix: d.current }, f({ ref: e, className: a }, s), i);
+}, we = Te(function(t, e) {
+  var n = t.icon, r = t.id, o = t.className, i = t.extend, s = gt(t, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(r, " ").concat(o || "").trim(), u = be("_".concat(bt()));
+  return ye(n, "".concat(r), { defIds: n.defIds, idSuffix: u.current }, I({ ref: e, className: a }, s), i);
 });
-function be(t, e, n, r, o) {
-  return Pe(t.tag, f(f({ key: e }, It(t, n, o)), r), (gt(t, n).children || []).map(function(i, s) {
-    return be(i, "".concat(e, "-").concat(t.tag, "-").concat(s), n, void 0, o);
+function ye(t, e, n, r, o) {
+  return Me(t.tag, I(I({ key: e }, Pt(t, n, o)), r), (Tt(t, n).children || []).map(function(i, s) {
+    return ye(i, "".concat(e, "-").concat(t.tag, "-").concat(s), n, void 0, o);
   }));
 }
-function It(t, e, n) {
-  var r = f({}, t.attrs);
+function Pt(t, e, n) {
+  var r = I({}, t.attrs);
   n != null && n.colorChannel1 && r.fill === "colorChannel1" && (r.fill = n.colorChannel1);
   var o = e.defIds;
   return !o || o.length === 0 || (t.tag === "use" && r["xlink:href"] && (r["xlink:href"] = r["xlink:href"] + e.idSuffix), Object.entries(r).forEach(function(i) {
@@ -52,37 +52,37 @@ function It(t, e, n) {
     typeof a == "string" && (r[s] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), r;
 }
-function gt(t, e) {
+function Tt(t, e) {
   var n, r = e.defIds;
-  return !r || r.length === 0 ? t : t.tag === "defs" && (!((n = t.children) === null || n === void 0) && n.length) ? f(f({}, t), { children: t.children.map(function(o) {
-    return typeof o.attrs.id == "string" && r && r.indexOf(o.attrs.id) > -1 ? f(f({}, o), { attrs: f(f({}, o.attrs), { id: o.attrs.id + e.idSuffix }) }) : o;
+  return !r || r.length === 0 ? t : t.tag === "defs" && (!((n = t.children) === null || n === void 0) && n.length) ? I(I({}, t), { children: t.children.map(function(o) {
+    return typeof o.attrs.id == "string" && r && r.indexOf(o.attrs.id) > -1 ? I(I({}, o), { attrs: I(I({}, o.attrs), { id: o.attrs.id + e.idSuffix }) }) : o;
   }) }) : t;
 }
-function Pt() {
+function bt() {
   return Math.random().toString(36).substring(2, 8);
 }
-Te.displayName = "UniverIcon";
-var Tt = { 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" } }] }, we = Ie(function(t, e) {
-  return Pe(Te, Object.assign({}, t, {
+we.displayName = "UniverIcon";
+var Mt = { 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" } }] }, Oe = Te(function(t, e) {
+  return Me(we, Object.assign({}, t, {
     id: "comment-single",
     ref: e,
-    icon: Tt
+    icon: Mt
   }));
 });
-we.displayName = "CommentSingle";
-const Me = "univer.sheet.thread-comment-modal", ne = "comment-single", ye = "SHEET_THREAD_COMMENT";
-var bt = Object.defineProperty, wt = Object.getOwnPropertyDescriptor, Mt = (t, e, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? wt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+Oe.displayName = "CommentSingle";
+const Ee = "univer.sheet.thread-comment-modal", ie = "comment-single", Ue = "SHEET_THREAD_COMMENT";
+var wt = Object.defineProperty, yt = Object.getOwnPropertyDescriptor, Ot = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? yt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
     (s = t[i]) && (o = (r ? s(e, n, o) : s(o)) || o);
-  return r && o && bt(e, n, o), o;
-}, ae = (t, e) => (n, r) => e(n, r, t);
-let y = class extends U {
+  return r && o && wt(e, n, o), o;
+}, de = (t, e) => (n, r) => e(n, r, t);
+let y = class extends R {
   constructor(e, n) {
     super();
-    E(this, "_lastPopup", null);
-    E(this, "_activePopup");
-    E(this, "_activePopup$", new vt(null));
-    E(this, "activePopup$", this._activePopup$.asObservable());
+    U(this, "_lastPopup", null);
+    U(this, "_activePopup");
+    U(this, "_activePopup$", new Ct(null));
+    U(this, "activePopup$", this._activePopup$.asObservable());
     this._canvasPopupManagerService = e, this._zenZoneService = n, this._initZenVisible();
   }
   get activePopup() {
@@ -107,7 +107,7 @@ let y = class extends U {
       r,
       o,
       {
-        componentKey: Me,
+        componentKey: Ee,
         onClickOutside: () => {
           this.hidePopup();
         },
@@ -120,12 +120,12 @@ let y = class extends U {
     );
     if (!a)
       throw new Error("[SheetsThreadCommentPopupService]: cannot show popup!");
-    const d = new Ne();
-    d.add(a), d.add({
+    const u = new Ae();
+    u.add(a), u.add({
       dispose: () => {
         n == null || n();
       }
-    }), this._lastPopup = d;
+    }), this._lastPopup = u;
   }
   hidePopup() {
     this._activePopup && (this._lastPopup && this._lastPopup.dispose(), this._lastPopup = null, this._activePopup = null, this._activePopup$.next(null));
@@ -137,22 +137,22 @@ let y = class extends U {
     }, this._activePopup$.next(this._activePopup));
   }
 };
-y = Mt([
-  ae(0, p(ot)),
-  ae(1, We)
+y = Ot([
+  de(0, p(st)),
+  de(1, ze)
 ], y);
-const yt = () => {
-  const t = M(R), e = M(y), n = W(e.activePopup$), r = M($);
-  if (W(r.commentUpdate$), !n)
+const Et = () => {
+  const t = M($), e = M(y), n = z(e.activePopup$), r = M(N);
+  if (z(r.commentUpdate$), !n)
     return null;
-  const { row: o, col: i, unitId: s, subUnitId: a, trigger: d } = n, c = r.getByLocation(s, a, o, i), h = `${me.chatAtABC(i)}${o + 1}`, u = () => {
+  const { row: o, col: i, unitId: s, subUnitId: a, trigger: u } = n, c = r.getByLocation(s, a, o, i), m = `${pe.chatAtABC(i)}${o + 1}`, h = () => {
     e.hidePopup();
-  }, g = (C) => {
-    var l, P, O;
-    return (O = (P = (l = t.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : l.getSheetBySheetId(C)) == null ? void 0 : P.getName()) != null ? O : "";
+  }, l = (C) => {
+    var _, P, O;
+    return (O = (P = (_ = t.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : _.getSheetBySheetId(C)) == null ? void 0 : P.getName()) != null ? O : "";
   };
-  return /* @__PURE__ */ Se.createElement(
-    He,
+  return /* @__PURE__ */ Pe.createElement(
+    Le,
     {
       onClick: () => {
         e.persistPopup();
@@ -162,62 +162,67 @@ const yt = () => {
       unitId: s,
       subUnitId: a,
       type: b.UNIVER_SHEET,
-      refStr: h,
-      onClose: u,
-      getSubUnitName: g,
-      autoFocus: d === "context-menu"
+      refStr: m,
+      onClose: h,
+      getSubUnitName: l,
+      autoFocus: u === "context-menu"
     }
   );
-}, X = {
-  type: xe.OPERATION,
+}, Q = {
+  type: je.OPERATION,
   id: "sheets.operation.show-comment-modal",
   handler(t) {
     var P;
-    const e = t.get(qe), n = t.get(R), r = t.get(y), o = t.get(te), i = (P = e.getFirst()) == null ? void 0 : P.primary, s = e.getCurrent(), a = t.get($);
+    const e = t.get(Je), n = t.get($), r = t.get(y), o = t.get(oe), i = (P = e.getFirst()) == null ? void 0 : P.primary, s = e.getCurrent(), a = t.get(N);
     if (!s || !i)
       return !1;
-    const { unitId: d, sheetId: c } = s, h = Xe(n, { unitId: d, subUnitId: c });
-    if (!h)
+    const { unitId: u, sheetId: c } = s, m = Qe(n, { unitId: u, subUnitId: c });
+    if (!m)
       return !1;
-    const { workbook: u, worksheet: g } = h, C = {
-      workbook: u,
-      worksheet: g,
-      unitId: d,
+    const { workbook: h, worksheet: l } = m, C = {
+      workbook: h,
+      worksheet: l,
+      unitId: u,
       subUnitId: c,
       row: i.startRow,
       col: i.startColumn
     };
     r.showPopup(C);
-    const l = a.getByLocation(d, c, i.startRow, i.startColumn);
-    return l && o.setActiveComment({
-      unitId: d,
+    const _ = a.getByLocation(u, c, i.startRow, i.startColumn);
+    return _ && o.setActiveComment({
+      unitId: u,
       subUnitId: c,
-      commentId: l,
+      commentId: _,
       trigger: "context-menu"
     }), !0;
   }
-}, Ot = () => {
-  var _;
-  const t = M(it), e = M(R), n = M(_e), r = M(y), o = e.getCurrentUnitForType(b.UNIVER_SHEET);
+}, Ut = () => {
+  var f;
+  const t = M(at), e = M($), n = M(fe), r = M(y), o = e.getCurrentUnitForType(b.UNIVER_SHEET);
   if (!o)
     return null;
-  const i = o.getUnitId(), s = M(ee), a = pt(() => o.activeSheet$.pipe(_t((m) => m == null ? void 0 : m.getSheetId())), [o.activeSheet$]), d = W(a, (_ = o.getActiveSheet()) == null ? void 0 : _.getSheetId()), c = ge(), h = M(te), u = W(h.activeCommentId$), g = se((m) => {
-    const v = o.getSheets(), w = {};
-    return v.forEach((S, T) => {
-      w[S.getSheetId()] = T;
-    }), m.map((S) => {
-      var re;
-      const T = Z(S.ref), Ue = [(re = w[S.subUnitId]) != null ? re : 0, T.row, T.column];
-      return { ...S, p: Ue };
-    }).sort((S, T) => S.p[0] === T.p[0] ? S.p[1] === T.p[1] ? S.p[2] - T.p[2] : S.p[1] - T.p[1] : S.p[0] - T.p[0]);
-  }, [o]), C = se((m) => {
-    if (m.unitId === i && m.subUnitId === d && !m.resolved) {
-      const { row: v, column: w } = Z(m.ref);
-      if (!Number.isNaN(v) && !Number.isNaN(w))
+  const i = o.getUnitId(), s = M(re), a = vt(() => o.activeSheet$.pipe(ft((d) => d == null ? void 0 : d.getSheetId())), [o.activeSheet$]), u = z(a, (f = o.getActiveSheet()) == null ? void 0 : f.getSheetId()), c = be(), m = M(oe), h = z(m.activeCommentId$), l = ue((d) => {
+    const v = o.getSheets(), S = {};
+    v.forEach((E, g) => {
+      S[E.getSheetId()] = g;
+    });
+    const x = (E) => E.map((g) => {
+      var se;
+      const w = G(g.ref), Ne = [(se = S[g.subUnitId]) != null ? se : 0, w.row, w.column];
+      return { ...g, p: Ne };
+    }).sort((g, w) => g.p[0] === w.p[0] ? g.p[1] === w.p[1] ? g.p[2] - w.p[2] : g.p[1] - w.p[1] : g.p[0] - w.p[0]);
+    return [
+      ...x(d.filter((E) => !E.resolved)),
+      ...x(d.filter((E) => E.resolved))
+    ];
+  }, [o]), C = ue((d) => {
+    if (d.unitId === i && d.subUnitId === u && !d.resolved) {
+      const { row: v, column: S } = G(d.ref);
+      if (!Number.isNaN(v) && !Number.isNaN(S))
         return t.addShape({
           range: {
-            startColumn: w,
-            endColumn: w,
+            startColumn: S,
+            endColumn: S,
             startRow: v,
             endRow: v
           },
@@ -231,104 +236,105 @@ const yt = () => {
           primary: null
         });
     }
-  }, [t, d, i]), l = (m) => {
-    var v, w;
-    return (w = (v = o.getSheetBySheetId(m)) == null ? void 0 : v.getName()) != null ? w : "";
+  }, [t, u, i]), _ = (d) => {
+    var v, S;
+    return (S = (v = o.getSheetBySheetId(d)) == null ? void 0 : v.getName()) != null ? S : "";
   }, P = () => {
-    s.executeCommand(X.id);
-  }, O = () => {
-    r.hidePopup();
-  }, j = (m) => {
-    u && u.unitId === m.unitId && u.subUnitId === m.subUnitId && u.commentId === m.id || (c.current && (t.removeShape(c.current), c.current = null), c.current = C(m));
-  }, A = () => {
+    s.executeCommand(Q.id);
+  }, O = (d) => {
+    h && h.unitId === d.unitId && h.subUnitId === d.subUnitId && h.commentId === d.id || (c.current && (t.removeShape(c.current), c.current = null), c.current = C(d));
+  }, D = () => {
     c.current && (t.removeShape(c.current), c.current = null);
+  }, ee = (d, v) => {
+    v && r.hidePopup();
   };
-  return lt(() => {
-    if (!u)
+  return _t(() => {
+    if (!h)
       return;
-    const m = n.getComment(u.unitId, u.subUnitId, u.commentId);
-    if (!m)
+    const d = n.getComment(h.unitId, h.subUnitId, h.commentId);
+    if (!d)
       return;
-    const v = C(m);
+    const v = C(d);
     return () => {
       v && t.removeShape(v);
     };
-  }, [C, u, n, t]), /* @__PURE__ */ Se.createElement(
-    Le,
+  }, [C, h, n, t]), /* @__PURE__ */ Pe.createElement(
+    Fe,
     {
       unitId: i,
       subUnitId$: a,
       type: b.UNIVER_SHEET,
       onAdd: P,
-      getSubUnitName: l,
-      onResolve: O,
-      sortComments: g,
-      onItemEnter: j,
-      onItemLeave: A
+      getSubUnitName: _,
+      onResolve: ee,
+      sortComments: l,
+      onItemEnter: O,
+      onItemLeave: D,
+      onDeleteComment: () => (D(), !0)
     }
   );
-}, Et = (t) => ({
-  id: X.id,
-  type: he.BUTTON,
-  positions: [pe.CONTEXT_MENU],
-  icon: ne,
+}, Rt = (t) => ({
+  id: Q.id,
+  type: le.BUTTON,
+  positions: [ve.CONTEXT_MENU],
+  icon: ie,
   title: "sheetThreadComment.menu.addComment",
-  hidden$: le(t, b.UNIVER_SHEET),
-  disabled$: fe(t, {
-    workbookTypes: [K],
-    worksheetTypes: [Y],
-    rangeTypes: [q]
+  hidden$: _e(t, b.UNIVER_SHEET),
+  disabled$: Ie(t, {
+    workbookTypes: [q],
+    worksheetTypes: [X],
+    rangeTypes: [J]
   })
-}), Ut = (t) => ({
-  id: Be.id,
-  type: he.BUTTON,
-  icon: ne,
+}), $t = (t) => ({
+  id: ke.id,
+  type: le.BUTTON,
+  icon: ie,
   tooltip: "sheetThreadComment.menu.commentManagement",
-  positions: pe.TOOLBAR_START,
-  group: ze.TOOLBAR_OTHERS,
-  disabled$: fe(t, {
-    workbookTypes: [K],
-    worksheetTypes: [Y],
-    rangeTypes: [q]
+  positions: ve.TOOLBAR_START,
+  group: Ke.TOOLBAR_OTHERS,
+  disabled$: Ie(t, {
+    workbookTypes: [q],
+    worksheetTypes: [X],
+    rangeTypes: [J]
   }),
-  hidden$: le(t, b.UNIVER_SHEET)
-}), Rt = {
-  id: X.id,
-  binding: Ze.M | ie.CTRL_COMMAND | ie.ALT,
-  preconditions: st
+  hidden$: _e(t, b.UNIVER_SHEET)
+}), Nt = {
+  id: Q.id,
+  binding: Ge.M | ce.CTRL_COMMAND | ce.ALT,
+  preconditions: ct
 };
-var $t = Object.defineProperty, Nt = Object.getOwnPropertyDescriptor, xt = (t, e, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Nt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+var Dt = Object.defineProperty, xt = Object.getOwnPropertyDescriptor, At = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? xt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
     (s = t[i]) && (o = (r ? s(e, n, o) : s(o)) || o);
-  return r && o && $t(e, n, o), o;
-}, I = (t, e) => (n, r) => e(n, r, t);
-const Dt = {};
-let N = class extends U {
-  constructor(t, e, n, r, o, i, s, a, d, c, h, u) {
-    super(), this._config = t, this._menuService = e, this._injector = n, this._componentManager = r, this._localeService = o, this._commandService = i, this._sheetsThreadCommentPopupService = s, this._sheetsThreadCommentModel = a, this._threadCommentPanelService = d, this._shortcutService = c, this._univerInstanceService = h, this._sheetPermissionInterceptorBaseController = u, this._initMenu(), this._initShortcut(), this._initComponent(), this._initCommandListener(), this._initPanelListener();
+  return r && o && Dt(e, n, o), o;
+}, T = (t, e) => (n, r) => e(n, r, t);
+const jt = {};
+let A = class extends R {
+  constructor(t, e, n, r, o, i, s, a, u, c, m) {
+    super(), this._config = t, this._menuService = e, this._injector = n, this._componentManager = r, this._commandService = o, this._sheetsThreadCommentPopupService = i, this._sheetsThreadCommentModel = s, this._threadCommentPanelService = a, this._shortcutService = u, this._univerInstanceService = c, this._sheetPermissionInterceptorBaseController = m, this._initMenu(), this._initShortcut(), this._initComponent(), this._initCommandListener(), this._initPanelListener();
   }
   _initShortcut() {
-    this._shortcutService.registerShortcut(Rt);
+    this._shortcutService.registerShortcut(Nt);
   }
   _initCommandListener() {
     this._commandService.onCommandExecuted((t) => {
-      if (t.id === Je.id) {
+      if (t.id === et.id) {
         const e = t.params, { unitId: n, subUnitId: r, selections: o, type: i } = e;
-        if ((i === Qe.MOVE_END || i === void 0) && o[0].primary) {
+        if ((i === tt.MOVE_END || i === void 0) && o[0].primary) {
           const s = o[0].primary.actualRow, a = o[0].primary.actualColumn;
           if (!this._sheetsThreadCommentModel.showCommentMarker(n, r, s, a)) {
-            this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(oe.id);
+            this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(ae.id);
             return;
           }
-          const d = this._sheetsThreadCommentModel.getByLocation(n, r, s, a);
-          d && this._commandService.executeCommand(oe.id, {
+          const u = this._sheetsThreadCommentModel.getByLocation(n, r, s, a);
+          u && this._commandService.executeCommand(ae.id, {
             unitId: n,
             subUnitId: r,
-            commentId: d
+            commentId: u
           });
         }
       }
-      if (t.id === z.id) {
+      if (t.id === K.id) {
         const e = t.params, n = this._sheetsThreadCommentPopupService.activePopup;
         if (!n)
           return;
@@ -340,17 +346,17 @@ let N = class extends U {
   _initMenu() {
     const { menu: t = {} } = this._config;
     [
-      Et,
-      Ut
+      Rt,
+      $t
     ].forEach((e) => {
       this._menuService.addMenuItem(e(this._injector), t);
     });
   }
   _initComponent() {
     [
-      [Me, yt],
-      [Fe, Ot],
-      [ne, we]
+      [Ee, Et],
+      [We, Ut],
+      [ie, Oe]
     ].forEach(([t, e]) => {
       this._componentManager.register(t, e);
     });
@@ -365,30 +371,30 @@ let N = class extends U {
         const a = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
         if (!a || a.getUnitId() !== n)
           return;
-        ((e = a.getActiveSheet()) == null ? void 0 : e.getSheetId()) !== r && await this._commandService.executeCommand(et.id, {
+        ((e = a.getActiveSheet()) == null ? void 0 : e.getSheetId()) !== r && await this._commandService.executeCommand(nt.id, {
           unitId: n,
           subUnitId: r
         });
-        const h = Z(s.ref), { row: u, column: g } = h;
+        const m = G(s.ref), { row: h, column: l } = m;
         if (!this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
-          workbookTypes: [K],
-          worksheetTypes: [Y],
-          rangeTypes: [q]
-        }, [{ startRow: u, startColumn: g, endRow: u, endColumn: g }]))
+          workbookTypes: [q],
+          worksheetTypes: [X],
+          rangeTypes: [J]
+        }, [{ startRow: h, startColumn: l, endRow: h, endColumn: l }]))
           return;
-        const l = 5;
-        await this._commandService.executeCommand(at.id, {
+        const _ = 1;
+        await this._commandService.executeCommand(ut.id, {
           range: {
-            startRow: Math.max(h.row - l, 0),
-            endRow: h.row + l,
-            startColumn: Math.max(h.column - l, 0),
-            endColumn: h.column + l
+            startRow: Math.max(m.row - _, 0),
+            endRow: m.row + _,
+            startColumn: Math.max(m.column - _, 0),
+            endColumn: m.column + _
           }
         }), this._sheetsThreadCommentPopupService.showPopup({
           unitId: n,
           subUnitId: r,
-          row: h.row,
-          col: h.column,
+          row: m.row,
+          col: m.column,
           commentId: s.id,
           trigger: i
         });
@@ -397,33 +403,32 @@ let N = class extends U {
     }));
   }
 };
-N = xt([
-  x(D.Starting, N),
-  I(1, Ke),
-  I(2, p(de)),
-  I(3, p(Ge)),
-  I(4, p(De)),
-  I(5, ee),
-  I(6, p(y)),
-  I(7, p($)),
-  I(8, p(te)),
-  I(9, Ye),
-  I(10, R),
-  I(11, p(Ce))
-], N);
-var jt = Object.defineProperty, At = Object.getOwnPropertyDescriptor, Vt = (t, e, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? At(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+A = At([
+  j(V.Starting, A),
+  T(1, qe),
+  T(2, p(he)),
+  T(3, p(Ye)),
+  T(4, re),
+  T(5, p(y)),
+  T(6, p(N)),
+  T(7, p(oe)),
+  T(8, Xe),
+  T(9, $),
+  T(10, p(ge))
+], A);
+var Vt = Object.defineProperty, Ht = Object.getOwnPropertyDescriptor, Bt = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Ht(e, n) : e, i = t.length - 1, s; i >= 0; i--)
     (s = t[i]) && (o = (r ? s(e, n, o) : s(o)) || o);
-  return r && o && jt(e, n, o), o;
-}, V = (t, e) => (n, r) => e(n, r, t);
-let L = class extends U {
+  return r && o && Vt(e, n, o), o;
+}, H = (t, e) => (n, r) => e(n, r, t);
+let F = class extends R {
   constructor(t, e, n, r) {
     super(), this._sheetInterceptorService = t, this._sheetsThreadCommentModel = e, this._univerInstanceService = n, this._renderManagerService = r, this._initViewModelIntercept(), this._initSkeletonChange();
   }
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        tt.CELL_CONTENT,
+        rt.CELL_CONTENT,
         {
           handler: (t, e, n) => {
             const { row: r, col: o, unitId: i, subUnitId: s } = e;
@@ -453,46 +458,46 @@ let L = class extends U {
         console.warn("No active sheet found");
         return;
       }
-      const o = this._renderManagerService.getRenderById(n), i = o == null ? void 0 : o.with(ct).getOrCreateSkeleton({ sheetId: r });
+      const o = this._renderManagerService.getRenderById(n), i = o == null ? void 0 : o.with(dt).getOrCreateSkeleton({ sheetId: r });
       i == null || i.makeDirty(!0), i == null || i.calculate(), o && o.mainComponent.makeForceDirty();
     };
-    this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.subscribe(() => {
+    this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.subscribe((e) => {
       t();
     }));
   }
 };
-L = Vt([
-  x(D.Ready, L),
-  V(0, p(ve)),
-  V(1, p($)),
-  V(2, R),
-  V(3, Ct)
-], L);
-var Ht = Object.defineProperty, Lt = Object.getOwnPropertyDescriptor, Bt = (t, e, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Lt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+F = Bt([
+  j(V.Ready, F),
+  H(0, p(Ce)),
+  H(1, p(N)),
+  H(2, $),
+  H(3, It)
+], F);
+var Lt = Object.defineProperty, Ft = Object.getOwnPropertyDescriptor, kt = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Ft(e, n) : e, i = t.length - 1, s; i >= 0; i--)
     (s = t[i]) && (o = (r ? s(e, n, o) : s(o)) || o);
-  return r && o && Ht(e, n, o), o;
-}, ce = (t, e) => (n, r) => e(n, r, t);
-const Ft = (t, e, n) => {
-  const r = Z(t), o = n.row - e.row, i = n.column - e.column, s = {
+  return r && o && Lt(e, n, o), o;
+}, te = (t, e) => (n, r) => e(n, r, t);
+const Wt = (t, e, n) => {
+  const r = G(t), o = n.row - e.row, i = n.column - e.column, s = {
     startColumn: r.column + i,
     startRow: r.row + o,
     endColumn: r.column + i,
     endRow: r.row + o
   };
-  return rt(s);
+  return it(s);
 };
-let B = class extends U {
-  constructor(e, n) {
+let k = class extends R {
+  constructor(e, n, r) {
     super();
-    E(this, "_copyInfo");
-    this._sheetClipboardService = e, this._sheetsThreadCommentModel = n, this._initClipboardHook();
+    U(this, "_copyInfo");
+    this._sheetClipboardService = e, this._sheetsThreadCommentModel = n, this._threadCommentDataSourceService = r, this._initClipboardHook();
   }
   // eslint-disable-next-line max-lines-per-function
   _initClipboardHook() {
     this.disposeWithMe(
       this._sheetClipboardService.addClipboardHook({
-        id: ye,
+        id: Ue,
         onBeforeCopy: (e, n, r) => {
           this._copyInfo = {
             unitId: e,
@@ -502,64 +507,68 @@ let B = class extends U {
         },
         // eslint-disable-next-line max-lines-per-function
         onPasteCells: (e, n, r, o) => {
-          const { unitId: i, subUnitId: s, range: a } = n, d = {
+          const { unitId: i, subUnitId: s, range: a } = n, u = {
             row: a.rows[0],
             column: a.cols[0]
           };
-          if (o.copyType === dt.CUT && this._copyInfo) {
-            const { range: c, unitId: h, subUnitId: u } = this._copyInfo, g = {
+          if (o.copyType === ht.CUT && this._copyInfo) {
+            const { range: c, unitId: m, subUnitId: h } = this._copyInfo, l = {
               row: c.startRow,
               column: c.startColumn
             };
-            if (!(i === h && s === u)) {
+            if (!(i === m && s === h)) {
               const C = [];
-              je.foreach(c, (_, m) => {
-                const v = this._sheetsThreadCommentModel.getCommentWithChildren(h, u, _, m);
-                v && C.push(v);
+              Ve.foreach(c, (f, d) => {
+                const v = this._sheetsThreadCommentModel.getAllByLocation(m, h, f, d);
+                this._threadCommentDataSourceService.syncUpdateMutationToColla ? v.forEach((S) => {
+                  C.push(S);
+                }) : v.forEach(({ children: S, ...x }) => {
+                  x.parentId || C.push(x);
+                });
               });
-              const l = [], P = [], O = [], j = [], A = (_) => {
-                l.unshift({
-                  id: z.id,
+              const _ = [], P = [], O = [], D = [], ee = (f) => {
+                _.unshift({
+                  id: K.id,
                   params: {
-                    unitId: h,
-                    subUnitId: u,
-                    commentId: _.id
+                    unitId: m,
+                    subUnitId: h,
+                    commentId: f.id
                   }
                 }), O.push({
-                  id: Q.id,
+                  id: ne.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
                     comment: {
-                      ..._,
-                      ref: Ft(_.ref, g, d),
+                      ...f,
+                      ref: Wt(f.ref, l, u),
                       unitId: i,
                       subUnitId: s
-                    }
+                    },
+                    sync: !0
                   }
                 }), P.push({
-                  id: Q.id,
+                  id: ne.id,
                   params: {
-                    unitId: h,
-                    subUnitId: u,
-                    comment: _
+                    unitId: m,
+                    subUnitId: h,
+                    comment: f,
+                    sync: !0
                   }
-                }), j.unshift({
-                  id: z.id,
+                }), D.unshift({
+                  id: K.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
-                    commentId: _.id
+                    commentId: f.id
                   }
                 });
               };
-              return C.forEach((_) => {
-                A(_.root), _.children.forEach((m) => {
-                  A(m);
-                });
+              return C.forEach((f) => {
+                ee(f);
               }), {
-                redos: [...l, ...O],
-                undos: [...j, ...P]
+                redos: [..._, ...O],
+                undos: [...D, ...P]
               };
             }
           }
@@ -572,31 +581,32 @@ let B = class extends U {
     );
   }
 };
-B = Bt([
-  x(D.Rendered, B),
-  ce(0, p(ut)),
-  ce(1, p($))
-], B);
-var kt = Object.defineProperty, Wt = Object.getOwnPropertyDescriptor, Zt = (t, e, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Wt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+k = kt([
+  j(V.Rendered, k),
+  te(0, p(mt)),
+  te(1, p(N)),
+  te(2, Se)
+], k);
+var Zt = Object.defineProperty, zt = Object.getOwnPropertyDescriptor, Gt = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? zt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
     (s = t[i]) && (o = (r ? s(e, n, o) : s(o)) || o);
-  return r && o && kt(e, n, o), o;
-}, H = (t, e) => (n, r) => e(n, r, t);
-let F = class extends U {
+  return r && o && Zt(e, n, o), o;
+}, B = (t, e) => (n, r) => e(n, r, t);
+let W = class extends R {
   constructor(t, e, n, r) {
     super(), this._hoverManagerService = t, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = n, this._sheetPermissionInterceptorBaseController = r, this._initHoverEvent();
   }
   _initHoverEvent() {
     this.disposeWithMe(
-      this._hoverManagerService.currentCell$.pipe(ft(100)).subscribe((t) => {
+      this._hoverManagerService.currentCell$.pipe(St(100)).subscribe((t) => {
         const e = this._sheetsThreadCommentPopupService.activePopup;
         if (t && (e && e.temp || !e)) {
           const { location: n } = t, { unitId: r, subUnitId: o, row: i, col: s } = n, a = this._sheetsThreadCommentModel.getByLocation(r, o, i, s);
           if (a) {
             if (!this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
-              workbookTypes: [K],
-              worksheetTypes: [Y],
-              rangeTypes: [q]
+              workbookTypes: [q],
+              worksheetTypes: [X],
+              rangeTypes: [J]
             }, [{ startRow: i, startColumn: s, endRow: i, endColumn: s }]))
               return;
             const c = this._sheetsThreadCommentModel.getComment(r, o, a);
@@ -615,50 +625,54 @@ let F = class extends U {
     );
   }
 };
-F = Zt([
-  x(D.Rendered, F),
-  H(0, p(mt)),
-  H(1, p(y)),
-  H(2, p($)),
-  H(3, p(Ce))
-], F);
-var zt = Object.defineProperty, Gt = Object.getOwnPropertyDescriptor, Kt = (t, e, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Gt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+W = Gt([
+  j(V.Rendered, W),
+  B(0, p(pt)),
+  B(1, p(y)),
+  B(2, p(N)),
+  B(3, p(ge))
+], W);
+var Kt = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, qt = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Yt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
     (s = t[i]) && (o = (r ? s(e, n, o) : s(o)) || o);
-  return r && o && zt(e, n, o), o;
-}, J = (t, e) => (n, r) => e(n, r, t);
-let k = class extends U {
-  constructor(t, e, n) {
-    super(), this._sheetInterceptorService = t, this._univerInstanceService = e, this._threadCommentModel = n, this._initSheetChange();
+  return r && o && Kt(e, n, o), o;
+}, L = (t, e) => (n, r) => e(n, r, t);
+let Z = class extends R {
+  constructor(t, e, n, r) {
+    super(), this._sheetInterceptorService = t, this._univerInstanceService = e, this._threadCommentModel = n, this._threadCommentDataSourceService = r, this._initSheetChange();
   }
   _initSheetChange() {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
         getMutations: (t) => {
           var e;
-          if (t.id === nt.id) {
+          if (t.id === ot.id) {
             const n = t.params, r = n.unitId ? this._univerInstanceService.getUnit(n.unitId) : this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
             if (!r)
               return { redos: [], undos: [] };
             const o = r.getUnitId(), i = n.subUnitId || ((e = r.getActiveSheet()) == null ? void 0 : e.getSheetId());
             if (!i)
               return { redos: [], undos: [] };
-            const { commentMap: s } = this._threadCommentModel.ensureMap(o, i), a = Array.from(Object.keys(s)), d = Array.from(Object.values(s)), c = a.map((u) => ({
-              id: z.id,
+            const { commentMap: s } = this._threadCommentModel.ensureMap(o, i), a = Array.from(Object.values(s)).filter((l) => !l.parentId), u = a.map((l) => l.id), c = this._threadCommentDataSourceService.syncUpdateMutationToColla, m = u.map((l) => ({
+              id: K.id,
               params: {
                 unitId: o,
                 subUnitId: i,
-                commentId: u
+                commentId: l
               }
-            })), h = d.map((u) => ({
-              id: Q.id,
+            })), h = a.map(({ children: l, ...C }) => ({
+              id: ne.id,
               params: {
                 unitId: o,
                 subUnitId: i,
-                comment: u
+                comment: {
+                  ...C,
+                  children: c ? l : void 0
+                },
+                sync: !c
               }
             }));
-            return { redos: c, undos: h };
+            return { redos: m, undos: h };
           }
           return { redos: [], undos: [] };
         }
@@ -666,65 +680,67 @@ let k = class extends U {
     );
   }
 };
-k = Kt([
-  x(D.Ready, k),
-  J(0, p(ve)),
-  J(1, R),
-  J(2, p(_e))
-], k);
-var Oe = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, qt = (t, e, n) => e in t ? Oe(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n, Xt = (t, e, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? Yt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+Z = qt([
+  j(V.Ready, Z),
+  L(0, p(Ce)),
+  L(1, $),
+  L(2, p(fe)),
+  L(3, Se)
+], Z);
+var Re = Object.defineProperty, Xt = Object.getOwnPropertyDescriptor, Jt = (t, e, n) => e in t ? Re(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n, Qt = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Xt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
     (s = t[i]) && (o = (r ? s(e, n, o) : s(o)) || o);
-  return r && o && Oe(e, n, o), o;
-}, ue = (t, e) => (n, r) => e(n, r, t), Ee = (t, e, n) => qt(t, typeof e != "symbol" ? e + "" : e, n);
-let G = class extends Ve {
+  return r && o && Re(e, n, o), o;
+}, me = (t, e) => (n, r) => e(n, r, t), $e = (t, e, n) => Jt(t, typeof e != "symbol" ? e + "" : e, n);
+let Y = class extends Be {
   constructor(e = {}, n, r) {
     super();
-    E(this, "_pluginConfig");
-    this._injector = n, this._commandService = r, this._pluginConfig = me.deepMerge({}, Dt, e);
+    U(this, "_pluginConfig");
+    this._injector = n, this._commandService = r, this._pluginConfig = pe.deepMerge({}, jt, e);
   }
   onStarting(e) {
     [
       [
-        N,
+        A,
         {
-          useFactory: () => this._injector.createInstance(N, this._pluginConfig)
+          useFactory: () => this._injector.createInstance(A, this._pluginConfig)
         }
       ],
-      [L],
-      [B],
       [F],
       [k],
+      [W],
+      [Z],
       [y]
     ].forEach((n) => {
       e.add(n);
-    }), [X].forEach((n) => {
+    }), [Q].forEach((n) => {
       this._commandService.registerCommand(n);
     });
   }
 };
-Ee(G, "pluginName", ye);
-Ee(G, "type", b.UNIVER_SHEET);
-G = Xt([
-  Ae(ke, ht),
-  ue(1, p(de)),
-  ue(2, p(ee))
-], G);
+$e(Y, "pluginName", Ue);
+$e(Y, "type", b.UNIVER_SHEET);
+Y = Qt([
+  He(Ze, lt),
+  me(1, p(he)),
+  me(2, p(re))
+], Y);
 export {
-  Cn as ICommandService,
-  wn as IThreadCommentDataSourceService,
-  Pn as IThreadCommentMentionDataService,
-  vn as Inject,
-  _n as Injector,
-  Sn as Plugin,
-  ye as SHEETS_THREAD_COMMENT,
-  N as SheetsThreadCommentController,
-  B as SheetsThreadCommentCopyPasteController,
-  F as SheetsThreadCommentHoverController,
-  yn as SheetsThreadCommentModel,
+  In as ICommandService,
+  yn as IThreadCommentDataSourceService,
+  bn as IThreadCommentMentionDataService,
+  Cn as Inject,
+  fn as Injector,
+  gn as Plugin,
+  Ue as SHEETS_THREAD_COMMENT,
+  A as SheetsThreadCommentController,
+  k as SheetsThreadCommentCopyPasteController,
+  W as SheetsThreadCommentHoverController,
+  En as SheetsThreadCommentModel,
   y as SheetsThreadCommentPopupService,
-  k as ThreadCommentRemoveSheetsController,
-  In as UniverInstanceType,
-  G as UniverSheetsThreadCommentPlugin,
-  Tn as UniverThreadCommentUIPlugin
+  Q as ShowAddSheetCommentModalOperation,
+  Z as ThreadCommentRemoveSheetsController,
+  Pn as UniverInstanceType,
+  Y as UniverSheetsThreadCommentPlugin,
+  Mn as UniverThreadCommentUIPlugin
 };