@univerjs/docs-drawing 0.2.2 → 0.2.4-alpha.0

package/README.md

@@ -1,16 +1,27 @@
 # @univerjs/docs-drawing
 
-[![npm version](https://img.shields.io/npm/v/@univerjs/docs-drawing)](https://npmjs.org/packages/@univerjs/docs-drawing)
-[![license](https://img.shields.io/npm/l/@univerjs/docs-drawing)](https://img.shields.io/npm/l/@univerjs/docs-drawing)
+## Package Overview
 
-## Introduction
+| Package Name | UMD Namespace | Version | License | Downloads | Contains CSS | Contains i18n locales |
+| --- | --- | --- | --- | --- | :---: | :---: |
+| `@univerjs/docs-drawing` | `UniverDocsDrawing` | [![][npm-version-shield]][npm-version-link] | ![][npm-license-shield] | ![][npm-downloads-shield] | ❌ | ❌ |
 
-> TODO: Introduction
+## Introduction
 
 ## Usage
 
 ### Installation
 
 ```shell
-npm i @univerjs/docs-drawing
+# Using npm
+npm install @univerjs/docs-drawing
+
+# Using pnpm
+pnpm add @univerjs/docs-drawing
 ```
+
+<!-- Links -->
+[npm-version-shield]: https://img.shields.io/npm/v/@univerjs/docs-drawing?style=flat-square
+[npm-version-link]: https://npmjs.com/package/@univerjs/docs-drawing
+[npm-license-shield]: https://img.shields.io/npm/l/@univerjs/docs-drawing?style=flat-square
+[npm-downloads-shield]: https://img.shields.io/npm/dm/@univerjs/docs-drawing?style=flat-square

package/lib/cjs/index.js

@@ -1 +1 @@
-"use strict";var P=Object.defineProperty;var M=(r,t,e)=>t in r?P(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e;var w=(r,t,e)=>M(r,typeof t!="symbol"?t+"":t,e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("@univerjs/core"),f=require("@wendellhu/redi"),p=require("@univerjs/engine-render"),R=require("@univerjs/docs-ui"),U=require("@univerjs/drawing");class l extends U.UnitDrawingService{}const _=f.createIdentifier("univer.doc.plugin.doc-drawing.service");var O=(r=>(r[r.INSERT=0]="INSERT",r[r.REMOVE=1]="REMOVE",r[r.UPDATE=2]="UPDATE",r[r.ARRANGE=3]="ARRANGE",r[r.GROUP=4]="GROUP",r[r.UNGROUP=5]="UNGROUP",r))(O||{});const I={id:"doc.mutation.set-drawing-apply",type:s.CommandType.MUTATION,handler:(r,t)=>{const e=r.get(U.IDrawingManagerService),i=r.get(_),n=r.get(s.IUniverInstanceService),{op:o,unitId:a,subUnitId:g,type:S,objects:c}=t;switch(e.applyJson1(a,g,o),i.applyJson1(a,g,o),S){case 0:e.addNotification(c),i.addNotification(c);break;case 1:e.removeNotification(c),i.removeNotification(c);break;case 2:e.updateNotification(c),i.updateNotification(c);break;case 3:e.orderNotification(c),i.orderNotification(c);break;case 4:e.groupUpdateNotification(c);break;case 5:e.ungroupUpdateNotification(c);break}const h=n.getUnit(a);return h.getSnapshot().drawings=e.getDrawingData(a,g),h.getSnapshot().drawingsOrder=e.getDrawingOrder(a,g),!0}};var b=Object.defineProperty,E=Object.getOwnPropertyDescriptor,N=(r,t,e,i)=>{for(var n=i>1?void 0:i?E(t,e):t,o=r.length-1,a;o>=0;o--)(a=r[o])&&(n=(i?a(t,e,n):a(n))||n);return i&&n&&b(t,e,n),n},d=(r,t)=>(e,i)=>t(e,i,r);const m="DOC_DRAWING_PLUGIN";let D=class extends s.Disposable{constructor(r){super(),this._commandService=r,this.disposeWithMe(this._commandService.registerCommand(I))}};D=N([s.OnLifecycle(s.LifecycleStages.Starting,D),d(0,s.ICommandService)],D);let u=class extends s.Disposable{constructor(r,t,e,i,n){super(),this._docDrawingService=r,this._drawingManagerService=t,this._resourceManagerService=e,this._univerInstanceService=i,this._textSelectionRenderManager=n,this._init()}_init(){this._initSnapshot(),this._initDataLoader()}_initSnapshot(){const r=e=>{const i=this._docDrawingService.getDrawingDataForUnit(e);return i?JSON.stringify(i):""},t=e=>{if(!e)return{};try{return JSON.parse(e)}catch{return{}}};this.disposeWithMe(this._resourceManagerService.registerPluginResource({pluginName:m,businesses:[s.UniverInstanceType.UNIVER_DOC],toJson:e=>r(e),parseJson:e=>t(e),onUnLoad:e=>{this._docDrawingService.removeDrawingDataForUnit(e),this._drawingManagerService.removeDrawingDataForUnit(e),this._setDrawingDataForUnit(e,{data:{},order:[]})},onLoad:(e,i)=>{this._docDrawingService.registerDrawingData(e,i),this._drawingManagerService.registerDrawingData(e,i),this._setDrawingDataForUnit(e,i[e])}}))}_setDrawingDataForUnit(r,t){const e=this._univerInstanceService.getUnit(r);e!=null&&e.resetDrawing(t.data,t.order)}_initDataLoader(){const r=this._univerInstanceService.getCurrentUnitForType(s.UniverInstanceType.UNIVER_DOC);if(!r)return!1;const t=r.getUnitId(),e=t,i=r.getDrawings(),n=r.getDrawingsOrder();if(!i||!n)return!1;Object.keys(i).forEach(a=>{const g=i[a],S=g.docTransform,c=R.docDrawingPositionToTransform(S);i[a]={...g,transform:c}});const o={[e]:{unitId:t,subUnitId:e,data:i,order:n}};return this._docDrawingService.registerDrawingData(t,o),this._drawingManagerService.registerDrawingData(t,o),!0}};u=N([s.OnLifecycle(s.LifecycleStages.Rendered,u),d(0,_),d(1,U.IDrawingManagerService),d(2,s.IResourceManagerService),d(3,s.IUniverInstanceService),d(4,p.ITextSelectionRenderManager)],u);var C=Object.defineProperty,L=Object.getOwnPropertyDescriptor,G=(r,t,e,i)=>{for(var n=i>1?void 0:i?L(t,e):t,o=r.length-1,a;o>=0;o--)(a=r[o])&&(n=(i?a(t,e,n):a(n))||n);return i&&n&&C(t,e,n),n},j=(r,t)=>(e,i)=>t(e,i,r),v;exports.UniverDocsDrawingPlugin=(v=class extends s.Plugin{constructor(t,e){super(),this._injector=e}onStarting(t){[[D],[u],[l],[_,{useClass:l}]].forEach(e=>t.add(e))}},w(v,"pluginName",m),w(v,"type",s.UniverInstanceType.UNIVER_DOC),v);exports.UniverDocsDrawingPlugin=G([j(1,f.Inject(f.Injector))],exports.UniverDocsDrawingPlugin);exports.DocDrawingApplyType=O;exports.DocDrawingService=l;exports.IDocDrawingService=_;exports.SetDocDrawingApplyMutation=I;
+"use strict";var P=Object.defineProperty;var b=(r,i,e)=>i in r?P(r,i,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[i]=e;var D=(r,i,e)=>b(r,typeof i!="symbol"?i+"":i,e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("@univerjs/core"),f=require("@univerjs/drawing"),I=require("rxjs/operators");class S extends f.UnitDrawingService{}const l=a.createIdentifier("univer.doc.plugin.doc-drawing.service");var h=(r=>(r[r.INSERT=0]="INSERT",r[r.REMOVE=1]="REMOVE",r[r.UPDATE=2]="UPDATE",r[r.ARRANGE=3]="ARRANGE",r[r.GROUP=4]="GROUP",r[r.UNGROUP=5]="UNGROUP",r))(h||{});const w={id:"doc.mutation.set-drawing-apply",type:a.CommandType.MUTATION,handler:(r,i)=>{const e=r.get(f.IDrawingManagerService),t=r.get(l),n=r.get(a.IUniverInstanceService),{op:s,unitId:c,subUnitId:g,type:O,objects:o}=i;switch(e.applyJson1(c,g,s),t.applyJson1(c,g,s),O){case 0:e.addNotification(o),t.addNotification(o);break;case 1:e.removeNotification(o),t.removeNotification(o);break;case 2:e.updateNotification(o),t.updateNotification(o);break;case 3:e.orderNotification(o),t.orderNotification(o);break;case 4:e.groupUpdateNotification(o);break;case 5:e.ungroupUpdateNotification(o);break}return n.getUnit(c),!0}};var p=Object.defineProperty,R=Object.getOwnPropertyDescriptor,N=(r,i,e,t)=>{for(var n=t>1?void 0:t?R(i,e):i,s=r.length-1,c;s>=0;s--)(c=r[s])&&(n=(t?c(i,e,n):c(n))||n);return t&&n&&p(i,e,n),n},d=(r,i)=>(e,t)=>i(e,t,r);const U="DOC_DRAWING_PLUGIN";let v=class extends a.Disposable{constructor(r){super(),this._commandService=r,this.disposeWithMe(this._commandService.registerCommand(w))}};v=N([a.OnLifecycle(a.LifecycleStages.Starting,v),d(0,a.ICommandService)],v);let _=class extends a.Disposable{constructor(r,i,e,t,n){super(),this._docDrawingService=r,this._drawingManagerService=i,this._resourceManagerService=e,this._univerInstanceService=t,this._lifecycleService=n,this._init()}_init(){this._initSnapshot(),this._drawingInitializeListener()}_initSnapshot(){const r=e=>{const t=this._docDrawingService.getDrawingDataForUnit(e);return t!=null&&t[e]?JSON.stringify(t==null?void 0:t[e]):""},i=e=>{if(!e)return{data:{},order:[]};try{return JSON.parse(e)}catch{return{data:{},order:[]}}};this.disposeWithMe(this._resourceManagerService.registerPluginResource({pluginName:U,businesses:[a.UniverInstanceType.UNIVER_DOC],toJson:e=>r(e),parseJson:e=>i(e),onUnLoad:e=>{this._setDrawingDataForUnit(e,{data:{},order:[]})},onLoad:(e,t)=>{var n,s;this._setDrawingDataForUnit(e,{data:(n=t.data)!=null?n:{},order:(s=t.order)!=null?s:[]})}}))}_setDrawingDataForUnit(r,i){const e=this._univerInstanceService.getUnit(r);e!=null&&(e.resetDrawing(i.data,i.order),this._initDataLoader())}_initDataLoader(){const r=this._univerInstanceService.getCurrentUnitForType(a.UniverInstanceType.UNIVER_DOC);if(!r)return!1;const i=r.getUnitId(),e=i,t=r.getDrawings(),n=r.getDrawingsOrder();if(!t||!n)return!1;Object.keys(t).forEach(c=>{const g=t[c];t[c]={...g}});const s={[e]:{unitId:i,subUnitId:e,data:t,order:n}};return this._docDrawingService.registerDrawingData(i,s),this._drawingManagerService.registerDrawingData(i,s),!0}_drawingInitializeListener(){this._lifecycleService.lifecycle$.pipe(I.filter(r=>r===a.LifecycleStages.Rendered),I.first()).subscribe(r=>{var e;const i=(e=this._univerInstanceService.getCurrentUnitForType(a.UniverInstanceType.UNIVER_DOC))==null?void 0:e.getUnitId();i&&(this._docDrawingService.initializeNotification(i),this._drawingManagerService.initializeNotification(i))})}};_=N([a.OnLifecycle(a.LifecycleStages.Starting,_),d(0,l),d(1,f.IDrawingManagerService),d(2,a.IResourceManagerService),d(3,a.IUniverInstanceService),d(4,a.Inject(a.LifecycleService))],_);var M=Object.defineProperty,C=Object.getOwnPropertyDescriptor,E=(r,i,e,t)=>{for(var n=t>1?void 0:t?C(i,e):i,s=r.length-1,c;s>=0;s--)(c=r[s])&&(n=(t?c(i,e,n):c(n))||n);return t&&n&&M(i,e,n),n},L=(r,i)=>(e,t)=>i(e,t,r),u;exports.UniverDocsDrawingPlugin=(u=class extends a.Plugin{constructor(i,e){super(),this._injector=e}onStarting(i){[[v],[_],[S],[l,{useClass:S}]].forEach(e=>i.add(e))}},D(u,"pluginName",U),D(u,"type",a.UniverInstanceType.UNIVER_DOC),u);exports.UniverDocsDrawingPlugin=E([L(1,a.Inject(a.Injector))],exports.UniverDocsDrawingPlugin);exports.DOCS_DRAWING_PLUGIN=U;exports.DocDrawingApplyType=h;exports.DocDrawingService=S;exports.IDocDrawingService=l;exports.SetDocDrawingApplyMutation=w;

package/lib/es/index.js

@@ -1,153 +1,159 @@
-var R = Object.defineProperty;
-var p = (r, t, e) => t in r ? R(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e;
-var D = (r, t, e) => p(r, typeof t != "symbol" ? t + "" : t, e);
-import { CommandType as b, IUniverInstanceService as U, OnLifecycle as l, LifecycleStages as N, Disposable as O, ICommandService as E, UniverInstanceType as f, IResourceManagerService as C, Plugin as G } from "@univerjs/core";
-import { createIdentifier as L, Inject as j, Injector as J } from "@wendellhu/redi";
-import { ITextSelectionRenderManager as x } from "@univerjs/engine-render";
-import { docDrawingPositionToTransform as F } from "@univerjs/docs-ui";
-import { UnitDrawingService as V, IDrawingManagerService as I } from "@univerjs/drawing";
-class m extends V {
+var b = Object.defineProperty;
+var M = (e, r, t) => r in e ? b(e, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[r] = t;
+var f = (e, r, t) => M(e, typeof r != "symbol" ? r + "" : r, t);
+import { createIdentifier as C, CommandType as E, IUniverInstanceService as D, OnLifecycle as I, LifecycleStages as l, Inject as N, LifecycleService as p, Disposable as O, ICommandService as L, UniverInstanceType as u, IResourceManagerService as G, Plugin as j, Injector as J } from "@univerjs/core";
+import { UnitDrawingService as F, IDrawingManagerService as w } from "@univerjs/drawing";
+import { filter as V, first as x } from "rxjs/operators";
+class h extends F {
 }
-const S = L("univer.doc.plugin.doc-drawing.service");
-var W = /* @__PURE__ */ ((r) => (r[r.INSERT = 0] = "INSERT", r[r.REMOVE = 1] = "REMOVE", r[r.UPDATE = 2] = "UPDATE", r[r.ARRANGE = 3] = "ARRANGE", r[r.GROUP = 4] = "GROUP", r[r.UNGROUP = 5] = "UNGROUP", r))(W || {});
-const $ = {
+const S = C("univer.doc.plugin.doc-drawing.service");
+var $ = /* @__PURE__ */ ((e) => (e[e.INSERT = 0] = "INSERT", e[e.REMOVE = 1] = "REMOVE", e[e.UPDATE = 2] = "UPDATE", e[e.ARRANGE = 3] = "ARRANGE", e[e.GROUP = 4] = "GROUP", e[e.UNGROUP = 5] = "UNGROUP", e))($ || {});
+const z = {
   id: "doc.mutation.set-drawing-apply",
-  type: b.MUTATION,
-  handler: (r, t) => {
-    const e = r.get(I), i = r.get(S), n = r.get(U), { op: o, unitId: a, subUnitId: c, type: u, objects: s } = t;
-    switch (e.applyJson1(a, c, o), i.applyJson1(a, c, o), u) {
+  type: E.MUTATION,
+  handler: (e, r) => {
+    const t = e.get(w), i = e.get(S), n = e.get(D), { op: a, unitId: s, subUnitId: d, type: m, objects: o } = r;
+    switch (t.applyJson1(s, d, a), i.applyJson1(s, d, a), m) {
       case 0:
-        e.addNotification(s), i.addNotification(s);
+        t.addNotification(o), i.addNotification(o);
         break;
       case 1:
-        e.removeNotification(s), i.removeNotification(s);
+        t.removeNotification(o), i.removeNotification(o);
         break;
       case 2:
-        e.updateNotification(s), i.updateNotification(s);
+        t.updateNotification(o), i.updateNotification(o);
         break;
       case 3:
-        e.orderNotification(s), i.orderNotification(s);
+        t.orderNotification(o), i.orderNotification(o);
         break;
       case 4:
-        e.groupUpdateNotification(s);
+        t.groupUpdateNotification(o);
         break;
       case 5:
-        e.ungroupUpdateNotification(s);
+        t.ungroupUpdateNotification(o);
         break;
     }
-    const h = n.getUnit(a);
-    return h.getSnapshot().drawings = e.getDrawingData(a, c), h.getSnapshot().drawingsOrder = e.getDrawingOrder(a, c), !0;
+    return n.getUnit(s), !0;
   }
 };
-var T = Object.defineProperty, q = Object.getOwnPropertyDescriptor, M = (r, t, e, i) => {
-  for (var n = i > 1 ? void 0 : i ? q(t, e) : t, o = r.length - 1, a; o >= 0; o--)
-    (a = r[o]) && (n = (i ? a(t, e, n) : a(n)) || n);
-  return i && n && T(t, e, n), n;
-}, g = (r, t) => (e, i) => t(e, i, r);
-const P = "DOC_DRAWING_PLUGIN";
+var W = Object.defineProperty, q = Object.getOwnPropertyDescriptor, P = (e, r, t, i) => {
+  for (var n = i > 1 ? void 0 : i ? q(r, t) : r, a = e.length - 1, s; a >= 0; a--)
+    (s = e[a]) && (n = (i ? s(r, t, n) : s(n)) || n);
+  return i && n && W(r, t, n), n;
+}, c = (e, r) => (t, i) => r(t, i, e);
+const R = "DOC_DRAWING_PLUGIN";
 let v = class extends O {
-  constructor(r) {
-    super(), this._commandService = r, this.disposeWithMe(this._commandService.registerCommand($));
+  constructor(e) {
+    super(), this._commandService = e, this.disposeWithMe(this._commandService.registerCommand(z));
   }
 };
-v = M([
-  l(N.Starting, v),
-  g(0, E)
+v = P([
+  I(l.Starting, v),
+  c(0, L)
 ], v);
 let _ = class extends O {
-  constructor(r, t, e, i, n) {
-    super(), this._docDrawingService = r, this._drawingManagerService = t, this._resourceManagerService = e, this._univerInstanceService = i, this._textSelectionRenderManager = n, this._init();
+  constructor(e, r, t, i, n) {
+    super(), this._docDrawingService = e, this._drawingManagerService = r, this._resourceManagerService = t, this._univerInstanceService = i, this._lifecycleService = n, this._init();
   }
   _init() {
-    this._initSnapshot(), this._initDataLoader();
+    this._initSnapshot(), this._drawingInitializeListener();
   }
   _initSnapshot() {
-    const r = (e) => {
-      const i = this._docDrawingService.getDrawingDataForUnit(e);
-      return i ? JSON.stringify(i) : "";
-    }, t = (e) => {
-      if (!e)
-        return {};
+    const e = (t) => {
+      const i = this._docDrawingService.getDrawingDataForUnit(t);
+      return i != null && i[t] ? JSON.stringify(i == null ? void 0 : i[t]) : "";
+    }, r = (t) => {
+      if (!t)
+        return { data: {}, order: [] };
       try {
-        return JSON.parse(e);
+        return JSON.parse(t);
       } catch {
-        return {};
+        return { data: {}, order: [] };
       }
     };
     this.disposeWithMe(
       this._resourceManagerService.registerPluginResource({
-        pluginName: P,
-        businesses: [f.UNIVER_DOC],
-        toJson: (e) => r(e),
-        parseJson: (e) => t(e),
-        onUnLoad: (e) => {
-          this._docDrawingService.removeDrawingDataForUnit(e), this._drawingManagerService.removeDrawingDataForUnit(e), this._setDrawingDataForUnit(e, { data: {}, order: [] });
+        pluginName: R,
+        businesses: [u.UNIVER_DOC],
+        toJson: (t) => e(t),
+        parseJson: (t) => r(t),
+        onUnLoad: (t) => {
+          this._setDrawingDataForUnit(t, { data: {}, order: [] });
         },
-        onLoad: (e, i) => {
-          this._docDrawingService.registerDrawingData(e, i), this._drawingManagerService.registerDrawingData(e, i), this._setDrawingDataForUnit(e, i[e]);
+        onLoad: (t, i) => {
+          var n, a;
+          this._setDrawingDataForUnit(t, { data: (n = i.data) != null ? n : {}, order: (a = i.order) != null ? a : [] });
         }
       })
     );
   }
-  _setDrawingDataForUnit(r, t) {
-    const e = this._univerInstanceService.getUnit(r);
-    e != null && e.resetDrawing(t.data, t.order);
+  _setDrawingDataForUnit(e, r) {
+    const t = this._univerInstanceService.getUnit(e);
+    t != null && (t.resetDrawing(r.data, r.order), this._initDataLoader());
   }
   _initDataLoader() {
-    const r = this._univerInstanceService.getCurrentUnitForType(f.UNIVER_DOC);
-    if (!r)
+    const e = this._univerInstanceService.getCurrentUnitForType(u.UNIVER_DOC);
+    if (!e)
       return !1;
-    const t = r.getUnitId(), e = t, i = r.getDrawings(), n = r.getDrawingsOrder();
+    const r = e.getUnitId(), t = r, i = e.getDrawings(), n = e.getDrawingsOrder();
     if (!i || !n)
       return !1;
-    Object.keys(i).forEach((a) => {
-      const c = i[a], u = c.docTransform, s = F(u);
-      i[a] = { ...c, transform: s };
+    Object.keys(i).forEach((s) => {
+      const d = i[s];
+      i[s] = { ...d };
     });
-    const o = {
-      [e]: {
-        unitId: t,
-        subUnitId: e,
+    const a = {
+      [t]: {
+        unitId: r,
+        subUnitId: t,
         data: i,
         order: n
       }
     };
-    return this._docDrawingService.registerDrawingData(t, o), this._drawingManagerService.registerDrawingData(t, o), !0;
+    return this._docDrawingService.registerDrawingData(r, a), this._drawingManagerService.registerDrawingData(r, a), !0;
+  }
+  _drawingInitializeListener() {
+    this._lifecycleService.lifecycle$.pipe(V((e) => e === l.Rendered), x()).subscribe((e) => {
+      var t;
+      const r = (t = this._univerInstanceService.getCurrentUnitForType(u.UNIVER_DOC)) == null ? void 0 : t.getUnitId();
+      r && (this._docDrawingService.initializeNotification(r), this._drawingManagerService.initializeNotification(r));
+    });
   }
 };
-_ = M([
-  l(N.Rendered, _),
-  g(0, S),
-  g(1, I),
-  g(2, C),
-  g(3, U),
-  g(4, x)
+_ = P([
+  I(l.Starting, _),
+  c(0, S),
+  c(1, w),
+  c(2, G),
+  c(3, D),
+  c(4, N(p))
 ], _);
-var z = Object.defineProperty, B = Object.getOwnPropertyDescriptor, H = (r, t, e, i) => {
-  for (var n = i > 1 ? void 0 : i ? B(t, e) : t, o = r.length - 1, a; o >= 0; o--)
-    (a = r[o]) && (n = (i ? a(t, e, n) : a(n)) || n);
-  return i && n && z(t, e, n), n;
-}, K = (r, t) => (e, i) => t(e, i, r), d;
-let w = (d = class extends G {
-  constructor(r, t) {
-    super(), this._injector = t;
+var B = Object.defineProperty, H = Object.getOwnPropertyDescriptor, K = (e, r, t, i) => {
+  for (var n = i > 1 ? void 0 : i ? H(r, t) : r, a = e.length - 1, s; a >= 0; a--)
+    (s = e[a]) && (n = (i ? s(r, t, n) : s(n)) || n);
+  return i && n && B(r, t, n), n;
+}, Q = (e, r) => (t, i) => r(t, i, e), g;
+let U = (g = class extends j {
+  constructor(e, r) {
+    super(), this._injector = r;
   }
-  onStarting(r) {
+  onStarting(e) {
     [
       [v],
       [_],
-      [m],
-      [S, { useClass: m }]
-    ].forEach((t) => r.add(t));
+      [h],
+      [S, { useClass: h }]
+    ].forEach((r) => e.add(r));
   }
-}, D(d, "pluginName", P), D(d, "type", f.UNIVER_DOC), d);
-w = H([
-  K(1, j(J))
-], w);
+}, f(g, "pluginName", R), f(g, "type", u.UNIVER_DOC), g);
+U = K([
+  Q(1, N(J))
+], U);
 export {
-  W as DocDrawingApplyType,
-  m as DocDrawingService,
+  R as DOCS_DRAWING_PLUGIN,
+  $ as DocDrawingApplyType,
+  h as DocDrawingService,
   S as IDocDrawingService,
-  $ as SetDocDrawingApplyMutation,
-  w as UniverDocsDrawingPlugin
+  z as SetDocDrawingApplyMutation,
+  U as UniverDocsDrawingPlugin
 };

package/lib/types/controllers/doc-drawing.controller.d.ts

@@ -1,9 +1,12 @@
-import { Disposable, ICommandService, IResourceManagerService, IUniverInstanceService } from '@univerjs/core';
-import { ITextSelectionRenderManager } from '@univerjs/engine-render';
+import { IDocumentData, Disposable, ICommandService, IResourceManagerService, IUniverInstanceService, LifecycleService } from '@univerjs/core';
 import { IDrawingManagerService } from '@univerjs/drawing';
 import { IDocDrawingService } from '../services/doc-drawing.service';
 
 export declare const DOCS_DRAWING_PLUGIN = "DOC_DRAWING_PLUGIN";
+export interface IDocDrawingModel {
+    drawings?: IDocumentData['drawings'];
+    drawingsOrder?: IDocumentData['drawingsOrder'];
+}
 export declare class DocDrawingLoadController extends Disposable {
     private readonly _commandService;
     constructor(_commandService: ICommandService);
@@ -13,10 +16,11 @@ export declare class DocDrawingController extends Disposable {
     private readonly _drawingManagerService;
     private _resourceManagerService;
     private _univerInstanceService;
-    private readonly _textSelectionRenderManager;
-    constructor(_docDrawingService: IDocDrawingService, _drawingManagerService: IDrawingManagerService, _resourceManagerService: IResourceManagerService, _univerInstanceService: IUniverInstanceService, _textSelectionRenderManager: ITextSelectionRenderManager);
+    private _lifecycleService;
+    constructor(_docDrawingService: IDocDrawingService, _drawingManagerService: IDrawingManagerService, _resourceManagerService: IResourceManagerService, _univerInstanceService: IUniverInstanceService, _lifecycleService: LifecycleService);
     private _init;
     private _initSnapshot;
     private _setDrawingDataForUnit;
     private _initDataLoader;
+    private _drawingInitializeListener;
 }

package/lib/types/index.d.ts

@@ -15,4 +15,5 @@
  */
 export { UniverDocsDrawingPlugin } from './plugin';
 export { type IDocDrawing, IDocDrawingService, DocDrawingService } from './services/doc-drawing.service';
+export { DOCS_DRAWING_PLUGIN, type IDocDrawingModel } from './controllers/doc-drawing.controller';
 export { SetDocDrawingApplyMutation, DocDrawingApplyType, type ISetDrawingApplyMutationParams } from './commands/mutations/set-drawing-apply.mutation';

package/lib/types/plugin.d.ts

@@ -1,5 +1,4 @@
-import { Plugin, UniverInstanceType } from '@univerjs/core';
-import { Injector } from '@wendellhu/redi';
+import { Injector, Plugin, UniverInstanceType } from '@univerjs/core';
 
 export declare class UniverDocsDrawingPlugin extends Plugin {
     _injector: Injector;

package/lib/types/services/doc-drawing.service.d.ts

@@ -15,5 +15,5 @@ export declare class DocDrawingService extends UnitDrawingService<IDocDrawing> {
 }
 export interface IDocDrawingService extends IUnitDrawingService<IDocDrawing> {
 }
-export declare const IDocDrawingService: import('@wendellhu/redi').IdentifierDecorator<IDocDrawingService>;
+export declare const IDocDrawingService: import('@univerjs/core').IdentifierDecorator<IDocDrawingService>;
 export {};

package/lib/umd/index.js

@@ -1 +1 @@
-(function(a,t){typeof exports=="object"&&typeof module<"u"?t(exports,require("@univerjs/core"),require("@wendellhu/redi"),require("@univerjs/engine-render"),require("@univerjs/docs-ui"),require("@univerjs/drawing")):typeof define=="function"&&define.amd?define(["exports","@univerjs/core","@wendellhu/redi","@univerjs/engine-render","@univerjs/docs-ui","@univerjs/drawing"],t):(a=typeof globalThis<"u"?globalThis:a||self,t(a.UniverDocsDrawing={},a.UniverCore,a["@wendellhu/redi"],a.UniverEngineRender,a.UniverDocsUi,a.UniverDrawing))})(this,function(a,t,g,M,p,w){"use strict";var G=Object.defineProperty;var T=(a,t,g)=>t in a?G(a,t,{enumerable:!0,configurable:!0,writable:!0,value:g}):a[t]=g;var l=(a,t,g)=>T(a,typeof t!="symbol"?t+"":t,g);var S;class U extends w.UnitDrawingService{}const D=g.createIdentifier("univer.doc.plugin.doc-drawing.service");var O=(r=>(r[r.INSERT=0]="INSERT",r[r.REMOVE=1]="REMOVE",r[r.UPDATE=2]="UPDATE",r[r.ARRANGE=3]="ARRANGE",r[r.GROUP=4]="GROUP",r[r.UNGROUP=5]="UNGROUP",r))(O||{});const I={id:"doc.mutation.set-drawing-apply",type:t.CommandType.MUTATION,handler:(r,i)=>{const e=r.get(w.IDrawingManagerService),n=r.get(D),s=r.get(t.IUniverInstanceService),{op:c,unitId:o,subUnitId:u,type:h,objects:d}=i;switch(e.applyJson1(o,u,c),n.applyJson1(o,u,c),h){case 0:e.addNotification(d),n.addNotification(d);break;case 1:e.removeNotification(d),n.removeNotification(d);break;case 2:e.updateNotification(d),n.updateNotification(d);break;case 3:e.orderNotification(d),n.orderNotification(d);break;case 4:e.groupUpdateNotification(d);break;case 5:e.ungroupUpdateNotification(d);break}const P=s.getUnit(o);return P.getSnapshot().drawings=e.getDrawingData(o,u),P.getSnapshot().drawingsOrder=e.getDrawingOrder(o,u),!0}};var R=Object.defineProperty,j=Object.getOwnPropertyDescriptor,m=(r,i,e,n)=>{for(var s=n>1?void 0:n?j(i,e):i,c=r.length-1,o;c>=0;c--)(o=r[c])&&(s=(n?o(i,e,s):o(s))||s);return n&&s&&R(i,e,s),s},v=(r,i)=>(e,n)=>i(e,n,r);const N="DOC_DRAWING_PLUGIN";let f=class extends t.Disposable{constructor(r){super(),this._commandService=r,this.disposeWithMe(this._commandService.registerCommand(I))}};f=m([t.OnLifecycle(t.LifecycleStages.Starting,f),v(0,t.ICommandService)],f);let _=class extends t.Disposable{constructor(r,i,e,n,s){super(),this._docDrawingService=r,this._drawingManagerService=i,this._resourceManagerService=e,this._univerInstanceService=n,this._textSelectionRenderManager=s,this._init()}_init(){this._initSnapshot(),this._initDataLoader()}_initSnapshot(){const r=e=>{const n=this._docDrawingService.getDrawingDataForUnit(e);return n?JSON.stringify(n):""},i=e=>{if(!e)return{};try{return JSON.parse(e)}catch{return{}}};this.disposeWithMe(this._resourceManagerService.registerPluginResource({pluginName:N,businesses:[t.UniverInstanceType.UNIVER_DOC],toJson:e=>r(e),parseJson:e=>i(e),onUnLoad:e=>{this._docDrawingService.removeDrawingDataForUnit(e),this._drawingManagerService.removeDrawingDataForUnit(e),this._setDrawingDataForUnit(e,{data:{},order:[]})},onLoad:(e,n)=>{this._docDrawingService.registerDrawingData(e,n),this._drawingManagerService.registerDrawingData(e,n),this._setDrawingDataForUnit(e,n[e])}}))}_setDrawingDataForUnit(r,i){const e=this._univerInstanceService.getUnit(r);e!=null&&e.resetDrawing(i.data,i.order)}_initDataLoader(){const r=this._univerInstanceService.getCurrentUnitForType(t.UniverInstanceType.UNIVER_DOC);if(!r)return!1;const i=r.getUnitId(),e=i,n=r.getDrawings(),s=r.getDrawingsOrder();if(!n||!s)return!1;Object.keys(n).forEach(o=>{const u=n[o],h=u.docTransform,d=p.docDrawingPositionToTransform(h);n[o]={...u,transform:d}});const c={[e]:{unitId:i,subUnitId:e,data:n,order:s}};return this._docDrawingService.registerDrawingData(i,c),this._drawingManagerService.registerDrawingData(i,c),!0}};_=m([t.OnLifecycle(t.LifecycleStages.Rendered,_),v(0,D),v(1,w.IDrawingManagerService),v(2,t.IResourceManagerService),v(3,t.IUniverInstanceService),v(4,M.ITextSelectionRenderManager)],_);var b=Object.defineProperty,E=Object.getOwnPropertyDescriptor,C=(r,i,e,n)=>{for(var s=n>1?void 0:n?E(i,e):i,c=r.length-1,o;c>=0;c--)(o=r[c])&&(s=(n?o(i,e,s):o(s))||s);return n&&s&&b(i,e,s),s},L=(r,i)=>(e,n)=>i(e,n,r);a.UniverDocsDrawingPlugin=(S=class extends t.Plugin{constructor(i,e){super(),this._injector=e}onStarting(i){[[f],[_],[U],[D,{useClass:U}]].forEach(e=>i.add(e))}},l(S,"pluginName",N),l(S,"type",t.UniverInstanceType.UNIVER_DOC),S),a.UniverDocsDrawingPlugin=C([L(1,g.Inject(g.Injector))],a.UniverDocsDrawingPlugin),a.DocDrawingApplyType=O,a.DocDrawingService=U,a.IDocDrawingService=D,a.SetDocDrawingApplyMutation=I,Object.defineProperty(a,Symbol.toStringTag,{value:"Module"})});
+(function(s,r){typeof exports=="object"&&typeof module<"u"?r(exports,require("@univerjs/core"),require("@univerjs/drawing"),require("rxjs/operators")):typeof define=="function"&&define.amd?define(["exports","@univerjs/core","@univerjs/drawing","rxjs/operators"],r):(s=typeof globalThis<"u"?globalThis:s||self,r(s.UniverDocsDrawing={},s.UniverCore,s.UniverDrawing,s.rxjs.operators))})(this,function(s,r,u,h){"use strict";var m=Object.defineProperty;var E=(s,r,u)=>r in s?m(s,r,{enumerable:!0,configurable:!0,writable:!0,value:u}):s[r]=u;var I=(s,r,u)=>E(s,typeof r!="symbol"?r+"":r,u);var D;class l extends u.UnitDrawingService{}const v=r.createIdentifier("univer.doc.plugin.doc-drawing.service");var w=(i=>(i[i.INSERT=0]="INSERT",i[i.REMOVE=1]="REMOVE",i[i.UPDATE=2]="UPDATE",i[i.ARRANGE=3]="ARRANGE",i[i.GROUP=4]="GROUP",i[i.UNGROUP=5]="UNGROUP",i))(w||{});const N={id:"doc.mutation.set-drawing-apply",type:r.CommandType.MUTATION,handler:(i,n)=>{const e=i.get(u.IDrawingManagerService),t=i.get(v),a=i.get(r.IUniverInstanceService),{op:c,unitId:o,subUnitId:S,type:C,objects:d}=n;switch(e.applyJson1(o,S,c),t.applyJson1(o,S,c),C){case 0:e.addNotification(d),t.addNotification(d);break;case 1:e.removeNotification(d),t.removeNotification(d);break;case 2:e.updateNotification(d),t.updateNotification(d);break;case 3:e.orderNotification(d),t.orderNotification(d);break;case 4:e.groupUpdateNotification(d);break;case 5:e.ungroupUpdateNotification(d);break}return a.getUnit(o),!0}};var P=Object.defineProperty,p=Object.getOwnPropertyDescriptor,O=(i,n,e,t)=>{for(var a=t>1?void 0:t?p(n,e):n,c=i.length-1,o;c>=0;c--)(o=i[c])&&(a=(t?o(n,e,a):o(a))||a);return t&&a&&P(n,e,a),a},g=(i,n)=>(e,t)=>n(e,t,i);const U="DOC_DRAWING_PLUGIN";let f=class extends r.Disposable{constructor(i){super(),this._commandService=i,this.disposeWithMe(this._commandService.registerCommand(N))}};f=O([r.OnLifecycle(r.LifecycleStages.Starting,f),g(0,r.ICommandService)],f);let _=class extends r.Disposable{constructor(i,n,e,t,a){super(),this._docDrawingService=i,this._drawingManagerService=n,this._resourceManagerService=e,this._univerInstanceService=t,this._lifecycleService=a,this._init()}_init(){this._initSnapshot(),this._drawingInitializeListener()}_initSnapshot(){const i=e=>{const t=this._docDrawingService.getDrawingDataForUnit(e);return t!=null&&t[e]?JSON.stringify(t==null?void 0:t[e]):""},n=e=>{if(!e)return{data:{},order:[]};try{return JSON.parse(e)}catch{return{data:{},order:[]}}};this.disposeWithMe(this._resourceManagerService.registerPluginResource({pluginName:U,businesses:[r.UniverInstanceType.UNIVER_DOC],toJson:e=>i(e),parseJson:e=>n(e),onUnLoad:e=>{this._setDrawingDataForUnit(e,{data:{},order:[]})},onLoad:(e,t)=>{var a,c;this._setDrawingDataForUnit(e,{data:(a=t.data)!=null?a:{},order:(c=t.order)!=null?c:[]})}}))}_setDrawingDataForUnit(i,n){const e=this._univerInstanceService.getUnit(i);e!=null&&(e.resetDrawing(n.data,n.order),this._initDataLoader())}_initDataLoader(){const i=this._univerInstanceService.getCurrentUnitForType(r.UniverInstanceType.UNIVER_DOC);if(!i)return!1;const n=i.getUnitId(),e=n,t=i.getDrawings(),a=i.getDrawingsOrder();if(!t||!a)return!1;Object.keys(t).forEach(o=>{const S=t[o];t[o]={...S}});const c={[e]:{unitId:n,subUnitId:e,data:t,order:a}};return this._docDrawingService.registerDrawingData(n,c),this._drawingManagerService.registerDrawingData(n,c),!0}_drawingInitializeListener(){this._lifecycleService.lifecycle$.pipe(h.filter(i=>i===r.LifecycleStages.Rendered),h.first()).subscribe(i=>{var e;const n=(e=this._univerInstanceService.getCurrentUnitForType(r.UniverInstanceType.UNIVER_DOC))==null?void 0:e.getUnitId();n&&(this._docDrawingService.initializeNotification(n),this._drawingManagerService.initializeNotification(n))})}};_=O([r.OnLifecycle(r.LifecycleStages.Starting,_),g(0,v),g(1,u.IDrawingManagerService),g(2,r.IResourceManagerService),g(3,r.IUniverInstanceService),g(4,r.Inject(r.LifecycleService))],_);var R=Object.defineProperty,M=Object.getOwnPropertyDescriptor,b=(i,n,e,t)=>{for(var a=t>1?void 0:t?M(n,e):n,c=i.length-1,o;c>=0;c--)(o=i[c])&&(a=(t?o(n,e,a):o(a))||a);return t&&a&&R(n,e,a),a},j=(i,n)=>(e,t)=>n(e,t,i);s.UniverDocsDrawingPlugin=(D=class extends r.Plugin{constructor(n,e){super(),this._injector=e}onStarting(n){[[f],[_],[l],[v,{useClass:l}]].forEach(e=>n.add(e))}},I(D,"pluginName",U),I(D,"type",r.UniverInstanceType.UNIVER_DOC),D),s.UniverDocsDrawingPlugin=b([j(1,r.Inject(r.Injector))],s.UniverDocsDrawingPlugin),s.DOCS_DRAWING_PLUGIN=U,s.DocDrawingApplyType=w,s.DocDrawingService=l,s.IDocDrawingService=v,s.SetDocDrawingApplyMutation=N,Object.defineProperty(s,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@univerjs/docs-drawing",
-  "version": "0.2.2",
+  "version": "0.2.4-alpha.0",
   "private": false,
   "description": "",
   "author": "DreamNum <developer@univer.ai>",
@@ -44,23 +44,19 @@
     "lib"
   ],
   "peerDependencies": {
-    "@wendellhu/redi": "0.15.5",
-    "@univerjs/core": "0.2.2",
-    "@univerjs/docs-ui": "0.2.2",
-    "@univerjs/drawing": "0.2.2",
-    "@univerjs/engine-render": "0.2.2"
+    "rxjs": ">=7.0.0",
+    "@univerjs/core": "0.2.4-alpha.0",
+    "@univerjs/drawing": "0.2.4-alpha.0"
   },
   "devDependencies": {
-    "@wendellhu/redi": "0.15.5",
     "typescript": "^5.5.3",
-    "vite": "^5.3.3",
-    "vitest": "^1.6.0",
-    "@univerjs/core": "0.2.2",
-    "@univerjs/docs": "0.2.2",
-    "@univerjs/docs-ui": "0.2.2",
-    "@univerjs/engine-render": "0.2.2",
-    "@univerjs/shared": "0.2.2",
-    "@univerjs/drawing": "0.2.2"
+    "vite": "^5.3.4",
+    "vitest": "^2.0.3",
+    "@univerjs/core": "0.2.4-alpha.0",
+    "@univerjs/docs": "0.2.4-alpha.0",
+    "@univerjs/engine-render": "0.2.4-alpha.0",
+    "@univerjs/drawing": "0.2.4-alpha.0",
+    "@univerjs/shared": "0.2.4-alpha.0"
   },
   "univerSpace": {
     ".": {