@univerjs/sheets-thread-comment-ui 0.5.0 → 0.5.1

package/lib/es/index.js

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