@univerjs/sheets-thread-comment 0.2.3 → 0.2.4

package/lib/es/index.js

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