@univerjs/sheets-thread-comment-ui 0.7.0-beta.0 → 0.7.0-nightly.202504301607

package/lib/index.js

@@ -1,34 +1,34 @@
 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 { 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 se, RANGE_TYPE as me, 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 { ThreadCommentPanelService as ae, 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 gn } from "@univerjs/thread-comment-ui";
+import { SheetCanvasPopManagerService as ot, CellPopupManagerService as it, ISheetClipboardService as st, COPY_TYPE as at, HoverManagerService as ct, IMarkSelectionService as fe, IEditorBridgeService as dt, SheetSkeletonManagerService as ht, ScrollToRangeOperation as mt, whenSheetEditorFocused as ut, getCurrentRangeDisable$ as ge } from "@univerjs/sheets-ui";
+import { IZenZoneService as lt, useDependency as U, useObservable as D, KeyCode as pt, MetaKeys as ue, getMenuHiddenObservable as Ie, MenuItemType as Pe, ContextMenuPosition as vt, ContextMenuGroup as _t, RibbonStartGroup as Ct, IMenuManagerService as St, ComponentManager as ft, IShortcutService as gt } from "@univerjs/ui";
+import { BehaviorSubject as It, debounceTime as ce, map as Pt } 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 { singleReferenceToGrid as A, serializeRange as Tt } from "@univerjs/engine-formula";
+import { IThreadCommentDataSourceService as be, DeleteCommentMutation as L, AddCommentMutation as ie, ThreadCommentModel as bt } from "@univerjs/thread-comment";
+import { AddCommentCommand as Pn, DeleteCommentCommand as Tn, DeleteCommentTreeCommand as bn, IThreadCommentDataSourceService as Mn, ResolveCommentCommand as wn, UpdateCommentCommand as yn } 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--)
+import { forwardRef as we, useRef as ye, createElement as Ee, useMemo as Mt, useCallback as le, useEffect as wt } from "react";
+const Ue = "univer.sheet.thread-comment-modal", de = "comment-single", Re = "SHEET_THREAD_COMMENT";
+var yt = Object.getOwnPropertyDescriptor, Et = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? yt(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);
+}, te = (n, e) => (r, t) => e(r, t, n);
 let R = class extends k {
-  constructor(e, r) {
+  constructor(e, r, t) {
     super();
     E(this, "_lastPopup", null);
     E(this, "_activePopup");
-    E(this, "_activePopup$", new gt(null));
+    E(this, "_activePopup$", new It(null));
     E(this, "activePopup$", this._activePopup$.asObservable());
-    this._canvasPopupManagerService = e, this._zenZoneService = r, this._initZenVisible(), this.disposeWithMe(() => {
+    this._canvasPopupManagerService = e, this._zenZoneService = r, this._cellPopupManagerService = t, this._initZenVisible(), this.disposeWithMe(() => {
       this._activePopup$.complete();
     });
   }
@@ -50,9 +50,13 @@ let R = class extends k {
     if (this._lastPopup && this._lastPopup.dispose(), this._zenZoneService.visible)
       return;
     this._activePopup = e, this._activePopup$.next(e);
-    const a = this._canvasPopupManagerService.attachPopupToCell(
-      t,
-      o,
+    const a = this._cellPopupManagerService.showPopup(
+      {
+        row: t,
+        col: o,
+        unitId: i,
+        subUnitId: s
+      },
       {
         componentKey: Ue,
         onClickOutside: () => {
@@ -62,7 +66,8 @@ let R = class extends k {
         excludeOutside: [
           ...Array.from(document.querySelectorAll(".univer-thread-comment")),
           document.getElementById("thread-comment-add")
-        ].filter(Boolean)
+        ].filter(Boolean),
+        priority: 2
       }
     );
     if (!a)
@@ -84,16 +89,17 @@ let R = class extends k {
     }, this._activePopup$.next(this._activePopup));
   }
 };
-R = yt([
-  le(0, v(ot)),
-  le(1, ut)
+R = Et([
+  te(0, v(ot)),
+  te(1, lt),
+  te(2, v(it))
 ], 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($);
+    const e = n.get(ve), r = n.get(N), t = n.get(R), o = n.get(ae), i = (_ = e.getCurrentLastSelection()) == null ? void 0 : _.primary, s = n.get($);
     if (!i)
       return !1;
     const a = Ye(r);
@@ -116,9 +122,9 @@ const V = {
       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--)
+}, Ut = "sheets-thread-comment.config", pe = {};
+var Rt = Object.getOwnPropertyDescriptor, Ot = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? Rt(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);
@@ -158,30 +164,30 @@ let F = class extends k {
       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(() => {
+    this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.pipe(ce(16)).subscribe(() => {
       n();
     }));
   }
 };
-F = Rt([
+F = Ot([
   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--)
+var kt = Object.getOwnPropertyDescriptor, Nt = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? kt(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) => {
+}, ne = (n, e) => (r, t) => e(r, t, n);
+const $t = (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);
+  return Tt(s);
 };
 let W = class extends k {
   constructor(e, r, t) {
@@ -207,7 +213,7 @@ let W = class extends k {
             row: a.rows[0],
             column: a.cols[0]
           };
-          if (o.copyType === st.CUT && this._copyInfo) {
+          if (o.copyType === at.CUT && this._copyInfo) {
             const { range: d, unitId: m, subUnitId: h } = this._copyInfo, u = {
               row: d.startRow,
               column: d.startColumn
@@ -231,20 +237,20 @@ let W = class extends k {
                     commentId: g.id
                   }
                 }), O.push({
-                  id: oe.id,
+                  id: ie.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
                     comment: {
                       ...g,
-                      ref: Nt(g.ref, u, c),
+                      ref: $t(g.ref, u, c),
                       unitId: i,
                       subUnitId: s
                     },
                     sync: !0
                   }
                 }), f.push({
-                  id: oe.id,
+                  id: ie.id,
                   params: {
                     unitId: m,
                     subUnitId: h,
@@ -277,13 +283,13 @@ let W = class extends k {
     );
   }
 };
-W = kt([
-  te(0, v(it)),
-  te(1, v($)),
-  te(2, be)
+W = Nt([
+  ne(0, v(st)),
+  ne(1, v($)),
+  ne(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--)
+var xt = Object.getOwnPropertyDescriptor, Dt = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? xt(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);
@@ -293,7 +299,7 @@ let Z = class extends k {
   }
   _initHoverEvent() {
     this.disposeWithMe(
-      this._hoverManagerService.currentCell$.pipe(ae(100)).subscribe((n) => {
+      this._hoverManagerService.currentCell$.pipe(ce(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);
@@ -320,14 +326,14 @@ let Z = class extends k {
     );
   }
 };
-Z = xt([
-  j(0, v(at)),
+Z = Dt([
+  j(0, v(ct)),
   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--)
+var At = Object.getOwnPropertyDescriptor, Vt = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? At(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);
@@ -340,11 +346,11 @@ let z = class extends k {
   }
   _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;
+    const o = (u = e[0]) == null ? void 0 : u.range, i = this._renderManagerService.getRenderById(r), s = (p = i == null ? void 0 : i.with(ht).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))) {
+    if ((((_ = o.rangeType) != null ? _ : me.NORMAL) !== me.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;
     }
@@ -410,7 +416,7 @@ let z = class extends k {
         }, [{ startRow: u, startColumn: p, endRow: u, endColumn: p }]))
           return;
         const f = 1;
-        if (await this._commandService.executeCommand(ht.id, {
+        if (await this._commandService.executeCommand(mt.id, {
           range: {
             startRow: Math.max(h.row - f, 0),
             endRow: h.row + f,
@@ -432,7 +438,7 @@ let z = class extends k {
     }));
   }
   _initMarkSelection() {
-    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.pipe(ae(100)).subscribe((e) => {
+    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.pipe(ce(100)).subscribe((e) => {
       var u, p;
       if (!e) {
         this._selectionShapeInfo && (this._markSelectionService.removeShape(this._selectionShapeInfo.shapeId), this._selectionShapeInfo = null);
@@ -473,20 +479,20 @@ let z = class extends k {
     }));
   }
 };
-z = At([
-  w(0, ie),
+z = Vt([
+  w(0, se),
   w(1, v(R)),
   w(2, v($)),
-  w(3, v(se)),
+  w(3, v(ae)),
   w(4, N),
   w(5, v(Ce)),
   w(6, fe),
   w(7, v(ve)),
-  w(8, ct),
+  w(8, dt),
   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--)
+var Ht = Object.getOwnPropertyDescriptor, jt = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? Ht(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);
@@ -514,7 +520,7 @@ let G = class extends k {
                 commentId: u
               }
             })), h = a.map(({ children: u, ...p }) => ({
-              id: oe.id,
+              id: ie.id,
               params: {
                 unitId: o,
                 subUnitId: i,
@@ -533,10 +539,10 @@ let G = class extends k {
     );
   }
 };
-G = Ht([
+G = jt([
   B(0, v(_e)),
   B(1, N),
-  B(2, v(Tt)),
+  B(2, v(bt)),
   B(3, be)
 ], G);
 var P = function() {
@@ -547,7 +553,7 @@ var P = function() {
     }
     return n;
   }, P.apply(this, arguments);
-}, jt = function(n, e) {
+}, Bt = 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")
@@ -555,15 +561,15 @@ var P = function() {
       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()));
+  var r = n.icon, t = n.id, o = n.className, i = n.extend, s = Bt(n, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(t, " ").concat(o || "").trim(), c = ye("_".concat(Wt()));
   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 Ee(n.tag, P(P({ key: e }, Lt(n, r, o)), t), (Ft(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) {
+function Lt(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];
@@ -575,25 +581,25 @@ function Bt(n, e, r) {
     typeof a == "string" && (t[s] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), t;
 }
-function Lt(n, e) {
+function Ft(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() {
+function Wt() {
   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) {
+var Zt = { 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
+    icon: Zt
   }));
 });
 Ne.displayName = "CommentSingle";
-const Zt = () => {
+const zt = () => {
   const n = U(N), e = U(R), r = D(e.activePopup$), t = U($);
   if (D(t.commentUpdate$), !r)
     return null;
@@ -620,23 +626,23 @@ const Zt = () => {
       autoFocus: c === "context-menu"
     }
   );
-}, zt = () => {
+}, Gt = () => {
   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 n = U(fe), e = U(N), r = U(R), t = e.getCurrentUnitForType(b.UNIVER_SHEET), o = t.getUnitId(), i = U(se), s = Mt(() => t.activeSheet$.pipe(Pt((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(ae), m = D(d.activeCommentId$), h = D(d.panelVisible$, d.panelVisible), u = le((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];
+      var he;
+      const y = A(S.ref), xe = [(he = C[S.subUnitId]) != null ? he : 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) => {
+  }, [t]), p = le((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 : {
@@ -671,7 +677,7 @@ const Zt = () => {
   }, X = (l, I) => {
     I && r.hidePopup();
   };
-  return Mt(() => {
+  return wt(() => {
     !h && c.current && n.removeShape(c.current);
   }, [n, h]), /* @__PURE__ */ Me(
     tt,
@@ -688,10 +694,10 @@ const Zt = () => {
       onDeleteComment: () => (x(), !0)
     }
   );
-}, Gt = (n) => ({
+}, Kt = (n) => ({
   id: V.id,
   type: Pe.BUTTON,
-  icon: ce,
+  icon: de,
   title: "sheetThreadComment.menu.addComment",
   hidden$: Ie(n, b.UNIVER_SHEET),
   disabled$: ge(n, {
@@ -699,10 +705,10 @@ const Zt = () => {
     worksheetTypes: [J],
     rangeTypes: [q]
   })
-}), Kt = (n) => ({
+}), Yt = (n) => ({
   id: Se.id,
   type: Pe.BUTTON,
-  icon: ce,
+  icon: de,
   tooltip: "sheetThreadComment.menu.commentManagement",
   disabled$: ge(n, {
     workbookTypes: [Q],
@@ -710,61 +716,61 @@ const Zt = () => {
     rangeTypes: [q]
   }),
   hidden$: Ie(n, b.UNIVER_SHEET)
-}), Yt = {
+}), qt = {
   id: V.id,
-  binding: lt.M | me.CTRL_COMMAND | me.ALT,
-  preconditions: mt
-}, qt = {
-  [_t.OTHERS]: {
+  binding: pt.M | ue.CTRL_COMMAND | ue.ALT,
+  preconditions: ut
+}, Jt = {
+  [Ct.OTHERS]: {
     [Se.id]: {
       order: 1,
-      menuItemFactory: Kt
+      menuItemFactory: Yt
     }
   },
-  [pt.MAIN_AREA]: {
-    [vt.OTHERS]: {
+  [vt.MAIN_AREA]: {
+    [_t.OTHERS]: {
       [V.id]: {
         order: 0,
-        menuItemFactory: Gt
+        menuItemFactory: Kt
       }
     }
   }
 };
-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--)
+var Qt = Object.getOwnPropertyDescriptor, Xt = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? Qt(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);
+}, re = (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);
+    this._shortcutService.registerShortcut(qt);
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(qt);
+    this._menuManagerService.mergeMenu(Jt);
   }
   _initComponent() {
     [
-      [Ue, Zt],
-      [nt, zt],
-      [ce, Ne]
+      [Ue, zt],
+      [nt, Gt],
+      [de, Ne]
     ].forEach(([n, e]) => {
       this._componentManager.register(n, e);
     });
   }
 };
-K = Qt([
-  ne(0, Ct),
-  ne(1, v(St)),
-  ne(2, ft)
+K = Xt([
+  re(0, St),
+  re(1, v(ft)),
+  re(2, gt)
 ], 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--)
+var en = Object.defineProperty, tn = Object.getOwnPropertyDescriptor, nn = (n, e, r) => e in n ? en(n, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : n[e] = r, rn = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? tn(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);
+}, oe = (n, e) => (r, t) => e(r, t, n), $e = (n, e, r) => nn(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;
@@ -773,7 +779,7 @@ let Y = class extends Ge {
       pe,
       this._config
     );
-    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(Et, i);
+    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(Ut, i);
   }
   onStarting() {
     [
@@ -799,22 +805,22 @@ let Y = class extends Ge {
 };
 $e(Y, "pluginName", Re);
 $e(Y, "type", b.UNIVER_SHEET);
-Y = nn([
+Y = rn([
   We(rt, Xe),
-  re(1, v(Ze)),
-  re(2, v(ie)),
-  re(3, ze)
+  oe(1, v(Ze)),
+  oe(2, v(se)),
+  oe(3, ze)
 ], Y);
 export {
-  In as AddCommentCommand,
-  Pn as DeleteCommentCommand,
-  Tn as DeleteCommentTreeCommand,
-  bn as IThreadCommentDataSourceService,
-  Mn as ResolveCommentCommand,
+  Pn as AddCommentCommand,
+  Tn as DeleteCommentCommand,
+  bn as DeleteCommentTreeCommand,
+  Mn as IThreadCommentDataSourceService,
+  wn as ResolveCommentCommand,
   Re as SHEETS_THREAD_COMMENT,
   R as SheetsThreadCommentPopupService,
   V as ShowAddSheetCommentModalOperation,
   Y as UniverSheetsThreadCommentUIPlugin,
-  fn as UniverThreadCommentUIPlugin,
-  wn as UpdateCommentCommand
+  gn as UniverThreadCommentUIPlugin,
+  yn as UpdateCommentCommand
 };

package/lib/types/services/sheets-thread-comment-popup.service.d.ts

@@ -1,6 +1,6 @@
 import { Nullable, Disposable } from '@univerjs/core';
 import { ISheetLocationBase } from '@univerjs/sheets';
-import { SheetCanvasPopManagerService } from '@univerjs/sheets-ui';
+import { CellPopupManagerService, SheetCanvasPopManagerService } from '@univerjs/sheets-ui';
 import { IZenZoneService } from '@univerjs/ui';
 export interface IThreadCommentPopup extends ISheetLocationBase {
     commentId?: string;
@@ -10,12 +10,13 @@ export interface IThreadCommentPopup extends ISheetLocationBase {
 export declare class SheetsThreadCommentPopupService extends Disposable {
     private readonly _canvasPopupManagerService;
     private readonly _zenZoneService;
+    private readonly _cellPopupManagerService;
     private _lastPopup;
     private _activePopup;
     private _activePopup$;
     activePopup$: import('rxjs').Observable<Nullable<IThreadCommentPopup>>;
     get activePopup(): Nullable<IThreadCommentPopup>;
-    constructor(_canvasPopupManagerService: SheetCanvasPopManagerService, _zenZoneService: IZenZoneService);
+    constructor(_canvasPopupManagerService: SheetCanvasPopManagerService, _zenZoneService: IZenZoneService, _cellPopupManagerService: CellPopupManagerService);
     private _initZenVisible;
     showPopup(location: IThreadCommentPopup, onHide?: () => void): void;
     hidePopup(): void;