@univerjs/sheets-thread-comment 0.4.2 → 0.5.0-alpha.0

package/lib/es/index.js

@@ -1,820 +1,367 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
-import { Inject, Disposable, DisposableCollection, CommandType, IUniverInstanceService, InterceptorEffectEnum, UniverInstanceType, useDependency, Tools, ICommandService, Range, RANGE_TYPE, Rectangle, DependentOn, Injector, Plugin, IConfigService } from "@univerjs/core";
-import { SheetsSelectionsService, getSheetCommandTarget, SheetInterceptorService, INTERCEPTOR_POINT, WorkbookCommentPermission, WorksheetViewPermission, RangeProtectionPermissionViewPoint, SetWorksheetActiveOperation, RemoveSheetCommand } from "@univerjs/sheets";
-import { SheetsThreadCommentModel, UniverSheetsThreadCommentBasePlugin } from "@univerjs/sheets-thread-comment-base";
-import { SheetsThreadCommentModel as SheetsThreadCommentModel2 } from "@univerjs/sheets-thread-comment-base";
-import { ThreadCommentPanelService, ThreadCommentTree, ThreadCommentPanel, ToggleSheetCommentPanelOperation, THREAD_COMMENT_PANEL, SetActiveCommentOperation, UniverThreadCommentUIPlugin } from "@univerjs/thread-comment-ui";
-import { IThreadCommentMentionDataService, UniverThreadCommentUIPlugin as UniverThreadCommentUIPlugin2 } from "@univerjs/thread-comment-ui";
-import { SheetCanvasPopManagerService, IMarkSelectionService, whenSheetEditorFocused, getCurrentRangeDisable$, ISheetClipboardService, COPY_TYPE, HoverManagerService, SheetPermissionInterceptorBaseController, IEditorBridgeService, SheetSkeletonManagerService, ScrollToRangeOperation } from "@univerjs/sheets-ui";
-import { IZenZoneService, useObservable, KeyCode, MetaKeys, MenuItemType, getMenuHiddenObservable, RibbonStartGroup, ContextMenuPosition, ContextMenuGroup, ComponentManager, IMenuManagerService, IShortcutService } from "@univerjs/ui";
-import { BehaviorSubject, debounceTime, map } from "rxjs";
-import { IRenderManagerService } from "@univerjs/engine-render";
-import React, { forwardRef, useRef, createElement, useMemo, useCallback, useEffect } from "react";
-import { singleReferenceToGrid, serializeRange } from "@univerjs/engine-formula";
-import { IThreadCommentDataSourceService, DeleteCommentMutation, AddCommentMutation, ThreadCommentModel } from "@univerjs/thread-comment";
-import { AddCommentCommand, DeleteCommentCommand, DeleteCommentTreeCommand, IThreadCommentDataSourceService as IThreadCommentDataSourceService2, ResolveCommentCommand, UpdateCommentCommand } from "@univerjs/thread-comment";
-const SHEETS_THREAD_COMMENT_MODAL = "univer.sheet.thread-comment-modal", COMMENT_SINGLE_ICON = "comment-single", SHEETS_THREAD_COMMENT = "SHEET_THREAD_COMMENT";
-var __defProp$7 = Object.defineProperty, __getOwnPropDesc$7 = Object.getOwnPropertyDescriptor, __decorateClass$7 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$7(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
-  return kind && result && __defProp$7(target, key, result), result;
-}, "__decorateClass$7"), __decorateParam$7 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$7"), _a;
-let SheetsThreadCommentPopupService = (_a = class extends Disposable {
-  constructor(_canvasPopupManagerService, _zenZoneService) {
+var x = Object.defineProperty;
+var T = (i, e, r) => e in i ? x(i, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : i[e] = r;
+var h = (i, e, r) => T(i, typeof e != "symbol" ? e + "" : e, r);
+import { Inject as l, Disposable as R, ObjectMatrix as $, UniverInstanceType as y, IUniverInstanceService as E, sequenceExecuteAsync as P, toDisposable as D, ICommandService as b, DependentOn as O, Injector as A, Plugin as j } from "@univerjs/core";
+import { singleReferenceToGrid as p, serializeRange as M } from "@univerjs/engine-formula";
+import { RefRangeService as W, SheetsSelectionsService as L, handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests as B } from "@univerjs/sheets";
+import { ThreadCommentModel as S, DeleteCommentMutation as N, AddCommentMutation as V, UpdateCommentRefMutation as C, UniverThreadCommentPlugin as H } from "@univerjs/thread-comment";
+import { Subject as F } from "rxjs";
+var z = Object.defineProperty, G = Object.getOwnPropertyDescriptor, q = (i, e, r, t) => {
+  for (var n = t > 1 ? void 0 : t ? G(e, r) : e, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (n = (t ? o(e, r, n) : o(n)) || n);
+  return t && n && z(e, r, n), n;
+}, w = (i, e) => (r, t) => e(r, t, i);
+let u = class extends R {
+  constructor(e, r) {
     super();
-    __publicField(this, "_lastPopup", null);
-    __publicField(this, "_activePopup");
-    __publicField(this, "_activePopup$", new BehaviorSubject(null));
-    __publicField(this, "activePopup$", this._activePopup$.asObservable());
-    this._canvasPopupManagerService = _canvasPopupManagerService, this._zenZoneService = _zenZoneService, this._initZenVisible(), this.disposeWithMe(() => {
-      this._activePopup$.complete();
+    h(this, "_matrixMap", /* @__PURE__ */ new Map());
+    h(this, "_locationMap", /* @__PURE__ */ new Map());
+    h(this, "_commentUpdate$", new F());
+    h(this, "commentUpdate$", this._commentUpdate$.asObservable());
+    this._threadCommentModel = e, this._univerInstanceService = r, this._init(), this.disposeWithMe(() => {
+      this._commentUpdate$.complete();
     });
   }
-  get activePopup() {
-    return this._activePopup;
-  }
-  _initZenVisible() {
-    this.disposeWithMe(this._zenZoneService.visible$.subscribe((visible) => {
-      visible && this.hidePopup();
-    }));
-  }
-  showPopup(location, onHide) {
-    var _a9;
-    const { row, col, unitId, subUnitId } = location;
-    if (this._activePopup && row === this._activePopup.row && col === this._activePopup.col && unitId === this._activePopup.unitId && subUnitId === ((_a9 = this.activePopup) == null ? void 0 : _a9.subUnitId)) {
-      this._activePopup = location, this._activePopup$.next(location);
-      return;
+  _init() {
+    this._initData(), this._initUpdateTransform();
+  }
+  _ensureCommentMatrix(e, r) {
+    let t = this._matrixMap.get(e);
+    t || (t = /* @__PURE__ */ new Map(), this._matrixMap.set(e, t));
+    let n = t.get(r);
+    return n || (n = new $(), t.set(r, n)), n;
+  }
+  _ensureCommentLocationMap(e, r) {
+    let t = this._locationMap.get(e);
+    t || (t = /* @__PURE__ */ new Map(), this._locationMap.set(e, t));
+    let n = t.get(r);
+    return n || (n = /* @__PURE__ */ new Map(), t.set(r, n)), n;
+  }
+  _addCommentToMatrix(e, r, t, n) {
+    var o;
+    const s = (o = e.getValue(r, t)) != null ? o : /* @__PURE__ */ new Set();
+    s.add(n), e.setValue(r, t, s);
+  }
+  _deleteCommentFromMatrix(e, r, t, n) {
+    if (r >= 0 && t >= 0) {
+      const s = e.getValue(r, t);
+      s && s.has(n) && (s.delete(n), s.size === 0 && e.realDeleteValue(r, t));
     }
-    if (this._lastPopup && this._lastPopup.dispose(), this._zenZoneService.visible)
-      return;
-    this._activePopup = location, this._activePopup$.next(location);
-    const popupDisposable = this._canvasPopupManagerService.attachPopupToCell(
-      row,
-      col,
-      {
-        componentKey: SHEETS_THREAD_COMMENT_MODAL,
-        onClickOutside: /* @__PURE__ */ __name(() => {
-          this.hidePopup();
-        }, "onClickOutside"),
-        direction: "horizontal",
-        excludeOutside: [
-          ...Array.from(document.querySelectorAll(".univer-thread-comment")),
-          document.getElementById("thread-comment-add")
-        ].filter(Boolean)
-      }
-    );
-    if (!popupDisposable)
-      throw new Error("[SheetsThreadCommentPopupService]: cannot show popup!");
-    const disposableCollection = new DisposableCollection();
-    disposableCollection.add(popupDisposable), disposableCollection.add({
-      dispose: /* @__PURE__ */ __name(() => {
-        onHide == null || onHide();
-      }, "dispose")
-    }), this._lastPopup = disposableCollection;
   }
-  hidePopup() {
-    this._activePopup && (this._lastPopup && this._lastPopup.dispose(), this._lastPopup = null, this._activePopup = null, this._activePopup$.next(null));
+  _ensure(e, r) {
+    const t = this._ensureCommentMatrix(e, r), n = this._ensureCommentLocationMap(e, r);
+    return { matrix: t, locationMap: n };
   }
-  persistPopup() {
-    !this._activePopup || !this._activePopup.temp || (this._activePopup = {
-      ...this._activePopup,
-      temp: !1
-    }, this._activePopup$.next(this._activePopup));
-  }
-}, __name(_a, "SheetsThreadCommentPopupService"), _a);
-SheetsThreadCommentPopupService = __decorateClass$7([
-  __decorateParam$7(0, Inject(SheetCanvasPopManagerService)),
-  __decorateParam$7(1, IZenZoneService)
-], SheetsThreadCommentPopupService);
-const ShowAddSheetCommentModalOperation = {
-  type: CommandType.OPERATION,
-  id: "sheets.operation.show-comment-modal",
-  handler(accessor) {
-    var _a9;
-    const selectionManagerService = accessor.get(SheetsSelectionsService), univerInstanceService = accessor.get(IUniverInstanceService), sheetsThreadCommentPopupService = accessor.get(SheetsThreadCommentPopupService), threadCommentPanelService = accessor.get(ThreadCommentPanelService), activeCell = (_a9 = selectionManagerService.getCurrentLastSelection()) == null ? void 0 : _a9.primary, model = accessor.get(SheetsThreadCommentModel);
-    if (!activeCell)
-      return !1;
-    const result = getSheetCommandTarget(univerInstanceService);
-    if (!result)
-      return !1;
-    const { workbook, worksheet, unitId, subUnitId } = result, location = {
-      workbook,
-      worksheet,
-      unitId,
-      subUnitId,
-      row: activeCell.startRow,
-      col: activeCell.startColumn
-    };
-    sheetsThreadCommentPopupService.showPopup(location);
-    const rootId = model.getByLocation(unitId, subUnitId, activeCell.startRow, activeCell.startColumn);
-    return rootId && threadCommentPanelService.setActiveComment({
-      unitId,
-      subUnitId,
-      commentId: rootId,
-      trigger: "context-menu"
-    }), !0;
+  _initData() {
+    const e = this._threadCommentModel.getAll();
+    for (const r of e)
+      for (const t of r.threads) {
+        const { unitId: n, subUnitId: s, root: o } = t;
+        this._addComment(n, s, o);
+      }
   }
-}, PLUGIN_CONFIG_KEY = "sheets-thread-comment.config", defaultPluginConfig = {};
-var __defProp$6 = Object.defineProperty, __getOwnPropDesc$6 = Object.getOwnPropertyDescriptor, __decorateClass$6 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$6(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
-  return kind && result && __defProp$6(target, key, result), result;
-}, "__decorateClass$6"), __decorateParam$6 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$6"), _a2;
-let SheetsThreadCommentRenderController = (_a2 = class extends Disposable {
-  constructor(_sheetInterceptorService, _sheetsThreadCommentModel, _univerInstanceService, _renderManagerService) {
-    super(), this._sheetInterceptorService = _sheetInterceptorService, this._sheetsThreadCommentModel = _sheetsThreadCommentModel, this._univerInstanceService = _univerInstanceService, this._renderManagerService = _renderManagerService, this._initViewModelIntercept(), this._initSkeletonChange();
+  _addComment(e, r, t) {
+    const n = p(t.ref), s = t.parentId, { row: o, column: a } = n, c = t.id, { matrix: m, locationMap: d } = this._ensure(e, r);
+    !s && o >= 0 && a >= 0 && (this._addCommentToMatrix(m, o, a, c), d.set(c, { row: o, column: a })), s || this._commentUpdate$.next({
+      unitId: e,
+      subUnitId: r,
+      payload: t,
+      type: "add",
+      isRoot: !s,
+      ...n
+    });
   }
-  _initViewModelIntercept() {
-    this.disposeWithMe(
-      this._sheetInterceptorService.intercept(
-        INTERCEPTOR_POINT.CELL_CONTENT,
-        {
-          effect: InterceptorEffectEnum.Style,
-          handler: /* @__PURE__ */ __name((cell, pos, next) => {
-            const { row, col, unitId, subUnitId } = pos;
-            return this._sheetsThreadCommentModel.showCommentMarker(unitId, subUnitId, row, col) ? next({
-              ...cell,
-              markers: {
-                ...cell == null ? void 0 : cell.markers,
-                tr: {
-                  color: "#FFBD37",
-                  size: 6
-                }
-              }
-            }) : next(cell);
-          }, "handler"),
-          priority: 100
+  // eslint-disable-next-line max-lines-per-function
+  _initUpdateTransform() {
+    this.disposeWithMe(this._threadCommentModel.commentUpdate$.subscribe((e) => {
+      const { unitId: r, subUnitId: t } = e;
+      try {
+        if (this._univerInstanceService.getUnitType(r) !== y.UNIVER_SHEET)
+          return;
+      } catch {
+      }
+      const { matrix: n, locationMap: s } = this._ensure(r, t);
+      switch (e.type) {
+        case "add": {
+          this._addComment(e.unitId, e.subUnitId, e.payload);
+          break;
+        }
+        case "delete": {
+          const { isRoot: o, comment: a } = e.payload;
+          if (o) {
+            const c = p(a.ref), { row: m, column: d } = c;
+            this._deleteCommentFromMatrix(n, m, d, a.id), this._commentUpdate$.next({
+              ...e,
+              ...c
+            });
+          }
+          break;
+        }
+        case "update": {
+          const { commentId: o } = e.payload, a = this._threadCommentModel.getComment(r, t, o);
+          if (!a)
+            return;
+          const c = p(a.ref);
+          this._commentUpdate$.next({
+            ...e,
+            ...c
+          });
+          break;
+        }
+        case "updateRef": {
+          const o = p(e.payload.ref), { commentId: a } = e.payload, c = s.get(a);
+          if (!c)
+            return;
+          const { row: m, column: d } = c;
+          this._deleteCommentFromMatrix(n, m, d, a), s.delete(a), o.row >= 0 && o.column >= 0 && (this._addCommentToMatrix(n, o.row, o.column, a), s.set(a, { row: o.row, column: o.column })), this._commentUpdate$.next({
+            ...e,
+            ...o
+          });
+          break;
+        }
+        case "resolve": {
+          const { unitId: o, subUnitId: a, payload: c } = e, { locationMap: m } = this._ensure(o, a), d = m.get(c.commentId);
+          d && this._commentUpdate$.next({
+            ...e,
+            ...d
+          });
+          break;
         }
-      )
-    );
-  }
-  _initSkeletonChange() {
-    const markSkeletonDirty = /* @__PURE__ */ __name(() => {
-      var _a9;
-      const workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
-      if (!workbook) return;
-      const unitId = workbook.getUnitId(), currentRender = this._renderManagerService.getRenderById(unitId);
-      (_a9 = currentRender == null ? void 0 : currentRender.mainComponent) == null || _a9.makeForceDirty();
-    }, "markSkeletonDirty");
-    this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.pipe(debounceTime(16)).subscribe(() => {
-      markSkeletonDirty();
-    }));
-  }
-}, __name(_a2, "SheetsThreadCommentRenderController"), _a2);
-SheetsThreadCommentRenderController = __decorateClass$6([
-  __decorateParam$6(0, Inject(SheetInterceptorService)),
-  __decorateParam$6(1, Inject(SheetsThreadCommentModel)),
-  __decorateParam$6(2, IUniverInstanceService),
-  __decorateParam$6(3, IRenderManagerService)
-], SheetsThreadCommentRenderController);
-var __assign = function() {
-  return __assign = Object.assign || function(t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-      for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && (t[p] = s[p]);
-    }
-    return t;
-  }, __assign.apply(this, arguments);
-}, __rest = function(s, e) {
-  var t = {};
-  for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0 && (t[p] = s[p]);
-  if (s != null && typeof Object.getOwnPropertySymbols == "function")
-    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-      e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]) && (t[p[i]] = s[p[i]]);
-  return t;
-}, IconBase = forwardRef(function(props, ref) {
-  var icon = props.icon, id = props.id, className = props.className, extend = props.extend, restProps = __rest(props, ["icon", "id", "className", "extend"]), cls = "univerjs-icon univerjs-icon-".concat(id, " ").concat(className || "").trim(), idSuffix = useRef("_".concat(generateShortUuid()));
-  return render(icon, "".concat(id), { defIds: icon.defIds, idSuffix: idSuffix.current }, __assign({ ref, className: cls }, restProps), extend);
-});
-function render(node, id, runtimeProps, rootProps, extend) {
-  return createElement(node.tag, __assign(__assign({ key: id }, replaceRuntimeIdsAndExtInAttrs(node, runtimeProps, extend)), rootProps), (replaceRuntimeIdsInDefs(node, runtimeProps).children || []).map(function(child, index) {
-    return render(child, "".concat(id, "-").concat(node.tag, "-").concat(index), runtimeProps, void 0, extend);
-  }));
-}
-__name(render, "render");
-function replaceRuntimeIdsAndExtInAttrs(node, runtimeProps, extend) {
-  var attrs = __assign({}, node.attrs);
-  extend != null && extend.colorChannel1 && attrs.fill === "colorChannel1" && (attrs.fill = extend.colorChannel1);
-  var defIds = runtimeProps.defIds;
-  return !defIds || defIds.length === 0 || (node.tag === "use" && attrs["xlink:href"] && (attrs["xlink:href"] = attrs["xlink:href"] + runtimeProps.idSuffix), Object.entries(attrs).forEach(function(_a9) {
-    var key = _a9[0], value = _a9[1];
-    typeof value == "string" && (attrs[key] = value.replace(/url\(#(.*)\)/, "url(#$1".concat(runtimeProps.idSuffix, ")")));
-  })), attrs;
-}
-__name(replaceRuntimeIdsAndExtInAttrs, "replaceRuntimeIdsAndExtInAttrs");
-function replaceRuntimeIdsInDefs(node, runtimeProps) {
-  var _a9, defIds = runtimeProps.defIds;
-  return !defIds || defIds.length === 0 ? node : node.tag === "defs" && (!((_a9 = node.children) === null || _a9 === void 0) && _a9.length) ? __assign(__assign({}, node), { children: node.children.map(function(child) {
-    return typeof child.attrs.id == "string" && defIds && defIds.indexOf(child.attrs.id) > -1 ? __assign(__assign({}, child), { attrs: __assign(__assign({}, child.attrs), { id: child.attrs.id + runtimeProps.idSuffix }) }) : child;
-  }) }) : node;
-}
-__name(replaceRuntimeIdsInDefs, "replaceRuntimeIdsInDefs");
-function generateShortUuid() {
-  return Math.random().toString(36).substring(2, 8);
-}
-__name(generateShortUuid, "generateShortUuid");
-IconBase.displayName = "UniverIcon";
-var element = { 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" } }] }, CommentSingle = forwardRef(function(props, ref) {
-  return createElement(IconBase, Object.assign({}, props, {
-    id: "comment-single",
-    ref,
-    icon: element
-  }));
-});
-CommentSingle.displayName = "CommentSingle";
-const SheetsThreadCommentCell = /* @__PURE__ */ __name(() => {
-  const univerInstanceService = useDependency(IUniverInstanceService), sheetsThreadCommentPopupService = useDependency(SheetsThreadCommentPopupService), activePopup = useObservable(sheetsThreadCommentPopupService.activePopup$), sheetThreadCommentModel = useDependency(SheetsThreadCommentModel);
-  if (useObservable(sheetThreadCommentModel.commentUpdate$), !activePopup)
-    return null;
-  const { row, col, unitId, subUnitId, trigger } = activePopup, rootId = sheetThreadCommentModel.getByLocation(unitId, subUnitId, row, col), ref = `${Tools.chatAtABC(col)}${row + 1}`, onClose = /* @__PURE__ */ __name(() => {
-    sheetsThreadCommentPopupService.hidePopup();
-  }, "onClose"), getSubUnitName = /* @__PURE__ */ __name((id) => {
-    var _a9, _b, _c;
-    return (_c = (_b = (_a9 = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET)) == null ? void 0 : _a9.getSheetBySheetId(id)) == null ? void 0 : _b.getName()) != null ? _c : "";
-  }, "getSubUnitName");
-  return /* @__PURE__ */ React.createElement(
-    ThreadCommentTree,
-    {
-      onClick: /* @__PURE__ */ __name(() => {
-        sheetsThreadCommentPopupService.persistPopup();
-      }, "onClick"),
-      prefix: "cell",
-      id: rootId,
-      unitId,
-      subUnitId,
-      type: UniverInstanceType.UNIVER_SHEET,
-      refStr: ref,
-      onClose,
-      getSubUnitName,
-      autoFocus: trigger === "context-menu"
-    }
-  );
-}, "SheetsThreadCommentCell"), SheetsThreadCommentPanel = /* @__PURE__ */ __name(() => {
-  var _a9;
-  const markSelectionService = useDependency(IMarkSelectionService), univerInstanceService = useDependency(IUniverInstanceService), sheetsThreadCommentPopupService = useDependency(SheetsThreadCommentPopupService), workbook = univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET), unitId = workbook.getUnitId(), commandService = useDependency(ICommandService), subUnitId$ = useMemo(() => workbook.activeSheet$.pipe(map((i) => i == null ? void 0 : i.getSheetId())), [workbook.activeSheet$]), subUnitId = useObservable(subUnitId$, (_a9 = workbook.getActiveSheet()) == null ? void 0 : _a9.getSheetId()), hoverShapeId = useRef(), panelService = useDependency(ThreadCommentPanelService), activeCommentId = useObservable(panelService.activeCommentId$), panelVisible = useObservable(panelService.panelVisible$, panelService.panelVisible), sortComments = useCallback((comments) => {
-    const worksheets = workbook.getSheets(), sheetIndex = {};
-    worksheets.forEach((sheet, i) => {
-      sheetIndex[sheet.getSheetId()] = i;
-    });
-    const sort = /* @__PURE__ */ __name((comments2) => comments2.map((comment) => {
-      var _a10;
-      const ref = singleReferenceToGrid(comment.ref), p = [(_a10 = sheetIndex[comment.subUnitId]) != null ? _a10 : 0, ref.row, ref.column];
-      return { ...comment, p };
-    }).sort((pre, aft) => pre.p[0] === aft.p[0] ? pre.p[1] === aft.p[1] ? pre.p[2] - aft.p[2] : pre.p[1] - aft.p[1] : pre.p[0] - aft.p[0]), "sort");
-    return [
-      ...sort(comments.filter((comment) => !comment.resolved)),
-      ...sort(comments.filter((comment) => comment.resolved))
-    ];
-  }, [workbook]), showShape = useCallback((comment) => {
-    var _a10;
-    if (comment.unitId === unitId && comment.subUnitId === subUnitId && !comment.resolved) {
-      const { row, column } = singleReferenceToGrid(comment.ref), worksheet = workbook.getSheetBySheetId(comment.subUnitId), mergeInfo = (_a10 = worksheet == null ? void 0 : worksheet.getMergedCell(row, column)) != null ? _a10 : {
-        startColumn: column,
-        endColumn: column,
-        startRow: row,
-        endRow: row
-      };
-      if (!Number.isNaN(row) && !Number.isNaN(column))
-        return markSelectionService.addShape({
-          range: mergeInfo,
-          style: {
-            hasAutoFill: !1,
-            fill: "rgb(255, 189, 55, 0.35)",
-            strokeWidth: 1,
-            stroke: "#FFBD37",
-            widgets: {}
-          },
-          primary: null
-        });
-    }
-  }, [markSelectionService, subUnitId, unitId]), getSubUnitName = /* @__PURE__ */ __name((id) => {
-    var _a10, _b;
-    return (_b = (_a10 = workbook.getSheetBySheetId(id)) == null ? void 0 : _a10.getName()) != null ? _b : "";
-  }, "getSubUnitName"), handleAdd = /* @__PURE__ */ __name(() => {
-    commandService.executeCommand(ShowAddSheetCommentModalOperation.id);
-  }, "handleAdd"), handleHover = /* @__PURE__ */ __name((comment) => {
-    activeCommentId && activeCommentId.unitId === comment.unitId && activeCommentId.subUnitId === comment.subUnitId && activeCommentId.commentId === comment.id || (hoverShapeId.current && (markSelectionService.removeShape(hoverShapeId.current), hoverShapeId.current = null), hoverShapeId.current = showShape(comment));
-  }, "handleHover"), handleLeave = /* @__PURE__ */ __name(() => {
-    hoverShapeId.current && (markSelectionService.removeShape(hoverShapeId.current), hoverShapeId.current = null);
-  }, "handleLeave"), handleResolve = /* @__PURE__ */ __name((id, resolved) => {
-    resolved && sheetsThreadCommentPopupService.hidePopup();
-  }, "handleResolve");
-  return useEffect(() => {
-    !panelVisible && hoverShapeId.current && markSelectionService.removeShape(hoverShapeId.current);
-  }, [markSelectionService, panelVisible]), /* @__PURE__ */ React.createElement(
-    ThreadCommentPanel,
-    {
-      unitId,
-      subUnitId$,
-      type: UniverInstanceType.UNIVER_SHEET,
-      onAdd: handleAdd,
-      getSubUnitName,
-      onResolve: handleResolve,
-      sortComments,
-      onItemEnter: handleHover,
-      onItemLeave: handleLeave,
-      onDeleteComment: /* @__PURE__ */ __name(() => (handleLeave(), !0), "onDeleteComment")
-    }
-  );
-}, "SheetsThreadCommentPanel"), threadCommentMenuFactory = /* @__PURE__ */ __name((accessor) => ({
-  id: ShowAddSheetCommentModalOperation.id,
-  type: MenuItemType.BUTTON,
-  icon: COMMENT_SINGLE_ICON,
-  title: "sheetThreadComment.menu.addComment",
-  hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
-  disabled$: getCurrentRangeDisable$(accessor, {
-    workbookTypes: [WorkbookCommentPermission],
-    worksheetTypes: [WorksheetViewPermission],
-    rangeTypes: [RangeProtectionPermissionViewPoint]
-  })
-}), "threadCommentMenuFactory"), threadPanelMenuFactory = /* @__PURE__ */ __name((accessor) => ({
-  id: ToggleSheetCommentPanelOperation.id,
-  type: MenuItemType.BUTTON,
-  icon: COMMENT_SINGLE_ICON,
-  tooltip: "sheetThreadComment.menu.commentManagement",
-  disabled$: getCurrentRangeDisable$(accessor, {
-    workbookTypes: [WorkbookCommentPermission],
-    worksheetTypes: [WorksheetViewPermission],
-    rangeTypes: [RangeProtectionPermissionViewPoint]
-  }),
-  hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET)
-}), "threadPanelMenuFactory"), AddCommentShortcut = {
-  id: ShowAddSheetCommentModalOperation.id,
-  binding: KeyCode.M | MetaKeys.CTRL_COMMAND | MetaKeys.ALT,
-  preconditions: whenSheetEditorFocused
-}, menuSchema = {
-  [RibbonStartGroup.OTHERS]: {
-    [ToggleSheetCommentPanelOperation.id]: {
-      order: 1,
-      menuItemFactory: threadPanelMenuFactory
-    }
-  },
-  [ContextMenuPosition.MAIN_AREA]: {
-    [ContextMenuGroup.OTHERS]: {
-      [ShowAddSheetCommentModalOperation.id]: {
-        order: 0,
-        menuItemFactory: threadCommentMenuFactory
       }
-    }
-  }
-};
-var __defProp$5 = Object.defineProperty, __getOwnPropDesc$5 = Object.getOwnPropertyDescriptor, __decorateClass$5 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$5(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
-  return kind && result && __defProp$5(target, key, result), result;
-}, "__decorateClass$5"), __decorateParam$5 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$5"), _a3;
-let SheetsThreadCommentController = (_a3 = class extends Disposable {
-  constructor(_menuManagerService, _componentManager, _shortcutService) {
-    super(), this._menuManagerService = _menuManagerService, this._componentManager = _componentManager, this._shortcutService = _shortcutService, this._initMenu(), this._initShortcut(), this._initComponent();
+    }));
   }
-  _initShortcut() {
-    this._shortcutService.registerShortcut(AddCommentShortcut);
+  getByLocation(e, r, t, n) {
+    var a;
+    return (a = this.getAllByLocation(e, r, t, n).filter((c) => !c.resolved)[0]) == null ? void 0 : a.id;
   }
-  _initMenu() {
-    this._menuManagerService.mergeMenu(menuSchema);
+  getAllByLocation(e, r, t, n) {
+    const o = this._ensureCommentMatrix(e, r).getValue(t, n);
+    return o ? Array.from(o).map((a) => this.getComment(e, r, a)).filter(Boolean) : [];
   }
-  _initComponent() {
-    [
-      [SHEETS_THREAD_COMMENT_MODAL, SheetsThreadCommentCell],
-      [THREAD_COMMENT_PANEL, SheetsThreadCommentPanel],
-      [COMMENT_SINGLE_ICON, CommentSingle]
-    ].forEach(([key, comp]) => {
-      this._componentManager.register(key, comp);
-    });
+  getComment(e, r, t) {
+    return this._threadCommentModel.getComment(e, r, t);
   }
-}, __name(_a3, "SheetsThreadCommentController"), _a3);
-SheetsThreadCommentController = __decorateClass$5([
-  __decorateParam$5(0, IMenuManagerService),
-  __decorateParam$5(1, Inject(ComponentManager)),
-  __decorateParam$5(2, IShortcutService)
-], SheetsThreadCommentController);
-var __defProp$4 = Object.defineProperty, __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor, __decorateClass$4 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$4(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
-  return kind && result && __defProp$4(target, key, result), result;
-}, "__decorateClass$4"), __decorateParam$4 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$4");
-const transformRef = /* @__PURE__ */ __name((ref, source, target) => {
-  const refObj = singleReferenceToGrid(ref), offsetRow = target.row - source.row, offsetCol = target.column - source.column, targetRange = {
-    startColumn: refObj.column + offsetCol,
-    startRow: refObj.row + offsetRow,
-    endColumn: refObj.column + offsetCol,
-    endRow: refObj.row + offsetRow
-  };
-  return serializeRange(targetRange);
-}, "transformRef");
-var _a4;
-let SheetsThreadCommentCopyPasteController = (_a4 = class extends Disposable {
-  constructor(_sheetClipboardService, _sheetsThreadCommentModel, _threadCommentDataSourceService) {
-    super();
-    __publicField(this, "_copyInfo");
-    this._sheetClipboardService = _sheetClipboardService, this._sheetsThreadCommentModel = _sheetsThreadCommentModel, this._threadCommentDataSourceService = _threadCommentDataSourceService, this._initClipboardHook();
+  getCommentWithChildren(e, r, t, n) {
+    const s = this.getByLocation(e, r, t, n);
+    if (!s)
+      return;
+    const o = this.getComment(e, r, s);
+    if (o)
+      return this._threadCommentModel.getThread(e, r, o.threadId);
   }
-  // eslint-disable-next-line max-lines-per-function
-  _initClipboardHook() {
-    this.disposeWithMe(
-      this._sheetClipboardService.addClipboardHook({
-        id: SHEETS_THREAD_COMMENT,
-        onBeforeCopy: /* @__PURE__ */ __name((unitId, subUnitId, range) => {
-          this._copyInfo = {
-            unitId,
-            subUnitId,
-            range
-          };
-        }, "onBeforeCopy"),
-        // eslint-disable-next-line max-lines-per-function
-        onPasteCells: /* @__PURE__ */ __name((_pasteFrom, pasteTo, _data, payload) => {
-          const { unitId: targetUnitId, subUnitId: targetSubUnitId, range } = pasteTo, targetPos = {
-            row: range.rows[0],
-            column: range.cols[0]
-          };
-          if (payload.copyType === COPY_TYPE.CUT && this._copyInfo) {
-            const { range: range2, unitId: sourceUnitId, subUnitId: sourceSubUnitId } = this._copyInfo, sourcePos = {
-              row: range2.startRow,
-              column: range2.startColumn
-            };
-            if (!(targetUnitId === sourceUnitId && targetSubUnitId === sourceSubUnitId)) {
-              const roots = [];
-              Range.foreach(range2, (row, col) => {
-                const comments = this._sheetsThreadCommentModel.getAllByLocation(sourceUnitId, sourceSubUnitId, row, col);
-                this._threadCommentDataSourceService.syncUpdateMutationToColla ? comments.forEach((comment) => {
-                  roots.push(comment);
-                }) : comments.forEach(({ children, ...comment }) => {
-                  comment.parentId || roots.push(comment);
-                });
-              });
-              const sourceRedos = [], sourceUndos = [], targetRedos = [], targetUndos = [], handleCommentItem = /* @__PURE__ */ __name((item) => {
-                sourceRedos.unshift({
-                  id: DeleteCommentMutation.id,
-                  params: {
-                    unitId: sourceUnitId,
-                    subUnitId: sourceSubUnitId,
-                    commentId: item.id
-                  }
-                }), targetRedos.push({
-                  id: AddCommentMutation.id,
-                  params: {
-                    unitId: targetUnitId,
-                    subUnitId: targetSubUnitId,
-                    comment: {
-                      ...item,
-                      ref: transformRef(item.ref, sourcePos, targetPos),
-                      unitId: targetUnitId,
-                      subUnitId: targetSubUnitId
-                    },
-                    sync: !0
-                  }
-                }), sourceUndos.push({
-                  id: AddCommentMutation.id,
-                  params: {
-                    unitId: sourceUnitId,
-                    subUnitId: sourceSubUnitId,
-                    comment: item,
-                    sync: !0
-                  }
-                }), targetUndos.unshift({
-                  id: DeleteCommentMutation.id,
-                  params: {
-                    unitId: targetUnitId,
-                    subUnitId: targetSubUnitId,
-                    commentId: item.id
-                  }
-                });
-              }, "handleCommentItem");
-              return roots.forEach((root) => {
-                handleCommentItem(root);
-              }), {
-                redos: [...sourceRedos, ...targetRedos],
-                undos: [...targetUndos, ...sourceUndos]
-              };
-            }
-          }
-          return {
-            redos: [],
-            undos: []
-          };
-        }, "onPasteCells")
-      })
-    );
+  showCommentMarker(e, r, t, n) {
+    const s = this.getByLocation(e, r, t, n);
+    if (!s)
+      return !1;
+    const o = this.getComment(e, r, s);
+    return !!(o && !o.resolved);
   }
-}, __name(_a4, "SheetsThreadCommentCopyPasteController"), _a4);
-SheetsThreadCommentCopyPasteController = __decorateClass$4([
-  __decorateParam$4(0, Inject(ISheetClipboardService)),
-  __decorateParam$4(1, Inject(SheetsThreadCommentModel)),
-  __decorateParam$4(2, IThreadCommentDataSourceService)
-], SheetsThreadCommentCopyPasteController);
-var __defProp$3 = Object.defineProperty, __getOwnPropDesc$3 = Object.getOwnPropertyDescriptor, __decorateClass$3 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$3(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
-  return kind && result && __defProp$3(target, key, result), result;
-}, "__decorateClass$3"), __decorateParam$3 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$3"), _a5;
-let SheetsThreadCommentHoverController = (_a5 = class extends Disposable {
-  constructor(_hoverManagerService, _sheetsThreadCommentPopupService, _sheetsThreadCommentModel, _sheetPermissionInterceptorBaseController) {
-    super(), this._hoverManagerService = _hoverManagerService, this._sheetsThreadCommentPopupService = _sheetsThreadCommentPopupService, this._sheetsThreadCommentModel = _sheetsThreadCommentModel, this._sheetPermissionInterceptorBaseController = _sheetPermissionInterceptorBaseController, this._initHoverEvent();
+  getSubUnitAll(e, r) {
+    return this._threadCommentModel.getUnit(e).filter((t) => t.subUnitId === r).map((t) => t.root);
   }
-  _initHoverEvent() {
-    this.disposeWithMe(
-      this._hoverManagerService.currentCell$.pipe(debounceTime(100)).subscribe((cell) => {
-        const currentPopup = this._sheetsThreadCommentPopupService.activePopup;
-        if (cell && (currentPopup && currentPopup.temp || !currentPopup)) {
-          const { location } = cell, { unitId, subUnitId, row, col } = location, commentId = this._sheetsThreadCommentModel.getByLocation(unitId, subUnitId, row, col);
-          if (commentId) {
-            if (!this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
-              workbookTypes: [WorkbookCommentPermission],
-              worksheetTypes: [WorksheetViewPermission],
-              rangeTypes: [RangeProtectionPermissionViewPoint]
-            }, [{ startRow: row, startColumn: col, endRow: row, endColumn: col }]))
-              return;
-            const comment = this._sheetsThreadCommentModel.getComment(unitId, subUnitId, commentId);
-            comment && !comment.resolved && this._sheetsThreadCommentPopupService.showPopup({
-              unitId,
-              subUnitId,
-              row,
-              col,
-              commentId,
-              temp: !0
-            });
-          } else
-            currentPopup && this._sheetsThreadCommentPopupService.hidePopup();
-        }
-      })
-    );
-  }
-}, __name(_a5, "SheetsThreadCommentHoverController"), _a5);
-SheetsThreadCommentHoverController = __decorateClass$3([
-  __decorateParam$3(0, Inject(HoverManagerService)),
-  __decorateParam$3(1, Inject(SheetsThreadCommentPopupService)),
-  __decorateParam$3(2, Inject(SheetsThreadCommentModel)),
-  __decorateParam$3(3, Inject(SheetPermissionInterceptorBaseController))
-], SheetsThreadCommentHoverController);
-var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor, __decorateClass$2 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
-  return kind && result && __defProp$2(target, key, result), result;
-}, "__decorateClass$2"), __decorateParam$2 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$2"), _a6;
-let SheetsThreadCommentPopupController = (_a6 = class extends Disposable {
-  constructor(_commandService, _sheetsThreadCommentPopupService, _sheetsThreadCommentModel, _threadCommentPanelService, _univerInstanceService, _sheetPermissionInterceptorBaseController, _markSelectionService, _sheetSelectionService, _editorBridgeService, _renderManagerService) {
+};
+u = q([
+  w(0, l(S)),
+  w(1, E)
+], u);
+var J = Object.defineProperty, K = Object.getOwnPropertyDescriptor, Q = (i, e, r, t) => {
+  for (var n = t > 1 ? void 0 : t ? K(e, r) : e, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (n = (t ? o(e, r, n) : o(n)) || n);
+  return t && n && J(e, r, n), n;
+}, _ = (i, e) => (r, t) => e(r, t, i);
+let f = class extends R {
+  constructor(e, r, t, n, s) {
     super();
-    __publicField(this, "_isSwitchToCommenting", !1);
-    __publicField(this, "_selectionShapeInfo", null);
-    this._commandService = _commandService, this._sheetsThreadCommentPopupService = _sheetsThreadCommentPopupService, this._sheetsThreadCommentModel = _sheetsThreadCommentModel, this._threadCommentPanelService = _threadCommentPanelService, this._univerInstanceService = _univerInstanceService, this._sheetPermissionInterceptorBaseController = _sheetPermissionInterceptorBaseController, this._markSelectionService = _markSelectionService, this._sheetSelectionService = _sheetSelectionService, this._editorBridgeService = _editorBridgeService, this._renderManagerService = _renderManagerService, this._initCommandListener(), this._initPanelListener(), this._initMarkSelection(), this._initSelectionUpdateListener(), this._initEditorBridge();
-  }
-  _handleSelectionChange(selections, unitId, subUnitId) {
-    var _a9, _b, _c;
-    const range = (_a9 = selections[0]) == null ? void 0 : _a9.range, render2 = this._renderManagerService.getRenderById(unitId), skeleton = (_b = render2 == null ? void 0 : render2.with(SheetSkeletonManagerService).getWorksheetSkeleton(subUnitId)) == null ? void 0 : _b.skeleton;
-    if (!skeleton || !range)
-      return;
-    const actualCell = skeleton.getCellByIndex(range.startRow, range.startColumn);
-    if ((((_c = range.rangeType) != null ? _c : RANGE_TYPE.NORMAL) !== RANGE_TYPE.NORMAL || range.endColumn - range.startColumn > 0 || range.endRow - range.startRow > 0) && !((actualCell.isMerged || actualCell.isMergedMainCell) && Rectangle.equals(actualCell.mergeInfo, range))) {
-      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(SetActiveCommentOperation.id);
-      return;
-    }
-    const row = actualCell.actualRow, col = actualCell.actualColumn;
-    if (!this._sheetsThreadCommentModel.showCommentMarker(unitId, subUnitId, row, col)) {
-      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(SetActiveCommentOperation.id);
-      return;
-    }
-    const commentId = this._sheetsThreadCommentModel.getByLocation(unitId, subUnitId, row, col);
-    commentId && this._commandService.executeCommand(SetActiveCommentOperation.id, {
-      unitId,
-      subUnitId,
-      commentId
+    h(this, "_disposableMap", /* @__PURE__ */ new Map());
+    h(this, "_watcherMap", /* @__PURE__ */ new Map());
+    h(this, "_handleRangeChange", (e, r, t, n, s) => {
+      const o = t.id, a = {
+        startColumn: t.column,
+        endColumn: t.column,
+        startRow: t.row,
+        endRow: t.row
+      };
+      return n ? {
+        redos: [{
+          id: C.id,
+          params: {
+            unitId: e,
+            subUnitId: r,
+            payload: {
+              ref: M(n),
+              commentId: o
+            },
+            silent: s
+          }
+        }],
+        undos: [{
+          id: C.id,
+          params: {
+            unitId: e,
+            subUnitId: r,
+            payload: {
+              ref: M(a),
+              commentId: o
+            },
+            silent: s
+          }
+        }]
+      } : {
+        redos: [{
+          id: N.id,
+          params: {
+            unitId: e,
+            subUnitId: r,
+            commentId: o
+          }
+        }],
+        undos: [{
+          id: V.id,
+          params: {
+            unitId: e,
+            subUnitId: r,
+            comment: t,
+            sync: !0
+          }
+        }]
+      };
     });
+    this._refRangeService = e, this._sheetsThreadCommentModel = r, this._threadCommentModel = t, this._selectionManagerService = n, this._commandService = s, this._initData(), this._initRefRange();
   }
-  _initSelectionUpdateListener() {
-    this.disposeWithMe(
-      this._sheetSelectionService.selectionMoveEnd$.subscribe((selections) => {
-        if (this._isSwitchToCommenting)
-          return;
-        const current = this._sheetSelectionService.currentSelectionParam;
-        current && this._handleSelectionChange(selections, current.unitId, current.sheetId);
-      })
-    );
+  _getIdWithUnitId(e, r, t) {
+    return `${e}-${r}-${t}`;
   }
-  _initEditorBridge() {
-    this.disposeWithMe(
-      this._editorBridgeService.visible$.subscribe((visible) => {
-        visible.visible && this._sheetsThreadCommentPopupService.hidePopup();
-      })
+  _register(e, r, t) {
+    const n = t.id, s = {
+      startColumn: t.column,
+      endColumn: t.column,
+      startRow: t.row,
+      endRow: t.row
+    };
+    this._disposableMap.set(
+      this._getIdWithUnitId(e, r, n),
+      this._refRangeService.registerRefRange(s, (o) => {
+        const a = B(s, o, { selectionManagerService: this._selectionManagerService }), c = Array.isArray(a) ? a[0] : a;
+        return c && c.startColumn === s.startColumn && c.startRow === s.startRow ? {
+          undos: [],
+          redos: []
+        } : this._handleRangeChange(e, r, t, c, !1);
+      }, e, r)
     );
   }
-  _initCommandListener() {
-    this._commandService.onCommandExecuted((commandInfo) => {
-      if (commandInfo.id === DeleteCommentMutation.id) {
-        const params = commandInfo.params, active = this._sheetsThreadCommentPopupService.activePopup;
-        if (!active)
-          return;
-        const { unitId, subUnitId, commentId } = active;
-        params.unitId === unitId && params.subUnitId === subUnitId && params.commentId === commentId && this._sheetsThreadCommentPopupService.hidePopup();
-      }
-    });
-  }
-  _initPanelListener() {
-    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe(async (commentInfo) => {
-      var _a9;
-      if (commentInfo) {
-        const { unitId, subUnitId, commentId, trigger } = commentInfo, comment = this._sheetsThreadCommentModel.getComment(unitId, subUnitId, commentId);
-        if (!comment || comment.resolved)
-          return;
-        const currentUnit = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
-        if (!currentUnit || currentUnit.getUnitId() !== unitId)
-          return;
-        this._isSwitchToCommenting = !0, ((_a9 = currentUnit.getActiveSheet()) == null ? void 0 : _a9.getSheetId()) !== subUnitId && await this._commandService.executeCommand(SetWorksheetActiveOperation.id, {
-          unitId,
-          subUnitId
-        }), this._isSwitchToCommenting = !1;
-        const location = singleReferenceToGrid(comment.ref), { row, column: col } = location;
-        if (!this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
-          workbookTypes: [WorkbookCommentPermission],
-          worksheetTypes: [WorksheetViewPermission],
-          rangeTypes: [RangeProtectionPermissionViewPoint]
-        }, [{ startRow: row, startColumn: col, endRow: row, endColumn: col }]))
-          return;
-        const GAP = 1;
-        if (await this._commandService.executeCommand(ScrollToRangeOperation.id, {
-          range: {
-            startRow: Math.max(location.row - GAP, 0),
-            endRow: location.row + GAP,
-            startColumn: Math.max(location.column - GAP, 0),
-            endColumn: location.column + GAP
-          }
-        }), this._editorBridgeService.isVisible().visible)
-          return;
-        this._sheetsThreadCommentPopupService.showPopup({
-          unitId,
-          subUnitId,
-          row: location.row,
-          col: location.column,
-          commentId: comment.id,
-          trigger
-        });
-      } else
-        this._sheetsThreadCommentPopupService.hidePopup();
-    }));
+  _watch(e, r, t) {
+    const n = t.id, s = {
+      startColumn: t.column,
+      endColumn: t.column,
+      startRow: t.row,
+      endRow: t.row
+    };
+    this._watcherMap.set(
+      this._getIdWithUnitId(e, r, n),
+      this._refRangeService.watchRange(e, r, s, (o, a) => {
+        const { redos: c } = this._handleRangeChange(e, r, t, a, !0);
+        P(c, this._commandService, { onlyLocal: !0 });
+      }, !0)
+    );
   }
-  _initMarkSelection() {
-    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.pipe(debounceTime(100)).subscribe((activeComment) => {
-      var _a9, _b;
-      if (!activeComment) {
-        this._selectionShapeInfo && (this._markSelectionService.removeShape(this._selectionShapeInfo.shapeId), this._selectionShapeInfo = null);
-        return;
+  _unwatch(e, r, t) {
+    var s;
+    const n = this._getIdWithUnitId(e, r, t);
+    (s = this._watcherMap.get(n)) == null || s.dispose(), this._watcherMap.delete(n);
+  }
+  _unregister(e, r, t) {
+    var s;
+    const n = this._getIdWithUnitId(e, r, t);
+    (s = this._disposableMap.get(n)) == null || s.dispose(), this._disposableMap.delete(n);
+  }
+  _initData() {
+    const e = this._threadCommentModel.getAll();
+    for (const r of e)
+      for (const t of r.threads) {
+        const { unitId: n, subUnitId: s, root: o } = t, a = p(o.ref), c = {
+          ...o,
+          ...a
+        };
+        this._register(n, s, c), this._watch(n, s, c);
       }
-      const { unitId, subUnitId, commentId } = activeComment;
-      this._selectionShapeInfo && (this._markSelectionService.removeShape(this._selectionShapeInfo.shapeId), this._selectionShapeInfo = null);
-      const comment = this._sheetsThreadCommentModel.getComment(unitId, subUnitId, commentId);
-      if (!comment)
-        return;
-      const location = singleReferenceToGrid(comment.ref), { row, column } = location;
-      if (Number.isNaN(row) || Number.isNaN(column))
-        return null;
-      const worksheet = (_a9 = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET)) == null ? void 0 : _a9.getSheetBySheetId(subUnitId), mergeInfo = (_b = worksheet == null ? void 0 : worksheet.getMergedCell(row, column)) != null ? _b : {
-        startColumn: column,
-        endColumn: column,
-        startRow: row,
-        endRow: row
-      }, shapeId = this._markSelectionService.addShape(
-        {
-          range: mergeInfo,
-          style: {
-            hasAutoFill: !1,
-            fill: "rgb(255, 189, 55, 0.35)",
-            strokeWidth: 1,
-            stroke: "#FFBD37",
-            widgets: {}
-          },
-          primary: null
-        },
-        [],
-        -1
-      );
-      shapeId && (this._selectionShapeInfo = {
-        ...activeComment,
-        shapeId
-      });
-    }));
-  }
-}, __name(_a6, "SheetsThreadCommentPopupController"), _a6);
-SheetsThreadCommentPopupController = __decorateClass$2([
-  __decorateParam$2(0, ICommandService),
-  __decorateParam$2(1, Inject(SheetsThreadCommentPopupService)),
-  __decorateParam$2(2, Inject(SheetsThreadCommentModel)),
-  __decorateParam$2(3, Inject(ThreadCommentPanelService)),
-  __decorateParam$2(4, IUniverInstanceService),
-  __decorateParam$2(5, Inject(SheetPermissionInterceptorBaseController)),
-  __decorateParam$2(6, IMarkSelectionService),
-  __decorateParam$2(7, Inject(SheetsSelectionsService)),
-  __decorateParam$2(8, IEditorBridgeService),
-  __decorateParam$2(9, IRenderManagerService)
-], SheetsThreadCommentPopupController);
-var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor, __decorateClass$1 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
-  return kind && result && __defProp$1(target, key, result), result;
-}, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$1"), _a7;
-let ThreadCommentRemoveSheetsController = (_a7 = class extends Disposable {
-  constructor(_sheetInterceptorService, _univerInstanceService, _threadCommentModel, _threadCommentDataSourceService) {
-    super(), this._sheetInterceptorService = _sheetInterceptorService, this._univerInstanceService = _univerInstanceService, this._threadCommentModel = _threadCommentModel, this._threadCommentDataSourceService = _threadCommentDataSourceService, this._initSheetChange();
   }
-  _initSheetChange() {
+  _initRefRange() {
     this.disposeWithMe(
-      this._sheetInterceptorService.interceptCommand({
-        getMutations: /* @__PURE__ */ __name((commandInfo) => {
-          var _a9;
-          if (commandInfo.id === RemoveSheetCommand.id) {
-            const params = commandInfo.params, workbook = params.unitId ? this._univerInstanceService.getUnit(params.unitId) : this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET);
-            if (!workbook)
-              return { redos: [], undos: [] };
-            const unitId = workbook.getUnitId(), subUnitId = params.subUnitId || ((_a9 = workbook.getActiveSheet()) == null ? void 0 : _a9.getSheetId());
-            if (!subUnitId)
-              return { redos: [], undos: [] };
-            const commentMap = this._threadCommentModel.ensureMap(unitId, subUnitId), comments = Array.from(commentMap.values()).filter((comment) => !comment.parentId), ids = comments.map((comment) => comment.id), shouldSync = this._threadCommentDataSourceService.syncUpdateMutationToColla, redos = ids.map((id) => ({
-              id: DeleteCommentMutation.id,
-              params: {
-                unitId,
-                subUnitId,
-                commentId: id
-              }
-            })), undos = comments.map(({ children, ...comment }) => ({
-              id: AddCommentMutation.id,
-              params: {
-                unitId,
-                subUnitId,
-                comment: {
-                  ...comment,
-                  children: shouldSync ? children : void 0
-                },
-                sync: !shouldSync
-              }
-            }));
-            return { redos, undos };
+      this._sheetsThreadCommentModel.commentUpdate$.subscribe((e) => {
+        const { unitId: r, subUnitId: t } = e;
+        switch (e.type) {
+          case "add": {
+            if (e.payload.parentId)
+              return;
+            const n = {
+              ...e.payload,
+              row: e.row,
+              column: e.column
+            };
+            this._register(e.unitId, e.subUnitId, n), this._watch(e.unitId, e.subUnitId, n);
+            break;
+          }
+          case "delete": {
+            this._unregister(r, t, e.payload.commentId), this._unwatch(r, t, e.payload.commentId);
+            break;
+          }
+          case "updateRef": {
+            const n = this._sheetsThreadCommentModel.getComment(r, t, e.payload.commentId);
+            if (!n)
+              return;
+            this._unregister(r, t, e.payload.commentId);
+            const s = {
+              ...n,
+              row: e.row,
+              column: e.column
+            };
+            e.silent || (this._unwatch(r, t, e.payload.commentId), this._watch(r, t, s)), this._register(e.unitId, e.subUnitId, s);
+            break;
           }
-          return { redos: [], undos: [] };
-        }, "getMutations")
+        }
       })
-    );
+    ), this.disposeWithMe(D(() => {
+      this._disposableMap.forEach((e) => {
+        e.dispose();
+      }), this._disposableMap.clear();
+    }));
   }
-}, __name(_a7, "ThreadCommentRemoveSheetsController"), _a7);
-ThreadCommentRemoveSheetsController = __decorateClass$1([
-  __decorateParam$1(0, Inject(SheetInterceptorService)),
-  __decorateParam$1(1, IUniverInstanceService),
-  __decorateParam$1(2, Inject(ThreadCommentModel)),
-  __decorateParam$1(3, IThreadCommentDataSourceService)
-], ThreadCommentRemoveSheetsController);
-var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __defNormalProp2 = /* @__PURE__ */ __name((obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, "__defNormalProp"), __decorateClass = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
-  return kind && result && __defProp2(target, key, result), result;
-}, "__decorateClass"), __decorateParam = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam"), __publicField2 = /* @__PURE__ */ __name((obj, key, value) => __defNormalProp2(obj, typeof key != "symbol" ? key + "" : key, value), "__publicField"), _a8;
-let UniverSheetsThreadCommentPlugin = (_a8 = class extends Plugin {
-  constructor(_config = defaultPluginConfig, _injector, _commandService, _configService) {
-    super(), this._config = _config, this._injector = _injector, this._commandService = _commandService, this._configService = _configService;
-    const { menu, ...rest } = this._config;
-    menu && this._configService.setConfig("menu", menu, { merge: !0 }), this._configService.setConfig(PLUGIN_CONFIG_KEY, rest);
+};
+f = Q([
+  _(0, l(W)),
+  _(1, l(u)),
+  _(2, l(S)),
+  _(3, l(L)),
+  _(4, b)
+], f);
+const X = "SHEET_THREAD_COMMENT_BASE_PLUGIN";
+var I = Object.defineProperty, Y = Object.getOwnPropertyDescriptor, Z = (i, e, r) => e in i ? I(i, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : i[e] = r, k = (i, e, r, t) => {
+  for (var n = t > 1 ? void 0 : t ? Y(e, r) : e, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (n = (t ? o(e, r, n) : o(n)) || n);
+  return t && n && I(e, r, n), n;
+}, v = (i, e) => (r, t) => e(r, t, i), U = (i, e, r) => Z(i, typeof e != "symbol" ? e + "" : e, r);
+let g = class extends j {
+  constructor(i, e, r) {
+    super(), this._injector = e, this._commandService = r;
   }
   onStarting() {
     [
-      [SheetsThreadCommentController],
-      [SheetsThreadCommentRenderController],
-      [SheetsThreadCommentCopyPasteController],
-      [SheetsThreadCommentHoverController],
-      [ThreadCommentRemoveSheetsController],
-      [SheetsThreadCommentPopupController],
-      [SheetsThreadCommentPopupService]
-    ].forEach((dep) => {
-      this._injector.add(dep);
-    }), [ShowAddSheetCommentModalOperation].forEach((command) => {
-      this._commandService.registerCommand(command);
-    }), this._injector.get(SheetsThreadCommentController);
+      [u],
+      [f]
+    ].forEach((i) => {
+      this._injector.add(i);
+    }), this._injector.get(f);
   }
-  onReady() {
-    this._injector.get(SheetsThreadCommentRenderController), this._injector.get(ThreadCommentRemoveSheetsController);
-  }
-  onRendered() {
-    this._injector.get(SheetsThreadCommentCopyPasteController), this._injector.get(SheetsThreadCommentHoverController), this._injector.get(SheetsThreadCommentPopupController);
-  }
-}, __name(_a8, "UniverSheetsThreadCommentPlugin"), _a8);
-__publicField2(UniverSheetsThreadCommentPlugin, "pluginName", SHEETS_THREAD_COMMENT);
-__publicField2(UniverSheetsThreadCommentPlugin, "type", UniverInstanceType.UNIVER_SHEET);
-UniverSheetsThreadCommentPlugin = __decorateClass([
-  DependentOn(UniverThreadCommentUIPlugin, UniverSheetsThreadCommentBasePlugin),
-  __decorateParam(1, Inject(Injector)),
-  __decorateParam(2, Inject(ICommandService)),
-  __decorateParam(3, IConfigService)
-], UniverSheetsThreadCommentPlugin);
+};
+U(g, "pluginName", X);
+U(g, "type", y.UNIVER_SHEET);
+g = k([
+  O(H),
+  v(1, l(A)),
+  v(2, l(b))
+], g);
 export {
-  AddCommentCommand,
-  DeleteCommentCommand,
-  DeleteCommentTreeCommand,
-  IThreadCommentDataSourceService2 as IThreadCommentDataSourceService,
-  IThreadCommentMentionDataService,
-  ResolveCommentCommand,
-  SHEETS_THREAD_COMMENT,
-  SheetsThreadCommentModel2 as SheetsThreadCommentModel,
-  SheetsThreadCommentPopupService,
-  ShowAddSheetCommentModalOperation,
-  UniverSheetsThreadCommentPlugin,
-  UniverThreadCommentUIPlugin2 as UniverThreadCommentUIPlugin,
-  UpdateCommentCommand
+  u as SheetsThreadCommentModel,
+  f as SheetsThreadCommentRefRangeController,
+  g as UniverSheetsThreadCommentPlugin
 };