@univerjs/thread-comment-ui 0.6.0 → 0.6.1

package/lib/es/index.js

@@ -1,21 +1,21 @@
 var Be = Object.defineProperty;
-var We = (t, e, n) => e in t ? Be(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
-var B = (t, e, n) => We(t, typeof e != "symbol" ? e + "" : e, n);
+var We = (t, e, r) => e in t ? Be(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
+var B = (t, e, r) => We(t, typeof e != "symbol" ? e + "" : e, r);
 import { Inject as Ne, IUniverInstanceService as Fe, Disposable as ze, UniverInstanceType as he, CommandType as Ue, DependentOn as Ze, Injector as Ke, ICommandService as oe, IConfigService as Ge, Plugin as Ye, merge as qe, mergeOverrideWithDependencies as Je, LocaleService as fe, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as Qe, BuildTextUtils as Ce, Tools as Xe, CustomRangeType as et, getBodySlice as tt, UserManagerService as pe, generateRandomId as nt } from "@univerjs/core";
-import { UniverThreadCommentPlugin as rt, ThreadCommentModel as Ee, getDT as ot, AddCommentCommand as it, ResolveCommentCommand as at, DeleteCommentTreeCommand as Pe, UpdateCommentCommand as st, DeleteCommentCommand as lt } from "@univerjs/thread-comment";
-import { ISidebarService as Oe, useDependency as T, KeyCode as ge, useObservable as W } from "@univerjs/ui";
+import { UniverThreadCommentPlugin as rt, ThreadCommentModel as Ee, getDT as ot, AddCommentCommand as it, ResolveCommentCommand as at, DeleteCommentTreeCommand as Oe, UpdateCommentCommand as st, DeleteCommentCommand as lt } from "@univerjs/thread-comment";
+import { ISidebarService as Pe, useDependency as T, KeyCode as ge, useObservable as W } from "@univerjs/ui";
 import { BehaviorSubject as Ie, filter as dt, debounceTime as ct } from "rxjs";
 import { jsxs as S, jsx as l } from "react/jsx-runtime";
 import { Button as ce, Tooltip as mt, DropdownLegacy as ut, Menu as ht, MenuItem as be, Select as Se } from "@univerjs/design";
-import { forwardRef as A, useRef as re, createElement as z, useState as V, useEffect as me, useMemo as ne, useImperativeHandle as Ct } from "react";
+import { forwardRef as j, useRef as re, createElement as z, useState as V, useEffect as me, useMemo as ne, useImperativeHandle as Ct } from "react";
 import { IEditorService as vt, BreakLineCommand as ft, RichTextEditor as pt } from "@univerjs/docs-ui";
-var gt = Object.getOwnPropertyDescriptor, It = (t, e, n, r) => {
-  for (var o = r > 1 ? void 0 : r ? gt(e, n) : e, s = t.length - 1, c; s >= 0; s--)
-    (c = t[s]) && (o = c(o) || o);
+var gt = Object.getOwnPropertyDescriptor, It = (t, e, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? gt(e, r) : e, a = t.length - 1, d; a >= 0; a--)
+    (d = t[a]) && (o = d(o) || o);
   return o;
-}, ye = (t, e) => (n, r) => e(n, r, t);
+}, ye = (t, e) => (r, n) => e(r, n, t);
 let Y = class extends ze {
-  constructor(e, n) {
+  constructor(e, r) {
     super();
     B(this, "_panelVisible", !1);
     B(this, "_panelVisible$", new Ie(!1));
@@ -23,7 +23,7 @@ let Y = class extends ze {
     B(this, "_activeCommentId$", new Ie(void 0));
     B(this, "panelVisible$", this._panelVisible$.asObservable());
     B(this, "activeCommentId$", this._activeCommentId$.asObservable());
-    this._sidebarService = e, this._univerInstanceService = n, this._init(), this.disposeWithMe(() => {
+    this._sidebarService = e, this._univerInstanceService = r, this._init(), this.disposeWithMe(() => {
       this._activeCommentId$.complete(), this._panelVisible$.complete();
     });
   }
@@ -52,19 +52,19 @@ let Y = class extends ze {
   }
 };
 Y = It([
-  ye(0, Ne(Oe)),
+  ye(0, Ne(Pe)),
   ye(1, Fe)
 ], Y);
 const bt = "thread-comment-panel", St = "UNIVER_THREAD_COMMENT_UI_PLUGIN", yt = {
   id: "thread-comment-ui.operation.toggle-panel",
   type: Ue.OPERATION,
   handler(t) {
-    const e = t.get(Oe), n = t.get(Y);
-    return n.panelVisible ? (e.close(), n.setPanelVisible(!1)) : (e.open({
+    const e = t.get(Pe), r = t.get(Y);
+    return r.panelVisible ? (e.close(), r.setPanelVisible(!1)) : (e.open({
       header: { title: "threadCommentUI.panel.title" },
       children: { label: bt },
       width: 330
-    }), n.setPanelVisible(!0)), !0;
+    }), r.setPanelVisible(!0)), !0;
   }
 }, F = {
   id: "thread-comment-ui.operation.set-active-comment",
@@ -73,20 +73,20 @@ const bt = "thread-comment-panel", St = "UNIVER_THREAD_COMMENT_UI_PLUGIN", yt =
     return t.get(Y).setActiveComment(e), !0;
   }
 }, _t = "thread-comment-ui.config", _e = {};
-var xt = Object.defineProperty, Tt = Object.getOwnPropertyDescriptor, Nt = (t, e, n) => e in t ? xt(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 ? Tt(e, n) : e, s = t.length - 1, c; s >= 0; s--)
-    (c = t[s]) && (o = c(o) || o);
+var xt = Object.defineProperty, Tt = Object.getOwnPropertyDescriptor, Nt = (t, e, r) => e in t ? xt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Ut = (t, e, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? Tt(e, r) : e, a = t.length - 1, d; a >= 0; a--)
+    (d = t[a]) && (o = d(o) || o);
   return o;
-}, ve = (t, e) => (n, r) => e(n, r, t), Me = (t, e, n) => Nt(t, typeof e != "symbol" ? e + "" : e, n);
+}, ve = (t, e) => (r, n) => e(r, n, t), Me = (t, e, r) => Nt(t, typeof e != "symbol" ? e + "" : e, r);
 let ue = class extends Ye {
-  constructor(t = _e, e, n, r) {
-    super(), this._config = t, this._injector = e, this._commandService = n, this._configService = r;
-    const { menu: o, ...s } = qe(
+  constructor(t = _e, e, r, n) {
+    super(), this._config = t, this._injector = e, this._commandService = r, this._configService = n;
+    const { menu: o, ...a } = qe(
       {},
       _e,
       this._config
     );
-    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(_t, s);
+    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(_t, a);
   }
   onStarting() {
     var t;
@@ -107,109 +107,112 @@ ue = Ut([
   ve(2, oe),
   ve(3, Ge)
 ], ue);
-var H = function() {
-  return H = Object.assign || function(t) {
-    for (var e, n = 1, r = arguments.length; n < r; n++) {
-      e = arguments[n];
+var D = function() {
+  return D = Object.assign || function(t) {
+    for (var e, r = 1, n = arguments.length; r < n; r++) {
+      e = arguments[r];
       for (var o in e) Object.prototype.hasOwnProperty.call(e, o) && (t[o] = e[o]);
     }
     return t;
-  }, H.apply(this, arguments);
+  }, D.apply(this, arguments);
 }, Et = function(t, e) {
-  var n = {};
-  for (var r in t) Object.prototype.hasOwnProperty.call(t, r) && e.indexOf(r) < 0 && (n[r] = t[r]);
+  var r = {};
+  for (var n in t) Object.prototype.hasOwnProperty.call(t, n) && e.indexOf(n) < 0 && (r[n] = t[n]);
   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;
-}, Z = A(function(t, e) {
-  var n = t.icon, r = t.id, o = t.className, s = t.extend, c = Et(t, ["icon", "id", "className", "extend"]), g = "univerjs-icon univerjs-icon-".concat(r, " ").concat(o || "").trim(), p = re("_".concat(Mt()));
-  return De(n, "".concat(r), { defIds: n.defIds, idSuffix: p.current }, H({ ref: e, className: g }, c), s);
+    for (var o = 0, n = Object.getOwnPropertySymbols(t); o < n.length; o++)
+      e.indexOf(n[o]) < 0 && Object.prototype.propertyIsEnumerable.call(t, n[o]) && (r[n[o]] = t[n[o]]);
+  return r;
+}, Z = j(function(t, e) {
+  var r = t.icon, n = t.id, o = t.className, a = t.extend, d = Et(t, ["icon", "id", "className", "extend"]), C = "univerjs-icon univerjs-icon-".concat(n, " ").concat(o || "").trim(), g = re("_".concat(Mt()));
+  return $e(r, "".concat(n), { defIds: r.defIds, idSuffix: g.current }, D({ ref: e, className: C }, d), a);
 });
-function De(t, e, n, r, o) {
-  return z(t.tag, H(H({ key: e }, Pt(t, n, o)), r), (Ot(t, n).children || []).map(function(s, c) {
-    return De(s, "".concat(e, "-").concat(t.tag, "-").concat(c), n, void 0, o);
+function $e(t, e, r, n, o) {
+  return z(t.tag, D(D({ key: e }, Ot(t, r, o)), n), (Pt(t, r).children || []).map(function(a, d) {
+    return $e(a, "".concat(e, "-").concat(t.tag, "-").concat(d), r, void 0, o);
   }));
 }
-function Pt(t, e, n) {
-  var r = H({}, t.attrs);
-  n != null && n.colorChannel1 && r.fill === "colorChannel1" && (r.fill = n.colorChannel1);
+function Ot(t, e, r) {
+  var n = D({}, t.attrs);
+  r != null && r.colorChannel1 && n.fill === "colorChannel1" && (n.fill = r.colorChannel1), t.tag === "mask" && n.id && (n.id = n.id + e.idSuffix), Object.entries(n).forEach(function(a) {
+    var d = a[0], C = a[1];
+    d === "mask" && typeof C == "string" && (n[d] = C.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+  });
   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(s) {
-    var c = s[0], g = s[1];
-    typeof g == "string" && (r[c] = g.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
-  })), r;
+  return !o || o.length === 0 || (t.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + e.idSuffix), Object.entries(n).forEach(function(a) {
+    var d = a[0], C = a[1];
+    typeof C == "string" && (n[d] = C.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+  })), n;
 }
-function Ot(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) ? H(H({}, t), { children: t.children.map(function(o) {
-    return typeof o.attrs.id == "string" && r && r.indexOf(o.attrs.id) > -1 ? H(H({}, o), { attrs: H(H({}, o.attrs), { id: o.attrs.id + e.idSuffix }) }) : o;
+function Pt(t, e) {
+  var r, n = e.defIds;
+  return !n || n.length === 0 ? t : t.tag === "defs" && (!((r = t.children) === null || r === void 0) && r.length) ? D(D({}, t), { children: t.children.map(function(o) {
+    return typeof o.attrs.id == "string" && n && n.indexOf(o.attrs.id) > -1 ? D(D({}, o), { attrs: D(D({}, o.attrs), { id: o.attrs.id + e.idSuffix }) }) : o;
   }) }) : t;
 }
 function Mt() {
   return Math.random().toString(36).substring(2, 8);
 }
 Z.displayName = "UniverIcon";
-var Dt = { 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" } }] }, He = A(function(t, e) {
+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" } }] }, De = j(function(t, e) {
   return z(Z, Object.assign({}, t, {
     id: "delete-single",
     ref: e,
-    icon: Dt
+    icon: $t
   }));
 });
-He.displayName = "DeleteSingle";
-var Ht = { 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" } }] }, $e = A(function(t, e) {
+De.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 = j(function(t, e) {
   return z(Z, Object.assign({}, t, {
     id: "increase-single",
     ref: e,
-    icon: Ht
+    icon: Dt
   }));
 });
-$e.displayName = "IncreaseSingle";
-var $t = { 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) {
+He.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" } }] }, ke = j(function(t, e) {
   return z(Z, Object.assign({}, t, {
     id: "more-horizontal-single",
     ref: e,
-    icon: $t
+    icon: Ht
   }));
 });
-Re.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) {
+ke.displayName = "MoreHorizontalSingle";
+var kt = { 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 } }] }, Re = j(function(t, e) {
   return z(Z, Object.assign({}, t, {
     id: "reply-to-comment-single",
     ref: e,
-    icon: Rt
+    icon: kt
   }));
 });
-we.displayName = "ReplyToCommentSingle";
-var wt = { 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) {
+Re.displayName = "ReplyToCommentSingle";
+var Rt = { 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" } }] }, we = j(function(t, e) {
   return z(Z, Object.assign({}, t, {
     id: "resolved-single",
     ref: e,
-    icon: wt
+    icon: Rt
   }));
 });
-ke.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 } }] }, Le = A(function(t, e) {
+we.displayName = "ResolvedSingle";
+var wt = { 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 } }] }, Le = j(function(t, e) {
   return z(Z, Object.assign({}, t, {
     id: "solve-single",
     ref: e,
-    icon: kt
+    icon: wt
   }));
 });
 Le.displayName = "SolveSingle";
 function Ve(t) {
-  var e, n, r = "";
-  if (typeof t == "string" || typeof t == "number") r += t;
+  var e, r, n = "";
+  if (typeof t == "string" || typeof t == "number") n += t;
   else if (typeof t == "object") if (Array.isArray(t)) {
     var o = t.length;
-    for (e = 0; e < o; e++) t[e] && (n = Ve(t[e])) && (r && (r += " "), r += n);
-  } else for (n in t) t[n] && (r && (r += " "), r += n);
-  return r;
+    for (e = 0; e < o; e++) t[e] && (r = Ve(t[e])) && (n && (n += " "), n += r);
+  } else for (r in t) t[r] && (n && (n += " "), n += r);
+  return n;
 }
 function Lt() {
-  for (var t, e, n = 0, r = "", o = arguments.length; n < o; n++) (t = arguments[n]) && (e = Ve(t)) && (r && (r += " "), r += e);
-  return r;
+  for (var t, e, r = 0, n = "", o = arguments.length; r < o; r++) (t = arguments[r]) && (e = Ve(t)) && (n && (n += " "), n += e);
+  return n;
 }
 const Vt = "univer-thread-comment-editor-buttons", xe = {
   threadCommentEditorButtons: Vt
@@ -221,77 +224,77 @@ function Te(t) {
     documentStyle: {}
   };
 }
-const Ae = A((t, e) => {
-  var w;
-  const { comment: n, onSave: r, id: o, onCancel: s, autoFocus: c, unitId: g, type: p } = t, N = T(oe), P = T(fe), [k, O] = V(!1), U = T(vt), m = re(null), v = p === he.UNIVER_SHEET ? Qe : g, [M, y] = V(() => {
-    var d, u, f;
-    return Ce.transform.getPlainText((f = (u = (d = m.current) == null ? void 0 : d.getDocumentData().body) == null ? void 0 : u.dataStream) != null ? f : "");
+const je = j((t, e) => {
+  var R;
+  const { comment: r, onSave: n, id: o, onCancel: a, autoFocus: d, unitId: C, type: g } = t, N = T(oe), O = T(fe), [w, P] = V(!1), U = T(vt), m = re(null), f = g === he.UNIVER_SHEET ? Qe : C, [M, y] = V(() => {
+    var c, u, p;
+    return Ce.transform.getPlainText((p = (u = (c = m.current) == null ? void 0 : c.getDocumentData().body) == null ? void 0 : u.dataStream) != null ? p : "");
   });
   me(() => {
-    var u, f, a, h;
-    y(Ce.transform.getPlainText((a = (f = (u = m.current) == null ? void 0 : u.getDocumentData().body) == null ? void 0 : f.dataStream) != null ? a : ""));
-    const d = (h = m.current) == null ? void 0 : h.selectionChange$.subscribe(() => {
+    var u, p, s, h;
+    y(Ce.transform.getPlainText((s = (p = (u = m.current) == null ? void 0 : u.getDocumentData().body) == null ? void 0 : p.dataStream) != null ? s : ""));
+    const c = (h = m.current) == null ? void 0 : h.selectionChange$.subscribe(() => {
       var K, _, b;
       y(Ce.transform.getPlainText((b = (_ = (K = m.current) == null ? void 0 : K.getDocumentData().body) == null ? void 0 : _.dataStream) != null ? b : ""));
     });
-    return () => d == null ? void 0 : d.unsubscribe();
-  }, [(w = m.current) == null ? void 0 : w.selectionChange$]);
-  const $ = ne(() => ({
+    return () => c == null ? void 0 : c.unsubscribe();
+  }, [(R = m.current) == null ? void 0 : R.selectionChange$]);
+  const H = ne(() => ({
     keyCodes: [{ keyCode: ge.ENTER }],
-    handler: (d) => {
-      d === ge.ENTER && N.executeCommand(
+    handler: (c) => {
+      c === ge.ENTER && N.executeCommand(
         ft.id
       );
     }
   }), [N]);
   Ct(e, () => ({
-    reply(d) {
-      var u, f;
-      (u = m.current) == null || u.focus(), (f = m.current) == null || f.setDocumentData(Te(d));
+    reply(c) {
+      var u, p;
+      (u = m.current) == null || u.focus(), (p = m.current) == null || p.setDocumentData(Te(c));
     }
   }));
   const I = () => {
     if (m.current) {
-      const d = Xe.deepClone(m.current.getDocumentData().body);
-      O(!1), r == null || r({
-        ...n,
-        text: d
+      const c = Xe.deepClone(m.current.getDocumentData().body);
+      P(!1), n == null || n({
+        ...r,
+        text: c
       }), m.current.replaceText(""), setTimeout(() => {
-        var u, f;
-        (u = m.current) == null || u.setSelectionRanges([]), (f = m.current) == null || f.blur();
+        var u, p;
+        (u = m.current) == null || u.setSelectionRanges([]), (p = m.current) == null || p.blur();
       }, 10);
     }
   };
-  return /* @__PURE__ */ S("div", { className: xe.threadCommentEditor, onClick: (d) => d.preventDefault(), children: [
+  return /* @__PURE__ */ S("div", { className: xe.threadCommentEditor, onClick: (c) => c.preventDefault(), children: [
     /* @__PURE__ */ l(
       pt,
       {
         ref: m,
-        autoFocus: c,
+        autoFocus: d,
         style: { width: "100%" },
-        keyboardEventConfig: $,
-        placeholder: P.t("threadCommentUI.editor.placeholder"),
-        initialValue: (n == null ? void 0 : n.text) && Te(n.text),
-        onFocusChange: (d) => d && O(d),
+        keyboardEventConfig: H,
+        placeholder: O.t("threadCommentUI.editor.placeholder"),
+        initialValue: (r == null ? void 0 : r.text) && Te(r.text),
+        onFocusChange: (c) => c && P(c),
         isSingle: !1,
         maxHeight: 64,
         onClickOutside: () => {
           setTimeout(() => {
-            U.focus(v);
+            U.focus(f);
           }, 30);
         }
       }
     ),
-    k ? /* @__PURE__ */ S("div", { className: xe.threadCommentEditorButtons, children: [
+    w ? /* @__PURE__ */ S("div", { className: xe.threadCommentEditorButtons, children: [
       /* @__PURE__ */ l(
         ce,
         {
           style: { marginRight: 12 },
           onClick: () => {
-            var d;
-            s == null || s(), O(!1), (d = m.current) == null || d.replaceText("", !0), N.executeCommand(F.id);
+            var c;
+            a == null || a(), P(!1), (c = m.current) == null || c.replaceText("", !0), N.executeCommand(F.id);
           },
-          children: P.t("threadCommentUI.editor.cancel")
+          children: O.t("threadCommentUI.editor.cancel")
         }
       ),
       /* @__PURE__ */ l(
@@ -300,54 +303,54 @@ const Ae = A((t, e) => {
           type: "primary",
           disabled: !M,
           onClick: I,
-          children: P.t(o ? "threadCommentUI.editor.save" : "threadCommentUI.editor.reply")
+          children: O.t(o ? "threadCommentUI.editor.save" : "threadCommentUI.editor.reply")
         }
       )
     ] }) : null
   ] });
-}), At = (t) => {
-  const { dataStream: e, customRanges: n } = t, r = e.endsWith(`\r
+}), jt = (t) => {
+  const { dataStream: e, customRanges: r } = t, n = e.endsWith(`\r
 `) ? e.length - 2 : e.length, o = [];
-  let s = 0;
-  return n == null || n.forEach((c) => {
-    s < c.startIndex && o.push({
+  let a = 0;
+  return r == null || r.forEach((d) => {
+    a < d.startIndex && o.push({
       type: "text",
-      content: e.slice(s, c.startIndex)
+      content: e.slice(a, d.startIndex)
     }), o.push({
       type: "mention",
       content: {
-        label: e.slice(c.startIndex, c.endIndex + 1),
-        id: c.rangeId
+        label: e.slice(d.startIndex, d.endIndex + 1),
+        id: d.rangeId
       }
-    }), s = c.endIndex + 1;
+    }), a = d.endIndex + 1;
   }), o.push({
     type: "text",
-    content: e.slice(s, r)
+    content: e.slice(a, n)
   }), o;
-}, jt = (t) => {
+}, At = (t) => {
   const { paragraphs: e = [] } = t;
-  let n = 0;
-  return e.map((r) => {
-    const o = tt(t, n, r.startIndex);
-    return n = r.startIndex + 1, At(o);
+  let r = 0;
+  return e.map((n) => {
+    const o = tt(t, r, n.startIndex);
+    return r = n.startIndex + 1, jt(o);
   });
 }, Bt = (t) => {
   let e = "";
-  const n = [];
-  return t.forEach((r) => {
-    switch (r.type) {
+  const r = [];
+  return t.forEach((n) => {
+    switch (n.type) {
       case "text":
-        e += r.content;
+        e += n.content;
         break;
       case "mention": {
         const o = e.length;
-        e += r.content.label;
-        const s = e.length - 1;
-        n.push({
-          rangeId: r.content.id,
+        e += n.content.label;
+        const a = e.length - 1;
+        r.push({
+          rangeId: n.content.id,
           rangeType: et.MENTION,
           startIndex: o,
-          endIndex: s,
+          endIndex: a,
           properties: {}
         });
         break;
@@ -368,9 +371,9 @@ const Ae = A((t, e) => {
       }
     ],
     dataStream: e,
-    customRanges: n
+    customRanges: r
   };
-}, Wt = "univer-thread-comment", Ft = "univer-thread-comment-active", zt = "univer-thread-comment-content", Zt = "univer-thread-comment-highlight", Kt = "univer-thread-comment-icon-container", Gt = "univer-thread-comment-icon", Yt = "univer-thread-comment-title", qt = "univer-thread-comment-title-position", Jt = "univer-thread-comment-title-highlight", Qt = "univer-thread-comment-title-position-text", Xt = "univer-thread-comment-username", en = "univer-thread-comment-item", tn = "univer-thread-comment-item-head", nn = "univer-thread-comment-item-title", rn = "univer-thread-comment-item-time", on = "univer-thread-comment-item-content", an = "univer-thread-comment-item-at", C = {
+}, Wt = "univer-thread-comment", Ft = "univer-thread-comment-active", zt = "univer-thread-comment-content", Zt = "univer-thread-comment-highlight", Kt = "univer-thread-comment-icon-container", Gt = "univer-thread-comment-icon", Yt = "univer-thread-comment-title", qt = "univer-thread-comment-title-position", Jt = "univer-thread-comment-title-highlight", Qt = "univer-thread-comment-title-position-text", Xt = "univer-thread-comment-username", en = "univer-thread-comment-item", tn = "univer-thread-comment-item-head", nn = "univer-thread-comment-item-title", rn = "univer-thread-comment-item-time", on = "univer-thread-comment-item-content", an = "univer-thread-comment-item-at", v = {
   threadComment: Wt,
   threadCommentActive: Ft,
   threadCommentContent: zt,
@@ -388,100 +391,100 @@ const Ae = A((t, e) => {
   threadCommentItemTime: rn,
   threadCommentItemContent: on,
   threadCommentItemAt: an
-}, je = "__mock__", sn = (t) => {
-  const { item: e, unitId: n, subUnitId: r, editing: o, onEditingChange: s, onReply: c, resolved: g, isRoot: p, onClose: N, onDeleteComment: P, type: k } = t, O = T(oe), U = T(fe), m = T(pe), v = m.getUser(e.personId), M = W(m.currentUser$), y = (M == null ? void 0 : M.userID) === e.personId, $ = e.id === je, [I, w] = V(!1), d = () => {
-    (P == null ? void 0 : P(e)) !== !1 && (O.executeCommand(
-      p ? Pe.id : lt.id,
+}, Ae = "__mock__", sn = (t) => {
+  const { item: e, unitId: r, subUnitId: n, editing: o, onEditingChange: a, onReply: d, resolved: C, isRoot: g, onClose: N, onDeleteComment: O, type: w } = t, P = T(oe), U = T(fe), m = T(pe), f = m.getUser(e.personId), M = W(m.currentUser$), y = (M == null ? void 0 : M.userID) === e.personId, H = e.id === Ae, [I, R] = V(!1), c = () => {
+    (O == null ? void 0 : O(e)) !== !1 && (P.executeCommand(
+      g ? Oe.id : lt.id,
       {
-        unitId: n,
-        subUnitId: r,
+        unitId: r,
+        subUnitId: n,
         commentId: e.id
       }
-    ), p && (N == null || N()));
+    ), g && (N == null || N()));
   };
-  return /* @__PURE__ */ S("div", { className: C.threadCommentItem, onMouseLeave: () => w(!1), onMouseEnter: () => w(!0), children: [
-    /* @__PURE__ */ l("img", { className: C.threadCommentItemHead, src: v == null ? void 0 : v.avatar }),
-    /* @__PURE__ */ S("div", { className: C.threadCommentItemTitle, children: [
-      /* @__PURE__ */ l("div", { className: C.threadCommentUsername, children: (v == null ? void 0 : v.name) || " " }),
+  return /* @__PURE__ */ S("div", { className: v.threadCommentItem, onMouseLeave: () => R(!1), onMouseEnter: () => R(!0), children: [
+    /* @__PURE__ */ l("img", { className: v.threadCommentItemHead, src: f == null ? void 0 : f.avatar }),
+    /* @__PURE__ */ S("div", { className: v.threadCommentItemTitle, children: [
+      /* @__PURE__ */ l("div", { className: v.threadCommentUsername, children: (f == null ? void 0 : f.name) || " " }),
       /* @__PURE__ */ S("div", { children: [
-        $ || g ? null : I ? /* @__PURE__ */ l("div", { className: C.threadCommentIcon, onClick: () => c(v), children: /* @__PURE__ */ l(we, {}) }) : null,
-        y && !$ && !g ? /* @__PURE__ */ l(
+        H || C ? null : I ? /* @__PURE__ */ l("div", { className: v.threadCommentIcon, onClick: () => d(f), children: /* @__PURE__ */ l(Re, {}) }) : null,
+        y && !H && !C ? /* @__PURE__ */ l(
           ut,
           {
             overlay: /* @__PURE__ */ S(ht, { children: [
-              /* @__PURE__ */ l(be, { onClick: () => s == null ? void 0 : s(!0), children: U.t("threadCommentUI.item.edit") }, "edit"),
-              /* @__PURE__ */ l(be, { onClick: d, children: U.t("threadCommentUI.item.delete") }, "delete")
+              /* @__PURE__ */ l(be, { onClick: () => a == null ? void 0 : a(!0), children: U.t("threadCommentUI.item.edit") }, "edit"),
+              /* @__PURE__ */ l(be, { onClick: c, children: U.t("threadCommentUI.item.delete") }, "delete")
             ] }),
-            children: /* @__PURE__ */ l("div", { className: C.threadCommentIcon, children: /* @__PURE__ */ l(Re, {}) })
+            children: /* @__PURE__ */ l("div", { className: v.threadCommentIcon, children: /* @__PURE__ */ l(ke, {}) })
           }
         ) : null
       ] })
     ] }),
-    /* @__PURE__ */ l("div", { className: C.threadCommentItemTime, children: e.dT }),
+    /* @__PURE__ */ l("div", { className: v.threadCommentItemTime, children: e.dT }),
     o ? /* @__PURE__ */ l(
-      Ae,
+      je,
       {
-        type: k,
+        type: w,
         id: e.id,
         comment: e,
-        onCancel: () => s == null ? void 0 : s(!1),
+        onCancel: () => a == null ? void 0 : a(!1),
         autoFocus: !0,
-        unitId: n,
-        subUnitId: r,
-        onSave: ({ text: u, attachments: f }) => {
-          s == null || s(!1), O.executeCommand(
+        unitId: r,
+        subUnitId: n,
+        onSave: ({ text: u, attachments: p }) => {
+          a == null || a(!1), P.executeCommand(
             st.id,
             {
-              unitId: n,
-              subUnitId: r,
+              unitId: r,
+              subUnitId: n,
               payload: {
                 commentId: e.id,
                 text: u,
-                attachments: f
+                attachments: p
               }
             }
           );
         }
       }
-    ) : /* @__PURE__ */ l("div", { className: C.threadCommentItemContent, children: jt(e.text).map((u, f) => /* @__PURE__ */ l("div", { children: u.map((a, h) => {
-      switch (a.type) {
+    ) : /* @__PURE__ */ l("div", { className: v.threadCommentItemContent, children: At(e.text).map((u, p) => /* @__PURE__ */ l("div", { children: u.map((s, h) => {
+      switch (s.type) {
         case "mention":
-          return /* @__PURE__ */ S("a", { className: C.threadCommentItemAt, children: [
-            a.content.label,
+          return /* @__PURE__ */ S("a", { className: v.threadCommentItemAt, children: [
+            s.content.label,
             " "
           ] }, h);
         default:
-          return a.content;
+          return s.content;
       }
-    }) }, f)) })
+    }) }, p)) })
   ] });
 }, ln = (t) => {
   var X, ee, se;
   const {
     id: e,
-    unitId: n,
-    subUnitId: r,
+    unitId: r,
+    subUnitId: n,
     refStr: o,
-    showEdit: s = !0,
-    onClick: c,
-    showHighlight: g,
-    onClose: p,
+    showEdit: a = !0,
+    onClick: d,
+    showHighlight: C,
+    onClose: g,
     getSubUnitName: N,
-    prefix: P,
-    autoFocus: k,
-    onMouseEnter: O,
+    prefix: O,
+    autoFocus: w,
+    onMouseEnter: P,
     onMouseLeave: U,
     onAddComment: m,
-    onDeleteComment: v,
+    onDeleteComment: f,
     onResolve: M,
     type: y
-  } = t, $ = T(Ee), [I, w] = V(!1), [d, u] = V(""), f = ne(() => $.commentUpdate$.pipe(ct(16)), [$]);
-  W(f);
-  const a = e ? $.getCommentWithChildren(n, r, e) : null, h = T(oe), K = T(pe), _ = a == null ? void 0 : a.root.resolved, b = W(K.currentUser$), G = re(null), ie = [
-    ...a ? [a.root] : (
+  } = t, H = T(Ee), [I, R] = V(!1), [c, u] = V(""), p = ne(() => H.commentUpdate$.pipe(ct(16)), [H]);
+  W(p);
+  const s = e ? H.getCommentWithChildren(r, n, e) : null, h = T(oe), K = T(pe), _ = s == null ? void 0 : s.root.resolved, b = W(K.currentUser$), G = re(null), ie = [
+    ...s ? [s.root] : (
       // mock empty comment
       [{
-        id: je,
+        id: Ae,
         text: {
           dataStream: `
 \r`
@@ -489,88 +492,88 @@ const Ae = A((t, e) => {
         personId: (X = b == null ? void 0 : b.userID) != null ? X : "",
         ref: o != null ? o : "",
         dT: "",
-        unitId: n,
-        subUnitId: r,
+        unitId: r,
+        subUnitId: n,
         threadId: ""
       }]
     ),
-    ...(ee = a == null ? void 0 : a.children) != null ? ee : []
-  ], D = re(null), q = (x) => {
+    ...(ee = s == null ? void 0 : s.children) != null ? ee : []
+  ], $ = re(null), q = (x) => {
     x.stopPropagation(), _ ? h.executeCommand(F.id, {
-      unitId: n,
-      subUnitId: r,
+      unitId: r,
+      subUnitId: n,
       commentId: e
     }) : h.executeCommand(F.id), h.executeCommand(at.id, {
-      unitId: n,
-      subUnitId: r,
+      unitId: r,
+      subUnitId: n,
       commentId: e,
       resolved: !_
     }), M == null || M(!_);
   }, L = (x) => {
-    x.stopPropagation(), h.executeCommand(F.id), !(a != null && a.root && (v == null ? void 0 : v(a.root)) === !1) && (h.executeCommand(
-      Pe.id,
+    x.stopPropagation(), h.executeCommand(F.id), !(s != null && s.root && (f == null ? void 0 : f(s.root)) === !1) && (h.executeCommand(
+      Oe.id,
       {
-        unitId: n,
-        subUnitId: r,
+        unitId: r,
+        subUnitId: n,
         commentId: e
       }
-    ), p == null || p());
+    ), g == null || g());
   };
   me(() => U == null ? void 0 : U(), []);
-  const J = N((se = a == null ? void 0 : a.root.subUnitId) != null ? se : r), Q = s && !d && !_, ae = `${o || (a == null ? void 0 : a.root.ref) || ""}${J ? " · " : ""}${J}`;
+  const J = N((se = s == null ? void 0 : s.root.subUnitId) != null ? se : n), Q = a && !c && !_, ae = `${o || (s == null ? void 0 : s.root.ref) || ""}${J ? " · " : ""}${J}`;
   return /* @__PURE__ */ S(
     "div",
     {
-      className: Lt(C.threadComment, {
-        [C.threadCommentActive]: !_ && (g || I || P === "cell")
+      className: Lt(v.threadComment, {
+        [v.threadCommentActive]: !_ && (C || I || O === "cell")
       }),
-      onClick: c,
-      id: `${P}-${n}-${r}-${e}`,
+      onClick: d,
+      id: `${O}-${r}-${n}-${e}`,
       onMouseEnter: () => {
-        O == null || O(), w(!0);
+        P == null || P(), R(!0);
       },
       onMouseLeave: () => {
-        U == null || U(), w(!1);
+        U == null || U(), R(!1);
       },
       children: [
-        !_ && g ? /* @__PURE__ */ l("div", { className: C.threadCommentHighlight }) : null,
-        /* @__PURE__ */ S("div", { className: C.threadCommentTitle, children: [
-          /* @__PURE__ */ S("div", { className: C.threadCommentTitlePosition, children: [
-            /* @__PURE__ */ l("div", { className: C.threadCommentTitleHighlight }),
-            /* @__PURE__ */ l(mt, { showIfEllipsis: !0, title: ae, children: /* @__PURE__ */ l("div", { className: C.threadCommentTitlePositionText, children: ae }) })
+        !_ && C ? /* @__PURE__ */ l("div", { className: v.threadCommentHighlight }) : null,
+        /* @__PURE__ */ S("div", { className: v.threadCommentTitle, children: [
+          /* @__PURE__ */ S("div", { className: v.threadCommentTitlePosition, children: [
+            /* @__PURE__ */ l("div", { className: v.threadCommentTitleHighlight }),
+            /* @__PURE__ */ l(mt, { showIfEllipsis: !0, title: ae, children: /* @__PURE__ */ l("div", { className: v.threadCommentTitlePositionText, children: ae }) })
           ] }),
-          a ? /* @__PURE__ */ S("div", { className: C.threadCommentIconContainer, children: [
+          s ? /* @__PURE__ */ S("div", { className: v.threadCommentIconContainer, children: [
             /* @__PURE__ */ l(
               "div",
               {
                 onClick: q,
-                className: C.threadCommentIcon,
+                className: v.threadCommentIcon,
                 style: { color: _ ? "rgb(var(--green-500))" : "" },
-                children: _ ? /* @__PURE__ */ l(ke, {}) : /* @__PURE__ */ l(Le, {})
+                children: _ ? /* @__PURE__ */ l(we, {}) : /* @__PURE__ */ l(Le, {})
               }
             ),
-            (b == null ? void 0 : b.userID) === a.root.personId ? /* @__PURE__ */ l("div", { className: C.threadCommentIcon, onClick: L, children: /* @__PURE__ */ l(He, {}) }) : null
+            (b == null ? void 0 : b.userID) === s.root.personId ? /* @__PURE__ */ l("div", { className: v.threadCommentIcon, onClick: L, children: /* @__PURE__ */ l(De, {}) }) : null
           ] }) : null
         ] }),
-        /* @__PURE__ */ l("div", { className: C.threadCommentContent, ref: D, children: ie.map(
+        /* @__PURE__ */ l("div", { className: v.threadCommentContent, ref: $, children: ie.map(
           (x) => /* @__PURE__ */ l(
             sn,
             {
-              onClose: p,
-              unitId: n,
-              subUnitId: r,
+              onClose: g,
+              unitId: r,
+              subUnitId: n,
               item: x,
-              isRoot: x.id === (a == null ? void 0 : a.root.id),
-              editing: d === x.id,
-              resolved: a == null ? void 0 : a.root.resolved,
+              isRoot: x.id === (s == null ? void 0 : s.root.id),
+              editing: c === x.id,
+              resolved: s == null ? void 0 : s.root.resolved,
               type: y,
               onEditingChange: (i) => {
                 u(i ? x.id : "");
               },
               onReply: (i) => {
                 i && requestAnimationFrame(() => {
-                  var R;
-                  (R = G.current) == null || R.reply(Bt([{
+                  var k;
+                  (k = G.current) == null || k.reply(Bt([{
                     type: "mention",
                     content: {
                       id: i.userID,
@@ -580,46 +583,46 @@ const Ae = A((t, e) => {
                 });
               },
               onAddComment: m,
-              onDeleteComment: v
+              onDeleteComment: f
             },
             x.id
           )
         ) }),
         Q ? /* @__PURE__ */ l("div", { children: /* @__PURE__ */ l(
-          Ae,
+          je,
           {
             ref: G,
             type: y,
-            unitId: n,
-            subUnitId: r,
+            unitId: r,
+            subUnitId: n,
             onSave: async ({ text: x, attachments: i }) => {
-              const R = {
+              const k = {
                 text: x,
                 attachments: i,
                 dT: ot(),
                 id: nt(),
                 ref: o,
                 personId: b == null ? void 0 : b.userID,
-                parentId: a == null ? void 0 : a.root.id,
-                unitId: n,
-                subUnitId: r,
-                threadId: a == null ? void 0 : a.root.threadId
+                parentId: s == null ? void 0 : s.root.id,
+                unitId: r,
+                subUnitId: n,
+                threadId: s == null ? void 0 : s.root.threadId
               };
-              (m == null ? void 0 : m(R)) !== !1 && (await h.executeCommand(
+              (m == null ? void 0 : m(k)) !== !1 && (await h.executeCommand(
                 it.id,
                 {
-                  unitId: n,
-                  subUnitId: r,
-                  comment: R
+                  unitId: r,
+                  subUnitId: n,
+                  comment: k
                 }
-              ), D.current && (D.current.scrollTop = D.current.scrollHeight));
+              ), $.current && ($.current.scrollTop = $.current.scrollHeight));
             },
-            autoFocus: k || !a,
+            autoFocus: w || !s,
             onCancel: () => {
-              a || p == null || p();
+              s || g == null || g();
             }
           },
-          `${k}`
+          `${w}`
         ) }) : null
       ]
     }
@@ -633,43 +636,43 @@ const Ae = A((t, e) => {
 }, _n = (t) => {
   const {
     unitId: e,
-    subUnitId$: n,
-    type: r,
+    subUnitId$: r,
+    type: n,
     onAdd: o,
-    getSubUnitName: s,
-    onResolve: c,
-    sortComments: g,
-    onItemLeave: p,
+    getSubUnitName: a,
+    onResolve: d,
+    sortComments: C,
+    onItemLeave: g,
     onItemEnter: N,
-    disableAdd: P,
-    tempComment: k,
-    onAddComment: O,
+    disableAdd: O,
+    tempComment: w,
+    onAddComment: P,
     onDeleteComment: U,
     showComments: m
-  } = t, [v, M] = V("all"), [y, $] = V("all"), I = T(fe), w = T(pe), d = T(Ee), [u, f] = V(() => d.getUnit(e)), a = T(Y), h = W(a.activeCommentId$), K = W(d.commentUpdate$), _ = T(oe), b = W(n), G = re(!0), ie = "panel", D = W(w.currentUser$), q = ne(() => {
+  } = t, [f, M] = V("all"), [y, H] = V("all"), I = T(fe), R = T(pe), c = T(Ee), [u, p] = V(() => c.getUnit(e)), s = T(Y), h = W(s.activeCommentId$), K = W(c.commentUpdate$), _ = T(oe), b = W(r), G = re(!0), ie = "panel", $ = W(R.currentUser$), q = ne(() => {
     var de;
-    const i = v === "all" ? u : (de = u.filter((E) => E.subUnitId === b)) != null ? de : [], R = g != null ? g : (E) => E, le = i.map((E) => {
-      var j;
-      return { ...E.root, children: (j = E.children) != null ? j : [], users: E.relativeUsers };
+    const i = f === "all" ? u : (de = u.filter((E) => E.subUnitId === b)) != null ? de : [], k = C != null ? C : (E) => E, le = i.map((E) => {
+      var A;
+      return { ...E.root, children: (A = E.children) != null ? A : [], users: E.relativeUsers };
     });
     if (m) {
       const E = /* @__PURE__ */ new Map();
-      return le.forEach((j) => {
-        E.set(j.id, j);
-      }), [...m, ""].map((j) => E.get(j)).filter(Boolean);
+      return le.forEach((A) => {
+        E.set(A.id, A);
+      }), [...m, ""].map((A) => E.get(A)).filter(Boolean);
     } else
-      return R(le);
-  }, [m, v, u, g, b]), L = ne(() => [
+      return k(le);
+  }, [m, f, u, C, b]), L = ne(() => [
     ...q.filter((i) => !i.resolved),
     ...q.filter((i) => i.resolved)
-  ], [q]), J = ne(() => y === "resolved" ? L.filter((i) => i.resolved) : y === "unsolved" ? L.filter((i) => !i.resolved) : y === "concern_me" && D != null && D.userID ? L.filter((i) => i == null ? void 0 : i.users.has(D.userID)) : L, [L, D == null ? void 0 : D.userID, y]), Q = k ? [k, ...J] : J, ae = Q.filter((i) => !i.resolved), X = Q.filter((i) => i.resolved), ee = y !== "all" || v !== "all", se = () => {
-    $("all"), M("all");
+  ], [q]), J = ne(() => y === "resolved" ? L.filter((i) => i.resolved) : y === "unsolved" ? L.filter((i) => !i.resolved) : y === "concern_me" && $ != null && $.userID ? L.filter((i) => i == null ? void 0 : i.users.has($.userID)) : L, [L, $ == null ? void 0 : $.userID, y]), Q = w ? [w, ...J] : J, ae = Q.filter((i) => !i.resolved), X = Q.filter((i) => i.resolved), ee = y !== "all" || f !== "all", se = () => {
+    H("all"), M("all");
   };
   me(() => {
-    e && f(
-      d.getUnit(e)
+    e && p(
+      c.getUnit(e)
     );
-  }, [e, d, K]), me(() => {
+  }, [e, c, K]), me(() => {
     var E;
     if (!h)
       return;
@@ -677,19 +680,19 @@ const Ae = A((t, e) => {
       G.current = !0;
       return;
     }
-    const { unitId: i, subUnitId: R, commentId: le } = h, de = `${ie}-${i}-${R}-${le}`;
+    const { unitId: i, subUnitId: k, commentId: le } = h, de = `${ie}-${i}-${k}-${le}`;
     (E = document.getElementById(de)) == null || E.scrollIntoView({ block: "center" });
   }, [h]);
   const x = (i) => /* @__PURE__ */ l(
     ln,
     {
       prefix: ie,
-      getSubUnitName: s,
+      getSubUnitName: a,
       id: i.id,
       unitId: i.unitId,
       subUnitId: i.subUnitId,
       refStr: i.ref,
-      type: r,
+      type: n,
       showEdit: (h == null ? void 0 : h.commentId) === i.id,
       showHighlight: (h == null ? void 0 : h.commentId) === i.id,
       onClick: () => {
@@ -704,20 +707,20 @@ const Ae = A((t, e) => {
         );
       },
       onMouseEnter: () => N == null ? void 0 : N(i),
-      onMouseLeave: () => p == null ? void 0 : p(i),
-      onAddComment: O,
+      onMouseLeave: () => g == null ? void 0 : g(i),
+      onAddComment: P,
       onDeleteComment: U,
-      onResolve: (R) => c == null ? void 0 : c(i.id, R)
+      onResolve: (k) => d == null ? void 0 : d(i.id, k)
     },
     i.id
   );
   return /* @__PURE__ */ S("div", { className: te.threadCommentPanel, children: [
     /* @__PURE__ */ S("div", { className: te.threadCommentPanelForms, children: [
-      r === he.UNIVER_SHEET ? /* @__PURE__ */ l(
+      n === he.UNIVER_SHEET ? /* @__PURE__ */ l(
         Se,
         {
           borderless: !0,
-          value: v,
+          value: f,
           onChange: (i) => M(i),
           options: [
             {
@@ -736,7 +739,7 @@ const Ae = A((t, e) => {
         {
           borderless: !0,
           value: y,
-          onChange: (i) => $(i),
+          onChange: (i) => H(i),
           options: [
             {
               value: "all",
@@ -777,9 +780,9 @@ const Ae = A((t, e) => {
           className: te.threadCommentPanelAdd,
           type: "primary",
           onClick: o,
-          disabled: P,
+          disabled: O,
           children: [
-            /* @__PURE__ */ l($e, {}),
+            /* @__PURE__ */ l(He, {}),
             I.t("threadCommentUI.panel.addComment")
           ]
         }