@univerjs/sheets-thread-comment 0.1.13 → 0.1.15

package/lib/es/index.js

@@ -1,218 +1,90 @@
-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 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 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++) {
+var Ee = Object.defineProperty;
+var Re = (t, e, n) => e in t ? Ee(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
+var y = (t, e, n) => (Re(t, typeof e != "symbol" ? e + "" : e, n), n);
+import { Inject as p, Injector as ae } from "@wendellhu/redi";
+import { Inject as ln, Injector as vn } from "@wendellhu/redi";
+import { Disposable as U, DisposableCollection as $e, IUniverInstanceService as E, Tools as ce, UniverInstanceType as b, CommandType as Ne, ICommandService as Y, OnLifecycle as N, LifecycleStages as x, LocaleService as xe, Range as De, DependentOn as je, Plugin as Ae } from "@univerjs/core";
+import { ICommandService as fn, Plugin as Cn, UniverInstanceType as Sn } from "@univerjs/core";
+import { ThreadCommentTree as Ve, ThreadCommentPanelService as q, ThreadCommentPanel as Le, ToggleSheetCommentPanelOperation as He, SetActiveCommentOperation as Q, THREAD_COMMENT_PANEL as Be, UniverThreadCommentUIPlugin as Fe } from "@univerjs/thread-comment-ui";
+import { IThreadCommentMentionDataService as gn, UniverThreadCommentUIPlugin as Pn } from "@univerjs/thread-comment-ui";
+import { IZenZoneService as We, useObservable as ee, KeyCode as Ze, MetaKeys as te, MenuItemType as de, MenuPosition as ue, getMenuHiddenObservable as me, MenuGroup as ze, ComponentManager as ke, IMenuService as Ge, IShortcutService as Ke } from "@univerjs/ui";
+import { SelectionManagerService as Ye, getSheetCommandTarget as qe, WorkbookCommentPermission as he, WorksheetViewPermission as pe, RangeProtectionPermissionEditPoint as le, SetSelectionsOperation as Xe, SelectionMoveType as Je, SetWorksheetActiveOperation as Qe, SheetInterceptorService as ve, INTERCEPTOR_POINT as et, RemoveSheetCommand as tt } from "@univerjs/sheets";
+import { singleReferenceToGrid as F, serializeRange as nt } from "@univerjs/engine-formula";
+import { ThreadCommentModel as _e, DeleteCommentMutation as W, AddCommentMutation as K } from "@univerjs/thread-comment";
+import { IThreadCommentDataSourceService as Tn } from "@univerjs/thread-comment";
+import { SheetCanvasPopManagerService as rt, IMarkSelectionService as ot, whenSheetEditorFocused as it, getCurrentRangeDisable$ as fe, ScrollToRangeOperation as st, SheetSkeletonManagerService as at, ISheetClipboardService as ct, COPY_TYPE as dt, HoverManagerService as ut } from "@univerjs/sheets-ui";
+import { SheetsThreadCommentModel as R, UniverSheetsThreadCommentBasePlugin as mt } from "@univerjs/sheets-thread-comment-base";
+import { SheetsThreadCommentModel as wn } from "@univerjs/sheets-thread-comment-base";
+import { useDependency as T, useObservable as ne } from "@wendellhu/redi/react-bindings";
+import Ce, { forwardRef as Se, useRef as Ie, createElement as ge, useMemo as ht, useCallback as re, useEffect as pt } from "react";
+import { BehaviorSubject as lt, map as vt, debounceTime as _t } from "rxjs";
+import { IRenderManagerService as ft } from "@univerjs/engine-render";
+var _ = function() {
+  return _ = Object.assign || function(t) {
+    for (var e, n = 1, o = arguments.length; n < o; n++) {
       e = arguments[n];
-      for (var t in e)
-        Object.prototype.hasOwnProperty.call(e, t) && (o[t] = e[t]);
+      for (var r in e)
+        Object.prototype.hasOwnProperty.call(e, r) && (t[r] = e[r]);
     }
-    return o;
-  }, f.apply(this, arguments);
-}, Pt = function(o, e) {
+    return t;
+  }, _.apply(this, arguments);
+}, Ct = function(t, e) {
   var n = {};
-  for (var r in o)
-    Object.prototype.hasOwnProperty.call(o, r) && e.indexOf(r) < 0 && (n[r] = o[r]);
-  if (o != null && typeof Object.getOwnPropertySymbols == "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]]);
+  for (var o in t)
+    Object.prototype.hasOwnProperty.call(t, o) && e.indexOf(o) < 0 && (n[o] = t[o]);
+  if (t != null && typeof Object.getOwnPropertySymbols == "function")
+    for (var r = 0, o = Object.getOwnPropertySymbols(t); r < o.length; r++)
+      e.indexOf(o[r]) < 0 && Object.prototype.propertyIsEnumerable.call(t, o[r]) && (n[o[r]] = t[o[r]]);
   return n;
-}, 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);
+}, Pe = Se(function(t, e) {
+  var n = t.icon, o = t.id, r = t.className, i = t.extend, s = Ct(t, ["icon", "id", "className", "extend"]), d = "univerjs-icon univerjs-icon-".concat(o, " ").concat(r || "").trim(), u = Ie("_".concat(gt()));
+  return be(n, "".concat(o), { defIds: n.defIds, idSuffix: u.current }, _({ ref: e, className: d }, s), i);
 });
-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 be(t, e, n, o, r) {
+  return ge(t.tag, _(_({ key: e }, St(t, n, r)), o), (It(t, n).children || []).map(function(i, s) {
+    return be(i, "".concat(e, "-").concat(t.tag, "-").concat(s), n, void 0, r);
   }));
 }
-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;
-  return !t || t.length === 0 || (o.tag === "use" && r["xlink:href"] && (r["xlink:href"] = r["xlink:href"] + e.idSuffix), Object.entries(r).forEach(function(i) {
-    var s = i[0], a = i[1];
-    typeof a == "string" && (r[s] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
-  })), r;
+function St(t, e, n) {
+  var o = _({}, t.attrs);
+  n != null && n.colorChannel1 && o.fill === "colorChannel1" && (o.fill = n.colorChannel1);
+  var r = e.defIds;
+  return !r || r.length === 0 || (t.tag === "use" && o["xlink:href"] && (o["xlink:href"] = o["xlink:href"] + e.idSuffix), Object.entries(o).forEach(function(i) {
+    var s = i[0], d = i[1];
+    typeof d == "string" && (o[s] = d.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+  })), o;
 }
-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 It(t, e) {
+  var n, o = e.defIds;
+  return !o || o.length === 0 ? t : t.tag === "defs" && (!((n = t.children) === null || n === void 0) && n.length) ? _(_({}, t), { children: t.children.map(function(r) {
+    return typeof r.attrs.id == "string" && o && o.indexOf(r.attrs.id) > -1 ? _(_({}, r), { attrs: _(_({}, r.attrs), { id: r.attrs.id + e.idSuffix }) }) : r;
+  }) }) : t;
 }
-function wt() {
+function gt() {
   return Math.random().toString(36).substring(2, 8);
 }
-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, {
+Pe.displayName = "UniverIcon";
+var Pt = { 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" } }] }, Te = Se(function(t, e) {
+  return ge(Pe, Object.assign({}, t, {
     id: "comment-single",
     ref: e,
-    icon: yt
+    icon: Pt
   }));
 });
-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 && Ut(e, n, t), t;
-}, de = (o, e) => (n, r) => e(n, r, o);
-let T = class extends O {
+Te.displayName = "CommentSingle";
+const Me = "univer.sheet.thread-comment-modal", X = "comment-single", we = "univer.sheet.thread-comment";
+var bt = Object.defineProperty, Tt = Object.getOwnPropertyDescriptor, Mt = (t, e, n, o) => {
+  for (var r = o > 1 ? void 0 : o ? Tt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (r = (o ? s(e, n, r) : s(r)) || r);
+  return o && r && bt(e, n, r), r;
+}, oe = (t, e) => (n, o) => e(n, o, t);
+let M = class extends U {
   constructor(e, n) {
     super();
-    _(this, "_matrixMap", /* @__PURE__ */ new Map());
-    _(this, "_locationMap", /* @__PURE__ */ new Map());
-    _(this, "_commentUpdate$", new Ct());
-    _(this, "commentUpdate$", this._commentUpdate$.asObservable());
-    this._threadCommentModel = e, this._univerInstanceService = n, this._init();
-  }
-  _init() {
-    this._initData(), this._initUpdateTransform();
-  }
-  _ensureCommentMatrix(e, n) {
-    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 je(), r.set(n, t)), t;
-  }
-  _ensureCommentLocationMap(e, n) {
-    let r = this._locationMap.get(e);
-    r || (r = /* @__PURE__ */ new Map(), this._locationMap.set(e, r));
-    let t = r.get(n);
-    return t || (t = /* @__PURE__ */ new Map(), r.set(n, t)), t;
-  }
-  _ensure(e, n) {
-    const r = this._ensureCommentMatrix(e, n), t = this._ensureCommentLocationMap(e, n);
-    return { matrix: r, locationMap: t };
-  }
-  _initData() {
-    const e = this._threadCommentModel.getAll();
-    for (const n in e) {
-      const r = e[n];
-      for (const t in r) {
-        const i = r[t];
-        for (const s in i) {
-          const a = i[s];
-          this._addComment(n, t, a);
-        }
-      }
-    }
-  }
-  _addComment(e, n, r) {
-    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,
-      type: "add",
-      ...t
-    });
-  }
-  _initUpdateTransform() {
-    this.disposeWithMe(this._threadCommentModel.commentUpdate$.subscribe((e) => {
-      const { unitId: n, subUnitId: r } = e;
-      try {
-        if (this._univerInstanceService.getUnitType(n) !== g.UNIVER_SHEET)
-          return;
-      } catch {
-      }
-      const { matrix: t, locationMap: i } = this._ensure(n, r);
-      switch (e.type) {
-        case "add": {
-          this._addComment(e.unitId, e.subUnitId, e.payload);
-          break;
-        }
-        case "delete": {
-          const { isRoot: s, comment: a } = e.payload, c = y(a.ref);
-          if (s) {
-            const { row: d, column: u } = c;
-            d >= 0 && u >= 0 && t.realDeleteValue(d, u);
-          }
-          this._commentUpdate$.next({
-            ...e,
-            ...c
-          });
-          break;
-        }
-        case "update": {
-          const { commentId: s } = e.payload, a = this._threadCommentModel.getComment(n, r, s);
-          if (!a)
-            return;
-          const c = y(a.ref);
-          this._commentUpdate$.next({
-            ...e,
-            ...c
-          });
-          break;
-        }
-        case "updateRef": {
-          const s = y(e.payload.ref), { commentId: a } = e.payload, c = i.get(a);
-          if (!c)
-            return;
-          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
-          });
-          break;
-        }
-      }
-    }));
-  }
-  getByLocation(e, n, r, t) {
-    return this._ensureCommentMatrix(e, n).getValue(r, t);
-  }
-  getComment(e, n, r) {
-    return this._threadCommentModel.getComment(e, n, r);
-  }
-  getCommentWithChildren(e, n, r, t) {
-    const s = this._ensureCommentMatrix(e, n).getValue(r, t);
-    if (s)
-      return this._threadCommentModel.getCommentWithChildren(e, n, s);
-  }
-  showCommentMarker(e, n, r, t) {
-    const i = this.getByLocation(e, n, r, t);
-    if (!i)
-      return !1;
-    const s = this.getComment(e, n, i);
-    return !!(s && !s.resolved);
-  }
-};
-T = Rt([
-  de(0, h(G)),
-  de(1, $)
-], T);
-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 && 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 gt(null));
-    _(this, "activePopup$", this._activePopup$.asObservable());
+    y(this, "_lastPopup", null);
+    y(this, "_activePopup");
+    y(this, "_activePopup$", new lt(null));
+    y(this, "activePopup$", this._activePopup$.asObservable());
     this._canvasPopupManagerService = e, this._zenZoneService = n, this._initZenVisible();
   }
   get activePopup() {
@@ -224,20 +96,20 @@ let U = class extends O {
     }));
   }
   showPopup(e, n) {
-    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 === ((d = this.activePopup) == null ? void 0 : d.subUnitId)) {
+    var a;
+    const { row: o, col: r, unitId: i, subUnitId: s } = e;
+    if (this._activePopup && o === this._activePopup.row && r === this._activePopup.col && i === this._activePopup.unitId && s === ((a = this.activePopup) == null ? void 0 : a.subUnitId)) {
       this._activePopup = e, this._activePopup$.next(e);
       return;
     }
     if (this._lastPopup && this._lastPopup.dispose(), this._zenZoneService.visible)
       return;
     this._activePopup = e, this._activePopup$.next(e);
-    const a = this._canvasPopupManagerService.attachPopupToCell(
+    const d = this._canvasPopupManagerService.attachPopupToCell(
+      o,
       r,
-      t,
       {
-        componentKey: Ee,
+        componentKey: Me,
         onClickOutside: () => {
           this.hidePopup();
         },
@@ -248,14 +120,14 @@ let U = class extends O {
         ].filter(Boolean)
       }
     );
-    if (!a)
+    if (!d)
       throw new Error("[SheetsThreadCommentPopupService]: cannot show popup!");
-    const c = new Ve();
-    c.add(a), c.add({
+    const u = new $e();
+    u.add(d), u.add({
       dispose: () => {
         n == null || n();
       }
-    }), this._lastPopup = c;
+    }), this._lastPopup = u;
   }
   hidePopup() {
     this._activePopup && (this._lastPopup && this._lastPopup.dispose(), this._lastPopup = null, this._activePopup = null, this._activePopup$.next(null));
@@ -267,83 +139,83 @@ let U = class extends O {
     }, this._activePopup$.next(this._activePopup));
   }
 };
-U = xt([
-  me(0, h(ct)),
-  me(1, Ge)
-], U);
-const Dt = () => {
-  const o = w($), e = w(U), n = oe(e.activePopup$), r = w(T);
-  if (oe(r.commentUpdate$), !n)
+M = Mt([
+  oe(0, p(rt)),
+  oe(1, We)
+], M);
+const wt = () => {
+  const t = T(E), e = T(M), n = ee(e.activePopup$), o = T(R);
+  if (ee(o.commentUpdate$), !n)
     return null;
-  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 = () => {
+  const { row: r, col: i, unitId: s, subUnitId: d, trigger: u } = n, a = o.getByLocation(s, d, r, i), m = `${ce.chatAtABC(i)}${r + 1}`, h = () => {
     e.hidePopup();
-  }, R = (S) => {
-    var I, M, E;
-    return (E = (M = (I = o.getCurrentUnitForType(g.UNIVER_SHEET)) == null ? void 0 : I.getSheetBySheetId(S)) == null ? void 0 : M.getName()) != null ? E : "";
+  }, w = (C) => {
+    var S, I, O;
+    return (O = (I = (S = t.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : S.getSheetBySheetId(C)) == null ? void 0 : I.getName()) != null ? O : "";
   };
-  return /* @__PURE__ */ be.createElement(
-    We,
+  return /* @__PURE__ */ Ce.createElement(
+    Ve,
     {
       onClick: () => {
         e.persistPopup();
       },
       prefix: "cell",
-      id: d,
+      id: a,
       unitId: s,
-      subUnitId: a,
-      type: g.UNIVER_SHEET,
-      refStr: u,
-      onClose: p,
-      getSubUnitName: R,
-      autoFocus: c === "context-menu"
+      subUnitId: d,
+      type: b.UNIVER_SHEET,
+      refStr: m,
+      onClose: h,
+      getSubUnitName: w,
+      autoFocus: u === "context-menu"
     }
   );
-}, K = {
-  type: Ae.OPERATION,
+}, z = {
+  type: Ne.OPERATION,
   id: "sheets.operation.show-comment-modal",
-  handler(o) {
-    var M;
-    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);
+  handler(t) {
+    var I;
+    const e = t.get(Ye), n = t.get(E), o = t.get(M), r = t.get(q), i = (I = e.getFirst()) == null ? void 0 : I.primary, s = e.getCurrent(), d = t.get(R);
     if (!s || !i)
       return !1;
-    const { unitId: c, sheetId: d } = s, u = et(n, { unitId: c, subUnitId: d });
-    if (!u)
+    const { unitId: u, sheetId: a } = s, m = qe(n, { unitId: u, subUnitId: a });
+    if (!m)
       return !1;
-    const { workbook: p, worksheet: R } = u, S = {
-      workbook: p,
-      worksheet: R,
-      unitId: c,
-      subUnitId: d,
-      row: i.actualRow,
+    const { workbook: h, worksheet: w } = m, C = {
+      workbook: h,
+      worksheet: w,
+      unitId: u,
+      subUnitId: a,
+      row: i.startRow,
       col: i.startColumn
     };
-    r.showPopup(S);
-    const I = a.getByLocation(c, d, i.actualRow, i.startColumn);
-    return I && t.setActiveComment({
-      unitId: c,
-      subUnitId: d,
-      commentId: I,
+    o.showPopup(C);
+    const S = d.getByLocation(u, a, i.startRow, i.startColumn);
+    return S && r.setActiveComment({
+      unitId: u,
+      subUnitId: a,
+      commentId: S,
       trigger: "context-menu"
     }), !0;
   }
-}, Nt = () => {
-  const o = w(dt), e = w($), n = w(G), r = w(U), t = e.getCurrentUnitForType(g.UNIVER_SHEET);
-  if (!t)
+}, Ot = () => {
+  const t = T(ot), e = T(E), n = T(_e), o = T(M), r = e.getCurrentUnitForType(b.UNIVER_SHEET);
+  if (!r)
     return null;
-  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;
-    }), m.map((C) => {
-      var ne;
-      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]), S = ce((m) => {
-    if (m.unitId === i && m.subUnitId === c && !m.resolved) {
-      const { row: l, column: v } = y(m.ref);
+  const i = r.getUnitId(), s = T(Y), d = ht(() => r.activeSheet$.pipe(vt((c) => c == null ? void 0 : c.getSheetId())), [r.activeSheet$]), u = ne(d, r.getActiveSheet().getSheetId()), a = Ie(), m = T(q), h = ne(m.activeCommentId$), w = re((c) => {
+    const l = r.getSheets(), v = {};
+    return l.forEach((f, g) => {
+      v[f.getSheetId()] = g;
+    }), c.map((f) => {
+      var J;
+      const g = F(f.ref), Ue = [(J = v[f.subUnitId]) != null ? J : 0, g.row, g.column];
+      return { ...f, p: Ue };
+    }).sort((f, g) => f.p[0] === g.p[0] ? f.p[1] === g.p[1] ? f.p[2] - g.p[2] : f.p[1] - g.p[1] : f.p[0] - g.p[0]);
+  }, [r]), C = re((c) => {
+    if (c.unitId === i && c.subUnitId === u && !c.resolved) {
+      const { row: l, column: v } = F(c.ref);
       if (!Number.isNaN(l) && !Number.isNaN(v))
-        return o.addShape({
+        return t.addShape({
           range: {
             startColumn: v,
             endColumn: v,
@@ -360,337 +232,203 @@ const Dt = () => {
           primary: null
         });
     }
-  }, [o, c, i]), I = (m) => {
+  }, [t, u, i]), S = (c) => {
     var l, v;
-    return (v = (l = t.getSheetBySheetId(m)) == null ? void 0 : l.getName()) != null ? v : "";
-  }, M = () => {
-    s.executeCommand(K.id);
-  }, E = () => {
-    r.hidePopup();
-  }, 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 = () => {
-    d.current && (o.removeShape(d.current), d.current = null);
+    return (v = (l = r.getSheetBySheetId(c)) == null ? void 0 : l.getName()) != null ? v : "";
+  }, I = () => {
+    s.executeCommand(z.id);
+  }, O = () => {
+    o.hidePopup();
+  }, D = (c) => {
+    h && h.unitId === c.unitId && h.subUnitId === c.subUnitId && h.commentId === c.id || (a.current && (t.removeShape(a.current), a.current = null), a.current = C(c));
+  }, j = () => {
+    a.current && (t.removeShape(a.current), a.current = null);
   };
-  return ft(() => {
-    if (!p)
+  return pt(() => {
+    if (!h)
       return;
-    const m = n.getComment(p.unitId, p.subUnitId, p.commentId);
-    if (!m)
+    const c = n.getComment(h.unitId, h.subUnitId, h.commentId);
+    if (!c)
       return;
-    const l = S(m);
+    const l = C(c);
     return () => {
-      l && o.removeShape(l);
+      l && t.removeShape(l);
     };
-  }, [S, p, n, o]), /* @__PURE__ */ be.createElement(
-    Fe,
+  }, [C, h, n, t]), /* @__PURE__ */ Ce.createElement(
+    Le,
     {
       unitId: i,
-      subUnitId$: a,
-      type: g.UNIVER_SHEET,
-      onAdd: M,
-      getSubUnitName: I,
-      onResolve: E,
-      sortComments: R,
-      onItemEnter: A,
-      onItemLeave: L
+      subUnitId$: d,
+      type: b.UNIVER_SHEET,
+      onAdd: I,
+      getSubUnitName: S,
+      onResolve: O,
+      sortComments: w,
+      onItemEnter: D,
+      onItemLeave: j
     }
   );
-}, jt = (o) => ({
-  id: K.id,
-  type: ve.BUTTON,
-  positions: [fe.CONTEXT_MENU],
-  icon: te,
+}, yt = (t) => ({
+  id: z.id,
+  type: de.BUTTON,
+  positions: [ue.CONTEXT_MENU],
+  icon: X,
   title: "sheetThreadComment.menu.addComment",
-  hidden$: Ce(o, g.UNIVER_SHEET),
-  disabled$: Pe(o, {
-    workbookTypes: [ge],
-    worksheetTypes: [Se],
-    rangeTypes: [Ie]
+  hidden$: me(t, b.UNIVER_SHEET),
+  disabled$: fe(t, {
+    workbookTypes: [he],
+    worksheetTypes: [pe],
+    rangeTypes: [le]
   })
-}), Vt = (o) => ({
-  id: Ze.id,
-  type: ve.BUTTON,
-  icon: te,
+}), Ut = (t) => ({
+  id: He.id,
+  type: de.BUTTON,
+  icon: X,
   tooltip: "sheetThreadComment.menu.commentManagement",
-  positions: fe.TOOLBAR_START,
-  group: Ye.TOOLBAR_OTHERS,
-  disabled$: Pe(o, {
-    workbookTypes: [ge],
-    worksheetTypes: [Se],
-    rangeTypes: [Ie]
+  positions: ue.TOOLBAR_START,
+  group: ze.TOOLBAR_OTHERS,
+  disabled$: fe(t, {
+    workbookTypes: [he],
+    worksheetTypes: [pe],
+    rangeTypes: [le]
   }),
-  hidden$: Ce(o, g.UNIVER_SHEET)
-}), At = {
-  id: K.id,
-  binding: Ke.M | ie.CTRL_COMMAND | ie.ALT,
-  preconditions: mt
+  hidden$: me(t, b.UNIVER_SHEET)
+}), Et = {
+  id: z.id,
+  binding: Ze.M | te.CTRL_COMMAND | te.ALT,
+  preconditions: it
 };
-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 && Lt(e, n, t), t;
-}, b = (o, e) => (n, r) => e(n, r, o);
-const Wt = {};
-let j = class extends O {
-  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();
+var Rt = Object.defineProperty, $t = Object.getOwnPropertyDescriptor, Nt = (t, e, n, o) => {
+  for (var r = o > 1 ? void 0 : o ? $t(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (r = (o ? s(e, n, r) : s(r)) || r);
+  return o && r && Rt(e, n, r), r;
+}, P = (t, e) => (n, o) => e(n, o, t);
+const xt = {};
+let $ = class extends U {
+  constructor(t, e, n, o, r, i, s, d, u, a, m) {
+    super(), this._config = t, this._menuService = e, this._injector = n, this._componentManager = o, this._localeService = r, this._commandService = i, this._sheetsThreadCommentPopupService = s, this._sheetsThreadCommentModel = d, this._threadCommentPanelService = u, this._shortcutService = a, this._univerInstanceService = m, this._initMenu(), this._initShortcut(), this._initComponent(), this._initCommandListener(), this._initPanelListener();
   }
   _initShortcut() {
-    this._shortcutService.registerShortcut(At);
+    this._shortcutService.registerShortcut(Et);
   }
   _initCommandListener() {
-    this._commandService.onCommandExecuted((o) => {
-      if (o.id === tt.id) {
-        const e = o.params, { unitId: n, subUnitId: r, selections: t, type: i } = e;
-        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);
+    this._commandService.onCommandExecuted((t) => {
+      if (t.id === Xe.id) {
+        const e = t.params, { unitId: n, subUnitId: o, selections: r, type: i } = e;
+        if ((i === Je.MOVE_END || i === void 0) && r[0].primary) {
+          const s = r[0].primary.actualRow, d = r[0].primary.actualColumn;
+          if (!this._sheetsThreadCommentModel.showCommentMarker(n, o, s, d)) {
+            this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(Q.id);
             return;
           }
-          const c = this._sheetsThreadCommentModel.getByLocation(n, r, s, a);
-          c && this._commandService.executeCommand(re.id, {
+          const u = this._sheetsThreadCommentModel.getByLocation(n, o, s, d);
+          u && this._commandService.executeCommand(Q.id, {
             unitId: n,
-            subUnitId: r,
-            commentId: c
+            subUnitId: o,
+            commentId: u
           });
         }
       }
-      if (o.id === V.id) {
-        const e = o.params, n = this._sheetsThreadCommentPopupService.activePopup;
+      if (t.id === W.id) {
+        const e = t.params, n = this._sheetsThreadCommentPopupService.activePopup;
         if (!n)
           return;
-        const { unitId: r, subUnitId: t, commentId: i } = n;
-        e.unitId === r && e.subUnitId === t && e.commentId === i && this._sheetsThreadCommentPopupService.hidePopup();
+        const { unitId: o, subUnitId: r, commentId: i } = n;
+        e.unitId === o && e.subUnitId === r && e.commentId === i && this._sheetsThreadCommentPopupService.hidePopup();
       }
     });
   }
   _initMenu() {
-    const { menu: o = {} } = this._config;
+    const { menu: t = {} } = this._config;
     [
-      jt,
-      Vt
+      yt,
+      Ut
     ].forEach((e) => {
-      this._menuService.addMenuItem(e(this._injector), o);
+      this._menuService.addMenuItem(e(this._injector), t);
     });
   }
   _initComponent() {
     [
-      [Ee, Dt],
-      [ke, Nt],
-      [te, Re]
-    ].forEach(([o, e]) => {
-      this._componentManager.register(o, e);
+      [Me, wt],
+      [Be, Ot],
+      [X, Te]
+    ].forEach(([t, e]) => {
+      this._componentManager.register(t, e);
     });
   }
   _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);
+    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe(async (t) => {
+      if (t) {
+        const { unitId: e, subUnitId: n, commentId: o, trigger: r } = t, i = this._sheetsThreadCommentModel.getComment(e, n, o);
         if (!i || i.resolved)
           return;
-        const s = this._univerInstanceService.getCurrentUnitForType(g.UNIVER_SHEET);
+        const s = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
         if (!s || s.getUnitId() !== e)
           return;
-        s.getActiveSheet().getSheetId() !== n && await this._commandService.executeCommand(rt.id, {
+        s.getActiveSheet().getSheetId() !== n && await this._commandService.executeCommand(Qe.id, {
           unitId: e,
           subUnitId: n
         });
-        const d = y(i.ref);
-        await this._commandService.executeCommand(ut.id, {
+        const a = F(i.ref), m = 5;
+        await this._commandService.executeCommand(st.id, {
           range: {
-            startColumn: d.column,
-            endColumn: d.column,
-            startRow: d.row,
-            endRow: d.row
+            startRow: Math.max(a.row - m, 0),
+            endRow: a.row + m,
+            startColumn: Math.max(a.column - m, 0),
+            endColumn: a.column + m
           }
         }), this._sheetsThreadCommentPopupService.showPopup({
           unitId: e,
           subUnitId: n,
-          row: d.row,
-          col: d.column,
+          row: a.row,
+          col: a.column,
           commentId: i.id,
-          trigger: t
+          trigger: r
         });
       } else
         this._sheetsThreadCommentPopupService.hidePopup();
     }));
   }
 };
-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, Je),
-  b(10, $)
-], j);
-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 && Ft(e, n, t), t;
-}, Y = (o, e) => (n, r) => e(n, r, o);
-let B = class extends O {
-  constructor(e, n, r) {
-    super();
-    _(this, "_disposableMap", /* @__PURE__ */ new Map());
-    this._refRangeService = e, this._sheetsThreadCommentModel = n, this._threadCommentModel = r, this._initData(), this._initRefRange();
-  }
-  _getIdWithUnitId(e, n, r) {
-    return `${e}-${n}-${r}`;
-  }
-  _register(e, n, r) {
-    const t = r.id, i = {
-      startColumn: r.column,
-      endColumn: r.column,
-      startRow: r.row,
-      endRow: r.row
-    }, s = (a) => {
-      const c = it(i, a);
-      return c && c.startColumn === i.startColumn && c.startRow === i.startRow ? {
-        undos: [],
-        redos: []
-      } : c ? {
-        redos: [{
-          id: se.id,
-          params: {
-            unitId: e,
-            subUnitId: n,
-            payload: {
-              ref: J(c),
-              commentId: t
-            }
-          }
-        }],
-        undos: [{
-          id: se.id,
-          params: {
-            unitId: e,
-            subUnitId: n,
-            payload: {
-              ref: J(i),
-              commentId: t
-            }
-          }
-        }]
-      } : {
-        redos: [{
-          id: V.id,
-          params: {
-            unitId: e,
-            subUnitId: n,
-            commentId: t
-          }
-        }],
-        undos: [{
-          id: z.id,
-          params: {
-            unitId: e,
-            subUnitId: n,
-            comment: r
-          }
-        }]
-      };
-    };
-    this._disposableMap.set(
-      this._getIdWithUnitId(e, n, t),
-      this._refRangeService.registerRefRange(i, s, e, n)
-    );
-  }
-  _initData() {
-    const e = this._threadCommentModel.getAll();
-    for (const n in e) {
-      const r = e[n];
-      for (const t in r) {
-        const i = r[t];
-        for (const s in i) {
-          const a = i[s], c = a.ref, d = y(c);
-          this._register(n, t, {
-            ...a,
-            ...d
-          });
-        }
-      }
-    }
-  }
-  _initRefRange() {
-    this.disposeWithMe(
-      this._sheetsThreadCommentModel.commentUpdate$.subscribe((e) => {
-        const { unitId: n, subUnitId: r } = e;
-        switch (e.type) {
-          case "add": {
-            const t = e.payload;
-            this._register(e.unitId, e.subUnitId, {
-              ...t,
-              row: e.row,
-              column: e.column
-            });
-            break;
-          }
-          case "delete": {
-            const t = this._disposableMap.get(this._getIdWithUnitId(n, r, e.payload.commentId));
-            t == null || t.dispose();
-            break;
-          }
-          case "updateRef": {
-            const t = this._sheetsThreadCommentModel.getComment(n, r, e.payload.commentId);
-            if (!t)
-              return;
-            const i = this._disposableMap.get(this._getIdWithUnitId(n, r, t.id));
-            i == null || i.dispose(), this._register(e.unitId, e.subUnitId, {
-              ...t,
-              row: e.row,
-              column: e.column
-            });
-            break;
-          }
-        }
-      })
-    ), this.disposeWithMe(He(() => {
-      this._disposableMap.forEach((e) => {
-        e.dispose();
-      }), this._disposableMap.clear();
-    }));
-  }
-};
-B = kt([
-  x(D.Starting, B),
-  Y(0, h(ot)),
-  Y(1, h(T)),
-  Y(2, h(G))
-], B);
-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 && 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();
+$ = Nt([
+  N(x.Starting, $),
+  P(1, Ge),
+  P(2, p(ae)),
+  P(3, p(ke)),
+  P(4, p(xe)),
+  P(5, Y),
+  P(6, p(M)),
+  P(7, p(R)),
+  P(8, p(q)),
+  P(9, Ke),
+  P(10, E)
+], $);
+var Dt = Object.defineProperty, jt = Object.getOwnPropertyDescriptor, At = (t, e, n, o) => {
+  for (var r = o > 1 ? void 0 : o ? jt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (r = (o ? s(e, n, r) : s(r)) || r);
+  return o && r && Dt(e, n, r), r;
+}, A = (t, e) => (n, o) => e(n, o, t);
+let V = class extends U {
+  constructor(t, e, n, o) {
+    super(), this._sheetInterceptorService = t, this._sheetsThreadCommentModel = e, this._univerInstanceService = n, this._renderManagerService = o, this._initViewModelIntercept(), this._initSkeletonChange();
   }
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        st.CELL_CONTENT,
+        et.CELL_CONTENT,
         {
-          handler: (o, e, n) => {
-            const { row: r, col: t, unitId: i, subUnitId: s } = e;
-            return this._sheetsThreadCommentModel.showCommentMarker(i, s, r, t) ? n({
-              ...o,
+          handler: (t, e, n) => {
+            const { row: o, col: r, unitId: i, subUnitId: s } = e;
+            return this._sheetsThreadCommentModel.showCommentMarker(i, s, o, r) ? n({
+              ...t,
               markers: {
-                ...o == null ? void 0 : o.markers,
+                ...t == null ? void 0 : t.markers,
                 tr: {
                   color: "#FFBD37",
                   size: 6
                 }
               }
-            }) : n(o);
+            }) : n(t);
           },
           priority: 100
         }
@@ -698,118 +436,117 @@ let W = class extends O {
     );
   }
   _initSkeletonChange() {
-    const o = () => {
-      const e = this._univerInstanceService.getCurrentUnitForType(g.UNIVER_SHEET);
+    const t = () => {
+      const e = this._univerInstanceService.getCurrentUnitForType(b.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);
-      t == null || t.makeDirty(!0), t == null || t.calculate(), i && i.mainComponent.makeForceDirty();
+      const n = e.getUnitId(), o = e.getActiveSheet().getSheetId(), r = this._renderManagerService.getRenderById(n), i = r == null ? void 0 : r.with(at).getOrCreateSkeleton({ sheetId: o });
+      i == null || i.makeDirty(!0), i == null || i.calculate(), r && r.mainComponent.makeForceDirty();
     };
     this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.subscribe(() => {
-      o();
+      t();
     }));
   }
 };
-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 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 && Yt(e, n, t), t;
-}, ue = (o, e) => (n, r) => e(n, r, o);
-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,
-    endColumn: r.column + i,
-    endRow: r.row + t
+V = At([
+  N(x.Ready, V),
+  A(0, p(ve)),
+  A(1, p(R)),
+  A(2, E),
+  A(3, ft)
+], V);
+var Vt = Object.defineProperty, Lt = Object.getOwnPropertyDescriptor, Ht = (t, e, n, o) => {
+  for (var r = o > 1 ? void 0 : o ? Lt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (r = (o ? s(e, n, r) : s(r)) || r);
+  return o && r && Vt(e, n, r), r;
+}, ie = (t, e) => (n, o) => e(n, o, t);
+const Bt = (t, e, n) => {
+  const o = F(t), r = n.row - e.row, i = n.column - e.column, s = {
+    startColumn: o.column + i,
+    startRow: o.row + r,
+    endColumn: o.column + i,
+    endRow: o.row + r
   };
-  return J(s);
+  return nt(s);
 };
-let F = class extends O {
+let L = class extends U {
   constructor(e, n) {
     super();
-    _(this, "_copyInfo");
+    y(this, "_copyInfo");
     this._sheetClipboardService = e, this._sheetsThreadCommentModel = n, this._initClipboardHook();
   }
   // eslint-disable-next-line max-lines-per-function
   _initClipboardHook() {
     this.disposeWithMe(
       this._sheetClipboardService.addClipboardHook({
-        id: $e,
-        onBeforeCopy: (e, n, r) => {
+        id: we,
+        onBeforeCopy: (e, n, o) => {
           this._copyInfo = {
             unitId: e,
             subUnitId: n,
-            range: r
+            range: o
           };
         },
         // eslint-disable-next-line max-lines-per-function
-        onPasteCells: (e, n, r, t) => {
-          const { unitId: i, subUnitId: s, range: a } = n, c = {
-            row: a.rows[0],
-            column: a.cols[0]
+        onPasteCells: (e, n, o, r) => {
+          const { unitId: i, subUnitId: s, range: d } = n, u = {
+            row: d.rows[0],
+            column: d.cols[0]
           };
-          if (t.copyType === lt.CUT && this._copyInfo) {
-            const { range: d, unitId: u, subUnitId: p } = this._copyInfo, R = {
-              row: d.startRow,
-              column: d.startColumn
+          if (r.copyType === dt.CUT && this._copyInfo) {
+            const { range: a, unitId: m, subUnitId: h } = this._copyInfo, w = {
+              row: a.startRow,
+              column: a.startColumn
             };
-            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);
+            if (!(i === m && s === h)) {
+              const C = [];
+              De.foreach(a, (c, l) => {
+                const v = this._sheetsThreadCommentModel.getCommentWithChildren(m, h, c, l);
+                v && C.push(v);
               });
-              const I = [], M = [], E = [], A = [], L = (m) => {
-                I.unshift({
-                  id: V.id,
+              const S = [], I = [], O = [], D = [], j = (c) => {
+                S.unshift({
+                  id: W.id,
                   params: {
-                    unitId: u,
-                    subUnitId: p,
-                    commentId: m.id
+                    unitId: m,
+                    subUnitId: h,
+                    commentId: c.id
                   }
-                }), E.push({
-                  id: z.id,
+                }), O.push({
+                  id: K.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
                     comment: {
-                      ...m,
-                      ref: Jt(m.ref, R, c),
+                      ...c,
+                      ref: Bt(c.ref, w, u),
                       unitId: i,
                       subUnitId: s
                     }
                   }
-                }), M.push({
-                  id: z.id,
+                }), I.push({
+                  id: K.id,
                   params: {
-                    unitId: u,
-                    subUnitId: p,
-                    comment: m
+                    unitId: m,
+                    subUnitId: h,
+                    comment: c
                   }
-                }), A.unshift({
-                  id: V.id,
+                }), D.unshift({
+                  id: W.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
-                    commentId: m.id
+                    commentId: c.id
                   }
                 });
               };
-              return S.forEach((m) => {
-                L(m.root), m.children.forEach((l) => {
-                  L(l);
+              return C.forEach((c) => {
+                j(c.root), c.children.forEach((l) => {
+                  j(l);
                 });
               }), {
-                redos: [...I, ...E],
-                undos: [...A, ...M]
+                redos: [...S, ...O],
+                undos: [...D, ...I]
               };
             }
           }
@@ -822,34 +559,34 @@ let F = class extends O {
     );
   }
 };
-F = Xt([
-  x(D.Rendered, F),
-  ue(0, h(pt)),
-  ue(1, h(T))
-], F);
-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 && 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();
+L = Ht([
+  N(x.Rendered, L),
+  ie(0, p(ct)),
+  ie(1, p(R))
+], L);
+var Ft = Object.defineProperty, Wt = Object.getOwnPropertyDescriptor, Zt = (t, e, n, o) => {
+  for (var r = o > 1 ? void 0 : o ? Wt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (r = (o ? s(e, n, r) : s(r)) || r);
+  return o && r && Ft(e, n, r), r;
+}, k = (t, e) => (n, o) => e(n, o, t);
+let H = class extends U {
+  constructor(t, e, n) {
+    super(), this._hoverManagerService = t, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = n, this._initHoverEvent();
   }
   _initHoverEvent() {
     this.disposeWithMe(
-      this._hoverManagerService.currentCell$.pipe(It(100)).subscribe((o) => {
+      this._hoverManagerService.currentCell$.pipe(_t(100)).subscribe((t) => {
         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,
+        if (t && (e && e.temp || !e)) {
+          const { location: n } = t, { unitId: o, subUnitId: r, row: i, col: s } = n, d = this._sheetsThreadCommentModel.getByLocation(o, r, i, s);
+          if (d) {
+            const u = this._sheetsThreadCommentModel.getComment(o, r, d);
+            u && !u.resolved && this._sheetsThreadCommentPopupService.showPopup({
+              unitId: o,
+              subUnitId: r,
               row: i,
               col: s,
-              commentId: a,
+              commentId: d,
               temp: !0
             });
           } else
@@ -859,45 +596,45 @@ let Z = class extends O {
     );
   }
 };
-Z = tn([
-  x(D.Rendered, Z),
-  q(0, h(_t)),
-  q(1, h(U)),
-  q(2, h(T))
-], Z);
-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 && nn(e, n, t), t;
-}, X = (o, e) => (n, r) => e(n, r, o);
-let k = class extends O {
-  constructor(o, e, n) {
-    super(), this._sheetInterceptorService = o, this._univerInstanceService = e, this._threadCommentModel = n, this._initSheetChange();
+H = Zt([
+  N(x.Rendered, H),
+  k(0, p(ut)),
+  k(1, p(M)),
+  k(2, p(R))
+], H);
+var zt = Object.defineProperty, kt = Object.getOwnPropertyDescriptor, Gt = (t, e, n, o) => {
+  for (var r = o > 1 ? void 0 : o ? kt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (r = (o ? s(e, n, r) : s(r)) || r);
+  return o && r && zt(e, n, r), r;
+}, G = (t, e) => (n, o) => e(n, o, t);
+let B = class extends U {
+  constructor(t, e, n) {
+    super(), this._sheetInterceptorService = t, this._univerInstanceService = e, this._threadCommentModel = n, this._initSheetChange();
   }
   _initSheetChange() {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
-        getMutations: (o) => {
-          if (o.id === at.id) {
-            const e = o.params, n = e.unitId ? this._univerInstanceService.getUnit(e.unitId) : this._univerInstanceService.getCurrentUnitForType(g.UNIVER_SHEET);
+        getMutations: (t) => {
+          if (t.id === tt.id) {
+            const e = t.params, n = e.unitId ? this._univerInstanceService.getUnit(e.unitId) : this._univerInstanceService.getCurrentUnitForType(b.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) => ({
-              id: V.id,
+            const o = n.getUnitId(), r = e.subUnitId || n.getActiveSheet().getSheetId(), { commentMap: i } = this._threadCommentModel.ensureMap(o, r), s = Array.from(Object.keys(i)), d = Array.from(Object.values(i)), u = s.map((m) => ({
+              id: W.id,
               params: {
-                unitId: r,
-                subUnitId: t,
-                commentId: u
+                unitId: o,
+                subUnitId: r,
+                commentId: m
               }
-            })), d = a.map((u) => ({
-              id: z.id,
+            })), a = d.map((m) => ({
+              id: K.id,
               params: {
-                unitId: r,
-                subUnitId: t,
-                comment: u
+                unitId: o,
+                subUnitId: r,
+                comment: m
               }
             }));
-            return { redos: c, undos: d };
+            return { redos: u, undos: a };
           }
           return { redos: [], undos: [] };
         }
@@ -905,65 +642,65 @@ let k = class extends O {
     );
   }
 };
-k = on([
-  x(D.Ready, k),
-  X(0, h(Me)),
-  X(1, $),
-  X(2, h(G))
-], 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 && sn(e, n, t), t;
-}, he = (o, e) => (n, r) => e(n, r, o), H;
-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({}, Wt, e);
+B = Gt([
+  N(x.Ready, B),
+  G(0, p(ve)),
+  G(1, E),
+  G(2, p(_e))
+], B);
+var Oe = Object.defineProperty, Kt = Object.getOwnPropertyDescriptor, Yt = (t, e, n) => e in t ? Oe(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n, qt = (t, e, n, o) => {
+  for (var r = o > 1 ? void 0 : o ? Kt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (r = (o ? s(e, n, r) : s(r)) || r);
+  return o && r && Oe(e, n, r), r;
+}, se = (t, e) => (n, o) => e(n, o, t), ye = (t, e, n) => (Yt(t, typeof e != "symbol" ? e + "" : e, n), n);
+let Z = class extends Ae {
+  constructor(e = {}, n, o) {
+    super();
+    y(this, "_pluginConfig");
+    this._injector = n, this._commandService = o, this._pluginConfig = ce.deepMerge({}, xt, e);
   }
   onStarting(e) {
-    super.onStarting(e), [
-      [T],
+    [
       [
-        j,
+        $,
         {
-          useFactory: () => this._injector.createInstance(j, this._pluginConfig)
+          useFactory: () => this._injector.createInstance($, this._pluginConfig)
         }
       ],
+      [V],
+      [L],
+      [H],
       [B],
-      [W],
-      [F],
-      [Z],
-      [k],
-      [U]
+      [M]
     ].forEach((n) => {
-      this._injector.add(n);
-    }), [K].forEach((n) => {
+      e.add(n);
+    }), [z].forEach((n) => {
       this._commandService.registerCommand(n);
     });
   }
-}, _(H, "pluginName", $e), _(H, "type", g.UNIVER_SHEET), H);
-pe = cn([
-  he(1, h(le)),
-  he(2, h(Q))
-], pe);
+};
+ye(Z, "pluginName", we);
+ye(Z, "type", b.UNIVER_SHEET);
+Z = qt([
+  je(Fe, mt),
+  se(1, p(ae)),
+  se(2, p(Y))
+], Z);
 export {
-  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,
-  k as ThreadCommentRemoveSheetsController,
-  On as UniverInstanceType,
-  pe as UniverSheetsThreadCommentPlugin,
-  $n as UniverThreadCommentUIPlugin
+  fn as ICommandService,
+  Tn as IThreadCommentDataSourceService,
+  gn as IThreadCommentMentionDataService,
+  ln as Inject,
+  vn as Injector,
+  Cn as Plugin,
+  we as SHEETS_THREAD_COMMENT,
+  $ as SheetsThreadCommentController,
+  L as SheetsThreadCommentCopyPasteController,
+  H as SheetsThreadCommentHoverController,
+  wn as SheetsThreadCommentModel,
+  M as SheetsThreadCommentPopupService,
+  B as ThreadCommentRemoveSheetsController,
+  Sn as UniverInstanceType,
+  Z as UniverSheetsThreadCommentPlugin,
+  Pn as UniverThreadCommentUIPlugin
 };