@univerjs/sheets-thread-comment 0.1.15 → 0.1.17

package/lib/es/index.js

@@ -1,90 +1,88 @@
-var Ee = Object.defineProperty;
-var Re = (t, e, n) => e in t ? Ee(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
-var y = (t, e, n) => (Re(t, typeof e != "symbol" ? e + "" : e, n), n);
-import { Inject as p, Injector as ae } from "@wendellhu/redi";
-import { Inject as ln, Injector as vn } from "@wendellhu/redi";
-import { Disposable as U, DisposableCollection as $e, IUniverInstanceService as E, Tools as ce, UniverInstanceType as b, CommandType as Ne, ICommandService as Y, OnLifecycle as N, LifecycleStages as x, LocaleService as xe, Range as De, DependentOn as je, Plugin as Ae } from "@univerjs/core";
-import { ICommandService as fn, Plugin as Cn, UniverInstanceType as Sn } from "@univerjs/core";
-import { ThreadCommentTree as Ve, ThreadCommentPanelService as q, ThreadCommentPanel as Le, ToggleSheetCommentPanelOperation as He, SetActiveCommentOperation as Q, THREAD_COMMENT_PANEL as Be, UniverThreadCommentUIPlugin as Fe } from "@univerjs/thread-comment-ui";
-import { IThreadCommentMentionDataService as gn, UniverThreadCommentUIPlugin as Pn } from "@univerjs/thread-comment-ui";
-import { IZenZoneService as We, useObservable as ee, KeyCode as Ze, MetaKeys as te, MenuItemType as de, MenuPosition as ue, getMenuHiddenObservable as me, MenuGroup as ze, ComponentManager as ke, IMenuService as Ge, IShortcutService as Ke } from "@univerjs/ui";
-import { SelectionManagerService as Ye, getSheetCommandTarget as qe, WorkbookCommentPermission as he, WorksheetViewPermission as pe, RangeProtectionPermissionEditPoint as le, SetSelectionsOperation as Xe, SelectionMoveType as Je, SetWorksheetActiveOperation as Qe, SheetInterceptorService as ve, INTERCEPTOR_POINT as et, RemoveSheetCommand as tt } from "@univerjs/sheets";
-import { singleReferenceToGrid as F, serializeRange as nt } from "@univerjs/engine-formula";
-import { ThreadCommentModel as _e, DeleteCommentMutation as W, AddCommentMutation as K } from "@univerjs/thread-comment";
-import { IThreadCommentDataSourceService as Tn } from "@univerjs/thread-comment";
-import { SheetCanvasPopManagerService as rt, IMarkSelectionService as ot, whenSheetEditorFocused as it, getCurrentRangeDisable$ as fe, ScrollToRangeOperation as st, SheetSkeletonManagerService as at, ISheetClipboardService as ct, COPY_TYPE as dt, HoverManagerService as ut } from "@univerjs/sheets-ui";
-import { SheetsThreadCommentModel as R, UniverSheetsThreadCommentBasePlugin as mt } from "@univerjs/sheets-thread-comment-base";
-import { SheetsThreadCommentModel as wn } from "@univerjs/sheets-thread-comment-base";
-import { useDependency as T, useObservable as ne } from "@wendellhu/redi/react-bindings";
-import Ce, { forwardRef as Se, useRef as Ie, createElement as ge, useMemo as ht, useCallback as re, useEffect as pt } from "react";
-import { BehaviorSubject as lt, map as vt, debounceTime as _t } from "rxjs";
-import { IRenderManagerService as ft } from "@univerjs/engine-render";
-var _ = function() {
-  return _ = Object.assign || function(t) {
-    for (var e, n = 1, o = arguments.length; n < o; n++) {
+var Re = Object.defineProperty;
+var $e = (t, e, n) => e in t ? Re(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
+var E = (t, e, n) => $e(t, typeof e != "symbol" ? e + "" : e, n);
+import { Inject as p, Injector as de } from "@wendellhu/redi";
+import { Inject as vn, Injector as _n } from "@wendellhu/redi";
+import { Disposable as U, DisposableCollection as Ne, IUniverInstanceService as R, Tools as me, UniverInstanceType as b, CommandType as xe, ICommandService as ee, OnLifecycle as x, LifecycleStages as D, LocaleService as De, Range as je, DependentOn as Ae, Plugin as Ve } from "@univerjs/core";
+import { ICommandService as Cn, Plugin as Sn, UniverInstanceType as In } from "@univerjs/core";
+import { ThreadCommentTree as He, ThreadCommentPanelService as te, ThreadCommentPanel as Le, ToggleSheetCommentPanelOperation as Be, SetActiveCommentOperation as oe, THREAD_COMMENT_PANEL as Fe, UniverThreadCommentUIPlugin as ke } from "@univerjs/thread-comment-ui";
+import { IThreadCommentMentionDataService as Pn, UniverThreadCommentUIPlugin as Tn } from "@univerjs/thread-comment-ui";
+import { IZenZoneService as We, useObservable as W, KeyCode as Ze, MetaKeys as ie, MenuItemType as he, MenuPosition as pe, getMenuHiddenObservable as le, MenuGroup as ze, ComponentManager as Ge, IMenuService as Ke, IShortcutService as Ye } from "@univerjs/ui";
+import { SelectionManagerService as qe, getSheetCommandTarget as Xe, WorkbookCommentPermission as K, WorksheetViewPermission as Y, RangeProtectionPermissionViewPoint as q, SetSelectionsOperation as Je, SelectionMoveType as Qe, SetWorksheetActiveOperation as et, SheetInterceptorService as ve, INTERCEPTOR_POINT as tt, RemoveSheetCommand as nt } from "@univerjs/sheets";
+import { singleReferenceToGrid as Z, serializeRange as rt } from "@univerjs/engine-formula";
+import { ThreadCommentModel as _e, DeleteCommentMutation as z, AddCommentMutation as Q } from "@univerjs/thread-comment";
+import { IThreadCommentDataSourceService as wn } from "@univerjs/thread-comment";
+import { SheetCanvasPopManagerService as ot, IMarkSelectionService as it, whenSheetEditorFocused as st, getCurrentRangeDisable$ as fe, SheetPermissionInterceptorBaseController as Ce, ScrollToRangeOperation as at, SheetSkeletonManagerService as ct, ISheetClipboardService as ut, COPY_TYPE as dt, HoverManagerService as mt } from "@univerjs/sheets-ui";
+import { SheetsThreadCommentModel as $, UniverSheetsThreadCommentBasePlugin as ht } from "@univerjs/sheets-thread-comment-base";
+import { SheetsThreadCommentModel as yn } from "@univerjs/sheets-thread-comment-base";
+import { useDependency as M } from "@wendellhu/redi/react-bindings";
+import Se, { forwardRef as Ie, useRef as ge, createElement as Pe, useMemo as pt, useCallback as se, useEffect as lt } from "react";
+import { BehaviorSubject as vt, map as _t, debounceTime as ft } from "rxjs";
+import { IRenderManagerService as Ct } from "@univerjs/engine-render";
+var f = function() {
+  return f = Object.assign || function(t) {
+    for (var e, n = 1, r = arguments.length; n < r; n++) {
       e = arguments[n];
-      for (var r in e)
-        Object.prototype.hasOwnProperty.call(e, r) && (t[r] = e[r]);
+      for (var o in e) Object.prototype.hasOwnProperty.call(e, o) && (t[o] = e[o]);
     }
     return t;
-  }, _.apply(this, arguments);
-}, Ct = function(t, e) {
+  }, f.apply(this, arguments);
+}, St = function(t, e) {
   var n = {};
-  for (var o in t)
-    Object.prototype.hasOwnProperty.call(t, o) && e.indexOf(o) < 0 && (n[o] = t[o]);
+  for (var r in t) Object.prototype.hasOwnProperty.call(t, r) && e.indexOf(r) < 0 && (n[r] = t[r]);
   if (t != null && typeof Object.getOwnPropertySymbols == "function")
-    for (var r = 0, o = Object.getOwnPropertySymbols(t); r < o.length; r++)
-      e.indexOf(o[r]) < 0 && Object.prototype.propertyIsEnumerable.call(t, o[r]) && (n[o[r]] = t[o[r]]);
+    for (var o = 0, r = Object.getOwnPropertySymbols(t); o < r.length; o++)
+      e.indexOf(r[o]) < 0 && Object.prototype.propertyIsEnumerable.call(t, r[o]) && (n[r[o]] = t[r[o]]);
   return n;
-}, Pe = Se(function(t, e) {
-  var n = t.icon, o = t.id, r = t.className, i = t.extend, s = Ct(t, ["icon", "id", "className", "extend"]), d = "univerjs-icon univerjs-icon-".concat(o, " ").concat(r || "").trim(), u = Ie("_".concat(gt()));
-  return be(n, "".concat(o), { defIds: n.defIds, idSuffix: u.current }, _({ ref: e, className: d }, s), i);
+}, Te = Ie(function(t, e) {
+  var n = t.icon, r = t.id, o = t.className, i = t.extend, s = St(t, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(r, " ").concat(o || "").trim(), d = ge("_".concat(Pt()));
+  return be(n, "".concat(r), { defIds: n.defIds, idSuffix: d.current }, f({ ref: e, className: a }, s), i);
 });
-function be(t, e, n, o, r) {
-  return ge(t.tag, _(_({ key: e }, St(t, n, r)), o), (It(t, n).children || []).map(function(i, s) {
-    return be(i, "".concat(e, "-").concat(t.tag, "-").concat(s), n, void 0, r);
+function be(t, e, n, r, o) {
+  return Pe(t.tag, f(f({ key: e }, It(t, n, o)), r), (gt(t, n).children || []).map(function(i, s) {
+    return be(i, "".concat(e, "-").concat(t.tag, "-").concat(s), n, void 0, o);
   }));
 }
-function St(t, e, n) {
-  var o = _({}, t.attrs);
-  n != null && n.colorChannel1 && o.fill === "colorChannel1" && (o.fill = n.colorChannel1);
-  var r = e.defIds;
-  return !r || r.length === 0 || (t.tag === "use" && o["xlink:href"] && (o["xlink:href"] = o["xlink:href"] + e.idSuffix), Object.entries(o).forEach(function(i) {
-    var s = i[0], d = i[1];
-    typeof d == "string" && (o[s] = d.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
-  })), o;
+function It(t, e, n) {
+  var r = f({}, t.attrs);
+  n != null && n.colorChannel1 && r.fill === "colorChannel1" && (r.fill = n.colorChannel1);
+  var o = e.defIds;
+  return !o || o.length === 0 || (t.tag === "use" && r["xlink:href"] && (r["xlink:href"] = r["xlink:href"] + e.idSuffix), Object.entries(r).forEach(function(i) {
+    var s = i[0], a = i[1];
+    typeof a == "string" && (r[s] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+  })), r;
 }
-function It(t, e) {
-  var n, o = e.defIds;
-  return !o || o.length === 0 ? t : t.tag === "defs" && (!((n = t.children) === null || n === void 0) && n.length) ? _(_({}, t), { children: t.children.map(function(r) {
-    return typeof r.attrs.id == "string" && o && o.indexOf(r.attrs.id) > -1 ? _(_({}, r), { attrs: _(_({}, r.attrs), { id: r.attrs.id + e.idSuffix }) }) : r;
+function gt(t, e) {
+  var n, r = e.defIds;
+  return !r || r.length === 0 ? t : t.tag === "defs" && (!((n = t.children) === null || n === void 0) && n.length) ? f(f({}, t), { children: t.children.map(function(o) {
+    return typeof o.attrs.id == "string" && r && r.indexOf(o.attrs.id) > -1 ? f(f({}, o), { attrs: f(f({}, o.attrs), { id: o.attrs.id + e.idSuffix }) }) : o;
   }) }) : t;
 }
-function gt() {
+function Pt() {
   return Math.random().toString(36).substring(2, 8);
 }
-Pe.displayName = "UniverIcon";
-var Pt = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 17", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521C5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345ZM8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521C8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345ZM11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521C11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521 5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345zM8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521 8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345zM11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521 11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M1.84351 3.41861C1.84351 3.01861 2.15531 2.69434 2.53993 2.69434H14.9381C15.3228 2.69434 15.6346 3.01861 15.6346 3.41861V12.4611C15.6346 12.8612 15.3228 13.1854 14.9381 13.1854H8.82117L6.06643 14.6179C5.85054 14.7301 5.59416 14.7181 5.38884 14.5862C5.18352 14.4542 5.05855 14.2211 5.05855 13.9701V13.1854H2.53993C2.15531 13.1854 1.84351 12.8612 1.84351 12.4611L1.84351 3.41861ZM6.45141 12.7982L8.34531 12.0135C8.44201 11.9632 8.54864 11.9371 8.65676 11.9371H14.2417C14.3522 11.9371 14.4417 11.8475 14.4417 11.7371V4.14271C14.4417 4.03225 14.3522 3.94271 14.2417 3.94271H3.23636C3.12591 3.94271 3.03636 4.03225 3.03636 4.14271L3.03636 11.7371C3.03636 11.8475 3.12591 11.9371 3.23636 11.9371L5.75498 11.9371C6.1396 11.9371 6.45141 12.0611 6.45141 12.4611V12.7982Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Te = Se(function(t, e) {
-  return ge(Pe, Object.assign({}, t, {
+Te.displayName = "UniverIcon";
+var Tt = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 17", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521C5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345ZM8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521C8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345ZM11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521C11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521 5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345zM8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521 8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345zM11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521 11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M1.84351 3.41861C1.84351 3.01861 2.15531 2.69434 2.53993 2.69434H14.9381C15.3228 2.69434 15.6346 3.01861 15.6346 3.41861V12.4611C15.6346 12.8612 15.3228 13.1854 14.9381 13.1854H8.82117L6.06643 14.6179C5.85054 14.7301 5.59416 14.7181 5.38884 14.5862C5.18352 14.4542 5.05855 14.2211 5.05855 13.9701V13.1854H2.53993C2.15531 13.1854 1.84351 12.8612 1.84351 12.4611L1.84351 3.41861ZM6.45141 12.7982L8.34531 12.0135C8.44201 11.9632 8.54864 11.9371 8.65676 11.9371H14.2417C14.3522 11.9371 14.4417 11.8475 14.4417 11.7371V4.14271C14.4417 4.03225 14.3522 3.94271 14.2417 3.94271H3.23636C3.12591 3.94271 3.03636 4.03225 3.03636 4.14271L3.03636 11.7371C3.03636 11.8475 3.12591 11.9371 3.23636 11.9371L5.75498 11.9371C6.1396 11.9371 6.45141 12.0611 6.45141 12.4611V12.7982Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, we = Ie(function(t, e) {
+  return Pe(Te, Object.assign({}, t, {
     id: "comment-single",
     ref: e,
-    icon: Pt
+    icon: Tt
   }));
 });
-Te.displayName = "CommentSingle";
-const Me = "univer.sheet.thread-comment-modal", X = "comment-single", we = "univer.sheet.thread-comment";
-var bt = Object.defineProperty, Tt = Object.getOwnPropertyDescriptor, Mt = (t, e, n, o) => {
-  for (var r = o > 1 ? void 0 : o ? Tt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
-    (s = t[i]) && (r = (o ? s(e, n, r) : s(r)) || r);
-  return o && r && bt(e, n, r), r;
-}, oe = (t, e) => (n, o) => e(n, o, t);
-let M = class extends U {
+we.displayName = "CommentSingle";
+const Me = "univer.sheet.thread-comment-modal", ne = "comment-single", ye = "SHEET_THREAD_COMMENT";
+var bt = Object.defineProperty, wt = Object.getOwnPropertyDescriptor, Mt = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? wt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (o = (r ? s(e, n, o) : s(o)) || o);
+  return r && o && bt(e, n, o), o;
+}, ae = (t, e) => (n, r) => e(n, r, t);
+let y = class extends U {
   constructor(e, n) {
     super();
-    y(this, "_lastPopup", null);
-    y(this, "_activePopup");
-    y(this, "_activePopup$", new lt(null));
-    y(this, "activePopup$", this._activePopup$.asObservable());
+    E(this, "_lastPopup", null);
+    E(this, "_activePopup");
+    E(this, "_activePopup$", new vt(null));
+    E(this, "activePopup$", this._activePopup$.asObservable());
     this._canvasPopupManagerService = e, this._zenZoneService = n, this._initZenVisible();
   }
   get activePopup() {
@@ -96,18 +94,18 @@ let M = class extends U {
     }));
   }
   showPopup(e, n) {
-    var a;
-    const { row: o, col: r, unitId: i, subUnitId: s } = e;
-    if (this._activePopup && o === this._activePopup.row && r === this._activePopup.col && i === this._activePopup.unitId && s === ((a = this.activePopup) == null ? void 0 : a.subUnitId)) {
+    var c;
+    const { row: r, col: o, unitId: i, subUnitId: s } = e;
+    if (this._activePopup && r === this._activePopup.row && o === this._activePopup.col && i === this._activePopup.unitId && s === ((c = this.activePopup) == null ? void 0 : c.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 d = this._canvasPopupManagerService.attachPopupToCell(
-      o,
+    const a = this._canvasPopupManagerService.attachPopupToCell(
       r,
+      o,
       {
         componentKey: Me,
         onClickOutside: () => {
@@ -120,14 +118,14 @@ let M = class extends U {
         ].filter(Boolean)
       }
     );
-    if (!d)
+    if (!a)
       throw new Error("[SheetsThreadCommentPopupService]: cannot show popup!");
-    const u = new $e();
-    u.add(d), u.add({
+    const d = new Ne();
+    d.add(a), d.add({
       dispose: () => {
         n == null || n();
       }
-    }), this._lastPopup = u;
+    }), this._lastPopup = d;
   }
   hidePopup() {
     this._activePopup && (this._lastPopup && this._lastPopup.dispose(), this._lastPopup = null, this._activePopup = null, this._activePopup$.next(null));
@@ -139,88 +137,89 @@ let M = class extends U {
     }, this._activePopup$.next(this._activePopup));
   }
 };
-M = Mt([
-  oe(0, p(rt)),
-  oe(1, We)
-], M);
-const wt = () => {
-  const t = T(E), e = T(M), n = ee(e.activePopup$), o = T(R);
-  if (ee(o.commentUpdate$), !n)
+y = Mt([
+  ae(0, p(ot)),
+  ae(1, We)
+], y);
+const yt = () => {
+  const t = M(R), e = M(y), n = W(e.activePopup$), r = M($);
+  if (W(r.commentUpdate$), !n)
     return null;
-  const { row: r, col: i, unitId: s, subUnitId: d, trigger: u } = n, a = o.getByLocation(s, d, r, i), m = `${ce.chatAtABC(i)}${r + 1}`, h = () => {
+  const { row: o, col: i, unitId: s, subUnitId: a, trigger: d } = n, c = r.getByLocation(s, a, o, i), h = `${me.chatAtABC(i)}${o + 1}`, u = () => {
     e.hidePopup();
-  }, w = (C) => {
-    var S, I, O;
-    return (O = (I = (S = t.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : S.getSheetBySheetId(C)) == null ? void 0 : I.getName()) != null ? O : "";
+  }, g = (C) => {
+    var l, P, O;
+    return (O = (P = (l = t.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : l.getSheetBySheetId(C)) == null ? void 0 : P.getName()) != null ? O : "";
   };
-  return /* @__PURE__ */ Ce.createElement(
-    Ve,
+  return /* @__PURE__ */ Se.createElement(
+    He,
     {
       onClick: () => {
         e.persistPopup();
       },
       prefix: "cell",
-      id: a,
+      id: c,
       unitId: s,
-      subUnitId: d,
+      subUnitId: a,
       type: b.UNIVER_SHEET,
-      refStr: m,
-      onClose: h,
-      getSubUnitName: w,
-      autoFocus: u === "context-menu"
+      refStr: h,
+      onClose: u,
+      getSubUnitName: g,
+      autoFocus: d === "context-menu"
     }
   );
-}, z = {
-  type: Ne.OPERATION,
+}, X = {
+  type: xe.OPERATION,
   id: "sheets.operation.show-comment-modal",
   handler(t) {
-    var I;
-    const e = t.get(Ye), n = t.get(E), o = t.get(M), r = t.get(q), i = (I = e.getFirst()) == null ? void 0 : I.primary, s = e.getCurrent(), d = t.get(R);
+    var P;
+    const e = t.get(qe), n = t.get(R), r = t.get(y), o = t.get(te), i = (P = e.getFirst()) == null ? void 0 : P.primary, s = e.getCurrent(), a = t.get($);
     if (!s || !i)
       return !1;
-    const { unitId: u, sheetId: a } = s, m = qe(n, { unitId: u, subUnitId: a });
-    if (!m)
+    const { unitId: d, sheetId: c } = s, h = Xe(n, { unitId: d, subUnitId: c });
+    if (!h)
       return !1;
-    const { workbook: h, worksheet: w } = m, C = {
-      workbook: h,
-      worksheet: w,
-      unitId: u,
-      subUnitId: a,
+    const { workbook: u, worksheet: g } = h, C = {
+      workbook: u,
+      worksheet: g,
+      unitId: d,
+      subUnitId: c,
       row: i.startRow,
       col: i.startColumn
     };
-    o.showPopup(C);
-    const S = d.getByLocation(u, a, i.startRow, i.startColumn);
-    return S && r.setActiveComment({
-      unitId: u,
-      subUnitId: a,
-      commentId: S,
+    r.showPopup(C);
+    const l = a.getByLocation(d, c, i.startRow, i.startColumn);
+    return l && o.setActiveComment({
+      unitId: d,
+      subUnitId: c,
+      commentId: l,
       trigger: "context-menu"
     }), !0;
   }
 }, Ot = () => {
-  const t = T(ot), e = T(E), n = T(_e), o = T(M), r = e.getCurrentUnitForType(b.UNIVER_SHEET);
-  if (!r)
+  var _;
+  const t = M(it), e = M(R), n = M(_e), r = M(y), o = e.getCurrentUnitForType(b.UNIVER_SHEET);
+  if (!o)
     return null;
-  const i = r.getUnitId(), s = T(Y), d = ht(() => r.activeSheet$.pipe(vt((c) => c == null ? void 0 : c.getSheetId())), [r.activeSheet$]), u = ne(d, r.getActiveSheet().getSheetId()), a = Ie(), m = T(q), h = ne(m.activeCommentId$), w = re((c) => {
-    const l = r.getSheets(), v = {};
-    return l.forEach((f, g) => {
-      v[f.getSheetId()] = g;
-    }), c.map((f) => {
-      var J;
-      const g = F(f.ref), Ue = [(J = v[f.subUnitId]) != null ? J : 0, g.row, g.column];
-      return { ...f, p: Ue };
-    }).sort((f, g) => f.p[0] === g.p[0] ? f.p[1] === g.p[1] ? f.p[2] - g.p[2] : f.p[1] - g.p[1] : f.p[0] - g.p[0]);
-  }, [r]), C = re((c) => {
-    if (c.unitId === i && c.subUnitId === u && !c.resolved) {
-      const { row: l, column: v } = F(c.ref);
-      if (!Number.isNaN(l) && !Number.isNaN(v))
+  const i = o.getUnitId(), s = M(ee), a = pt(() => o.activeSheet$.pipe(_t((m) => m == null ? void 0 : m.getSheetId())), [o.activeSheet$]), d = W(a, (_ = o.getActiveSheet()) == null ? void 0 : _.getSheetId()), c = ge(), h = M(te), u = W(h.activeCommentId$), g = se((m) => {
+    const v = o.getSheets(), w = {};
+    return v.forEach((S, T) => {
+      w[S.getSheetId()] = T;
+    }), m.map((S) => {
+      var re;
+      const T = Z(S.ref), Ue = [(re = w[S.subUnitId]) != null ? re : 0, T.row, T.column];
+      return { ...S, p: Ue };
+    }).sort((S, T) => S.p[0] === T.p[0] ? S.p[1] === T.p[1] ? S.p[2] - T.p[2] : S.p[1] - T.p[1] : S.p[0] - T.p[0]);
+  }, [o]), C = se((m) => {
+    if (m.unitId === i && m.subUnitId === d && !m.resolved) {
+      const { row: v, column: w } = Z(m.ref);
+      if (!Number.isNaN(v) && !Number.isNaN(w))
         return t.addShape({
           range: {
-            startColumn: v,
-            endColumn: v,
-            startRow: l,
-            endRow: l
+            startColumn: w,
+            endColumn: w,
+            startRow: v,
+            endRow: v
           },
           style: {
             hasAutoFill: !1,
@@ -232,116 +231,116 @@ const wt = () => {
           primary: null
         });
     }
-  }, [t, u, i]), S = (c) => {
-    var l, v;
-    return (v = (l = r.getSheetBySheetId(c)) == null ? void 0 : l.getName()) != null ? v : "";
-  }, I = () => {
-    s.executeCommand(z.id);
+  }, [t, d, i]), l = (m) => {
+    var v, w;
+    return (w = (v = o.getSheetBySheetId(m)) == null ? void 0 : v.getName()) != null ? w : "";
+  }, P = () => {
+    s.executeCommand(X.id);
   }, O = () => {
-    o.hidePopup();
-  }, D = (c) => {
-    h && h.unitId === c.unitId && h.subUnitId === c.subUnitId && h.commentId === c.id || (a.current && (t.removeShape(a.current), a.current = null), a.current = C(c));
-  }, j = () => {
-    a.current && (t.removeShape(a.current), a.current = null);
+    r.hidePopup();
+  }, j = (m) => {
+    u && u.unitId === m.unitId && u.subUnitId === m.subUnitId && u.commentId === m.id || (c.current && (t.removeShape(c.current), c.current = null), c.current = C(m));
+  }, A = () => {
+    c.current && (t.removeShape(c.current), c.current = null);
   };
-  return pt(() => {
-    if (!h)
+  return lt(() => {
+    if (!u)
       return;
-    const c = n.getComment(h.unitId, h.subUnitId, h.commentId);
-    if (!c)
+    const m = n.getComment(u.unitId, u.subUnitId, u.commentId);
+    if (!m)
       return;
-    const l = C(c);
+    const v = C(m);
     return () => {
-      l && t.removeShape(l);
+      v && t.removeShape(v);
     };
-  }, [C, h, n, t]), /* @__PURE__ */ Ce.createElement(
+  }, [C, u, n, t]), /* @__PURE__ */ Se.createElement(
     Le,
     {
       unitId: i,
-      subUnitId$: d,
+      subUnitId$: a,
       type: b.UNIVER_SHEET,
-      onAdd: I,
-      getSubUnitName: S,
+      onAdd: P,
+      getSubUnitName: l,
       onResolve: O,
-      sortComments: w,
-      onItemEnter: D,
-      onItemLeave: j
+      sortComments: g,
+      onItemEnter: j,
+      onItemLeave: A
     }
   );
-}, yt = (t) => ({
-  id: z.id,
-  type: de.BUTTON,
-  positions: [ue.CONTEXT_MENU],
-  icon: X,
+}, Et = (t) => ({
+  id: X.id,
+  type: he.BUTTON,
+  positions: [pe.CONTEXT_MENU],
+  icon: ne,
   title: "sheetThreadComment.menu.addComment",
-  hidden$: me(t, b.UNIVER_SHEET),
+  hidden$: le(t, b.UNIVER_SHEET),
   disabled$: fe(t, {
-    workbookTypes: [he],
-    worksheetTypes: [pe],
-    rangeTypes: [le]
+    workbookTypes: [K],
+    worksheetTypes: [Y],
+    rangeTypes: [q]
   })
 }), Ut = (t) => ({
-  id: He.id,
-  type: de.BUTTON,
-  icon: X,
+  id: Be.id,
+  type: he.BUTTON,
+  icon: ne,
   tooltip: "sheetThreadComment.menu.commentManagement",
-  positions: ue.TOOLBAR_START,
+  positions: pe.TOOLBAR_START,
   group: ze.TOOLBAR_OTHERS,
   disabled$: fe(t, {
-    workbookTypes: [he],
-    worksheetTypes: [pe],
-    rangeTypes: [le]
+    workbookTypes: [K],
+    worksheetTypes: [Y],
+    rangeTypes: [q]
   }),
-  hidden$: me(t, b.UNIVER_SHEET)
-}), Et = {
-  id: z.id,
-  binding: Ze.M | te.CTRL_COMMAND | te.ALT,
-  preconditions: it
+  hidden$: le(t, b.UNIVER_SHEET)
+}), Rt = {
+  id: X.id,
+  binding: Ze.M | ie.CTRL_COMMAND | ie.ALT,
+  preconditions: st
 };
-var Rt = Object.defineProperty, $t = Object.getOwnPropertyDescriptor, Nt = (t, e, n, o) => {
-  for (var r = o > 1 ? void 0 : o ? $t(e, n) : e, i = t.length - 1, s; i >= 0; i--)
-    (s = t[i]) && (r = (o ? s(e, n, r) : s(r)) || r);
-  return o && r && Rt(e, n, r), r;
-}, P = (t, e) => (n, o) => e(n, o, t);
-const xt = {};
-let $ = class extends U {
-  constructor(t, e, n, o, r, i, s, d, u, a, m) {
-    super(), this._config = t, this._menuService = e, this._injector = n, this._componentManager = o, this._localeService = r, this._commandService = i, this._sheetsThreadCommentPopupService = s, this._sheetsThreadCommentModel = d, this._threadCommentPanelService = u, this._shortcutService = a, this._univerInstanceService = m, this._initMenu(), this._initShortcut(), this._initComponent(), this._initCommandListener(), this._initPanelListener();
+var $t = Object.defineProperty, Nt = Object.getOwnPropertyDescriptor, xt = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Nt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (o = (r ? s(e, n, o) : s(o)) || o);
+  return r && o && $t(e, n, o), o;
+}, I = (t, e) => (n, r) => e(n, r, t);
+const Dt = {};
+let N = class extends U {
+  constructor(t, e, n, r, o, i, s, a, d, c, h, u) {
+    super(), this._config = t, this._menuService = e, this._injector = n, this._componentManager = r, this._localeService = o, this._commandService = i, this._sheetsThreadCommentPopupService = s, this._sheetsThreadCommentModel = a, this._threadCommentPanelService = d, this._shortcutService = c, this._univerInstanceService = h, this._sheetPermissionInterceptorBaseController = u, this._initMenu(), this._initShortcut(), this._initComponent(), this._initCommandListener(), this._initPanelListener();
   }
   _initShortcut() {
-    this._shortcutService.registerShortcut(Et);
+    this._shortcutService.registerShortcut(Rt);
   }
   _initCommandListener() {
     this._commandService.onCommandExecuted((t) => {
-      if (t.id === Xe.id) {
-        const e = t.params, { unitId: n, subUnitId: o, selections: r, type: i } = e;
-        if ((i === Je.MOVE_END || i === void 0) && r[0].primary) {
-          const s = r[0].primary.actualRow, d = r[0].primary.actualColumn;
-          if (!this._sheetsThreadCommentModel.showCommentMarker(n, o, s, d)) {
-            this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(Q.id);
+      if (t.id === Je.id) {
+        const e = t.params, { unitId: n, subUnitId: r, selections: o, type: i } = e;
+        if ((i === Qe.MOVE_END || i === void 0) && o[0].primary) {
+          const s = o[0].primary.actualRow, a = o[0].primary.actualColumn;
+          if (!this._sheetsThreadCommentModel.showCommentMarker(n, r, s, a)) {
+            this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(oe.id);
             return;
           }
-          const u = this._sheetsThreadCommentModel.getByLocation(n, o, s, d);
-          u && this._commandService.executeCommand(Q.id, {
+          const d = this._sheetsThreadCommentModel.getByLocation(n, r, s, a);
+          d && this._commandService.executeCommand(oe.id, {
             unitId: n,
-            subUnitId: o,
-            commentId: u
+            subUnitId: r,
+            commentId: d
           });
         }
       }
-      if (t.id === W.id) {
+      if (t.id === z.id) {
         const e = t.params, n = this._sheetsThreadCommentPopupService.activePopup;
         if (!n)
           return;
-        const { unitId: o, subUnitId: r, commentId: i } = n;
-        e.unitId === o && e.subUnitId === r && e.commentId === i && this._sheetsThreadCommentPopupService.hidePopup();
+        const { unitId: r, subUnitId: o, commentId: i } = n;
+        e.unitId === r && e.subUnitId === o && e.commentId === i && this._sheetsThreadCommentPopupService.hidePopup();
       }
     });
   }
   _initMenu() {
     const { menu: t = {} } = this._config;
     [
-      yt,
+      Et,
       Ut
     ].forEach((e) => {
       this._menuService.addMenuItem(e(this._injector), t);
@@ -349,77 +348,86 @@ let $ = class extends U {
   }
   _initComponent() {
     [
-      [Me, wt],
-      [Be, Ot],
-      [X, Te]
+      [Me, yt],
+      [Fe, Ot],
+      [ne, we]
     ].forEach(([t, e]) => {
       this._componentManager.register(t, e);
     });
   }
   _initPanelListener() {
     this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe(async (t) => {
+      var e;
       if (t) {
-        const { unitId: e, subUnitId: n, commentId: o, trigger: r } = t, i = this._sheetsThreadCommentModel.getComment(e, n, o);
-        if (!i || i.resolved)
+        const { unitId: n, subUnitId: r, commentId: o, trigger: i } = t, s = this._sheetsThreadCommentModel.getComment(n, r, o);
+        if (!s || s.resolved)
           return;
-        const s = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
-        if (!s || s.getUnitId() !== e)
+        const a = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
+        if (!a || a.getUnitId() !== n)
           return;
-        s.getActiveSheet().getSheetId() !== n && await this._commandService.executeCommand(Qe.id, {
-          unitId: e,
-          subUnitId: n
+        ((e = a.getActiveSheet()) == null ? void 0 : e.getSheetId()) !== r && await this._commandService.executeCommand(et.id, {
+          unitId: n,
+          subUnitId: r
         });
-        const a = F(i.ref), m = 5;
-        await this._commandService.executeCommand(st.id, {
+        const h = Z(s.ref), { row: u, column: g } = h;
+        if (!this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+          workbookTypes: [K],
+          worksheetTypes: [Y],
+          rangeTypes: [q]
+        }, [{ startRow: u, startColumn: g, endRow: u, endColumn: g }]))
+          return;
+        const l = 5;
+        await this._commandService.executeCommand(at.id, {
           range: {
-            startRow: Math.max(a.row - m, 0),
-            endRow: a.row + m,
-            startColumn: Math.max(a.column - m, 0),
-            endColumn: a.column + m
+            startRow: Math.max(h.row - l, 0),
+            endRow: h.row + l,
+            startColumn: Math.max(h.column - l, 0),
+            endColumn: h.column + l
           }
         }), this._sheetsThreadCommentPopupService.showPopup({
-          unitId: e,
-          subUnitId: n,
-          row: a.row,
-          col: a.column,
-          commentId: i.id,
-          trigger: r
+          unitId: n,
+          subUnitId: r,
+          row: h.row,
+          col: h.column,
+          commentId: s.id,
+          trigger: i
         });
       } else
         this._sheetsThreadCommentPopupService.hidePopup();
     }));
   }
 };
-$ = Nt([
-  N(x.Starting, $),
-  P(1, Ge),
-  P(2, p(ae)),
-  P(3, p(ke)),
-  P(4, p(xe)),
-  P(5, Y),
-  P(6, p(M)),
-  P(7, p(R)),
-  P(8, p(q)),
-  P(9, Ke),
-  P(10, E)
-], $);
-var Dt = Object.defineProperty, jt = Object.getOwnPropertyDescriptor, At = (t, e, n, o) => {
-  for (var r = o > 1 ? void 0 : o ? jt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
-    (s = t[i]) && (r = (o ? s(e, n, r) : s(r)) || r);
-  return o && r && Dt(e, n, r), r;
-}, A = (t, e) => (n, o) => e(n, o, t);
-let V = class extends U {
-  constructor(t, e, n, o) {
-    super(), this._sheetInterceptorService = t, this._sheetsThreadCommentModel = e, this._univerInstanceService = n, this._renderManagerService = o, this._initViewModelIntercept(), this._initSkeletonChange();
+N = xt([
+  x(D.Starting, N),
+  I(1, Ke),
+  I(2, p(de)),
+  I(3, p(Ge)),
+  I(4, p(De)),
+  I(5, ee),
+  I(6, p(y)),
+  I(7, p($)),
+  I(8, p(te)),
+  I(9, Ye),
+  I(10, R),
+  I(11, p(Ce))
+], N);
+var jt = Object.defineProperty, At = Object.getOwnPropertyDescriptor, Vt = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? At(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (o = (r ? s(e, n, o) : s(o)) || o);
+  return r && o && jt(e, n, o), o;
+}, V = (t, e) => (n, r) => e(n, r, t);
+let L = class extends U {
+  constructor(t, e, n, r) {
+    super(), this._sheetInterceptorService = t, this._sheetsThreadCommentModel = e, this._univerInstanceService = n, this._renderManagerService = r, this._initViewModelIntercept(), this._initSkeletonChange();
   }
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        et.CELL_CONTENT,
+        tt.CELL_CONTENT,
         {
           handler: (t, e, n) => {
-            const { row: o, col: r, unitId: i, subUnitId: s } = e;
-            return this._sheetsThreadCommentModel.showCommentMarker(i, s, o, r) ? n({
+            const { row: r, col: o, unitId: i, subUnitId: s } = e;
+            return this._sheetsThreadCommentModel.showCommentMarker(i, s, r, o) ? n({
               ...t,
               markers: {
                 ...t == null ? void 0 : t.markers,
@@ -437,116 +445,121 @@ let V = class extends U {
   }
   _initSkeletonChange() {
     const t = () => {
+      var s;
       const e = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
-      if (!e)
+      if (!e) return;
+      const n = e.getUnitId(), r = (s = e.getActiveSheet()) == null ? void 0 : s.getSheetId();
+      if (!r) {
+        console.warn("No active sheet found");
         return;
-      const n = e.getUnitId(), o = e.getActiveSheet().getSheetId(), r = this._renderManagerService.getRenderById(n), i = r == null ? void 0 : r.with(at).getOrCreateSkeleton({ sheetId: o });
-      i == null || i.makeDirty(!0), i == null || i.calculate(), r && r.mainComponent.makeForceDirty();
+      }
+      const o = this._renderManagerService.getRenderById(n), i = o == null ? void 0 : o.with(ct).getOrCreateSkeleton({ sheetId: r });
+      i == null || i.makeDirty(!0), i == null || i.calculate(), o && o.mainComponent.makeForceDirty();
     };
     this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.subscribe(() => {
       t();
     }));
   }
 };
-V = At([
-  N(x.Ready, V),
-  A(0, p(ve)),
-  A(1, p(R)),
-  A(2, E),
-  A(3, ft)
-], V);
-var Vt = Object.defineProperty, Lt = Object.getOwnPropertyDescriptor, Ht = (t, e, n, o) => {
-  for (var r = o > 1 ? void 0 : o ? Lt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
-    (s = t[i]) && (r = (o ? s(e, n, r) : s(r)) || r);
-  return o && r && Vt(e, n, r), r;
-}, ie = (t, e) => (n, o) => e(n, o, t);
-const Bt = (t, e, n) => {
-  const o = F(t), r = n.row - e.row, i = n.column - e.column, s = {
-    startColumn: o.column + i,
-    startRow: o.row + r,
-    endColumn: o.column + i,
-    endRow: o.row + r
+L = Vt([
+  x(D.Ready, L),
+  V(0, p(ve)),
+  V(1, p($)),
+  V(2, R),
+  V(3, Ct)
+], L);
+var Ht = Object.defineProperty, Lt = Object.getOwnPropertyDescriptor, Bt = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Lt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (o = (r ? s(e, n, o) : s(o)) || o);
+  return r && o && Ht(e, n, o), o;
+}, ce = (t, e) => (n, r) => e(n, r, t);
+const Ft = (t, e, n) => {
+  const r = Z(t), o = n.row - e.row, i = n.column - e.column, s = {
+    startColumn: r.column + i,
+    startRow: r.row + o,
+    endColumn: r.column + i,
+    endRow: r.row + o
   };
-  return nt(s);
+  return rt(s);
 };
-let L = class extends U {
+let B = class extends U {
   constructor(e, n) {
     super();
-    y(this, "_copyInfo");
+    E(this, "_copyInfo");
     this._sheetClipboardService = e, this._sheetsThreadCommentModel = n, this._initClipboardHook();
   }
   // eslint-disable-next-line max-lines-per-function
   _initClipboardHook() {
     this.disposeWithMe(
       this._sheetClipboardService.addClipboardHook({
-        id: we,
-        onBeforeCopy: (e, n, o) => {
+        id: ye,
+        onBeforeCopy: (e, n, r) => {
           this._copyInfo = {
             unitId: e,
             subUnitId: n,
-            range: o
+            range: r
           };
         },
         // eslint-disable-next-line max-lines-per-function
-        onPasteCells: (e, n, o, r) => {
-          const { unitId: i, subUnitId: s, range: d } = n, u = {
-            row: d.rows[0],
-            column: d.cols[0]
+        onPasteCells: (e, n, r, o) => {
+          const { unitId: i, subUnitId: s, range: a } = n, d = {
+            row: a.rows[0],
+            column: a.cols[0]
           };
-          if (r.copyType === dt.CUT && this._copyInfo) {
-            const { range: a, unitId: m, subUnitId: h } = this._copyInfo, w = {
-              row: a.startRow,
-              column: a.startColumn
+          if (o.copyType === dt.CUT && this._copyInfo) {
+            const { range: c, unitId: h, subUnitId: u } = this._copyInfo, g = {
+              row: c.startRow,
+              column: c.startColumn
             };
-            if (!(i === m && s === h)) {
+            if (!(i === h && s === u)) {
               const C = [];
-              De.foreach(a, (c, l) => {
-                const v = this._sheetsThreadCommentModel.getCommentWithChildren(m, h, c, l);
+              je.foreach(c, (_, m) => {
+                const v = this._sheetsThreadCommentModel.getCommentWithChildren(h, u, _, m);
                 v && C.push(v);
               });
-              const S = [], I = [], O = [], D = [], j = (c) => {
-                S.unshift({
-                  id: W.id,
+              const l = [], P = [], O = [], j = [], A = (_) => {
+                l.unshift({
+                  id: z.id,
                   params: {
-                    unitId: m,
-                    subUnitId: h,
-                    commentId: c.id
+                    unitId: h,
+                    subUnitId: u,
+                    commentId: _.id
                   }
                 }), O.push({
-                  id: K.id,
+                  id: Q.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
                     comment: {
-                      ...c,
-                      ref: Bt(c.ref, w, u),
+                      ..._,
+                      ref: Ft(_.ref, g, d),
                       unitId: i,
                       subUnitId: s
                     }
                   }
-                }), I.push({
-                  id: K.id,
+                }), P.push({
+                  id: Q.id,
                   params: {
-                    unitId: m,
-                    subUnitId: h,
-                    comment: c
+                    unitId: h,
+                    subUnitId: u,
+                    comment: _
                   }
-                }), D.unshift({
-                  id: W.id,
+                }), j.unshift({
+                  id: z.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
-                    commentId: c.id
+                    commentId: _.id
                   }
                 });
               };
-              return C.forEach((c) => {
-                j(c.root), c.children.forEach((l) => {
-                  j(l);
+              return C.forEach((_) => {
+                A(_.root), _.children.forEach((m) => {
+                  A(m);
                 });
               }), {
-                redos: [...S, ...O],
-                undos: [...D, ...I]
+                redos: [...l, ...O],
+                undos: [...j, ...P]
               };
             }
           }
@@ -559,34 +572,40 @@ let L = class extends U {
     );
   }
 };
-L = Ht([
-  N(x.Rendered, L),
-  ie(0, p(ct)),
-  ie(1, p(R))
-], L);
-var Ft = Object.defineProperty, Wt = Object.getOwnPropertyDescriptor, Zt = (t, e, n, o) => {
-  for (var r = o > 1 ? void 0 : o ? Wt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
-    (s = t[i]) && (r = (o ? s(e, n, r) : s(r)) || r);
-  return o && r && Ft(e, n, r), r;
-}, k = (t, e) => (n, o) => e(n, o, t);
-let H = class extends U {
-  constructor(t, e, n) {
-    super(), this._hoverManagerService = t, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = n, this._initHoverEvent();
+B = Bt([
+  x(D.Rendered, B),
+  ce(0, p(ut)),
+  ce(1, p($))
+], B);
+var kt = Object.defineProperty, Wt = Object.getOwnPropertyDescriptor, Zt = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Wt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (o = (r ? s(e, n, o) : s(o)) || o);
+  return r && o && kt(e, n, o), o;
+}, H = (t, e) => (n, r) => e(n, r, t);
+let F = class extends U {
+  constructor(t, e, n, r) {
+    super(), this._hoverManagerService = t, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = n, this._sheetPermissionInterceptorBaseController = r, this._initHoverEvent();
   }
   _initHoverEvent() {
     this.disposeWithMe(
-      this._hoverManagerService.currentCell$.pipe(_t(100)).subscribe((t) => {
+      this._hoverManagerService.currentCell$.pipe(ft(100)).subscribe((t) => {
         const e = this._sheetsThreadCommentPopupService.activePopup;
         if (t && (e && e.temp || !e)) {
-          const { location: n } = t, { unitId: o, subUnitId: r, row: i, col: s } = n, d = this._sheetsThreadCommentModel.getByLocation(o, r, i, s);
-          if (d) {
-            const u = this._sheetsThreadCommentModel.getComment(o, r, d);
-            u && !u.resolved && this._sheetsThreadCommentPopupService.showPopup({
-              unitId: o,
-              subUnitId: r,
+          const { location: n } = t, { unitId: r, subUnitId: o, row: i, col: s } = n, a = this._sheetsThreadCommentModel.getByLocation(r, o, i, s);
+          if (a) {
+            if (!this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
+              workbookTypes: [K],
+              worksheetTypes: [Y],
+              rangeTypes: [q]
+            }, [{ startRow: i, startColumn: s, endRow: i, endColumn: s }]))
+              return;
+            const c = this._sheetsThreadCommentModel.getComment(r, o, a);
+            c && !c.resolved && this._sheetsThreadCommentPopupService.showPopup({
+              unitId: r,
+              subUnitId: o,
               row: i,
               col: s,
-              commentId: d,
+              commentId: a,
               temp: !0
             });
           } else
@@ -596,18 +615,19 @@ let H = class extends U {
     );
   }
 };
-H = Zt([
-  N(x.Rendered, H),
-  k(0, p(ut)),
-  k(1, p(M)),
-  k(2, p(R))
-], H);
-var zt = Object.defineProperty, kt = Object.getOwnPropertyDescriptor, Gt = (t, e, n, o) => {
-  for (var r = o > 1 ? void 0 : o ? kt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
-    (s = t[i]) && (r = (o ? s(e, n, r) : s(r)) || r);
-  return o && r && zt(e, n, r), r;
-}, G = (t, e) => (n, o) => e(n, o, t);
-let B = class extends U {
+F = Zt([
+  x(D.Rendered, F),
+  H(0, p(mt)),
+  H(1, p(y)),
+  H(2, p($)),
+  H(3, p(Ce))
+], F);
+var zt = Object.defineProperty, Gt = Object.getOwnPropertyDescriptor, Kt = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Gt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (o = (r ? s(e, n, o) : s(o)) || o);
+  return r && o && zt(e, n, o), o;
+}, J = (t, e) => (n, r) => e(n, r, t);
+let k = class extends U {
   constructor(t, e, n) {
     super(), this._sheetInterceptorService = t, this._univerInstanceService = e, this._threadCommentModel = n, this._initSheetChange();
   }
@@ -615,26 +635,30 @@ let B = class extends U {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
         getMutations: (t) => {
-          if (t.id === tt.id) {
-            const e = t.params, n = e.unitId ? this._univerInstanceService.getUnit(e.unitId) : this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
-            if (!n)
+          var e;
+          if (t.id === nt.id) {
+            const n = t.params, r = n.unitId ? this._univerInstanceService.getUnit(n.unitId) : this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
+            if (!r)
               return { redos: [], undos: [] };
-            const o = n.getUnitId(), r = e.subUnitId || n.getActiveSheet().getSheetId(), { commentMap: i } = this._threadCommentModel.ensureMap(o, r), s = Array.from(Object.keys(i)), d = Array.from(Object.values(i)), u = s.map((m) => ({
-              id: W.id,
+            const o = r.getUnitId(), i = n.subUnitId || ((e = r.getActiveSheet()) == null ? void 0 : e.getSheetId());
+            if (!i)
+              return { redos: [], undos: [] };
+            const { commentMap: s } = this._threadCommentModel.ensureMap(o, i), a = Array.from(Object.keys(s)), d = Array.from(Object.values(s)), c = a.map((u) => ({
+              id: z.id,
               params: {
                 unitId: o,
-                subUnitId: r,
-                commentId: m
+                subUnitId: i,
+                commentId: u
               }
-            })), a = d.map((m) => ({
-              id: K.id,
+            })), h = d.map((u) => ({
+              id: Q.id,
               params: {
                 unitId: o,
-                subUnitId: r,
-                comment: m
+                subUnitId: i,
+                comment: u
               }
             }));
-            return { redos: u, undos: a };
+            return { redos: c, undos: h };
           }
           return { redos: [], undos: [] };
         }
@@ -642,65 +666,65 @@ let B = class extends U {
     );
   }
 };
-B = Gt([
-  N(x.Ready, B),
-  G(0, p(ve)),
-  G(1, E),
-  G(2, p(_e))
-], B);
-var Oe = Object.defineProperty, Kt = Object.getOwnPropertyDescriptor, Yt = (t, e, n) => e in t ? Oe(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n, qt = (t, e, n, o) => {
-  for (var r = o > 1 ? void 0 : o ? Kt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
-    (s = t[i]) && (r = (o ? s(e, n, r) : s(r)) || r);
-  return o && r && Oe(e, n, r), r;
-}, se = (t, e) => (n, o) => e(n, o, t), ye = (t, e, n) => (Yt(t, typeof e != "symbol" ? e + "" : e, n), n);
-let Z = class extends Ae {
-  constructor(e = {}, n, o) {
+k = Kt([
+  x(D.Ready, k),
+  J(0, p(ve)),
+  J(1, R),
+  J(2, p(_e))
+], k);
+var Oe = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, qt = (t, e, n) => e in t ? Oe(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n, Xt = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Yt(e, n) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (o = (r ? s(e, n, o) : s(o)) || o);
+  return r && o && Oe(e, n, o), o;
+}, ue = (t, e) => (n, r) => e(n, r, t), Ee = (t, e, n) => qt(t, typeof e != "symbol" ? e + "" : e, n);
+let G = class extends Ve {
+  constructor(e = {}, n, r) {
     super();
-    y(this, "_pluginConfig");
-    this._injector = n, this._commandService = o, this._pluginConfig = ce.deepMerge({}, xt, e);
+    E(this, "_pluginConfig");
+    this._injector = n, this._commandService = r, this._pluginConfig = me.deepMerge({}, Dt, e);
   }
   onStarting(e) {
     [
       [
-        $,
+        N,
         {
-          useFactory: () => this._injector.createInstance($, this._pluginConfig)
+          useFactory: () => this._injector.createInstance(N, this._pluginConfig)
         }
       ],
-      [V],
       [L],
-      [H],
       [B],
-      [M]
+      [F],
+      [k],
+      [y]
     ].forEach((n) => {
       e.add(n);
-    }), [z].forEach((n) => {
+    }), [X].forEach((n) => {
       this._commandService.registerCommand(n);
     });
   }
 };
-ye(Z, "pluginName", we);
-ye(Z, "type", b.UNIVER_SHEET);
-Z = qt([
-  je(Fe, mt),
-  se(1, p(ae)),
-  se(2, p(Y))
-], Z);
+Ee(G, "pluginName", ye);
+Ee(G, "type", b.UNIVER_SHEET);
+G = Xt([
+  Ae(ke, ht),
+  ue(1, p(de)),
+  ue(2, p(ee))
+], G);
 export {
-  fn as ICommandService,
-  Tn as IThreadCommentDataSourceService,
-  gn as IThreadCommentMentionDataService,
-  ln as Inject,
-  vn as Injector,
-  Cn as Plugin,
-  we as SHEETS_THREAD_COMMENT,
-  $ as SheetsThreadCommentController,
-  L as SheetsThreadCommentCopyPasteController,
-  H as SheetsThreadCommentHoverController,
-  wn as SheetsThreadCommentModel,
-  M as SheetsThreadCommentPopupService,
-  B as ThreadCommentRemoveSheetsController,
-  Sn as UniverInstanceType,
-  Z as UniverSheetsThreadCommentPlugin,
-  Pn as UniverThreadCommentUIPlugin
+  Cn as ICommandService,
+  wn as IThreadCommentDataSourceService,
+  Pn as IThreadCommentMentionDataService,
+  vn as Inject,
+  _n as Injector,
+  Sn as Plugin,
+  ye as SHEETS_THREAD_COMMENT,
+  N as SheetsThreadCommentController,
+  B as SheetsThreadCommentCopyPasteController,
+  F as SheetsThreadCommentHoverController,
+  yn as SheetsThreadCommentModel,
+  y as SheetsThreadCommentPopupService,
+  k as ThreadCommentRemoveSheetsController,
+  In as UniverInstanceType,
+  G as UniverSheetsThreadCommentPlugin,
+  Tn as UniverThreadCommentUIPlugin
 };