@univerjs/docs-thread-comment-ui 0.4.2-nightly.202411071606 → 0.4.2-nightly.202411091134

package/lib/cjs/index.js

@@ -0,0 +1,10 @@
+"use strict";var ce=Object.defineProperty;var se=(e,t,r)=>t in e?ce(e,t,{enumerable:!0,configurable:!0,writable:!0,value:r}):e[t]=r;var H=(e,t,r)=>se(e,typeof t!="symbol"?t+"":t,r);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("@univerjs/core"),x=require("@univerjs/engine-render"),O=require("@univerjs/thread-comment-ui"),S=require("@univerjs/docs"),j=require("@univerjs/docs-ui"),w=require("@univerjs/thread-comment"),v=require("@univerjs/ui"),A=require("rxjs"),g=require("react"),de="DOC_THREAD_COMMENT_UI_PLUGIN",M="default_doc",ae="docs-thread-comment-ui.config",me={};var le=Object.defineProperty,ue=Object.getOwnPropertyDescriptor,Ce=(e,t,r,n)=>{for(var o=n>1?void 0:n?ue(t,r):t,i=e.length-1,s;i>=0;i--)(s=e[i])&&(o=(n?s(t,r,o):s(o))||o);return n&&o&&le(t,r,o),o},Y=(e,t)=>(r,n)=>t(r,n,e);let P=class extends c.Disposable{constructor(t,r){super();H(this,"_addingComment$",new A.BehaviorSubject(void 0));H(this,"addingComment$",this._addingComment$.asObservable());this._sidebarService=t,this._threadCommentPanelService=r,this.disposeWithMe(()=>{this._addingComment$.complete()})}get addingComment(){return this._addingComment$.getValue()}startAdd(t){this._addingComment$.next(t)}endAdd(){this._addingComment$.next(void 0)}};P=Ce([Y(0,v.ISidebarService),Y(1,c.Inject(O.ThreadCommentPanelService))],P);var Q={exports:{}},q={};/**
+ * @license React
+ * react-jsx-runtime.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */var fe=g,he=Symbol.for("react.element"),ve=Symbol.for("react.fragment"),pe=Object.prototype.hasOwnProperty,Ie=fe.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner,_e={key:!0,ref:!0,__self:!0,__source:!0};function X(e,t,r){var n,o={},i=null,s=null;r!==void 0&&(i=""+r),t.key!==void 0&&(i=""+t.key),t.ref!==void 0&&(s=t.ref);for(n in t)pe.call(t,n)&&!_e.hasOwnProperty(n)&&(o[n]=t[n]);if(e&&e.defaultProps)for(n in t=e.defaultProps,t)o[n]===void 0&&(o[n]=t[n]);return{$$typeof:he,type:e,key:i,ref:s,props:o,_owner:Ie.current}}q.Fragment=ve;q.jsx=X;q.jsxs=X;Q.exports=q;var ge=Q.exports;const Z={id:"docs.command.add-comment",type:c.CommandType.COMMAND,async handler(e,t){if(!t)return!1;const{comment:r,unitId:n}=t,i=await e.get(w.IThreadCommentDataSourceService).addComment(r),s=e.get(c.ICommandService),d=j.addCustomDecorationBySelectionFactory(e,{id:i.threadId,type:c.CustomDecorationType.COMMENT});if(d){const u={id:w.AddCommentMutation.id,params:{unitId:n,subUnitId:M,comment:i}},f={id:O.SetActiveCommentOperation.id,params:{unitId:n,subUnitId:M,commentId:i.id}};return(await c.sequenceExecute([u,d,f],s)).result}return!1}},z={id:"docs.command.delete-comment",type:c.CommandType.COMMAND,async handler(e,t){if(!t)return!1;const{commentId:r,unitId:n}=t,o=e.get(c.ICommandService),i=j.deleteCustomDecorationFactory(e,{id:r,unitId:n});return i?(await c.sequenceExecute([i],o)).result:!1}},k=e=>{const t=e.get(x.IRenderManagerService),r=e.get(S.DocSelectionManagerService),n=t.getCurrent(),o=n==null?void 0:n.with(S.DocSkeletonManagerService).getSkeleton(),i=o==null?void 0:o.getViewModel().getEditArea();if(i===x.DocumentEditArea.FOOTER||i===x.DocumentEditArea.HEADER)return!0;const s=r.getActiveTextRange();return!!(s==null||s.collapsed)};function Se(e){return{id:$.id,type:v.MenuItemType.BUTTON,icon:"CommentSingle",title:"threadCommentUI.panel.addComment",tooltip:"threadCommentUI.panel.addComment",hidden$:v.getMenuHiddenObservable(e,c.UniverInstanceType.UNIVER_DOC,void 0,c.SHEET_EDITOR_UNITS),disabled$:new A.Observable(function(t){const n=e.get(S.DocSelectionManagerService).textSelection$.pipe(A.debounceTime(16)).subscribe(()=>{t.next(k(e))});return()=>{n.unsubscribe()}})}}function Oe(e){return{id:J.id,type:v.MenuItemType.BUTTON,icon:"CommentSingle",title:"threadCommentUI.panel.addComment",tooltip:"threadCommentUI.panel.addComment",hidden$:v.getMenuHiddenObservable(e,c.UniverInstanceType.UNIVER_DOC)}}const R=()=>{const e=c.useDependency(c.IUniverInstanceService),t=c.useDependency(c.Injector),r=g.useMemo(()=>e.getCurrentTypeOfUnit$(c.UniverInstanceType.UNIVER_DOC),[e]),n=c.useObservable(r),o=g.useMemo(()=>new A.Observable(m=>m.next(M)),[]),i=c.useDependency(S.DocSelectionManagerService),s=g.useMemo(()=>i.textSelection$.pipe(A.debounceTime(16)),[i.textSelection$]);c.useObservable(s);const d=c.useDependency(c.ICommandService),u=c.useDependency(P),f=c.useObservable(u.addingComment$),[a,p]=g.useState([]);if(g.useEffect(()=>{var y;const m=new Set,l=n==null?void 0:n.getCustomDecorations();p((y=l==null?void 0:l.map(C=>C.id).filter(C=>{const T=m.has(C);return m.add(C),!T}))!=null?y:[]);const b=d.onCommandExecuted(C=>{var T;if(C.id===S.RichTextEditingMutation.id){const E=new Set,L=n==null?void 0:n.getCustomDecorations();p((T=L==null?void 0:L.map(V=>V.id).filter(V=>{const ie=E.has(V);return E.add(V),!ie}))!=null?T:[])}});return()=>{b.dispose()}},[d,n]),!n)return null;const I=k(t),h=n.getUnitId();return ge.jsx(O.ThreadCommentPanel,{unitId:h,subUnitId$:o,type:c.UniverInstanceType.UNIVER_DOC,onAdd:()=>{d.executeCommand($.id)},getSubUnitName:()=>"",disableAdd:I,tempComment:f,onAddComment:m=>{if(!m.parentId){const l={unitId:h,range:f,comment:m};return d.executeCommand(Z.id,l),u.endAdd(),!1}return!0},onDeleteComment:m=>{if(!m.parentId){const l={unitId:h,commentId:m.id};return d.executeCommand(z.id,l),!1}return!0},showComments:a})};R.componentKey="univer.doc.thread-comment-panel";const N={id:"docs.operation.show-comment-panel",type:c.CommandType.OPERATION,handler(e,t){var o;const r=e.get(O.ThreadCommentPanelService),n=e.get(v.ISidebarService);return(!r.panelVisible||((o=n.options.children)==null?void 0:o.label)!==R.componentKey)&&(n.open({header:{title:"threadCommentUI.panel.title"},children:{label:R.componentKey},width:320,onClose:()=>r.setPanelVisible(!1)}),r.setPanelVisible(!0)),t&&r.setActiveComment(t==null?void 0:t.activeComment),!0}},J={id:"docs.operation.toggle-comment-panel",type:c.CommandType.OPERATION,handler(e){var n;const t=e.get(O.ThreadCommentPanelService),r=e.get(v.ISidebarService);return!t.panelVisible||((n=r.options.children)==null?void 0:n.label)!==R.componentKey?(r.open({header:{title:"threadCommentUI.panel.title"},children:{label:R.componentKey},width:320,onClose:()=>t.setPanelVisible(!1)}),t.setPanelVisible(!0)):(r.close(),t.setPanelVisible(!1),t.setActiveComment(null)),!0}},$={id:"docs.operation.start-add-comment",type:c.CommandType.OPERATION,handler(e){var C,T,E;const t=e.get(O.ThreadCommentPanelService),n=e.get(c.IUniverInstanceService).getCurrentUnitForType(c.UniverInstanceType.UNIVER_DOC),o=e.get(S.DocSelectionManagerService),i=e.get(x.IRenderManagerService),s=e.get(c.UserManagerService),d=e.get(P),u=e.get(c.ICommandService),f=e.get(v.ISidebarService),a=o.getActiveTextRange();if(!n||!a)return!1;const p=(C=i.getRenderById(n.getUnitId()))==null?void 0:C.with(j.DocSelectionRenderService);if(a.collapsed)return t.panelVisible?(t.setPanelVisible(!1),f.close()):u.executeCommand(N.id),!0;u.executeCommand(N.id);const I=n.getUnitId(),h=((E=(T=n.getBody())==null?void 0:T.dataStream)!=null?E:"").slice(a.startOffset,a.endOffset),m=c.BuildTextUtils.transform.getPlainText(h),l=M,b="",y={unitId:I,subUnitId:l,id:b,ref:m,dT:w.getDT(),personId:s.getCurrentUser().userID,text:{dataStream:`\r
+`},startOffset:a.startOffset,endOffset:a.endOffset,collapsed:!0,threadId:b};return p==null||p.blurEditor(),d.startAdd(y),t.setActiveComment({unitId:I,subUnitId:l,commentId:b}),!0}};var be=Object.defineProperty,Me=Object.getOwnPropertyDescriptor,Te=(e,t,r,n)=>{for(var o=n>1?void 0:n?Me(t,r):t,i=e.length-1,s;i>=0;i--)(s=e[i])&&(o=(n?s(t,r,o):s(o))||o);return n&&o&&be(t,r,o),o},D=(e,t)=>(r,n)=>t(r,n,e);let B=class extends c.Disposable{constructor(e,t,r,n,o,i){super(),this._threadCommentPanelService=e,this._univerInstanceService=t,this._commandService=r,this._docThreadCommentService=n,this._renderManagerService=o,this._threadCommentModel=i,this._initSelectionChange(),this._initActiveCommandChange()}_initSelectionChange(){let e;this.disposeWithMe(this._commandService.onCommandExecuted(t=>{var r,n,o,i;if(t.id===S.SetTextSelectionsOperation.id){const s=t.params,{unitId:d,ranges:u}=s,f=this._univerInstanceService.getUnit(d,c.UniverInstanceType.UNIVER_DOC),a=u[0];if((e==null?void 0:e.startOffset)===(a==null?void 0:a.startOffset)&&(e==null?void 0:e.endOffset)===(a==null?void 0:a.endOffset))return;if(e=a,a&&f){const{startOffset:p,endOffset:I,collapsed:h}=a;let m;if(h?m=(n=(r=f.getBody())==null?void 0:r.customDecorations)==null?void 0:n.find(l=>l.startIndex<=p&&l.endIndex>=I-1):m=(i=(o=f.getBody())==null?void 0:o.customDecorations)==null?void 0:i.find(l=>l.startIndex<=p&&l.endIndex>=I-1),m){const l=this._threadCommentModel.getComment(d,M,m.id);l&&!l.resolved&&this._commandService.executeCommand(N.id,{activeComment:{unitId:d,subUnitId:M,commentId:m.id}});return}}if(!this._threadCommentPanelService.activeCommentId)return;this._commandService.executeCommand(O.SetActiveCommentOperation.id)}}))}_initActiveCommandChange(){this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe(e=>{var t,r,n,o;if(e){const i=this._univerInstanceService.getUnit(e.unitId);if(i){const s=(t=this._renderManagerService.getRenderById(e.unitId))==null?void 0:t.with(j.DocBackScrollRenderController),d=(n=(r=i.getBody())==null?void 0:r.customDecorations)==null?void 0:n.find(u=>u.id===e.commentId);d&&s&&s.scrollToRange({startOffset:d.startIndex,endOffset:d.endIndex,collapsed:!1})}}(!e||e.commentId!==((o=this._docThreadCommentService.addingComment)==null?void 0:o.id))&&this._docThreadCommentService.endAdd()}))}};B=Te([D(0,c.Inject(O.ThreadCommentPanelService)),D(1,c.IUniverInstanceService),D(2,c.ICommandService),D(3,c.Inject(P)),D(4,x.IRenderManagerService),D(5,c.Inject(w.ThreadCommentModel))],B);var _=function(){return _=Object.assign||function(e){for(var t,r=1,n=arguments.length;r<n;r++){t=arguments[r];for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o])}return e},_.apply(this,arguments)},ye=function(e,t){var r={};for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&t.indexOf(n)<0&&(r[n]=e[n]);if(e!=null&&typeof Object.getOwnPropertySymbols=="function")for(var o=0,n=Object.getOwnPropertySymbols(e);o<n.length;o++)t.indexOf(n[o])<0&&Object.prototype.propertyIsEnumerable.call(e,n[o])&&(r[n[o]]=e[n[o]]);return r},ee=g.forwardRef(function(e,t){var r=e.icon,n=e.id,o=e.className,i=e.extend,s=ye(e,["icon","id","className","extend"]),d="univerjs-icon univerjs-icon-".concat(n," ").concat(o||"").trim(),u=g.useRef("_".concat(xe()));return te(r,"".concat(n),{defIds:r.defIds,idSuffix:u.current},_({ref:t,className:d},s),i)});function te(e,t,r,n,o){return g.createElement(e.tag,_(_({key:t},De(e,r,o)),n),(Ue(e,r).children||[]).map(function(i,s){return te(i,"".concat(t,"-").concat(e.tag,"-").concat(s),r,void 0,o)}))}function De(e,t,r){var n=_({},e.attrs);r!=null&&r.colorChannel1&&n.fill==="colorChannel1"&&(n.fill=r.colorChannel1);var o=t.defIds;return!o||o.length===0||(e.tag==="use"&&n["xlink:href"]&&(n["xlink:href"]=n["xlink:href"]+t.idSuffix),Object.entries(n).forEach(function(i){var s=i[0],d=i[1];typeof d=="string"&&(n[s]=d.replace(/url\(#(.*)\)/,"url(#$1".concat(t.idSuffix,")")))})),n}function Ue(e,t){var r,n=t.defIds;return!n||n.length===0?e:e.tag==="defs"&&(!((r=e.children)===null||r===void 0)&&r.length)?_(_({},e),{children:e.children.map(function(o){return typeof o.attrs.id=="string"&&n&&n.indexOf(o.attrs.id)>-1?_(_({},o),{attrs:_(_({},o.attrs),{id:o.attrs.id+t.idSuffix})}):o})}):e}function xe(){return Math.random().toString(36).substring(2,8)}ee.displayName="UniverIcon";var Pe={tag:"svg",attrs:{fill:"none",viewBox:"0 0 17 17",width:"1em",height:"1em"},children:[{tag:"path",attrs:{fill:"currentColor",d:"M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521C5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345ZM8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521C8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345ZM11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521C11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345Z",fillRule:"evenodd",clipRule:"evenodd"}},{tag:"path",attrs:{fill:"currentColor",d:"M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521 5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345zM8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521 8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345zM11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521 11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345z"}},{tag:"path",attrs:{fill:"currentColor",d:"M1.84351 3.41861C1.84351 3.01861 2.15531 2.69434 2.53993 2.69434H14.9381C15.3228 2.69434 15.6346 3.01861 15.6346 3.41861V12.4611C15.6346 12.8612 15.3228 13.1854 14.9381 13.1854H8.82117L6.06643 14.6179C5.85054 14.7301 5.59416 14.7181 5.38884 14.5862C5.18352 14.4542 5.05855 14.2211 5.05855 13.9701V13.1854H2.53993C2.15531 13.1854 1.84351 12.8612 1.84351 12.4611L1.84351 3.41861ZM6.45141 12.7982L8.34531 12.0135C8.44201 11.9632 8.54864 11.9371 8.65676 11.9371H14.2417C14.3522 11.9371 14.4417 11.8475 14.4417 11.7371V4.14271C14.4417 4.03225 14.3522 3.94271 14.2417 3.94271H3.23636C3.12591 3.94271 3.03636 4.03225 3.03636 4.14271L3.03636 11.7371C3.03636 11.8475 3.12591 11.9371 3.23636 11.9371L5.75498 11.9371C6.1396 11.9371 6.45141 12.0611 6.45141 12.4611V12.7982Z",fillRule:"evenodd",clipRule:"evenodd"}}]},ne=g.forwardRef(function(e,t){return g.createElement(ee,Object.assign({},e,{id:"comment-single",ref:t,icon:Pe}))});ne.displayName="CommentSingle";const Re={[v.RibbonStartGroup.OTHERS]:{[J.id]:{order:1,menuItemFactory:Oe}},[v.ContextMenuPosition.MAIN_AREA]:{[v.ContextMenuGroup.DATA]:{[$.id]:{order:1,menuItemFactory:Se}}}};var Ee=Object.defineProperty,we=Object.getOwnPropertyDescriptor,Ae=(e,t,r,n)=>{for(var o=n>1?void 0:n?we(t,r):t,i=e.length-1,s;i>=0;i--)(s=e[i])&&(o=(n?s(t,r,o):s(o))||o);return n&&o&&Ee(t,r,o),o},W=(e,t)=>(r,n)=>t(r,n,e);let F=class extends c.Disposable{constructor(e,t,r){super(),this._commandService=e,this._menuManagerService=t,this._componentManager=r,this._initCommands(),this._initMenus(),this._initComponents()}_initCommands(){[Z,z,N,$,J].forEach(e=>{this.disposeWithMe(this._commandService.registerCommand(e))})}_initMenus(){this._menuManagerService.mergeMenu(Re)}_initComponents(){[R].forEach(e=>{this.disposeWithMe(this._componentManager.register(e.componentKey,e))}),this.disposeWithMe(this._componentManager.register("CommentSingle",ne))}};F=Ae([W(0,c.ICommandService),W(1,v.IMenuManagerService),W(2,c.Inject(v.ComponentManager))],F);var Ne=Object.defineProperty,je=Object.getOwnPropertyDescriptor,$e=(e,t,r,n)=>{for(var o=n>1?void 0:n?je(t,r):t,i=e.length-1,s;i>=0;i--)(s=e[i])&&(o=(n?s(t,r,o):s(o))||o);return n&&o&&Ne(t,r,o),o},U=(e,t)=>(r,n)=>t(r,n,e);let G=class extends c.Disposable{constructor(e,t,r,n,o,i,s){super(),this._context=e,this._docInterceptorService=t,this._threadCommentPanelService=r,this._docRenderController=n,this._univerInstanceService=o,this._threadCommentModel=i,this._commandService=s,this._interceptorViewModel(),this._initReRender(),this._initSyncComments()}_initReRender(){this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe(e=>{var r;if(e){this._docRenderController.reRender(e.unitId);return}const t=(r=this._univerInstanceService.getCurrentUnitForType(c.UniverInstanceType.UNIVER_DOC))==null?void 0:r.getUnitId();t&&this._docRenderController.reRender(t)})),this.disposeWithMe(this._threadCommentModel.commentUpdate$.subscribe(e=>{e.type==="resolve"&&this._docRenderController.reRender(e.unitId)}))}_interceptorViewModel(){this._docInterceptorService.intercept(S.DOC_INTERCEPTOR_POINT.CUSTOM_DECORATION,{handler:(e,t,r)=>{if(!e)return r(e);const{unitId:n,index:o,customDecorations:i}=t,s=this._threadCommentPanelService.activeCommentId,{commentId:d,unitId:u}=s||{},f=i.find(h=>h.id===d),a=this._threadCommentModel.getComment(n,M,e.id);if(!a)return r({...e,show:!1});const p=f&&o>=f.startIndex&&o<=f.endIndex,I=u===n&&e.id===d;return r({...e,active:I||p,show:!a.resolved})}})}_initSyncComments(){var o,i,s;const e=this._context.unit.getUnitId(),t=M,r=(s=(i=(o=this._context.unit.getBody())==null?void 0:o.customDecorations)==null?void 0:i.filter(d=>d.type===c.CustomDecorationType.COMMENT).map(d=>d.id))!=null?s:[];r.forEach(d=>{this._threadCommentModel.getComment(e,t,d)||this._threadCommentModel.addComment(e,t,{id:d,threadId:d,ref:"",dT:"",personId:"",text:{dataStream:""},unitId:e,subUnitId:t})}),r.length&&this._threadCommentModel.syncThreadComments(this._context.unit.getUnitId(),M,r);let n=r.sort();this.disposeWithMe(this._commandService.onCommandExecuted(d=>{var u,f,a;if(d.id===S.RichTextEditingMutation.id){if(d.params.unitId!==this._context.unit.getUnitId())return;const I=(a=(f=(u=this._context.unit.getBody())==null?void 0:u.customDecorations)==null?void 0:f.filter(m=>m.type===c.CustomDecorationType.COMMENT).map(m=>m.id))!=null?a:[],h=I.sort();if(JSON.stringify(n)!==JSON.stringify(h)){const m=new Set(n),l=new Set(h),b=new Set,y=new Set;I.forEach(C=>{m.has(C)||b.add(C)}),n.forEach(C=>{l.has(C)||y.add(C)}),n=h,b.forEach(C=>{this._threadCommentModel.getComment(e,t,C)||this._threadCommentModel.addComment(e,t,{id:C,threadId:C,ref:"",dT:"",personId:"",text:{dataStream:""},unitId:e,subUnitId:t})}),this._threadCommentModel.syncThreadComments(e,t,[...b])}}}))}};G=$e([U(1,c.Inject(S.DocInterceptorService)),U(2,c.Inject(O.ThreadCommentPanelService)),U(3,c.Inject(j.DocRenderController)),U(4,c.IUniverInstanceService),U(5,c.Inject(w.ThreadCommentModel)),U(6,c.ICommandService)],G);var re=Object.defineProperty,Ve=Object.getOwnPropertyDescriptor,Be=(e,t,r)=>t in e?re(e,t,{enumerable:!0,configurable:!0,writable:!0,value:r}):e[t]=r,Fe=(e,t,r,n)=>{for(var o=n>1?void 0:n?Ve(t,r):t,i=e.length-1,s;i>=0;i--)(s=e[i])&&(o=(n?s(t,r,o):s(o))||o);return n&&o&&re(t,r,o),o},K=(e,t)=>(r,n)=>t(r,n,e),oe=(e,t,r)=>Be(e,typeof t!="symbol"?t+"":t,r);exports.UniverDocsThreadCommentUIPlugin=class extends c.Plugin{constructor(t=me,r,n,o){super(),this._config=t,this._injector=r,this._renderManagerSrv=n,this._configService=o;const{menu:i,...s}=this._config;i&&this._configService.setConfig("menu",i,{merge:!0}),this._configService.setConfig(ae,s)}onStarting(){[[F],[B],[P]].forEach(t=>{this._injector.add(t)})}onRendered(){this._initRenderModule(),this._injector.get(B),this._injector.get(F)}_initRenderModule(){[G].forEach(t=>{this._renderManagerSrv.registerRenderModule(c.UniverInstanceType.UNIVER_DOC,t)})}};oe(exports.UniverDocsThreadCommentUIPlugin,"pluginName",de);oe(exports.UniverDocsThreadCommentUIPlugin,"type",c.UniverInstanceType.UNIVER_DOC);exports.UniverDocsThreadCommentUIPlugin=Fe([c.DependentOn(O.UniverThreadCommentUIPlugin),K(1,c.Inject(c.Injector)),K(2,x.IRenderManagerService),K(3,c.IConfigService)],exports.UniverDocsThreadCommentUIPlugin);exports.AddDocCommentComment=Z;exports.DeleteDocCommentComment=z;exports.ShowCommentPanelOperation=N;exports.StartAddCommentOperation=$;

package/lib/es/index.js

@@ -1,284 +1,304 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
-import { Inject, Disposable, CommandType, ICommandService, CustomDecorationType, sequenceExecute, UniverInstanceType, SHEET_EDITOR_UNITS, useDependency, IUniverInstanceService, Injector, useObservable, UserManagerService, BuildTextUtils, DependentOn, Plugin, IConfigService } from "@univerjs/core";
-import { IRenderManagerService, DocumentEditArea } from "@univerjs/engine-render";
-import { ThreadCommentPanelService, SetActiveCommentOperation, ThreadCommentPanel, UniverThreadCommentUIPlugin } from "@univerjs/thread-comment-ui";
-import { DocSelectionManagerService, DocSkeletonManagerService, RichTextEditingMutation, SetTextSelectionsOperation, DocInterceptorService, DOC_INTERCEPTOR_POINT } from "@univerjs/docs";
-import { addCustomDecorationBySelectionFactory, deleteCustomDecorationFactory, DocSelectionRenderService, DocBackScrollRenderController, DocRenderController } from "@univerjs/docs-ui";
-import { IThreadCommentDataSourceService, AddCommentMutation, getDT, ThreadCommentModel } from "@univerjs/thread-comment";
-import { ISidebarService, MenuItemType, getMenuHiddenObservable, RibbonStartGroup, ContextMenuPosition, ContextMenuGroup, ComponentManager, IMenuManagerService } from "@univerjs/ui";
-import { BehaviorSubject, Observable, debounceTime } from "rxjs";
-import React, { useMemo, useState, useEffect, forwardRef, useRef, createElement } from "react";
-const PLUGIN_NAME = "DOC_THREAD_COMMENT_UI_PLUGIN", DEFAULT_DOC_SUBUNIT_ID = "default_doc", PLUGIN_CONFIG_KEY = "docs-thread-comment-ui.config", defaultPluginConfig = {};
-var __defProp$4 = Object.defineProperty, __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor, __decorateClass$4 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$4(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
-  return kind && result && __defProp$4(target, key, result), result;
-}, "__decorateClass$4"), __decorateParam$4 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$4"), _a;
-let DocThreadCommentService = (_a = class extends Disposable {
-  constructor(_sidebarService, _threadCommentPanelService) {
+var be = Object.defineProperty;
+var xe = (e, t, r) => t in e ? be(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
+var Z = (e, t, r) => xe(e, typeof t != "symbol" ? t + "" : t, r);
+import { Inject as p, Disposable as j, CommandType as E, ICommandService as M, CustomDecorationType as Q, sequenceExecute as ne, UniverInstanceType as S, SHEET_EDITOR_UNITS as ye, useDependency as U, IUniverInstanceService as B, Injector as re, useObservable as q, UserManagerService as De, BuildTextUtils as Te, DependentOn as Re, Plugin as Pe, IConfigService as Ue } from "@univerjs/core";
+import { IRenderManagerService as F, DocumentEditArea as ee } from "@univerjs/engine-render";
+import { ThreadCommentPanelService as R, SetActiveCommentOperation as oe, ThreadCommentPanel as Ee, UniverThreadCommentUIPlugin as we } from "@univerjs/thread-comment-ui";
+import { DocSelectionManagerService as L, DocSkeletonManagerService as Ne, RichTextEditingMutation as ie, SetTextSelectionsOperation as Ae, DocInterceptorService as $e, DOC_INTERCEPTOR_POINT as Ve } from "@univerjs/docs";
+import { addCustomDecorationBySelectionFactory as je, deleteCustomDecorationFactory as Be, DocSelectionRenderService as Fe, DocBackScrollRenderController as Le, DocRenderController as He } from "@univerjs/docs-ui";
+import { IThreadCommentDataSourceService as We, AddCommentMutation as Ke, getDT as Ge, ThreadCommentModel as se } from "@univerjs/thread-comment";
+import { ISidebarService as H, MenuItemType as de, getMenuHiddenObservable as ce, RibbonStartGroup as Ze, ContextMenuPosition as qe, ContextMenuGroup as ze, ComponentManager as Je, IMenuManagerService as Ye } from "@univerjs/ui";
+import { BehaviorSubject as Qe, Observable as ae, debounceTime as me } from "rxjs";
+import Xe, { useMemo as z, useState as ke, useEffect as et, forwardRef as le, useRef as tt, createElement as ue } from "react";
+const nt = "DOC_THREAD_COMMENT_UI_PLUGIN", I = "default_doc", rt = "docs-thread-comment-ui.config", ot = {};
+var it = Object.defineProperty, st = Object.getOwnPropertyDescriptor, dt = (e, t, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? st(t, r) : t, i = e.length - 1, s; i >= 0; i--)
+    (s = e[i]) && (o = (n ? s(t, r, o) : s(o)) || o);
+  return n && o && it(t, r, o), o;
+}, te = (e, t) => (r, n) => t(r, n, e);
+let D = class extends j {
+  constructor(t, r) {
     super();
-    __publicField(this, "_addingComment$", new BehaviorSubject(void 0));
-    __publicField(this, "addingComment$", this._addingComment$.asObservable());
-    this._sidebarService = _sidebarService, this._threadCommentPanelService = _threadCommentPanelService, this.disposeWithMe(() => {
+    Z(this, "_addingComment$", new Qe(void 0));
+    Z(this, "addingComment$", this._addingComment$.asObservable());
+    this._sidebarService = t, this._threadCommentPanelService = r, this.disposeWithMe(() => {
       this._addingComment$.complete();
     });
   }
   get addingComment() {
     return this._addingComment$.getValue();
   }
-  startAdd(comment) {
-    this._addingComment$.next(comment);
+  startAdd(t) {
+    this._addingComment$.next(t);
   }
   endAdd() {
     this._addingComment$.next(void 0);
   }
-}, __name(_a, "DocThreadCommentService"), _a);
-DocThreadCommentService = __decorateClass$4([
-  __decorateParam$4(0, ISidebarService),
-  __decorateParam$4(1, Inject(ThreadCommentPanelService))
-], DocThreadCommentService);
-const AddDocCommentComment = {
+};
+D = dt([
+  te(0, H),
+  te(1, p(R))
+], D);
+var fe = { exports: {} }, W = {};
+/**
+ * @license React
+ * react-jsx-runtime.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+var ct = Xe, at = Symbol.for("react.element"), mt = Symbol.for("react.fragment"), lt = Object.prototype.hasOwnProperty, ut = ct.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, ft = { key: !0, ref: !0, __self: !0, __source: !0 };
+function he(e, t, r) {
+  var n, o = {}, i = null, s = null;
+  r !== void 0 && (i = "" + r), t.key !== void 0 && (i = "" + t.key), t.ref !== void 0 && (s = t.ref);
+  for (n in t) lt.call(t, n) && !ft.hasOwnProperty(n) && (o[n] = t[n]);
+  if (e && e.defaultProps) for (n in t = e.defaultProps, t) o[n] === void 0 && (o[n] = t[n]);
+  return { $$typeof: at, type: e, key: i, ref: s, props: o, _owner: ut.current };
+}
+W.Fragment = mt;
+W.jsx = he;
+W.jsxs = he;
+fe.exports = W;
+var ht = fe.exports;
+const Ce = {
   id: "docs.command.add-comment",
-  type: CommandType.COMMAND,
-  async handler(accessor, params) {
-    if (!params)
+  type: E.COMMAND,
+  async handler(e, t) {
+    if (!t)
       return !1;
-    const { comment: originComment, unitId } = params, comment = await accessor.get(IThreadCommentDataSourceService).addComment(originComment), commandService = accessor.get(ICommandService), doMutation = addCustomDecorationBySelectionFactory(
-      accessor,
+    const { comment: r, unitId: n } = t, i = await e.get(We).addComment(r), s = e.get(M), d = je(
+      e,
       {
-        id: comment.threadId,
-        type: CustomDecorationType.COMMENT
+        id: i.threadId,
+        type: Q.COMMENT
       }
     );
-    if (doMutation) {
-      const addComment = {
-        id: AddCommentMutation.id,
+    if (d) {
+      const l = {
+        id: Ke.id,
         params: {
-          unitId,
-          subUnitId: DEFAULT_DOC_SUBUNIT_ID,
-          comment
+          unitId: n,
+          subUnitId: I,
+          comment: i
         }
-      }, activeOperation = {
-        id: SetActiveCommentOperation.id,
+      }, f = {
+        id: oe.id,
         params: {
-          unitId,
-          subUnitId: DEFAULT_DOC_SUBUNIT_ID,
-          commentId: comment.id
+          unitId: n,
+          subUnitId: I,
+          commentId: i.id
         }
       };
-      return (await sequenceExecute([addComment, doMutation, activeOperation], commandService)).result;
+      return (await ne([l, d, f], s)).result;
     }
     return !1;
   }
-}, DeleteDocCommentComment = {
+}, ve = {
   id: "docs.command.delete-comment",
-  type: CommandType.COMMAND,
-  async handler(accessor, params) {
-    if (!params)
+  type: E.COMMAND,
+  async handler(e, t) {
+    if (!t)
       return !1;
-    const { commentId, unitId } = params, commandService = accessor.get(ICommandService), doMutation = deleteCustomDecorationFactory(accessor, {
-      id: commentId,
-      unitId
+    const { commentId: r, unitId: n } = t, o = e.get(M), i = Be(e, {
+      id: r,
+      unitId: n
     });
-    return doMutation ? (await sequenceExecute([doMutation], commandService)).result : !1;
+    return i ? (await ne([i], o)).result : !1;
   }
-}, shouldDisableAddComment = /* @__PURE__ */ __name((accessor) => {
-  const renderManagerService = accessor.get(IRenderManagerService), docSelectionManagerService = accessor.get(DocSelectionManagerService), render2 = renderManagerService.getCurrent(), skeleton = render2 == null ? void 0 : render2.with(DocSkeletonManagerService).getSkeleton(), editArea = skeleton == null ? void 0 : skeleton.getViewModel().getEditArea();
-  if (editArea === DocumentEditArea.FOOTER || editArea === DocumentEditArea.HEADER)
+}, _e = (e) => {
+  const t = e.get(F), r = e.get(L), n = t.getCurrent(), o = n == null ? void 0 : n.with(Ne).getSkeleton(), i = o == null ? void 0 : o.getViewModel().getEditArea();
+  if (i === ee.FOOTER || i === ee.HEADER)
     return !0;
-  const range = docSelectionManagerService.getActiveTextRange();
-  return !!(range == null || range.collapsed);
-}, "shouldDisableAddComment");
-function AddDocCommentMenuItemFactory(accessor) {
+  const s = r.getActiveTextRange();
+  return !!(s == null || s.collapsed);
+};
+function Ct(e) {
   return {
-    id: StartAddCommentOperation.id,
-    type: MenuItemType.BUTTON,
+    id: K.id,
+    type: de.BUTTON,
     icon: "CommentSingle",
     title: "threadCommentUI.panel.addComment",
     tooltip: "threadCommentUI.panel.addComment",
-    hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC, void 0, SHEET_EDITOR_UNITS),
-    disabled$: new Observable(function(subscribe) {
-      const observer = accessor.get(DocSelectionManagerService).textSelection$.pipe(debounceTime(16)).subscribe(() => {
-        subscribe.next(shouldDisableAddComment(accessor));
+    hidden$: ce(e, S.UNIVER_DOC, void 0, ye),
+    disabled$: new ae(function(t) {
+      const n = e.get(L).textSelection$.pipe(me(16)).subscribe(() => {
+        t.next(_e(e));
       });
       return () => {
-        observer.unsubscribe();
+        n.unsubscribe();
       };
     })
   };
 }
-__name(AddDocCommentMenuItemFactory, "AddDocCommentMenuItemFactory");
-function ToolbarDocCommentMenuItemFactory(accessor) {
+function vt(e) {
   return {
-    id: ToggleCommentPanelOperation.id,
-    type: MenuItemType.BUTTON,
+    id: k.id,
+    type: de.BUTTON,
     icon: "CommentSingle",
     title: "threadCommentUI.panel.addComment",
     tooltip: "threadCommentUI.panel.addComment",
-    hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC)
+    hidden$: ce(e, S.UNIVER_DOC)
   };
 }
-__name(ToolbarDocCommentMenuItemFactory, "ToolbarDocCommentMenuItemFactory");
-const DocThreadCommentPanel = /* @__PURE__ */ __name(() => {
-  const univerInstanceService = useDependency(IUniverInstanceService), injector = useDependency(Injector), doc$ = useMemo(() => univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_DOC), [univerInstanceService]), doc = useObservable(doc$), subUnitId$ = useMemo(() => new Observable((sub) => sub.next(DEFAULT_DOC_SUBUNIT_ID)), []), docSelectionManagerService = useDependency(DocSelectionManagerService), selectionChange$ = useMemo(
-    () => docSelectionManagerService.textSelection$.pipe(debounceTime(16)),
-    [docSelectionManagerService.textSelection$]
+const T = () => {
+  const e = U(B), t = U(re), r = z(() => e.getCurrentTypeOfUnit$(S.UNIVER_DOC), [e]), n = q(r), o = z(() => new ae((a) => a.next(I)), []), i = U(L), s = z(
+    () => i.textSelection$.pipe(me(16)),
+    [i.textSelection$]
   );
-  useObservable(selectionChange$);
-  const commandService = useDependency(ICommandService), docCommentService = useDependency(DocThreadCommentService), tempComment = useObservable(docCommentService.addingComment$), [commentIds, setCommentIds] = useState([]);
-  if (useEffect(() => {
-    var _a6;
-    const set = /* @__PURE__ */ new Set(), customRanges = doc == null ? void 0 : doc.getCustomDecorations();
-    setCommentIds((_a6 = customRanges == null ? void 0 : customRanges.map((r) => r.id).filter((i) => {
-      const hasRepeat = set.has(i);
-      return set.add(i), !hasRepeat;
-    })) != null ? _a6 : []);
-    const dispose = commandService.onCommandExecuted((command) => {
-      var _a7;
-      if (command.id === RichTextEditingMutation.id) {
-        const set2 = /* @__PURE__ */ new Set(), customRanges2 = doc == null ? void 0 : doc.getCustomDecorations();
-        setCommentIds((_a7 = customRanges2 == null ? void 0 : customRanges2.map((r) => r.id).filter((i) => {
-          const hasRepeat = set2.has(i);
-          return set2.add(i), !hasRepeat;
-        })) != null ? _a7 : []);
+  q(s);
+  const d = U(M), l = U(D), f = q(l.addingComment$), [c, C] = ke([]);
+  if (et(() => {
+    var b;
+    const a = /* @__PURE__ */ new Set(), m = n == null ? void 0 : n.getCustomDecorations();
+    C((b = m == null ? void 0 : m.map((u) => u.id).filter((u) => {
+      const O = a.has(u);
+      return a.add(u), !O;
+    })) != null ? b : []);
+    const g = d.onCommandExecuted((u) => {
+      var O;
+      if (u.id === ie.id) {
+        const P = /* @__PURE__ */ new Set(), G = n == null ? void 0 : n.getCustomDecorations();
+        C((O = G == null ? void 0 : G.map((w) => w.id).filter((w) => {
+          const Me = P.has(w);
+          return P.add(w), !Me;
+        })) != null ? O : []);
       }
     });
     return () => {
-      dispose.dispose();
+      g.dispose();
     };
-  }, [commandService, doc]), !doc)
+  }, [d, n]), !n)
     return null;
-  const isInValidSelection = shouldDisableAddComment(injector), unitId = doc.getUnitId();
-  return /* @__PURE__ */ React.createElement(
-    ThreadCommentPanel,
+  const v = _e(t), h = n.getUnitId();
+  return /* @__PURE__ */ ht.jsx(
+    Ee,
     {
-      unitId,
-      subUnitId$,
-      type: UniverInstanceType.UNIVER_DOC,
-      onAdd: /* @__PURE__ */ __name(() => {
-        commandService.executeCommand(StartAddCommentOperation.id);
-      }, "onAdd"),
-      getSubUnitName: /* @__PURE__ */ __name(() => "", "getSubUnitName"),
-      disableAdd: isInValidSelection,
-      tempComment,
-      onAddComment: /* @__PURE__ */ __name((comment) => {
-        if (!comment.parentId) {
-          const params = {
-            unitId,
-            range: tempComment,
-            comment
+      unitId: h,
+      subUnitId$: o,
+      type: S.UNIVER_DOC,
+      onAdd: () => {
+        d.executeCommand(K.id);
+      },
+      getSubUnitName: () => "",
+      disableAdd: v,
+      tempComment: f,
+      onAddComment: (a) => {
+        if (!a.parentId) {
+          const m = {
+            unitId: h,
+            range: f,
+            comment: a
           };
-          return commandService.executeCommand(AddDocCommentComment.id, params), docCommentService.endAdd(), !1;
+          return d.executeCommand(Ce.id, m), l.endAdd(), !1;
         }
         return !0;
-      }, "onAddComment"),
-      onDeleteComment: /* @__PURE__ */ __name((comment) => {
-        if (!comment.parentId) {
-          const params = {
-            unitId,
-            commentId: comment.id
+      },
+      onDeleteComment: (a) => {
+        if (!a.parentId) {
+          const m = {
+            unitId: h,
+            commentId: a.id
           };
-          return commandService.executeCommand(DeleteDocCommentComment.id, params), !1;
+          return d.executeCommand(ve.id, m), !1;
         }
         return !0;
-      }, "onDeleteComment"),
-      showComments: commentIds
+      },
+      showComments: c
     }
   );
-}, "DocThreadCommentPanel");
-DocThreadCommentPanel.componentKey = "univer.doc.thread-comment-panel";
-const ShowCommentPanelOperation = {
+};
+T.componentKey = "univer.doc.thread-comment-panel";
+const N = {
   id: "docs.operation.show-comment-panel",
-  type: CommandType.OPERATION,
-  handler(accessor, params) {
-    var _a6;
-    const panelService = accessor.get(ThreadCommentPanelService), sidebarService = accessor.get(ISidebarService);
-    return (!panelService.panelVisible || ((_a6 = sidebarService.options.children) == null ? void 0 : _a6.label) !== DocThreadCommentPanel.componentKey) && (sidebarService.open({
+  type: E.OPERATION,
+  handler(e, t) {
+    var o;
+    const r = e.get(R), n = e.get(H);
+    return (!r.panelVisible || ((o = n.options.children) == null ? void 0 : o.label) !== T.componentKey) && (n.open({
       header: { title: "threadCommentUI.panel.title" },
-      children: { label: DocThreadCommentPanel.componentKey },
+      children: { label: T.componentKey },
       width: 320,
-      onClose: /* @__PURE__ */ __name(() => panelService.setPanelVisible(!1), "onClose")
-    }), panelService.setPanelVisible(!0)), params && panelService.setActiveComment(params == null ? void 0 : params.activeComment), !0;
+      onClose: () => r.setPanelVisible(!1)
+    }), r.setPanelVisible(!0)), t && r.setActiveComment(t == null ? void 0 : t.activeComment), !0;
   }
-}, ToggleCommentPanelOperation = {
+}, k = {
   id: "docs.operation.toggle-comment-panel",
-  type: CommandType.OPERATION,
-  handler(accessor) {
-    var _a6;
-    const panelService = accessor.get(ThreadCommentPanelService), sidebarService = accessor.get(ISidebarService);
-    return !panelService.panelVisible || ((_a6 = sidebarService.options.children) == null ? void 0 : _a6.label) !== DocThreadCommentPanel.componentKey ? (sidebarService.open({
+  type: E.OPERATION,
+  handler(e) {
+    var n;
+    const t = e.get(R), r = e.get(H);
+    return !t.panelVisible || ((n = r.options.children) == null ? void 0 : n.label) !== T.componentKey ? (r.open({
       header: { title: "threadCommentUI.panel.title" },
-      children: { label: DocThreadCommentPanel.componentKey },
+      children: { label: T.componentKey },
       width: 320,
-      onClose: /* @__PURE__ */ __name(() => panelService.setPanelVisible(!1), "onClose")
-    }), panelService.setPanelVisible(!0)) : (sidebarService.close(), panelService.setPanelVisible(!1), panelService.setActiveComment(null)), !0;
+      onClose: () => t.setPanelVisible(!1)
+    }), t.setPanelVisible(!0)) : (r.close(), t.setPanelVisible(!1), t.setActiveComment(null)), !0;
   }
-}, StartAddCommentOperation = {
+}, K = {
   id: "docs.operation.start-add-comment",
-  type: CommandType.OPERATION,
-  handler(accessor) {
-    var _a6, _b, _c;
-    const panelService = accessor.get(ThreadCommentPanelService), doc = accessor.get(IUniverInstanceService).getCurrentUnitForType(UniverInstanceType.UNIVER_DOC), docSelectionManagerService = accessor.get(DocSelectionManagerService), renderManagerService = accessor.get(IRenderManagerService), userManagerService = accessor.get(UserManagerService), docCommentService = accessor.get(DocThreadCommentService), commandService = accessor.get(ICommandService), sidebarService = accessor.get(ISidebarService), textRange = docSelectionManagerService.getActiveTextRange();
-    if (!doc || !textRange)
+  type: E.OPERATION,
+  handler(e) {
+    var u, O, P;
+    const t = e.get(R), n = e.get(B).getCurrentUnitForType(S.UNIVER_DOC), o = e.get(L), i = e.get(F), s = e.get(De), d = e.get(D), l = e.get(M), f = e.get(H), c = o.getActiveTextRange();
+    if (!n || !c)
       return !1;
-    const docSelectionRenderManager = (_a6 = renderManagerService.getRenderById(doc.getUnitId())) == null ? void 0 : _a6.with(DocSelectionRenderService);
-    if (textRange.collapsed)
-      return panelService.panelVisible ? (panelService.setPanelVisible(!1), sidebarService.close()) : commandService.executeCommand(ShowCommentPanelOperation.id), !0;
-    commandService.executeCommand(ShowCommentPanelOperation.id);
-    const unitId = doc.getUnitId(), dataStream = ((_c = (_b = doc.getBody()) == null ? void 0 : _b.dataStream) != null ? _c : "").slice(textRange.startOffset, textRange.endOffset), text = BuildTextUtils.transform.getPlainText(dataStream), subUnitId = DEFAULT_DOC_SUBUNIT_ID, commentId = "", comment = {
-      unitId,
-      subUnitId,
-      id: commentId,
-      ref: text,
-      dT: getDT(),
-      personId: userManagerService.getCurrentUser().userID,
+    const C = (u = i.getRenderById(n.getUnitId())) == null ? void 0 : u.with(Fe);
+    if (c.collapsed)
+      return t.panelVisible ? (t.setPanelVisible(!1), f.close()) : l.executeCommand(N.id), !0;
+    l.executeCommand(N.id);
+    const v = n.getUnitId(), h = ((P = (O = n.getBody()) == null ? void 0 : O.dataStream) != null ? P : "").slice(c.startOffset, c.endOffset), a = Te.transform.getPlainText(h), m = I, g = "", b = {
+      unitId: v,
+      subUnitId: m,
+      id: g,
+      ref: a,
+      dT: Ge(),
+      personId: s.getCurrentUser().userID,
       text: {
         dataStream: `\r
 `
       },
-      startOffset: textRange.startOffset,
-      endOffset: textRange.endOffset,
+      startOffset: c.startOffset,
+      endOffset: c.endOffset,
       collapsed: !0,
-      threadId: commentId
+      threadId: g
     };
-    return docSelectionRenderManager == null || docSelectionRenderManager.blurEditor(), docCommentService.startAdd(comment), panelService.setActiveComment({
-      unitId,
-      subUnitId,
-      commentId
+    return C == null || C.blurEditor(), d.startAdd(b), t.setActiveComment({
+      unitId: v,
+      subUnitId: m,
+      commentId: g
     }), !0;
   }
 };
-var __defProp$3 = Object.defineProperty, __getOwnPropDesc$3 = Object.getOwnPropertyDescriptor, __decorateClass$3 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$3(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
-  return kind && result && __defProp$3(target, key, result), result;
-}, "__decorateClass$3"), __decorateParam$3 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$3"), _a2;
-let DocThreadCommentSelectionController = (_a2 = class extends Disposable {
-  constructor(_threadCommentPanelService, _univerInstanceService, _commandService, _docThreadCommentService, _renderManagerService, _threadCommentModel) {
-    super(), this._threadCommentPanelService = _threadCommentPanelService, this._univerInstanceService = _univerInstanceService, this._commandService = _commandService, this._docThreadCommentService = _docThreadCommentService, this._renderManagerService = _renderManagerService, this._threadCommentModel = _threadCommentModel, this._initSelectionChange(), this._initActiveCommandChange();
+var _t = Object.defineProperty, pt = Object.getOwnPropertyDescriptor, gt = (e, t, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? pt(t, r) : t, i = e.length - 1, s; i >= 0; i--)
+    (s = e[i]) && (o = (n ? s(t, r, o) : s(o)) || o);
+  return n && o && _t(t, r, o), o;
+}, x = (e, t) => (r, n) => t(r, n, e);
+let A = class extends j {
+  constructor(e, t, r, n, o, i) {
+    super(), this._threadCommentPanelService = e, this._univerInstanceService = t, this._commandService = r, this._docThreadCommentService = n, this._renderManagerService = o, this._threadCommentModel = i, this._initSelectionChange(), this._initActiveCommandChange();
   }
   _initSelectionChange() {
-    let lastSelection;
+    let e;
     this.disposeWithMe(
-      this._commandService.onCommandExecuted((commandInfo) => {
-        var _a6, _b, _c, _d;
-        if (commandInfo.id === SetTextSelectionsOperation.id) {
-          const params = commandInfo.params, { unitId, ranges } = params, doc = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_DOC), primary = ranges[0];
-          if ((lastSelection == null ? void 0 : lastSelection.startOffset) === (primary == null ? void 0 : primary.startOffset) && (lastSelection == null ? void 0 : lastSelection.endOffset) === (primary == null ? void 0 : primary.endOffset))
+      this._commandService.onCommandExecuted((t) => {
+        var r, n, o, i;
+        if (t.id === Ae.id) {
+          const s = t.params, { unitId: d, ranges: l } = s, f = this._univerInstanceService.getUnit(d, S.UNIVER_DOC), c = l[0];
+          if ((e == null ? void 0 : e.startOffset) === (c == null ? void 0 : c.startOffset) && (e == null ? void 0 : e.endOffset) === (c == null ? void 0 : c.endOffset))
             return;
-          if (lastSelection = primary, primary && doc) {
-            const { startOffset, endOffset, collapsed } = primary;
-            let customRange;
-            if (collapsed ? customRange = (_b = (_a6 = doc.getBody()) == null ? void 0 : _a6.customDecorations) == null ? void 0 : _b.find((value) => value.startIndex <= startOffset && value.endIndex >= endOffset - 1) : customRange = (_d = (_c = doc.getBody()) == null ? void 0 : _c.customDecorations) == null ? void 0 : _d.find((value) => value.startIndex <= startOffset && value.endIndex >= endOffset - 1), customRange) {
-              const comment = this._threadCommentModel.getComment(unitId, DEFAULT_DOC_SUBUNIT_ID, customRange.id);
-              comment && !comment.resolved && this._commandService.executeCommand(ShowCommentPanelOperation.id, {
+          if (e = c, c && f) {
+            const { startOffset: C, endOffset: v, collapsed: h } = c;
+            let a;
+            if (h ? a = (n = (r = f.getBody()) == null ? void 0 : r.customDecorations) == null ? void 0 : n.find((m) => m.startIndex <= C && m.endIndex >= v - 1) : a = (i = (o = f.getBody()) == null ? void 0 : o.customDecorations) == null ? void 0 : i.find((m) => m.startIndex <= C && m.endIndex >= v - 1), a) {
+              const m = this._threadCommentModel.getComment(d, I, a.id);
+              m && !m.resolved && this._commandService.executeCommand(N.id, {
                 activeComment: {
-                  unitId,
-                  subUnitId: DEFAULT_DOC_SUBUNIT_ID,
-                  commentId: customRange.id
+                  unitId: d,
+                  subUnitId: I,
+                  commentId: a.id
                 }
               });
               return;
@@ -286,260 +306,256 @@ let DocThreadCommentSelectionController = (_a2 = class extends Disposable {
           }
           if (!this._threadCommentPanelService.activeCommentId)
             return;
-          this._commandService.executeCommand(SetActiveCommentOperation.id);
+          this._commandService.executeCommand(oe.id);
         }
       })
     );
   }
   _initActiveCommandChange() {
-    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe((activeComment) => {
-      var _a6, _b, _c, _d;
-      if (activeComment) {
-        const doc = this._univerInstanceService.getUnit(activeComment.unitId);
-        if (doc) {
-          const backScrollController = (_a6 = this._renderManagerService.getRenderById(activeComment.unitId)) == null ? void 0 : _a6.with(DocBackScrollRenderController), customRange = (_c = (_b = doc.getBody()) == null ? void 0 : _b.customDecorations) == null ? void 0 : _c.find((range) => range.id === activeComment.commentId);
-          customRange && backScrollController && backScrollController.scrollToRange({
-            startOffset: customRange.startIndex,
-            endOffset: customRange.endIndex,
+    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe((e) => {
+      var t, r, n, o;
+      if (e) {
+        const i = this._univerInstanceService.getUnit(e.unitId);
+        if (i) {
+          const s = (t = this._renderManagerService.getRenderById(e.unitId)) == null ? void 0 : t.with(Le), d = (n = (r = i.getBody()) == null ? void 0 : r.customDecorations) == null ? void 0 : n.find((l) => l.id === e.commentId);
+          d && s && s.scrollToRange({
+            startOffset: d.startIndex,
+            endOffset: d.endIndex,
             collapsed: !1
           });
         }
       }
-      (!activeComment || activeComment.commentId !== ((_d = this._docThreadCommentService.addingComment) == null ? void 0 : _d.id)) && this._docThreadCommentService.endAdd();
+      (!e || e.commentId !== ((o = this._docThreadCommentService.addingComment) == null ? void 0 : o.id)) && this._docThreadCommentService.endAdd();
     }));
   }
-}, __name(_a2, "DocThreadCommentSelectionController"), _a2);
-DocThreadCommentSelectionController = __decorateClass$3([
-  __decorateParam$3(0, Inject(ThreadCommentPanelService)),
-  __decorateParam$3(1, IUniverInstanceService),
-  __decorateParam$3(2, ICommandService),
-  __decorateParam$3(3, Inject(DocThreadCommentService)),
-  __decorateParam$3(4, IRenderManagerService),
-  __decorateParam$3(5, Inject(ThreadCommentModel))
-], DocThreadCommentSelectionController);
-var __assign = function() {
-  return __assign = Object.assign || function(t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-      for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && (t[p] = s[p]);
+};
+A = gt([
+  x(0, p(R)),
+  x(1, B),
+  x(2, M),
+  x(3, p(D)),
+  x(4, F),
+  x(5, p(se))
+], A);
+var _ = function() {
+  return _ = Object.assign || function(e) {
+    for (var t, r = 1, n = arguments.length; r < n; r++) {
+      t = arguments[r];
+      for (var o in t) Object.prototype.hasOwnProperty.call(t, o) && (e[o] = t[o]);
     }
-    return t;
-  }, __assign.apply(this, arguments);
-}, __rest = function(s, e) {
-  var t = {};
-  for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0 && (t[p] = s[p]);
-  if (s != null && typeof Object.getOwnPropertySymbols == "function")
-    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++)
-      e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]) && (t[p[i]] = s[p[i]]);
-  return t;
-}, IconBase = forwardRef(function(props, ref) {
-  var icon = props.icon, id = props.id, className = props.className, extend = props.extend, restProps = __rest(props, ["icon", "id", "className", "extend"]), cls = "univerjs-icon univerjs-icon-".concat(id, " ").concat(className || "").trim(), idSuffix = useRef("_".concat(generateShortUuid()));
-  return render(icon, "".concat(id), { defIds: icon.defIds, idSuffix: idSuffix.current }, __assign({ ref, className: cls }, restProps), extend);
+    return e;
+  }, _.apply(this, arguments);
+}, It = function(e, t) {
+  var r = {};
+  for (var n in e) Object.prototype.hasOwnProperty.call(e, n) && t.indexOf(n) < 0 && (r[n] = e[n]);
+  if (e != null && typeof Object.getOwnPropertySymbols == "function")
+    for (var o = 0, n = Object.getOwnPropertySymbols(e); o < n.length; o++)
+      t.indexOf(n[o]) < 0 && Object.prototype.propertyIsEnumerable.call(e, n[o]) && (r[n[o]] = e[n[o]]);
+  return r;
+}, pe = le(function(e, t) {
+  var r = e.icon, n = e.id, o = e.className, i = e.extend, s = It(e, ["icon", "id", "className", "extend"]), d = "univerjs-icon univerjs-icon-".concat(n, " ").concat(o || "").trim(), l = tt("_".concat(Mt()));
+  return ge(r, "".concat(n), { defIds: r.defIds, idSuffix: l.current }, _({ ref: t, className: d }, s), i);
 });
-function render(node, id, runtimeProps, rootProps, extend) {
-  return createElement(node.tag, __assign(__assign({ key: id }, replaceRuntimeIdsAndExtInAttrs(node, runtimeProps, extend)), rootProps), (replaceRuntimeIdsInDefs(node, runtimeProps).children || []).map(function(child, index) {
-    return render(child, "".concat(id, "-").concat(node.tag, "-").concat(index), runtimeProps, void 0, extend);
+function ge(e, t, r, n, o) {
+  return ue(e.tag, _(_({ key: t }, St(e, r, o)), n), (Ot(e, r).children || []).map(function(i, s) {
+    return ge(i, "".concat(t, "-").concat(e.tag, "-").concat(s), r, void 0, o);
   }));
 }
-__name(render, "render");
-function replaceRuntimeIdsAndExtInAttrs(node, runtimeProps, extend) {
-  var attrs = __assign({}, node.attrs);
-  extend != null && extend.colorChannel1 && attrs.fill === "colorChannel1" && (attrs.fill = extend.colorChannel1);
-  var defIds = runtimeProps.defIds;
-  return !defIds || defIds.length === 0 || (node.tag === "use" && attrs["xlink:href"] && (attrs["xlink:href"] = attrs["xlink:href"] + runtimeProps.idSuffix), Object.entries(attrs).forEach(function(_a6) {
-    var key = _a6[0], value = _a6[1];
-    typeof value == "string" && (attrs[key] = value.replace(/url\(#(.*)\)/, "url(#$1".concat(runtimeProps.idSuffix, ")")));
-  })), attrs;
+function St(e, t, r) {
+  var n = _({}, e.attrs);
+  r != null && r.colorChannel1 && n.fill === "colorChannel1" && (n.fill = r.colorChannel1);
+  var o = t.defIds;
+  return !o || o.length === 0 || (e.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + t.idSuffix), Object.entries(n).forEach(function(i) {
+    var s = i[0], d = i[1];
+    typeof d == "string" && (n[s] = d.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
+  })), n;
 }
-__name(replaceRuntimeIdsAndExtInAttrs, "replaceRuntimeIdsAndExtInAttrs");
-function replaceRuntimeIdsInDefs(node, runtimeProps) {
-  var _a6, defIds = runtimeProps.defIds;
-  return !defIds || defIds.length === 0 ? node : node.tag === "defs" && (!((_a6 = node.children) === null || _a6 === void 0) && _a6.length) ? __assign(__assign({}, node), { children: node.children.map(function(child) {
-    return typeof child.attrs.id == "string" && defIds && defIds.indexOf(child.attrs.id) > -1 ? __assign(__assign({}, child), { attrs: __assign(__assign({}, child.attrs), { id: child.attrs.id + runtimeProps.idSuffix }) }) : child;
-  }) }) : node;
+function Ot(e, t) {
+  var r, n = t.defIds;
+  return !n || n.length === 0 ? e : e.tag === "defs" && (!((r = e.children) === null || r === void 0) && r.length) ? _(_({}, e), { children: e.children.map(function(o) {
+    return typeof o.attrs.id == "string" && n && n.indexOf(o.attrs.id) > -1 ? _(_({}, o), { attrs: _(_({}, o.attrs), { id: o.attrs.id + t.idSuffix }) }) : o;
+  }) }) : e;
 }
-__name(replaceRuntimeIdsInDefs, "replaceRuntimeIdsInDefs");
-function generateShortUuid() {
+function Mt() {
   return Math.random().toString(36).substring(2, 8);
 }
-__name(generateShortUuid, "generateShortUuid");
-IconBase.displayName = "UniverIcon";
-var element = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 17", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521C5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345ZM8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521C8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345ZM11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521C11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521 5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345zM8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521 8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345zM11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521 11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M1.84351 3.41861C1.84351 3.01861 2.15531 2.69434 2.53993 2.69434H14.9381C15.3228 2.69434 15.6346 3.01861 15.6346 3.41861V12.4611C15.6346 12.8612 15.3228 13.1854 14.9381 13.1854H8.82117L6.06643 14.6179C5.85054 14.7301 5.59416 14.7181 5.38884 14.5862C5.18352 14.4542 5.05855 14.2211 5.05855 13.9701V13.1854H2.53993C2.15531 13.1854 1.84351 12.8612 1.84351 12.4611L1.84351 3.41861ZM6.45141 12.7982L8.34531 12.0135C8.44201 11.9632 8.54864 11.9371 8.65676 11.9371H14.2417C14.3522 11.9371 14.4417 11.8475 14.4417 11.7371V4.14271C14.4417 4.03225 14.3522 3.94271 14.2417 3.94271H3.23636C3.12591 3.94271 3.03636 4.03225 3.03636 4.14271L3.03636 11.7371C3.03636 11.8475 3.12591 11.9371 3.23636 11.9371L5.75498 11.9371C6.1396 11.9371 6.45141 12.0611 6.45141 12.4611V12.7982Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, CommentSingle = forwardRef(function(props, ref) {
-  return createElement(IconBase, Object.assign({}, props, {
+pe.displayName = "UniverIcon";
+var bt = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 17", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521C5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345ZM8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521C8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345ZM11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521C11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521 5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345zM8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521 8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345zM11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521 11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M1.84351 3.41861C1.84351 3.01861 2.15531 2.69434 2.53993 2.69434H14.9381C15.3228 2.69434 15.6346 3.01861 15.6346 3.41861V12.4611C15.6346 12.8612 15.3228 13.1854 14.9381 13.1854H8.82117L6.06643 14.6179C5.85054 14.7301 5.59416 14.7181 5.38884 14.5862C5.18352 14.4542 5.05855 14.2211 5.05855 13.9701V13.1854H2.53993C2.15531 13.1854 1.84351 12.8612 1.84351 12.4611L1.84351 3.41861ZM6.45141 12.7982L8.34531 12.0135C8.44201 11.9632 8.54864 11.9371 8.65676 11.9371H14.2417C14.3522 11.9371 14.4417 11.8475 14.4417 11.7371V4.14271C14.4417 4.03225 14.3522 3.94271 14.2417 3.94271H3.23636C3.12591 3.94271 3.03636 4.03225 3.03636 4.14271L3.03636 11.7371C3.03636 11.8475 3.12591 11.9371 3.23636 11.9371L5.75498 11.9371C6.1396 11.9371 6.45141 12.0611 6.45141 12.4611V12.7982Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Ie = le(function(e, t) {
+  return ue(pe, Object.assign({}, e, {
     id: "comment-single",
-    ref,
-    icon: element
+    ref: t,
+    icon: bt
   }));
 });
-CommentSingle.displayName = "CommentSingle";
-const menuSchema = {
-  [RibbonStartGroup.OTHERS]: {
-    [ToggleCommentPanelOperation.id]: {
+Ie.displayName = "CommentSingle";
+const xt = {
+  [Ze.OTHERS]: {
+    [k.id]: {
       order: 1,
-      menuItemFactory: ToolbarDocCommentMenuItemFactory
+      menuItemFactory: vt
     }
   },
-  [ContextMenuPosition.MAIN_AREA]: {
-    [ContextMenuGroup.DATA]: {
-      [StartAddCommentOperation.id]: {
+  [qe.MAIN_AREA]: {
+    [ze.DATA]: {
+      [K.id]: {
         order: 1,
-        menuItemFactory: AddDocCommentMenuItemFactory
+        menuItemFactory: Ct
       }
     }
   }
 };
-var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor, __decorateClass$2 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
-  return kind && result && __defProp$2(target, key, result), result;
-}, "__decorateClass$2"), __decorateParam$2 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$2"), _a3;
-let DocThreadCommentUIController = (_a3 = class extends Disposable {
-  constructor(_commandService, _menuManagerService, _componentManager) {
-    super(), this._commandService = _commandService, this._menuManagerService = _menuManagerService, this._componentManager = _componentManager, this._initCommands(), this._initMenus(), this._initComponents();
+var yt = Object.defineProperty, Dt = Object.getOwnPropertyDescriptor, Tt = (e, t, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? Dt(t, r) : t, i = e.length - 1, s; i >= 0; i--)
+    (s = e[i]) && (o = (n ? s(t, r, o) : s(o)) || o);
+  return n && o && yt(t, r, o), o;
+}, J = (e, t) => (r, n) => t(r, n, e);
+let $ = class extends j {
+  constructor(e, t, r) {
+    super(), this._commandService = e, this._menuManagerService = t, this._componentManager = r, this._initCommands(), this._initMenus(), this._initComponents();
   }
   _initCommands() {
     [
-      AddDocCommentComment,
-      DeleteDocCommentComment,
-      ShowCommentPanelOperation,
-      StartAddCommentOperation,
-      ToggleCommentPanelOperation
-    ].forEach((command) => {
-      this.disposeWithMe(this._commandService.registerCommand(command));
+      Ce,
+      ve,
+      N,
+      K,
+      k
+    ].forEach((e) => {
+      this.disposeWithMe(this._commandService.registerCommand(e));
     });
   }
   _initMenus() {
-    this._menuManagerService.mergeMenu(menuSchema);
+    this._menuManagerService.mergeMenu(xt);
   }
   _initComponents() {
-    [DocThreadCommentPanel].forEach((comp) => {
-      this.disposeWithMe(this._componentManager.register(comp.componentKey, comp));
-    }), this.disposeWithMe(this._componentManager.register("CommentSingle", CommentSingle));
+    [T].forEach((e) => {
+      this.disposeWithMe(this._componentManager.register(e.componentKey, e));
+    }), this.disposeWithMe(this._componentManager.register("CommentSingle", Ie));
   }
-}, __name(_a3, "DocThreadCommentUIController"), _a3);
-DocThreadCommentUIController = __decorateClass$2([
-  __decorateParam$2(0, ICommandService),
-  __decorateParam$2(1, IMenuManagerService),
-  __decorateParam$2(2, Inject(ComponentManager))
-], DocThreadCommentUIController);
-var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor, __decorateClass$1 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
-  return kind && result && __defProp$1(target, key, result), result;
-}, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$1"), _a4;
-let DocThreadCommentRenderController = (_a4 = class extends Disposable {
-  constructor(_context, _docInterceptorService, _threadCommentPanelService, _docRenderController, _univerInstanceService, _threadCommentModel, _commandService) {
-    super(), this._context = _context, this._docInterceptorService = _docInterceptorService, this._threadCommentPanelService = _threadCommentPanelService, this._docRenderController = _docRenderController, this._univerInstanceService = _univerInstanceService, this._threadCommentModel = _threadCommentModel, this._commandService = _commandService, this._interceptorViewModel(), this._initReRender(), this._initSyncComments();
+};
+$ = Tt([
+  J(0, M),
+  J(1, Ye),
+  J(2, p(Je))
+], $);
+var Rt = Object.defineProperty, Pt = Object.getOwnPropertyDescriptor, Ut = (e, t, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? Pt(t, r) : t, i = e.length - 1, s; i >= 0; i--)
+    (s = e[i]) && (o = (n ? s(t, r, o) : s(o)) || o);
+  return n && o && Rt(t, r, o), o;
+}, y = (e, t) => (r, n) => t(r, n, e);
+let X = class extends j {
+  constructor(e, t, r, n, o, i, s) {
+    super(), this._context = e, this._docInterceptorService = t, this._threadCommentPanelService = r, this._docRenderController = n, this._univerInstanceService = o, this._threadCommentModel = i, this._commandService = s, this._interceptorViewModel(), this._initReRender(), this._initSyncComments();
   }
   _initReRender() {
-    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe((activeComment) => {
-      var _a6;
-      if (activeComment) {
-        this._docRenderController.reRender(activeComment.unitId);
+    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe((e) => {
+      var r;
+      if (e) {
+        this._docRenderController.reRender(e.unitId);
         return;
       }
-      const unitId = (_a6 = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_DOC)) == null ? void 0 : _a6.getUnitId();
-      unitId && this._docRenderController.reRender(unitId);
-    })), this.disposeWithMe(this._threadCommentModel.commentUpdate$.subscribe((update) => {
-      update.type === "resolve" && this._docRenderController.reRender(update.unitId);
+      const t = (r = this._univerInstanceService.getCurrentUnitForType(S.UNIVER_DOC)) == null ? void 0 : r.getUnitId();
+      t && this._docRenderController.reRender(t);
+    })), this.disposeWithMe(this._threadCommentModel.commentUpdate$.subscribe((e) => {
+      e.type === "resolve" && this._docRenderController.reRender(e.unitId);
     }));
   }
   _interceptorViewModel() {
-    this._docInterceptorService.intercept(DOC_INTERCEPTOR_POINT.CUSTOM_DECORATION, {
-      handler: /* @__PURE__ */ __name((data, pos, next) => {
-        if (!data)
-          return next(data);
-        const { unitId, index, customDecorations } = pos, activeComment = this._threadCommentPanelService.activeCommentId, { commentId, unitId: commentUnitID } = activeComment || {}, activeCustomDecoration = customDecorations.find((i) => i.id === commentId), comment = this._threadCommentModel.getComment(unitId, DEFAULT_DOC_SUBUNIT_ID, data.id);
-        if (!comment)
-          return next({
-            ...data,
+    this._docInterceptorService.intercept(Ve.CUSTOM_DECORATION, {
+      handler: (e, t, r) => {
+        if (!e)
+          return r(e);
+        const { unitId: n, index: o, customDecorations: i } = t, s = this._threadCommentPanelService.activeCommentId, { commentId: d, unitId: l } = s || {}, f = i.find((h) => h.id === d), c = this._threadCommentModel.getComment(n, I, e.id);
+        if (!c)
+          return r({
+            ...e,
             show: !1
           });
-        const isActiveIndex = activeCustomDecoration && index >= activeCustomDecoration.startIndex && index <= activeCustomDecoration.endIndex, isActive = commentUnitID === unitId && data.id === commentId;
-        return next({
-          ...data,
-          active: isActive || isActiveIndex,
-          show: !comment.resolved
+        const C = f && o >= f.startIndex && o <= f.endIndex, v = l === n && e.id === d;
+        return r({
+          ...e,
+          active: v || C,
+          show: !c.resolved
         });
-      }, "handler")
+      }
     });
   }
   _initSyncComments() {
-    var _a6, _b, _c;
-    const unitId = this._context.unit.getUnitId(), subUnitId = DEFAULT_DOC_SUBUNIT_ID, threadIds = (_c = (_b = (_a6 = this._context.unit.getBody()) == null ? void 0 : _a6.customDecorations) == null ? void 0 : _b.filter((i) => i.type === CustomDecorationType.COMMENT).map((i) => i.id)) != null ? _c : [];
-    threadIds.forEach((id) => {
-      this._threadCommentModel.getComment(unitId, subUnitId, id) || this._threadCommentModel.addComment(unitId, subUnitId, { id, threadId: id, ref: "", dT: "", personId: "", text: { dataStream: "" }, unitId, subUnitId });
-    }), threadIds.length && this._threadCommentModel.syncThreadComments(this._context.unit.getUnitId(), DEFAULT_DOC_SUBUNIT_ID, threadIds);
-    let prevThreadIds = threadIds.sort();
-    this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo) => {
-      var _a7, _b2, _c2;
-      if (commandInfo.id === RichTextEditingMutation.id) {
-        if (commandInfo.params.unitId !== this._context.unit.getUnitId())
+    var o, i, s;
+    const e = this._context.unit.getUnitId(), t = I, r = (s = (i = (o = this._context.unit.getBody()) == null ? void 0 : o.customDecorations) == null ? void 0 : i.filter((d) => d.type === Q.COMMENT).map((d) => d.id)) != null ? s : [];
+    r.forEach((d) => {
+      this._threadCommentModel.getComment(e, t, d) || this._threadCommentModel.addComment(e, t, { id: d, threadId: d, ref: "", dT: "", personId: "", text: { dataStream: "" }, unitId: e, subUnitId: t });
+    }), r.length && this._threadCommentModel.syncThreadComments(this._context.unit.getUnitId(), I, r);
+    let n = r.sort();
+    this.disposeWithMe(this._commandService.onCommandExecuted((d) => {
+      var l, f, c;
+      if (d.id === ie.id) {
+        if (d.params.unitId !== this._context.unit.getUnitId())
           return;
-        const currentThreadIds = (_c2 = (_b2 = (_a7 = this._context.unit.getBody()) == null ? void 0 : _a7.customDecorations) == null ? void 0 : _b2.filter((i) => i.type === CustomDecorationType.COMMENT).map((i) => i.id)) != null ? _c2 : [], currentThreadIdsSorted = currentThreadIds.sort();
-        if (JSON.stringify(prevThreadIds) !== JSON.stringify(currentThreadIdsSorted)) {
-          const preIds = new Set(prevThreadIds), currentIds = new Set(currentThreadIdsSorted), addIds = /* @__PURE__ */ new Set(), deleteIds = /* @__PURE__ */ new Set();
-          currentThreadIds.forEach((id) => {
-            preIds.has(id) || addIds.add(id);
-          }), prevThreadIds.forEach((id) => {
-            currentIds.has(id) || deleteIds.add(id);
-          }), prevThreadIds = currentThreadIdsSorted, addIds.forEach((id) => {
-            this._threadCommentModel.getComment(unitId, subUnitId, id) || this._threadCommentModel.addComment(unitId, subUnitId, { id, threadId: id, ref: "", dT: "", personId: "", text: { dataStream: "" }, unitId, subUnitId });
-          }), this._threadCommentModel.syncThreadComments(unitId, subUnitId, [...addIds]);
+        const v = (c = (f = (l = this._context.unit.getBody()) == null ? void 0 : l.customDecorations) == null ? void 0 : f.filter((a) => a.type === Q.COMMENT).map((a) => a.id)) != null ? c : [], h = v.sort();
+        if (JSON.stringify(n) !== JSON.stringify(h)) {
+          const a = new Set(n), m = new Set(h), g = /* @__PURE__ */ new Set(), b = /* @__PURE__ */ new Set();
+          v.forEach((u) => {
+            a.has(u) || g.add(u);
+          }), n.forEach((u) => {
+            m.has(u) || b.add(u);
+          }), n = h, g.forEach((u) => {
+            this._threadCommentModel.getComment(e, t, u) || this._threadCommentModel.addComment(e, t, { id: u, threadId: u, ref: "", dT: "", personId: "", text: { dataStream: "" }, unitId: e, subUnitId: t });
+          }), this._threadCommentModel.syncThreadComments(e, t, [...g]);
         }
       }
     }));
   }
-}, __name(_a4, "DocThreadCommentRenderController"), _a4);
-DocThreadCommentRenderController = __decorateClass$1([
-  __decorateParam$1(1, Inject(DocInterceptorService)),
-  __decorateParam$1(2, Inject(ThreadCommentPanelService)),
-  __decorateParam$1(3, Inject(DocRenderController)),
-  __decorateParam$1(4, IUniverInstanceService),
-  __decorateParam$1(5, Inject(ThreadCommentModel)),
-  __decorateParam$1(6, ICommandService)
-], DocThreadCommentRenderController);
-var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __defNormalProp2 = /* @__PURE__ */ __name((obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, "__defNormalProp"), __decorateClass = /* @__PURE__ */ __name((decorators, target, key, kind) => {
-  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
-    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
-  return kind && result && __defProp2(target, key, result), result;
-}, "__decorateClass"), __decorateParam = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam"), __publicField2 = /* @__PURE__ */ __name((obj, key, value) => __defNormalProp2(obj, typeof key != "symbol" ? key + "" : key, value), "__publicField"), _a5;
-let UniverDocsThreadCommentUIPlugin = (_a5 = class extends Plugin {
-  constructor(_config = defaultPluginConfig, _injector, _renderManagerSrv, _configService) {
-    super(), this._config = _config, this._injector = _injector, this._renderManagerSrv = _renderManagerSrv, this._configService = _configService;
-    const { menu, ...rest } = this._config;
-    menu && this._configService.setConfig("menu", menu, { merge: !0 }), this._configService.setConfig(PLUGIN_CONFIG_KEY, rest);
+};
+X = Ut([
+  y(1, p($e)),
+  y(2, p(R)),
+  y(3, p(He)),
+  y(4, B),
+  y(5, p(se)),
+  y(6, M)
+], X);
+var Se = Object.defineProperty, Et = Object.getOwnPropertyDescriptor, wt = (e, t, r) => t in e ? Se(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, Nt = (e, t, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? Et(t, r) : t, i = e.length - 1, s; i >= 0; i--)
+    (s = e[i]) && (o = (n ? s(t, r, o) : s(o)) || o);
+  return n && o && Se(t, r, o), o;
+}, Y = (e, t) => (r, n) => t(r, n, e), Oe = (e, t, r) => wt(e, typeof t != "symbol" ? t + "" : t, r);
+let V = class extends Pe {
+  constructor(e = ot, t, r, n) {
+    super(), this._config = e, this._injector = t, this._renderManagerSrv = r, this._configService = n;
+    const { menu: o, ...i } = this._config;
+    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(rt, i);
   }
   onStarting() {
     [
-      [DocThreadCommentUIController],
-      [DocThreadCommentSelectionController],
-      [DocThreadCommentService]
-    ].forEach((dep) => {
-      this._injector.add(dep);
+      [$],
+      [A],
+      [D]
+    ].forEach((e) => {
+      this._injector.add(e);
     });
   }
   onRendered() {
-    this._initRenderModule(), this._injector.get(DocThreadCommentSelectionController), this._injector.get(DocThreadCommentUIController);
+    this._initRenderModule(), this._injector.get(A), this._injector.get($);
   }
   _initRenderModule() {
-    [DocThreadCommentRenderController].forEach((dep) => {
-      this._renderManagerSrv.registerRenderModule(UniverInstanceType.UNIVER_DOC, dep);
+    [X].forEach((e) => {
+      this._renderManagerSrv.registerRenderModule(S.UNIVER_DOC, e);
     });
   }
-}, __name(_a5, "UniverDocsThreadCommentUIPlugin"), _a5);
-__publicField2(UniverDocsThreadCommentUIPlugin, "pluginName", PLUGIN_NAME);
-__publicField2(UniverDocsThreadCommentUIPlugin, "type", UniverInstanceType.UNIVER_DOC);
-UniverDocsThreadCommentUIPlugin = __decorateClass([
-  DependentOn(UniverThreadCommentUIPlugin),
-  __decorateParam(1, Inject(Injector)),
-  __decorateParam(2, IRenderManagerService),
-  __decorateParam(3, IConfigService)
-], UniverDocsThreadCommentUIPlugin);
+};
+Oe(V, "pluginName", nt);
+Oe(V, "type", S.UNIVER_DOC);
+V = Nt([
+  Re(we),
+  Y(1, p(re)),
+  Y(2, F),
+  Y(3, Ue)
+], V);
 export {
-  AddDocCommentComment,
-  DeleteDocCommentComment,
-  ShowCommentPanelOperation,
-  StartAddCommentOperation,
-  UniverDocsThreadCommentUIPlugin
+  Ce as AddDocCommentComment,
+  ve as DeleteDocCommentComment,
+  N as ShowCommentPanelOperation,
+  K as StartAddCommentOperation,
+  V as UniverDocsThreadCommentUIPlugin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@univerjs/docs-thread-comment-ui",
-  "version": "0.4.2-nightly.202411071606",
+  "version": "0.4.2-nightly.202411091134",
   "private": false,
   "description": "Univer thread comment plugin",
   "author": "DreamNum <developer@univer.ai>",
@@ -21,10 +21,12 @@
   "exports": {
     ".": {
       "import": "./lib/es/index.js",
+      "require": "./lib/cjs/index.js",
       "types": "./lib/types/index.d.ts"
     },
     "./*": {
       "import": "./lib/es/*",
+      "require": "./lib/cjs/*",
       "types": "./lib/types/index.d.ts"
     },
     "./lib/*": "./lib/*"
@@ -45,17 +47,17 @@
     "rxjs": ">=7.0.0"
   },
   "dependencies": {
-    "@univerjs/icons": "^0.2.3",
+    "@univerjs/icons": "^0.2.5",
     "clsx": "^2.1.1",
-    "@univerjs/core": "0.4.2-nightly.202411071606",
-    "@univerjs/design": "0.4.2-nightly.202411071606",
-    "@univerjs/docs": "0.4.2-nightly.202411071606",
-    "@univerjs/docs-ui": "0.4.2-nightly.202411071606",
-    "@univerjs/engine-formula": "0.4.2-nightly.202411071606",
-    "@univerjs/engine-render": "0.4.2-nightly.202411071606",
-    "@univerjs/thread-comment": "0.4.2-nightly.202411071606",
-    "@univerjs/ui": "0.4.2-nightly.202411071606",
-    "@univerjs/thread-comment-ui": "0.4.2-nightly.202411071606"
+    "@univerjs/core": "0.4.2-nightly.202411091134",
+    "@univerjs/design": "0.4.2-nightly.202411091134",
+    "@univerjs/docs": "0.4.2-nightly.202411091134",
+    "@univerjs/docs-ui": "0.4.2-nightly.202411091134",
+    "@univerjs/engine-formula": "0.4.2-nightly.202411091134",
+    "@univerjs/thread-comment-ui": "0.4.2-nightly.202411091134",
+    "@univerjs/engine-render": "0.4.2-nightly.202411091134",
+    "@univerjs/ui": "0.4.2-nightly.202411091134",
+    "@univerjs/thread-comment": "0.4.2-nightly.202411091134"
   },
   "devDependencies": {
     "react": "18.3.1",
@@ -65,13 +67,15 @@
     "vitest": "^2.1.4",
     "@univerjs-infra/shared": "0.4.2"
   },
-  "univerSpace": {
+  "space": {
     ".": {
       "import": "./lib/es/index.js",
+      "require": "./lib/cjs/index.js",
       "types": "./lib/types/index.d.ts"
     },
     "./*": {
       "import": "./lib/es/*",
+      "require": "./lib/cjs/*",
       "types": "./lib/types/index.d.ts"
     },
     "./lib/*": "./lib/*"
@@ -81,7 +85,7 @@
     "test:watch": "vitest",
     "coverage": "vitest run --coverage",
     "lint:types": "tsc --noEmit",
-    "build": "tsc && vite build"
+    "build": "tsx build.ts"
   },
   "module": "./lib/es/index.js"
 }