@univerjs/sheets-thread-comment-ui 0.5.3 → 0.5.4-experimental.20250114-7c09c35

package/lib/es/index.js

@@ -1,20 +1,20 @@
-var Le = Object.defineProperty;
-var ke = (o, e, n) => e in o ? Le(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n;
+var Be = Object.defineProperty;
+var ke = (o, e, n) => e in o ? Be(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n;
 var E = (o, e, n) => ke(o, typeof e != "symbol" ? e + "" : e, n);
-import { Inject as _, Disposable as $, DisposableCollection as Fe, CommandType as We, IUniverInstanceService as N, InterceptorEffectEnum as Ze, UniverInstanceType as b, Range as ze, ICommandService as ae, RANGE_TYPE as he, Rectangle as qe, useDependency as R, Tools as Ge, DependentOn as Je, Injector as Ye, Plugin as Ke, merge as Qe, IConfigService as Xe } from "@univerjs/core";
-import { SheetsSelectionsService as Se, getSheetCommandTarget as et, SheetInterceptorService as ge, INTERCEPTOR_POINT as tt, WorkbookCommentPermission as K, WorksheetViewPermission as Q, RangeProtectionPermissionViewPoint as X, SetWorksheetActiveOperation as nt, RemoveSheetCommand as rt } from "@univerjs/sheets";
+import { Inject as _, Disposable as $, DisposableCollection as Fe, CommandType as We, IUniverInstanceService as N, InterceptorEffectEnum as Ze, UniverInstanceType as b, Range as ze, ICommandService as ce, RANGE_TYPE as he, Rectangle as qe, useDependency as R, Tools as Ge, DependentOn as Je, Injector as Ye, Plugin as Ke, merge as Qe, IConfigService as Xe } from "@univerjs/core";
+import { SheetsSelectionsService as Se, getSheetCommandTarget as et, SheetInterceptorService as ge, INTERCEPTOR_POINT as tt, SheetPermissionCheckController as Ie, WorkbookCommentPermission as K, WorksheetViewPermission as Q, RangeProtectionPermissionViewPoint as X, SetWorksheetActiveOperation as nt, RemoveSheetCommand as rt } from "@univerjs/sheets";
 import { SheetsThreadCommentModel as x, UniverSheetsThreadCommentPlugin as ot } from "@univerjs/sheets-thread-comment";
-import { ThreadCommentPanelService as ce, SetActiveCommentOperation as te, ThreadCommentTree as it, ThreadCommentPanel as st, ToggleSheetCommentPanelOperation as Ie, THREAD_COMMENT_PANEL as at, UniverThreadCommentUIPlugin as ct } from "@univerjs/thread-comment-ui";
+import { ThreadCommentPanelService as ae, SetActiveCommentOperation as te, ThreadCommentTree as it, ThreadCommentPanel as st, ToggleSheetCommentPanelOperation as Pe, THREAD_COMMENT_PANEL as ct, UniverThreadCommentUIPlugin as at } from "@univerjs/thread-comment-ui";
 import { UniverThreadCommentUIPlugin as $n } from "@univerjs/thread-comment-ui";
-import { SheetCanvasPopManagerService as mt, ISheetClipboardService as ut, COPY_TYPE as dt, HoverManagerService as ht, SheetPermissionInterceptorBaseController as Pe, IMarkSelectionService as Te, IEditorBridgeService as lt, SheetSkeletonManagerService as pt, ScrollToRangeOperation as _t, whenSheetEditorFocused as vt, getCurrentRangeDisable$ as be } from "@univerjs/sheets-ui";
-import { IZenZoneService as ft, useObservable as A, KeyCode as Ct, MetaKeys as le, MenuItemType as Me, getMenuHiddenObservable as we, RibbonStartGroup as St, ContextMenuPosition as gt, ContextMenuGroup as It, ComponentManager as Pt, IMenuManagerService as Tt, IShortcutService as bt } from "@univerjs/ui";
-import { BehaviorSubject as Mt, debounceTime as me, map as wt } from "rxjs";
+import { SheetCanvasPopManagerService as ut, ISheetClipboardService as dt, COPY_TYPE as mt, HoverManagerService as ht, IMarkSelectionService as Te, IEditorBridgeService as lt, SheetSkeletonManagerService as pt, ScrollToRangeOperation as _t, whenSheetEditorFocused as ft, getCurrentRangeDisable$ as be } from "@univerjs/sheets-ui";
+import { IZenZoneService as vt, useObservable as A, KeyCode as Ct, MetaKeys as le, MenuItemType as Me, getMenuHiddenObservable as we, RibbonStartGroup as St, ContextMenuPosition as gt, ContextMenuGroup as It, ComponentManager as Pt, IMenuManagerService as Tt, IShortcutService as bt } from "@univerjs/ui";
+import { BehaviorSubject as Mt, debounceTime as ue, map as wt } from "rxjs";
 import { IRenderManagerService as ye } from "@univerjs/engine-render";
 import { singleReferenceToGrid as V, serializeRange as yt } from "@univerjs/engine-formula";
 import { IThreadCommentDataSourceService as Ee, DeleteCommentMutation as F, AddCommentMutation as se, ThreadCommentModel as Et } from "@univerjs/thread-comment";
-import { AddCommentCommand as xn, DeleteCommentCommand as Dn, DeleteCommentTreeCommand as jn, IThreadCommentDataSourceService as An, ResolveCommentCommand as Vn, UpdateCommentCommand as Bn } from "@univerjs/thread-comment";
+import { AddCommentCommand as xn, DeleteCommentCommand as Dn, DeleteCommentTreeCommand as jn, IThreadCommentDataSourceService as An, ResolveCommentCommand as Vn, UpdateCommentCommand as Hn } from "@univerjs/thread-comment";
 import Rt, { forwardRef as Re, useRef as Oe, createElement as Ue, useMemo as Ot, useCallback as pe, useEffect as Ut } from "react";
-const $e = "univer.sheet.thread-comment-modal", ue = "comment-single", Ne = "SHEET_THREAD_COMMENT";
+const $e = "univer.sheet.thread-comment-modal", de = "comment-single", Ne = "SHEET_THREAD_COMMENT";
 var $t = Object.defineProperty, Nt = Object.getOwnPropertyDescriptor, xt = (o, e, n, t) => {
   for (var r = t > 1 ? void 0 : t ? Nt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = (t ? s(e, n, r) : s(r)) || r);
@@ -40,16 +40,16 @@ let O = class extends $ {
     }));
   }
   showPopup(e, n) {
-    var d;
+    var m;
     const { row: t, col: r, unitId: i, subUnitId: s } = e;
-    if (this._activePopup && t === this._activePopup.row && r === this._activePopup.col && i === this._activePopup.unitId && s === ((d = this.activePopup) == null ? void 0 : d.subUnitId)) {
+    if (this._activePopup && t === this._activePopup.row && r === this._activePopup.col && i === this._activePopup.unitId && s === ((m = this.activePopup) == null ? void 0 : m.subUnitId)) {
       this._activePopup = e, this._activePopup$.next(e);
       return;
     }
     if (this._lastPopup && this._lastPopup.dispose(), this._zenZoneService.visible)
       return;
     this._activePopup = e, this._activePopup$.next(e);
-    const a = this._canvasPopupManagerService.attachPopupToCell(
+    const c = this._canvasPopupManagerService.attachPopupToCell(
       t,
       r,
       {
@@ -64,14 +64,14 @@ let O = class extends $ {
         ].filter(Boolean)
       }
     );
-    if (!a)
+    if (!c)
       throw new Error("[SheetsThreadCommentPopupService]: cannot show popup!");
-    const c = new Fe();
-    c.add(a), c.add({
+    const a = new Fe();
+    a.add(c), a.add({
       dispose: () => {
         n == null || n();
       }
-    }), this._lastPopup = c;
+    }), this._lastPopup = a;
   }
   hidePopup() {
     this._activePopup && (this._lastPopup && this._lastPopup.dispose(), this._lastPopup = null, this._activePopup = null, this._activePopup$.next(null));
@@ -84,43 +84,43 @@ let O = class extends $ {
   }
 };
 O = xt([
-  _e(0, _(mt)),
-  _e(1, ft)
+  _e(0, _(ut)),
+  _e(1, vt)
 ], O);
-const B = {
+const H = {
   type: We.OPERATION,
   id: "sheets.operation.show-comment-modal",
   handler(o) {
-    var v;
-    const e = o.get(Se), n = o.get(N), t = o.get(O), r = o.get(ce), i = (v = e.getCurrentLastSelection()) == null ? void 0 : v.primary, s = o.get(x);
+    var f;
+    const e = o.get(Se), n = o.get(N), t = o.get(O), r = o.get(ae), i = (f = e.getCurrentLastSelection()) == null ? void 0 : f.primary, s = o.get(x);
     if (!i)
       return !1;
-    const a = et(n);
-    if (!a)
+    const c = et(n);
+    if (!c)
       return !1;
-    const { workbook: c, worksheet: d, unitId: m, subUnitId: u } = a, h = {
-      workbook: c,
-      worksheet: d,
-      unitId: m,
-      subUnitId: u,
+    const { workbook: a, worksheet: m, unitId: u, subUnitId: d } = c, h = {
+      workbook: a,
+      worksheet: m,
+      unitId: u,
+      subUnitId: d,
       row: i.startRow,
       col: i.startColumn
     };
     t.showPopup(h);
-    const l = s.getByLocation(m, u, i.startRow, i.startColumn);
+    const l = s.getByLocation(u, d, i.startRow, i.startColumn);
     return l && r.setActiveComment({
-      unitId: m,
-      subUnitId: u,
+      unitId: u,
+      subUnitId: d,
       commentId: l,
       trigger: "context-menu"
     }), !0;
   }
-}, Dt = "sheets-thread-comment.config", ve = {};
+}, Dt = "sheets-thread-comment.config", fe = {};
 var jt = Object.defineProperty, At = Object.getOwnPropertyDescriptor, Vt = (o, e, n, t) => {
   for (var r = t > 1 ? void 0 : t ? At(e, n) : e, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = (t ? s(e, n, r) : s(r)) || r);
   return t && r && jt(e, n, r), r;
-}, H = (o, e) => (n, t) => e(n, t, o);
+}, L = (o, e) => (n, t) => e(n, t, o);
 let W = class extends $ {
   constructor(o, e, n, t) {
     super(), this._sheetInterceptorService = o, this._sheetsThreadCommentModel = e, this._univerInstanceService = n, this._renderManagerService = t, this._initViewModelIntercept(), this._initSkeletonChange();
@@ -157,21 +157,21 @@ let W = class extends $ {
       const n = e.getUnitId(), t = this._renderManagerService.getRenderById(n);
       (r = t == null ? void 0 : t.mainComponent) == null || r.makeForceDirty();
     };
-    this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.pipe(me(16)).subscribe(() => {
+    this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.pipe(ue(16)).subscribe(() => {
       o();
     }));
   }
 };
 W = Vt([
-  H(0, _(ge)),
-  H(1, _(x)),
-  H(2, N),
-  H(3, ye)
+  L(0, _(ge)),
+  L(1, _(x)),
+  L(2, N),
+  L(3, ye)
 ], W);
-var Bt = Object.defineProperty, Ht = Object.getOwnPropertyDescriptor, Lt = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Ht(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+var Ht = Object.defineProperty, Lt = Object.getOwnPropertyDescriptor, Bt = (o, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? Lt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = (t ? s(e, n, r) : s(r)) || r);
-  return t && r && Bt(e, n, r), r;
+  return t && r && Ht(e, n, r), r;
 }, ne = (o, e) => (n, t) => e(n, t, o);
 const kt = (o, e, n) => {
   const t = V(o), r = n.row - e.row, i = n.column - e.column, s = {
@@ -202,31 +202,31 @@ let Z = class extends $ {
         },
         // eslint-disable-next-line max-lines-per-function
         onPasteCells: (e, n, t, r) => {
-          const { unitId: i, subUnitId: s, range: a } = n, c = {
-            row: a.rows[0],
-            column: a.cols[0]
+          const { unitId: i, subUnitId: s, range: c } = n, a = {
+            row: c.rows[0],
+            column: c.cols[0]
           };
-          if (r.copyType === dt.CUT && this._copyInfo) {
-            const { range: d, unitId: m, subUnitId: u } = this._copyInfo, h = {
-              row: d.startRow,
-              column: d.startColumn
+          if (r.copyType === mt.CUT && this._copyInfo) {
+            const { range: m, unitId: u, subUnitId: d } = this._copyInfo, h = {
+              row: m.startRow,
+              column: m.startColumn
             };
-            if (!(i === m && s === u)) {
+            if (!(i === u && s === d)) {
               const l = [];
-              ze.foreach(d, (g, p) => {
-                const I = this._sheetsThreadCommentModel.getAllByLocation(m, u, g, p);
-                this._threadCommentDataSourceService.syncUpdateMutationToColla ? I.forEach((f) => {
-                  l.push(f);
-                }) : I.forEach(({ children: f, ...M }) => {
+              ze.foreach(m, (g, p) => {
+                const I = this._sheetsThreadCommentModel.getAllByLocation(u, d, g, p);
+                this._threadCommentDataSourceService.syncUpdateMutationToColla ? I.forEach((v) => {
+                  l.push(v);
+                }) : I.forEach(({ children: v, ...M }) => {
                   M.parentId || l.push(M);
                 });
               });
-              const v = [], S = [], U = [], D = [], ee = (g) => {
-                v.unshift({
+              const f = [], S = [], U = [], D = [], ee = (g) => {
+                f.unshift({
                   id: F.id,
                   params: {
-                    unitId: m,
-                    subUnitId: u,
+                    unitId: u,
+                    subUnitId: d,
                     commentId: g.id
                   }
                 }), U.push({
@@ -236,7 +236,7 @@ let Z = class extends $ {
                     subUnitId: s,
                     comment: {
                       ...g,
-                      ref: kt(g.ref, h, c),
+                      ref: kt(g.ref, h, a),
                       unitId: i,
                       subUnitId: s
                     },
@@ -245,8 +245,8 @@ let Z = class extends $ {
                 }), S.push({
                   id: se.id,
                   params: {
-                    unitId: m,
-                    subUnitId: u,
+                    unitId: u,
+                    subUnitId: d,
                     comment: g,
                     sync: !0
                   }
@@ -262,7 +262,7 @@ let Z = class extends $ {
               return l.forEach((g) => {
                 ee(g);
               }), {
-                redos: [...v, ...U],
+                redos: [...f, ...U],
                 undos: [...D, ...S]
               };
             }
@@ -276,8 +276,8 @@ let Z = class extends $ {
     );
   }
 };
-Z = Lt([
-  ne(0, _(ut)),
+Z = Bt([
+  ne(0, _(dt)),
   ne(1, _(x)),
   ne(2, Ee)
 ], Z);
@@ -285,31 +285,31 @@ var Ft = Object.defineProperty, Wt = Object.getOwnPropertyDescriptor, Zt = (o, e
   for (var r = t > 1 ? void 0 : t ? Wt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = (t ? s(e, n, r) : s(r)) || r);
   return t && r && Ft(e, n, r), r;
-}, L = (o, e) => (n, t) => e(n, t, o);
+}, B = (o, e) => (n, t) => e(n, t, o);
 let z = class extends $ {
   constructor(o, e, n, t) {
-    super(), this._hoverManagerService = o, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = n, this._sheetPermissionInterceptorBaseController = t, this._initHoverEvent();
+    super(), this._hoverManagerService = o, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = n, this._sheetPermissionCheckController = t, this._initHoverEvent();
   }
   _initHoverEvent() {
     this.disposeWithMe(
-      this._hoverManagerService.currentCell$.pipe(me(100)).subscribe((o) => {
+      this._hoverManagerService.currentCell$.pipe(ue(100)).subscribe((o) => {
         const e = this._sheetsThreadCommentPopupService.activePopup;
         if (o && (e && e.temp || !e)) {
-          const { location: n } = o, { unitId: t, subUnitId: r, row: i, col: s } = n, a = this._sheetsThreadCommentModel.getByLocation(t, r, i, s);
-          if (a) {
-            if (!this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+          const { location: n } = o, { unitId: t, subUnitId: r, row: i, col: s } = n, c = this._sheetsThreadCommentModel.getByLocation(t, r, i, s);
+          if (c) {
+            if (!this._sheetPermissionCheckController.permissionCheckWithRanges({
               workbookTypes: [K],
               worksheetTypes: [Q],
               rangeTypes: [X]
             }, [{ startRow: i, startColumn: s, endRow: i, endColumn: s }]))
               return;
-            const d = this._sheetsThreadCommentModel.getComment(t, r, a);
-            d && !d.resolved && this._sheetsThreadCommentPopupService.showPopup({
+            const m = this._sheetsThreadCommentModel.getComment(t, r, c);
+            m && !m.resolved && this._sheetsThreadCommentPopupService.showPopup({
               unitId: t,
               subUnitId: r,
               row: i,
               col: s,
-              commentId: a,
+              commentId: c,
               temp: !0
             });
           } else
@@ -320,10 +320,10 @@ let z = class extends $ {
   }
 };
 z = Zt([
-  L(0, _(ht)),
-  L(1, _(O)),
-  L(2, _(x)),
-  L(3, _(Pe))
+  B(0, _(ht)),
+  B(1, _(O)),
+  B(2, _(x)),
+  B(3, _(Ie))
 ], z);
 var zt = Object.defineProperty, qt = Object.getOwnPropertyDescriptor, Gt = (o, e, n, t) => {
   for (var r = t > 1 ? void 0 : t ? qt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
@@ -331,32 +331,32 @@ var zt = Object.defineProperty, qt = Object.getOwnPropertyDescriptor, Gt = (o, e
   return t && r && zt(e, n, r), r;
 }, w = (o, e) => (n, t) => e(n, t, o);
 let q = class extends $ {
-  constructor(e, n, t, r, i, s, a, c, d, m) {
+  constructor(e, n, t, r, i, s, c, a, m, u) {
     super();
     E(this, "_isSwitchToCommenting", !1);
     E(this, "_selectionShapeInfo", null);
-    this._commandService = e, this._sheetsThreadCommentPopupService = n, this._sheetsThreadCommentModel = t, this._threadCommentPanelService = r, this._univerInstanceService = i, this._sheetPermissionInterceptorBaseController = s, this._markSelectionService = a, this._sheetSelectionService = c, this._editorBridgeService = d, this._renderManagerService = m, this._initCommandListener(), this._initPanelListener(), this._initMarkSelection(), this._initSelectionUpdateListener(), this._initEditorBridge();
+    this._commandService = e, this._sheetsThreadCommentPopupService = n, this._sheetsThreadCommentModel = t, this._threadCommentPanelService = r, this._univerInstanceService = i, this._sheetPermissionCheckController = s, this._markSelectionService = c, this._sheetSelectionService = a, this._editorBridgeService = m, this._renderManagerService = u, this._initCommandListener(), this._initPanelListener(), this._initMarkSelection(), this._initSelectionUpdateListener(), this._initEditorBridge();
   }
   _handleSelectionChange(e, n, t) {
-    var h, l, v;
+    var h, l, f;
     const r = (h = e[0]) == null ? void 0 : h.range, i = this._renderManagerService.getRenderById(n), s = (l = i == null ? void 0 : i.with(pt).getWorksheetSkeleton(t)) == null ? void 0 : l.skeleton;
     if (!s || !r)
       return;
-    const a = s.getCellWithCoordByIndex(r.startRow, r.startColumn);
-    if ((((v = r.rangeType) != null ? v : he.NORMAL) !== he.NORMAL || r.endColumn - r.startColumn > 0 || r.endRow - r.startRow > 0) && !((a.isMerged || a.isMergedMainCell) && qe.equals(a.mergeInfo, r))) {
+    const c = s.getCellWithCoordByIndex(r.startRow, r.startColumn);
+    if ((((f = r.rangeType) != null ? f : he.NORMAL) !== he.NORMAL || r.endColumn - r.startColumn > 0 || r.endRow - r.startRow > 0) && !((c.isMerged || c.isMergedMainCell) && qe.equals(c.mergeInfo, r))) {
       this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(te.id);
       return;
     }
-    const d = a.actualRow, m = a.actualColumn;
-    if (!this._sheetsThreadCommentModel.showCommentMarker(n, t, d, m)) {
+    const m = c.actualRow, u = c.actualColumn;
+    if (!this._sheetsThreadCommentModel.showCommentMarker(n, t, m, u)) {
       this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(te.id);
       return;
     }
-    const u = this._sheetsThreadCommentModel.getByLocation(n, t, d, m);
-    u && this._commandService.executeCommand(te.id, {
+    const d = this._sheetsThreadCommentModel.getByLocation(n, t, m, u);
+    d && this._commandService.executeCommand(te.id, {
       unitId: n,
       subUnitId: t,
-      commentId: u
+      commentId: d
     });
   }
   _initSelectionUpdateListener() {
@@ -391,18 +391,18 @@ let q = class extends $ {
     this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe(async (e) => {
       var n;
       if (e) {
-        const { unitId: t, subUnitId: r, commentId: i, trigger: s } = e, a = this._sheetsThreadCommentModel.getComment(t, r, i);
-        if (!a || a.resolved)
+        const { unitId: t, subUnitId: r, commentId: i, trigger: s } = e, c = this._sheetsThreadCommentModel.getComment(t, r, i);
+        if (!c || c.resolved)
           return;
-        const c = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
-        if (!c || c.getUnitId() !== t)
+        const a = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
+        if (!a || a.getUnitId() !== t)
           return;
-        this._isSwitchToCommenting = !0, ((n = c.getActiveSheet()) == null ? void 0 : n.getSheetId()) !== r && await this._commandService.executeCommand(nt.id, {
+        this._isSwitchToCommenting = !0, ((n = a.getActiveSheet()) == null ? void 0 : n.getSheetId()) !== r && await this._commandService.executeCommand(nt.id, {
           unitId: t,
           subUnitId: r
         }), this._isSwitchToCommenting = !1;
-        const u = V(a.ref), { row: h, column: l } = u;
-        if (!this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+        const d = V(c.ref), { row: h, column: l } = d;
+        if (!this._sheetPermissionCheckController.permissionCheckWithRanges({
           workbookTypes: [K],
           worksheetTypes: [Q],
           rangeTypes: [X]
@@ -411,19 +411,19 @@ let q = class extends $ {
         const S = 1;
         if (await this._commandService.executeCommand(_t.id, {
           range: {
-            startRow: Math.max(u.row - S, 0),
-            endRow: u.row + S,
-            startColumn: Math.max(u.column - S, 0),
-            endColumn: u.column + S
+            startRow: Math.max(d.row - S, 0),
+            endRow: d.row + S,
+            startColumn: Math.max(d.column - S, 0),
+            endColumn: d.column + S
           }
         }), this._editorBridgeService.isVisible().visible)
           return;
         this._sheetsThreadCommentPopupService.showPopup({
           unitId: t,
           subUnitId: r,
-          row: u.row,
-          col: u.column,
-          commentId: a.id,
+          row: d.row,
+          col: d.column,
+          commentId: c.id,
           trigger: s
         });
       } else
@@ -431,7 +431,7 @@ let q = class extends $ {
     }));
   }
   _initMarkSelection() {
-    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.pipe(me(100)).subscribe((e) => {
+    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.pipe(ue(100)).subscribe((e) => {
       var h, l;
       if (!e) {
         this._selectionShapeInfo && (this._markSelectionService.removeShape(this._selectionShapeInfo.shapeId), this._selectionShapeInfo = null);
@@ -442,17 +442,17 @@ let q = class extends $ {
       const i = this._sheetsThreadCommentModel.getComment(n, t, r);
       if (!i)
         return;
-      const s = V(i.ref), { row: a, column: c } = s;
-      if (Number.isNaN(a) || Number.isNaN(c))
+      const s = V(i.ref), { row: c, column: a } = s;
+      if (Number.isNaN(c) || Number.isNaN(a))
         return null;
-      const d = (h = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : h.getSheetBySheetId(t), m = (l = d == null ? void 0 : d.getMergedCell(a, c)) != null ? l : {
-        startColumn: c,
-        endColumn: c,
-        startRow: a,
-        endRow: a
-      }, u = this._markSelectionService.addShape(
+      const m = (h = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : h.getSheetBySheetId(t), u = (l = m == null ? void 0 : m.getMergedCell(c, a)) != null ? l : {
+        startColumn: a,
+        endColumn: a,
+        startRow: c,
+        endRow: c
+      }, d = this._markSelectionService.addShape(
         {
-          range: m,
+          range: u,
           style: {
             // hasAutoFill: false,
             fill: "rgb(255, 189, 55, 0.35)",
@@ -465,20 +465,20 @@ let q = class extends $ {
         [],
         -1
       );
-      u && (this._selectionShapeInfo = {
+      d && (this._selectionShapeInfo = {
         ...e,
-        shapeId: u
+        shapeId: d
       });
     }));
   }
 };
 q = Gt([
-  w(0, ae),
+  w(0, ce),
   w(1, _(O)),
   w(2, _(x)),
-  w(3, _(ce)),
+  w(3, _(ae)),
   w(4, N),
-  w(5, _(Pe)),
+  w(5, _(Ie)),
   w(6, Te),
   w(7, _(Se)),
   w(8, lt),
@@ -505,26 +505,26 @@ let G = class extends $ {
             const r = t.getUnitId(), i = n.subUnitId || ((e = t.getActiveSheet()) == null ? void 0 : e.getSheetId());
             if (!i)
               return { redos: [], undos: [] };
-            const s = this._threadCommentModel.ensureMap(r, i), a = Array.from(s.values()).filter((h) => !h.parentId), c = a.map((h) => h.id), d = this._threadCommentDataSourceService.syncUpdateMutationToColla, m = c.map((h) => ({
+            const s = this._threadCommentModel.ensureMap(r, i), c = Array.from(s.values()).filter((h) => !h.parentId), a = c.map((h) => h.id), m = this._threadCommentDataSourceService.syncUpdateMutationToColla, u = a.map((h) => ({
               id: F.id,
               params: {
                 unitId: r,
                 subUnitId: i,
                 commentId: h
               }
-            })), u = a.map(({ children: h, ...l }) => ({
+            })), d = c.map(({ children: h, ...l }) => ({
               id: se.id,
               params: {
                 unitId: r,
                 subUnitId: i,
                 comment: {
                   ...l,
-                  children: d ? h : void 0
+                  children: m ? h : void 0
                 },
-                sync: !d
+                sync: !m
               }
             }));
-            return { redos: m, undos: u };
+            return { redos: u, undos: d };
           }
           return { redos: [], undos: [] };
         }
@@ -554,8 +554,8 @@ var P = function() {
       e.indexOf(t[r]) < 0 && Object.prototype.propertyIsEnumerable.call(o, t[r]) && (n[t[r]] = o[t[r]]);
   return n;
 }, xe = Re(function(o, e) {
-  var n = o.icon, t = o.id, r = o.className, i = o.extend, s = Qt(o, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(t, " ").concat(r || "").trim(), c = Oe("_".concat(tn()));
-  return De(n, "".concat(t), { defIds: n.defIds, idSuffix: c.current }, P({ ref: e, className: a }, s), i);
+  var n = o.icon, t = o.id, r = o.className, i = o.extend, s = Qt(o, ["icon", "id", "className", "extend"]), c = "univerjs-icon univerjs-icon-".concat(t, " ").concat(r || "").trim(), a = Oe("_".concat(tn()));
+  return De(n, "".concat(t), { defIds: n.defIds, idSuffix: a.current }, P({ ref: e, className: c }, s), i);
 });
 function De(o, e, n, t, r) {
   return Ue(o.tag, P(P({ key: e }, Xt(o, n, r)), t), (en(o, n).children || []).map(function(i, s) {
@@ -567,8 +567,8 @@ function Xt(o, e, n) {
   n != null && n.colorChannel1 && t.fill === "colorChannel1" && (t.fill = n.colorChannel1);
   var r = e.defIds;
   return !r || r.length === 0 || (o.tag === "use" && t["xlink:href"] && (t["xlink:href"] = t["xlink:href"] + e.idSuffix), Object.entries(t).forEach(function(i) {
-    var s = i[0], a = i[1];
-    typeof a == "string" && (t[s] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+    var s = i[0], c = i[1];
+    typeof c == "string" && (t[s] = c.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), t;
 }
 function en(o, e) {
@@ -599,17 +599,17 @@ var re = { exports: {} }, j = {};
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var fe;
+var ve;
 function rn() {
-  if (fe) return j;
-  fe = 1;
+  if (ve) return j;
+  ve = 1;
   var o = Rt, e = Symbol.for("react.element"), n = Symbol.for("react.fragment"), t = Object.prototype.hasOwnProperty, r = o.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, i = { key: !0, ref: !0, __self: !0, __source: !0 };
-  function s(a, c, d) {
-    var m, u = {}, h = null, l = null;
-    d !== void 0 && (h = "" + d), c.key !== void 0 && (h = "" + c.key), c.ref !== void 0 && (l = c.ref);
-    for (m in c) t.call(c, m) && !i.hasOwnProperty(m) && (u[m] = c[m]);
-    if (a && a.defaultProps) for (m in c = a.defaultProps, c) u[m] === void 0 && (u[m] = c[m]);
-    return { $$typeof: e, type: a, key: h, ref: l, props: u, _owner: r.current };
+  function s(c, a, m) {
+    var u, d = {}, h = null, l = null;
+    m !== void 0 && (h = "" + m), a.key !== void 0 && (h = "" + a.key), a.ref !== void 0 && (l = a.ref);
+    for (u in a) t.call(a, u) && !i.hasOwnProperty(u) && (d[u] = a[u]);
+    if (c && c.defaultProps) for (u in a = c.defaultProps, a) d[u] === void 0 && (d[u] = a[u]);
+    return { $$typeof: e, type: c, key: h, ref: l, props: d, _owner: r.current };
   }
   return j.Fragment = n, j.jsx = s, j.jsxs = s, j;
 }
@@ -622,11 +622,11 @@ const sn = () => {
   const o = R(N), e = R(O), n = A(e.activePopup$), t = R(x);
   if (A(t.commentUpdate$), !n)
     return null;
-  const { row: r, col: i, unitId: s, subUnitId: a, trigger: c } = n, d = t.getByLocation(s, a, r, i), m = `${Ge.chatAtABC(i)}${r + 1}`, u = () => {
+  const { row: r, col: i, unitId: s, subUnitId: c, trigger: a } = n, m = t.getByLocation(s, c, r, i), u = `${Ge.chatAtABC(i)}${r + 1}`, d = () => {
     e.hidePopup();
   }, h = (l) => {
-    var v, S, U;
-    return (U = (S = (v = o.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : v.getSheetBySheetId(l)) == null ? void 0 : S.getName()) != null ? U : "";
+    var f, S, U;
+    return (U = (S = (f = o.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : f.getSheetBySheetId(l)) == null ? void 0 : S.getName()) != null ? U : "";
   };
   return /* @__PURE__ */ Ae.jsx(
     it,
@@ -635,27 +635,27 @@ const sn = () => {
         e.persistPopup();
       },
       prefix: "cell",
-      id: d,
+      id: m,
       unitId: s,
-      subUnitId: a,
+      subUnitId: c,
       type: b.UNIVER_SHEET,
-      refStr: m,
-      onClose: u,
+      refStr: u,
+      onClose: d,
       getSubUnitName: h,
-      autoFocus: c === "context-menu"
+      autoFocus: a === "context-menu"
     }
   );
-}, an = () => {
+}, cn = () => {
   var g;
-  const o = R(Te), e = R(N), n = R(O), t = e.getCurrentUnitForType(b.UNIVER_SHEET), r = t.getUnitId(), i = R(ae), s = Ot(() => t.activeSheet$.pipe(wt((p) => p == null ? void 0 : p.getSheetId())), [t.activeSheet$]), a = A(s, (g = t.getActiveSheet()) == null ? void 0 : g.getSheetId()), c = Oe(), d = R(ce), m = A(d.activeCommentId$), u = A(d.panelVisible$, d.panelVisible), h = pe((p) => {
-    const I = t.getSheets(), f = {};
+  const o = R(Te), e = R(N), n = R(O), t = e.getCurrentUnitForType(b.UNIVER_SHEET), r = t.getUnitId(), i = R(ce), s = Ot(() => t.activeSheet$.pipe(wt((p) => p == null ? void 0 : p.getSheetId())), [t.activeSheet$]), c = A(s, (g = t.getActiveSheet()) == null ? void 0 : g.getSheetId()), a = Oe(), m = R(ae), u = A(m.activeCommentId$), d = A(m.panelVisible$, m.panelVisible), h = pe((p) => {
+    const I = t.getSheets(), v = {};
     I.forEach((T, C) => {
-      f[T.getSheetId()] = C;
+      v[T.getSheetId()] = C;
     });
     const M = (T) => T.map((C) => {
-      var de;
-      const y = V(C.ref), He = [(de = f[C.subUnitId]) != null ? de : 0, y.row, y.column];
-      return { ...C, p: He };
+      var me;
+      const y = V(C.ref), Le = [(me = v[C.subUnitId]) != null ? me : 0, y.row, y.column];
+      return { ...C, p: Le };
     }).sort((C, y) => C.p[0] === y.p[0] ? C.p[1] === y.p[1] ? C.p[2] - y.p[2] : C.p[1] - y.p[1] : C.p[0] - y.p[0]);
     return [
       ...M(p.filter((T) => !T.resolved)),
@@ -663,14 +663,14 @@ const sn = () => {
     ];
   }, [t]), l = pe((p) => {
     var I;
-    if (p.unitId === r && p.subUnitId === a && !p.resolved) {
-      const { row: f, column: M } = V(p.ref), T = t.getSheetBySheetId(p.subUnitId), C = (I = T == null ? void 0 : T.getMergedCell(f, M)) != null ? I : {
+    if (p.unitId === r && p.subUnitId === c && !p.resolved) {
+      const { row: v, column: M } = V(p.ref), T = t.getSheetBySheetId(p.subUnitId), C = (I = T == null ? void 0 : T.getMergedCell(v, M)) != null ? I : {
         startColumn: M,
         endColumn: M,
-        startRow: f,
-        endRow: f
+        startRow: v,
+        endRow: v
       };
-      if (!Number.isNaN(f) && !Number.isNaN(M))
+      if (!Number.isNaN(v) && !Number.isNaN(M))
         return o.addShape({
           range: C,
           style: {
@@ -683,28 +683,28 @@ const sn = () => {
           primary: null
         });
     }
-  }, [o, a, r]), v = (p) => {
-    var I, f;
-    return (f = (I = t.getSheetBySheetId(p)) == null ? void 0 : I.getName()) != null ? f : "";
+  }, [o, c, r]), f = (p) => {
+    var I, v;
+    return (v = (I = t.getSheetBySheetId(p)) == null ? void 0 : I.getName()) != null ? v : "";
   }, S = () => {
-    i.executeCommand(B.id);
+    i.executeCommand(H.id);
   }, U = (p) => {
-    m && m.unitId === p.unitId && m.subUnitId === p.subUnitId && m.commentId === p.id || (c.current && (o.removeShape(c.current), c.current = null), c.current = l(p));
+    u && u.unitId === p.unitId && u.subUnitId === p.subUnitId && u.commentId === p.id || (a.current && (o.removeShape(a.current), a.current = null), a.current = l(p));
   }, D = () => {
-    c.current && (o.removeShape(c.current), c.current = null);
+    a.current && (o.removeShape(a.current), a.current = null);
   }, ee = (p, I) => {
     I && n.hidePopup();
   };
   return Ut(() => {
-    !u && c.current && o.removeShape(c.current);
-  }, [o, u]), /* @__PURE__ */ Ae.jsx(
+    !d && a.current && o.removeShape(a.current);
+  }, [o, d]), /* @__PURE__ */ Ae.jsx(
     st,
     {
       unitId: r,
       subUnitId$: s,
       type: b.UNIVER_SHEET,
       onAdd: S,
-      getSubUnitName: v,
+      getSubUnitName: f,
       onResolve: ee,
       sortComments: h,
       onItemEnter: U,
@@ -712,10 +712,10 @@ const sn = () => {
       onDeleteComment: () => (D(), !0)
     }
   );
-}, cn = (o) => ({
-  id: B.id,
+}, an = (o) => ({
+  id: H.id,
   type: Me.BUTTON,
-  icon: ue,
+  icon: de,
   title: "sheetThreadComment.menu.addComment",
   hidden$: we(o, b.UNIVER_SHEET),
   disabled$: be(o, {
@@ -723,10 +723,10 @@ const sn = () => {
     worksheetTypes: [Q],
     rangeTypes: [X]
   })
-}), mn = (o) => ({
-  id: Ie.id,
+}), un = (o) => ({
+  id: Pe.id,
   type: Me.BUTTON,
-  icon: ue,
+  icon: de,
   tooltip: "sheetThreadComment.menu.commentManagement",
   disabled$: be(o, {
     workbookTypes: [K],
@@ -734,22 +734,22 @@ const sn = () => {
     rangeTypes: [X]
   }),
   hidden$: we(o, b.UNIVER_SHEET)
-}), un = {
-  id: B.id,
+}), dn = {
+  id: H.id,
   binding: Ct.M | le.CTRL_COMMAND | le.ALT,
-  preconditions: vt
-}, dn = {
+  preconditions: ft
+}, mn = {
   [St.OTHERS]: {
-    [Ie.id]: {
+    [Pe.id]: {
       order: 1,
-      menuItemFactory: mn
+      menuItemFactory: un
     }
   },
   [gt.MAIN_AREA]: {
     [It.OTHERS]: {
-      [B.id]: {
+      [H.id]: {
         order: 0,
-        menuItemFactory: cn
+        menuItemFactory: an
       }
     }
   }
@@ -764,16 +764,16 @@ let J = class extends $ {
     super(), this._menuManagerService = o, this._componentManager = e, this._shortcutService = n, this._initMenu(), this._initShortcut(), this._initComponent();
   }
   _initShortcut() {
-    this._shortcutService.registerShortcut(un);
+    this._shortcutService.registerShortcut(dn);
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(dn);
+    this._menuManagerService.mergeMenu(mn);
   }
   _initComponent() {
     [
       [$e, sn],
-      [at, an],
-      [ue, je]
+      [ct, cn],
+      [de, je]
     ].forEach(([o, e]) => {
       this._componentManager.register(o, e);
     });
@@ -784,17 +784,17 @@ J = pn([
   oe(1, _(Pt)),
   oe(2, bt)
 ], J);
-var Ve = Object.defineProperty, _n = Object.getOwnPropertyDescriptor, vn = (o, e, n) => e in o ? Ve(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n, fn = (o, e, n, t) => {
+var Ve = Object.defineProperty, _n = Object.getOwnPropertyDescriptor, fn = (o, e, n) => e in o ? Ve(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n, vn = (o, e, n, t) => {
   for (var r = t > 1 ? void 0 : t ? _n(e, n) : e, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (r = (t ? s(e, n, r) : s(r)) || r);
   return t && r && Ve(e, n, r), r;
-}, ie = (o, e) => (n, t) => e(n, t, o), Be = (o, e, n) => vn(o, typeof e != "symbol" ? e + "" : e, n);
+}, ie = (o, e) => (n, t) => e(n, t, o), He = (o, e, n) => fn(o, typeof e != "symbol" ? e + "" : e, n);
 let Y = class extends Ke {
-  constructor(o = ve, e, n, t) {
+  constructor(o = fe, e, n, t) {
     super(), this._config = o, this._injector = e, this._commandService = n, this._configService = t;
     const { menu: r, ...i } = Qe(
       {},
-      ve,
+      fe,
       this._config
     );
     r && this._configService.setConfig("menu", r, { merge: !0 }), this._configService.setConfig(Dt, i);
@@ -810,7 +810,7 @@ let Y = class extends Ke {
       [O]
     ].forEach((o) => {
       this._injector.add(o);
-    }), [B].forEach((o) => {
+    }), [H].forEach((o) => {
       this._commandService.registerCommand(o);
     }), this._injector.get(J);
   }
@@ -821,12 +821,12 @@ let Y = class extends Ke {
     this._injector.get(Z), this._injector.get(z), this._injector.get(q);
   }
 };
-Be(Y, "pluginName", Ne);
-Be(Y, "type", b.UNIVER_SHEET);
-Y = fn([
-  Je(ct, ot),
+He(Y, "pluginName", Ne);
+He(Y, "type", b.UNIVER_SHEET);
+Y = vn([
+  Je(at, ot),
   ie(1, _(Ye)),
-  ie(2, _(ae)),
+  ie(2, _(ce)),
   ie(3, Xe)
 ], Y);
 export {
@@ -837,8 +837,8 @@ export {
   Vn as ResolveCommentCommand,
   Ne as SHEETS_THREAD_COMMENT,
   O as SheetsThreadCommentPopupService,
-  B as ShowAddSheetCommentModalOperation,
+  H as ShowAddSheetCommentModalOperation,
   Y as UniverSheetsThreadCommentUIPlugin,
   $n as UniverThreadCommentUIPlugin,
-  Bn as UpdateCommentCommand
+  Hn as UpdateCommentCommand
 };