@univerjs/sheets-thread-comment 0.1.12 → 0.1.13

package/lib/es/index.js

@@ -1,22 +1,22 @@
-var Re = Object.defineProperty;
-var Ee = (o, e, n) => e in o ? Re(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n;
-var _ = (o, e, n) => (Ee(o, typeof e != "symbol" ? e + "" : e, n), n);
-import { Inject as h, Injector as pe } from "@wendellhu/redi";
-import { Inject as Sn, Injector as gn } from "@wendellhu/redi";
-import { Disposable as O, ObjectMatrix as $e, UniverInstanceType as S, IUniverInstanceService as $, DisposableCollection as xe, Tools as _e, CommandType as Ne, ICommandService as Q, OnLifecycle as x, LifecycleStages as N, LocaleService as De, toDisposable as je, Range as Ve } from "@univerjs/core";
-import { ICommandService as Mn, Plugin as Pn, UniverInstanceType as bn } from "@univerjs/core";
-import { ThreadCommentTree as Ae, ThreadCommentPanelService as ee, ThreadCommentPanel as Le, ToggleSheetCommentPanelOperation as He, SetActiveCommentOperation as re, THREAD_COMMENT_PANEL as Be, UniverThreadCommentUIPlugin as We } from "@univerjs/thread-comment-ui";
-import { IThreadCommentMentionDataService as wn, UniverThreadCommentUIPlugin as yn } from "@univerjs/thread-comment-ui";
-import { IZenZoneService as Fe, useObservable as oe, KeyCode as Ze, MetaKeys as ie, MenuItemType as ve, MenuPosition as fe, getMenuHiddenObservable as Ce, ComponentManager as ze, IMenuService as Ke, IShortcutService as Ge } from "@univerjs/ui";
-import { SelectionManagerService as Ye, getSheetCommandTarget as ke, SetSelectionsOperation as qe, SelectionMoveType as Xe, SetWorksheetActiveOperation as Je, RefRangeService as Qe, handleDefaultRangeChangeWithEffectRefCommands as et, SheetInterceptorService as Se, INTERCEPTOR_POINT as tt, RemoveSheetCommand as nt } from "@univerjs/sheets";
+var De = Object.defineProperty;
+var Ne = (o, e, n) => e in o ? De(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n;
+var _ = (o, e, n) => (Ne(o, typeof e != "symbol" ? e + "" : e, n), n);
+import { Inject as h, Injector as le } from "@wendellhu/redi";
+import { Inject as bn, Injector as Tn } from "@wendellhu/redi";
+import { Disposable as O, ObjectMatrix as je, UniverInstanceType as g, IUniverInstanceService as $, DisposableCollection as Ve, Tools as _e, CommandType as Ae, ICommandService as Q, OnLifecycle as x, LifecycleStages as D, LocaleService as Le, toDisposable as He, Range as Be } from "@univerjs/core";
+import { ICommandService as yn, Plugin as Un, UniverInstanceType as On } from "@univerjs/core";
+import { ThreadCommentTree as We, ThreadCommentPanelService as ee, ThreadCommentPanel as Fe, ToggleSheetCommentPanelOperation as Ze, SetActiveCommentOperation as re, THREAD_COMMENT_PANEL as ke, UniverThreadCommentUIPlugin as ze } from "@univerjs/thread-comment-ui";
+import { IThreadCommentMentionDataService as En, UniverThreadCommentUIPlugin as $n } from "@univerjs/thread-comment-ui";
+import { IZenZoneService as Ge, useObservable as oe, KeyCode as Ke, MetaKeys as ie, MenuItemType as ve, MenuPosition as fe, getMenuHiddenObservable as Ce, MenuGroup as Ye, ComponentManager as qe, IMenuService as Xe, IShortcutService as Je } from "@univerjs/ui";
+import { SelectionManagerService as Qe, getSheetCommandTarget as et, WorkbookCommentPermission as ge, WorksheetViewPermission as Se, RangeProtectionPermissionEditPoint as Ie, SetSelectionsOperation as tt, SelectionMoveType as nt, SetWorksheetActiveOperation as rt, RefRangeService as ot, handleDefaultRangeChangeWithEffectRefCommands as it, SheetInterceptorService as Me, INTERCEPTOR_POINT as st, RemoveSheetCommand as at } from "@univerjs/sheets";
 import { singleReferenceToGrid as y, serializeRange as J } from "@univerjs/engine-formula";
-import { SheetCanvasPopManagerService as rt, IMarkSelectionService as ot, whenSheetEditorFocused as it, ScrollToCellCommand as st, SheetSkeletonManagerService as at, ISheetClipboardService as ct, COPY_TYPE as mt, HoverManagerService as dt } from "@univerjs/sheets-ui";
-import { ThreadCommentModel as G, DeleteCommentMutation as V, AddCommentMutation as K, UpdateCommentRefMutation as se } from "@univerjs/thread-comment";
-import { IThreadCommentDataSourceService as On } from "@univerjs/thread-comment";
+import { SheetCanvasPopManagerService as ct, IMarkSelectionService as dt, whenSheetEditorFocused as mt, getCommentDisable$ as Pe, ScrollToCellCommand as ut, SheetSkeletonManagerService as ht, ISheetClipboardService as pt, COPY_TYPE as lt, HoverManagerService as _t } from "@univerjs/sheets-ui";
+import { ThreadCommentModel as G, DeleteCommentMutation as V, AddCommentMutation as z, UpdateCommentRefMutation as se } from "@univerjs/thread-comment";
+import { IThreadCommentDataSourceService as Dn } from "@univerjs/thread-comment";
 import { useDependency as w, useObservable as ae } from "@wendellhu/redi/react-bindings";
-import ge, { forwardRef as Ie, useRef as Me, createElement as Pe, useMemo as ut, useCallback as ce, useEffect as ht } from "react";
-import { Subject as lt, BehaviorSubject as pt, map as _t } from "rxjs";
-import { IRenderManagerService as vt } from "@univerjs/engine-render";
+import be, { forwardRef as Te, useRef as we, createElement as ye, useMemo as vt, useCallback as ce, useEffect as ft } from "react";
+import { Subject as Ct, BehaviorSubject as gt, map as St, debounceTime as It } from "rxjs";
+import { IRenderManagerService as Mt } from "@univerjs/engine-render";
 var f = function() {
   return f = Object.assign || function(o) {
     for (var e, n = 1, r = arguments.length; n < r; n++) {
@@ -26,7 +26,7 @@ var f = function() {
     }
     return o;
   }, f.apply(this, arguments);
-}, ft = function(o, e) {
+}, Pt = function(o, e) {
   var n = {};
   for (var r in o)
     Object.prototype.hasOwnProperty.call(o, r) && e.indexOf(r) < 0 && (n[r] = o[r]);
@@ -34,16 +34,16 @@ var f = function() {
     for (var t = 0, r = Object.getOwnPropertySymbols(o); t < r.length; t++)
       e.indexOf(r[t]) < 0 && Object.prototype.propertyIsEnumerable.call(o, r[t]) && (n[r[t]] = o[r[t]]);
   return n;
-}, be = Ie(function(o, e) {
-  var n = o.icon, r = o.id, t = o.className, i = o.extend, s = ft(o, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(r, " ").concat(t || "").trim(), c = Me("_".concat(gt()));
-  return Te(n, "".concat(r), { defIds: n.defIds, idSuffix: c.current }, f({ ref: e, className: a }, s), i);
+}, Ue = Te(function(o, e) {
+  var n = o.icon, r = o.id, t = o.className, i = o.extend, s = Pt(o, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(r, " ").concat(t || "").trim(), c = we("_".concat(wt()));
+  return Oe(n, "".concat(r), { defIds: n.defIds, idSuffix: c.current }, f({ ref: e, className: a }, s), i);
 });
-function Te(o, e, n, r, t) {
-  return Pe(o.tag, f(f({ key: e }, Ct(o, n, t)), r), (St(o, n).children || []).map(function(i, s) {
-    return Te(i, "".concat(e, "-").concat(o.tag, "-").concat(s), n, void 0, t);
+function Oe(o, e, n, r, t) {
+  return ye(o.tag, f(f({ key: e }, bt(o, n, t)), r), (Tt(o, n).children || []).map(function(i, s) {
+    return Oe(i, "".concat(e, "-").concat(o.tag, "-").concat(s), n, void 0, t);
   }));
 }
-function Ct(o, e, n) {
+function bt(o, e, n) {
   var r = f({}, o.attrs);
   n != null && n.colorChannel1 && r.fill === "colorChannel1" && (r.fill = n.colorChannel1);
   var t = e.defIds;
@@ -52,35 +52,35 @@ function Ct(o, e, n) {
     typeof a == "string" && (r[s] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), r;
 }
-function St(o, e) {
+function Tt(o, e) {
   var n, r = e.defIds;
   return !r || r.length === 0 ? o : o.tag === "defs" && (!((n = o.children) === null || n === void 0) && n.length) ? f(f({}, o), { children: o.children.map(function(t) {
     return typeof t.attrs.id == "string" && r && r.indexOf(t.attrs.id) > -1 ? f(f({}, t), { attrs: f(f({}, t.attrs), { id: t.attrs.id + e.idSuffix }) }) : t;
   }) }) : o;
 }
-function gt() {
+function wt() {
   return Math.random().toString(36).substring(2, 8);
 }
-be.displayName = "UniverIcon";
-var It = { 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" } }] }, we = Ie(function(o, e) {
-  return Pe(be, Object.assign({}, o, {
+Ue.displayName = "UniverIcon";
+var yt = { 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" } }] }, Re = Te(function(o, e) {
+  return ye(Ue, Object.assign({}, o, {
     id: "comment-single",
     ref: e,
-    icon: It
+    icon: yt
   }));
 });
-we.displayName = "CommentSingle";
-var Mt = Object.defineProperty, Pt = Object.getOwnPropertyDescriptor, bt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? Pt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+Re.displayName = "CommentSingle";
+var Ut = Object.defineProperty, Ot = Object.getOwnPropertyDescriptor, Rt = (o, e, n, r) => {
+  for (var t = r > 1 ? void 0 : r ? Ot(e, n) : e, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && Mt(e, n, t), t;
-}, me = (o, e) => (n, r) => e(n, r, o);
+  return r && t && Ut(e, n, t), t;
+}, de = (o, e) => (n, r) => e(n, r, o);
 let T = class extends O {
   constructor(e, n) {
     super();
     _(this, "_matrixMap", /* @__PURE__ */ new Map());
     _(this, "_locationMap", /* @__PURE__ */ new Map());
-    _(this, "_commentUpdate$", new lt());
+    _(this, "_commentUpdate$", new Ct());
     _(this, "commentUpdate$", this._commentUpdate$.asObservable());
     this._threadCommentModel = e, this._univerInstanceService = n, this._init();
   }
@@ -91,7 +91,7 @@ let T = class extends O {
     let r = this._matrixMap.get(e);
     r || (r = /* @__PURE__ */ new Map(), this._matrixMap.set(e, r));
     let t = r.get(n);
-    return t || (t = new $e(), r.set(n, t)), t;
+    return t || (t = new je(), r.set(n, t)), t;
   }
   _ensureCommentLocationMap(e, n) {
     let r = this._locationMap.get(e);
@@ -117,8 +117,8 @@ let T = class extends O {
     }
   }
   _addComment(e, n, r) {
-    const t = y(r.ref), i = r.parentId, { row: s, column: a } = t, c = r.id, { matrix: m, locationMap: u } = this._ensure(e, n);
-    !i && s >= 0 && a >= 0 && (m.setValue(s, a, c), u.set(c, { row: s, column: a })), this._commentUpdate$.next({
+    const t = y(r.ref), i = r.parentId, { row: s, column: a } = t, c = r.id, { matrix: d, locationMap: u } = this._ensure(e, n);
+    !i && s >= 0 && a >= 0 && (d.setValue(s, a, c), u.set(c, { row: s, column: a })), this._commentUpdate$.next({
       unitId: e,
       subUnitId: n,
       payload: r,
@@ -130,7 +130,7 @@ let T = class extends O {
     this.disposeWithMe(this._threadCommentModel.commentUpdate$.subscribe((e) => {
       const { unitId: n, subUnitId: r } = e;
       try {
-        if (this._univerInstanceService.getUnitType(n) !== S.UNIVER_SHEET)
+        if (this._univerInstanceService.getUnitType(n) !== g.UNIVER_SHEET)
           return;
       } catch {
       }
@@ -143,8 +143,8 @@ let T = class extends O {
         case "delete": {
           const { isRoot: s, comment: a } = e.payload, c = y(a.ref);
           if (s) {
-            const { row: m, column: u } = c;
-            m >= 0 && u >= 0 && t.realDeleteValue(m, u);
+            const { row: d, column: u } = c;
+            d >= 0 && u >= 0 && t.realDeleteValue(d, u);
           }
           this._commentUpdate$.next({
             ...e,
@@ -167,8 +167,8 @@ let T = class extends O {
           const s = y(e.payload.ref), { commentId: a } = e.payload, c = i.get(a);
           if (!c)
             return;
-          const { row: m, column: u } = c;
-          t.getValue(m, u) === a && (t.realDeleteValue(m, u), i.delete(a)), s.row >= 0 && s.column >= 0 && (t.setValue(s.row, s.column, a), i.set(a, { row: s.row, column: s.column })), this._commentUpdate$.next({
+          const { row: d, column: u } = c;
+          t.getValue(d, u) === a && (t.realDeleteValue(d, u), i.delete(a)), s.row >= 0 && s.column >= 0 && (t.setValue(s.row, s.column, a), i.set(a, { row: s.row, column: s.column })), this._commentUpdate$.next({
             ...e,
             ...s
           });
@@ -196,22 +196,22 @@ let T = class extends O {
     return !!(s && !s.resolved);
   }
 };
-T = bt([
-  me(0, h(G)),
-  me(1, $)
+T = Rt([
+  de(0, h(G)),
+  de(1, $)
 ], T);
-const ye = "univer.sheet.thread-comment-modal", te = "comment-single", Ue = "univer.sheet.thread-comment";
-var Tt = Object.defineProperty, wt = Object.getOwnPropertyDescriptor, yt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? wt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+const Ee = "univer.sheet.thread-comment-modal", te = "comment-single", $e = "univer.sheet.thread-comment";
+var Et = Object.defineProperty, $t = Object.getOwnPropertyDescriptor, xt = (o, e, n, r) => {
+  for (var t = r > 1 ? void 0 : r ? $t(e, n) : e, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && Tt(e, n, t), t;
-}, de = (o, e) => (n, r) => e(n, r, o);
+  return r && t && Et(e, n, t), t;
+}, me = (o, e) => (n, r) => e(n, r, o);
 let U = class extends O {
   constructor(e, n) {
     super();
     _(this, "_lastPopup", null);
     _(this, "_activePopup");
-    _(this, "_activePopup$", new pt(null));
+    _(this, "_activePopup$", new gt(null));
     _(this, "activePopup$", this._activePopup$.asObservable());
     this._canvasPopupManagerService = e, this._zenZoneService = n, this._initZenVisible();
   }
@@ -224,9 +224,9 @@ let U = class extends O {
     }));
   }
   showPopup(e, n) {
-    var m;
+    var d;
     const { row: r, col: t, unitId: i, subUnitId: s } = e;
-    if (this._activePopup && r === this._activePopup.row && t === this._activePopup.col && i === this._activePopup.unitId && s === ((m = this.activePopup) == null ? void 0 : m.subUnitId)) {
+    if (this._activePopup && r === this._activePopup.row && t === this._activePopup.col && i === this._activePopup.unitId && s === ((d = this.activePopup) == null ? void 0 : d.subUnitId)) {
       this._activePopup = e, this._activePopup$.next(e);
       return;
     }
@@ -237,7 +237,7 @@ let U = class extends O {
       r,
       t,
       {
-        componentKey: ye,
+        componentKey: Ee,
         onClickOutside: () => {
           this.hidePopup();
         },
@@ -250,7 +250,7 @@ let U = class extends O {
     );
     if (!a)
       throw new Error("[SheetsThreadCommentPopupService]: cannot show popup!");
-    const c = new xe();
+    const c = new Ve();
     c.add(a), c.add({
       dispose: () => {
         n == null || n();
@@ -267,88 +267,88 @@ let U = class extends O {
     }, this._activePopup$.next(this._activePopup));
   }
 };
-U = yt([
-  de(0, h(rt)),
-  de(1, Fe)
+U = xt([
+  me(0, h(ct)),
+  me(1, Ge)
 ], U);
-const Ut = () => {
+const Dt = () => {
   const o = w($), e = w(U), n = oe(e.activePopup$), r = w(T);
   if (oe(r.commentUpdate$), !n)
     return null;
-  const { row: t, col: i, unitId: s, subUnitId: a, trigger: c } = n, m = r.getByLocation(s, a, t, i), u = `${_e.chatAtABC(i)}${t + 1}`, l = () => {
+  const { row: t, col: i, unitId: s, subUnitId: a, trigger: c } = n, d = r.getByLocation(s, a, t, i), u = `${_e.chatAtABC(i)}${t + 1}`, p = () => {
     e.hidePopup();
-  }, R = (g) => {
+  }, R = (S) => {
     var I, M, E;
-    return (E = (M = (I = o.getCurrentUnitForType(S.UNIVER_SHEET)) == null ? void 0 : I.getSheetBySheetId(g)) == null ? void 0 : M.getName()) != null ? E : "";
+    return (E = (M = (I = o.getCurrentUnitForType(g.UNIVER_SHEET)) == null ? void 0 : I.getSheetBySheetId(S)) == null ? void 0 : M.getName()) != null ? E : "";
   };
-  return /* @__PURE__ */ ge.createElement(
-    Ae,
+  return /* @__PURE__ */ be.createElement(
+    We,
     {
       onClick: () => {
         e.persistPopup();
       },
       prefix: "cell",
-      id: m,
+      id: d,
       unitId: s,
       subUnitId: a,
-      type: S.UNIVER_SHEET,
+      type: g.UNIVER_SHEET,
       refStr: u,
-      onClose: l,
+      onClose: p,
       getSubUnitName: R,
       autoFocus: c === "context-menu"
     }
   );
-}, Y = {
-  type: Ne.OPERATION,
+}, K = {
+  type: Ae.OPERATION,
   id: "sheets.operation.show-comment-modal",
   handler(o) {
     var M;
-    const e = o.get(Ye), n = o.get($), r = o.get(U), t = o.get(ee), i = (M = e.getFirst()) == null ? void 0 : M.primary, s = e.getCurrent(), a = o.get(T);
+    const e = o.get(Qe), n = o.get($), r = o.get(U), t = o.get(ee), i = (M = e.getFirst()) == null ? void 0 : M.primary, s = e.getCurrent(), a = o.get(T);
     if (!s || !i)
       return !1;
-    const { unitId: c, sheetId: m } = s, u = ke(n, { unitId: c, subUnitId: m });
+    const { unitId: c, sheetId: d } = s, u = et(n, { unitId: c, subUnitId: d });
     if (!u)
       return !1;
-    const { workbook: l, worksheet: R } = u, g = {
-      workbook: l,
+    const { workbook: p, worksheet: R } = u, S = {
+      workbook: p,
       worksheet: R,
       unitId: c,
-      subUnitId: m,
+      subUnitId: d,
       row: i.actualRow,
       col: i.startColumn
     };
-    r.showPopup(g);
-    const I = a.getByLocation(c, m, i.actualRow, i.startColumn);
+    r.showPopup(S);
+    const I = a.getByLocation(c, d, i.actualRow, i.startColumn);
     return I && t.setActiveComment({
       unitId: c,
-      subUnitId: m,
+      subUnitId: d,
       commentId: I,
       trigger: "context-menu"
     }), !0;
   }
-}, Ot = () => {
-  const o = w(ot), e = w($), n = w(G), r = w(U), t = e.getCurrentUnitForType(S.UNIVER_SHEET);
+}, Nt = () => {
+  const o = w(dt), e = w($), n = w(G), r = w(U), t = e.getCurrentUnitForType(g.UNIVER_SHEET);
   if (!t)
     return null;
-  const i = t.getUnitId(), s = w(Q), a = ut(() => t.activeSheet$.pipe(_t((d) => d == null ? void 0 : d.getSheetId())), [t.activeSheet$]), c = ae(a, t.getActiveSheet().getSheetId()), m = Me(), u = w(ee), l = ae(u.activeCommentId$), R = ce((d) => {
-    const p = t.getSheets(), v = {};
-    return p.forEach((C, P) => {
+  const i = t.getUnitId(), s = w(Q), a = vt(() => t.activeSheet$.pipe(St((m) => m == null ? void 0 : m.getSheetId())), [t.activeSheet$]), c = ae(a, t.getActiveSheet().getSheetId()), d = we(), u = w(ee), p = ae(u.activeCommentId$), R = ce((m) => {
+    const l = t.getSheets(), v = {};
+    return l.forEach((C, P) => {
       v[C.getSheetId()] = P;
-    }), d.map((C) => {
+    }), m.map((C) => {
       var ne;
-      const P = y(C.ref), Oe = [(ne = v[C.subUnitId]) != null ? ne : 0, P.row, P.column];
-      return { ...C, p: Oe };
+      const P = y(C.ref), xe = [(ne = v[C.subUnitId]) != null ? ne : 0, P.row, P.column];
+      return { ...C, p: xe };
     }).sort((C, P) => C.p[0] === P.p[0] ? C.p[1] === P.p[1] ? C.p[2] - P.p[2] : C.p[1] - P.p[1] : C.p[0] - P.p[0]);
-  }, [t]), g = ce((d) => {
-    if (d.unitId === i && d.subUnitId === c && !d.resolved) {
-      const { row: p, column: v } = y(d.ref);
-      if (!Number.isNaN(p) && !Number.isNaN(v))
+  }, [t]), S = ce((m) => {
+    if (m.unitId === i && m.subUnitId === c && !m.resolved) {
+      const { row: l, column: v } = y(m.ref);
+      if (!Number.isNaN(l) && !Number.isNaN(v))
         return o.addShape({
           range: {
             startColumn: v,
             endColumn: v,
-            startRow: p,
-            endRow: p
+            startRow: l,
+            endRow: l
           },
           style: {
             hasAutoFill: !1,
@@ -360,34 +360,34 @@ const Ut = () => {
           primary: null
         });
     }
-  }, [o, c, i]), I = (d) => {
-    var p, v;
-    return (v = (p = t.getSheetBySheetId(d)) == null ? void 0 : p.getName()) != null ? v : "";
+  }, [o, c, i]), I = (m) => {
+    var l, v;
+    return (v = (l = t.getSheetBySheetId(m)) == null ? void 0 : l.getName()) != null ? v : "";
   }, M = () => {
-    s.executeCommand(Y.id);
+    s.executeCommand(K.id);
   }, E = () => {
     r.hidePopup();
-  }, A = (d) => {
-    l && l.unitId === d.unitId && l.subUnitId === d.subUnitId && l.commentId === d.id || (m.current && (o.removeShape(m.current), m.current = null), m.current = g(d));
+  }, A = (m) => {
+    p && p.unitId === m.unitId && p.subUnitId === m.subUnitId && p.commentId === m.id || (d.current && (o.removeShape(d.current), d.current = null), d.current = S(m));
   }, L = () => {
-    m.current && (o.removeShape(m.current), m.current = null);
+    d.current && (o.removeShape(d.current), d.current = null);
   };
-  return ht(() => {
-    if (!l)
+  return ft(() => {
+    if (!p)
       return;
-    const d = n.getComment(l.unitId, l.subUnitId, l.commentId);
-    if (!d)
+    const m = n.getComment(p.unitId, p.subUnitId, p.commentId);
+    if (!m)
       return;
-    const p = g(d);
+    const l = S(m);
     return () => {
-      p && o.removeShape(p);
+      l && o.removeShape(l);
     };
-  }, [g, l, n, o]), /* @__PURE__ */ ge.createElement(
-    Le,
+  }, [S, p, n, o]), /* @__PURE__ */ be.createElement(
+    Fe,
     {
       unitId: i,
       subUnitId$: a,
-      type: S.UNIVER_SHEET,
+      type: g.UNIVER_SHEET,
       onAdd: M,
       getSubUnitName: I,
       onResolve: E,
@@ -396,50 +396,54 @@ const Ut = () => {
       onItemLeave: L
     }
   );
-}, Rt = {
-  sheetThreadComment: {
-    menu: {
-      addComment: "添加评论",
-      commentManagement: "评论管理"
-    }
-  }
-}, Et = (o) => ({
-  id: Y.id,
+}, jt = (o) => ({
+  id: K.id,
   type: ve.BUTTON,
   positions: [fe.CONTEXT_MENU],
   icon: te,
   title: "sheetThreadComment.menu.addComment",
-  hidden$: Ce(o, S.UNIVER_SHEET)
-}), $t = (o) => ({
-  id: He.id,
+  hidden$: Ce(o, g.UNIVER_SHEET),
+  disabled$: Pe(o, {
+    workbookTypes: [ge],
+    worksheetTypes: [Se],
+    rangeTypes: [Ie]
+  })
+}), Vt = (o) => ({
+  id: Ze.id,
   type: ve.BUTTON,
   icon: te,
   tooltip: "sheetThreadComment.menu.commentManagement",
   positions: fe.TOOLBAR_START,
-  hidden$: Ce(o, S.UNIVER_SHEET)
-}), xt = {
-  id: Y.id,
-  binding: Ze.M | ie.CTRL_COMMAND | ie.ALT,
-  preconditions: it
+  group: Ye.TOOLBAR_OTHERS,
+  disabled$: Pe(o, {
+    workbookTypes: [ge],
+    worksheetTypes: [Se],
+    rangeTypes: [Ie]
+  }),
+  hidden$: Ce(o, g.UNIVER_SHEET)
+}), At = {
+  id: K.id,
+  binding: Ke.M | ie.CTRL_COMMAND | ie.ALT,
+  preconditions: mt
 };
-var Nt = Object.defineProperty, Dt = Object.getOwnPropertyDescriptor, jt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? Dt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+var Lt = Object.defineProperty, Ht = Object.getOwnPropertyDescriptor, Bt = (o, e, n, r) => {
+  for (var t = r > 1 ? void 0 : r ? Ht(e, n) : e, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && Nt(e, n, t), t;
+  return r && t && Lt(e, n, t), t;
 }, b = (o, e) => (n, r) => e(n, r, o);
-const Vt = {};
+const Wt = {};
 let j = class extends O {
-  constructor(o, e, n, r, t, i, s, a, c, m, u) {
-    super(), this._config = o, this._menuService = e, this._injector = n, this._componentManager = r, this._localeService = t, this._commandService = i, this._sheetsThreadCommentPopupService = s, this._sheetsThreadCommentModel = a, this._threadCommentPanelService = c, this._shortcutService = m, this._univerInstanceService = u, this._initMenu(), this._initShortcut(), this._initComponent(), this._initLocale(), this._initCommandListener(), this._initPanelListener();
+  constructor(o, e, n, r, t, i, s, a, c, d, u) {
+    super(), this._config = o, this._menuService = e, this._injector = n, this._componentManager = r, this._localeService = t, this._commandService = i, this._sheetsThreadCommentPopupService = s, this._sheetsThreadCommentModel = a, this._threadCommentPanelService = c, this._shortcutService = d, this._univerInstanceService = u, this._initMenu(), this._initShortcut(), this._initComponent(), this._initCommandListener(), this._initPanelListener();
   }
   _initShortcut() {
-    this._shortcutService.registerShortcut(xt);
+    this._shortcutService.registerShortcut(At);
   }
   _initCommandListener() {
     this._commandService.onCommandExecuted((o) => {
-      if (o.id === qe.id) {
+      if (o.id === tt.id) {
         const e = o.params, { unitId: n, subUnitId: r, selections: t, type: i } = e;
-        if ((i === Xe.MOVE_END || i === void 0) && t[0].primary) {
+        if ((i === nt.MOVE_END || i === void 0) && t[0].primary) {
           const s = t[0].primary.actualRow, a = t[0].primary.actualColumn;
           if (!this._sheetsThreadCommentModel.showCommentMarker(n, r, s, a)) {
             this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(re.id);
@@ -465,50 +469,47 @@ let j = class extends O {
   _initMenu() {
     const { menu: o = {} } = this._config;
     [
-      Et,
-      $t
+      jt,
+      Vt
     ].forEach((e) => {
       this._menuService.addMenuItem(e(this._injector), o);
     });
   }
   _initComponent() {
     [
-      [ye, Ut],
-      [Be, Ot],
-      [te, we]
+      [Ee, Dt],
+      [ke, Nt],
+      [te, Re]
     ].forEach(([o, e]) => {
       this._componentManager.register(o, e);
     });
   }
-  _initLocale() {
-    this._localeService.load({ zhCN: Rt });
-  }
   _initPanelListener() {
     this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe(async (o) => {
       if (o) {
         const { unitId: e, subUnitId: n, commentId: r, trigger: t } = o, i = this._sheetsThreadCommentModel.getComment(e, n, r);
         if (!i || i.resolved)
           return;
-        const s = this._univerInstanceService.getCurrentUnitForType(S.UNIVER_SHEET);
+        const s = this._univerInstanceService.getCurrentUnitForType(g.UNIVER_SHEET);
         if (!s || s.getUnitId() !== e)
           return;
-        s.getActiveSheet().getSheetId() !== n && await this._commandService.executeCommand(Je.id, {
+        s.getActiveSheet().getSheetId() !== n && await this._commandService.executeCommand(rt.id, {
           unitId: e,
           subUnitId: n
         });
-        const m = y(i.ref);
-        await this._commandService.executeCommand(st.id, {
+        const d = y(i.ref);
+        await this._commandService.executeCommand(ut.id, {
           range: {
-            startColumn: m.column,
-            endColumn: m.column,
-            startRow: m.row,
-            endRow: m.row
+            startColumn: d.column,
+            endColumn: d.column,
+            startRow: d.row,
+            endRow: d.row
           }
         }), this._sheetsThreadCommentPopupService.showPopup({
           unitId: e,
           subUnitId: n,
-          row: m.row,
-          col: m.column,
+          row: d.row,
+          col: d.column,
           commentId: i.id,
           trigger: t
         });
@@ -517,24 +518,24 @@ let j = class extends O {
     }));
   }
 };
-j = jt([
-  x(N.Starting, j),
-  b(1, Ke),
-  b(2, h(pe)),
-  b(3, h(ze)),
-  b(4, h(De)),
+j = Bt([
+  x(D.Starting, j),
+  b(1, Xe),
+  b(2, h(le)),
+  b(3, h(qe)),
+  b(4, h(Le)),
   b(5, Q),
   b(6, h(U)),
   b(7, h(T)),
   b(8, h(ee)),
-  b(9, Ge),
+  b(9, Je),
   b(10, $)
 ], j);
-var At = Object.defineProperty, Lt = Object.getOwnPropertyDescriptor, Ht = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? Lt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+var Ft = Object.defineProperty, Zt = Object.getOwnPropertyDescriptor, kt = (o, e, n, r) => {
+  for (var t = r > 1 ? void 0 : r ? Zt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && At(e, n, t), t;
-}, k = (o, e) => (n, r) => e(n, r, o);
+  return r && t && Ft(e, n, t), t;
+}, Y = (o, e) => (n, r) => e(n, r, o);
 let B = class extends O {
   constructor(e, n, r) {
     super();
@@ -551,7 +552,7 @@ let B = class extends O {
       startRow: r.row,
       endRow: r.row
     }, s = (a) => {
-      const c = et(i, a);
+      const c = it(i, a);
       return c && c.startColumn === i.startColumn && c.startRow === i.startRow ? {
         undos: [],
         redos: []
@@ -588,7 +589,7 @@ let B = class extends O {
           }
         }],
         undos: [{
-          id: K.id,
+          id: z.id,
           params: {
             unitId: e,
             subUnitId: n,
@@ -609,10 +610,10 @@ let B = class extends O {
       for (const t in r) {
         const i = r[t];
         for (const s in i) {
-          const a = i[s], c = a.ref, m = y(c);
+          const a = i[s], c = a.ref, d = y(c);
           this._register(n, t, {
             ...a,
-            ...m
+            ...d
           });
         }
       }
@@ -651,24 +652,24 @@ let B = class extends O {
           }
         }
       })
-    ), this.disposeWithMe(je(() => {
+    ), this.disposeWithMe(He(() => {
       this._disposableMap.forEach((e) => {
         e.dispose();
       }), this._disposableMap.clear();
     }));
   }
 };
-B = Ht([
-  x(N.Starting, B),
-  k(0, h(Qe)),
-  k(1, h(T)),
-  k(2, h(G))
+B = kt([
+  x(D.Starting, B),
+  Y(0, h(ot)),
+  Y(1, h(T)),
+  Y(2, h(G))
 ], B);
-var Bt = Object.defineProperty, Wt = Object.getOwnPropertyDescriptor, Ft = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? Wt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+var zt = Object.defineProperty, Gt = Object.getOwnPropertyDescriptor, Kt = (o, e, n, r) => {
+  for (var t = r > 1 ? void 0 : r ? Gt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && Bt(e, n, t), t;
-}, D = (o, e) => (n, r) => e(n, r, o);
+  return r && t && zt(e, n, t), t;
+}, N = (o, e) => (n, r) => e(n, r, o);
 let W = class extends O {
   constructor(o, e, n, r, t) {
     super(), this._sheetInterceptorService = o, this._sheetsThreadCommentModel = e, this._univerInstanceService = n, this._sheetSkeletonManagerService = r, this._renderManagerService = t, this._initViewModelIntercept(), this._initSkeletonChange();
@@ -676,7 +677,7 @@ let W = class extends O {
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        tt.CELL_CONTENT,
+        st.CELL_CONTENT,
         {
           handler: (o, e, n) => {
             const { row: r, col: t, unitId: i, subUnitId: s } = e;
@@ -698,7 +699,7 @@ let W = class extends O {
   }
   _initSkeletonChange() {
     const o = () => {
-      const e = this._univerInstanceService.getCurrentUnitForType(S.UNIVER_SHEET);
+      const e = this._univerInstanceService.getCurrentUnitForType(g.UNIVER_SHEET);
       if (!e)
         return;
       const n = e.getUnitId(), r = e.getActiveSheet().getSheetId(), t = this._sheetSkeletonManagerService.getOrCreateSkeleton({ unitId: n, sheetId: r }), i = this._renderManagerService.getRenderById(n);
@@ -709,20 +710,20 @@ let W = class extends O {
     }));
   }
 };
-W = Ft([
-  x(N.Ready, W),
-  D(0, h(Se)),
-  D(1, h(T)),
-  D(2, $),
-  D(3, h(at)),
-  D(4, vt)
+W = Kt([
+  x(D.Ready, W),
+  N(0, h(Me)),
+  N(1, h(T)),
+  N(2, $),
+  N(3, h(ht)),
+  N(4, Mt)
 ], W);
-var Zt = Object.defineProperty, zt = Object.getOwnPropertyDescriptor, Kt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? zt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+var Yt = Object.defineProperty, qt = Object.getOwnPropertyDescriptor, Xt = (o, e, n, r) => {
+  for (var t = r > 1 ? void 0 : r ? qt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && Zt(e, n, t), t;
+  return r && t && Yt(e, n, t), t;
 }, ue = (o, e) => (n, r) => e(n, r, o);
-const Gt = (o, e, n) => {
+const Jt = (o, e, n) => {
   const r = y(o), t = n.row - e.row, i = n.column - e.column, s = {
     startColumn: r.column + i,
     startRow: r.row + t,
@@ -741,7 +742,7 @@ let F = class extends O {
   _initClipboardHook() {
     this.disposeWithMe(
       this._sheetClipboardService.addClipboardHook({
-        id: Ue,
+        id: $e,
         onBeforeCopy: (e, n, r) => {
           this._copyInfo = {
             unitId: e,
@@ -755,56 +756,56 @@ let F = class extends O {
             row: a.rows[0],
             column: a.cols[0]
           };
-          if (t.copyType === mt.CUT && this._copyInfo) {
-            const { range: m, unitId: u, subUnitId: l } = this._copyInfo, R = {
-              row: m.startRow,
-              column: m.startColumn
+          if (t.copyType === lt.CUT && this._copyInfo) {
+            const { range: d, unitId: u, subUnitId: p } = this._copyInfo, R = {
+              row: d.startRow,
+              column: d.startColumn
             };
-            if (!(i === u && s === l)) {
-              const g = [];
-              Ve.foreach(m, (d, p) => {
-                const v = this._sheetsThreadCommentModel.getCommentWithChildren(u, l, d, p);
-                v && g.push(v);
+            if (!(i === u && s === p)) {
+              const S = [];
+              Be.foreach(d, (m, l) => {
+                const v = this._sheetsThreadCommentModel.getCommentWithChildren(u, p, m, l);
+                v && S.push(v);
               });
-              const I = [], M = [], E = [], A = [], L = (d) => {
+              const I = [], M = [], E = [], A = [], L = (m) => {
                 I.unshift({
                   id: V.id,
                   params: {
                     unitId: u,
-                    subUnitId: l,
-                    commentId: d.id
+                    subUnitId: p,
+                    commentId: m.id
                   }
                 }), E.push({
-                  id: K.id,
+                  id: z.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
                     comment: {
-                      ...d,
-                      ref: Gt(d.ref, R, c),
+                      ...m,
+                      ref: Jt(m.ref, R, c),
                       unitId: i,
                       subUnitId: s
                     }
                   }
                 }), M.push({
-                  id: K.id,
+                  id: z.id,
                   params: {
                     unitId: u,
-                    subUnitId: l,
-                    comment: d
+                    subUnitId: p,
+                    comment: m
                   }
                 }), A.unshift({
                   id: V.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
-                    commentId: d.id
+                    commentId: m.id
                   }
                 });
               };
-              return g.forEach((d) => {
-                L(d.root), d.children.forEach((p) => {
-                  L(p);
+              return S.forEach((m) => {
+                L(m.root), m.children.forEach((l) => {
+                  L(l);
                 });
               }), {
                 redos: [...I, ...E],
@@ -821,53 +822,55 @@ let F = class extends O {
     );
   }
 };
-F = Kt([
-  x(N.Rendered, F),
-  ue(0, h(ct)),
+F = Xt([
+  x(D.Rendered, F),
+  ue(0, h(pt)),
   ue(1, h(T))
 ], F);
-var Yt = Object.defineProperty, kt = Object.getOwnPropertyDescriptor, qt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? kt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+var Qt = Object.defineProperty, en = Object.getOwnPropertyDescriptor, tn = (o, e, n, r) => {
+  for (var t = r > 1 ? void 0 : r ? en(e, n) : e, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && Yt(e, n, t), t;
+  return r && t && Qt(e, n, t), t;
 }, q = (o, e) => (n, r) => e(n, r, o);
 let Z = class extends O {
   constructor(o, e, n) {
     super(), this._hoverManagerService = o, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = n, this._initHoverEvent();
   }
   _initHoverEvent() {
-    this._hoverManagerService.currentCell$.subscribe((o) => {
-      const e = this._sheetsThreadCommentPopupService.activePopup;
-      if (o && (e && e.temp || !e)) {
-        const { location: n } = o, { unitId: r, subUnitId: t, row: i, col: s } = n, a = this._sheetsThreadCommentModel.getByLocation(r, t, i, s);
-        if (a) {
-          const c = this._sheetsThreadCommentModel.getComment(r, t, a);
-          c && !c.resolved && this._sheetsThreadCommentPopupService.showPopup({
-            unitId: r,
-            subUnitId: t,
-            row: i,
-            col: s,
-            commentId: a,
-            temp: !0
-          });
-        } else
-          e && this._sheetsThreadCommentPopupService.hidePopup();
-      }
-    });
+    this.disposeWithMe(
+      this._hoverManagerService.currentCell$.pipe(It(100)).subscribe((o) => {
+        const e = this._sheetsThreadCommentPopupService.activePopup;
+        if (o && (e && e.temp || !e)) {
+          const { location: n } = o, { unitId: r, subUnitId: t, row: i, col: s } = n, a = this._sheetsThreadCommentModel.getByLocation(r, t, i, s);
+          if (a) {
+            const c = this._sheetsThreadCommentModel.getComment(r, t, a);
+            c && !c.resolved && this._sheetsThreadCommentPopupService.showPopup({
+              unitId: r,
+              subUnitId: t,
+              row: i,
+              col: s,
+              commentId: a,
+              temp: !0
+            });
+          } else
+            e && this._sheetsThreadCommentPopupService.hidePopup();
+        }
+      })
+    );
   }
 };
-Z = qt([
-  x(N.Rendered, Z),
-  q(0, h(dt)),
+Z = tn([
+  x(D.Rendered, Z),
+  q(0, h(_t)),
   q(1, h(U)),
   q(2, h(T))
 ], Z);
-var Xt = Object.defineProperty, Jt = Object.getOwnPropertyDescriptor, Qt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? Jt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+var nn = Object.defineProperty, rn = Object.getOwnPropertyDescriptor, on = (o, e, n, r) => {
+  for (var t = r > 1 ? void 0 : r ? rn(e, n) : e, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && Xt(e, n, t), t;
+  return r && t && nn(e, n, t), t;
 }, X = (o, e) => (n, r) => e(n, r, o);
-let z = class extends O {
+let k = class extends O {
   constructor(o, e, n) {
     super(), this._sheetInterceptorService = o, this._univerInstanceService = e, this._threadCommentModel = n, this._initSheetChange();
   }
@@ -875,8 +878,8 @@ let z = class extends O {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
         getMutations: (o) => {
-          if (o.id === nt.id) {
-            const e = o.params, n = e.unitId ? this._univerInstanceService.getUnit(e.unitId) : this._univerInstanceService.getCurrentUnitForType(S.UNIVER_SHEET);
+          if (o.id === at.id) {
+            const e = o.params, n = e.unitId ? this._univerInstanceService.getUnit(e.unitId) : this._univerInstanceService.getCurrentUnitForType(g.UNIVER_SHEET);
             if (!n)
               return { redos: [], undos: [] };
             const r = n.getUnitId(), t = e.subUnitId || n.getActiveSheet().getSheetId(), { commentMap: i } = this._threadCommentModel.ensureMap(r, t), s = Array.from(Object.keys(i)), a = Array.from(Object.values(i)), c = s.map((u) => ({
@@ -886,15 +889,15 @@ let z = class extends O {
                 subUnitId: t,
                 commentId: u
               }
-            })), m = a.map((u) => ({
-              id: K.id,
+            })), d = a.map((u) => ({
+              id: z.id,
               params: {
                 unitId: r,
                 subUnitId: t,
                 comment: u
               }
             }));
-            return { redos: c, undos: m };
+            return { redos: c, undos: d };
           }
           return { redos: [], undos: [] };
         }
@@ -902,22 +905,22 @@ let z = class extends O {
     );
   }
 };
-z = Qt([
-  x(N.Ready, z),
-  X(0, h(Se)),
+k = on([
+  x(D.Ready, k),
+  X(0, h(Me)),
   X(1, $),
   X(2, h(G))
-], z);
-var en = Object.defineProperty, tn = Object.getOwnPropertyDescriptor, nn = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? tn(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+], k);
+var sn = Object.defineProperty, an = Object.getOwnPropertyDescriptor, cn = (o, e, n, r) => {
+  for (var t = r > 1 ? void 0 : r ? an(e, n) : e, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && en(e, n, t), t;
+  return r && t && sn(e, n, t), t;
 }, he = (o, e) => (n, r) => e(n, r, o), H;
-let le = (H = class extends We {
+let pe = (H = class extends ze {
   constructor(e = {}, n, r) {
     super(e, n, r);
     _(this, "_pluginConfig");
-    this._injector = n, this._commandService = r, this._pluginConfig = _e.deepMerge({}, Vt, e);
+    this._injector = n, this._commandService = r, this._pluginConfig = _e.deepMerge({}, Wt, e);
   }
   onStarting(e) {
     super.onStarting(e), [
@@ -932,35 +935,35 @@ let le = (H = class extends We {
       [W],
       [F],
       [Z],
-      [z],
+      [k],
       [U]
     ].forEach((n) => {
       this._injector.add(n);
-    }), [Y].forEach((n) => {
+    }), [K].forEach((n) => {
       this._commandService.registerCommand(n);
     });
   }
-}, _(H, "pluginName", Ue), _(H, "type", S.UNIVER_SHEET), H);
-le = nn([
-  he(1, h(pe)),
+}, _(H, "pluginName", $e), _(H, "type", g.UNIVER_SHEET), H);
+pe = cn([
+  he(1, h(le)),
   he(2, h(Q))
-], le);
+], pe);
 export {
-  Mn as ICommandService,
-  On as IThreadCommentDataSourceService,
-  wn as IThreadCommentMentionDataService,
-  Sn as Inject,
-  gn as Injector,
-  Pn as Plugin,
-  Ue as SHEETS_THREAD_COMMENT,
+  yn as ICommandService,
+  Dn as IThreadCommentDataSourceService,
+  En as IThreadCommentMentionDataService,
+  bn as Inject,
+  Tn as Injector,
+  Un as Plugin,
+  $e as SHEETS_THREAD_COMMENT,
   j as SheetsThreadCommentController,
   F as SheetsThreadCommentCopyPasteController,
   Z as SheetsThreadCommentHoverController,
   T as SheetsThreadCommentModel,
   U as SheetsThreadCommentPopupService,
   B as SheetsThreadCommentRefRangeController,
-  z as ThreadCommentRemoveSheetsController,
-  bn as UniverInstanceType,
-  le as UniverSheetsThreadCommentPlugin,
-  yn as UniverThreadCommentUIPlugin
+  k as ThreadCommentRemoveSheetsController,
+  On as UniverInstanceType,
+  pe as UniverSheetsThreadCommentPlugin,
+  $n as UniverThreadCommentUIPlugin
 };