@univerjs/sheets-drawing-ui 0.2.4-alpha.0 → 0.2.4

package/lib/es/index.js

@@ -1,14 +1,16 @@
 var en = Object.defineProperty;
 var tn = (i, e, n) => e in i ? en(i, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : i[e] = n;
 var H = (i, e, n) => tn(i, typeof e != "symbol" ? e + "" : e, n);
-import { CommandType as F, ICommandService as V, IUndoRedoService as ge, LocaleService as _e, IUniverInstanceService as he, useDependency as q, RxDisposable as nn, UniverInstanceType as B, connectInjector as rn, toDisposable as sn, FOCUSING_COMMON_DRAWINGS as we, OnLifecycle as ie, LifecycleStages as se, Inject as W, Injector as nt, IContextService as _t, Disposable as oe, Direction as Q, FOCUSING_FORMULA_EDITOR as on, EDITOR_ACTIVATED as an, Rectangle as cn, DrawingTypeEnum as Ye, DisposableCollection as dn, Tools as ne, UserManagerService as ln, IPermissionService as un, Plugin as gn, DependentOn as hn } from "@univerjs/core";
-import { ImageCropperObject as mn, COMPONENT_IMAGE_POPUP_MENU as fn, OpenImageCropOperation as pn, ImageResetSizeOperation as wn, DrawingCommonPanel as _n, DrawingRenderService as vn, UniverDrawingUIPlugin as Sn } from "@univerjs/drawing-ui";
-import { ISheetDrawingService as k, SetDrawingApplyMutation as E, DrawingApplyType as y, SheetDrawingAnchorType as O, UniverSheetsDrawingPlugin as Cn } from "@univerjs/sheets-drawing";
-import { IDrawingManagerService as z, IImageIoService as vt, ArrangeTypeEnum as Ce, DrawingTypeEnum as Ve, DRAWING_IMAGE_COUNT_LIMIT as dt, ImageUploadStatusType as ke, DRAWING_IMAGE_ALLOW_SIZE as In, getImageSize as Rn, DRAWING_IMAGE_WIDTH_LIMIT as lt, DRAWING_IMAGE_HEIGHT_LIMIT as ut, DRAWING_IMAGE_ALLOW_IMAGE_LIST as Mn, getDrawingShapeKeyByDrawingSearch as Dn, UniverDrawingPlugin as bn } from "@univerjs/drawing";
-import { IRenderManagerService as K, getGroupState as En, transformObjectOutOfGroup as yn, precisionTo as ee, Rect as On, DRAWING_OBJECT_LAYER_INDEX as Pn, SHEET_VIEWPORT_KEY as Tn, RENDER_CLASS_TYPE as ae } from "@univerjs/engine-render";
-import { SheetCanvasPopManagerService as Un, ISheetSelectionRenderService as Ge, SheetSkeletonManagerService as re, attachRangeWithCoord as An, getCurrentRangeDisable$ as Nn, SetScrollOperation as jn, SetZoomRatioOperation as Ln, SheetPrintInterceptorService as Bn, COPY_TYPE as gt, PREDEFINED_HOOK_NAME as Ie, virtualizeDiscreteRanges as Wn, ISheetClipboardService as $n } from "@univerjs/sheets-ui";
-import { takeUntil as ht, Subject as mt, BehaviorSubject as Vn, combineLatest as Re, map as ft, filter as Me, distinctUntilChanged as De } from "rxjs";
-import { ISidebarService as Gn, BuiltInUIPart as xn, IUIPartsService as Fn, IMessageService as Yn, MenuItemType as St, MenuPosition as kn, MenuGroup as Hn, getMenuHiddenObservable as Ct, KeyCode as ue, ComponentManager as Xn, IMenuService as zn, IShortcutService as Kn, CanvasFloatDomService as Jn } from "@univerjs/ui";
+import { CommandType as F, ICommandService as V, IUndoRedoService as ge, LocaleService as _e, IUniverInstanceService as he, RxDisposable as nn, UniverInstanceType as B, toDisposable as rn, FOCUSING_COMMON_DRAWINGS as we, OnLifecycle as ie, LifecycleStages as se, IContextService as _t, Disposable as oe, Direction as q, FOCUSING_FORMULA_EDITOR as sn, EDITOR_ACTIVATED as on, Rectangle as an, DrawingTypeEnum as Ye, DisposableCollection as cn, Tools as ne, UserManagerService as dn, IPermissionService as ln, Plugin as un, DependentOn as gn } from "@univerjs/core";
+import { Inject as W, Injector as nt } from "@wendellhu/redi";
+import { ImageCropperObject as hn, COMPONENT_IMAGE_POPUP_MENU as mn, OpenImageCropOperation as fn, ImageResetSizeOperation as pn, DrawingCommonPanel as wn, DrawingRenderService as _n, UniverDrawingUIPlugin as vn } from "@univerjs/drawing-ui";
+import { ISheetDrawingService as k, SetDrawingApplyMutation as E, DrawingApplyType as y, SheetDrawingAnchorType as O, UniverSheetsDrawingPlugin as Sn } from "@univerjs/sheets-drawing";
+import { IDrawingManagerService as z, IImageIoService as vt, ArrangeTypeEnum as Ce, DrawingTypeEnum as Ve, DRAWING_IMAGE_COUNT_LIMIT as dt, ImageUploadStatusType as ke, DRAWING_IMAGE_ALLOW_SIZE as Cn, getImageSize as In, DRAWING_IMAGE_WIDTH_LIMIT as lt, DRAWING_IMAGE_HEIGHT_LIMIT as ut, DRAWING_IMAGE_ALLOW_IMAGE_LIST as Rn, getDrawingShapeKeyByDrawingSearch as Mn, UniverDrawingPlugin as Dn } from "@univerjs/drawing";
+import { IRenderManagerService as K, getGroupState as bn, transformObjectOutOfGroup as En, precisionTo as Q, Rect as yn, DRAWING_OBJECT_LAYER_INDEX as On, SHEET_VIEWPORT_KEY as Pn, RENDER_CLASS_TYPE as ae } from "@univerjs/engine-render";
+import { SheetCanvasPopManagerService as Tn, ISheetSelectionRenderService as Ge, SheetSkeletonManagerService as re, attachRangeWithCoord as Un, getCurrentRangeDisable$ as An, SetScrollOperation as Nn, SetZoomRatioOperation as jn, SheetPrintInterceptorService as Ln, COPY_TYPE as gt, PREDEFINED_HOOK_NAME as Ie, virtualizeDiscreteRanges as Bn, ISheetClipboardService as Wn } from "@univerjs/sheets-ui";
+import { takeUntil as ht, Subject as mt, BehaviorSubject as $n, combineLatest as Re, map as ft, filter as Me, distinctUntilChanged as De } from "rxjs";
+import { ISidebarService as Vn, BuiltInUIPart as Gn, IUIPartsService as xn, IMessageService as Fn, MenuItemType as St, MenuPosition as Yn, MenuGroup as kn, getMenuHiddenObservable as Ct, KeyCode as ue, ComponentManager as Hn, IMenuService as Xn, IShortcutService as zn, CanvasFloatDomService as Kn } from "@univerjs/ui";
+import { useDependency as ee, connectInjector as Jn } from "@wendellhu/redi/react-bindings";
 import { getSheetCommandTarget as le, SheetsSelectionsService as Zn, WorkbookEditablePermission as Ze, WorksheetEditPermission as Pe, RangeProtectionPermissionEditPoint as qn, InsertRowCommand as It, InsertColCommand as Rt, RemoveRowCommand as Mt, RemoveColCommand as Dt, DeleteRangeMoveLeftCommand as bt, DeleteRangeMoveUpCommand as Et, InsertRangeMoveDownCommand as yt, InsertRangeMoveRightCommand as Ot, DeltaRowHeightCommand as qe, SetRowHeightCommand as Qe, DeltaColumnWidthCommand as Pt, SetColWidthCommand as Tt, SetRowHiddenCommand as Ut, SetSpecificRowsVisibleCommand as At, SetSpecificColsVisibleCommand as Nt, SetColHiddenCommand as jt, SetRowVisibleMutation as Qn, SetRowHiddenMutation as er, SetColVisibleMutation as tr, SetColHiddenMutation as nr, SetWorksheetRowHeightMutation as rr, SetWorksheetColWidthMutation as ir, SetWorksheetActiveOperation as sr, SheetInterceptorService as or, SetFrozenMutation as ar, WorkbookViewPermission as pt, WorksheetViewPermission as He } from "@univerjs/sheets";
 import L, { useEffect as rt, forwardRef as Lt, useRef as Bt, createElement as Wt, useState as et } from "react";
 import { MessageType as be, RadioGroup as cr, Radio as Xe } from "@univerjs/design";
@@ -51,7 +53,7 @@ const j = {
   id: "sidebar.operation.sheet-image",
   type: F.COMMAND,
   handler: async (i, e) => {
-    const n = i.get(Gn), t = i.get(_e), r = i.get(he), s = i.get(z);
+    const n = i.get(Vn), t = i.get(_e), r = i.get(he), s = i.get(z);
     if (!le(r)) return !1;
     switch (e.value) {
       case "open":
@@ -85,7 +87,7 @@ const j = {
   univerCircleAnimation: gr,
   uploadLoadingBodyText: hr
 }, mr = () => {
-  const i = q(vt), e = q(_e), [n, t] = L.useState(0);
+  const i = ee(vt), e = ee(_e), [n, t] = L.useState(0);
   return rt(() => {
     const r = i.change$.subscribe((s) => {
       t(s);
@@ -107,7 +109,7 @@ let Te = class extends nn {
     this._injector = e, this._drawingManagerService = n, this._canvasPopManagerService = t, this._renderManagerService = r, this._univerInstanceService = s, this._contextService = o, this._uiPartsService = a, this._init();
   }
   _init() {
-    this._univerInstanceService.getCurrentTypeOfUnit$(B.UNIVER_SHEET).pipe(ht(this.dispose$)).subscribe((e) => this._create(e)), this._univerInstanceService.getTypeOfUnitDisposed$(B.UNIVER_SHEET).pipe(ht(this.dispose$)).subscribe((e) => this._dispose(e)), this._univerInstanceService.getAllUnitsForType(B.UNIVER_SHEET).forEach((e) => this._create(e)), this._uiPartsService.registerComponent(xn.CONTENT, () => rn(mr, this._injector));
+    this._univerInstanceService.getCurrentTypeOfUnit$(B.UNIVER_SHEET).pipe(ht(this.dispose$)).subscribe((e) => this._create(e)), this._univerInstanceService.getTypeOfUnitDisposed$(B.UNIVER_SHEET).pipe(ht(this.dispose$)).subscribe((e) => this._dispose(e)), this._univerInstanceService.getAllUnitsForType(B.UNIVER_SHEET).forEach((e) => this._create(e)), this._uiPartsService.registerComponent(Gn.CONTENT, () => Jn(mr, this._injector));
   }
   _dispose(e) {
     const n = e.getUnitId();
@@ -122,7 +124,7 @@ let Te = class extends nn {
   _hasCropObject(e) {
     const n = e.getAllObjects();
     for (const t of n)
-      if (t instanceof mn)
+      if (t instanceof hn)
         return !0;
     return !1;
   }
@@ -136,7 +138,7 @@ let Te = class extends nn {
       return;
     let r;
     this.disposeWithMe(
-      sn(
+      rn(
         t.createControl$.subscribe(() => {
           if (this._contextService.setContextValue(we, !0), this._hasCropObject(n))
             return;
@@ -153,7 +155,7 @@ let Te = class extends nn {
             return;
           const { unitId: l, subUnitId: c, drawingId: u } = h;
           r == null || r.dispose(), r = this.disposeWithMe(this._canvasPopManagerService.attachPopupToObject(a, {
-            componentKey: fn,
+            componentKey: mn,
             direction: "horizontal",
             offset: [2, 0],
             extraProps: {
@@ -195,14 +197,14 @@ let Te = class extends nn {
       {
         label: "image-popup.crop",
         index: 2,
-        commandId: pn.id,
+        commandId: fn.id,
         commandParams: { unitId: e, subUnitId: n, drawingId: t },
         disable: !1
       },
       {
         label: "image-popup.reset",
         index: 3,
-        commandId: wn.id,
+        commandId: pn.id,
         commandParams: [{ unitId: e, subUnitId: n, drawingId: t }],
         disable: !1
       }
@@ -213,11 +215,11 @@ Te = wr([
   ie(se.Steady, Te),
   te(0, W(nt)),
   te(1, z),
-  te(2, W(Un)),
+  te(2, W(Tn)),
   te(3, K),
   te(4, he),
   te(5, _t),
-  te(6, W(Fn))
+  te(6, W(xn))
 ], Te);
 const xe = {
   id: "sheet.operation.insert-float-image",
@@ -290,7 +292,7 @@ const xe = {
 function _r(i) {
   const e = [];
   return i.forEach((n) => {
-    const { parent: t, children: r } = n, { unitId: s, subUnitId: o, drawingId: a } = t, d = En(0, 0, r.map((c) => c.transform || {})), h = r.map((c) => {
+    const { parent: t, children: r } = n, { unitId: s, subUnitId: o, drawingId: a } = t, d = bn(0, 0, r.map((c) => c.transform || {})), h = r.map((c) => {
       const u = c.transform || { left: 0, top: 0 }, { unitId: g, subUnitId: f, drawingId: m } = c;
       return {
         unitId: g,
@@ -323,7 +325,7 @@ function vr(i) {
     if (d == null)
       return;
     const h = r.map((c) => {
-      const { transform: u } = c, { unitId: g, subUnitId: f, drawingId: m } = c, p = yn(u || {}, d, d.width || 0, d.height || 0);
+      const { transform: u } = c, { unitId: g, subUnitId: f, drawingId: m } = c, p = En(u || {}, d, d.width || 0, d.height || 0);
       return {
         unitId: g,
         subUnitId: f,
@@ -416,7 +418,7 @@ function $(i, e, n) {
   if (v == null)
     return;
   const { startX: R, startY: _ } = C, { startX: b, startY: w } = v;
-  let P = ee(R + c, 1), D = ee(_ + g, 1), T = ee(b + m - P, 1), U = ee(w + S - D, 1);
+  let P = Q(R + c, 1), D = Q(_ + g, 1), T = Q(b + m - P, 1), U = Q(w + S - D, 1);
   C.startX === v.endX && (T = 0), C.startY === v.endY && (U = 0);
   const M = n.getCurrentSkeleton(), I = M.rowHeaderWidth + M.columnTotalWidth, A = M.columnHeaderHeight + M.rowTotalHeight;
   return P + T > I && (P = I - T), D + U > A && (D = A - U), {
@@ -437,17 +439,17 @@ function N(i, e) {
     return;
   const u = {
     column: c.actualColumn,
-    columnOffset: ee(n - c.startX, 1),
+    columnOffset: Q(n - c.startX, 1),
     row: c.actualRow,
-    rowOffset: ee(t - c.startY, 1)
+    rowOffset: Q(t - c.startY, 1)
   }, g = e.getSelectionCellByPosition(n + r, t + s);
   if (g == null)
     return;
   const f = {
     column: g.actualColumn,
-    columnOffset: ee(n + r - g.startX, 1),
+    columnOffset: Q(n + r - g.startX, 1),
     row: g.actualRow,
-    rowOffset: ee(t + s - g.startY, 1)
+    rowOffset: Q(t + s - g.startY, 1)
   };
   return {
     flipY: o,
@@ -520,7 +522,7 @@ let Ue = class extends oe {
       const v = C.message;
       v === ke.ERROR_EXCEED_SIZE ? this._messageService.show({
         type: be.Error,
-        content: this._localeService.t("update-status.exceedMaxSize", String(In / (1024 * 1024)))
+        content: this._localeService.t("update-status.exceedMaxSize", String(Cn / (1024 * 1024)))
       }) : v === ke.ERROR_IMAGE_TYPE ? this._messageService.show({
         type: be.Error,
         content: this._localeService.t("update-status.invalidImageType")
@@ -534,7 +536,7 @@ let Ue = class extends oe {
     const n = this._getUnitInfo();
     if (n == null)
       return;
-    const { unitId: t, subUnitId: r } = n, { imageId: s, imageSourceType: o, source: a, base64Cache: d } = e, { width: h, height: l, image: c } = await Rn(d || ""), u = this._renderManagerService.getRenderById(t);
+    const { unitId: t, subUnitId: r } = n, { imageId: s, imageSourceType: o, source: a, base64Cache: d } = e, { width: h, height: l, image: c } = await In(d || ""), u = this._renderManagerService.getRenderById(t);
     if (u == null)
       return;
     const { width: g, height: f } = u.scene;
@@ -584,7 +586,7 @@ let Ue = class extends oe {
       endColumn: 0
     };
     r && r.length > 0 && (s = r[r.length - 1].range);
-    const o = An(this._skeletonManagerService.getCurrent().skeleton, s);
+    const o = Un(this._skeletonManagerService.getCurrent().skeleton, s);
     if (o == null)
       return;
     let { startColumn: a, startRow: d, startX: h, startY: l } = o, c = !1;
@@ -693,7 +695,7 @@ Ue = Ir([
   X(4, k),
   X(5, z),
   X(6, _t),
-  X(7, Yn),
+  X(7, Fn),
   X(8, W(_e)),
   X(9, K)
 ], Ue);
@@ -754,10 +756,10 @@ const yr = "univer-upload-file-menu", Or = "univer-upload-file-menu-input", wt =
 }, zt = "COMPONENT_UPLOAD_FILE_MENU";
 var We = /* @__PURE__ */ ((i) => (i[i.cellImage = 0] = "cellImage", i[i.floatImage = 1] = "floatImage", i))(We || {});
 const Pr = (i) => {
-  const { type: e } = i, n = q(V), t = Bt(null), r = () => {
+  const { type: e } = i, n = ee(V), t = Bt(null), r = () => {
     var a;
     (a = t.current) == null || a.click();
-  }, s = Mn.map((a) => `.${a.replace("image/", "")}`).join(","), o = (a) => {
+  }, s = Rn.map((a) => `.${a.replace("image/", "")}`).join(","), o = (a) => {
     const d = a.target.files;
     if (d == null)
       return;
@@ -780,12 +782,12 @@ function Tr(i) {
   return {
     id: Jt,
     type: St.SUBITEMS,
-    positions: [kn.TOOLBAR_START],
-    group: Hn.TOOLBAR_FORMULAS_INSERT,
+    positions: [Yn.TOOLBAR_START],
+    group: kn.TOOLBAR_FORMULAS_INSERT,
     icon: Kt,
     tooltip: "sheetImage.title",
     hidden$: Ct(i, B.UNIVER_SHEET),
-    disabled$: Nn(i, { workbookTypes: [Ze], worksheetTypes: [Pe], rangeTypes: [qn] })
+    disabled$: An(i, { workbookTypes: [Ze], worksheetTypes: [Pe], rangeTypes: [qn] })
   };
 }
 function Ur(i) {
@@ -821,7 +823,7 @@ const Ar = "univer-image-common-panel", Nr = "univer-image-common-panel-grid", j
   sheetImageMenuInput: Xr
 }, zr = (i) => {
   var v;
-  const e = q(V), n = q(_e), t = q(z), r = q(K), { drawings: s } = i, o = s[0];
+  const e = ee(V), n = ee(_e), t = ee(z), r = ee(K), { drawings: s } = i, o = s[0];
   if (o == null)
     return;
   const { unitId: a } = o, d = r.getRenderById(a), h = d == null ? void 0 : d.scene;
@@ -882,7 +884,7 @@ const Ar = "univer-image-common-panel", Nr = "univer-image-common-panel-grid", j
   const C = (R) => R ? "block" : "none";
   return /* @__PURE__ */ L.createElement("div", { className: Ee(Z.imageCommonPanelGrid, Z.imageCommonPanelBorder), style: { display: C(c) } }, /* @__PURE__ */ L.createElement("div", { className: Z.imageCommonPanelRow }, /* @__PURE__ */ L.createElement("div", { className: Ee(Z.imageCommonPanelColumn, Z.imageCommonPanelTitle) }, /* @__PURE__ */ L.createElement("div", null, n.t("drawing-anchor.title")))), /* @__PURE__ */ L.createElement("div", { className: Ee(Z.imageCommonPanelRow) }, /* @__PURE__ */ L.createElement("div", { className: Ee(Z.imageCommonPanelColumn) }, /* @__PURE__ */ L.createElement(cr, { value: f, onChange: S, direction: "vertical" }, /* @__PURE__ */ L.createElement(Xe, { value: O.Both }, n.t("drawing-anchor.both")), /* @__PURE__ */ L.createElement(Xe, { value: O.Position }, n.t("drawing-anchor.position")), /* @__PURE__ */ L.createElement(Xe, { value: O.None }, n.t("drawing-anchor.none"))))));
 }, Kr = () => {
-  const i = q(z), e = i.getFocusDrawings(), [n, t] = et(e);
+  const i = ee(z), e = i.getFocusDrawings(), [n, t] = et(e);
   return rt(() => {
     const r = i.focus$.subscribe((s) => {
       t(s);
@@ -890,7 +892,7 @@ const Ar = "univer-image-common-panel", Nr = "univer-image-common-panel-grid", j
     return () => {
       r.unsubscribe();
     };
-  }, []), !!(n != null && n.length) && /* @__PURE__ */ L.createElement("div", { className: Z.imageCommonPanel }, /* @__PURE__ */ L.createElement(_n, { drawings: n }), /* @__PURE__ */ L.createElement(zr, { drawings: n }));
+  }, []), !!(n != null && n.length) && /* @__PURE__ */ L.createElement("div", { className: Z.imageCommonPanel }, /* @__PURE__ */ L.createElement(wn, { drawings: n }), /* @__PURE__ */ L.createElement(zr, { drawings: n }));
 }, ve = {
   id: "sheet.command.move-drawing",
   type: F.COMMAND,
@@ -903,7 +905,7 @@ const Ar = "univer-image-common-panel", Nr = "univer-image-common-panel-grid", j
       if (c == null)
         return null;
       const u = { ...c }, { left: g = 0, top: f = 0 } = c;
-      return s === Q.UP ? u.top = f - 1 : s === Q.DOWN ? u.top = f + 1 : s === Q.LEFT ? u.left = g - 1 : s === Q.RIGHT && (u.left = g + 1), {
+      return s === q.UP ? u.top = f - 1 : s === q.DOWN ? u.top = f + 1 : s === q.LEFT ? u.left = g - 1 : s === q.RIGHT && (u.left = g + 1), {
         ...l,
         transform: u,
         sheetTransform: N(u, r)
@@ -937,7 +939,7 @@ const Ar = "univer-image-common-panel", Nr = "univer-image-common-panel-grid", j
   }
 };
 function Se(i) {
-  return !i.getContextValue(on) && !i.getContextValue(an) && i.getContextValue(we);
+  return !i.getContextValue(sn) && !i.getContextValue(on) && i.getContextValue(we);
 }
 const Jr = {
   id: ve.id,
@@ -947,7 +949,7 @@ const Jr = {
   priority: 100,
   preconditions: Se,
   staticParameters: {
-    direction: Q.DOWN
+    direction: q.DOWN
   }
 }, Zr = {
   id: ve.id,
@@ -957,7 +959,7 @@ const Jr = {
   priority: 100,
   preconditions: Se,
   staticParameters: {
-    direction: Q.UP
+    direction: q.UP
   }
 }, qr = {
   id: ve.id,
@@ -967,7 +969,7 @@ const Jr = {
   priority: 100,
   preconditions: Se,
   staticParameters: {
-    direction: Q.LEFT
+    direction: q.LEFT
   }
 }, Qr = {
   id: ve.id,
@@ -977,7 +979,7 @@ const Jr = {
   priority: 100,
   preconditions: Se,
   staticParameters: {
-    direction: Q.RIGHT
+    direction: q.RIGHT
   }
 }, ei = {
   id: Zt.id,
@@ -1048,10 +1050,10 @@ let pe = class extends oe {
 pe = ri([
   ie(se.Rendered, pe),
   me(1, W(nt)),
-  me(2, W(Xn)),
-  me(3, zn),
+  me(2, W(Hn)),
+  me(3, Xn),
   me(4, V),
-  me(5, Kn)
+  me(5, zn)
 ], pe);
 var si = Object.defineProperty, oi = Object.getOwnPropertyDescriptor, ai = (i, e, n, t) => {
   for (var r = t > 1 ? void 0 : t ? oi(e, n) : e, s = i.length - 1, o; s >= 0; s--)
@@ -1737,7 +1739,7 @@ let Ae = class extends oe {
       const { from: h, to: l } = a, { row: c, column: u } = h, { row: g, column: f } = l;
       for (let m = 0; m < n.length; m++) {
         const p = n[m], { startRow: S, endRow: C, startColumn: v, endColumn: R } = p;
-        if (cn.intersects(
+        if (an.intersects(
           {
             startRow: S,
             endRow: C,
@@ -1776,7 +1778,7 @@ var li = Object.defineProperty, ui = Object.getOwnPropertyDescriptor, gi = (i, e
   return t && r && li(e, n, r), r;
 }, de = (i, e) => (n, t) => e(n, t, i);
 function hi(i, e, n, t) {
-  const { scaleX: r, scaleY: s } = e.getAncestorScale(), o = e.getViewport(Tn.VIEW_MAIN), a = {
+  const { scaleX: r, scaleY: s } = e.getAncestorScale(), o = e.getViewport(Pn.VIEW_MAIN), a = {
     left: !0,
     top: !0
   };
@@ -1879,7 +1881,7 @@ let tt = class extends oe {
           const { scene: u, canvas: g } = c;
           if (h == null)
             return !0;
-          const { left: f, top: m, width: p, height: S, angle: C, flipX: v, flipY: R, skewX: _, skewY: b } = h, w = Dn({ unitId: t, subUnitId: r, drawingId: s }), P = u.getObject(w);
+          const { left: f, top: m, width: p, height: S, angle: C, flipX: v, flipY: R, skewX: _, skewY: b } = h, w = Mn({ unitId: t, subUnitId: r, drawingId: s }), P = u.getObject(w);
           if (P != null) {
             P.transformByState({ left: f, top: m, width: p, height: S, angle: C, flipX: v, flipY: R, skewX: _, skewY: b });
             return;
@@ -1890,9 +1892,9 @@ let tt = class extends oe {
             width: p,
             height: S,
             zIndex: this._drawingManagerService.getDrawingOrder(t, r).length - 1
-          }, T = new On(w, D);
-          u.addObject(T, Pn).attachTransformerTo(T);
-          const U = this._ensureMap(t, r), M = new dn(), I = ze(T, c.renderObject, d.skeleton, o.worksheet), A = new Vn(I), G = {
+          }, T = new yn(w, D);
+          u.addObject(T, On).attachTransformerTo(T);
+          const U = this._ensureMap(t, r), M = new cn(), I = ze(T, c.renderObject, d.skeleton, o.worksheet), A = new $n(I), G = {
             dispose: M,
             rect: T,
             position$: A,
@@ -1944,10 +1946,10 @@ let tt = class extends oe {
           }
         });
       };
-      if (e.id === jn.id) {
+      if (e.id === Nn.id) {
         const s = e.params, { unitId: o, sheetId: a } = s;
         n(o, a);
-      } else if (e.id === Ln.id) {
+      } else if (e.id === jn.id) {
         const s = e.params, { unitId: o } = s;
         Array.from((r = (t = this._domLayerMap.get(o)) == null ? void 0 : t.keys()) != null ? r : []).forEach((d) => {
           n(o, d);
@@ -2074,7 +2076,7 @@ tt = gi([
   de(1, he),
   de(2, W(V)),
   de(3, z),
-  de(4, W(Jn)),
+  de(4, W(Kn)),
   de(5, k)
 ], tt);
 var mi = Object.defineProperty, fi = Object.getOwnPropertyDescriptor, pi = (i, e, n, t) => {
@@ -2128,8 +2130,8 @@ let Ne = class extends oe {
 };
 Ne = pi([
   ie(se.Rendered, Ne),
-  Oe(0, W(Bn)),
-  Oe(1, W(vn)),
+  Oe(0, W(Ln)),
+  Oe(1, W(_n)),
   Oe(2, z),
   Oe(3, K)
 ], Ne);
@@ -2289,9 +2291,9 @@ je = vi([
   ie(se.Rendered, je),
   fe(0, z),
   fe(1, K),
-  fe(2, un),
+  fe(2, ln),
   fe(3, he),
-  fe(4, W(ln))
+  fe(4, W(dn))
 ], je);
 var Si = Object.defineProperty, Ci = Object.getOwnPropertyDescriptor, Ii = (i, e, n, t) => {
   for (var r = t > 1 ? void 0 : t ? Ci(e, n) : e, s = i.length - 1, o; s >= 0; s--)
@@ -2357,7 +2359,7 @@ let Le = class extends oe {
     const { copyRange: t } = n;
     if (!t)
       return { redos: [], undos: [] };
-    const { drawings: r, unitId: s, subUnitId: o } = this._copyInfo, { ranges: [a, d], mapFunc: h } = Wn([t, e]), { row: l, col: c } = h(a.startRow, a.startColumn), { row: u, col: g } = h(d.startRow, d.startColumn), f = (D = this._renderManagerService.getRenderById(s)) == null ? void 0 : D.with(re);
+    const { drawings: r, unitId: s, subUnitId: o } = this._copyInfo, { ranges: [a, d], mapFunc: h } = Bn([t, e]), { row: l, col: c } = h(a.startRow, a.startColumn), { row: u, col: g } = h(d.startRow, d.startColumn), f = (D = this._renderManagerService.getRenderById(s)) == null ? void 0 : D.with(re);
     if (!f)
       return { redos: [], undos: [] };
     const m = f.attachRangeWithCoord({
@@ -2426,7 +2428,7 @@ let Le = class extends oe {
 };
 Le = Ii([
   ie(se.Ready, Le),
-  Ke(0, $n),
+  Ke(0, Wn),
   Ke(1, K),
   Ke(2, k)
 ], Le);
@@ -2436,7 +2438,7 @@ var qt = Object.defineProperty, Ri = Object.getOwnPropertyDescriptor, Mi = (i, e
   return t && r && qt(e, n, r), r;
 }, Je = (i, e) => (n, t) => e(n, t, i), Qt = (i, e, n) => Mi(i, typeof e != "symbol" ? e + "" : e, n);
 const bi = "SHEET_IMAGE_UI_PLUGIN";
-let $e = class extends gn {
+let $e = class extends un {
   constructor(e = {}, n, t, r) {
     super();
     H(this, "_pluginConfig");
@@ -2479,7 +2481,7 @@ let $e = class extends gn {
 Qt($e, "type", B.UNIVER_SHEET);
 Qt($e, "pluginName", bi);
 $e = Di([
-  hn(bn, Sn, Cn),
+  gn(Dn, vn, Sn),
   Je(1, W(nt)),
   Je(2, W(_e)),
   Je(3, K)

package/lib/types/controllers/drawing-popup-menu.controller.d.ts

@@ -1,4 +1,5 @@
-import { IContextService, Injector, IUniverInstanceService, RxDisposable } from '@univerjs/core';
+import { IContextService, IUniverInstanceService, RxDisposable } from '@univerjs/core';
+import { Injector } from '@wendellhu/redi';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { SheetCanvasPopManagerService } from '@univerjs/sheets-ui';
 import { IDrawingManagerService } from '@univerjs/drawing';

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

@@ -1,5 +1,6 @@
-import { DependencyOverride, Disposable, ICommandService, Injector } from '@univerjs/core';
+import { DependencyOverride, Disposable, ICommandService } from '@univerjs/core';
 import { MenuConfig, ComponentManager, IMenuService, IShortcutService } from '@univerjs/ui';
+import { Injector } from '@wendellhu/redi';
 
 export interface IUniverSheetsDrawingConfig {
     menu?: MenuConfig;

package/lib/types/plugin.d.ts

@@ -1,4 +1,5 @@
-import { Injector, LocaleService, Plugin, UniverInstanceType } from '@univerjs/core';
+import { LocaleService, Plugin, UniverInstanceType } from '@univerjs/core';
+import { Injector } from '@wendellhu/redi';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { IUniverSheetsDrawingConfig } from './controllers/sheet-drawing.controller';
 

package/lib/types/services/canvas-float-dom-manager.service.d.ts

@@ -1,8 +1,9 @@
-import { IDisposable, IPosition, ITransformState, Worksheet, Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
+import { IPosition, ITransformState, Worksheet, Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
 import { IDrawingManagerService } from '@univerjs/drawing';
 import { IBoundRectNoAngle, Scene, SpreadsheetSkeleton, IRenderManagerService } from '@univerjs/engine-render';
 import { ISheetDrawingService } from '@univerjs/sheets-drawing';
 import { CanvasFloatDomService } from '@univerjs/ui';
+import { IDisposable } from '@wendellhu/redi';
 
 export interface ICanvasFloatDom {
     allowTransform: boolean;

package/lib/types/views/menu/image.menu.d.ts

@@ -1,5 +1,5 @@
 import { IMenuItem } from '@univerjs/ui';
-import { IAccessor } from '@univerjs/core';
+import { IAccessor } from '@wendellhu/redi';
 
 export declare const IMAGE_UPLOAD_ICON = "addition-and-subtraction-single";
 export declare function ImageMenuFactory(accessor: IAccessor): IMenuItem;