@univerjs/thread-comment-ui 0.2.3 → 0.2.4

package/lib/es/index.js

@@ -1,37 +1,39 @@
-var je = Object.defineProperty;
-var Ve = (t, e, n) => e in t ? je(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
-var w = (t, e, n) => Ve(t, typeof e != "symbol" ? e + "" : e, n);
-import Be from "dayjs";
-import { UniverThreadCommentPlugin as Fe, ThreadCommentModel as Se, AddCommentCommand as We, UpdateCommentCommand as ze, ResolveCommentCommand as Ze, DeleteCommentTreeCommand as Ee, DeleteCommentCommand as Ye } from "@univerjs/thread-comment";
-import { Disposable as ye, UniverInstanceType as he, IUniverInstanceService as Ge, CommandType as xe, OnLifecycle as Ke, LifecycleStages as qe, LocaleService as se, Plugin as Je, mergeOverrideWithDependencies as Qe, DependentOn as Xe, ICommandService as J, CustomRangeType as et, UserManagerService as Ce, Tools as tt } from "@univerjs/core";
-import { Inject as ve, createIdentifier as nt, Injector as rt } from "@wendellhu/redi";
-import { ISidebarService as _e, useObservable as L } from "@univerjs/ui";
-import { BehaviorSubject as fe, filter as ot } from "rxjs";
-import a, { forwardRef as A, useRef as me, createElement as V, useState as k, useImperativeHandle as at, useEffect as ue, useMemo as ce } from "react";
-import { useDependency as S } from "@wendellhu/redi/react-bindings";
-import { Mentions as it, Mention as lt, Button as ae, Dropdown as st, Menu as mt, MenuItem as ge, Select as pe } from "@univerjs/design";
-import dt from "clsx";
-import { ITextSelectionRenderManager as ct } from "@univerjs/engine-render";
-import { TextSelectionManagerService as ut } from "@univerjs/docs";
-function ht() {
-  return Be().format("YYYY/MM/DD HH:mm");
+var We = Object.defineProperty;
+var Fe = (t, e, n) => e in t ? We(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
+var w = (t, e, n) => Fe(t, typeof e != "symbol" ? e + "" : e, n);
+import ze from "dayjs";
+import { UniverThreadCommentPlugin as Ze, ThreadCommentModel as xe, AddCommentCommand as Ye, UpdateCommentCommand as Ge, ResolveCommentCommand as Ke, DeleteCommentTreeCommand as _e, DeleteCommentCommand as qe } from "@univerjs/thread-comment";
+import { Disposable as Te, UniverInstanceType as Ce, IUniverInstanceService as Je, CommandType as Ne, OnLifecycle as Qe, LifecycleStages as Xe, LocaleService as de, Plugin as et, mergeOverrideWithDependencies as tt, DependentOn as nt, ICommandService as X, CustomRangeType as rt, UserManagerService as fe, Tools as ot } from "@univerjs/core";
+import { Inject as ge, createIdentifier as at, Injector as it } from "@wendellhu/redi";
+import { ISidebarService as Me, useObservable as j } from "@univerjs/ui";
+import { BehaviorSubject as Ie, filter as lt } from "rxjs";
+import a, { forwardRef as A, useRef as ce, createElement as B, useState as k, useImperativeHandle as st, useEffect as ve, useMemo as he } from "react";
+import { useDependency as b } from "@wendellhu/redi/react-bindings";
+import { Mentions as mt, Mention as dt, Button as le, Dropdown as ct, Menu as ut, MenuItem as Se, Select as be } from "@univerjs/design";
+import ht from "clsx";
+import { ITextSelectionRenderManager as vt } from "@univerjs/engine-render";
+import { TextSelectionManagerService as Ct } from "@univerjs/docs";
+function ft() {
+  return ze().format("YYYY/MM/DD HH:mm");
 }
-const Ct = "thread-comment-panel", vt = "THREAD_COMMENT_UI_PLUGIN";
-var ft = Object.defineProperty, gt = Object.getOwnPropertyDescriptor, pt = (t, e, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? gt(e, n) : e, l = t.length - 1, m; l >= 0; l--)
-    (m = t[l]) && (o = (r ? m(e, n, o) : m(o)) || o);
-  return r && o && ft(e, n, o), o;
-}, Ie = (t, e) => (n, r) => e(n, r, t);
-let F = class extends ye {
+const gt = "thread-comment-panel", pt = "THREAD_COMMENT_UI_PLUGIN";
+var It = Object.defineProperty, St = Object.getOwnPropertyDescriptor, bt = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? St(e, n) : e, i = t.length - 1, m; i >= 0; i--)
+    (m = t[i]) && (o = (r ? m(e, n, o) : m(o)) || o);
+  return r && o && It(e, n, o), o;
+}, Ee = (t, e) => (n, r) => e(n, r, t);
+let z = class extends Te {
   constructor(e, n) {
     super();
     w(this, "_panelVisible", !1);
-    w(this, "_panelVisible$", new fe(!1));
+    w(this, "_panelVisible$", new Ie(!1));
     w(this, "_activeCommentId");
-    w(this, "_activeCommentId$", new fe(void 0));
+    w(this, "_activeCommentId$", new Ie(void 0));
     w(this, "panelVisible$", this._panelVisible$.asObservable());
     w(this, "activeCommentId$", this._activeCommentId$.asObservable());
-    this._sidebarService = e, this._univerInstanceService = n, this._init();
+    this._sidebarService = e, this._univerInstanceService = n, this._init(), this.disposeWithMe(() => {
+      this._activeCommentId$.complete(), this._panelVisible$.complete();
+    });
   }
   _init() {
     this.disposeWithMe(
@@ -39,7 +41,7 @@ let F = class extends ye {
         e.visible || this.setPanelVisible(!1);
       })
     ), this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(he.UNIVER_SHEET).pipe(ot((e) => !e)).subscribe(() => {
+      this._univerInstanceService.getCurrentTypeOfUnit$(Ce.UNIVER_SHEET).pipe(lt((e) => !e)).subscribe(() => {
         this._sidebarService.close();
       })
     );
@@ -57,43 +59,43 @@ let F = class extends ye {
     this._activeCommentId = e, this._activeCommentId$.next(e);
   }
 };
-F = pt([
-  Ie(0, ve(_e)),
-  Ie(1, Ge)
-], F);
-const It = {
+z = bt([
+  Ee(0, ge(Me)),
+  Ee(1, Je)
+], z);
+const Et = {
   id: "thread-comment-ui.operation.toggle-panel",
-  type: xe.OPERATION,
+  type: Ne.OPERATION,
   handler(t) {
-    const e = t.get(_e), n = t.get(F);
+    const e = t.get(Me), n = t.get(z);
     return n.panelVisible ? (e.close(), n.setPanelVisible(!1)) : (e.open({
       header: { title: "threadCommentUI.panel.title" },
-      children: { label: Ct },
+      children: { label: gt },
       width: 320
     }), n.setPanelVisible(!0)), !0;
   }
-}, j = {
+}, V = {
   id: "thread-comment-ui.operation.set-active-comment",
-  type: xe.OPERATION,
+  type: Ne.OPERATION,
   handler(t, e) {
-    return t.get(F).setActiveComment(e), !0;
+    return t.get(z).setActiveComment(e), !0;
   }
 };
-var bt = Object.defineProperty, St = Object.getOwnPropertyDescriptor, Et = (t, e, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? St(e, n) : e, l = t.length - 1, m; l >= 0; l--)
-    (m = t[l]) && (o = (r ? m(e, n, o) : m(o)) || o);
-  return r && o && bt(e, n, o), o;
-}, yt = (t, e) => (n, r) => e(n, r, t);
-let oe = class extends ye {
+var yt = Object.defineProperty, xt = Object.getOwnPropertyDescriptor, _t = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? xt(e, n) : e, i = t.length - 1, m; i >= 0; i--)
+    (m = t[i]) && (o = (r ? m(e, n, o) : m(o)) || o);
+  return r && o && yt(e, n, o), o;
+}, Tt = (t, e) => (n, r) => e(n, r, t);
+let ie = class extends Te {
   constructor(t) {
     super(), this._localeService = t;
   }
 };
-oe = Et([
-  Ke(qe.Starting, oe),
-  yt(0, ve(se))
-], oe);
-class xt {
+ie = _t([
+  Qe(Xe.Starting, ie),
+  Tt(0, ge(de))
+], ie);
+class Nt {
   constructor() {
     w(this, "dataSource");
     w(this, "renderSuggestion");
@@ -103,36 +105,36 @@ class xt {
     return this.dataSource ? this.dataSource.getMentions(e, n, r) : [];
   }
 }
-const Te = nt("thread-comment.mention-data.service");
-var Ne = Object.defineProperty, _t = Object.getOwnPropertyDescriptor, Tt = (t, e, n) => e in t ? Ne(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n, Nt = (t, e, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? _t(e, n) : e, l = t.length - 1, m; l >= 0; l--)
-    (m = t[l]) && (o = (r ? m(e, n, o) : m(o)) || o);
-  return r && o && Ne(e, n, o), o;
-}, be = (t, e) => (n, r) => e(n, r, t), Me = (t, e, n) => Tt(t, typeof e != "symbol" ? e + "" : e, n);
-let ie = class extends Je {
+const Pe = at("thread-comment.mention-data.service");
+var Ue = Object.defineProperty, Mt = Object.getOwnPropertyDescriptor, Pt = (t, e, n) => e in t ? Ue(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n, Ut = (t, e, n, r) => {
+  for (var o = r > 1 ? void 0 : r ? Mt(e, n) : e, i = t.length - 1, m; i >= 0; i--)
+    (m = t[i]) && (o = (r ? m(e, n, o) : m(o)) || o);
+  return r && o && Ue(e, n, o), o;
+}, ye = (t, e) => (n, r) => e(n, r, t), $e = (t, e, n) => Pt(t, typeof e != "symbol" ? e + "" : e, n);
+let se = class extends et {
   constructor(t, e, n) {
     super(), this._config = t, this._injector = e, this._commandService = n;
   }
   onStarting(t) {
     var e;
-    Qe([
-      [oe],
-      [F],
-      [Te, { useClass: xt }]
+    tt([
+      [ie],
+      [z],
+      [Pe, { useClass: Nt }]
     ], (e = this._config) == null ? void 0 : e.overrides).forEach((n) => {
       t.add(n);
-    }), [It, j].forEach((n) => {
+    }), [Et, V].forEach((n) => {
       this._commandService.registerCommand(n);
     });
   }
 };
-Me(ie, "pluginName", vt);
-Me(ie, "type", he.UNIVER_UNKNOWN);
-ie = Nt([
-  Xe(Fe),
-  be(1, ve(rt)),
-  be(2, J)
-], ie);
+$e(se, "pluginName", pt);
+$e(se, "type", Ce.UNIVER_UNKNOWN);
+se = Ut([
+  nt(Ze),
+  ye(1, ge(it)),
+  ye(2, X)
+], se);
 var T = function() {
   return T = Object.assign || function(t) {
     for (var e, n = 1, r = arguments.length; n < r; n++) {
@@ -141,95 +143,95 @@ var T = function() {
     }
     return t;
   }, T.apply(this, arguments);
-}, Mt = function(t, e) {
+}, $t = function(t, e) {
   var n = {};
   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 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;
-}, B = A(function(t, e) {
-  var n = t.icon, r = t.id, o = t.className, l = t.extend, m = Mt(t, ["icon", "id", "className", "extend"]), c = "univerjs-icon univerjs-icon-".concat(r, " ").concat(o || "").trim(), f = me("_".concat(Ot()));
-  return Ue(n, "".concat(r), { defIds: n.defIds, idSuffix: f.current }, T({ ref: e, className: c }, m), l);
+}, W = A(function(t, e) {
+  var n = t.icon, r = t.id, o = t.className, i = t.extend, m = $t(t, ["icon", "id", "className", "extend"]), c = "univerjs-icon univerjs-icon-".concat(r, " ").concat(o || "").trim(), f = ce("_".concat(Ht()));
+  return Oe(n, "".concat(r), { defIds: n.defIds, idSuffix: f.current }, T({ ref: e, className: c }, m), i);
 });
-function Ue(t, e, n, r, o) {
-  return V(t.tag, T(T({ key: e }, Ut(t, n, o)), r), (Pt(t, n).children || []).map(function(l, m) {
-    return Ue(l, "".concat(e, "-").concat(t.tag, "-").concat(m), n, void 0, o);
+function Oe(t, e, n, r, o) {
+  return B(t.tag, T(T({ key: e }, Ot(t, n, o)), r), (wt(t, n).children || []).map(function(i, m) {
+    return Oe(i, "".concat(e, "-").concat(t.tag, "-").concat(m), n, void 0, o);
   }));
 }
-function Ut(t, e, n) {
+function Ot(t, e, n) {
   var r = T({}, 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(l) {
-    var m = l[0], c = l[1];
+  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 m = i[0], c = i[1];
     typeof c == "string" && (r[m] = c.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), r;
 }
-function Pt(t, e) {
+function wt(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) ? T(T({}, t), { children: t.children.map(function(o) {
     return typeof o.attrs.id == "string" && r && r.indexOf(o.attrs.id) > -1 ? T(T({}, o), { attrs: T(T({}, o.attrs), { id: o.attrs.id + e.idSuffix }) }) : o;
   }) }) : t;
 }
-function Ot() {
+function Ht() {
   return Math.random().toString(36).substring(2, 8);
 }
-B.displayName = "UniverIcon";
-var $t = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.3313 1.4667C5.3313 1.13533 5.59993.866699 5.9313.866699H10.069C10.4004.866699 10.669 1.13533 10.669 1.4667 10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667zM1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443 14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443zM6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928 9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171 10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778 9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539 9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263 6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539 5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778 6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Pe = A(function(t, e) {
-  return V(B, Object.assign({}, t, {
+W.displayName = "UniverIcon";
+var Rt = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.3313 1.4667C5.3313 1.13533 5.59993.866699 5.9313.866699H10.069C10.4004.866699 10.669 1.13533 10.669 1.4667 10.669 1.79807 10.4004 2.0667 10.069 2.0667H5.9313C5.59993 2.0667 5.3313 1.79807 5.3313 1.4667zM1.09985 3.64443C1.09985 3.31306 1.36848 3.04443 1.69985 3.04443H14.2999C14.6312 3.04443 14.8999 3.31306 14.8999 3.64443 14.8999 3.9758 14.6312 4.24443 14.2999 4.24443H1.69985C1.36848 4.24443 1.09985 3.9758 1.09985 3.64443zM6.12398 8.30171C6.35829 8.0674 6.73819 8.0674 6.97251 8.30171L8.00007 9.32928 9.02764 8.30171C9.26195 8.0674 9.64185 8.0674 9.87617 8.30171 10.1105 8.53603 10.1105 8.91593 9.87617 9.15024L8.8486 10.1778 9.87617 11.2054C10.1105 11.4397 10.1105 11.8196 9.87617 12.0539 9.64185 12.2882 9.26195 12.2882 9.02764 12.0539L8.00007 11.0263 6.97251 12.0539C6.73819 12.2882 6.35829 12.2882 6.12398 12.0539 5.88966 11.8196 5.88966 11.4397 6.12398 11.2054L7.15154 10.1778 6.12398 9.15024C5.88966 8.91593 5.88966 8.53603 6.12398 8.30171z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.75332 5.22217C3.86966 5.22217 3.15332 5.93851 3.15332 6.82217V12.5331C3.15332 13.9691 4.31738 15.1332 5.75332 15.1332H10.2465C11.6825 15.1332 12.8465 13.9691 12.8465 12.5331V6.82217C12.8465 5.93851 12.1302 5.22217 11.2465 5.22217H4.75332ZM4.35332 6.82217C4.35332 6.60125 4.53241 6.42217 4.75332 6.42217H11.2465C11.4674 6.42217 11.6465 6.60125 11.6465 6.82217V12.5331C11.6465 13.3063 11.0197 13.9332 10.2465 13.9332H5.75332C4.98012 13.9332 4.35332 13.3063 4.35332 12.5331V6.82217Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, we = A(function(t, e) {
+  return B(W, Object.assign({}, t, {
     id: "delete-single",
     ref: e,
-    icon: $t
+    icon: Rt
   }));
 });
-Pe.displayName = "DeleteSingle";
-var wt = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8.6 1.99991C8.60001 1.66854 8.33138 1.39991 8.00001 1.3999C7.66864 1.3999 7.40001 1.66853 7.4 1.9999L7.39996 7.3999H1.9999C1.66853 7.3999 1.3999 7.66853 1.3999 7.9999C1.3999 8.33127 1.66853 8.5999 1.9999 8.5999H7.39995L7.3999 13.9999C7.3999 14.3313 7.66853 14.5999 7.9999 14.5999C8.33127 14.5999 8.5999 14.3313 8.5999 13.9999L8.59995 8.5999H13.9999C14.3313 8.5999 14.5999 8.33127 14.5999 7.9999C14.5999 7.66853 14.3313 7.3999 13.9999 7.3999H8.59996L8.6 1.99991Z" } }] }, Oe = A(function(t, e) {
-  return V(B, Object.assign({}, t, {
+we.displayName = "DeleteSingle";
+var Dt = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8.6 1.99991C8.60001 1.66854 8.33138 1.39991 8.00001 1.3999C7.66864 1.3999 7.40001 1.66853 7.4 1.9999L7.39996 7.3999H1.9999C1.66853 7.3999 1.3999 7.66853 1.3999 7.9999C1.3999 8.33127 1.66853 8.5999 1.9999 8.5999H7.39995L7.3999 13.9999C7.3999 14.3313 7.66853 14.5999 7.9999 14.5999C8.33127 14.5999 8.5999 14.3313 8.5999 13.9999L8.59995 8.5999H13.9999C14.3313 8.5999 14.5999 8.33127 14.5999 7.9999C14.5999 7.66853 14.3313 7.3999 13.9999 7.3999H8.59996L8.6 1.99991Z" } }] }, He = A(function(t, e) {
+  return B(W, Object.assign({}, t, {
     id: "increase-single",
     ref: e,
-    icon: wt
+    icon: Dt
   }));
 });
-Oe.displayName = "IncreaseSingle";
-var Ht = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M3 9C3.55228 9 4 8.55228 4 8 4 7.44772 3.55228 7 3 7 2.44772 7 2 7.44772 2 8 2 8.55228 2.44772 9 3 9zM8 9C8.55228 9 9 8.55228 9 8 9 7.44772 8.55228 7 8 7 7.44772 7 7 7.44772 7 8 7 8.55228 7.44772 9 8 9zM13 9C13.5523 9 14 8.55228 14 8 14 7.44772 13.5523 7 13 7 12.4477 7 12 7.44772 12 8 12 8.55228 12.4477 9 13 9z" } }] }, $e = A(function(t, e) {
-  return V(B, Object.assign({}, t, {
+He.displayName = "IncreaseSingle";
+var kt = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M3 9C3.55228 9 4 8.55228 4 8 4 7.44772 3.55228 7 3 7 2.44772 7 2 7.44772 2 8 2 8.55228 2.44772 9 3 9zM8 9C8.55228 9 9 8.55228 9 8 9 7.44772 8.55228 7 8 7 7.44772 7 7 7.44772 7 8 7 8.55228 7.44772 9 8 9zM13 9C13.5523 9 14 8.55228 14 8 14 7.44772 13.5523 7 13 7 12.4477 7 12 7.44772 12 8 12 8.55228 12.4477 9 13 9z" } }] }, Re = A(function(t, e) {
+  return B(W, Object.assign({}, t, {
     id: "more-horizontal-single",
     ref: e,
-    icon: Ht
+    icon: kt
   }));
 });
-$e.displayName = "MoreHorizontalSingle";
-var Rt = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { stroke: "currentColor", d: "M7.48389 10.3267V12.1905C7.48389 12.7428 7.9316 13.1905 8.48389 13.1905H11.2216L12.2955 14.2644L13.3695 13.1905H14.1593C14.7116 13.1905 15.1593 12.7428 15.1593 12.1905V8.46289C15.1593 7.91061 14.7116 7.46289 14.1593 7.46289H12.2955", strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 1.2 } }, { tag: "path", attrs: { stroke: "currentColor", d: "M0.840332 3.73535C0.840332 2.63078 1.73576 1.73535 2.84033 1.73535H10.2955C11.4001 1.73535 12.2955 2.63078 12.2955 3.73535V8.32676C12.2955 9.43132 11.4001 10.3268 10.2955 10.3268H5.6014L4.1695 11.7587L3.05978 10.3268H2.84033C1.73576 10.3268 0.840332 9.43133 0.840332 8.32676V3.73535Z", strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 1.2 } }, { tag: "path", attrs: { stroke: "currentColor", d: "M6.41016 6.1311H6.76813M8.91626 6.1311H9.27424M3.90454 6.1311H4.26252", strokeLinecap: "round", strokeWidth: 1.2 } }] }, we = A(function(t, e) {
-  return V(B, Object.assign({}, t, {
+Re.displayName = "MoreHorizontalSingle";
+var At = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { stroke: "currentColor", d: "M7.48389 10.3267V12.1905C7.48389 12.7428 7.9316 13.1905 8.48389 13.1905H11.2216L12.2955 14.2644L13.3695 13.1905H14.1593C14.7116 13.1905 15.1593 12.7428 15.1593 12.1905V8.46289C15.1593 7.91061 14.7116 7.46289 14.1593 7.46289H12.2955", strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 1.2 } }, { tag: "path", attrs: { stroke: "currentColor", d: "M0.840332 3.73535C0.840332 2.63078 1.73576 1.73535 2.84033 1.73535H10.2955C11.4001 1.73535 12.2955 2.63078 12.2955 3.73535V8.32676C12.2955 9.43132 11.4001 10.3268 10.2955 10.3268H5.6014L4.1695 11.7587L3.05978 10.3268H2.84033C1.73576 10.3268 0.840332 9.43133 0.840332 8.32676V3.73535Z", strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 1.2 } }, { tag: "path", attrs: { stroke: "currentColor", d: "M6.41016 6.1311H6.76813M8.91626 6.1311H9.27424M3.90454 6.1311H4.26252", strokeLinecap: "round", strokeWidth: 1.2 } }] }, De = A(function(t, e) {
+  return B(W, Object.assign({}, t, {
     id: "reply-to-comment-single",
     ref: e,
-    icon: Rt
+    icon: At
   }));
 });
-we.displayName = "ReplyToCommentSingle";
-var Dt = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 17", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8.6106 15.4036C12.4766 15.4036 15.6106 12.2696 15.6106 8.40356C15.6106 4.53757 12.4766 1.40356 8.6106 1.40356C4.7446 1.40356 1.6106 4.53757 1.6106 8.40356C1.6106 12.2696 4.7446 15.4036 8.6106 15.4036ZM12.3351 6.82773C12.5694 6.59342 12.5694 6.21352 12.3351 5.9792C12.1007 5.74489 11.7208 5.74489 11.4865 5.9792L7.91079 9.55494L6.33506 7.9792C6.10074 7.74489 5.72084 7.74489 5.48653 7.9792C5.25221 8.21352 5.25221 8.59342 5.48653 8.82773L7.48653 10.8277C7.72084 11.062 8.10074 11.062 8.33506 10.8277L12.3351 6.82773Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, He = A(function(t, e) {
-  return V(B, Object.assign({}, t, {
+De.displayName = "ReplyToCommentSingle";
+var Lt = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 17", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8.6106 15.4036C12.4766 15.4036 15.6106 12.2696 15.6106 8.40356C15.6106 4.53757 12.4766 1.40356 8.6106 1.40356C4.7446 1.40356 1.6106 4.53757 1.6106 8.40356C1.6106 12.2696 4.7446 15.4036 8.6106 15.4036ZM12.3351 6.82773C12.5694 6.59342 12.5694 6.21352 12.3351 5.9792C12.1007 5.74489 11.7208 5.74489 11.4865 5.9792L7.91079 9.55494L6.33506 7.9792C6.10074 7.74489 5.72084 7.74489 5.48653 7.9792C5.25221 8.21352 5.25221 8.59342 5.48653 8.82773L7.48653 10.8277C7.72084 11.062 8.10074 11.062 8.33506 10.8277L12.3351 6.82773Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, ke = A(function(t, e) {
+  return B(W, Object.assign({}, t, {
     id: "resolved-single",
     ref: e,
-    icon: Dt
+    icon: Lt
   }));
 });
-He.displayName = "ResolvedSingle";
-var kt = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 17", width: "1em", height: "1em" }, children: [{ tag: "circle", attrs: { cx: 8.73, cy: 8.4, r: 6.4, stroke: "currentColor", strokeWidth: 1.2 } }, { tag: "path", attrs: { stroke: "currentColor", d: "M6.02637 8.40356L8.02637 10.4036L12.0264 6.40356", strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 1.2 } }] }, Re = A(function(t, e) {
-  return V(B, Object.assign({}, t, {
+ke.displayName = "ResolvedSingle";
+var jt = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 17", width: "1em", height: "1em" }, children: [{ tag: "circle", attrs: { cx: 8.73, cy: 8.4, r: 6.4, stroke: "currentColor", strokeWidth: 1.2 } }, { tag: "path", attrs: { stroke: "currentColor", d: "M6.02637 8.40356L8.02637 10.4036L12.0264 6.40356", strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 1.2 } }] }, Ae = A(function(t, e) {
+  return B(W, Object.assign({}, t, {
     id: "solve-single",
     ref: e,
-    icon: kt
+    icon: jt
   }));
 });
-Re.displayName = "SolveSingle";
-const At = "univer-thread-comment-editor-buttons", Lt = "univer-thread-comment-editor-suggestion", jt = "univer-thread-comment-editor-suggestionActive", Vt = "univer-thread-comment-editor-suggestion-icon", le = {
-  threadCommentEditorButtons: At,
-  threadCommentEditorSuggestion: Lt,
-  threadCommentEditorSuggestionActive: jt,
-  threadCommentEditorSuggestionIcon: Vt
-}, Bt = (t) => {
+Ae.displayName = "SolveSingle";
+const Vt = "univer-thread-comment-editor-buttons", Bt = "univer-thread-comment-editor-suggestion", Wt = "univer-thread-comment-editor-suggestionActive", Ft = "univer-thread-comment-editor-suggestion-icon", me = {
+  threadCommentEditorButtons: Vt,
+  threadCommentEditorSuggestion: Bt,
+  threadCommentEditorSuggestionActive: Wt,
+  threadCommentEditorSuggestionIcon: Ft
+}, zt = (t) => {
   const e = /@\[(.*?)\]\((.*?)\)|(\w+)/g;
   let n, r = 0;
   const o = [];
@@ -251,32 +253,32 @@ const At = "univer-thread-comment-editor-buttons", Lt = "univer-thread-comment-e
     type: "text",
     content: t.substring(r)
   }), o;
-}, Ft = (t) => t.map((e) => {
+}, Zt = (t) => t.map((e) => {
   switch (e.type) {
     case "mention":
       return `@[${e.content.label}](${e.content.id})`;
     default:
       return e.content;
   }
-}).join(""), De = (t) => {
+}).join(""), Le = (t) => {
   const { dataStream: e, customRanges: n } = t, r = e.length - 2, o = [];
-  let l = 0;
+  let i = 0;
   return n == null || n.forEach((m) => {
-    l < m.startIndex && o.push({
+    i < m.startIndex && o.push({
       type: "text",
-      content: e.slice(l, m.startIndex)
+      content: e.slice(i, m.startIndex)
     }), o.push({
       type: "mention",
       content: {
         label: e.slice(m.startIndex, m.endIndex).slice(1, -1),
         id: m.rangeId
       }
-    }), l = m.endIndex;
+    }), i = m.endIndex;
   }), o.push({
     type: "text",
-    content: e.slice(l, r)
+    content: e.slice(i, r)
   }), o;
-}, ke = (t) => {
+}, je = (t) => {
   let e = "";
   const n = [];
   return t.forEach((r) => {
@@ -287,12 +289,12 @@ const At = "univer-thread-comment-editor-buttons", Lt = "univer-thread-comment-e
       case "mention": {
         const o = e.length;
         e += `${r.content.label}`;
-        const l = e.length;
+        const i = e.length;
         n.push({
           rangeId: r.content.id,
-          rangeType: et.MENTION,
+          rangeType: rt.MENTION,
           startIndex: o,
-          endIndex: l
+          endIndex: i
         });
         break;
       }
@@ -314,63 +316,63 @@ const At = "univer-thread-comment-editor-buttons", Lt = "univer-thread-comment-e
     dataStream: e,
     customRanges: n
   };
-}, Wt = (t) => ({
+}, Yt = (t) => ({
   display: t.label,
   id: `${t.id}`,
   raw: t
-}), zt = (t, e, n, r, o) => {
+}), Gt = (t, e, n, r, o) => {
   var m, c;
-  const l = (m = t.raw) == null ? void 0 : m.icon;
-  return /* @__PURE__ */ a.createElement("div", { className: le.threadCommentEditorSuggestion }, l ? /* @__PURE__ */ a.createElement("img", { className: le.threadCommentEditorSuggestionIcon, src: l }) : null, /* @__PURE__ */ a.createElement("div", null, (c = t.display) != null ? c : t.id));
-}, Ae = A((t, e) => {
-  var C;
-  const { comment: n, onSave: r, id: o, onCancel: l, autoFocus: m, unitId: c, subUnitId: f } = t, y = S(Te), P = S(J), _ = S(se), [I, h] = k({ ...n }), [g, b] = k(!1), N = me(null), E = S(ct), H = S(ut);
-  return at(e, () => ({
-    reply(v) {
+  const i = (m = t.raw) == null ? void 0 : m.icon;
+  return /* @__PURE__ */ a.createElement("div", { className: me.threadCommentEditorSuggestion }, i ? /* @__PURE__ */ a.createElement("img", { className: me.threadCommentEditorSuggestionIcon, src: i }) : null, /* @__PURE__ */ a.createElement("div", null, (c = t.display) != null ? c : t.id));
+}, Ve = A((t, e) => {
+  var v;
+  const { comment: n, onSave: r, id: o, onCancel: i, autoFocus: m, unitId: c, subUnitId: f } = t, y = b(Pe), P = b(X), _ = b(de), [I, h] = k({ ...n }), [g, S] = k(!1), N = ce(null), E = b(vt), H = b(Ct);
+  return st(e, () => ({
+    reply(C) {
       var d;
       h({
         ...n,
-        text: v,
+        text: C,
         attachments: []
       }), (d = N.current) == null || d.inputElement.focus();
     }
-  })), /* @__PURE__ */ a.createElement("div", { className: le.threadCommentEditor, onClick: (v) => v.preventDefault() }, /* @__PURE__ */ a.createElement(
-    it,
+  })), /* @__PURE__ */ a.createElement("div", { className: me.threadCommentEditor, onClick: (C) => C.preventDefault() }, /* @__PURE__ */ a.createElement(
+    mt,
     {
       ref: N,
       autoFocus: m,
       style: { width: "100%" },
       placeholder: _.t("threadCommentUI.editor.placeholder"),
-      value: I != null && I.text ? Ft(De(I.text)) : "",
-      onChange: (v) => {
-        v.target.value || h({ ...n, text: void 0 }), h == null || h({ ...n, text: ke(Bt(v.target.value)) });
+      value: I != null && I.text ? Zt(Le(I.text)) : "",
+      onChange: (C) => {
+        C.target.value || h({ ...n, text: void 0 }), h == null || h({ ...n, text: je(zt(C.target.value)) });
       },
       onFocus: () => {
-        const v = H.getActiveRange();
-        v && v.collapsed && E.removeAllTextRanges(), E.blur(), b(!0);
+        const C = H.getActiveRange();
+        C && C.collapsed && E.removeAllTextRanges(), E.blur(), S(!0);
       }
     },
     /* @__PURE__ */ a.createElement(
-      lt,
+      dt,
       {
         key: y.trigger,
         trigger: y.trigger,
-        data: (v, d) => y.getMentions(v, c, f).then((s) => s.map(Wt)).then(d),
-        displayTransform: (v, d) => `@${d} `,
-        renderSuggestion: (C = y.renderSuggestion) != null ? C : zt
+        data: (C, d) => y.getMentions(C, c, f).then((l) => l.map(Yt)).then(d),
+        displayTransform: (C, d) => `@${d} `,
+        renderSuggestion: (v = y.renderSuggestion) != null ? v : Gt
       }
     )
-  ), g ? /* @__PURE__ */ a.createElement("div", { className: le.threadCommentEditorButtons }, /* @__PURE__ */ a.createElement(
-    ae,
+  ), g ? /* @__PURE__ */ a.createElement("div", { className: me.threadCommentEditorButtons }, /* @__PURE__ */ a.createElement(
+    le,
     {
       style: { marginRight: 12 },
       onClick: () => {
-        l == null || l(), b(!1), h({ text: void 0 }), P.executeCommand(j.id);
+        i == null || i(), S(!1), h({ text: void 0 }), P.executeCommand(V.id);
       }
     },
     _.t("threadCommentUI.editor.cancel")
   ), /* @__PURE__ */ a.createElement(
-    ae,
+    le,
     {
       type: "primary",
       disabled: !I.text,
@@ -378,35 +380,35 @@ const At = "univer-thread-comment-editor-buttons", Lt = "univer-thread-comment-e
         I.text && (r == null || r({
           ...I,
           text: I.text
-        }), b(!1), h({ text: void 0 }));
+        }), S(!1), h({ text: void 0 }));
       }
     },
     _.t(o ? "threadCommentUI.editor.save" : "threadCommentUI.editor.reply")
   )) : null);
-}), Zt = "univer-thread-comment", Yt = "univer-thread-comment-active", Gt = "univer-thread-comment-content", Kt = "univer-thread-comment-highlight", qt = "univer-thread-comment-icon-container", Jt = "univer-thread-comment-icon", Qt = "univer-thread-comment-title", Xt = "univer-thread-comment-title-position", en = "univer-thread-comment-title-highlight", tn = "univer-thread-comment-title-position-text", nn = "univer-thread-comment-username", rn = "univer-thread-comment-item", on = "univer-thread-comment-item-head", an = "univer-thread-comment-item-title", ln = "univer-thread-comment-item-title-position", sn = "univer-thread-comment-item-title-highlight", mn = "univer-thread-comment-item-time", dn = "univer-thread-comment-item-content", cn = "univer-thread-comment-item-at", u = {
-  threadComment: Zt,
-  threadCommentActive: Yt,
-  threadCommentContent: Gt,
-  threadCommentHighlight: Kt,
-  threadCommentIconContainer: qt,
-  threadCommentIcon: Jt,
-  threadCommentTitle: Qt,
-  threadCommentTitlePosition: Xt,
-  threadCommentTitleHighlight: en,
-  threadCommentTitlePositionText: tn,
-  threadCommentUsername: nn,
-  threadCommentItem: rn,
-  threadCommentItemHead: on,
-  threadCommentItemTitle: an,
-  threadCommentItemTitlePosition: ln,
-  threadCommentItemTitleHighlight: sn,
-  threadCommentItemTime: mn,
-  threadCommentItemContent: dn,
-  threadCommentItemAt: cn
-}, Le = "__mock__", un = (t) => {
-  const { item: e, unitId: n, subUnitId: r, editing: o, onEditingChange: l, onReply: m, resolved: c, isRoot: f, onClose: y, onDeleteComment: P } = t, _ = S(J), I = S(se), h = S(Ce), g = h.getUser(e.personId), b = L(h.currentUser$), N = (b == null ? void 0 : b.userID) === e.personId, E = e.id === Le, [H, C] = k(!1), v = () => {
+}), Kt = "univer-thread-comment", qt = "univer-thread-comment-active", Jt = "univer-thread-comment-content", Qt = "univer-thread-comment-highlight", Xt = "univer-thread-comment-icon-container", en = "univer-thread-comment-icon", tn = "univer-thread-comment-title", nn = "univer-thread-comment-title-position", rn = "univer-thread-comment-title-highlight", on = "univer-thread-comment-title-position-text", an = "univer-thread-comment-username", ln = "univer-thread-comment-item", sn = "univer-thread-comment-item-head", mn = "univer-thread-comment-item-title", dn = "univer-thread-comment-item-title-position", cn = "univer-thread-comment-item-title-highlight", un = "univer-thread-comment-item-time", hn = "univer-thread-comment-item-content", vn = "univer-thread-comment-item-at", u = {
+  threadComment: Kt,
+  threadCommentActive: qt,
+  threadCommentContent: Jt,
+  threadCommentHighlight: Qt,
+  threadCommentIconContainer: Xt,
+  threadCommentIcon: en,
+  threadCommentTitle: tn,
+  threadCommentTitlePosition: nn,
+  threadCommentTitleHighlight: rn,
+  threadCommentTitlePositionText: on,
+  threadCommentUsername: an,
+  threadCommentItem: ln,
+  threadCommentItemHead: sn,
+  threadCommentItemTitle: mn,
+  threadCommentItemTitlePosition: dn,
+  threadCommentItemTitleHighlight: cn,
+  threadCommentItemTime: un,
+  threadCommentItemContent: hn,
+  threadCommentItemAt: vn
+}, Be = "__mock__", Cn = (t) => {
+  const { item: e, unitId: n, subUnitId: r, editing: o, onEditingChange: i, onReply: m, resolved: c, isRoot: f, onClose: y, onDeleteComment: P } = t, _ = b(X), I = b(de), h = b(fe), g = h.getUser(e.personId), S = j(h.currentUser$), N = (S == null ? void 0 : S.userID) === e.personId, E = e.id === Be, [H, v] = k(!1), C = () => {
     (P == null ? void 0 : P(e)) !== !1 && (_.executeCommand(
-      f ? Ee.id : Ye.id,
+      f ? _e.id : qe.id,
       {
         unitId: n,
         subUnitId: r,
@@ -414,52 +416,52 @@ const At = "univer-thread-comment-editor-buttons", Lt = "univer-thread-comment-e
       }
     ), f && (y == null || y()));
   };
-  return /* @__PURE__ */ a.createElement("div", { className: u.threadCommentItem, onMouseLeave: () => C(!1), onMouseEnter: () => C(!0) }, /* @__PURE__ */ a.createElement("img", { className: u.threadCommentItemHead, src: g == null ? void 0 : g.avatar }), /* @__PURE__ */ a.createElement("div", { className: u.threadCommentItemTitle }, /* @__PURE__ */ a.createElement("div", { className: u.threadCommentUsername }, (g == null ? void 0 : g.name) || " "), /* @__PURE__ */ a.createElement("div", null, E || c ? null : H ? /* @__PURE__ */ a.createElement("div", { className: u.threadCommentIcon, onClick: () => m(g) }, /* @__PURE__ */ a.createElement(we, null)) : null, N && !E && !c ? /* @__PURE__ */ a.createElement(
-    st,
+  return /* @__PURE__ */ a.createElement("div", { className: u.threadCommentItem, onMouseLeave: () => v(!1), onMouseEnter: () => v(!0) }, /* @__PURE__ */ a.createElement("img", { className: u.threadCommentItemHead, src: g == null ? void 0 : g.avatar }), /* @__PURE__ */ a.createElement("div", { className: u.threadCommentItemTitle }, /* @__PURE__ */ a.createElement("div", { className: u.threadCommentUsername }, (g == null ? void 0 : g.name) || " "), /* @__PURE__ */ a.createElement("div", null, E || c ? null : H ? /* @__PURE__ */ a.createElement("div", { className: u.threadCommentIcon, onClick: () => m(g) }, /* @__PURE__ */ a.createElement(De, null)) : null, N && !E && !c ? /* @__PURE__ */ a.createElement(
+    ct,
     {
-      overlay: /* @__PURE__ */ a.createElement(mt, null, /* @__PURE__ */ a.createElement(ge, { key: "edit", onClick: () => l == null ? void 0 : l(!0) }, I.t("threadCommentUI.item.edit")), /* @__PURE__ */ a.createElement(ge, { key: "delete", onClick: v }, I.t("threadCommentUI.item.delete")))
+      overlay: /* @__PURE__ */ a.createElement(ut, null, /* @__PURE__ */ a.createElement(Se, { key: "edit", onClick: () => i == null ? void 0 : i(!0) }, I.t("threadCommentUI.item.edit")), /* @__PURE__ */ a.createElement(Se, { key: "delete", onClick: C }, I.t("threadCommentUI.item.delete")))
     },
-    /* @__PURE__ */ a.createElement("div", { className: u.threadCommentIcon }, /* @__PURE__ */ a.createElement($e, null))
+    /* @__PURE__ */ a.createElement("div", { className: u.threadCommentIcon }, /* @__PURE__ */ a.createElement(Re, null))
   ) : null)), /* @__PURE__ */ a.createElement("div", { className: u.threadCommentItemTime }, e.dT), o ? /* @__PURE__ */ a.createElement(
-    Ae,
+    Ve,
     {
       id: e.id,
       comment: e,
-      onCancel: () => l == null ? void 0 : l(!1),
+      onCancel: () => i == null ? void 0 : i(!1),
       autoFocus: !0,
       unitId: n,
       subUnitId: r,
-      onSave: ({ text: d, attachments: s }) => {
-        l == null || l(!1), _.executeCommand(
-          ze.id,
+      onSave: ({ text: d, attachments: l }) => {
+        i == null || i(!1), _.executeCommand(
+          Ge.id,
           {
             unitId: n,
             subUnitId: r,
             payload: {
               commentId: e.id,
               text: d,
-              attachments: s
+              attachments: l
             }
           }
         );
       }
     }
-  ) : /* @__PURE__ */ a.createElement("div", { className: u.threadCommentItemContent }, De(e.text).map((d, s) => {
+  ) : /* @__PURE__ */ a.createElement("div", { className: u.threadCommentItemContent }, Le(e.text).map((d, l) => {
     switch (d.type) {
       case "mention":
-        return /* @__PURE__ */ a.createElement("a", { className: u.threadCommentItemAt, key: s }, "@", d.content.label, " ");
+        return /* @__PURE__ */ a.createElement("a", { className: u.threadCommentItemAt, key: l }, "@", d.content.label, " ");
       default:
         return d.content;
     }
   })));
-}, hn = (t) => {
-  var Y, G, K;
+}, fn = (t) => {
+  var K, F, ne;
   const {
     id: e,
     unitId: n,
     subUnitId: r,
     refStr: o,
-    showEdit: l = !0,
+    showEdit: i = !0,
     onClick: m,
     showHighlight: c,
     onClose: f,
@@ -469,20 +471,20 @@ const At = "univer-thread-comment-editor-buttons", Lt = "univer-thread-comment-e
     onMouseEnter: I,
     onMouseLeave: h,
     onAddComment: g,
-    onDeleteComment: b,
+    onDeleteComment: S,
     onResolve: N
-  } = t, E = S(Se), [H, C] = k(!1), [v, d] = k("");
-  L(E.commentMap$);
-  const s = e ? E.getCommentWithChildren(n, r, e) : null, R = S(J), de = S(Ce), p = s == null ? void 0 : s.root.resolved, M = L(de.currentUser$), W = me(null), Q = [
-    ...s ? [s.root] : (
+  } = t, E = b(xe), [H, v] = k(!1), [C, d] = k("");
+  j(E.commentMap$);
+  const l = e ? E.getCommentWithChildren(n, r, e) : null, R = b(X), ue = b(fe), p = l == null ? void 0 : l.root.resolved, M = j(ue.currentUser$), Z = ce(null), ee = [
+    ...l ? [l.root] : (
       // mock empty comment
       [{
-        id: Le,
+        id: Be,
         text: {
           dataStream: `
 \r`
         },
-        personId: (Y = M == null ? void 0 : M.userID) != null ? Y : "",
+        personId: (K = M == null ? void 0 : M.userID) != null ? K : "",
         ref: o != null ? o : "",
         dT: "",
         unitId: n,
@@ -490,21 +492,21 @@ const At = "univer-thread-comment-editor-buttons", Lt = "univer-thread-comment-e
         threadId: ""
       }]
     ),
-    ...(G = s == null ? void 0 : s.children) != null ? G : []
-  ], z = (x) => {
-    x.stopPropagation(), p ? R.executeCommand(j.id, {
+    ...(F = l == null ? void 0 : l.children) != null ? F : []
+  ], Y = (x) => {
+    x.stopPropagation(), p ? R.executeCommand(V.id, {
       unitId: n,
       subUnitId: r,
       commentId: e
-    }) : R.executeCommand(j.id), R.executeCommand(Ze.id, {
+    }) : R.executeCommand(V.id), R.executeCommand(Ke.id, {
       unitId: n,
       subUnitId: r,
       commentId: e,
       resolved: !p
     }), N == null || N(!p);
-  }, X = (x) => {
-    x.stopPropagation(), R.executeCommand(j.id), !(s != null && s.root && (b == null ? void 0 : b(s.root)) === !1) && (R.executeCommand(
-      Ee.id,
+  }, te = (x) => {
+    x.stopPropagation(), R.executeCommand(V.id), !(l != null && l.root && (S == null ? void 0 : S(l.root)) === !1) && (R.executeCommand(
+      _e.id,
       {
         unitId: n,
         subUnitId: r,
@@ -512,115 +514,116 @@ const At = "univer-thread-comment-editor-buttons", Lt = "univer-thread-comment-e
       }
     ), f == null || f());
   };
-  ue(() => h == null ? void 0 : h(), []);
-  const O = y((K = s == null ? void 0 : s.root.subUnitId) != null ? K : r), Z = l && !v && !p, D = `${o || (s == null ? void 0 : s.root.ref)}${O ? " · " : ""}${O}`;
+  ve(() => h == null ? void 0 : h(), []);
+  const U = y((ne = l == null ? void 0 : l.root.subUnitId) != null ? ne : r), G = i && !C && !p, D = `${o || (l == null ? void 0 : l.root.ref) || ""}${U ? " · " : ""}${U}`;
   return /* @__PURE__ */ a.createElement(
     "div",
     {
-      className: dt(u.threadComment, {
+      className: ht(u.threadComment, {
         [u.threadCommentActive]: !p && (c || H || P === "cell")
       }),
       onClick: m,
       id: `${P}-${n}-${r}-${e}`,
       onMouseEnter: () => {
-        I == null || I(), C(!0);
+        I == null || I(), v(!0);
       },
       onMouseLeave: () => {
-        h == null || h(), C(!1);
+        h == null || h(), v(!1);
       }
     },
     !p && c ? /* @__PURE__ */ a.createElement("div", { className: u.threadCommentHighlight }) : null,
-    /* @__PURE__ */ a.createElement("div", { className: u.threadCommentTitle }, /* @__PURE__ */ a.createElement("div", { className: u.threadCommentTitlePosition }, /* @__PURE__ */ a.createElement("div", { className: u.threadCommentTitleHighlight }), /* @__PURE__ */ a.createElement("div", { className: u.threadCommentTitlePositionText }, D)), s ? /* @__PURE__ */ a.createElement("div", { className: u.threadCommentIconContainer }, /* @__PURE__ */ a.createElement(
+    /* @__PURE__ */ a.createElement("div", { className: u.threadCommentTitle }, /* @__PURE__ */ a.createElement("div", { className: u.threadCommentTitlePosition }, /* @__PURE__ */ a.createElement("div", { className: u.threadCommentTitleHighlight }), /* @__PURE__ */ a.createElement("div", { className: u.threadCommentTitlePositionText }, D)), l ? /* @__PURE__ */ a.createElement("div", { className: u.threadCommentIconContainer }, /* @__PURE__ */ a.createElement(
       "div",
       {
-        onClick: z,
+        onClick: Y,
         className: u.threadCommentIcon,
         style: { color: p ? "rgb(var(--green-500))" : "" }
       },
-      p ? /* @__PURE__ */ a.createElement(He, null) : /* @__PURE__ */ a.createElement(Re, null)
-    ), (M == null ? void 0 : M.userID) === s.root.personId ? /* @__PURE__ */ a.createElement("div", { className: u.threadCommentIcon, onClick: X }, /* @__PURE__ */ a.createElement(Pe, null)) : null) : null),
-    /* @__PURE__ */ a.createElement("div", { className: u.threadCommentContent }, Q.map(
+      p ? /* @__PURE__ */ a.createElement(ke, null) : /* @__PURE__ */ a.createElement(Ae, null)
+    ), (M == null ? void 0 : M.userID) === l.root.personId ? /* @__PURE__ */ a.createElement("div", { className: u.threadCommentIcon, onClick: te }, /* @__PURE__ */ a.createElement(we, null)) : null) : null),
+    /* @__PURE__ */ a.createElement("div", { className: u.threadCommentContent }, ee.map(
       (x) => /* @__PURE__ */ a.createElement(
-        un,
+        Cn,
         {
           onClose: f,
           unitId: n,
           subUnitId: r,
           item: x,
           key: x.id,
-          isRoot: x.id === (s == null ? void 0 : s.root.id),
-          editing: v === x.id,
-          resolved: s == null ? void 0 : s.root.resolved,
-          onEditingChange: (i) => {
-            d(i ? x.id : "");
+          isRoot: x.id === (l == null ? void 0 : l.root.id),
+          editing: C === x.id,
+          resolved: l == null ? void 0 : l.root.resolved,
+          onEditingChange: ($) => {
+            d($ ? x.id : "");
           },
-          onReply: (i) => {
-            i && requestAnimationFrame(() => {
-              var U;
-              (U = W.current) == null || U.reply(ke([{
+          onReply: ($) => {
+            $ && requestAnimationFrame(() => {
+              var L;
+              (L = Z.current) == null || L.reply(je([{
                 type: "mention",
                 content: {
-                  id: i.userID,
-                  label: i.name
+                  id: $.userID,
+                  label: $.name
                 }
               }]));
             });
           },
           onAddComment: g,
-          onDeleteComment: b
+          onDeleteComment: S
         }
       )
     )),
-    Z ? /* @__PURE__ */ a.createElement("div", null, /* @__PURE__ */ a.createElement(
-      Ae,
+    G ? /* @__PURE__ */ a.createElement("div", null, /* @__PURE__ */ a.createElement(
+      Ve,
       {
         key: `${_}`,
-        ref: W,
+        ref: Z,
         unitId: n,
         subUnitId: r,
-        onSave: ({ text: x, attachments: i }) => {
-          const U = {
+        onSave: ({ text: x, attachments: $ }) => {
+          const L = {
             text: x,
-            attachments: i,
-            dT: ht(),
-            id: tt.generateRandomId(),
+            attachments: $,
+            dT: ft(),
+            id: ot.generateRandomId(),
             ref: o,
             personId: M == null ? void 0 : M.userID,
-            parentId: s == null ? void 0 : s.root.id,
+            parentId: l == null ? void 0 : l.root.id,
             unitId: n,
             subUnitId: r,
-            threadId: s == null ? void 0 : s.root.threadId
+            threadId: l == null ? void 0 : l.root.threadId
           };
-          (g == null ? void 0 : g(U)) !== !1 && R.executeCommand(
-            We.id,
+          (g == null ? void 0 : g(L)) !== !1 && R.executeCommand(
+            Ye.id,
             {
               unitId: n,
               subUnitId: r,
-              comment: U
+              comment: L
             }
           );
         },
-        autoFocus: _ || !s,
+        autoFocus: _ || !l,
         onCancel: () => {
-          s || f == null || f();
+          l || f == null || f();
         }
       }
     )) : null
   );
-}, Cn = "univer-thread-comment-panel", vn = "univer-thread-comment", fn = "univer-thread-comment-panel-forms", gn = "univer-select", pn = "univer-thread-comment-panel-empty", In = "univer-thread-comment-panel-add", re = {
-  threadCommentPanel: Cn,
-  threadComment: vn,
-  threadCommentPanelForms: fn,
-  select: gn,
-  threadCommentPanelEmpty: pn,
-  threadCommentPanelAdd: In
-}, wn = (t) => {
+}, gn = "univer-thread-comment-panel", pn = "univer-thread-comment", In = "univer-thread-comment-panel-forms", Sn = "univer-select", bn = "univer-thread-comment-panel-empty", En = "univer-thread-comment-panel-add", yn = "univer-thread-comment-panel-solved", Q = {
+  threadCommentPanel: gn,
+  threadComment: pn,
+  threadCommentPanelForms: In,
+  select: Sn,
+  threadCommentPanelEmpty: bn,
+  threadCommentPanelAdd: En,
+  threadCommentPanelSolved: yn
+}, kn = (t) => {
   const {
     unitId: e,
     subUnitId$: n,
     type: r,
     onAdd: o,
-    getSubUnitName: l,
+    getSubUnitName: i,
     onResolve: m,
     sortComments: c,
     onItemLeave: f,
@@ -630,136 +633,138 @@ const At = "univer-thread-comment-editor-buttons", Lt = "univer-thread-comment-e
     onAddComment: I,
     onDeleteComment: h,
     showComments: g
-  } = t, [b, N] = k("all"), [E, H] = k("all"), C = S(se), v = S(Ce), d = S(Se), [s, R] = k(() => d.getUnit(e)), de = S(F), p = L(de.activeCommentId$), M = L(d.commentUpdate$), W = S(J), Q = L(n), z = me(!0), X = "panel", O = L(v.currentUser$), Z = ce(() => {
-    var te, q;
-    const i = (b === "all" ? s.map(($) => $[1]).flat() : (q = (te = s.find(($) => $[0] === Q)) == null ? void 0 : te[1]) != null ? q : []).filter(($) => !$.parentId), U = c != null ? c : ($) => $, ee = i;
+  } = t, [S, N] = k("all"), [E, H] = k("all"), v = b(de), C = b(fe), d = b(xe), [l, R] = k(() => d.getUnit(e)), ue = b(z), p = j(ue.activeCommentId$), M = j(d.commentUpdate$), Z = b(X), ee = j(n), Y = ce(!0), te = "panel", U = j(C.currentUser$), G = he(() => {
+    var oe, J;
+    const s = (S === "all" ? l.map((O) => O[1]).flat() : (J = (oe = l.find((O) => O[0] === ee)) == null ? void 0 : oe[1]) != null ? J : []).filter((O) => !O.parentId), q = c != null ? c : (O) => O, re = s;
     if (g) {
-      const $ = /* @__PURE__ */ new Map();
-      return ee.forEach((ne) => {
-        $.set(ne.id, ne);
-      }), [...g, ""].map((ne) => $.get(ne)).filter(Boolean);
+      const O = /* @__PURE__ */ new Map();
+      return re.forEach((ae) => {
+        O.set(ae.id, ae);
+      }), [...g, ""].map((ae) => O.get(ae)).filter(Boolean);
     } else
-      return U(ee);
-  }, [g, b, s, c, Q]), D = ce(() => [
-    ...Z.filter((i) => !i.resolved),
-    ...Z.filter((i) => i.resolved)
-  ], [Z]), Y = ce(() => E === "resolved" ? D.filter((i) => i.resolved) : E === "unsolved" ? D.filter((i) => !i.resolved) : E === "concern_me" && O != null && O.userID ? D.map((i) => d.getCommentWithChildren(i.unitId, i.subUnitId, i.id)).map((i) => i != null && i.relativeUsers.has(O.userID) ? i.root : null).filter(Boolean) : D, [D, O == null ? void 0 : O.userID, E, d]), G = _ ? [_, ...Y] : Y, K = E !== "all" || b !== "all", x = () => {
+      return q(re);
+  }, [g, S, l, c, ee]), D = he(() => [
+    ...G.filter((s) => !s.resolved),
+    ...G.filter((s) => s.resolved)
+  ], [G]), K = he(() => E === "resolved" ? D.filter((s) => s.resolved) : E === "unsolved" ? D.filter((s) => !s.resolved) : E === "concern_me" && U != null && U.userID ? D.map((s) => d.getCommentWithChildren(s.unitId, s.subUnitId, s.id)).map((s) => s != null && s.relativeUsers.has(U.userID) ? s.root : null).filter(Boolean) : D, [D, U == null ? void 0 : U.userID, E, d]), F = _ ? [_, ...K] : K, ne = F.filter((s) => !s.resolved), x = F.filter((s) => s.resolved), $ = E !== "all" || S !== "all", L = () => {
     H("all"), N("all");
   };
-  return ue(() => {
+  ve(() => {
     e && R(
       d.getUnit(e)
     );
-  }, [e, d, M]), ue(() => {
-    var q;
+  }, [e, d, M]), ve(() => {
+    var J;
     if (!p)
       return;
-    if (!z.current) {
-      z.current = !0;
+    if (!Y.current) {
+      Y.current = !0;
       return;
     }
-    const { unitId: i, subUnitId: U, commentId: ee } = p, te = `${X}-${i}-${U}-${ee}`;
-    (q = document.getElementById(te)) == null || q.scrollIntoView({ block: "center" });
-  }, [p]), /* @__PURE__ */ a.createElement("div", { className: re.threadCommentPanel }, /* @__PURE__ */ a.createElement("div", { className: re.threadCommentPanelForms }, r === he.UNIVER_SHEET ? /* @__PURE__ */ a.createElement(
-    pe,
+    const { unitId: s, subUnitId: q, commentId: re } = p, oe = `${te}-${s}-${q}-${re}`;
+    (J = document.getElementById(oe)) == null || J.scrollIntoView({ block: "center" });
+  }, [p]);
+  const pe = (s) => /* @__PURE__ */ a.createElement(
+    fn,
+    {
+      prefix: te,
+      getSubUnitName: i,
+      key: s.id,
+      id: s.id,
+      unitId: s.unitId,
+      subUnitId: s.subUnitId,
+      refStr: s.ref,
+      type: r,
+      showEdit: (p == null ? void 0 : p.commentId) === s.id,
+      showHighlight: (p == null ? void 0 : p.commentId) === s.id,
+      onClick: () => {
+        Y.current = !1, s.resolved ? Z.executeCommand(V.id) : Z.executeCommand(
+          V.id,
+          {
+            unitId: s.unitId,
+            subUnitId: s.subUnitId,
+            commentId: s.id,
+            temp: !1
+          }
+        );
+      },
+      onMouseEnter: () => y == null ? void 0 : y(s),
+      onMouseLeave: () => f == null ? void 0 : f(s),
+      onAddComment: I,
+      onDeleteComment: h,
+      onResolve: (q) => m == null ? void 0 : m(s.id, q)
+    }
+  );
+  return /* @__PURE__ */ a.createElement("div", { className: Q.threadCommentPanel }, /* @__PURE__ */ a.createElement("div", { className: Q.threadCommentPanelForms }, r === Ce.UNIVER_SHEET ? /* @__PURE__ */ a.createElement(
+    be,
     {
       borderless: !0,
-      value: b,
-      onChange: (i) => N(i),
+      value: S,
+      onChange: (s) => N(s),
       options: [
         {
           value: "current",
-          label: C.t("threadCommentUI.filter.sheet.current")
+          label: v.t("threadCommentUI.filter.sheet.current")
         },
         {
           value: "all",
-          label: C.t("threadCommentUI.filter.sheet.all")
+          label: v.t("threadCommentUI.filter.sheet.all")
         }
       ]
     }
   ) : null, /* @__PURE__ */ a.createElement(
-    pe,
+    be,
     {
       borderless: !0,
       value: E,
-      onChange: (i) => H(i),
+      onChange: (s) => H(s),
       options: [
         {
           value: "all",
-          label: C.t("threadCommentUI.filter.status.all")
+          label: v.t("threadCommentUI.filter.status.all")
         },
         {
           value: "resolved",
-          label: C.t("threadCommentUI.filter.status.resolved")
+          label: v.t("threadCommentUI.filter.status.resolved")
         },
         {
           value: "unsolved",
-          label: C.t("threadCommentUI.filter.status.unsolved")
+          label: v.t("threadCommentUI.filter.status.unsolved")
         },
         {
           value: "concern_me",
-          label: C.t("threadCommentUI.filter.status.concernMe")
+          label: v.t("threadCommentUI.filter.status.concernMe")
         }
       ]
     }
-  )), G.map((i) => /* @__PURE__ */ a.createElement(
-    hn,
-    {
-      prefix: X,
-      getSubUnitName: l,
-      key: i.id,
-      id: i.id,
-      unitId: i.unitId,
-      subUnitId: i.subUnitId,
-      refStr: i.ref,
-      type: r,
-      showEdit: (p == null ? void 0 : p.commentId) === i.id,
-      showHighlight: (p == null ? void 0 : p.commentId) === i.id,
-      onClick: () => {
-        z.current = !1, i.resolved ? W.executeCommand(j.id) : W.executeCommand(
-          j.id,
-          {
-            unitId: i.unitId,
-            subUnitId: i.subUnitId,
-            commentId: i.id,
-            temp: !1
-          }
-        );
-      },
-      onMouseEnter: () => y == null ? void 0 : y(i),
-      onMouseLeave: () => f == null ? void 0 : f(i),
-      onAddComment: I,
-      onDeleteComment: h,
-      onResolve: (U) => m == null ? void 0 : m(i.id, U)
-    }
-  )), G.length ? null : /* @__PURE__ */ a.createElement("div", { className: re.threadCommentPanelEmpty }, K ? C.t("threadCommentUI.panel.filterEmpty") : C.t("threadCommentUI.panel.empty"), K ? /* @__PURE__ */ a.createElement(
-    ae,
+  )), ne.map(pe), x.length ? /* @__PURE__ */ a.createElement("div", { className: Q.threadCommentPanelSolved }, "已解决") : null, x.map(pe), F.length ? null : /* @__PURE__ */ a.createElement("div", { className: Q.threadCommentPanelEmpty }, $ ? v.t("threadCommentUI.panel.filterEmpty") : v.t("threadCommentUI.panel.empty"), $ ? /* @__PURE__ */ a.createElement(
+    le,
     {
-      onClick: x,
+      onClick: L,
       type: "link"
     },
-    C.t("threadCommentUI.panel.reset")
+    v.t("threadCommentUI.panel.reset")
   ) : /* @__PURE__ */ a.createElement(
-    ae,
+    le,
     {
       id: "thread-comment-add",
-      className: re.threadCommentPanelAdd,
+      className: Q.threadCommentPanelAdd,
       type: "primary",
       onClick: o,
       disabled: P
     },
-    /* @__PURE__ */ a.createElement(Oe, null),
-    C.t("threadCommentUI.panel.addComment")
+    /* @__PURE__ */ a.createElement(He, null),
+    v.t("threadCommentUI.panel.addComment")
   )));
 };
 export {
-  Te as IThreadCommentMentionDataService,
-  j as SetActiveCommentOperation,
-  Ct as THREAD_COMMENT_PANEL,
-  wn as ThreadCommentPanel,
-  F as ThreadCommentPanelService,
-  hn as ThreadCommentTree,
-  It as ToggleSheetCommentPanelOperation,
-  ie as UniverThreadCommentUIPlugin,
-  ht as getDT
+  Pe as IThreadCommentMentionDataService,
+  V as SetActiveCommentOperation,
+  gt as THREAD_COMMENT_PANEL,
+  kn as ThreadCommentPanel,
+  z as ThreadCommentPanelService,
+  fn as ThreadCommentTree,
+  Et as ToggleSheetCommentPanelOperation,
+  se as UniverThreadCommentUIPlugin,
+  ft as getDT
 };