@univerjs/sheets-thread-comment-ui 0.4.2-nightly.202411081606 → 0.4.2-nightly.202411091134

package/lib/es/index.js

@@ -1,34 +1,33 @@
-var Ae = Object.defineProperty;
-var je = (o, e, n) => e in o ? Ae(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n;
-var E = (o, e, n) => je(o, typeof e != "symbol" ? e + "" : e, n);
-import { Inject as v, Disposable as $, DisposableCollection as Ve, CommandType as Be, IUniverInstanceService as N, InterceptorEffectEnum as He, UniverInstanceType as b, useDependency as O, Tools as Le, ICommandService as ie, Range as Fe, RANGE_TYPE as me, Rectangle as ke, DependentOn as We, Injector as Ze, Plugin as ze, IConfigService as Ge } from "@univerjs/core";
-import { SheetsSelectionsService as pe, getSheetCommandTarget as Ke, SheetInterceptorService as ve, INTERCEPTOR_POINT as Ye, WorkbookCommentPermission as q, WorksheetViewPermission as J, RangeProtectionPermissionViewPoint as Q, SetWorksheetActiveOperation as qe, RemoveSheetCommand as Je } from "@univerjs/sheets";
-import { SheetsThreadCommentModel as D, UniverSheetsThreadCommentPlugin as Qe } from "@univerjs/sheets-thread-comment";
-import { ThreadCommentPanelService as se, ThreadCommentTree as Xe, ThreadCommentPanel as et, ToggleSheetCommentPanelOperation as _e, THREAD_COMMENT_PANEL as tt, SetActiveCommentOperation as ee, UniverThreadCommentUIPlugin as nt } from "@univerjs/thread-comment-ui";
-import { IThreadCommentMentionDataService as Mn, UniverThreadCommentUIPlugin as wn } from "@univerjs/thread-comment-ui";
-import { SheetCanvasPopManagerService as rt, IMarkSelectionService as fe, whenSheetEditorFocused as ot, getCurrentRangeDisable$ as Ce, ISheetClipboardService as it, COPY_TYPE as st, HoverManagerService as at, SheetPermissionInterceptorBaseController as Se, IEditorBridgeService as ct, SheetSkeletonManagerService as ht, ScrollToRangeOperation as mt } from "@univerjs/sheets-ui";
-import { IZenZoneService as dt, useObservable as A, KeyCode as ut, MetaKeys as de, MenuItemType as ge, getMenuHiddenObservable as Ie, RibbonStartGroup as lt, ContextMenuPosition as pt, ContextMenuGroup as vt, ComponentManager as _t, IMenuManagerService as ft, IShortcutService as Ct } from "@univerjs/ui";
-import { BehaviorSubject as St, debounceTime as ae, map as gt } from "rxjs";
-import { IRenderManagerService as Pe } from "@univerjs/engine-render";
-import { jsx as Te } from "react/jsx-runtime";
-import { singleReferenceToGrid as j, serializeRange as It } from "@univerjs/engine-formula";
-import { forwardRef as be, useRef as Me, createElement as we, useMemo as Pt, useCallback as ue, useEffect as Tt } from "react";
-import { IThreadCommentDataSourceService as ye, DeleteCommentMutation as F, AddCommentMutation as oe, ThreadCommentModel as bt } from "@univerjs/thread-comment";
-import { AddCommentCommand as En, DeleteCommentCommand as On, DeleteCommentTreeCommand as Un, IThreadCommentDataSourceService as Rn, ResolveCommentCommand as $n, UpdateCommentCommand as Nn } from "@univerjs/thread-comment";
-const Ee = "univer.sheet.thread-comment-modal", ce = "comment-single", Oe = "SHEET_THREAD_COMMENT";
-var Mt = Object.defineProperty, wt = Object.getOwnPropertyDescriptor, yt = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? wt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(e, n, r) : s(r)) || r);
-  return t && r && Mt(e, n, r), r;
-}, le = (o, e) => (n, t) => e(n, t, o);
-let U = class extends $ {
-  constructor(e, n) {
+var Be = Object.defineProperty;
+var Le = (o, e, r) => e in o ? Be(o, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : o[e] = r;
+var E = (o, e, r) => Le(o, typeof e != "symbol" ? e + "" : e, r);
+import { Inject as v, Disposable as $, DisposableCollection as He, CommandType as Fe, IUniverInstanceService as N, InterceptorEffectEnum as ke, UniverInstanceType as b, useDependency as O, Tools as We, ICommandService as se, Range as Ze, RANGE_TYPE as he, Rectangle as ze, DependentOn as Ge, Injector as Ye, Plugin as qe, IConfigService as Ke } from "@univerjs/core";
+import { SheetsSelectionsService as ve, getSheetCommandTarget as Je, SheetInterceptorService as _e, INTERCEPTOR_POINT as Qe, WorkbookCommentPermission as K, WorksheetViewPermission as J, RangeProtectionPermissionViewPoint as Q, SetWorksheetActiveOperation as Xe, RemoveSheetCommand as et } from "@univerjs/sheets";
+import { SheetsThreadCommentModel as x, UniverSheetsThreadCommentPlugin as tt } from "@univerjs/sheets-thread-comment";
+import { ThreadCommentPanelService as ae, ThreadCommentTree as nt, ThreadCommentPanel as rt, ToggleSheetCommentPanelOperation as fe, THREAD_COMMENT_PANEL as ot, SetActiveCommentOperation as te, UniverThreadCommentUIPlugin as it } from "@univerjs/thread-comment-ui";
+import { IThreadCommentMentionDataService as xn, UniverThreadCommentUIPlugin as Dn } from "@univerjs/thread-comment-ui";
+import { SheetCanvasPopManagerService as st, IMarkSelectionService as Ce, whenSheetEditorFocused as at, getCurrentRangeDisable$ as Se, ISheetClipboardService as ct, COPY_TYPE as mt, HoverManagerService as dt, SheetPermissionInterceptorBaseController as ge, IEditorBridgeService as ht, SheetSkeletonManagerService as ut, ScrollToRangeOperation as lt } from "@univerjs/sheets-ui";
+import { IZenZoneService as pt, useObservable as j, KeyCode as vt, MetaKeys as ue, MenuItemType as Ie, getMenuHiddenObservable as Pe, RibbonStartGroup as _t, ContextMenuPosition as ft, ContextMenuGroup as Ct, ComponentManager as St, IMenuManagerService as gt, IShortcutService as It } from "@univerjs/ui";
+import { BehaviorSubject as Pt, debounceTime as ce, map as Tt } from "rxjs";
+import { IRenderManagerService as Te } from "@univerjs/engine-render";
+import bt, { forwardRef as be, useRef as Me, createElement as we, useMemo as Mt, useCallback as le, useEffect as wt } from "react";
+import { singleReferenceToGrid as A, serializeRange as yt } from "@univerjs/engine-formula";
+import { IThreadCommentDataSourceService as ye, DeleteCommentMutation as F, AddCommentMutation as ie, ThreadCommentModel as Et } from "@univerjs/thread-comment";
+import { AddCommentCommand as An, DeleteCommentCommand as Vn, DeleteCommentTreeCommand as Bn, IThreadCommentDataSourceService as Ln, ResolveCommentCommand as Hn, UpdateCommentCommand as Fn } from "@univerjs/thread-comment";
+const Ee = "univer.sheet.thread-comment-modal", me = "comment-single", Oe = "SHEET_THREAD_COMMENT";
+var Ot = Object.defineProperty, Rt = Object.getOwnPropertyDescriptor, Ut = (o, e, r, t) => {
+  for (var n = t > 1 ? void 0 : t ? Rt(e, r) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (t ? s(e, r, n) : s(n)) || n);
+  return t && n && Ot(e, r, n), n;
+}, pe = (o, e) => (r, t) => e(r, t, o);
+let R = class extends $ {
+  constructor(e, r) {
     super();
     E(this, "_lastPopup", null);
     E(this, "_activePopup");
-    E(this, "_activePopup$", new St(null));
+    E(this, "_activePopup$", new Pt(null));
     E(this, "activePopup$", this._activePopup$.asObservable());
-    this._canvasPopupManagerService = e, this._zenZoneService = n, this._initZenVisible(), this.disposeWithMe(() => {
+    this._canvasPopupManagerService = e, this._zenZoneService = r, this._initZenVisible(), this.disposeWithMe(() => {
       this._activePopup$.complete();
     });
   }
@@ -40,10 +39,10 @@ let U = class extends $ {
       e && this.hidePopup();
     }));
   }
-  showPopup(e, n) {
-    var h;
-    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 === ((h = this.activePopup) == null ? void 0 : h.subUnitId)) {
+  showPopup(e, r) {
+    var m;
+    const { row: t, col: n, unitId: i, subUnitId: s } = e;
+    if (this._activePopup && t === this._activePopup.row && n === this._activePopup.col && i === this._activePopup.unitId && s === ((m = this.activePopup) == null ? void 0 : m.subUnitId)) {
       this._activePopup = e, this._activePopup$.next(e);
       return;
     }
@@ -52,7 +51,7 @@ let U = class extends $ {
     this._activePopup = e, this._activePopup$.next(e);
     const a = this._canvasPopupManagerService.attachPopupToCell(
       t,
-      r,
+      n,
       {
         componentKey: Ee,
         onClickOutside: () => {
@@ -67,10 +66,10 @@ let U = class extends $ {
     );
     if (!a)
       throw new Error("[SheetsThreadCommentPopupService]: cannot show popup!");
-    const c = new Ve();
+    const c = new He();
     c.add(a), c.add({
       dispose: () => {
-        n == null || n();
+        r == null || r();
       }
     }), this._lastPopup = c;
   }
@@ -84,57 +83,57 @@ let U = class extends $ {
     }, this._activePopup$.next(this._activePopup));
   }
 };
-U = yt([
-  le(0, v(rt)),
-  le(1, dt)
-], U);
+R = Ut([
+  pe(0, v(st)),
+  pe(1, pt)
+], R);
 const V = {
-  type: Be.OPERATION,
+  type: Fe.OPERATION,
   id: "sheets.operation.show-comment-modal",
   handler(o) {
     var _;
-    const e = o.get(pe), n = o.get(N), t = o.get(U), r = o.get(se), i = (_ = e.getCurrentLastSelection()) == null ? void 0 : _.primary, s = o.get(D);
+    const e = o.get(ve), r = o.get(N), t = o.get(R), n = o.get(ae), i = (_ = e.getCurrentLastSelection()) == null ? void 0 : _.primary, s = o.get(x);
     if (!i)
       return !1;
-    const a = Ke(n);
+    const a = Je(r);
     if (!a)
       return !1;
-    const { workbook: c, worksheet: h, unitId: d, subUnitId: m } = a, u = {
+    const { workbook: c, worksheet: m, unitId: h, subUnitId: d } = a, u = {
       workbook: c,
-      worksheet: h,
-      unitId: d,
-      subUnitId: m,
+      worksheet: m,
+      unitId: h,
+      subUnitId: d,
       row: i.startRow,
       col: i.startColumn
     };
     t.showPopup(u);
-    const p = s.getByLocation(d, m, i.startRow, i.startColumn);
-    return p && r.setActiveComment({
-      unitId: d,
-      subUnitId: m,
+    const p = s.getByLocation(h, d, i.startRow, i.startColumn);
+    return p && n.setActiveComment({
+      unitId: h,
+      subUnitId: d,
       commentId: p,
       trigger: "context-menu"
     }), !0;
   }
-}, Et = "sheets-thread-comment.config", Ot = {};
-var Ut = Object.defineProperty, Rt = Object.getOwnPropertyDescriptor, $t = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Rt(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 && Ut(e, n, r), r;
-}, B = (o, e) => (n, t) => e(n, t, o);
+}, $t = "sheets-thread-comment.config", Nt = {};
+var xt = Object.defineProperty, Dt = Object.getOwnPropertyDescriptor, jt = (o, e, r, t) => {
+  for (var n = t > 1 ? void 0 : t ? Dt(e, r) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (t ? s(e, r, n) : s(n)) || n);
+  return t && n && xt(e, r, n), n;
+}, B = (o, e) => (r, t) => e(r, t, o);
 let k = class extends $ {
-  constructor(o, e, n, t) {
-    super(), this._sheetInterceptorService = o, this._sheetsThreadCommentModel = e, this._univerInstanceService = n, this._renderManagerService = t, this._initViewModelIntercept(), this._initSkeletonChange();
+  constructor(o, e, r, t) {
+    super(), this._sheetInterceptorService = o, this._sheetsThreadCommentModel = e, this._univerInstanceService = r, this._renderManagerService = t, this._initViewModelIntercept(), this._initSkeletonChange();
   }
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        Ye.CELL_CONTENT,
+        Qe.CELL_CONTENT,
         {
-          effect: He.Style,
-          handler: (o, e, n) => {
-            const { row: t, col: r, unitId: i, subUnitId: s } = e;
-            return this._sheetsThreadCommentModel.showCommentMarker(i, s, t, r) ? n({
+          effect: ke.Style,
+          handler: (o, e, r) => {
+            const { row: t, col: n, unitId: i, subUnitId: s } = e;
+            return this._sheetsThreadCommentModel.showCommentMarker(i, s, t, n) ? r({
               ...o,
               markers: {
                 ...o == null ? void 0 : o.markers,
@@ -143,7 +142,7 @@ let k = class extends $ {
                   size: 6
                 }
               }
-            }) : n(o);
+            }) : r(o);
           },
           priority: 100
         }
@@ -152,121 +151,144 @@ let k = class extends $ {
   }
   _initSkeletonChange() {
     const o = () => {
-      var r;
+      var n;
       const e = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
       if (!e) return;
-      const n = e.getUnitId(), t = this._renderManagerService.getRenderById(n);
-      (r = t == null ? void 0 : t.mainComponent) == null || r.makeForceDirty();
+      const r = e.getUnitId(), t = this._renderManagerService.getRenderById(r);
+      (n = t == null ? void 0 : t.mainComponent) == null || n.makeForceDirty();
     };
-    this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.pipe(ae(16)).subscribe(() => {
+    this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.pipe(ce(16)).subscribe(() => {
       o();
     }));
   }
 };
-k = $t([
-  B(0, v(ve)),
-  B(1, v(D)),
+k = jt([
+  B(0, v(_e)),
+  B(1, v(x)),
   B(2, N),
-  B(3, Pe)
+  B(3, Te)
 ], k);
 var P = function() {
   return P = Object.assign || function(o) {
-    for (var e, n = 1, t = arguments.length; n < t; n++) {
-      e = arguments[n];
-      for (var r in e) Object.prototype.hasOwnProperty.call(e, r) && (o[r] = e[r]);
+    for (var e, r = 1, t = arguments.length; r < t; r++) {
+      e = arguments[r];
+      for (var n in e) Object.prototype.hasOwnProperty.call(e, n) && (o[n] = e[n]);
     }
     return o;
   }, P.apply(this, arguments);
-}, Nt = function(o, e) {
-  var n = {};
-  for (var t in o) Object.prototype.hasOwnProperty.call(o, t) && e.indexOf(t) < 0 && (n[t] = o[t]);
+}, At = function(o, e) {
+  var r = {};
+  for (var t in o) Object.prototype.hasOwnProperty.call(o, t) && e.indexOf(t) < 0 && (r[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;
-}, Ue = be(function(o, e) {
-  var n = o.icon, t = o.id, r = o.className, i = o.extend, s = Nt(o, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(t, " ").concat(r || "").trim(), c = Me("_".concat(At()));
-  return Re(n, "".concat(t), { defIds: n.defIds, idSuffix: c.current }, P({ ref: e, className: a }, s), i);
+    for (var n = 0, t = Object.getOwnPropertySymbols(o); n < t.length; n++)
+      e.indexOf(t[n]) < 0 && Object.prototype.propertyIsEnumerable.call(o, t[n]) && (r[t[n]] = o[t[n]]);
+  return r;
+}, Re = be(function(o, e) {
+  var r = o.icon, t = o.id, n = o.className, i = o.extend, s = At(o, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(t, " ").concat(n || "").trim(), c = Me("_".concat(Lt()));
+  return Ue(r, "".concat(t), { defIds: r.defIds, idSuffix: c.current }, P({ ref: e, className: a }, s), i);
 });
-function Re(o, e, n, t, r) {
-  return we(o.tag, P(P({ key: e }, Dt(o, n, r)), t), (xt(o, n).children || []).map(function(i, s) {
-    return Re(i, "".concat(e, "-").concat(o.tag, "-").concat(s), n, void 0, r);
+function Ue(o, e, r, t, n) {
+  return we(o.tag, P(P({ key: e }, Vt(o, r, n)), t), (Bt(o, r).children || []).map(function(i, s) {
+    return Ue(i, "".concat(e, "-").concat(o.tag, "-").concat(s), r, void 0, n);
   }));
 }
-function Dt(o, e, n) {
+function Vt(o, e, r) {
   var t = P({}, o.attrs);
-  n != null && n.colorChannel1 && t.fill === "colorChannel1" && (t.fill = n.colorChannel1);
-  var r = e.defIds;
-  return !r || r.length === 0 || (o.tag === "use" && t["xlink:href"] && (t["xlink:href"] = t["xlink:href"] + e.idSuffix), Object.entries(t).forEach(function(i) {
+  r != null && r.colorChannel1 && t.fill === "colorChannel1" && (t.fill = r.colorChannel1);
+  var n = e.defIds;
+  return !n || n.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;
 }
-function xt(o, e) {
-  var n, t = e.defIds;
-  return !t || t.length === 0 ? o : o.tag === "defs" && (!((n = o.children) === null || n === void 0) && n.length) ? P(P({}, o), { children: o.children.map(function(r) {
-    return typeof r.attrs.id == "string" && t && t.indexOf(r.attrs.id) > -1 ? P(P({}, r), { attrs: P(P({}, r.attrs), { id: r.attrs.id + e.idSuffix }) }) : r;
+function Bt(o, e) {
+  var r, t = e.defIds;
+  return !t || t.length === 0 ? o : o.tag === "defs" && (!((r = o.children) === null || r === void 0) && r.length) ? P(P({}, o), { children: o.children.map(function(n) {
+    return typeof n.attrs.id == "string" && t && t.indexOf(n.attrs.id) > -1 ? P(P({}, n), { attrs: P(P({}, n.attrs), { id: n.attrs.id + e.idSuffix }) }) : n;
   }) }) : o;
 }
-function At() {
+function Lt() {
   return Math.random().toString(36).substring(2, 8);
 }
-Ue.displayName = "UniverIcon";
-var jt = { 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" } }] }, $e = be(function(o, e) {
-  return we(Ue, Object.assign({}, o, {
+Re.displayName = "UniverIcon";
+var Ht = { 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" } }] }, $e = be(function(o, e) {
+  return we(Re, Object.assign({}, o, {
     id: "comment-single",
     ref: e,
-    icon: jt
+    icon: Ht
   }));
 });
 $e.displayName = "CommentSingle";
-const Vt = () => {
-  const o = O(N), e = O(U), n = A(e.activePopup$), t = O(D);
-  if (A(t.commentUpdate$), !n)
+var Ne = { exports: {} }, X = {};
+/**
+ * @license React
+ * react-jsx-runtime.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+var Ft = bt, kt = Symbol.for("react.element"), Wt = Symbol.for("react.fragment"), Zt = Object.prototype.hasOwnProperty, zt = Ft.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, Gt = { key: !0, ref: !0, __self: !0, __source: !0 };
+function xe(o, e, r) {
+  var t, n = {}, i = null, s = null;
+  r !== void 0 && (i = "" + r), e.key !== void 0 && (i = "" + e.key), e.ref !== void 0 && (s = e.ref);
+  for (t in e) Zt.call(e, t) && !Gt.hasOwnProperty(t) && (n[t] = e[t]);
+  if (o && o.defaultProps) for (t in e = o.defaultProps, e) n[t] === void 0 && (n[t] = e[t]);
+  return { $$typeof: kt, type: o, key: i, ref: s, props: n, _owner: zt.current };
+}
+X.Fragment = Wt;
+X.jsx = xe;
+X.jsxs = xe;
+Ne.exports = X;
+var De = Ne.exports;
+const Yt = () => {
+  const o = O(N), e = O(R), r = j(e.activePopup$), t = O(x);
+  if (j(t.commentUpdate$), !r)
     return null;
-  const { row: r, col: i, unitId: s, subUnitId: a, trigger: c } = n, h = t.getByLocation(s, a, r, i), d = `${Le.chatAtABC(i)}${r + 1}`, m = () => {
+  const { row: n, col: i, unitId: s, subUnitId: a, trigger: c } = r, m = t.getByLocation(s, a, n, i), h = `${We.chatAtABC(i)}${n + 1}`, d = () => {
     e.hidePopup();
   }, u = (p) => {
-    var _, S, R;
-    return (R = (S = (_ = o.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : _.getSheetBySheetId(p)) == null ? void 0 : S.getName()) != null ? R : "";
+    var _, S, U;
+    return (U = (S = (_ = o.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : _.getSheetBySheetId(p)) == null ? void 0 : S.getName()) != null ? U : "";
   };
-  return /* @__PURE__ */ Te(
-    Xe,
+  return /* @__PURE__ */ De.jsx(
+    nt,
     {
       onClick: () => {
         e.persistPopup();
       },
       prefix: "cell",
-      id: h,
+      id: m,
       unitId: s,
       subUnitId: a,
       type: b.UNIVER_SHEET,
-      refStr: d,
-      onClose: m,
+      refStr: h,
+      onClose: d,
       getSubUnitName: u,
       autoFocus: c === "context-menu"
     }
   );
-}, Bt = () => {
+}, qt = () => {
   var g;
-  const o = O(fe), e = O(N), n = O(U), t = e.getCurrentUnitForType(b.UNIVER_SHEET), r = t.getUnitId(), i = O(ie), s = Pt(() => t.activeSheet$.pipe(gt((l) => l == null ? void 0 : l.getSheetId())), [t.activeSheet$]), a = A(s, (g = t.getActiveSheet()) == null ? void 0 : g.getSheetId()), c = Me(), h = O(se), d = A(h.activeCommentId$), m = A(h.panelVisible$, h.panelVisible), u = ue((l) => {
+  const o = O(Ce), e = O(N), r = O(R), t = e.getCurrentUnitForType(b.UNIVER_SHEET), n = t.getUnitId(), i = O(se), s = Mt(() => t.activeSheet$.pipe(Tt((l) => l == null ? void 0 : l.getSheetId())), [t.activeSheet$]), a = j(s, (g = t.getActiveSheet()) == null ? void 0 : g.getSheetId()), c = Me(), m = O(ae), h = j(m.activeCommentId$), d = j(m.panelVisible$, m.panelVisible), u = le((l) => {
     const I = t.getSheets(), f = {};
     I.forEach((T, C) => {
       f[T.getSheetId()] = C;
     });
     const M = (T) => T.map((C) => {
-      var he;
-      const y = j(C.ref), xe = [(he = f[C.subUnitId]) != null ? he : 0, y.row, y.column];
-      return { ...C, p: xe };
+      var de;
+      const y = A(C.ref), Ve = [(de = f[C.subUnitId]) != null ? de : 0, y.row, y.column];
+      return { ...C, p: Ve };
     }).sort((C, y) => C.p[0] === y.p[0] ? C.p[1] === y.p[1] ? C.p[2] - y.p[2] : C.p[1] - y.p[1] : C.p[0] - y.p[0]);
     return [
       ...M(l.filter((T) => !T.resolved)),
       ...M(l.filter((T) => T.resolved))
     ];
-  }, [t]), p = ue((l) => {
+  }, [t]), p = le((l) => {
     var I;
-    if (l.unitId === r && l.subUnitId === a && !l.resolved) {
-      const { row: f, column: M } = j(l.ref), T = t.getSheetBySheetId(l.subUnitId), C = (I = T == null ? void 0 : T.getMergedCell(f, M)) != null ? I : {
+    if (l.unitId === n && l.subUnitId === a && !l.resolved) {
+      const { row: f, column: M } = A(l.ref), T = t.getSheetBySheetId(l.subUnitId), C = (I = T == null ? void 0 : T.getMergedCell(f, M)) != null ? I : {
         startColumn: M,
         endColumn: M,
         startRow: f,
@@ -285,190 +307,190 @@ const Vt = () => {
           primary: null
         });
     }
-  }, [o, a, r]), _ = (l) => {
+  }, [o, a, n]), _ = (l) => {
     var I, f;
     return (f = (I = t.getSheetBySheetId(l)) == null ? void 0 : I.getName()) != null ? f : "";
   }, S = () => {
     i.executeCommand(V.id);
-  }, R = (l) => {
-    d && d.unitId === l.unitId && d.subUnitId === l.subUnitId && d.commentId === l.id || (c.current && (o.removeShape(c.current), c.current = null), c.current = p(l));
-  }, x = () => {
+  }, U = (l) => {
+    h && h.unitId === l.unitId && h.subUnitId === l.subUnitId && h.commentId === l.id || (c.current && (o.removeShape(c.current), c.current = null), c.current = p(l));
+  }, D = () => {
     c.current && (o.removeShape(c.current), c.current = null);
-  }, X = (l, I) => {
-    I && n.hidePopup();
+  }, ee = (l, I) => {
+    I && r.hidePopup();
   };
-  return Tt(() => {
-    !m && c.current && o.removeShape(c.current);
-  }, [o, m]), /* @__PURE__ */ Te(
-    et,
+  return wt(() => {
+    !d && c.current && o.removeShape(c.current);
+  }, [o, d]), /* @__PURE__ */ De.jsx(
+    rt,
     {
-      unitId: r,
+      unitId: n,
       subUnitId$: s,
       type: b.UNIVER_SHEET,
       onAdd: S,
       getSubUnitName: _,
-      onResolve: X,
+      onResolve: ee,
       sortComments: u,
-      onItemEnter: R,
-      onItemLeave: x,
-      onDeleteComment: () => (x(), !0)
+      onItemEnter: U,
+      onItemLeave: D,
+      onDeleteComment: () => (D(), !0)
     }
   );
-}, Ht = (o) => ({
+}, Kt = (o) => ({
   id: V.id,
-  type: ge.BUTTON,
-  icon: ce,
+  type: Ie.BUTTON,
+  icon: me,
   title: "sheetThreadComment.menu.addComment",
-  hidden$: Ie(o, b.UNIVER_SHEET),
-  disabled$: Ce(o, {
-    workbookTypes: [q],
+  hidden$: Pe(o, b.UNIVER_SHEET),
+  disabled$: Se(o, {
+    workbookTypes: [K],
     worksheetTypes: [J],
     rangeTypes: [Q]
   })
-}), Lt = (o) => ({
-  id: _e.id,
-  type: ge.BUTTON,
-  icon: ce,
+}), Jt = (o) => ({
+  id: fe.id,
+  type: Ie.BUTTON,
+  icon: me,
   tooltip: "sheetThreadComment.menu.commentManagement",
-  disabled$: Ce(o, {
-    workbookTypes: [q],
+  disabled$: Se(o, {
+    workbookTypes: [K],
     worksheetTypes: [J],
     rangeTypes: [Q]
   }),
-  hidden$: Ie(o, b.UNIVER_SHEET)
-}), Ft = {
+  hidden$: Pe(o, b.UNIVER_SHEET)
+}), Qt = {
   id: V.id,
-  binding: ut.M | de.CTRL_COMMAND | de.ALT,
-  preconditions: ot
-}, kt = {
-  [lt.OTHERS]: {
-    [_e.id]: {
+  binding: vt.M | ue.CTRL_COMMAND | ue.ALT,
+  preconditions: at
+}, Xt = {
+  [_t.OTHERS]: {
+    [fe.id]: {
       order: 1,
-      menuItemFactory: Lt
+      menuItemFactory: Jt
     }
   },
-  [pt.MAIN_AREA]: {
-    [vt.OTHERS]: {
+  [ft.MAIN_AREA]: {
+    [Ct.OTHERS]: {
       [V.id]: {
         order: 0,
-        menuItemFactory: Ht
+        menuItemFactory: Kt
       }
     }
   }
 };
-var Wt = Object.defineProperty, Zt = Object.getOwnPropertyDescriptor, zt = (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 && Wt(e, n, r), r;
-}, te = (o, e) => (n, t) => e(n, t, o);
+var en = Object.defineProperty, tn = Object.getOwnPropertyDescriptor, nn = (o, e, r, t) => {
+  for (var n = t > 1 ? void 0 : t ? tn(e, r) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (t ? s(e, r, n) : s(n)) || n);
+  return t && n && en(e, r, n), n;
+}, ne = (o, e) => (r, t) => e(r, t, o);
 let W = class extends $ {
-  constructor(o, e, n) {
-    super(), this._menuManagerService = o, this._componentManager = e, this._shortcutService = n, this._initMenu(), this._initShortcut(), this._initComponent();
+  constructor(o, e, r) {
+    super(), this._menuManagerService = o, this._componentManager = e, this._shortcutService = r, this._initMenu(), this._initShortcut(), this._initComponent();
   }
   _initShortcut() {
-    this._shortcutService.registerShortcut(Ft);
+    this._shortcutService.registerShortcut(Qt);
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(kt);
+    this._menuManagerService.mergeMenu(Xt);
   }
   _initComponent() {
     [
-      [Ee, Vt],
-      [tt, Bt],
-      [ce, $e]
+      [Ee, Yt],
+      [ot, qt],
+      [me, $e]
     ].forEach(([o, e]) => {
       this._componentManager.register(o, e);
     });
   }
 };
-W = zt([
-  te(0, ft),
-  te(1, v(_t)),
-  te(2, Ct)
+W = nn([
+  ne(0, gt),
+  ne(1, v(St)),
+  ne(2, It)
 ], W);
-var Gt = Object.defineProperty, Kt = Object.getOwnPropertyDescriptor, Yt = (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 && Gt(e, n, r), r;
-}, ne = (o, e) => (n, t) => e(n, t, o);
-const qt = (o, e, n) => {
-  const t = j(o), r = n.row - e.row, i = n.column - e.column, s = {
+var rn = Object.defineProperty, on = Object.getOwnPropertyDescriptor, sn = (o, e, r, t) => {
+  for (var n = t > 1 ? void 0 : t ? on(e, r) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (t ? s(e, r, n) : s(n)) || n);
+  return t && n && rn(e, r, n), n;
+}, re = (o, e) => (r, t) => e(r, t, o);
+const an = (o, e, r) => {
+  const t = A(o), n = r.row - e.row, i = r.column - e.column, s = {
     startColumn: t.column + i,
-    startRow: t.row + r,
+    startRow: t.row + n,
     endColumn: t.column + i,
-    endRow: t.row + r
+    endRow: t.row + n
   };
-  return It(s);
+  return yt(s);
 };
 let Z = class extends $ {
-  constructor(e, n, t) {
+  constructor(e, r, t) {
     super();
     E(this, "_copyInfo");
-    this._sheetClipboardService = e, this._sheetsThreadCommentModel = n, this._threadCommentDataSourceService = t, this._initClipboardHook();
+    this._sheetClipboardService = e, this._sheetsThreadCommentModel = r, this._threadCommentDataSourceService = t, this._initClipboardHook();
   }
   // eslint-disable-next-line max-lines-per-function
   _initClipboardHook() {
     this.disposeWithMe(
       this._sheetClipboardService.addClipboardHook({
         id: Oe,
-        onBeforeCopy: (e, n, t) => {
+        onBeforeCopy: (e, r, t) => {
           this._copyInfo = {
             unitId: e,
-            subUnitId: n,
+            subUnitId: r,
             range: t
           };
         },
         // eslint-disable-next-line max-lines-per-function
-        onPasteCells: (e, n, t, r) => {
-          const { unitId: i, subUnitId: s, range: a } = n, c = {
+        onPasteCells: (e, r, t, n) => {
+          const { unitId: i, subUnitId: s, range: a } = r, c = {
             row: a.rows[0],
             column: a.cols[0]
           };
-          if (r.copyType === st.CUT && this._copyInfo) {
-            const { range: h, unitId: d, subUnitId: m } = this._copyInfo, u = {
-              row: h.startRow,
-              column: h.startColumn
+          if (n.copyType === mt.CUT && this._copyInfo) {
+            const { range: m, unitId: h, subUnitId: d } = this._copyInfo, u = {
+              row: m.startRow,
+              column: m.startColumn
             };
-            if (!(i === d && s === m)) {
+            if (!(i === h && s === d)) {
               const p = [];
-              Fe.foreach(h, (g, l) => {
-                const I = this._sheetsThreadCommentModel.getAllByLocation(d, m, g, l);
+              Ze.foreach(m, (g, l) => {
+                const I = this._sheetsThreadCommentModel.getAllByLocation(h, d, g, l);
                 this._threadCommentDataSourceService.syncUpdateMutationToColla ? I.forEach((f) => {
                   p.push(f);
                 }) : I.forEach(({ children: f, ...M }) => {
                   M.parentId || p.push(M);
                 });
               });
-              const _ = [], S = [], R = [], x = [], X = (g) => {
+              const _ = [], S = [], U = [], D = [], ee = (g) => {
                 _.unshift({
                   id: F.id,
                   params: {
-                    unitId: d,
-                    subUnitId: m,
+                    unitId: h,
+                    subUnitId: d,
                     commentId: g.id
                   }
-                }), R.push({
-                  id: oe.id,
+                }), U.push({
+                  id: ie.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
                     comment: {
                       ...g,
-                      ref: qt(g.ref, u, c),
+                      ref: an(g.ref, u, c),
                       unitId: i,
                       subUnitId: s
                     },
                     sync: !0
                   }
                 }), S.push({
-                  id: oe.id,
+                  id: ie.id,
                   params: {
-                    unitId: d,
-                    subUnitId: m,
+                    unitId: h,
+                    subUnitId: d,
                     comment: g,
                     sync: !0
                   }
-                }), x.unshift({
+                }), D.unshift({
                   id: F.id,
                   params: {
                     unitId: i,
@@ -478,10 +500,10 @@ let Z = class extends $ {
                 });
               };
               return p.forEach((g) => {
-                X(g);
+                ee(g);
               }), {
-                redos: [..._, ...R],
-                undos: [...x, ...S]
+                redos: [..._, ...U],
+                undos: [...D, ...S]
               };
             }
           }
@@ -494,37 +516,37 @@ let Z = class extends $ {
     );
   }
 };
-Z = Yt([
-  ne(0, v(it)),
-  ne(1, v(D)),
-  ne(2, ye)
+Z = sn([
+  re(0, v(ct)),
+  re(1, v(x)),
+  re(2, ye)
 ], Z);
-var Jt = Object.defineProperty, Qt = Object.getOwnPropertyDescriptor, Xt = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Qt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(e, n, r) : s(r)) || r);
-  return t && r && Jt(e, n, r), r;
-}, H = (o, e) => (n, t) => e(n, t, o);
+var cn = Object.defineProperty, mn = Object.getOwnPropertyDescriptor, dn = (o, e, r, t) => {
+  for (var n = t > 1 ? void 0 : t ? mn(e, r) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (t ? s(e, r, n) : s(n)) || n);
+  return t && n && cn(e, r, n), n;
+}, L = (o, e) => (r, t) => e(r, t, o);
 let z = class extends $ {
-  constructor(o, e, n, t) {
-    super(), this._hoverManagerService = o, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = n, this._sheetPermissionInterceptorBaseController = t, this._initHoverEvent();
+  constructor(o, e, r, t) {
+    super(), this._hoverManagerService = o, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = r, this._sheetPermissionInterceptorBaseController = t, this._initHoverEvent();
   }
   _initHoverEvent() {
     this.disposeWithMe(
-      this._hoverManagerService.currentCell$.pipe(ae(100)).subscribe((o) => {
+      this._hoverManagerService.currentCell$.pipe(ce(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);
+          const { location: r } = o, { unitId: t, subUnitId: n, row: i, col: s } = r, a = this._sheetsThreadCommentModel.getByLocation(t, n, i, s);
           if (a) {
             if (!this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
-              workbookTypes: [q],
+              workbookTypes: [K],
               worksheetTypes: [J],
               rangeTypes: [Q]
             }, [{ startRow: i, startColumn: s, endRow: i, endColumn: s }]))
               return;
-            const h = this._sheetsThreadCommentModel.getComment(t, r, a);
-            h && !h.resolved && this._sheetsThreadCommentPopupService.showPopup({
+            const m = this._sheetsThreadCommentModel.getComment(t, n, a);
+            m && !m.resolved && this._sheetsThreadCommentPopupService.showPopup({
               unitId: t,
-              subUnitId: r,
+              subUnitId: n,
               row: i,
               col: s,
               commentId: a,
@@ -537,44 +559,44 @@ let z = class extends $ {
     );
   }
 };
-z = Xt([
-  H(0, v(at)),
-  H(1, v(U)),
-  H(2, v(D)),
-  H(3, v(Se))
+z = dn([
+  L(0, v(dt)),
+  L(1, v(R)),
+  L(2, v(x)),
+  L(3, v(ge))
 ], z);
-var en = Object.defineProperty, tn = Object.getOwnPropertyDescriptor, nn = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? tn(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 && en(e, n, r), r;
-}, w = (o, e) => (n, t) => e(n, t, o);
+var hn = Object.defineProperty, un = Object.getOwnPropertyDescriptor, ln = (o, e, r, t) => {
+  for (var n = t > 1 ? void 0 : t ? un(e, r) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (t ? s(e, r, n) : s(n)) || n);
+  return t && n && hn(e, r, n), n;
+}, w = (o, e) => (r, t) => e(r, t, o);
 let G = class extends $ {
-  constructor(e, n, t, r, i, s, a, c, h, d) {
+  constructor(e, r, t, n, i, s, a, c, m, h) {
     super();
     E(this, "_isSwitchToCommenting", !1);
     E(this, "_selectionShapeInfo", null);
-    this._commandService = e, this._sheetsThreadCommentPopupService = n, this._sheetsThreadCommentModel = t, this._threadCommentPanelService = r, this._univerInstanceService = i, this._sheetPermissionInterceptorBaseController = s, this._markSelectionService = a, this._sheetSelectionService = c, this._editorBridgeService = h, this._renderManagerService = d, this._initCommandListener(), this._initPanelListener(), this._initMarkSelection(), this._initSelectionUpdateListener(), this._initEditorBridge();
+    this._commandService = e, this._sheetsThreadCommentPopupService = r, this._sheetsThreadCommentModel = t, this._threadCommentPanelService = n, this._univerInstanceService = i, this._sheetPermissionInterceptorBaseController = s, this._markSelectionService = a, this._sheetSelectionService = c, this._editorBridgeService = m, this._renderManagerService = h, this._initCommandListener(), this._initPanelListener(), this._initMarkSelection(), this._initSelectionUpdateListener(), this._initEditorBridge();
   }
-  _handleSelectionChange(e, n, t) {
+  _handleSelectionChange(e, r, t) {
     var u, p, _;
-    const r = (u = e[0]) == null ? void 0 : u.range, i = this._renderManagerService.getRenderById(n), s = (p = i == null ? void 0 : i.with(ht).getWorksheetSkeleton(t)) == null ? void 0 : p.skeleton;
-    if (!s || !r)
+    const n = (u = e[0]) == null ? void 0 : u.range, i = this._renderManagerService.getRenderById(r), s = (p = i == null ? void 0 : i.with(ut).getWorksheetSkeleton(t)) == null ? void 0 : p.skeleton;
+    if (!s || !n)
       return;
-    const a = s.getCellByIndex(r.startRow, r.startColumn);
-    if ((((_ = r.rangeType) != null ? _ : me.NORMAL) !== me.NORMAL || r.endColumn - r.startColumn > 0 || r.endRow - r.startRow > 0) && !((a.isMerged || a.isMergedMainCell) && ke.equals(a.mergeInfo, r))) {
-      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(ee.id);
+    const a = s.getCellByIndex(n.startRow, n.startColumn);
+    if ((((_ = n.rangeType) != null ? _ : he.NORMAL) !== he.NORMAL || n.endColumn - n.startColumn > 0 || n.endRow - n.startRow > 0) && !((a.isMerged || a.isMergedMainCell) && ze.equals(a.mergeInfo, n))) {
+      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(te.id);
       return;
     }
-    const h = a.actualRow, d = a.actualColumn;
-    if (!this._sheetsThreadCommentModel.showCommentMarker(n, t, h, d)) {
-      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(ee.id);
+    const m = a.actualRow, h = a.actualColumn;
+    if (!this._sheetsThreadCommentModel.showCommentMarker(r, t, m, h)) {
+      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(te.id);
       return;
     }
-    const m = this._sheetsThreadCommentModel.getByLocation(n, t, h, d);
-    m && this._commandService.executeCommand(ee.id, {
-      unitId: n,
+    const d = this._sheetsThreadCommentModel.getByLocation(r, t, m, h);
+    d && this._commandService.executeCommand(te.id, {
+      unitId: r,
       subUnitId: t,
-      commentId: m
+      commentId: d
     });
   }
   _initSelectionUpdateListener() {
@@ -582,8 +604,8 @@ let G = class extends $ {
       this._sheetSelectionService.selectionMoveEnd$.subscribe((e) => {
         if (this._isSwitchToCommenting)
           return;
-        const n = this._sheetSelectionService.currentSelectionParam;
-        n && this._handleSelectionChange(e, n.unitId, n.sheetId);
+        const r = this._sheetSelectionService.currentSelectionParam;
+        r && this._handleSelectionChange(e, r.unitId, r.sheetId);
       })
     );
   }
@@ -597,50 +619,50 @@ let G = class extends $ {
   _initCommandListener() {
     this._commandService.onCommandExecuted((e) => {
       if (e.id === F.id) {
-        const n = e.params, t = this._sheetsThreadCommentPopupService.activePopup;
+        const r = e.params, t = this._sheetsThreadCommentPopupService.activePopup;
         if (!t)
           return;
-        const { unitId: r, subUnitId: i, commentId: s } = t;
-        n.unitId === r && n.subUnitId === i && n.commentId === s && this._sheetsThreadCommentPopupService.hidePopup();
+        const { unitId: n, subUnitId: i, commentId: s } = t;
+        r.unitId === n && r.subUnitId === i && r.commentId === s && this._sheetsThreadCommentPopupService.hidePopup();
       }
     });
   }
   _initPanelListener() {
     this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe(async (e) => {
-      var n;
+      var r;
       if (e) {
-        const { unitId: t, subUnitId: r, commentId: i, trigger: s } = e, a = this._sheetsThreadCommentModel.getComment(t, r, i);
+        const { unitId: t, subUnitId: n, commentId: i, trigger: s } = e, a = this._sheetsThreadCommentModel.getComment(t, n, i);
         if (!a || a.resolved)
           return;
         const c = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
         if (!c || c.getUnitId() !== t)
           return;
-        this._isSwitchToCommenting = !0, ((n = c.getActiveSheet()) == null ? void 0 : n.getSheetId()) !== r && await this._commandService.executeCommand(qe.id, {
+        this._isSwitchToCommenting = !0, ((r = c.getActiveSheet()) == null ? void 0 : r.getSheetId()) !== n && await this._commandService.executeCommand(Xe.id, {
           unitId: t,
-          subUnitId: r
+          subUnitId: n
         }), this._isSwitchToCommenting = !1;
-        const m = j(a.ref), { row: u, column: p } = m;
+        const d = A(a.ref), { row: u, column: p } = d;
         if (!this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
-          workbookTypes: [q],
+          workbookTypes: [K],
           worksheetTypes: [J],
           rangeTypes: [Q]
         }, [{ startRow: u, startColumn: p, endRow: u, endColumn: p }]))
           return;
         const S = 1;
-        if (await this._commandService.executeCommand(mt.id, {
+        if (await this._commandService.executeCommand(lt.id, {
           range: {
-            startRow: Math.max(m.row - S, 0),
-            endRow: m.row + S,
-            startColumn: Math.max(m.column - S, 0),
-            endColumn: m.column + S
+            startRow: Math.max(d.row - S, 0),
+            endRow: d.row + S,
+            startColumn: Math.max(d.column - S, 0),
+            endColumn: d.column + S
           }
         }), this._editorBridgeService.isVisible().visible)
           return;
         this._sheetsThreadCommentPopupService.showPopup({
           unitId: t,
-          subUnitId: r,
-          row: m.row,
-          col: m.column,
+          subUnitId: n,
+          row: d.row,
+          col: d.column,
           commentId: a.id,
           trigger: s
         });
@@ -649,28 +671,28 @@ let G = class extends $ {
     }));
   }
   _initMarkSelection() {
-    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.pipe(ae(100)).subscribe((e) => {
+    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.pipe(ce(100)).subscribe((e) => {
       var u, p;
       if (!e) {
         this._selectionShapeInfo && (this._markSelectionService.removeShape(this._selectionShapeInfo.shapeId), this._selectionShapeInfo = null);
         return;
       }
-      const { unitId: n, subUnitId: t, commentId: r } = e;
+      const { unitId: r, subUnitId: t, commentId: n } = e;
       this._selectionShapeInfo && (this._markSelectionService.removeShape(this._selectionShapeInfo.shapeId), this._selectionShapeInfo = null);
-      const i = this._sheetsThreadCommentModel.getComment(n, t, r);
+      const i = this._sheetsThreadCommentModel.getComment(r, t, n);
       if (!i)
         return;
-      const s = j(i.ref), { row: a, column: c } = s;
+      const s = A(i.ref), { row: a, column: c } = s;
       if (Number.isNaN(a) || Number.isNaN(c))
         return null;
-      const h = (u = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : u.getSheetBySheetId(t), d = (p = h == null ? void 0 : h.getMergedCell(a, c)) != null ? p : {
+      const m = (u = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : u.getSheetBySheetId(t), h = (p = m == null ? void 0 : m.getMergedCell(a, c)) != null ? p : {
         startColumn: c,
         endColumn: c,
         startRow: a,
         endRow: a
-      }, m = this._markSelectionService.addShape(
+      }, d = this._markSelectionService.addShape(
         {
-          range: d,
+          range: h,
           style: {
             hasAutoFill: !1,
             fill: "rgb(255, 189, 55, 0.35)",
@@ -683,66 +705,66 @@ let G = class extends $ {
         [],
         -1
       );
-      m && (this._selectionShapeInfo = {
+      d && (this._selectionShapeInfo = {
         ...e,
-        shapeId: m
+        shapeId: d
       });
     }));
   }
 };
-G = nn([
-  w(0, ie),
-  w(1, v(U)),
-  w(2, v(D)),
-  w(3, v(se)),
+G = ln([
+  w(0, se),
+  w(1, v(R)),
+  w(2, v(x)),
+  w(3, v(ae)),
   w(4, N),
-  w(5, v(Se)),
-  w(6, fe),
-  w(7, v(pe)),
-  w(8, ct),
-  w(9, Pe)
+  w(5, v(ge)),
+  w(6, Ce),
+  w(7, v(ve)),
+  w(8, ht),
+  w(9, Te)
 ], G);
-var rn = Object.defineProperty, on = Object.getOwnPropertyDescriptor, sn = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? on(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 && rn(e, n, r), r;
-}, L = (o, e) => (n, t) => e(n, t, o);
-let K = class extends $ {
-  constructor(o, e, n, t) {
-    super(), this._sheetInterceptorService = o, this._univerInstanceService = e, this._threadCommentModel = n, this._threadCommentDataSourceService = t, this._initSheetChange();
+var pn = Object.defineProperty, vn = Object.getOwnPropertyDescriptor, _n = (o, e, r, t) => {
+  for (var n = t > 1 ? void 0 : t ? vn(e, r) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (t ? s(e, r, n) : s(n)) || n);
+  return t && n && pn(e, r, n), n;
+}, H = (o, e) => (r, t) => e(r, t, o);
+let Y = class extends $ {
+  constructor(o, e, r, t) {
+    super(), this._sheetInterceptorService = o, this._univerInstanceService = e, this._threadCommentModel = r, this._threadCommentDataSourceService = t, this._initSheetChange();
   }
   _initSheetChange() {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
         getMutations: (o) => {
           var e;
-          if (o.id === Je.id) {
-            const n = o.params, t = n.unitId ? this._univerInstanceService.getUnit(n.unitId) : this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
+          if (o.id === et.id) {
+            const r = o.params, t = r.unitId ? this._univerInstanceService.getUnit(r.unitId) : this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
             if (!t)
               return { redos: [], undos: [] };
-            const r = t.getUnitId(), i = n.subUnitId || ((e = t.getActiveSheet()) == null ? void 0 : e.getSheetId());
+            const n = t.getUnitId(), i = r.subUnitId || ((e = t.getActiveSheet()) == null ? void 0 : e.getSheetId());
             if (!i)
               return { redos: [], undos: [] };
-            const s = this._threadCommentModel.ensureMap(r, i), a = Array.from(s.values()).filter((u) => !u.parentId), c = a.map((u) => u.id), h = this._threadCommentDataSourceService.syncUpdateMutationToColla, d = c.map((u) => ({
+            const s = this._threadCommentModel.ensureMap(n, i), a = Array.from(s.values()).filter((u) => !u.parentId), c = a.map((u) => u.id), m = this._threadCommentDataSourceService.syncUpdateMutationToColla, h = c.map((u) => ({
               id: F.id,
               params: {
-                unitId: r,
+                unitId: n,
                 subUnitId: i,
                 commentId: u
               }
-            })), m = a.map(({ children: u, ...p }) => ({
-              id: oe.id,
+            })), d = a.map(({ children: u, ...p }) => ({
+              id: ie.id,
               params: {
-                unitId: r,
+                unitId: n,
                 subUnitId: i,
                 comment: {
                   ...p,
-                  children: h ? u : void 0
+                  children: m ? u : void 0
                 },
-                sync: !h
+                sync: !m
               }
             }));
-            return { redos: d, undos: m };
+            return { redos: h, undos: d };
           }
           return { redos: [], undos: [] };
         }
@@ -750,22 +772,22 @@ let K = class extends $ {
     );
   }
 };
-K = sn([
-  L(0, v(ve)),
-  L(1, N),
-  L(2, v(bt)),
-  L(3, ye)
-], K);
-var Ne = Object.defineProperty, an = Object.getOwnPropertyDescriptor, cn = (o, e, n) => e in o ? Ne(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n, hn = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? an(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;
-}, re = (o, e) => (n, t) => e(n, t, o), De = (o, e, n) => cn(o, typeof e != "symbol" ? e + "" : e, n);
-let Y = class extends ze {
-  constructor(o = Ot, e, n, t) {
-    super(), this._config = o, this._injector = e, this._commandService = n, this._configService = t;
-    const { menu: r, ...i } = this._config;
-    r && this._configService.setConfig("menu", r, { merge: !0 }), this._configService.setConfig(Et, i);
+Y = _n([
+  H(0, v(_e)),
+  H(1, N),
+  H(2, v(Et)),
+  H(3, ye)
+], Y);
+var je = Object.defineProperty, fn = Object.getOwnPropertyDescriptor, Cn = (o, e, r) => e in o ? je(o, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : o[e] = r, Sn = (o, e, r, t) => {
+  for (var n = t > 1 ? void 0 : t ? fn(e, r) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (t ? s(e, r, n) : s(n)) || n);
+  return t && n && je(e, r, n), n;
+}, oe = (o, e) => (r, t) => e(r, t, o), Ae = (o, e, r) => Cn(o, typeof e != "symbol" ? e + "" : e, r);
+let q = class extends qe {
+  constructor(o = Nt, e, r, t) {
+    super(), this._config = o, this._injector = e, this._commandService = r, this._configService = t;
+    const { menu: n, ...i } = this._config;
+    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig($t, i);
   }
   onStarting() {
     [
@@ -773,9 +795,9 @@ let Y = class extends ze {
       [k],
       [Z],
       [z],
-      [K],
+      [Y],
       [G],
-      [U]
+      [R]
     ].forEach((o) => {
       this._injector.add(o);
     }), [V].forEach((o) => {
@@ -783,31 +805,31 @@ let Y = class extends ze {
     }), this._injector.get(W);
   }
   onReady() {
-    this._injector.get(k), this._injector.get(K);
+    this._injector.get(k), this._injector.get(Y);
   }
   onRendered() {
     this._injector.get(Z), this._injector.get(z), this._injector.get(G);
   }
 };
-De(Y, "pluginName", Oe);
-De(Y, "type", b.UNIVER_SHEET);
-Y = hn([
-  We(nt, Qe),
-  re(1, v(Ze)),
-  re(2, v(ie)),
-  re(3, Ge)
-], Y);
+Ae(q, "pluginName", Oe);
+Ae(q, "type", b.UNIVER_SHEET);
+q = Sn([
+  Ge(it, tt),
+  oe(1, v(Ye)),
+  oe(2, v(se)),
+  oe(3, Ke)
+], q);
 export {
-  En as AddCommentCommand,
-  On as DeleteCommentCommand,
-  Un as DeleteCommentTreeCommand,
-  Rn as IThreadCommentDataSourceService,
-  Mn as IThreadCommentMentionDataService,
-  $n as ResolveCommentCommand,
+  An as AddCommentCommand,
+  Vn as DeleteCommentCommand,
+  Bn as DeleteCommentTreeCommand,
+  Ln as IThreadCommentDataSourceService,
+  xn as IThreadCommentMentionDataService,
+  Hn as ResolveCommentCommand,
   Oe as SHEETS_THREAD_COMMENT,
-  U as SheetsThreadCommentPopupService,
+  R as SheetsThreadCommentPopupService,
   V as ShowAddSheetCommentModalOperation,
-  Y as UniverSheetsThreadCommentUIPlugin,
-  wn as UniverThreadCommentUIPlugin,
-  Nn as UpdateCommentCommand
+  q as UniverSheetsThreadCommentUIPlugin,
+  Dn as UniverThreadCommentUIPlugin,
+  Fn as UpdateCommentCommand
 };