@univerjs/sheets-thread-comment-ui 0.5.4 → 0.5.5-experimental.20250123-34738ff

package/lib/es/index.js

@@ -1,33 +1,35 @@
-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 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 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 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 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", 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);
-  return t && r && $t(e, n, r), r;
-}, _e = (o, e) => (n, t) => e(n, t, o);
-let O = class extends $ {
-  constructor(e, n) {
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
+import { Inject, Disposable, DisposableCollection, CommandType, IUniverInstanceService, InterceptorEffectEnum, UniverInstanceType, Range, ICommandService, RANGE_TYPE, Rectangle, useDependency, Tools, DependentOn, Injector, Plugin, merge, IConfigService } from "@univerjs/core";
+import { SheetsSelectionsService, getSheetCommandTarget, SheetInterceptorService, INTERCEPTOR_POINT, SheetPermissionCheckController, WorkbookCommentPermission, WorksheetViewPermission, RangeProtectionPermissionViewPoint, SetWorksheetActiveOperation, RemoveSheetCommand } from "@univerjs/sheets";
+import { SheetsThreadCommentModel, UniverSheetsThreadCommentPlugin } from "@univerjs/sheets-thread-comment";
+import { ThreadCommentPanelService, SetActiveCommentOperation, ThreadCommentTree, ThreadCommentPanel, ToggleSheetCommentPanelOperation, THREAD_COMMENT_PANEL, UniverThreadCommentUIPlugin } from "@univerjs/thread-comment-ui";
+import { UniverThreadCommentUIPlugin as UniverThreadCommentUIPlugin2 } from "@univerjs/thread-comment-ui";
+import { SheetCanvasPopManagerService, ISheetClipboardService, COPY_TYPE, HoverManagerService, IMarkSelectionService, IEditorBridgeService, SheetSkeletonManagerService, ScrollToRangeOperation, whenSheetEditorFocused, getCurrentRangeDisable$ } from "@univerjs/sheets-ui";
+import { IZenZoneService, useObservable, KeyCode, MetaKeys, MenuItemType, getMenuHiddenObservable, RibbonStartGroup, ContextMenuPosition, ContextMenuGroup, ComponentManager, IMenuManagerService, IShortcutService } from "@univerjs/ui";
+import { BehaviorSubject, debounceTime, map } from "rxjs";
+import { IRenderManagerService } from "@univerjs/engine-render";
+import { singleReferenceToGrid, serializeRange } from "@univerjs/engine-formula";
+import { IThreadCommentDataSourceService, DeleteCommentMutation, AddCommentMutation, ThreadCommentModel } from "@univerjs/thread-comment";
+import { AddCommentCommand, DeleteCommentCommand, DeleteCommentTreeCommand, IThreadCommentDataSourceService as IThreadCommentDataSourceService2, ResolveCommentCommand, UpdateCommentCommand } from "@univerjs/thread-comment";
+import { jsx } from "react/jsx-runtime";
+import { forwardRef, useRef, createElement, useMemo, useCallback, useEffect } from "react";
+const SHEETS_THREAD_COMMENT_MODAL = "univer.sheet.thread-comment-modal", COMMENT_SINGLE_ICON = "comment-single", SHEETS_THREAD_COMMENT = "SHEET_THREAD_COMMENT";
+var __defProp$7 = Object.defineProperty, __getOwnPropDesc$7 = Object.getOwnPropertyDescriptor, __decorateClass$7 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$7(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$7(target, key, result), result;
+}, "__decorateClass$7"), __decorateParam$7 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$7"), _a;
+let SheetsThreadCommentPopupService = (_a = class extends Disposable {
+  constructor(_canvasPopupManagerService, _zenZoneService) {
     super();
-    E(this, "_lastPopup", null);
-    E(this, "_activePopup");
-    E(this, "_activePopup$", new Mt(null));
-    E(this, "activePopup$", this._activePopup$.asObservable());
-    this._canvasPopupManagerService = e, this._zenZoneService = n, this._initZenVisible(), this.disposeWithMe(() => {
+    __publicField(this, "_lastPopup", null);
+    __publicField(this, "_activePopup");
+    __publicField(this, "_activePopup$", new BehaviorSubject(null));
+    __publicField(this, "activePopup$", this._activePopup$.asObservable());
+    this._canvasPopupManagerService = _canvasPopupManagerService, this._zenZoneService = _zenZoneService, this._initZenVisible(), this.disposeWithMe(() => {
       this._activePopup$.complete();
     });
   }
@@ -35,28 +37,28 @@ let O = class extends $ {
     return this._activePopup;
   }
   _initZenVisible() {
-    this.disposeWithMe(this._zenZoneService.visible$.subscribe((e) => {
-      e && this.hidePopup();
+    this.disposeWithMe(this._zenZoneService.visible$.subscribe((visible) => {
+      visible && this.hidePopup();
     }));
   }
-  showPopup(e, n) {
-    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 === ((m = this.activePopup) == null ? void 0 : m.subUnitId)) {
-      this._activePopup = e, this._activePopup$.next(e);
+  showPopup(location, onHide) {
+    var _a9;
+    const { row, col, unitId, subUnitId } = location;
+    if (this._activePopup && row === this._activePopup.row && col === this._activePopup.col && unitId === this._activePopup.unitId && subUnitId === ((_a9 = this.activePopup) == null ? void 0 : _a9.subUnitId)) {
+      this._activePopup = location, this._activePopup$.next(location);
       return;
     }
     if (this._lastPopup && this._lastPopup.dispose(), this._zenZoneService.visible)
       return;
-    this._activePopup = e, this._activePopup$.next(e);
-    const c = this._canvasPopupManagerService.attachPopupToCell(
-      t,
-      r,
+    this._activePopup = location, this._activePopup$.next(location);
+    const popupDisposable = this._canvasPopupManagerService.attachPopupToCell(
+      row,
+      col,
       {
-        componentKey: $e,
-        onClickOutside: () => {
+        componentKey: SHEETS_THREAD_COMMENT_MODAL,
+        onClickOutside: /* @__PURE__ */ __name(() => {
           this.hidePopup();
-        },
+        }, "onClickOutside"),
         direction: "horizontal",
         excludeOutside: [
           ...Array.from(document.querySelectorAll(".univer-thread-comment")),
@@ -64,14 +66,14 @@ let O = class extends $ {
         ].filter(Boolean)
       }
     );
-    if (!c)
+    if (!popupDisposable)
       throw new Error("[SheetsThreadCommentPopupService]: cannot show popup!");
-    const a = new Fe();
-    a.add(c), a.add({
-      dispose: () => {
-        n == null || n();
-      }
-    }), this._lastPopup = a;
+    const disposableCollection = new DisposableCollection();
+    disposableCollection.add(popupDisposable), disposableCollection.add({
+      dispose: /* @__PURE__ */ __name(() => {
+        onHide == null || onHide();
+      }, "dispose")
+    }), this._lastPopup = disposableCollection;
   }
   hidePopup() {
     this._activePopup && (this._lastPopup && this._lastPopup.dispose(), this._lastPopup = null, this._activePopup = null, this._activePopup$.next(null));
@@ -82,188 +84,189 @@ let O = class extends $ {
       temp: !1
     }, this._activePopup$.next(this._activePopup));
   }
-};
-O = xt([
-  _e(0, _(ut)),
-  _e(1, vt)
-], O);
-const H = {
-  type: We.OPERATION,
+}, __name(_a, "SheetsThreadCommentPopupService"), _a);
+SheetsThreadCommentPopupService = __decorateClass$7([
+  __decorateParam$7(0, Inject(SheetCanvasPopManagerService)),
+  __decorateParam$7(1, IZenZoneService)
+], SheetsThreadCommentPopupService);
+const ShowAddSheetCommentModalOperation = {
+  type: CommandType.OPERATION,
   id: "sheets.operation.show-comment-modal",
-  handler(o) {
-    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)
+  handler(accessor) {
+    var _a9;
+    const selectionManagerService = accessor.get(SheetsSelectionsService), univerInstanceService = accessor.get(IUniverInstanceService), sheetsThreadCommentPopupService = accessor.get(SheetsThreadCommentPopupService), threadCommentPanelService = accessor.get(ThreadCommentPanelService), activeCell = (_a9 = selectionManagerService.getCurrentLastSelection()) == null ? void 0 : _a9.primary, model = accessor.get(SheetsThreadCommentModel);
+    if (!activeCell)
       return !1;
-    const c = et(n);
-    if (!c)
+    const result = getSheetCommandTarget(univerInstanceService);
+    if (!result)
       return !1;
-    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
+    const { workbook, worksheet, unitId, subUnitId } = result, location = {
+      workbook,
+      worksheet,
+      unitId,
+      subUnitId,
+      row: activeCell.startRow,
+      col: activeCell.startColumn
     };
-    t.showPopup(h);
-    const l = s.getByLocation(u, d, i.startRow, i.startColumn);
-    return l && r.setActiveComment({
-      unitId: u,
-      subUnitId: d,
-      commentId: l,
+    sheetsThreadCommentPopupService.showPopup(location);
+    const rootId = model.getByLocation(unitId, subUnitId, activeCell.startRow, activeCell.startColumn);
+    return rootId && threadCommentPanelService.setActiveComment({
+      unitId,
+      subUnitId,
+      commentId: rootId,
       trigger: "context-menu"
     }), !0;
   }
-}, 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;
-}, 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();
+}, SHEETS_THREAD_COMMENT_UI_PLUGIN_CONFIG_KEY = "sheets-thread-comment.config", defaultPluginConfig = {};
+var __defProp$6 = Object.defineProperty, __getOwnPropDesc$6 = Object.getOwnPropertyDescriptor, __decorateClass$6 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$6(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$6(target, key, result), result;
+}, "__decorateClass$6"), __decorateParam$6 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$6"), _a2;
+let SheetsThreadCommentRenderController = (_a2 = class extends Disposable {
+  constructor(_sheetInterceptorService, _sheetsThreadCommentModel, _univerInstanceService, _renderManagerService) {
+    super(), this._sheetInterceptorService = _sheetInterceptorService, this._sheetsThreadCommentModel = _sheetsThreadCommentModel, this._univerInstanceService = _univerInstanceService, this._renderManagerService = _renderManagerService, this._initViewModelIntercept(), this._initSkeletonChange();
   }
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        tt.CELL_CONTENT,
+        INTERCEPTOR_POINT.CELL_CONTENT,
         {
-          effect: Ze.Style,
-          handler: (o, e, n) => {
-            const { row: t, col: r, unitId: i, subUnitId: s } = e;
-            return this._sheetsThreadCommentModel.showCommentMarker(i, s, t, r) ? n({
-              ...o,
+          effect: InterceptorEffectEnum.Style,
+          handler: /* @__PURE__ */ __name((cell, pos, next) => {
+            const { row, col, unitId, subUnitId } = pos;
+            return this._sheetsThreadCommentModel.showCommentMarker(unitId, subUnitId, row, col) ? next({
+              ...cell,
               markers: {
-                ...o == null ? void 0 : o.markers,
+                ...cell == null ? void 0 : cell.markers,
                 tr: {
                   color: "#FFBD37",
                   size: 6
                 }
               }
-            }) : n(o);
-          },
+            }) : next(cell);
+          }, "handler"),
           priority: 100
         }
       )
     );
   }
   _initSkeletonChange() {
-    const o = () => {
-      var r;
-      const e = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
-      if (!e) return;
-      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(ue(16)).subscribe(() => {
-      o();
+    const markSkeletonDirty = /* @__PURE__ */ __name(() => {
+      var _a9;
+      const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+      if (!workbook) return;
+      const unitId = workbook.getUnitId(), currentRender = this._renderManagerService.getRenderById(unitId);
+      (_a9 = currentRender == null ? void 0 : currentRender.mainComponent) == null || _a9.makeForceDirty();
+    }, "markSkeletonDirty");
+    this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.pipe(debounceTime(16)).subscribe(() => {
+      markSkeletonDirty();
     }));
   }
-};
-W = Vt([
-  L(0, _(ge)),
-  L(1, _(x)),
-  L(2, N),
-  L(3, ye)
-], W);
-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 && 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 = {
-    startColumn: t.column + i,
-    startRow: t.row + r,
-    endColumn: t.column + i,
-    endRow: t.row + r
+}, __name(_a2, "SheetsThreadCommentRenderController"), _a2);
+SheetsThreadCommentRenderController = __decorateClass$6([
+  __decorateParam$6(0, Inject(SheetInterceptorService)),
+  __decorateParam$6(1, Inject(SheetsThreadCommentModel)),
+  __decorateParam$6(2, IUniverInstanceService),
+  __decorateParam$6(3, IRenderManagerService)
+], SheetsThreadCommentRenderController);
+var __defProp$5 = Object.defineProperty, __getOwnPropDesc$5 = Object.getOwnPropertyDescriptor, __decorateClass$5 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$5(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$5(target, key, result), result;
+}, "__decorateClass$5"), __decorateParam$5 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$5");
+const transformRef = /* @__PURE__ */ __name((ref, source, target) => {
+  const refObj = singleReferenceToGrid(ref), offsetRow = target.row - source.row, offsetCol = target.column - source.column, targetRange = {
+    startColumn: refObj.column + offsetCol,
+    startRow: refObj.row + offsetRow,
+    endColumn: refObj.column + offsetCol,
+    endRow: refObj.row + offsetRow
   };
-  return yt(s);
-};
-let Z = class extends $ {
-  constructor(e, n, t) {
+  return serializeRange(targetRange);
+}, "transformRef");
+var _a3;
+let SheetsThreadCommentCopyPasteController = (_a3 = class extends Disposable {
+  constructor(_sheetClipboardService, _sheetsThreadCommentModel, _threadCommentDataSourceService) {
     super();
-    E(this, "_copyInfo");
-    this._sheetClipboardService = e, this._sheetsThreadCommentModel = n, this._threadCommentDataSourceService = t, this._initClipboardHook();
+    __publicField(this, "_copyInfo");
+    this._sheetClipboardService = _sheetClipboardService, this._sheetsThreadCommentModel = _sheetsThreadCommentModel, this._threadCommentDataSourceService = _threadCommentDataSourceService, this._initClipboardHook();
   }
   // eslint-disable-next-line max-lines-per-function
   _initClipboardHook() {
     this.disposeWithMe(
       this._sheetClipboardService.addClipboardHook({
-        id: Ne,
-        onBeforeCopy: (e, n, t) => {
+        id: SHEETS_THREAD_COMMENT,
+        onBeforeCopy: /* @__PURE__ */ __name((unitId, subUnitId, range) => {
           this._copyInfo = {
-            unitId: e,
-            subUnitId: n,
-            range: t
+            unitId,
+            subUnitId,
+            range
           };
-        },
+        }, "onBeforeCopy"),
         // eslint-disable-next-line max-lines-per-function
-        onPasteCells: (e, n, t, r) => {
-          const { unitId: i, subUnitId: s, range: c } = n, a = {
-            row: c.rows[0],
-            column: c.cols[0]
+        onPasteCells: /* @__PURE__ */ __name((_pasteFrom, pasteTo, _data, payload) => {
+          const { unitId: targetUnitId, subUnitId: targetSubUnitId, range } = pasteTo, targetPos = {
+            row: range.rows[0],
+            column: range.cols[0]
           };
-          if (r.copyType === mt.CUT && this._copyInfo) {
-            const { range: m, unitId: u, subUnitId: d } = this._copyInfo, h = {
-              row: m.startRow,
-              column: m.startColumn
+          if (payload.copyType === COPY_TYPE.CUT && this._copyInfo) {
+            const { range: range2, unitId: sourceUnitId, subUnitId: sourceSubUnitId } = this._copyInfo, sourcePos = {
+              row: range2.startRow,
+              column: range2.startColumn
             };
-            if (!(i === u && s === d)) {
-              const l = [];
-              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);
+            if (!(targetUnitId === sourceUnitId && targetSubUnitId === sourceSubUnitId)) {
+              const roots = [];
+              Range.foreach(range2, (row, col) => {
+                const comments = this._sheetsThreadCommentModel.getAllByLocation(sourceUnitId, sourceSubUnitId, row, col);
+                this._threadCommentDataSourceService.syncUpdateMutationToColla ? comments.forEach((comment) => {
+                  roots.push(comment);
+                }) : comments.forEach(({ children, ...comment }) => {
+                  comment.parentId || roots.push(comment);
                 });
               });
-              const f = [], S = [], U = [], D = [], ee = (g) => {
-                f.unshift({
-                  id: F.id,
+              const sourceRedos = [], sourceUndos = [], targetRedos = [], targetUndos = [], handleCommentItem = /* @__PURE__ */ __name((item) => {
+                sourceRedos.unshift({
+                  id: DeleteCommentMutation.id,
                   params: {
-                    unitId: u,
-                    subUnitId: d,
-                    commentId: g.id
+                    unitId: sourceUnitId,
+                    subUnitId: sourceSubUnitId,
+                    commentId: item.id
                   }
-                }), U.push({
-                  id: se.id,
+                }), targetRedos.push({
+                  id: AddCommentMutation.id,
                   params: {
-                    unitId: i,
-                    subUnitId: s,
+                    unitId: targetUnitId,
+                    subUnitId: targetSubUnitId,
                     comment: {
-                      ...g,
-                      ref: kt(g.ref, h, a),
-                      unitId: i,
-                      subUnitId: s
+                      ...item,
+                      ref: transformRef(item.ref, sourcePos, targetPos),
+                      unitId: targetUnitId,
+                      subUnitId: targetSubUnitId
                     },
                     sync: !0
                   }
-                }), S.push({
-                  id: se.id,
+                }), sourceUndos.push({
+                  id: AddCommentMutation.id,
                   params: {
-                    unitId: u,
-                    subUnitId: d,
-                    comment: g,
+                    unitId: sourceUnitId,
+                    subUnitId: sourceSubUnitId,
+                    comment: item,
                     sync: !0
                   }
-                }), D.unshift({
-                  id: F.id,
+                }), targetUndos.unshift({
+                  id: DeleteCommentMutation.id,
                   params: {
-                    unitId: i,
-                    subUnitId: s,
-                    commentId: g.id
+                    unitId: targetUnitId,
+                    subUnitId: targetSubUnitId,
+                    commentId: item.id
                   }
                 });
-              };
-              return l.forEach((g) => {
-                ee(g);
+              }, "handleCommentItem");
+              return roots.forEach((root) => {
+                handleCommentItem(root);
               }), {
-                redos: [...f, ...U],
-                undos: [...D, ...S]
+                redos: [...sourceRedos, ...targetRedos],
+                undos: [...targetUndos, ...sourceUndos]
               };
             }
           }
@@ -271,188 +274,188 @@ let Z = class extends $ {
             redos: [],
             undos: []
           };
-        }
+        }, "onPasteCells")
       })
     );
   }
-};
-Z = Bt([
-  ne(0, _(dt)),
-  ne(1, _(x)),
-  ne(2, Ee)
-], Z);
-var Ft = Object.defineProperty, Wt = Object.getOwnPropertyDescriptor, Zt = (o, e, n, t) => {
-  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;
-}, 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._sheetPermissionCheckController = t, this._initHoverEvent();
+}, __name(_a3, "SheetsThreadCommentCopyPasteController"), _a3);
+SheetsThreadCommentCopyPasteController = __decorateClass$5([
+  __decorateParam$5(0, Inject(ISheetClipboardService)),
+  __decorateParam$5(1, Inject(SheetsThreadCommentModel)),
+  __decorateParam$5(2, IThreadCommentDataSourceService)
+], SheetsThreadCommentCopyPasteController);
+var __defProp$4 = Object.defineProperty, __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor, __decorateClass$4 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$4(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$4(target, key, result), result;
+}, "__decorateClass$4"), __decorateParam$4 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$4"), _a4;
+let SheetsThreadCommentHoverController = (_a4 = class extends Disposable {
+  constructor(_hoverManagerService, _sheetsThreadCommentPopupService, _sheetsThreadCommentModel, _sheetPermissionCheckController) {
+    super(), this._hoverManagerService = _hoverManagerService, this._sheetsThreadCommentPopupService = _sheetsThreadCommentPopupService, this._sheetsThreadCommentModel = _sheetsThreadCommentModel, this._sheetPermissionCheckController = _sheetPermissionCheckController, this._initHoverEvent();
   }
   _initHoverEvent() {
     this.disposeWithMe(
-      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, c = this._sheetsThreadCommentModel.getByLocation(t, r, i, s);
-          if (c) {
+      this._hoverManagerService.currentCell$.pipe(debounceTime(100)).subscribe((cell) => {
+        const currentPopup = this._sheetsThreadCommentPopupService.activePopup;
+        if (cell && (currentPopup && currentPopup.temp || !currentPopup)) {
+          const { location } = cell, { unitId, subUnitId, row, col } = location, commentId = this._sheetsThreadCommentModel.getByLocation(unitId, subUnitId, row, col);
+          if (commentId) {
             if (!this._sheetPermissionCheckController.permissionCheckWithRanges({
-              workbookTypes: [K],
-              worksheetTypes: [Q],
-              rangeTypes: [X]
-            }, [{ startRow: i, startColumn: s, endRow: i, endColumn: s }]))
+              workbookTypes: [WorkbookCommentPermission],
+              worksheetTypes: [WorksheetViewPermission],
+              rangeTypes: [RangeProtectionPermissionViewPoint]
+            }, [{ startRow: row, startColumn: col, endRow: row, endColumn: col }]))
               return;
-            const m = this._sheetsThreadCommentModel.getComment(t, r, c);
-            m && !m.resolved && this._sheetsThreadCommentPopupService.showPopup({
-              unitId: t,
-              subUnitId: r,
-              row: i,
-              col: s,
-              commentId: c,
+            const comment = this._sheetsThreadCommentModel.getComment(unitId, subUnitId, commentId);
+            comment && !comment.resolved && this._sheetsThreadCommentPopupService.showPopup({
+              unitId,
+              subUnitId,
+              row,
+              col,
+              commentId,
               temp: !0
             });
           } else
-            e && this._sheetsThreadCommentPopupService.hidePopup();
+            currentPopup && this._sheetsThreadCommentPopupService.hidePopup();
         }
       })
     );
   }
-};
-z = Zt([
-  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--)
-    (s = o[i]) && (r = (t ? s(e, n, r) : s(r)) || r);
-  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, c, a, m, u) {
+}, __name(_a4, "SheetsThreadCommentHoverController"), _a4);
+SheetsThreadCommentHoverController = __decorateClass$4([
+  __decorateParam$4(0, Inject(HoverManagerService)),
+  __decorateParam$4(1, Inject(SheetsThreadCommentPopupService)),
+  __decorateParam$4(2, Inject(SheetsThreadCommentModel)),
+  __decorateParam$4(3, Inject(SheetPermissionCheckController))
+], SheetsThreadCommentHoverController);
+var __defProp$3 = Object.defineProperty, __getOwnPropDesc$3 = Object.getOwnPropertyDescriptor, __decorateClass$3 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$3(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$3(target, key, result), result;
+}, "__decorateClass$3"), __decorateParam$3 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$3"), _a5;
+let SheetsThreadCommentPopupController = (_a5 = class extends Disposable {
+  constructor(_commandService, _sheetsThreadCommentPopupService, _sheetsThreadCommentModel, _threadCommentPanelService, _univerInstanceService, _sheetPermissionCheckController, _markSelectionService, _sheetSelectionService, _editorBridgeService, _renderManagerService) {
     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._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, 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)
+    __publicField(this, "_isSwitchToCommenting", !1);
+    __publicField(this, "_selectionShapeInfo", null);
+    this._commandService = _commandService, this._sheetsThreadCommentPopupService = _sheetsThreadCommentPopupService, this._sheetsThreadCommentModel = _sheetsThreadCommentModel, this._threadCommentPanelService = _threadCommentPanelService, this._univerInstanceService = _univerInstanceService, this._sheetPermissionCheckController = _sheetPermissionCheckController, this._markSelectionService = _markSelectionService, this._sheetSelectionService = _sheetSelectionService, this._editorBridgeService = _editorBridgeService, this._renderManagerService = _renderManagerService, this._initCommandListener(), this._initPanelListener(), this._initMarkSelection(), this._initSelectionUpdateListener(), this._initEditorBridge();
+  }
+  _handleSelectionChange(selections, unitId, subUnitId) {
+    var _a9, _b, _c;
+    const range = (_a9 = selections[0]) == null ? void 0 : _a9.range, render2 = this._renderManagerService.getRenderById(unitId), skeleton = (_b = render2 == null ? void 0 : render2.with(SheetSkeletonManagerService).getWorksheetSkeleton(subUnitId)) == null ? void 0 : _b.skeleton;
+    if (!skeleton || !range)
       return;
-    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);
+    const actualCell = skeleton.getCellWithCoordByIndex(range.startRow, range.startColumn);
+    if ((((_c = range.rangeType) != null ? _c : RANGE_TYPE.NORMAL) !== RANGE_TYPE.NORMAL || range.endColumn - range.startColumn > 0 || range.endRow - range.startRow > 0) && !((actualCell.isMerged || actualCell.isMergedMainCell) && Rectangle.equals(actualCell.mergeInfo, range))) {
+      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(SetActiveCommentOperation.id);
       return;
     }
-    const m = c.actualRow, u = c.actualColumn;
-    if (!this._sheetsThreadCommentModel.showCommentMarker(n, t, m, u)) {
-      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(te.id);
+    const row = actualCell.actualRow, col = actualCell.actualColumn;
+    if (!this._sheetsThreadCommentModel.showCommentMarker(unitId, subUnitId, row, col)) {
+      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(SetActiveCommentOperation.id);
       return;
     }
-    const d = this._sheetsThreadCommentModel.getByLocation(n, t, m, u);
-    d && this._commandService.executeCommand(te.id, {
-      unitId: n,
-      subUnitId: t,
-      commentId: d
+    const commentId = this._sheetsThreadCommentModel.getByLocation(unitId, subUnitId, row, col);
+    commentId && this._commandService.executeCommand(SetActiveCommentOperation.id, {
+      unitId,
+      subUnitId,
+      commentId
     });
   }
   _initSelectionUpdateListener() {
     this.disposeWithMe(
-      this._sheetSelectionService.selectionMoveEnd$.subscribe((e) => {
+      this._sheetSelectionService.selectionMoveEnd$.subscribe((selections) => {
         if (this._isSwitchToCommenting)
           return;
-        const n = this._sheetSelectionService.currentSelectionParam;
-        n && this._handleSelectionChange(e, n.unitId, n.sheetId);
+        const current = this._sheetSelectionService.currentSelectionParam;
+        current && this._handleSelectionChange(selections, current.unitId, current.sheetId);
       })
     );
   }
   _initEditorBridge() {
     this.disposeWithMe(
-      this._editorBridgeService.visible$.subscribe((e) => {
-        e.visible && this._sheetsThreadCommentPopupService.hidePopup();
+      this._editorBridgeService.visible$.subscribe((visible) => {
+        visible.visible && this._sheetsThreadCommentPopupService.hidePopup();
       })
     );
   }
   _initCommandListener() {
-    this._commandService.onCommandExecuted((e) => {
-      if (e.id === F.id) {
-        const n = e.params, t = this._sheetsThreadCommentPopupService.activePopup;
-        if (!t)
+    this._commandService.onCommandExecuted((commandInfo) => {
+      if (commandInfo.id === DeleteCommentMutation.id) {
+        const params = commandInfo.params, active = this._sheetsThreadCommentPopupService.activePopup;
+        if (!active)
           return;
-        const { unitId: r, subUnitId: i, commentId: s } = t;
-        n.unitId === r && n.subUnitId === i && n.commentId === s && this._sheetsThreadCommentPopupService.hidePopup();
+        const { unitId, subUnitId, commentId } = active;
+        params.unitId === unitId && params.subUnitId === subUnitId && params.commentId === commentId && this._sheetsThreadCommentPopupService.hidePopup();
       }
     });
   }
   _initPanelListener() {
-    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe(async (e) => {
-      var n;
-      if (e) {
-        const { unitId: t, subUnitId: r, commentId: i, trigger: s } = e, c = this._sheetsThreadCommentModel.getComment(t, r, i);
-        if (!c || c.resolved)
+    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe(async (commentInfo) => {
+      var _a9;
+      if (commentInfo) {
+        const { unitId, subUnitId, commentId, trigger } = commentInfo, comment = this._sheetsThreadCommentModel.getComment(unitId, subUnitId, commentId);
+        if (!comment || comment.resolved)
           return;
-        const a = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
-        if (!a || a.getUnitId() !== t)
+        const currentUnit = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+        if (!currentUnit || currentUnit.getUnitId() !== unitId)
           return;
-        this._isSwitchToCommenting = !0, ((n = a.getActiveSheet()) == null ? void 0 : n.getSheetId()) !== r && await this._commandService.executeCommand(nt.id, {
-          unitId: t,
-          subUnitId: r
+        this._isSwitchToCommenting = !0, ((_a9 = currentUnit.getActiveSheet()) == null ? void 0 : _a9.getSheetId()) !== subUnitId && await this._commandService.executeCommand(SetWorksheetActiveOperation.id, {
+          unitId,
+          subUnitId
         }), this._isSwitchToCommenting = !1;
-        const d = V(c.ref), { row: h, column: l } = d;
+        const location = singleReferenceToGrid(comment.ref), { row, column: col } = location;
         if (!this._sheetPermissionCheckController.permissionCheckWithRanges({
-          workbookTypes: [K],
-          worksheetTypes: [Q],
-          rangeTypes: [X]
-        }, [{ startRow: h, startColumn: l, endRow: h, endColumn: l }]))
+          workbookTypes: [WorkbookCommentPermission],
+          worksheetTypes: [WorksheetViewPermission],
+          rangeTypes: [RangeProtectionPermissionViewPoint]
+        }, [{ startRow: row, startColumn: col, endRow: row, endColumn: col }]))
           return;
-        const S = 1;
-        if (await this._commandService.executeCommand(_t.id, {
+        const GAP = 1;
+        if (await this._commandService.executeCommand(ScrollToRangeOperation.id, {
           range: {
-            startRow: Math.max(d.row - S, 0),
-            endRow: d.row + S,
-            startColumn: Math.max(d.column - S, 0),
-            endColumn: d.column + S
+            startRow: Math.max(location.row - GAP, 0),
+            endRow: location.row + GAP,
+            startColumn: Math.max(location.column - GAP, 0),
+            endColumn: location.column + GAP
           }
         }), this._editorBridgeService.isVisible().visible)
           return;
         this._sheetsThreadCommentPopupService.showPopup({
-          unitId: t,
-          subUnitId: r,
-          row: d.row,
-          col: d.column,
-          commentId: c.id,
-          trigger: s
+          unitId,
+          subUnitId,
+          row: location.row,
+          col: location.column,
+          commentId: comment.id,
+          trigger
         });
       } else
         this._sheetsThreadCommentPopupService.hidePopup();
     }));
   }
   _initMarkSelection() {
-    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.pipe(ue(100)).subscribe((e) => {
-      var h, l;
-      if (!e) {
+    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.pipe(debounceTime(100)).subscribe((activeComment) => {
+      var _a9, _b;
+      if (!activeComment) {
         this._selectionShapeInfo && (this._markSelectionService.removeShape(this._selectionShapeInfo.shapeId), this._selectionShapeInfo = null);
         return;
       }
-      const { unitId: n, subUnitId: t, commentId: r } = e;
+      const { unitId, subUnitId, commentId } = activeComment;
       this._selectionShapeInfo && (this._markSelectionService.removeShape(this._selectionShapeInfo.shapeId), this._selectionShapeInfo = null);
-      const i = this._sheetsThreadCommentModel.getComment(n, t, r);
-      if (!i)
+      const comment = this._sheetsThreadCommentModel.getComment(unitId, subUnitId, commentId);
+      if (!comment)
         return;
-      const s = V(i.ref), { row: c, column: a } = s;
-      if (Number.isNaN(c) || Number.isNaN(a))
+      const location = singleReferenceToGrid(comment.ref), { row, column } = location;
+      if (Number.isNaN(row) || Number.isNaN(column))
         return null;
-      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(
+      const worksheet = (_a9 = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET)) == null ? void 0 : _a9.getSheetBySheetId(subUnitId), mergeInfo = (_b = worksheet == null ? void 0 : worksheet.getMergedCell(row, column)) != null ? _b : {
+        startColumn: column,
+        endColumn: column,
+        startRow: row,
+        endRow: row
+      }, shapeId = this._markSelectionService.addShape(
         {
-          range: u,
+          range: mergeInfo,
           style: {
             // hasAutoFill: false,
             fill: "rgb(255, 189, 55, 0.35)",
@@ -465,214 +468,189 @@ let q = class extends $ {
         [],
         -1
       );
-      d && (this._selectionShapeInfo = {
-        ...e,
-        shapeId: d
+      shapeId && (this._selectionShapeInfo = {
+        ...activeComment,
+        shapeId
       });
     }));
   }
-};
-q = Gt([
-  w(0, ce),
-  w(1, _(O)),
-  w(2, _(x)),
-  w(3, _(ae)),
-  w(4, N),
-  w(5, _(Ie)),
-  w(6, Te),
-  w(7, _(Se)),
-  w(8, lt),
-  w(9, ye)
-], q);
-var Jt = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, Kt = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Yt(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;
-}, k = (o, e) => (n, t) => e(n, t, o);
-let G = class extends $ {
-  constructor(o, e, n, t) {
-    super(), this._sheetInterceptorService = o, this._univerInstanceService = e, this._threadCommentModel = n, this._threadCommentDataSourceService = t, this._initSheetChange();
+}, __name(_a5, "SheetsThreadCommentPopupController"), _a5);
+SheetsThreadCommentPopupController = __decorateClass$3([
+  __decorateParam$3(0, ICommandService),
+  __decorateParam$3(1, Inject(SheetsThreadCommentPopupService)),
+  __decorateParam$3(2, Inject(SheetsThreadCommentModel)),
+  __decorateParam$3(3, Inject(ThreadCommentPanelService)),
+  __decorateParam$3(4, IUniverInstanceService),
+  __decorateParam$3(5, Inject(SheetPermissionCheckController)),
+  __decorateParam$3(6, IMarkSelectionService),
+  __decorateParam$3(7, Inject(SheetsSelectionsService)),
+  __decorateParam$3(8, IEditorBridgeService),
+  __decorateParam$3(9, IRenderManagerService)
+], SheetsThreadCommentPopupController);
+var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor, __decorateClass$2 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$2(target, key, result), result;
+}, "__decorateClass$2"), __decorateParam$2 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$2"), _a6;
+let ThreadCommentRemoveSheetsController = (_a6 = class extends Disposable {
+  constructor(_sheetInterceptorService, _univerInstanceService, _threadCommentModel, _threadCommentDataSourceService) {
+    super(), this._sheetInterceptorService = _sheetInterceptorService, this._univerInstanceService = _univerInstanceService, this._threadCommentModel = _threadCommentModel, this._threadCommentDataSourceService = _threadCommentDataSourceService, this._initSheetChange();
   }
   _initSheetChange() {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
-        getMutations: (o) => {
-          var e;
-          if (o.id === rt.id) {
-            const n = o.params, t = n.unitId ? this._univerInstanceService.getUnit(n.unitId) : this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
-            if (!t)
+        getMutations: /* @__PURE__ */ __name((commandInfo) => {
+          var _a9;
+          if (commandInfo.id === RemoveSheetCommand.id) {
+            const params = commandInfo.params, workbook = params.unitId ? this._univerInstanceService.getUnit(params.unitId) : this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+            if (!workbook)
               return { redos: [], undos: [] };
-            const r = t.getUnitId(), i = n.subUnitId || ((e = t.getActiveSheet()) == null ? void 0 : e.getSheetId());
-            if (!i)
+            const unitId = workbook.getUnitId(), subUnitId = params.subUnitId || ((_a9 = workbook.getActiveSheet()) == null ? void 0 : _a9.getSheetId());
+            if (!subUnitId)
               return { redos: [], undos: [] };
-            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,
+            const commentMap = this._threadCommentModel.ensureMap(unitId, subUnitId), comments = Array.from(commentMap.values()).filter((comment) => !comment.parentId), ids = comments.map((comment) => comment.id), shouldSync = this._threadCommentDataSourceService.syncUpdateMutationToColla, redos = ids.map((id) => ({
+              id: DeleteCommentMutation.id,
               params: {
-                unitId: r,
-                subUnitId: i,
-                commentId: h
+                unitId,
+                subUnitId,
+                commentId: id
               }
-            })), d = c.map(({ children: h, ...l }) => ({
-              id: se.id,
+            })), undos = comments.map(({ children, ...comment }) => ({
+              id: AddCommentMutation.id,
               params: {
-                unitId: r,
-                subUnitId: i,
+                unitId,
+                subUnitId,
                 comment: {
-                  ...l,
-                  children: m ? h : void 0
+                  ...comment,
+                  children: shouldSync ? children : void 0
                 },
-                sync: !m
+                sync: !shouldSync
               }
             }));
-            return { redos: u, undos: d };
+            return { redos, undos };
           }
           return { redos: [], undos: [] };
-        }
+        }, "getMutations")
       })
     );
   }
-};
-G = Kt([
-  k(0, _(ge)),
-  k(1, N),
-  k(2, _(Et)),
-  k(3, Ee)
-], G);
-var P = function() {
-  return P = Object.assign || function(o) {
-    for (var e, n = 1, t = arguments.length; n < t; n++) {
-      e = arguments[n];
-      for (var r in e) Object.prototype.hasOwnProperty.call(e, r) && (o[r] = e[r]);
+}, __name(_a6, "ThreadCommentRemoveSheetsController"), _a6);
+ThreadCommentRemoveSheetsController = __decorateClass$2([
+  __decorateParam$2(0, Inject(SheetInterceptorService)),
+  __decorateParam$2(1, IUniverInstanceService),
+  __decorateParam$2(2, Inject(ThreadCommentModel)),
+  __decorateParam$2(3, IThreadCommentDataSourceService)
+], ThreadCommentRemoveSheetsController);
+var __assign = function() {
+  return __assign = Object.assign || function(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && (t[p] = s[p]);
     }
-    return o;
-  }, P.apply(this, arguments);
-}, Qt = function(o, e) {
-  var n = {};
-  for (var t in o) Object.prototype.hasOwnProperty.call(o, t) && e.indexOf(t) < 0 && (n[t] = o[t]);
-  if (o != null && typeof Object.getOwnPropertySymbols == "function")
-    for (var r = 0, t = Object.getOwnPropertySymbols(o); r < t.length; r++)
-      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"]), 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);
+    return t;
+  }, __assign.apply(this, arguments);
+}, __rest = function(s, e) {
+  var t = {};
+  for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0 && (t[p] = s[p]);
+  if (s != null && typeof Object.getOwnPropertySymbols == "function")
+    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
+      e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]) && (t[p[i]] = s[p[i]]);
+  return t;
+}, IconBase = forwardRef(function(props, ref) {
+  var icon = props.icon, id = props.id, className = props.className, extend = props.extend, restProps = __rest(props, ["icon", "id", "className", "extend"]), cls = "univerjs-icon univerjs-icon-".concat(id, " ").concat(className || "").trim(), idSuffix = useRef("_".concat(generateShortUuid()));
+  return render(icon, "".concat(id), { defIds: icon.defIds, idSuffix: idSuffix.current }, __assign({ ref, className: cls }, restProps), extend);
 });
-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) {
-    return De(i, "".concat(e, "-").concat(o.tag, "-").concat(s), n, void 0, r);
+function render(node, id, runtimeProps, rootProps, extend) {
+  return createElement(node.tag, __assign(__assign({ key: id }, replaceRuntimeIdsAndExtInAttrs(node, runtimeProps, extend)), rootProps), (replaceRuntimeIdsInDefs(node, runtimeProps).children || []).map(function(child, index) {
+    return render(child, "".concat(id, "-").concat(node.tag, "-").concat(index), runtimeProps, void 0, extend);
   }));
 }
-function Xt(o, e, n) {
-  var t = P({}, o.attrs);
-  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], c = i[1];
-    typeof c == "string" && (t[s] = c.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
-  })), t;
+__name(render, "render");
+function replaceRuntimeIdsAndExtInAttrs(node, runtimeProps, extend) {
+  var attrs = __assign({}, node.attrs);
+  extend != null && extend.colorChannel1 && attrs.fill === "colorChannel1" && (attrs.fill = extend.colorChannel1);
+  var defIds = runtimeProps.defIds;
+  return !defIds || defIds.length === 0 || (node.tag === "use" && attrs["xlink:href"] && (attrs["xlink:href"] = attrs["xlink:href"] + runtimeProps.idSuffix), Object.entries(attrs).forEach(function(_a9) {
+    var key = _a9[0], value = _a9[1];
+    typeof value == "string" && (attrs[key] = value.replace(/url\(#(.*)\)/, "url(#$1".concat(runtimeProps.idSuffix, ")")));
+  })), attrs;
 }
-function en(o, e) {
-  var n, t = e.defIds;
-  return !t || t.length === 0 ? o : o.tag === "defs" && (!((n = o.children) === null || n === void 0) && n.length) ? P(P({}, o), { children: o.children.map(function(r) {
-    return typeof r.attrs.id == "string" && t && t.indexOf(r.attrs.id) > -1 ? P(P({}, r), { attrs: P(P({}, r.attrs), { id: r.attrs.id + e.idSuffix }) }) : r;
-  }) }) : o;
+__name(replaceRuntimeIdsAndExtInAttrs, "replaceRuntimeIdsAndExtInAttrs");
+function replaceRuntimeIdsInDefs(node, runtimeProps) {
+  var _a9, defIds = runtimeProps.defIds;
+  return !defIds || defIds.length === 0 ? node : node.tag === "defs" && (!((_a9 = node.children) === null || _a9 === void 0) && _a9.length) ? __assign(__assign({}, node), { children: node.children.map(function(child) {
+    return typeof child.attrs.id == "string" && defIds && defIds.indexOf(child.attrs.id) > -1 ? __assign(__assign({}, child), { attrs: __assign(__assign({}, child.attrs), { id: child.attrs.id + runtimeProps.idSuffix }) }) : child;
+  }) }) : node;
 }
-function tn() {
+__name(replaceRuntimeIdsInDefs, "replaceRuntimeIdsInDefs");
+function generateShortUuid() {
   return Math.random().toString(36).substring(2, 8);
 }
-xe.displayName = "UniverIcon";
-var nn = { 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" } }] }, je = Re(function(o, e) {
-  return Ue(xe, Object.assign({}, o, {
+__name(generateShortUuid, "generateShortUuid");
+IconBase.displayName = "UniverIcon";
+var element = { 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" } }] }, CommentSingle = forwardRef(function(props, ref) {
+  return createElement(IconBase, Object.assign({}, props, {
     id: "comment-single",
-    ref: e,
-    icon: nn
+    ref,
+    icon: element
   }));
 });
-je.displayName = "CommentSingle";
-var re = { exports: {} }, j = {};
-/**
- * @license React
- * react-jsx-runtime.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-var ve;
-function rn() {
-  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(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;
-}
-var Ce;
-function on() {
-  return Ce || (Ce = 1, re.exports = rn()), re.exports;
-}
-var Ae = on();
-const sn = () => {
-  const o = R(N), e = R(O), n = A(e.activePopup$), t = R(x);
-  if (A(t.commentUpdate$), !n)
+CommentSingle.displayName = "CommentSingle";
+const SheetsThreadCommentCell = /* @__PURE__ */ __name(() => {
+  const univerInstanceService = useDependency(IUniverInstanceService), sheetsThreadCommentPopupService = useDependency(SheetsThreadCommentPopupService), activePopup = useObservable(sheetsThreadCommentPopupService.activePopup$), sheetThreadCommentModel = useDependency(SheetsThreadCommentModel);
+  if (useObservable(sheetThreadCommentModel.commentUpdate$), !activePopup)
     return null;
-  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 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,
+  const { row, col, unitId, subUnitId, trigger } = activePopup, rootId = sheetThreadCommentModel.getByLocation(unitId, subUnitId, row, col), ref = `${Tools.chatAtABC(col)}${row + 1}`, onClose = /* @__PURE__ */ __name(() => {
+    sheetsThreadCommentPopupService.hidePopup();
+  }, "onClose"), getSubUnitName = /* @__PURE__ */ __name((id) => {
+    var _a9, _b, _c;
+    return (_c = (_b = (_a9 = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET)) == null ? void 0 : _a9.getSheetBySheetId(id)) == null ? void 0 : _b.getName()) != null ? _c : "";
+  }, "getSubUnitName");
+  return /* @__PURE__ */ jsx(
+    ThreadCommentTree,
     {
-      onClick: () => {
-        e.persistPopup();
-      },
+      onClick: /* @__PURE__ */ __name(() => {
+        sheetsThreadCommentPopupService.persistPopup();
+      }, "onClick"),
       prefix: "cell",
-      id: m,
-      unitId: s,
-      subUnitId: c,
-      type: b.UNIVER_SHEET,
-      refStr: u,
-      onClose: d,
-      getSubUnitName: h,
-      autoFocus: a === "context-menu"
+      id: rootId,
+      unitId,
+      subUnitId,
+      type: UniverInstanceType.UNIVER_SHEET,
+      refStr: ref,
+      onClose,
+      getSubUnitName,
+      autoFocus: trigger === "context-menu"
     }
   );
-}, cn = () => {
-  var g;
-  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) => {
-      v[T.getSheetId()] = C;
+}, "SheetsThreadCommentCell"), SheetsThreadCommentPanel = /* @__PURE__ */ __name(() => {
+  var _a9;
+  const markSelectionService = useDependency(IMarkSelectionService), univerInstanceService = useDependency(IUniverInstanceService), sheetsThreadCommentPopupService = useDependency(SheetsThreadCommentPopupService), workbook = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET), unitId = workbook.getUnitId(), commandService = useDependency(ICommandService), subUnitId$ = useMemo(() => workbook.activeSheet$.pipe(map((i) => i == null ? void 0 : i.getSheetId())), [workbook.activeSheet$]), subUnitId = useObservable(subUnitId$, (_a9 = workbook.getActiveSheet()) == null ? void 0 : _a9.getSheetId()), hoverShapeId = useRef(null), panelService = useDependency(ThreadCommentPanelService), activeCommentId = useObservable(panelService.activeCommentId$), panelVisible = useObservable(panelService.panelVisible$, panelService.panelVisible), sortComments = useCallback((comments) => {
+    const worksheets = workbook.getSheets(), sheetIndex = {};
+    worksheets.forEach((sheet, i) => {
+      sheetIndex[sheet.getSheetId()] = i;
     });
-    const M = (T) => T.map((C) => {
-      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]);
+    const sort = /* @__PURE__ */ __name((comments2) => comments2.map((comment) => {
+      var _a10;
+      const ref = singleReferenceToGrid(comment.ref), p = [(_a10 = sheetIndex[comment.subUnitId]) != null ? _a10 : 0, ref.row, ref.column];
+      return { ...comment, p };
+    }).sort((pre, aft) => pre.p[0] === aft.p[0] ? pre.p[1] === aft.p[1] ? pre.p[2] - aft.p[2] : pre.p[1] - aft.p[1] : pre.p[0] - aft.p[0]), "sort");
     return [
-      ...M(p.filter((T) => !T.resolved)),
-      ...M(p.filter((T) => T.resolved))
+      ...sort(comments.filter((comment) => !comment.resolved)),
+      ...sort(comments.filter((comment) => comment.resolved))
     ];
-  }, [t]), l = pe((p) => {
-    var 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: v,
-        endRow: v
+  }, [workbook]), showShape = useCallback((comment) => {
+    var _a10;
+    if (comment.unitId === unitId && comment.subUnitId === subUnitId && !comment.resolved) {
+      const { row, column } = singleReferenceToGrid(comment.ref), worksheet = workbook.getSheetBySheetId(comment.subUnitId), mergeInfo = (_a10 = worksheet == null ? void 0 : worksheet.getMergedCell(row, column)) != null ? _a10 : {
+        startColumn: column,
+        endColumn: column,
+        startRow: row,
+        endRow: row
       };
-      if (!Number.isNaN(v) && !Number.isNaN(M))
-        return o.addShape({
-          range: C,
+      if (!Number.isNaN(row) && !Number.isNaN(column))
+        return markSelectionService.addShape({
+          range: mergeInfo,
           style: {
             // hasAutoFill: false,
             fill: "rgb(255, 189, 55, 0.35)",
@@ -683,162 +661,163 @@ const sn = () => {
           primary: null
         });
     }
-  }, [o, c, r]), f = (p) => {
-    var I, v;
-    return (v = (I = t.getSheetBySheetId(p)) == null ? void 0 : I.getName()) != null ? v : "";
-  }, S = () => {
-    i.executeCommand(H.id);
-  }, U = (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 = () => {
-    a.current && (o.removeShape(a.current), a.current = null);
-  }, ee = (p, I) => {
-    I && n.hidePopup();
-  };
-  return Ut(() => {
-    !d && a.current && o.removeShape(a.current);
-  }, [o, d]), /* @__PURE__ */ Ae.jsx(
-    st,
+    return null;
+  }, [markSelectionService, subUnitId, unitId]), getSubUnitName = /* @__PURE__ */ __name((id) => {
+    var _a10, _b;
+    return (_b = (_a10 = workbook.getSheetBySheetId(id)) == null ? void 0 : _a10.getName()) != null ? _b : "";
+  }, "getSubUnitName"), handleAdd = /* @__PURE__ */ __name(() => {
+    commandService.executeCommand(ShowAddSheetCommentModalOperation.id);
+  }, "handleAdd"), handleHover = /* @__PURE__ */ __name((comment) => {
+    activeCommentId && activeCommentId.unitId === comment.unitId && activeCommentId.subUnitId === comment.subUnitId && activeCommentId.commentId === comment.id || (hoverShapeId.current && (markSelectionService.removeShape(hoverShapeId.current), hoverShapeId.current = null), hoverShapeId.current = showShape(comment));
+  }, "handleHover"), handleLeave = /* @__PURE__ */ __name(() => {
+    hoverShapeId.current && (markSelectionService.removeShape(hoverShapeId.current), hoverShapeId.current = null);
+  }, "handleLeave"), handleResolve = /* @__PURE__ */ __name((id, resolved) => {
+    resolved && sheetsThreadCommentPopupService.hidePopup();
+  }, "handleResolve");
+  return useEffect(() => {
+    !panelVisible && hoverShapeId.current && markSelectionService.removeShape(hoverShapeId.current);
+  }, [markSelectionService, panelVisible]), /* @__PURE__ */ jsx(
+    ThreadCommentPanel,
     {
-      unitId: r,
-      subUnitId$: s,
-      type: b.UNIVER_SHEET,
-      onAdd: S,
-      getSubUnitName: f,
-      onResolve: ee,
-      sortComments: h,
-      onItemEnter: U,
-      onItemLeave: D,
-      onDeleteComment: () => (D(), !0)
+      unitId,
+      subUnitId$,
+      type: UniverInstanceType.UNIVER_SHEET,
+      onAdd: handleAdd,
+      getSubUnitName,
+      onResolve: handleResolve,
+      sortComments,
+      onItemEnter: handleHover,
+      onItemLeave: handleLeave,
+      onDeleteComment: /* @__PURE__ */ __name(() => (handleLeave(), !0), "onDeleteComment")
     }
   );
-}, an = (o) => ({
-  id: H.id,
-  type: Me.BUTTON,
-  icon: de,
+}, "SheetsThreadCommentPanel"), threadCommentMenuFactory = /* @__PURE__ */ __name((accessor) => ({
+  id: ShowAddSheetCommentModalOperation.id,
+  type: MenuItemType.BUTTON,
+  icon: COMMENT_SINGLE_ICON,
   title: "sheetThreadComment.menu.addComment",
-  hidden$: we(o, b.UNIVER_SHEET),
-  disabled$: be(o, {
-    workbookTypes: [K],
-    worksheetTypes: [Q],
-    rangeTypes: [X]
+  hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+  disabled$: getCurrentRangeDisable$(accessor, {
+    workbookTypes: [WorkbookCommentPermission],
+    worksheetTypes: [WorksheetViewPermission],
+    rangeTypes: [RangeProtectionPermissionViewPoint]
   })
-}), un = (o) => ({
-  id: Pe.id,
-  type: Me.BUTTON,
-  icon: de,
+}), "threadCommentMenuFactory"), threadPanelMenuFactory = /* @__PURE__ */ __name((accessor) => ({
+  id: ToggleSheetCommentPanelOperation.id,
+  type: MenuItemType.BUTTON,
+  icon: COMMENT_SINGLE_ICON,
   tooltip: "sheetThreadComment.menu.commentManagement",
-  disabled$: be(o, {
-    workbookTypes: [K],
-    worksheetTypes: [Q],
-    rangeTypes: [X]
+  disabled$: getCurrentRangeDisable$(accessor, {
+    workbookTypes: [WorkbookCommentPermission],
+    worksheetTypes: [WorksheetViewPermission],
+    rangeTypes: [RangeProtectionPermissionViewPoint]
   }),
-  hidden$: we(o, b.UNIVER_SHEET)
-}), dn = {
-  id: H.id,
-  binding: Ct.M | le.CTRL_COMMAND | le.ALT,
-  preconditions: ft
-}, mn = {
-  [St.OTHERS]: {
-    [Pe.id]: {
+  hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET)
+}), "threadPanelMenuFactory"), AddCommentShortcut = {
+  id: ShowAddSheetCommentModalOperation.id,
+  binding: KeyCode.M | MetaKeys.CTRL_COMMAND | MetaKeys.ALT,
+  preconditions: whenSheetEditorFocused
+}, menuSchema = {
+  [RibbonStartGroup.OTHERS]: {
+    [ToggleSheetCommentPanelOperation.id]: {
       order: 1,
-      menuItemFactory: un
+      menuItemFactory: threadPanelMenuFactory
     }
   },
-  [gt.MAIN_AREA]: {
-    [It.OTHERS]: {
-      [H.id]: {
+  [ContextMenuPosition.MAIN_AREA]: {
+    [ContextMenuGroup.OTHERS]: {
+      [ShowAddSheetCommentModalOperation.id]: {
         order: 0,
-        menuItemFactory: an
+        menuItemFactory: threadCommentMenuFactory
       }
     }
   }
 };
-var hn = Object.defineProperty, ln = Object.getOwnPropertyDescriptor, pn = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? ln(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 && hn(e, n, r), r;
-}, oe = (o, e) => (n, t) => e(n, t, o);
-let J = class extends $ {
-  constructor(o, e, n) {
-    super(), this._menuManagerService = o, this._componentManager = e, this._shortcutService = n, this._initMenu(), this._initShortcut(), this._initComponent();
+var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor, __decorateClass$1 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$1(target, key, result), result;
+}, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$1"), _a7;
+let SheetsThreadCommentController = (_a7 = class extends Disposable {
+  constructor(_menuManagerService, _componentManager, _shortcutService) {
+    super(), this._menuManagerService = _menuManagerService, this._componentManager = _componentManager, this._shortcutService = _shortcutService, this._initMenu(), this._initShortcut(), this._initComponent();
   }
   _initShortcut() {
-    this._shortcutService.registerShortcut(dn);
+    this._shortcutService.registerShortcut(AddCommentShortcut);
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(mn);
+    this._menuManagerService.mergeMenu(menuSchema);
   }
   _initComponent() {
     [
-      [$e, sn],
-      [ct, cn],
-      [de, je]
-    ].forEach(([o, e]) => {
-      this._componentManager.register(o, e);
+      [SHEETS_THREAD_COMMENT_MODAL, SheetsThreadCommentCell],
+      [THREAD_COMMENT_PANEL, SheetsThreadCommentPanel],
+      [COMMENT_SINGLE_ICON, CommentSingle]
+    ].forEach(([key, comp]) => {
+      this._componentManager.register(key, comp);
     });
   }
-};
-J = pn([
-  oe(0, Tt),
-  oe(1, _(Pt)),
-  oe(2, bt)
-], J);
-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), He = (o, e, n) => fn(o, typeof e != "symbol" ? e + "" : e, n);
-let Y = class extends Ke {
-  constructor(o = fe, e, n, t) {
-    super(), this._config = o, this._injector = e, this._commandService = n, this._configService = t;
-    const { menu: r, ...i } = Qe(
+}, __name(_a7, "SheetsThreadCommentController"), _a7);
+SheetsThreadCommentController = __decorateClass$1([
+  __decorateParam$1(0, IMenuManagerService),
+  __decorateParam$1(1, Inject(ComponentManager)),
+  __decorateParam$1(2, IShortcutService)
+], SheetsThreadCommentController);
+var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __defNormalProp2 = /* @__PURE__ */ __name((obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, "__defNormalProp"), __decorateClass = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp2(target, key, result), result;
+}, "__decorateClass"), __decorateParam = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam"), __publicField2 = /* @__PURE__ */ __name((obj, key, value) => __defNormalProp2(obj, typeof key != "symbol" ? key + "" : key, value), "__publicField"), _a8;
+let UniverSheetsThreadCommentUIPlugin = (_a8 = class extends Plugin {
+  constructor(_config = defaultPluginConfig, _injector, _commandService, _configService) {
+    super(), this._config = _config, this._injector = _injector, this._commandService = _commandService, this._configService = _configService;
+    const { menu, ...rest } = merge(
       {},
-      fe,
+      defaultPluginConfig,
       this._config
     );
-    r && this._configService.setConfig("menu", r, { merge: !0 }), this._configService.setConfig(Dt, i);
+    menu && this._configService.setConfig("menu", menu, { merge: !0 }), this._configService.setConfig(SHEETS_THREAD_COMMENT_UI_PLUGIN_CONFIG_KEY, rest);
   }
   onStarting() {
     [
-      [J],
-      [W],
-      [Z],
-      [z],
-      [G],
-      [q],
-      [O]
-    ].forEach((o) => {
-      this._injector.add(o);
-    }), [H].forEach((o) => {
-      this._commandService.registerCommand(o);
-    }), this._injector.get(J);
+      [SheetsThreadCommentController],
+      [SheetsThreadCommentRenderController],
+      [SheetsThreadCommentCopyPasteController],
+      [SheetsThreadCommentHoverController],
+      [ThreadCommentRemoveSheetsController],
+      [SheetsThreadCommentPopupController],
+      [SheetsThreadCommentPopupService]
+    ].forEach((dep) => {
+      this._injector.add(dep);
+    }), [ShowAddSheetCommentModalOperation].forEach((command) => {
+      this._commandService.registerCommand(command);
+    }), this._injector.get(SheetsThreadCommentController);
   }
   onReady() {
-    this._injector.get(W), this._injector.get(G);
+    this._injector.get(SheetsThreadCommentRenderController), this._injector.get(ThreadCommentRemoveSheetsController);
   }
   onRendered() {
-    this._injector.get(Z), this._injector.get(z), this._injector.get(q);
-  }
-};
-He(Y, "pluginName", Ne);
-He(Y, "type", b.UNIVER_SHEET);
-Y = vn([
-  Je(at, ot),
-  ie(1, _(Ye)),
-  ie(2, _(ce)),
-  ie(3, Xe)
-], Y);
+    this._injector.get(SheetsThreadCommentCopyPasteController), this._injector.get(SheetsThreadCommentHoverController), this._injector.get(SheetsThreadCommentPopupController);
+  }
+}, __name(_a8, "UniverSheetsThreadCommentUIPlugin"), _a8);
+__publicField2(UniverSheetsThreadCommentUIPlugin, "pluginName", SHEETS_THREAD_COMMENT);
+__publicField2(UniverSheetsThreadCommentUIPlugin, "type", UniverInstanceType.UNIVER_SHEET);
+UniverSheetsThreadCommentUIPlugin = __decorateClass([
+  DependentOn(UniverThreadCommentUIPlugin, UniverSheetsThreadCommentPlugin),
+  __decorateParam(1, Inject(Injector)),
+  __decorateParam(2, Inject(ICommandService)),
+  __decorateParam(3, IConfigService)
+], UniverSheetsThreadCommentUIPlugin);
 export {
-  xn as AddCommentCommand,
-  Dn as DeleteCommentCommand,
-  jn as DeleteCommentTreeCommand,
-  An as IThreadCommentDataSourceService,
-  Vn as ResolveCommentCommand,
-  Ne as SHEETS_THREAD_COMMENT,
-  O as SheetsThreadCommentPopupService,
-  H as ShowAddSheetCommentModalOperation,
-  Y as UniverSheetsThreadCommentUIPlugin,
-  $n as UniverThreadCommentUIPlugin,
-  Hn as UpdateCommentCommand
+  AddCommentCommand,
+  DeleteCommentCommand,
+  DeleteCommentTreeCommand,
+  IThreadCommentDataSourceService2 as IThreadCommentDataSourceService,
+  ResolveCommentCommand,
+  SHEETS_THREAD_COMMENT,
+  SheetsThreadCommentPopupService,
+  ShowAddSheetCommentModalOperation,
+  UniverSheetsThreadCommentUIPlugin,
+  UniverThreadCommentUIPlugin2 as UniverThreadCommentUIPlugin,
+  UpdateCommentCommand
 };