@univerjs/sheets-thread-comment-ui 0.6.7 → 0.6.9

package/lib/index.js

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

package/lib/locale/en-US.js

@@ -0,0 +1,11 @@
+const e = {
+  sheetThreadComment: {
+    menu: {
+      addComment: "Add Comment",
+      commentManagement: "Comment Management"
+    }
+  }
+};
+export {
+  e as default
+};

package/lib/locale/fa-IR.js

@@ -0,0 +1,11 @@
+const e = {
+  sheetThreadComment: {
+    menu: {
+      addComment: "افزودن نظر",
+      commentManagement: "مدیریت نظر"
+    }
+  }
+};
+export {
+  e as default
+};

package/lib/locale/fr-FR.js

@@ -0,0 +1,11 @@
+const e = {
+  sheetThreadComment: {
+    menu: {
+      addComment: "Ajouter un commentaire",
+      commentManagement: "Gestion des commentaires"
+    }
+  }
+};
+export {
+  e as default
+};

package/lib/locale/ru-RU.js

@@ -0,0 +1,11 @@
+const e = {
+  sheetThreadComment: {
+    menu: {
+      addComment: "Add Comment",
+      commentManagement: "Comment Management"
+    }
+  }
+};
+export {
+  e as default
+};

package/lib/locale/vi-VN.js

@@ -0,0 +1,11 @@
+const n = {
+  sheetThreadComment: {
+    menu: {
+      addComment: "Thêm bình luận",
+      commentManagement: "Quản lý bình luận"
+    }
+  }
+};
+export {
+  n as default
+};

package/lib/locale/zh-CN.js

@@ -0,0 +1,11 @@
+const e = {
+  sheetThreadComment: {
+    menu: {
+      addComment: "添加评论",
+      commentManagement: "评论管理"
+    }
+  }
+};
+export {
+  e as default
+};

package/lib/locale/zh-TW.js

@@ -0,0 +1,11 @@
+const e = {
+  sheetThreadComment: {
+    menu: {
+      addComment: "新增評論",
+      commentManagement: "評論管理"
+    }
+  }
+};
+export {
+  e as default
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@univerjs/sheets-thread-comment-ui",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "private": false,
   "description": "Univer thread comment plugin",
   "author": "DreamNum <developer@univer.ai>",
@@ -48,20 +48,20 @@
     "lib"
   ],
   "peerDependencies": {
-    "react": ">=16.9.0",
+    "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc",
     "rxjs": ">=7.0.0"
   },
   "dependencies": {
-    "@univerjs/icons": "^0.2.28",
-    "@univerjs/engine-formula": "0.6.7",
-    "@univerjs/engine-render": "0.6.7",
-    "@univerjs/sheets": "0.6.7",
-    "@univerjs/sheets-thread-comment": "0.6.7",
-    "@univerjs/sheets-ui": "0.6.7",
-    "@univerjs/core": "0.6.7",
-    "@univerjs/thread-comment-ui": "0.6.7",
-    "@univerjs/thread-comment": "0.6.7",
-    "@univerjs/ui": "0.6.7"
+    "@univerjs/icons": "^0.2.31",
+    "@univerjs/core": "0.6.9",
+    "@univerjs/engine-formula": "0.6.9",
+    "@univerjs/engine-render": "0.6.9",
+    "@univerjs/sheets-thread-comment": "0.6.9",
+    "@univerjs/sheets-ui": "0.6.9",
+    "@univerjs/thread-comment": "0.6.9",
+    "@univerjs/thread-comment-ui": "0.6.9",
+    "@univerjs/sheets": "0.6.9",
+    "@univerjs/ui": "0.6.9"
   },
   "devDependencies": {
     "postcss": "^8.5.3",
@@ -71,7 +71,7 @@
     "typescript": "^5.8.2",
     "vite": "^6.2.3",
     "vitest": "^3.0.9",
-    "@univerjs-infra/shared": "0.6.7"
+    "@univerjs-infra/shared": "0.6.9"
   },
   "scripts": {
     "test": "vitest run",