@univerjs/sheets-thread-comment 0.2.5 → 0.2.7

package/lib/es/index.js

@@ -1,86 +1,91 @@
-var xe = Object.defineProperty;
-var Ve = (o, e, n) => e in o ? xe(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n;
-var w = (o, e, n) => Ve(o, typeof e != "symbol" ? e + "" : e, n);
-import { Inject as l, Disposable as R, DisposableCollection as Ae, useDependency as y, IUniverInstanceService as N, Tools as me, UniverInstanceType as b, CommandType as je, ICommandService as re, OnLifecycle as B, LifecycleStages as H, Injector as pe, Range as Be, DependentOn as He, Plugin as Le } from "@univerjs/core";
-import { ICommandService as vn, Inject as _n, Injector as fn, Plugin as Cn, UniverInstanceType as Sn } from "@univerjs/core";
-import { ThreadCommentTree as ke, ThreadCommentPanelService as oe, ThreadCommentPanel as Fe, ToggleSheetCommentPanelOperation as We, SetActiveCommentOperation as ae, THREAD_COMMENT_PANEL as Ze, UniverThreadCommentUIPlugin as ze } from "@univerjs/thread-comment-ui";
-import { IThreadCommentMentionDataService as gn, UniverThreadCommentUIPlugin as Pn } from "@univerjs/thread-comment-ui";
-import { IZenZoneService as Ge, useObservable as V, KeyCode as Ke, MetaKeys as ce, MenuItemType as le, MenuPosition as ve, getMenuHiddenObservable as _e, MenuGroup as Ye, ComponentManager as qe, IMenuService as Xe, IShortcutService as Je } from "@univerjs/ui";
-import { SheetsSelectionsService as Qe, getSheetCommandTarget as et, WorkbookCommentPermission as q, WorksheetViewPermission as X, RangeProtectionPermissionViewPoint as J, SetSelectionsOperation as tt, SelectionMoveType as nt, SetWorksheetActiveOperation as rt, SheetInterceptorService as fe, INTERCEPTOR_POINT as ot, RemoveSheetCommand as it } from "@univerjs/sheets";
-import { singleReferenceToGrid as j, serializeRange as st } from "@univerjs/engine-formula";
-import { DeleteCommentMutation as K, IThreadCommentDataSourceService as Ce, AddCommentMutation as ne, ThreadCommentModel as at } from "@univerjs/thread-comment";
-import { IThreadCommentDataSourceService as bn } from "@univerjs/thread-comment";
-import { SheetCanvasPopManagerService as ct, IMarkSelectionService as Se, whenSheetEditorFocused as ut, getCurrentRangeDisable$ as Ie, SheetPermissionInterceptorBaseController as ge, ScrollToRangeOperation as dt, SheetSkeletonManagerService as ht, ISheetClipboardService as mt, COPY_TYPE as pt, HoverManagerService as lt } from "@univerjs/sheets-ui";
-import { SheetsThreadCommentModel as $, UniverSheetsThreadCommentBasePlugin as vt } from "@univerjs/sheets-thread-comment-base";
-import { SheetsThreadCommentModel as Mn } from "@univerjs/sheets-thread-comment-base";
-import Pe, { forwardRef as Te, useRef as be, createElement as we, useMemo as _t, useCallback as ue, useEffect as ft } from "react";
-import { BehaviorSubject as Ct, map as St, debounceTime as Me } from "rxjs";
-import { IRenderManagerService as It } from "@univerjs/engine-render";
-var I = function() {
-  return I = 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]);
+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, useDependency, IUniverInstanceService, Tools, UniverInstanceType, CommandType, ICommandService, OnLifecycle, LifecycleStages, Injector, Range, DependentOn, Plugin } from "@univerjs/core";
+import { ICommandService as ICommandService2, Inject as Inject2, Injector as Injector2, Plugin as Plugin2, UniverInstanceType as UniverInstanceType2 } from "@univerjs/core";
+import { ThreadCommentTree, ThreadCommentPanelService, ThreadCommentPanel, ToggleSheetCommentPanelOperation, SetActiveCommentOperation, THREAD_COMMENT_PANEL, UniverThreadCommentUIPlugin } from "@univerjs/thread-comment-ui";
+import { IThreadCommentMentionDataService, UniverThreadCommentUIPlugin as UniverThreadCommentUIPlugin2 } from "@univerjs/thread-comment-ui";
+import { IZenZoneService, useObservable, KeyCode, MetaKeys, MenuItemType, MenuPosition, getMenuHiddenObservable, MenuGroup, ComponentManager, IMenuService, IShortcutService } from "@univerjs/ui";
+import { SheetsSelectionsService, getSheetCommandTarget, WorkbookCommentPermission, WorksheetViewPermission, RangeProtectionPermissionViewPoint, SetSelectionsOperation, SelectionMoveType, SetWorksheetActiveOperation, SheetInterceptorService, INTERCEPTOR_POINT, RemoveSheetCommand } from "@univerjs/sheets";
+import { singleReferenceToGrid, serializeRange } from "@univerjs/engine-formula";
+import { DeleteCommentMutation, IThreadCommentDataSourceService, AddCommentMutation, ThreadCommentModel } from "@univerjs/thread-comment";
+import { IThreadCommentDataSourceService as IThreadCommentDataSourceService2 } from "@univerjs/thread-comment";
+import { SheetCanvasPopManagerService, IMarkSelectionService, whenSheetEditorFocused, getCurrentRangeDisable$, SheetPermissionInterceptorBaseController, ScrollToRangeOperation, SheetSkeletonManagerService, ISheetClipboardService, COPY_TYPE, HoverManagerService } from "@univerjs/sheets-ui";
+import { SheetsThreadCommentModel, UniverSheetsThreadCommentBasePlugin } from "@univerjs/sheets-thread-comment-base";
+import { SheetsThreadCommentModel as SheetsThreadCommentModel2 } from "@univerjs/sheets-thread-comment-base";
+import React, { forwardRef, useRef, createElement, useMemo, useCallback, useEffect } from "react";
+import { BehaviorSubject, map, debounceTime } from "rxjs";
+import { IRenderManagerService } from "@univerjs/engine-render";
+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;
-  }, I.apply(this, arguments);
-}, gt = 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;
-}, ye = Te(function(o, e) {
-  var n = o.icon, t = o.id, r = o.className, i = o.extend, s = gt(o, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(t, " ").concat(r || "").trim(), c = be("_".concat(bt()));
-  return Oe(n, "".concat(t), { defIds: n.defIds, idSuffix: c.current }, I({ ref: e, className: a }, 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 Oe(o, e, n, t, r) {
-  return we(o.tag, I(I({ key: e }, Pt(o, n, r)), t), (Tt(o, n).children || []).map(function(i, s) {
-    return Oe(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 Pt(o, e, n) {
-  var t = I({}, 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], a = i[1];
-    typeof a == "string" && (t[s] = a.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(_a8) {
+    var key = _a8[0], value = _a8[1];
+    typeof value == "string" && (attrs[key] = value.replace(/url\(#(.*)\)/, "url(#$1".concat(runtimeProps.idSuffix, ")")));
+  })), attrs;
 }
-function Tt(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) ? I(I({}, o), { children: o.children.map(function(r) {
-    return typeof r.attrs.id == "string" && t && t.indexOf(r.attrs.id) > -1 ? I(I({}, r), { attrs: I(I({}, r.attrs), { id: r.attrs.id + e.idSuffix }) }) : r;
-  }) }) : o;
+__name(replaceRuntimeIdsAndExtInAttrs, "replaceRuntimeIdsAndExtInAttrs");
+function replaceRuntimeIdsInDefs(node, runtimeProps) {
+  var _a8, defIds = runtimeProps.defIds;
+  return !defIds || defIds.length === 0 ? node : node.tag === "defs" && (!((_a8 = node.children) === null || _a8 === void 0) && _a8.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 bt() {
+__name(replaceRuntimeIdsInDefs, "replaceRuntimeIdsInDefs");
+function generateShortUuid() {
   return Math.random().toString(36).substring(2, 8);
 }
-ye.displayName = "UniverIcon";
-var wt = { 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" } }] }, Ee = Te(function(o, e) {
-  return we(ye, 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: wt
+    ref,
+    icon: element
   }));
 });
-Ee.displayName = "CommentSingle";
-const Ue = "univer.sheet.thread-comment-modal", ie = "comment-single", Re = "SHEET_THREAD_COMMENT";
-var Mt = Object.defineProperty, yt = Object.getOwnPropertyDescriptor, Ot = (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 && Mt(e, n, r), r;
-}, de = (o, e) => (n, t) => e(n, t, o);
-let O = class extends R {
-  constructor(e, n) {
+CommentSingle.displayName = "CommentSingle";
+const SHEETS_THREAD_COMMENT_MODAL = "univer.sheet.thread-comment-modal", COMMENT_SINGLE_ICON = "comment-single", SHEETS_THREAD_COMMENT = "SHEET_THREAD_COMMENT";
+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"), _a;
+let SheetsThreadCommentPopupService = (_a = class extends Disposable {
+  constructor(_canvasPopupManagerService, _zenZoneService) {
     super();
-    w(this, "_lastPopup", null);
-    w(this, "_activePopup");
-    w(this, "_activePopup$", new Ct(null));
-    w(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();
     });
   }
@@ -88,28 +93,28 @@ let O = class extends R {
     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 u;
-    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 === ((u = this.activePopup) == null ? void 0 : u.subUnitId)) {
-      this._activePopup = e, this._activePopup$.next(e);
+  showPopup(location, onHide) {
+    var _a8;
+    const { row, col, unitId, subUnitId } = location;
+    if (this._activePopup && row === this._activePopup.row && col === this._activePopup.col && unitId === this._activePopup.unitId && subUnitId === ((_a8 = this.activePopup) == null ? void 0 : _a8.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 a = this._canvasPopupManagerService.attachPopupToCell(
-      t,
-      r,
+    this._activePopup = location, this._activePopup$.next(location);
+    const popupDisposable = this._canvasPopupManagerService.attachPopupToCell(
+      row,
+      col,
       {
-        componentKey: Ue,
-        onClickOutside: () => {
+        componentKey: SHEETS_THREAD_COMMENT_MODAL,
+        onClickOutside: /* @__PURE__ */ __name(() => {
           this.hidePopup();
-        },
+        }, "onClickOutside"),
         direction: "horizontal",
         excludeOutside: [
           ...Array.from(document.querySelectorAll(".univer-thread-comment")),
@@ -117,14 +122,14 @@ let O = class extends R {
         ].filter(Boolean)
       }
     );
-    if (!a)
+    if (!popupDisposable)
       throw new Error("[SheetsThreadCommentPopupService]: cannot show popup!");
-    const c = new Ae();
-    c.add(a), c.add({
-      dispose: () => {
-        n == null || n();
-      }
-    }), this._lastPopup = c;
+    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));
@@ -135,92 +140,92 @@ let O = class extends R {
       temp: !1
     }, this._activePopup$.next(this._activePopup));
   }
-};
-O = Ot([
-  de(0, l(ct)),
-  de(1, Ge)
-], O);
-const Et = () => {
-  const o = y(N), e = y(O), n = V(e.activePopup$), t = y($);
-  if (V(t.commentUpdate$), !n)
+}, __name(_a, "SheetsThreadCommentPopupService"), _a);
+SheetsThreadCommentPopupService = __decorateClass$6([
+  __decorateParam$6(0, Inject(SheetCanvasPopManagerService)),
+  __decorateParam$6(1, IZenZoneService)
+], SheetsThreadCommentPopupService);
+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: a, trigger: c } = n, u = t.getByLocation(s, a, r, i), h = `${me.chatAtABC(i)}${r + 1}`, d = () => {
-    e.hidePopup();
-  }, p = (v) => {
-    var g, f, E;
-    return (E = (f = (g = o.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : g.getSheetBySheetId(v)) == null ? void 0 : f.getName()) != null ? E : "";
-  };
-  return /* @__PURE__ */ Pe.createElement(
-    ke,
+  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 _a8, _b, _c;
+    return (_c = (_b = (_a8 = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET)) == null ? void 0 : _a8.getSheetBySheetId(id)) == null ? void 0 : _b.getName()) != null ? _c : "";
+  }, "getSubUnitName");
+  return /* @__PURE__ */ React.createElement(
+    ThreadCommentTree,
     {
-      onClick: () => {
-        e.persistPopup();
-      },
+      onClick: /* @__PURE__ */ __name(() => {
+        sheetsThreadCommentPopupService.persistPopup();
+      }, "onClick"),
       prefix: "cell",
-      id: u,
-      unitId: s,
-      subUnitId: a,
-      type: b.UNIVER_SHEET,
-      refStr: h,
-      onClose: d,
-      getSubUnitName: p,
-      autoFocus: c === "context-menu"
+      id: rootId,
+      unitId,
+      subUnitId,
+      type: UniverInstanceType.UNIVER_SHEET,
+      refStr: ref,
+      onClose,
+      getSubUnitName,
+      autoFocus: trigger === "context-menu"
     }
   );
-}, Q = {
-  type: je.OPERATION,
+}, "SheetsThreadCommentCell"), ShowAddSheetCommentModalOperation = {
+  type: CommandType.OPERATION,
   id: "sheets.operation.show-comment-modal",
-  handler(o) {
-    var g;
-    const e = o.get(Qe), n = o.get(N), t = o.get(O), r = o.get(oe), i = (g = e.getCurrentLastSelection()) == null ? void 0 : g.primary, s = o.get($);
-    if (!i)
+  handler(accessor) {
+    var _a8;
+    const selectionManagerService = accessor.get(SheetsSelectionsService), univerInstanceService = accessor.get(IUniverInstanceService), sheetsThreadCommentPopupService = accessor.get(SheetsThreadCommentPopupService), threadCommentPanelService = accessor.get(ThreadCommentPanelService), activeCell = (_a8 = selectionManagerService.getCurrentLastSelection()) == null ? void 0 : _a8.primary, model = accessor.get(SheetsThreadCommentModel);
+    if (!activeCell)
       return !1;
-    const a = et(n);
-    if (!a)
+    const result = getSheetCommandTarget(univerInstanceService);
+    if (!result)
       return !1;
-    const { workbook: c, worksheet: u, unitId: h, subUnitId: d } = a, p = {
-      workbook: c,
-      worksheet: u,
-      unitId: h,
-      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(p);
-    const v = s.getByLocation(h, d, i.startRow, i.startColumn);
-    return v && r.setActiveComment({
-      unitId: h,
-      subUnitId: d,
-      commentId: v,
+    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;
   }
-}, Ut = () => {
-  var C;
-  const o = y(Se), e = y(N), n = y(O), t = e.getCurrentUnitForType(b.UNIVER_SHEET), r = t.getUnitId(), i = y(re), s = _t(() => t.activeSheet$.pipe(St((m) => m == null ? void 0 : m.getSheetId())), [t.activeSheet$]), a = V(s, (C = t.getActiveSheet()) == null ? void 0 : C.getSheetId()), c = be(), u = y(oe), h = V(u.activeCommentId$), d = V(u.panelVisible$, u.panelVisible), p = ue((m) => {
-    const _ = t.getSheets(), S = {};
-    _.forEach((U, P) => {
-      S[U.getSheetId()] = P;
+}, SheetsThreadCommentPanel = /* @__PURE__ */ __name(() => {
+  var _a8;
+  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$, (_a8 = workbook.getActiveSheet()) == null ? void 0 : _a8.getSheetId()), hoverShapeId = useRef(), 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 x = (U) => U.map((P) => {
-      var se;
-      const M = j(P.ref), De = [(se = S[P.subUnitId]) != null ? se : 0, M.row, M.column];
-      return { ...P, p: De };
-    }).sort((P, M) => P.p[0] === M.p[0] ? P.p[1] === M.p[1] ? P.p[2] - M.p[2] : P.p[1] - M.p[1] : P.p[0] - M.p[0]);
+    const sort = /* @__PURE__ */ __name((comments2) => comments2.map((comment) => {
+      var _a9;
+      const ref = singleReferenceToGrid(comment.ref), p = [(_a9 = sheetIndex[comment.subUnitId]) != null ? _a9 : 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 [
-      ...x(m.filter((U) => !U.resolved)),
-      ...x(m.filter((U) => U.resolved))
+      ...sort(comments.filter((comment) => !comment.resolved)),
+      ...sort(comments.filter((comment) => comment.resolved))
     ];
-  }, [t]), v = ue((m) => {
-    if (m.unitId === r && m.subUnitId === a && !m.resolved) {
-      const { row: _, column: S } = j(m.ref);
-      if (!Number.isNaN(_) && !Number.isNaN(S))
-        return o.addShape({
+  }, [workbook]), showShape = useCallback((comment) => {
+    if (comment.unitId === unitId && comment.subUnitId === subUnitId && !comment.resolved) {
+      const { row, column } = singleReferenceToGrid(comment.ref);
+      if (!Number.isNaN(row) && !Number.isNaN(column))
+        return markSelectionService.addShape({
           range: {
-            startColumn: S,
-            endColumn: S,
-            startRow: _,
-            endRow: _
+            startColumn: column,
+            endColumn: column,
+            startRow: row,
+            endRow: row
           },
           style: {
             hasAutoFill: !1,
@@ -232,197 +237,200 @@ const Et = () => {
           primary: null
         });
     }
-  }, [o, a, r]), g = (m) => {
-    var _, S;
-    return (S = (_ = t.getSheetBySheetId(m)) == null ? void 0 : _.getName()) != null ? S : "";
-  }, f = () => {
-    i.executeCommand(Q.id);
-  }, E = (m) => {
-    h && h.unitId === m.unitId && h.subUnitId === m.subUnitId && h.commentId === m.id || (c.current && (o.removeShape(c.current), c.current = null), c.current = v(m));
-  }, D = () => {
-    c.current && (o.removeShape(c.current), c.current = null);
-  }, ee = (m, _) => {
-    _ && n.hidePopup();
-  };
-  return ft(() => {
-    !d && c.current && o.removeShape(c.current);
-  }, [o, d]), /* @__PURE__ */ Pe.createElement(
-    Fe,
+  }, [markSelectionService, subUnitId, unitId]), getSubUnitName = /* @__PURE__ */ __name((id) => {
+    var _a9, _b;
+    return (_b = (_a9 = workbook.getSheetBySheetId(id)) == null ? void 0 : _a9.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__ */ React.createElement(
+    ThreadCommentPanel,
     {
-      unitId: r,
-      subUnitId$: s,
-      type: b.UNIVER_SHEET,
-      onAdd: f,
-      getSubUnitName: g,
-      onResolve: ee,
-      sortComments: p,
-      onItemEnter: E,
-      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")
     }
   );
-}, Rt = (o) => ({
-  id: Q.id,
-  type: le.BUTTON,
-  positions: [ve.CONTEXT_MENU],
-  icon: ie,
+}, "SheetsThreadCommentPanel"), threadCommentMenuFactory = /* @__PURE__ */ __name((accessor) => ({
+  id: ShowAddSheetCommentModalOperation.id,
+  type: MenuItemType.BUTTON,
+  positions: [MenuPosition.CONTEXT_MENU],
+  icon: COMMENT_SINGLE_ICON,
   title: "sheetThreadComment.menu.addComment",
-  hidden$: _e(o, b.UNIVER_SHEET),
-  disabled$: Ie(o, {
-    workbookTypes: [q],
-    worksheetTypes: [X],
-    rangeTypes: [J]
+  hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+  disabled$: getCurrentRangeDisable$(accessor, {
+    workbookTypes: [WorkbookCommentPermission],
+    worksheetTypes: [WorksheetViewPermission],
+    rangeTypes: [RangeProtectionPermissionViewPoint]
   })
-}), Nt = (o) => ({
-  id: We.id,
-  type: le.BUTTON,
-  icon: ie,
+}), "threadCommentMenuFactory"), threadPanelMenuFactory = /* @__PURE__ */ __name((accessor) => ({
+  id: ToggleSheetCommentPanelOperation.id,
+  type: MenuItemType.BUTTON,
+  icon: COMMENT_SINGLE_ICON,
   tooltip: "sheetThreadComment.menu.commentManagement",
-  positions: ve.TOOLBAR_START,
-  group: Ye.TOOLBAR_OTHERS,
-  disabled$: Ie(o, {
-    workbookTypes: [q],
-    worksheetTypes: [X],
-    rangeTypes: [J]
+  positions: MenuPosition.TOOLBAR_START,
+  group: MenuGroup.TOOLBAR_OTHERS,
+  disabled$: getCurrentRangeDisable$(accessor, {
+    workbookTypes: [WorkbookCommentPermission],
+    worksheetTypes: [WorksheetViewPermission],
+    rangeTypes: [RangeProtectionPermissionViewPoint]
   }),
-  hidden$: _e(o, b.UNIVER_SHEET)
-}), $t = {
-  id: Q.id,
-  binding: Ke.M | ce.CTRL_COMMAND | ce.ALT,
-  preconditions: ut
+  hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET)
+}), "threadPanelMenuFactory"), AddCommentShortcut = {
+  id: ShowAddSheetCommentModalOperation.id,
+  binding: KeyCode.M | MetaKeys.CTRL_COMMAND | MetaKeys.ALT,
+  preconditions: whenSheetEditorFocused
 };
-var Dt = Object.defineProperty, xt = Object.getOwnPropertyDescriptor, Vt = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? xt(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 && Dt(e, n, r), r;
-}, T = (o, e) => (n, t) => e(n, t, o);
-const At = {};
-let A = class extends R {
-  constructor(e, n, t, r, i, s, a, c, u, h, d, p) {
+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 DefaultSheetsThreadCommentConfig = {};
+var _a2;
+let SheetsThreadCommentController = (_a2 = class extends Disposable {
+  constructor(_config, _menuService, _injector, _componentManager, _commandService, _sheetsThreadCommentPopupService, _sheetsThreadCommentModel, _threadCommentPanelService, _shortcutService, _univerInstanceService, _sheetPermissionInterceptorBaseController, _markSelectionService) {
     super();
-    w(this, "_isSwitchToCommenting", !1);
-    w(this, "_selectionShapeInfo", null);
-    this._config = e, this._menuService = n, this._injector = t, this._componentManager = r, this._commandService = i, this._sheetsThreadCommentPopupService = s, this._sheetsThreadCommentModel = a, this._threadCommentPanelService = c, this._shortcutService = u, this._univerInstanceService = h, this._sheetPermissionInterceptorBaseController = d, this._markSelectionService = p, this._initMenu(), this._initShortcut(), this._initComponent(), this._initCommandListener(), this._initPanelListener(), this._initMarkSelection();
+    __publicField(this, "_isSwitchToCommenting", !1);
+    __publicField(this, "_selectionShapeInfo", null);
+    this._config = _config, this._menuService = _menuService, this._injector = _injector, this._componentManager = _componentManager, this._commandService = _commandService, this._sheetsThreadCommentPopupService = _sheetsThreadCommentPopupService, this._sheetsThreadCommentModel = _sheetsThreadCommentModel, this._threadCommentPanelService = _threadCommentPanelService, this._shortcutService = _shortcutService, this._univerInstanceService = _univerInstanceService, this._sheetPermissionInterceptorBaseController = _sheetPermissionInterceptorBaseController, this._markSelectionService = _markSelectionService, this._initMenu(), this._initShortcut(), this._initComponent(), this._initCommandListener(), this._initPanelListener(), this._initMarkSelection();
   }
   _initShortcut() {
-    this._shortcutService.registerShortcut($t);
+    this._shortcutService.registerShortcut(AddCommentShortcut);
   }
   _initCommandListener() {
-    this._commandService.onCommandExecuted((e) => {
-      var n;
-      if (e.id === tt.id) {
+    this._commandService.onCommandExecuted((commandInfo) => {
+      var _a8;
+      if (commandInfo.id === SetSelectionsOperation.id) {
         if (this._isSwitchToCommenting)
           return;
-        const t = e.params, { unitId: r, subUnitId: i, selections: s, type: a } = t;
-        if ((a === nt.MOVE_END || a === void 0) && ((n = s[0]) != null && n.primary)) {
-          const c = s[0].range;
-          if (c.endColumn - c.startColumn > 0 || c.endRow - c.startRow > 0)
+        const params = commandInfo.params, { unitId, subUnitId, selections, type } = params;
+        if ((type === SelectionMoveType.MOVE_END || type === void 0) && ((_a8 = selections[0]) != null && _a8.primary)) {
+          const range = selections[0].range;
+          if (range.endColumn - range.startColumn > 0 || range.endRow - range.startRow > 0) {
+            this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(SetActiveCommentOperation.id);
             return;
-          const u = s[0].primary.actualRow, h = s[0].primary.actualColumn;
-          if (!this._sheetsThreadCommentModel.showCommentMarker(r, i, u, h)) {
-            this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(ae.id);
+          }
+          const row = selections[0].primary.actualRow, col = selections[0].primary.actualColumn;
+          if (!this._sheetsThreadCommentModel.showCommentMarker(unitId, subUnitId, row, col)) {
+            this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(SetActiveCommentOperation.id);
             return;
           }
-          const d = this._sheetsThreadCommentModel.getByLocation(r, i, u, h);
-          d && this._commandService.executeCommand(ae.id, {
-            unitId: r,
-            subUnitId: i,
-            commentId: d
+          const commentId = this._sheetsThreadCommentModel.getByLocation(unitId, subUnitId, row, col);
+          commentId && this._commandService.executeCommand(SetActiveCommentOperation.id, {
+            unitId,
+            subUnitId,
+            commentId
           });
         }
       }
-      if (e.id === K.id) {
-        const t = e.params, r = this._sheetsThreadCommentPopupService.activePopup;
-        if (!r)
+      if (commandInfo.id === DeleteCommentMutation.id) {
+        const params = commandInfo.params, active = this._sheetsThreadCommentPopupService.activePopup;
+        if (!active)
           return;
-        const { unitId: i, subUnitId: s, commentId: a } = r;
-        t.unitId === i && t.subUnitId === s && t.commentId === a && this._sheetsThreadCommentPopupService.hidePopup();
+        const { unitId, subUnitId, commentId } = active;
+        params.unitId === unitId && params.subUnitId === subUnitId && params.commentId === commentId && this._sheetsThreadCommentPopupService.hidePopup();
       }
     });
   }
   _initMenu() {
-    const { menu: e = {} } = this._config;
+    const { menu = {} } = this._config;
     [
-      Rt,
-      Nt
-    ].forEach((n) => {
-      this._menuService.addMenuItem(n(this._injector), e);
+      threadCommentMenuFactory,
+      threadPanelMenuFactory
+    ].forEach((menuFactory) => {
+      this._menuService.addMenuItem(menuFactory(this._injector), menu);
     });
   }
   _initComponent() {
     [
-      [Ue, Et],
-      [Ze, Ut],
-      [ie, Ee]
-    ].forEach(([e, n]) => {
-      this._componentManager.register(e, n);
+      [SHEETS_THREAD_COMMENT_MODAL, SheetsThreadCommentCell],
+      [THREAD_COMMENT_PANEL, SheetsThreadCommentPanel],
+      [COMMENT_SINGLE_ICON, CommentSingle]
+    ].forEach(([key, comp]) => {
+      this._componentManager.register(key, comp);
     });
   }
   _initPanelListener() {
-    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)
+    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe(async (commentInfo) => {
+      var _a8;
+      if (commentInfo) {
+        const { unitId, subUnitId, commentId, trigger } = commentInfo, comment = this._sheetsThreadCommentModel.getComment(unitId, subUnitId, commentId);
+        if (!comment || comment.resolved)
           return;
-        const c = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
-        if (!c || c.getUnitId() !== t)
+        const currentUnit = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+        if (!currentUnit || currentUnit.getUnitId() !== unitId)
           return;
-        this._isSwitchToCommenting = !0, ((n = c.getActiveSheet()) == null ? void 0 : n.getSheetId()) !== r && await this._commandService.executeCommand(rt.id, {
-          unitId: t,
-          subUnitId: r
+        this._isSwitchToCommenting = !0, ((_a8 = currentUnit.getActiveSheet()) == null ? void 0 : _a8.getSheetId()) !== subUnitId && await this._commandService.executeCommand(SetWorksheetActiveOperation.id, {
+          unitId,
+          subUnitId
         }), this._isSwitchToCommenting = !1;
-        const d = j(a.ref), { row: p, column: v } = d;
+        const location = singleReferenceToGrid(comment.ref), { row, column: col } = location;
         if (!this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
-          workbookTypes: [q],
-          worksheetTypes: [X],
-          rangeTypes: [J]
-        }, [{ startRow: p, startColumn: v, endRow: p, endColumn: v }]))
+          workbookTypes: [WorkbookCommentPermission],
+          worksheetTypes: [WorksheetViewPermission],
+          rangeTypes: [RangeProtectionPermissionViewPoint]
+        }, [{ startRow: row, startColumn: col, endRow: row, endColumn: col }]))
           return;
-        const f = 1;
-        await this._commandService.executeCommand(dt.id, {
+        const GAP = 1;
+        await this._commandService.executeCommand(ScrollToRangeOperation.id, {
           range: {
-            startRow: Math.max(d.row - f, 0),
-            endRow: d.row + f,
-            startColumn: Math.max(d.column - f, 0),
-            endColumn: d.column + f
+            startRow: Math.max(location.row - GAP, 0),
+            endRow: location.row + GAP,
+            startColumn: Math.max(location.column - GAP, 0),
+            endColumn: location.column + GAP
           }
         }), this._sheetsThreadCommentPopupService.showPopup({
-          unitId: t,
-          subUnitId: r,
-          row: d.row,
-          col: d.column,
-          commentId: a.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$.subscribe((e) => {
-      if (!e) {
+    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe((activeComment) => {
+      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;
       if (this._selectionShapeInfo) {
-        if (this._selectionShapeInfo.unitId === n && this._selectionShapeInfo.subUnitId === t && this._selectionShapeInfo.commentId === r)
+        if (this._selectionShapeInfo.unitId === unitId && this._selectionShapeInfo.subUnitId === subUnitId && this._selectionShapeInfo.commentId === commentId)
           return;
         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 = j(i.ref), { row: a, column: c } = s;
-      if (Number.isNaN(a) || Number.isNaN(c))
+      const location = singleReferenceToGrid(comment.ref), { row, column } = location;
+      if (Number.isNaN(row) || Number.isNaN(column))
         return;
-      const u = this._markSelectionService.addShape({
+      const shapeId = this._markSelectionService.addShape({
         range: {
-          startColumn: c,
-          endColumn: c,
-          startRow: a,
-          endRow: a
+          startColumn: column,
+          endColumn: column,
+          startRow: row,
+          endRow: row
         },
         style: {
           hasAutoFill: !1,
@@ -433,180 +441,181 @@ let A = class extends R {
         },
         primary: null
       });
-      u && (this._selectionShapeInfo = {
-        ...e,
-        shapeId: u
+      shapeId && (this._selectionShapeInfo = {
+        ...activeComment,
+        shapeId
       });
     }));
   }
-};
-A = Vt([
-  B(H.Starting, A),
-  T(1, Xe),
-  T(2, l(pe)),
-  T(3, l(qe)),
-  T(4, re),
-  T(5, l(O)),
-  T(6, l($)),
-  T(7, l(oe)),
-  T(8, Je),
-  T(9, N),
-  T(10, l(ge)),
-  T(11, Se)
-], A);
-var jt = Object.defineProperty, Bt = Object.getOwnPropertyDescriptor, Ht = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Bt(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 R {
-  constructor(o, e, n, t) {
-    super(), this._sheetInterceptorService = o, this._sheetsThreadCommentModel = e, this._univerInstanceService = n, this._renderManagerService = t, this._initViewModelIntercept(), this._initSkeletonChange();
+}, __name(_a2, "SheetsThreadCommentController"), _a2);
+SheetsThreadCommentController = __decorateClass$5([
+  OnLifecycle(LifecycleStages.Starting, SheetsThreadCommentController),
+  __decorateParam$5(1, IMenuService),
+  __decorateParam$5(2, Inject(Injector)),
+  __decorateParam$5(3, Inject(ComponentManager)),
+  __decorateParam$5(4, ICommandService),
+  __decorateParam$5(5, Inject(SheetsThreadCommentPopupService)),
+  __decorateParam$5(6, Inject(SheetsThreadCommentModel)),
+  __decorateParam$5(7, Inject(ThreadCommentPanelService)),
+  __decorateParam$5(8, IShortcutService),
+  __decorateParam$5(9, IUniverInstanceService),
+  __decorateParam$5(10, Inject(SheetPermissionInterceptorBaseController)),
+  __decorateParam$5(11, IMarkSelectionService)
+], SheetsThreadCommentController);
+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"), _a3;
+let SheetsThreadCommentRenderController = (_a3 = 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(
-        ot.CELL_CONTENT,
+        INTERCEPTOR_POINT.CELL_CONTENT,
         {
-          handler: (o, e, n) => {
-            const { row: t, col: r, unitId: i, subUnitId: s } = e;
-            return this._sheetsThreadCommentModel.showCommentMarker(i, s, t, r) ? n({
-              ...o,
+          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 s;
-      const e = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
-      if (!e) return;
-      const n = e.getUnitId(), t = (s = e.getActiveSheet()) == null ? void 0 : s.getSheetId();
-      if (!t) {
+    const markSkeletonDirty = /* @__PURE__ */ __name(() => {
+      var _a8;
+      const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
+      if (!workbook) return;
+      const unitId = workbook.getUnitId(), subUnitId = (_a8 = workbook.getActiveSheet()) == null ? void 0 : _a8.getSheetId();
+      if (!subUnitId) {
         console.warn("No active sheet found");
         return;
       }
-      const r = this._renderManagerService.getRenderById(n), i = r == null ? void 0 : r.with(ht).getOrCreateSkeleton({ sheetId: t });
-      i == null || i.makeDirty(!0), i == null || i.calculate(), r && r.mainComponent.makeForceDirty();
-    };
-    this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.pipe(Me(16)).subscribe((e) => {
-      o();
+      const currentRender = this._renderManagerService.getRenderById(unitId), skeleton = currentRender == null ? void 0 : currentRender.with(SheetSkeletonManagerService).getOrCreateSkeleton({ sheetId: subUnitId });
+      skeleton == null || skeleton.makeDirty(!0), skeleton == null || skeleton.calculate(), currentRender && currentRender.mainComponent.makeForceDirty();
+    }, "markSkeletonDirty");
+    this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.pipe(debounceTime(16)).subscribe((update) => {
+      markSkeletonDirty();
     }));
   }
-};
-W = Ht([
-  B(H.Ready, W),
-  L(0, l(fe)),
-  L(1, l($)),
-  L(2, N),
-  L(3, It)
-], W);
-var Lt = Object.defineProperty, kt = Object.getOwnPropertyDescriptor, Ft = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? kt(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 && Lt(e, n, r), r;
-}, te = (o, e) => (n, t) => e(n, t, o);
-const Wt = (o, e, n) => {
-  const t = j(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(_a3, "SheetsThreadCommentRenderController"), _a3);
+SheetsThreadCommentRenderController = __decorateClass$4([
+  OnLifecycle(LifecycleStages.Ready, SheetsThreadCommentRenderController),
+  __decorateParam$4(0, Inject(SheetInterceptorService)),
+  __decorateParam$4(1, Inject(SheetsThreadCommentModel)),
+  __decorateParam$4(2, IUniverInstanceService),
+  __decorateParam$4(3, IRenderManagerService)
+], SheetsThreadCommentRenderController);
+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");
+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 st(s);
-};
-let Z = class extends R {
-  constructor(e, n, t) {
+  return serializeRange(targetRange);
+}, "transformRef");
+var _a4;
+let SheetsThreadCommentCopyPasteController = (_a4 = class extends Disposable {
+  constructor(_sheetClipboardService, _sheetsThreadCommentModel, _threadCommentDataSourceService) {
     super();
-    w(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: Re,
-        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: a } = n, c = {
-            row: a.rows[0],
-            column: a.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 === pt.CUT && this._copyInfo) {
-            const { range: u, unitId: h, subUnitId: d } = this._copyInfo, p = {
-              row: u.startRow,
-              column: u.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 === h && s === d)) {
-              const v = [];
-              Be.foreach(u, (C, m) => {
-                const _ = this._sheetsThreadCommentModel.getAllByLocation(h, d, C, m);
-                this._threadCommentDataSourceService.syncUpdateMutationToColla ? _.forEach((S) => {
-                  v.push(S);
-                }) : _.forEach(({ children: S, ...x }) => {
-                  x.parentId || v.push(x);
+            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 g = [], f = [], E = [], D = [], ee = (C) => {
-                g.unshift({
-                  id: K.id,
+              const sourceRedos = [], sourceUndos = [], targetRedos = [], targetUndos = [], handleCommentItem = /* @__PURE__ */ __name((item) => {
+                sourceRedos.unshift({
+                  id: DeleteCommentMutation.id,
                   params: {
-                    unitId: h,
-                    subUnitId: d,
-                    commentId: C.id
+                    unitId: sourceUnitId,
+                    subUnitId: sourceSubUnitId,
+                    commentId: item.id
                   }
-                }), E.push({
-                  id: ne.id,
+                }), targetRedos.push({
+                  id: AddCommentMutation.id,
                   params: {
-                    unitId: i,
-                    subUnitId: s,
+                    unitId: targetUnitId,
+                    subUnitId: targetSubUnitId,
                     comment: {
-                      ...C,
-                      ref: Wt(C.ref, p, c),
-                      unitId: i,
-                      subUnitId: s
+                      ...item,
+                      ref: transformRef(item.ref, sourcePos, targetPos),
+                      unitId: targetUnitId,
+                      subUnitId: targetSubUnitId
                     },
                     sync: !0
                   }
-                }), f.push({
-                  id: ne.id,
+                }), sourceUndos.push({
+                  id: AddCommentMutation.id,
                   params: {
-                    unitId: h,
-                    subUnitId: d,
-                    comment: C,
+                    unitId: sourceUnitId,
+                    subUnitId: sourceSubUnitId,
+                    comment: item,
                     sync: !0
                   }
-                }), D.unshift({
-                  id: K.id,
+                }), targetUndos.unshift({
+                  id: DeleteCommentMutation.id,
                   params: {
-                    unitId: i,
-                    subUnitId: s,
-                    commentId: C.id
+                    unitId: targetUnitId,
+                    subUnitId: targetSubUnitId,
+                    commentId: item.id
                   }
                 });
-              };
-              return v.forEach((C) => {
-                ee(C);
+              }, "handleCommentItem");
+              return roots.forEach((root) => {
+                handleCommentItem(root);
               }), {
-                redos: [...g, ...E],
-                undos: [...D, ...f]
+                redos: [...sourceRedos, ...targetRedos],
+                undos: [...targetUndos, ...sourceUndos]
               };
             }
           }
@@ -614,171 +623,171 @@ let Z = class extends R {
             redos: [],
             undos: []
           };
-        }
+        }, "onPasteCells")
       })
     );
   }
-};
-Z = Ft([
-  B(H.Rendered, Z),
-  te(0, l(mt)),
-  te(1, l($)),
-  te(2, Ce)
-], Z);
-var Zt = Object.defineProperty, zt = Object.getOwnPropertyDescriptor, Gt = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? zt(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;
-}, k = (o, e) => (n, t) => e(n, t, o);
-let z = class extends R {
-  constructor(o, e, n, t) {
-    super(), this._hoverManagerService = o, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = n, this._sheetPermissionInterceptorBaseController = t, this._initHoverEvent();
+}, __name(_a4, "SheetsThreadCommentCopyPasteController"), _a4);
+SheetsThreadCommentCopyPasteController = __decorateClass$3([
+  OnLifecycle(LifecycleStages.Rendered, SheetsThreadCommentCopyPasteController),
+  __decorateParam$3(0, Inject(ISheetClipboardService)),
+  __decorateParam$3(1, Inject(SheetsThreadCommentModel)),
+  __decorateParam$3(2, IThreadCommentDataSourceService)
+], SheetsThreadCommentCopyPasteController);
+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"), _a5;
+let SheetsThreadCommentHoverController = (_a5 = class extends Disposable {
+  constructor(_hoverManagerService, _sheetsThreadCommentPopupService, _sheetsThreadCommentModel, _sheetPermissionInterceptorBaseController) {
+    super(), this._hoverManagerService = _hoverManagerService, this._sheetsThreadCommentPopupService = _sheetsThreadCommentPopupService, this._sheetsThreadCommentModel = _sheetsThreadCommentModel, this._sheetPermissionInterceptorBaseController = _sheetPermissionInterceptorBaseController, this._initHoverEvent();
   }
   _initHoverEvent() {
     this.disposeWithMe(
-      this._hoverManagerService.currentCell$.pipe(Me(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) {
+      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._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
-              workbookTypes: [q],
-              worksheetTypes: [X],
-              rangeTypes: [J]
-            }, [{ startRow: i, startColumn: s, endRow: i, endColumn: s }]))
+              workbookTypes: [WorkbookCommentPermission],
+              worksheetTypes: [WorksheetViewPermission],
+              rangeTypes: [RangeProtectionPermissionViewPoint]
+            }, [{ startRow: row, startColumn: col, endRow: row, endColumn: col }]))
               return;
-            const u = this._sheetsThreadCommentModel.getComment(t, r, a);
-            u && !u.resolved && this._sheetsThreadCommentPopupService.showPopup({
-              unitId: t,
-              subUnitId: r,
-              row: i,
-              col: s,
-              commentId: a,
+            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 = Gt([
-  B(H.Rendered, z),
-  k(0, l(lt)),
-  k(1, l(O)),
-  k(2, l($)),
-  k(3, l(ge))
-], z);
-var Kt = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, qt = (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 && Kt(e, n, r), r;
-}, F = (o, e) => (n, t) => e(n, t, o);
-let G = class extends R {
-  constructor(o, e, n, t) {
-    super(), this._sheetInterceptorService = o, this._univerInstanceService = e, this._threadCommentModel = n, this._threadCommentDataSourceService = t, this._initSheetChange();
+}, __name(_a5, "SheetsThreadCommentHoverController"), _a5);
+SheetsThreadCommentHoverController = __decorateClass$2([
+  OnLifecycle(LifecycleStages.Rendered, SheetsThreadCommentHoverController),
+  __decorateParam$2(0, Inject(HoverManagerService)),
+  __decorateParam$2(1, Inject(SheetsThreadCommentPopupService)),
+  __decorateParam$2(2, Inject(SheetsThreadCommentModel)),
+  __decorateParam$2(3, Inject(SheetPermissionInterceptorBaseController))
+], SheetsThreadCommentHoverController);
+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"), _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 === it.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 _a8;
+          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 || ((_a8 = workbook.getActiveSheet()) == null ? void 0 : _a8.getSheetId());
+            if (!subUnitId)
               return { redos: [], undos: [] };
-            const { commentMap: s } = this._threadCommentModel.ensureMap(r, i), a = Array.from(Object.values(s)).filter((p) => !p.parentId), c = a.map((p) => p.id), u = this._threadCommentDataSourceService.syncUpdateMutationToColla, h = c.map((p) => ({
-              id: K.id,
+            const { commentMap } = this._threadCommentModel.ensureMap(unitId, subUnitId), comments = Array.from(Object.values(commentMap)).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: p
+                unitId,
+                subUnitId,
+                commentId: id
               }
-            })), d = a.map(({ children: p, ...v }) => ({
-              id: ne.id,
+            })), undos = comments.map(({ children, ...comment }) => ({
+              id: AddCommentMutation.id,
               params: {
-                unitId: r,
-                subUnitId: i,
+                unitId,
+                subUnitId,
                 comment: {
-                  ...v,
-                  children: u ? p : void 0
+                  ...comment,
+                  children: shouldSync ? children : void 0
                 },
-                sync: !u
+                sync: !shouldSync
               }
             }));
-            return { redos: h, undos: d };
+            return { redos, undos };
           }
           return { redos: [], undos: [] };
-        }
+        }, "getMutations")
       })
     );
   }
-};
-G = qt([
-  B(H.Ready, G),
-  F(0, l(fe)),
-  F(1, N),
-  F(2, l(at)),
-  F(3, Ce)
-], G);
-var Ne = Object.defineProperty, Xt = Object.getOwnPropertyDescriptor, Jt = (o, e, n) => e in o ? Ne(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n, Qt = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Xt(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 && Ne(e, n, r), r;
-}, he = (o, e) => (n, t) => e(n, t, o), $e = (o, e, n) => Jt(o, typeof e != "symbol" ? e + "" : e, n);
-let Y = class extends Le {
-  constructor(e = {}, n, t) {
+}, __name(_a6, "ThreadCommentRemoveSheetsController"), _a6);
+ThreadCommentRemoveSheetsController = __decorateClass$1([
+  OnLifecycle(LifecycleStages.Ready, ThreadCommentRemoveSheetsController),
+  __decorateParam$1(0, Inject(SheetInterceptorService)),
+  __decorateParam$1(1, IUniverInstanceService),
+  __decorateParam$1(2, Inject(ThreadCommentModel)),
+  __decorateParam$1(3, IThreadCommentDataSourceService)
+], ThreadCommentRemoveSheetsController);
+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"), _a7;
+let UniverSheetsThreadCommentPlugin = (_a7 = class extends Plugin {
+  constructor(config = {}, _injector, _commandService) {
     super();
-    w(this, "_pluginConfig");
-    this._injector = n, this._commandService = t, this._pluginConfig = me.deepMerge({}, At, e);
+    __publicField(this, "_pluginConfig");
+    this._injector = _injector, this._commandService = _commandService, this._pluginConfig = Tools.deepMerge({}, DefaultSheetsThreadCommentConfig, config);
   }
-  onStarting(e) {
+  onStarting() {
     [
       [
-        A,
+        SheetsThreadCommentController,
         {
-          useFactory: () => this._injector.createInstance(A, this._pluginConfig)
+          useFactory: /* @__PURE__ */ __name(() => this._injector.createInstance(SheetsThreadCommentController, this._pluginConfig), "useFactory")
         }
       ],
-      [W],
-      [Z],
-      [z],
-      [G],
-      [O]
-    ].forEach((n) => {
-      e.add(n);
-    }), [Q].forEach((n) => {
-      this._commandService.registerCommand(n);
+      [SheetsThreadCommentRenderController],
+      [SheetsThreadCommentCopyPasteController],
+      [SheetsThreadCommentHoverController],
+      [ThreadCommentRemoveSheetsController],
+      [SheetsThreadCommentPopupService]
+    ].forEach((dep) => {
+      this._injector.add(dep);
+    }), [ShowAddSheetCommentModalOperation].forEach((command) => {
+      this._commandService.registerCommand(command);
     });
   }
-};
-$e(Y, "pluginName", Re);
-$e(Y, "type", b.UNIVER_SHEET);
-Y = Qt([
-  He(ze, vt),
-  he(1, l(pe)),
-  he(2, l(re))
-], Y);
+}, __name(_a7, "UniverSheetsThreadCommentPlugin"), _a7);
+__publicField2(UniverSheetsThreadCommentPlugin, "pluginName", SHEETS_THREAD_COMMENT);
+__publicField2(UniverSheetsThreadCommentPlugin, "type", UniverInstanceType.UNIVER_SHEET);
+UniverSheetsThreadCommentPlugin = __decorateClass([
+  DependentOn(UniverThreadCommentUIPlugin, UniverSheetsThreadCommentBasePlugin),
+  __decorateParam(1, Inject(Injector)),
+  __decorateParam(2, Inject(ICommandService))
+], UniverSheetsThreadCommentPlugin);
 export {
-  vn as ICommandService,
-  bn as IThreadCommentDataSourceService,
-  gn as IThreadCommentMentionDataService,
-  _n as Inject,
-  fn as Injector,
-  Cn as Plugin,
-  Re as SHEETS_THREAD_COMMENT,
-  A as SheetsThreadCommentController,
-  Z as SheetsThreadCommentCopyPasteController,
-  z as SheetsThreadCommentHoverController,
-  Mn as SheetsThreadCommentModel,
-  O as SheetsThreadCommentPopupService,
-  Q as ShowAddSheetCommentModalOperation,
-  G as ThreadCommentRemoveSheetsController,
-  Sn as UniverInstanceType,
-  Y as UniverSheetsThreadCommentPlugin,
-  Pn as UniverThreadCommentUIPlugin
+  ICommandService2 as ICommandService,
+  IThreadCommentDataSourceService2 as IThreadCommentDataSourceService,
+  IThreadCommentMentionDataService,
+  Inject2 as Inject,
+  Injector2 as Injector,
+  Plugin2 as Plugin,
+  SHEETS_THREAD_COMMENT,
+  SheetsThreadCommentController,
+  SheetsThreadCommentCopyPasteController,
+  SheetsThreadCommentHoverController,
+  SheetsThreadCommentModel2 as SheetsThreadCommentModel,
+  SheetsThreadCommentPopupService,
+  ShowAddSheetCommentModalOperation,
+  ThreadCommentRemoveSheetsController,
+  UniverInstanceType2 as UniverInstanceType,
+  UniverSheetsThreadCommentPlugin,
+  UniverThreadCommentUIPlugin2 as UniverThreadCommentUIPlugin
 };