@univerjs/sheets-drawing-ui 0.1.16 → 0.1.17

package/lib/es/index.js

@@ -1,19 +1,19 @@
-var Jt = Object.defineProperty;
-var Zt = (r, e, n) => e in r ? Jt(r, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : r[e] = n;
-var K = (r, e, n) => Zt(r, typeof e != "symbol" ? e + "" : e, n);
-import { CommandType as G, ICommandService as W, IUndoRedoService as ae, LocaleService as pe, IUniverInstanceService as ce, RxDisposable as qt, UniverInstanceType as Y, toDisposable as Ve, FOCUSING_COMMON_DRAWINGS as fe, OnLifecycle as de, LifecycleStages as le, IContextService as ht, Disposable as ue, Direction as J, FOCUSING_FORMULA_EDITOR as Qt, EDITOR_ACTIVATED as en, Rectangle as tn, DrawingTypeEnum as Ge, DisposableCollection as nn, Tools as ie, UserManagerService as rn, IPermissionService as sn, Plugin as on, DependentOn as an } from "@univerjs/core";
-import { Inject as B, Injector as qe } from "@wendellhu/redi";
+var kt = Object.defineProperty;
+var Jt = (r, e, n) => e in r ? kt(r, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : r[e] = n;
+var K = (r, e, n) => Jt(r, typeof e != "symbol" ? e + "" : e, n);
+import { CommandType as G, ICommandService as B, IUndoRedoService as ae, LocaleService as pe, IUniverInstanceService as ce, RxDisposable as Zt, UniverInstanceType as Y, toDisposable as qt, FOCUSING_COMMON_DRAWINGS as fe, OnLifecycle as de, LifecycleStages as le, IContextService as gt, Disposable as ue, Direction as J, FOCUSING_FORMULA_EDITOR as Qt, EDITOR_ACTIVATED as en, Rectangle as tn, DrawingTypeEnum as Ve, DisposableCollection as nn, Tools as ie, UserManagerService as rn, IPermissionService as sn, Plugin as on, DependentOn as an } from "@univerjs/core";
+import { Inject as $, Injector as Ze } from "@wendellhu/redi";
 import { ImageCropperObject as cn, COMPONENT_IMAGE_POPUP_MENU as dn, OpenImageCropOperation as ln, ImageResetSizeOperation as un, DrawingCommonPanel as mn, DrawingRenderService as gn, UniverDrawingUIPlugin as hn } from "@univerjs/drawing-ui";
 import { ISheetDrawingService as X, SetDrawingApplyMutation as O, DrawingApplyType as P, SheetDrawingAnchorType as b, UniverSheetsDrawingPlugin as fn } from "@univerjs/sheets-drawing";
-import { IDrawingManagerService as H, IImageIoService as ft, ArrangeTypeEnum as ve, DrawingTypeEnum as Le, DRAWING_IMAGE_COUNT_LIMIT as st, ImageUploadStatusType as xe, DRAWING_IMAGE_ALLOW_SIZE as pn, getImageSize as wn, DRAWING_IMAGE_WIDTH_LIMIT as ot, DRAWING_IMAGE_HEIGHT_LIMIT as at, DRAWING_IMAGE_ALLOW_IMAGE_LIST as _n, getDrawingShapeKeyByDrawingSearch as vn, UniverDrawingPlugin as Sn } from "@univerjs/drawing";
+import { IDrawingManagerService as H, IImageIoService as ht, ArrangeTypeEnum as ve, DrawingTypeEnum as Le, DRAWING_IMAGE_COUNT_LIMIT as it, ImageUploadStatusType as Ge, DRAWING_IMAGE_ALLOW_SIZE as pn, getImageSize as wn, DRAWING_IMAGE_WIDTH_LIMIT as st, DRAWING_IMAGE_HEIGHT_LIMIT as ot, DRAWING_IMAGE_ALLOW_IMAGE_LIST as _n, getDrawingShapeKeyByDrawingSearch as vn, UniverDrawingPlugin as Sn } from "@univerjs/drawing";
 import { IRenderManagerService as te, getGroupState as Cn, transformObjectOutOfGroup as In, precisionTo as Z, Rect as Rn, DRAWING_OBJECT_LAYER_INDEX as Dn, SHEET_VIEWPORT_KEY as Mn, RENDER_CLASS_TYPE as ne } from "@univerjs/engine-render";
-import { SheetCanvasPopManagerService as bn, ISelectionRenderService as Be, getCurrentRangeDisable$ as On, SheetSkeletonManagerService as He, SetScrollOperation as Pn, SetZoomRatioOperation as En, SheetPrintInterceptorService as yn } from "@univerjs/sheets-ui";
-import { takeUntil as ct, Subject as dt, BehaviorSubject as Tn, combineLatest as Se, map as lt, filter as Ce, distinctUntilChanged as Ie } from "rxjs";
-import { ISidebarService as Un, BuiltInUIPart as An, IUIPartsService as Nn, IMessageService as jn, MenuItemType as pt, MenuPosition as Ln, MenuGroup as Bn, getMenuHiddenObservable as wt, KeyCode as oe, ComponentManager as Wn, IMenuService as $n, IShortcutService as Vn, CanvasFloatDomService as Gn } from "@univerjs/ui";
+import { SheetCanvasPopManagerService as bn, ISelectionRenderService as $e, getCurrentRangeDisable$ as On, SheetSkeletonManagerService as Xe, SetScrollOperation as Pn, SetZoomRatioOperation as En, SheetPrintInterceptorService as yn } from "@univerjs/sheets-ui";
+import { takeUntil as at, Subject as ct, BehaviorSubject as Tn, combineLatest as Se, map as dt, filter as Ce, distinctUntilChanged as Ie } from "rxjs";
+import { ISidebarService as Un, BuiltInUIPart as An, IUIPartsService as Nn, IMessageService as jn, MenuItemType as ft, MenuPosition as Ln, MenuGroup as $n, getMenuHiddenObservable as pt, KeyCode as oe, ComponentManager as Bn, IMenuService as Wn, IShortcutService as Vn, CanvasFloatDomService as Gn } from "@univerjs/ui";
 import { useDependency as q, connectInjector as xn } from "@wendellhu/redi/react-bindings";
-import { getSheetCommandTarget as se, SelectionManagerService as Fn, WorkbookEditablePermission as ze, WorksheetEditPermission as Oe, RangeProtectionPermissionEditPoint as Yn, InsertRowCommand as _t, InsertColCommand as vt, RemoveRowCommand as St, RemoveColCommand as Ct, DeleteRangeMoveLeftCommand as It, DeleteRangeMoveUpCommand as Rt, InsertRangeMoveDownCommand as Dt, InsertRangeMoveRightCommand as Mt, DeltaRowHeightCommand as Ke, SetRowHeightCommand as ke, DeltaColumnWidthCommand as bt, SetColWidthCommand as Ot, SetRowHiddenCommand as Pt, SetSpecificRowsVisibleCommand as Et, SetSpecificColsVisibleCommand as yt, SetColHiddenCommand as Tt, SetRowVisibleMutation as Xn, SetRowHiddenMutation as Hn, SetColVisibleMutation as zn, SetColHiddenMutation as Kn, SetWorksheetRowHeightMutation as kn, SetWorksheetColWidthMutation as Jn, SetWorksheetActiveOperation as Zn, SheetInterceptorService as qn, SetFrozenMutation as Qn, WorkbookViewPermission as ut, WorksheetViewPermission as Fe } from "@univerjs/sheets";
-import L, { useEffect as Qe, forwardRef as Ut, useRef as At, createElement as Nt, useState as Je } from "react";
-import { MessageType as Re, RadioGroup as er, Radio as Ye } from "@univerjs/design";
+import { getSheetCommandTarget as se, SelectionManagerService as Fn, WorkbookEditablePermission as He, WorksheetEditPermission as Oe, RangeProtectionPermissionEditPoint as Yn, InsertRowCommand as wt, InsertColCommand as _t, RemoveRowCommand as vt, RemoveColCommand as St, DeleteRangeMoveLeftCommand as Ct, DeleteRangeMoveUpCommand as It, InsertRangeMoveDownCommand as Rt, InsertRangeMoveRightCommand as Dt, DeltaRowHeightCommand as ze, SetRowHeightCommand as Ke, DeltaColumnWidthCommand as Mt, SetColWidthCommand as bt, SetRowHiddenCommand as Ot, SetSpecificRowsVisibleCommand as Pt, SetSpecificColsVisibleCommand as Et, SetColHiddenCommand as yt, SetRowVisibleMutation as Xn, SetRowHiddenMutation as Hn, SetColVisibleMutation as zn, SetColHiddenMutation as Kn, SetWorksheetRowHeightMutation as kn, SetWorksheetColWidthMutation as Jn, SetWorksheetActiveOperation as Zn, SheetInterceptorService as qn, SetFrozenMutation as Qn, WorkbookViewPermission as lt, WorksheetViewPermission as xe } from "@univerjs/sheets";
+import L, { useEffect as qe, forwardRef as Tt, useRef as Ut, createElement as At, useState as ke } from "react";
+import { MessageType as Re, RadioGroup as er, Radio as Fe } from "@univerjs/design";
 import De from "clsx";
 const j = {
   id: "sheet.operation.clear-drawing-transformer",
@@ -25,11 +25,11 @@ const j = {
       (s = (i = n.getRenderById(t)) == null ? void 0 : i.scene.getTransformer()) == null || s.debounceRefreshControls();
     }), !0;
   }
-}, et = {
+}, Qe = {
   id: "sheet.command.remove-sheet-image",
   type: G.COMMAND,
   handler: (r, e) => {
-    const n = r.get(W), t = r.get(ae), i = r.get(X);
+    const n = r.get(B), t = r.get(ae), i = r.get(X);
     if (!e) return !1;
     const { drawings: s } = e, o = [];
     s.forEach((f) => {
@@ -49,7 +49,7 @@ const j = {
       ]
     }), !0) : !1;
   }
-}, jt = "COMPONENT_SHEET_DRAWING_PANEL", Lt = {
+}, Nt = "COMPONENT_SHEET_DRAWING_PANEL", jt = {
   id: "sidebar.operation.sheet-image",
   type: G.COMMAND,
   handler: async (r, e) => {
@@ -59,7 +59,7 @@ const j = {
       case "open":
         n.open({
           header: { title: t.t("sheetImage.panel.title") },
-          children: { label: jt },
+          children: { label: Nt },
           onClose: () => {
             s.focusDrawing(null);
           },
@@ -73,12 +73,12 @@ const j = {
     }
     return !0;
   }
-}, Bt = {
+}, Lt = {
   id: "sheet.operation.edit-sheet-image",
   type: G.OPERATION,
   handler: (r, e) => {
-    const n = r.get(H), t = r.get(W);
-    return e == null ? !1 : (n.focusDrawing([e]), t.executeCommand(Lt.id, { value: "open" }), !0);
+    const n = r.get(H), t = r.get(B);
+    return e == null ? !1 : (n.focusDrawing([e]), t.executeCommand(jt.id, { value: "open" }), !0);
   }
 }, tr = "univer-upload-loading", nr = "univer-upload-loading-body", rr = "univer-upload-loading-body-animation", ir = "univer-UniverCircleAnimation", sr = "univer-upload-loading-body-text", Me = {
   uploadLoading: tr,
@@ -87,8 +87,8 @@ const j = {
   univerCircleAnimation: ir,
   uploadLoadingBodyText: sr
 }, or = () => {
-  const r = q(ft), e = q(pe), [n, t] = L.useState(0);
-  return Qe(() => {
+  const r = q(ht), e = q(pe), [n, t] = L.useState(0);
+  return qe(() => {
     const i = r.change$.subscribe((s) => {
       t(s);
     });
@@ -102,14 +102,14 @@ var ar = Object.defineProperty, cr = Object.getOwnPropertyDescriptor, dr = (r, e
     (o = r[s]) && (i = (t ? o(e, n, i) : o(i)) || i);
   return t && i && ar(e, n, i), i;
 }, Q = (r, e) => (n, t) => e(n, t, r);
-let Pe = class extends qt {
+let Pe = class extends Zt {
   constructor(e, n, t, i, s, o, a) {
     super();
     K(this, "_initImagePopupMenu", /* @__PURE__ */ new Set());
     this._injector = e, this._drawingManagerService = n, this._canvasPopManagerService = t, this._renderManagerService = i, this._univerInstanceService = s, this._contextService = o, this._uiPartsService = a, this._init();
   }
   _init() {
-    this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET).pipe(ct(this.dispose$)).subscribe((e) => this._create(e)), this._univerInstanceService.getTypeOfUnitDisposed$(Y.UNIVER_SHEET).pipe(ct(this.dispose$)).subscribe((e) => this._dispose(e)), this._univerInstanceService.getAllUnitsForType(Y.UNIVER_SHEET).forEach((e) => this._create(e)), this._uiPartsService.registerComponent(An.CONTENT, () => xn(or, this._injector));
+    this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET).pipe(at(this.dispose$)).subscribe((e) => this._create(e)), this._univerInstanceService.getTypeOfUnitDisposed$(Y.UNIVER_SHEET).pipe(at(this.dispose$)).subscribe((e) => this._dispose(e)), this._univerInstanceService.getAllUnitsForType(Y.UNIVER_SHEET).forEach((e) => this._create(e)), this._uiPartsService.registerComponent(An.CONTENT, () => xn(or, this._injector));
   }
   _dispose(e) {
     const n = e.getUnitId();
@@ -138,8 +138,8 @@ let Pe = class extends qt {
       return;
     const i = [];
     this.disposeWithMe(
-      Ve(
-        t.onCreateControlObservable.add(() => {
+      qt(
+        t.createControl$.subscribe(() => {
           if (this._contextService.setContextValue(fe, !0), this._hasCropObject(n))
             return;
           const o = t.getSelectedObjectMap();
@@ -169,17 +169,13 @@ let Pe = class extends qt {
         })
       )
     ), this.disposeWithMe(
-      Ve(
-        t.onClearControlObservable.add(() => {
-          i.forEach((o) => o.dispose()), this._contextService.setContextValue(fe, !1), this._drawingManagerService.focusDrawing(null);
-        })
-      )
+      t.clearControl$.subscribe(() => {
+        i.forEach((o) => o.dispose()), this._contextService.setContextValue(fe, !1), this._drawingManagerService.focusDrawing(null);
+      })
     ), this.disposeWithMe(
-      Ve(
-        t.onChangingObservable.add(() => {
-          i.forEach((o) => o.dispose());
-        })
-      )
+      t.changing$.subscribe(() => {
+        i.forEach((o) => o.dispose());
+      })
     );
   }
   _getImageMenuItems(e, n, t) {
@@ -187,14 +183,14 @@ let Pe = class extends qt {
       {
         label: "image-popup.edit",
         index: 0,
-        commandId: Bt.id,
+        commandId: Lt.id,
         commandParams: { unitId: e, subUnitId: n, drawingId: t },
         disable: !1
       },
       {
         label: "image-popup.delete",
         index: 1,
-        commandId: et.id,
+        commandId: Qe.id,
         commandParams: { unitId: e, drawings: [{ unitId: e, subUnitId: n, drawingId: t }] },
         disable: !1
       },
@@ -217,15 +213,15 @@ let Pe = class extends qt {
 };
 Pe = dr([
   de(le.Steady, Pe),
-  Q(0, B(qe)),
+  Q(0, $(Ze)),
   Q(1, H),
-  Q(2, B(bn)),
+  Q(2, $(bn)),
   Q(3, te),
   Q(4, ce),
-  Q(5, ht),
-  Q(6, B(Nn))
+  Q(5, gt),
+  Q(6, $(Nn))
 ], Pe);
-const We = {
+const Be = {
   id: "sheet.operation.insert-float-image",
   type: G.OPERATION,
   handler: (r, e) => !0
@@ -233,11 +229,11 @@ const We = {
   id: "sheet.operation.insert-cell-image",
   type: G.OPERATION,
   handler: (r, e) => !0
-}, tt = {
+}, et = {
   id: "sheet.command.insert-sheet-image",
   type: G.COMMAND,
   handler: (r, e) => {
-    const n = r.get(W), t = r.get(ae), i = r.get(X);
+    const n = r.get(B), t = r.get(ae), i = r.get(X);
     if (!e) return !1;
     const s = e.drawings, o = s.map((f) => f.unitId), a = i.getBatchAddOp(s), { unitId: c, subUnitId: g, undo: l, redo: d, objects: m } = a;
     return n.syncExecuteCommand(O.id, { op: d, unitId: c, subUnitId: g, objects: m, type: P.INSERT }) ? (t.pushUndoRedo({
@@ -252,11 +248,11 @@ const We = {
       ]
     }), !0) : !1;
   }
-}, $e = {
+}, We = {
   id: "sheet.command.set-sheet-image",
   type: G.COMMAND,
   handler: (r, e) => {
-    const n = r.get(W), t = r.get(ae), i = r.get(X);
+    const n = r.get(B), t = r.get(ae), i = r.get(X);
     if (!e) return !1;
     const { drawings: s } = e, o = i.getBatchUpdateOp(s), { unitId: a, subUnitId: c, undo: g, redo: l, objects: d } = o;
     return n.syncExecuteCommand(O.id, { unitId: a, subUnitId: c, op: l, objects: d, type: P.UPDATE }) ? (t.pushUndoRedo({
@@ -271,11 +267,11 @@ const We = {
       ]
     }), !0) : !1;
   }
-}, Wt = {
+}, $t = {
   id: "sheet.command.set-drawing-arrange",
   type: G.COMMAND,
   handler: (r, e) => {
-    const n = r.get(W), t = r.get(ae);
+    const n = r.get(B), t = r.get(ae);
     if (!e) return !1;
     const i = r.get(X), { unitId: s, subUnitId: o, drawingIds: a, arrangeType: c } = e, g = { unitId: s, subUnitId: o, drawingIds: a };
     let l;
@@ -353,11 +349,11 @@ function ur(r) {
     });
   }), e;
 }
-const $t = {
+const Bt = {
   id: "sheet.command.group-sheet-image",
   type: G.COMMAND,
   handler: (r, e) => {
-    const n = r.get(W), t = r.get(ae), i = r.get(X);
+    const n = r.get(B), t = r.get(ae), i = r.get(X);
     if (!e) return !1;
     const s = [];
     e.forEach(({ parent: u, children: f }) => {
@@ -378,11 +374,11 @@ const $t = {
       ]
     }), !0) : !1;
   }
-}, Vt = {
+}, Wt = {
   id: "sheet.command.ungroup-sheet-image",
   type: G.COMMAND,
   handler: (r, e) => {
-    const n = r.get(W), t = r.get(ae), i = r.get(X);
+    const n = r.get(B), t = r.get(ae), i = r.get(X);
     if (!e) return !1;
     const s = [];
     e.forEach(({ parent: u, children: f }) => {
@@ -421,12 +417,12 @@ function V(r, e) {
   });
   if (u == null)
     return;
-  const { startX: f, startY: h } = m, { startX: p, startY: S } = u, I = Z(f + s, 1), v = Z(h + a, 1);
-  let C = Z(p + g - I, 1), _ = Z(S + d - v, 1);
-  return m.startX === u.endX && (C = 0), m.startY === u.endY && (_ = 0), {
-    left: I,
+  const { startX: f, startY: h } = m, { startX: p, startY: S } = u, C = Z(f + s, 1), v = Z(h + a, 1);
+  let R = Z(p + g - C, 1), _ = Z(S + d - v, 1);
+  return m.startX === u.endX && (R = 0), m.startY === u.endY && (_ = 0), {
+    left: C,
     top: v,
-    width: C,
+    width: R,
     height: _
   };
 }
@@ -471,15 +467,15 @@ let Ee = class extends ue {
   _initCommandListeners() {
     this.disposeWithMe(
       this._commandService.onCommandExecuted(async (r) => {
-        if (r.id === Ae.id || r.id === We.id) {
+        if (r.id === Ae.id || r.id === Be.id) {
           const e = r.params;
           if (e.files == null)
             return;
           const n = e.files.length;
-          if (n > st) {
+          if (n > it) {
             this._messageService.show({
               type: Re.Error,
-              content: this._localeService.t("update-status.exceedMaxCount", String(st))
+              content: this._localeService.t("update-status.exceedMaxCount", String(it))
             });
             return;
           }
@@ -498,15 +494,15 @@ let Ee = class extends ue {
     let e;
     try {
       e = await this._imageIoService.saveImage(r);
-    } catch (I) {
-      const v = I.message;
-      v === xe.ERROR_EXCEED_SIZE ? this._messageService.show({
+    } catch (C) {
+      const v = C.message;
+      v === Ge.ERROR_EXCEED_SIZE ? this._messageService.show({
         type: Re.Error,
         content: this._localeService.t("update-status.exceedMaxSize", String(pn / (1024 * 1024)))
-      }) : v === xe.ERROR_IMAGE_TYPE ? this._messageService.show({
+      }) : v === Ge.ERROR_IMAGE_TYPE ? this._messageService.show({
         type: Re.Error,
         content: this._localeService.t("update-status.invalidImageType")
-      }) : v === xe.ERROR_IMAGE && this._messageService.show({
+      }) : v === Ge.ERROR_IMAGE && this._messageService.show({
         type: Re.Error,
         content: this._localeService.t("update-status.invalidImage")
       });
@@ -522,9 +518,9 @@ let Ee = class extends ue {
     const { width: u, height: f } = m.scene;
     this._imageIoService.addImageSourceCache(a, o, d);
     let h = 1;
-    if (g > ot || l > at) {
-      const I = ot / g, v = at / l;
-      h = Math.max(I, v);
+    if (g > st || l > ot) {
+      const C = st / g, v = ot / l;
+      h = Math.max(C, v);
     }
     const p = this._getImagePosition(g * h, l * h, u, f);
     if (p == null)
@@ -539,7 +535,7 @@ let Ee = class extends ue {
       transform: V(p, this._selectionRenderService),
       sheetTransform: p
     };
-    this._commandService.executeCommand(tt.id, {
+    this._commandService.executeCommand(et.id, {
       unitId: t,
       drawings: [S]
     });
@@ -598,7 +594,7 @@ let Ee = class extends ue {
   _updateOrderListener() {
     this._drawingManagerService.featurePluginOrderUpdate$.subscribe((r) => {
       const { unitId: e, subUnitId: n, drawingIds: t, arrangeType: i } = r;
-      this._commandService.executeCommand(Wt.id, {
+      this._commandService.executeCommand($t.id, {
         unitId: e,
         subUnitId: n,
         drawingIds: t,
@@ -625,7 +621,7 @@ let Ee = class extends ue {
           sheetTransform: { ...g }
         };
         e.push(l);
-      }), e.length > 0 && this._commandService.executeCommand($e.id, {
+      }), e.length > 0 && this._commandService.executeCommand(We.id, {
         unitId: r[0].unitId,
         drawings: e
       }));
@@ -633,11 +629,11 @@ let Ee = class extends ue {
   }
   _groupDrawingListener() {
     this._drawingManagerService.featurePluginGroupUpdate$.subscribe((r) => {
-      this._commandService.executeCommand($t.id, r);
+      this._commandService.executeCommand(Bt.id, r);
       const { unitId: e, subUnitId: n, drawingId: t } = r[0].parent;
       this._drawingManagerService.focusDrawing([{ unitId: e, subUnitId: n, drawingId: t }]);
     }), this._drawingManagerService.featurePluginUngroupUpdate$.subscribe((r) => {
-      this._commandService.executeCommand(Vt.id, r);
+      this._commandService.executeCommand(Wt.id, r);
     });
   }
   _focusDrawingListener() {
@@ -650,16 +646,16 @@ let Ee = class extends ue {
 };
 Ee = hr([
   de(le.Rendered, Ee),
-  F(0, W),
+  F(0, B),
   F(1, ce),
-  F(2, B(Fn)),
-  F(3, Be),
-  F(4, ft),
+  F(2, $(Fn)),
+  F(3, $e),
+  F(4, ht),
   F(5, X),
   F(6, H),
-  F(7, ht),
+  F(7, gt),
   F(8, jn),
-  F(9, B(pe)),
+  F(9, $(pe)),
   F(10, te)
 ], Ee);
 var x = function() {
@@ -677,13 +673,13 @@ var x = function() {
     for (var i = 0, t = Object.getOwnPropertySymbols(r); i < t.length; i++)
       e.indexOf(t[i]) < 0 && Object.prototype.propertyIsEnumerable.call(r, t[i]) && (n[t[i]] = r[t[i]]);
   return n;
-}, Gt = Ut(function(r, e) {
-  var n = r.icon, t = r.id, i = r.className, s = r.extend, o = fr(r, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(t, " ").concat(i || "").trim(), c = At("_".concat(_r()));
-  return xt(n, "".concat(t), { defIds: n.defIds, idSuffix: c.current }, x({ ref: e, className: a }, o), s);
+}, Vt = Tt(function(r, e) {
+  var n = r.icon, t = r.id, i = r.className, s = r.extend, o = fr(r, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(t, " ").concat(i || "").trim(), c = Ut("_".concat(_r()));
+  return Gt(n, "".concat(t), { defIds: n.defIds, idSuffix: c.current }, x({ ref: e, className: a }, o), s);
 });
-function xt(r, e, n, t, i) {
-  return Nt(r.tag, x(x({ key: e }, pr(r, n, i)), t), (wr(r, n).children || []).map(function(s, o) {
-    return xt(s, "".concat(e, "-").concat(r.tag, "-").concat(o), n, void 0, i);
+function Gt(r, e, n, t, i) {
+  return At(r.tag, x(x({ key: e }, pr(r, n, i)), t), (wr(r, n).children || []).map(function(s, o) {
+    return Gt(s, "".concat(e, "-").concat(r.tag, "-").concat(o), n, void 0, i);
   }));
 }
 function pr(r, e, n) {
@@ -704,22 +700,22 @@ function wr(r, e) {
 function _r() {
   return Math.random().toString(36).substring(2, 8);
 }
-Gt.displayName = "UniverIcon";
-var vr = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M2.2498 3.65005C2.2498 2.87685 2.87661 2.25005 3.64981 2.25005H7.9998C8.33118 2.25005 8.5998 1.98142 8.5998 1.65005C8.5998 1.31868 8.33118 1.05005 7.9998 1.05005H3.64981C2.21387 1.05005 1.0498 2.21411 1.0498 3.65005V12.35C1.0498 13.786 2.21386 14.95 3.6498 14.95H12.3498C13.7857 14.95 14.9498 13.786 14.9498 12.3501V8.00005C14.9498 7.66868 14.6812 7.40005 14.3498 7.40005C14.0184 7.40005 13.7498 7.66868 13.7498 8.00005V9.23974L12.2385 8.1063C11.7252 7.72129 11.0068 7.7723 10.5531 8.22605L9.00869 9.77041L6.73916 7.8251C6.24387 7.40055 5.5095 7.41278 5.02864 7.85359L2.2498 10.4009V3.65005ZM2.2498 12.0287V12.35C2.2498 13.1232 2.87661 13.75 3.6498 13.75H12.3498C13.123 13.75 13.7498 13.1232 13.7498 12.3501V10.7397L11.5186 9.06631C11.4829 9.03956 11.433 9.04314 11.4016 9.07458L9.92249 10.5537L11.1015 11.5642C11.3531 11.7799 11.3822 12.1587 11.1666 12.4103C10.9509 12.6619 10.5721 12.691 10.3205 12.4753L5.9582 8.7362C5.92384 8.70674 5.87288 8.70758 5.83952 8.73816L2.2498 12.0287Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M11.8097 1.14783C12.1411 1.14783 12.4097 1.41646 12.4097 1.74783V3.297H14.1541C14.4855 3.297 14.7541 3.56563 14.7541 3.897C14.7541 4.22837 14.4855 4.497 14.1541 4.497H12.4097V6.24167C12.4097 6.57304 12.1411 6.84167 11.8097 6.84167C11.4783 6.84167 11.2097 6.57304 11.2097 6.24167V4.497H9.6603C9.32893 4.497 9.0603 4.22837 9.0603 3.897C9.0603 3.56563 9.32893 3.297 9.6603 3.297H11.2097V1.74783C11.2097 1.41646 11.4783 1.14783 11.8097 1.14783Z" } }] }, Ft = Ut(function(r, e) {
-  return Nt(Gt, Object.assign({}, r, {
+Vt.displayName = "UniverIcon";
+var vr = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M2.2498 3.65005C2.2498 2.87685 2.87661 2.25005 3.64981 2.25005H7.9998C8.33118 2.25005 8.5998 1.98142 8.5998 1.65005C8.5998 1.31868 8.33118 1.05005 7.9998 1.05005H3.64981C2.21387 1.05005 1.0498 2.21411 1.0498 3.65005V12.35C1.0498 13.786 2.21386 14.95 3.6498 14.95H12.3498C13.7857 14.95 14.9498 13.786 14.9498 12.3501V8.00005C14.9498 7.66868 14.6812 7.40005 14.3498 7.40005C14.0184 7.40005 13.7498 7.66868 13.7498 8.00005V9.23974L12.2385 8.1063C11.7252 7.72129 11.0068 7.7723 10.5531 8.22605L9.00869 9.77041L6.73916 7.8251C6.24387 7.40055 5.5095 7.41278 5.02864 7.85359L2.2498 10.4009V3.65005ZM2.2498 12.0287V12.35C2.2498 13.1232 2.87661 13.75 3.6498 13.75H12.3498C13.123 13.75 13.7498 13.1232 13.7498 12.3501V10.7397L11.5186 9.06631C11.4829 9.03956 11.433 9.04314 11.4016 9.07458L9.92249 10.5537L11.1015 11.5642C11.3531 11.7799 11.3822 12.1587 11.1666 12.4103C10.9509 12.6619 10.5721 12.691 10.3205 12.4753L5.9582 8.7362C5.92384 8.70674 5.87288 8.70758 5.83952 8.73816L2.2498 12.0287Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M11.8097 1.14783C12.1411 1.14783 12.4097 1.41646 12.4097 1.74783V3.297H14.1541C14.4855 3.297 14.7541 3.56563 14.7541 3.897C14.7541 4.22837 14.4855 4.497 14.1541 4.497H12.4097V6.24167C12.4097 6.57304 12.1411 6.84167 11.8097 6.84167C11.4783 6.84167 11.2097 6.57304 11.2097 6.24167V4.497H9.6603C9.32893 4.497 9.0603 4.22837 9.0603 3.897C9.0603 3.56563 9.32893 3.297 9.6603 3.297H11.2097V1.74783C11.2097 1.41646 11.4783 1.14783 11.8097 1.14783Z" } }] }, xt = Tt(function(r, e) {
+  return At(Vt, Object.assign({}, r, {
     id: "add-image-single",
     ref: e,
     icon: vr
   }));
 });
-Ft.displayName = "AddImageSingle";
-const Sr = "univer-upload-file-menu", Cr = "univer-upload-file-menu-input", mt = {
+xt.displayName = "AddImageSingle";
+const Sr = "univer-upload-file-menu", Cr = "univer-upload-file-menu-input", ut = {
   uploadFileMenu: Sr,
   uploadFileMenuInput: Cr
-}, Yt = "COMPONENT_UPLOAD_FILE_MENU";
+}, Ft = "COMPONENT_UPLOAD_FILE_MENU";
 var Ne = /* @__PURE__ */ ((r) => (r[r.cellImage = 0] = "cellImage", r[r.floatImage = 1] = "floatImage", r))(Ne || {});
 const Ir = (r) => {
-  const { type: e } = r, n = q(W), t = At(null), i = () => {
+  const { type: e } = r, n = q(B), t = Ut(null), i = () => {
     var a;
     (a = t.current) == null || a.click();
   }, s = _n.map((a) => `.${a.replace("image/", "")}`).join(","), o = (a) => {
@@ -727,48 +723,48 @@ const Ir = (r) => {
     if (c == null)
       return;
     const g = Array.from(c);
-    e === Ne.floatImage ? n.executeCommand(We.id, { files: g }) : e === Ne.cellImage && n.executeCommand(Ae.id, { files: g }), t.current && (t.current.value = "");
+    e === Ne.floatImage ? n.executeCommand(Be.id, { files: g }) : e === Ne.cellImage && n.executeCommand(Ae.id, { files: g }), t.current && (t.current.value = "");
   };
-  return /* @__PURE__ */ L.createElement("div", { onClick: i, className: mt.uploadFileMenu }, /* @__PURE__ */ L.createElement(
+  return /* @__PURE__ */ L.createElement("div", { onClick: i, className: ut.uploadFileMenu }, /* @__PURE__ */ L.createElement(
     "input",
     {
       type: "file",
-      className: mt.uploadFileMenuInput,
+      className: ut.uploadFileMenuInput,
       ref: t,
       onChange: o,
       accept: s,
       multiple: !0
     }
   ));
-}, Xt = "addition-and-subtraction-single", Ht = "sheet.menu.image";
+}, Yt = "addition-and-subtraction-single", Xt = "sheet.menu.image";
 function Rr(r) {
   return {
-    id: Ht,
-    type: pt.SUBITEMS,
+    id: Xt,
+    type: ft.SUBITEMS,
     positions: [Ln.TOOLBAR_START],
-    group: Bn.TOOLBAR_FORMULAS_INSERT,
-    icon: Xt,
+    group: $n.TOOLBAR_FORMULAS_INSERT,
+    icon: Yt,
     tooltip: "sheetImage.title",
-    hidden$: wt(r, Y.UNIVER_SHEET),
-    disabled$: On(r, { workbookTypes: [ze], worksheetTypes: [Oe], rangeTypes: [Yn] })
+    hidden$: pt(r, Y.UNIVER_SHEET),
+    disabled$: On(r, { workbookTypes: [He], worksheetTypes: [Oe], rangeTypes: [Yn] })
   };
 }
 function Dr(r) {
   return {
-    id: We.id,
+    id: Be.id,
     title: "sheetImage.upload.float",
-    type: pt.SELECTOR,
+    type: ft.SELECTOR,
     label: {
-      name: Yt,
+      name: Ft,
       props: {
         type: Ne.floatImage
       }
     },
-    positions: [Ht],
-    hidden$: wt(r, Y.UNIVER_SHEET)
+    positions: [Xt],
+    hidden$: pt(r, Y.UNIVER_SHEET)
   };
 }
-const Mr = "univer-image-common-panel", br = "univer-image-common-panel-grid", Or = "univer-image-common-panel-border", Pr = "univer-image-common-panel-title", Er = "univer-image-common-panel-row", yr = "univer-image-common-panel-row-vertical", Tr = "univer-image-common-panel-column", Ur = "univer-image-common-panel-column-center", Ar = "univer-image-common-panel-inline", Nr = "univer-image-common-panel-span2", jr = "univer-image-common-panel-span3", Lr = "univer-image-common-panel-input", Br = "univer-sheet-image-menu", Wr = "univer-sheet-image-menu-input", k = {
+const Mr = "univer-image-common-panel", br = "univer-image-common-panel-grid", Or = "univer-image-common-panel-border", Pr = "univer-image-common-panel-title", Er = "univer-image-common-panel-row", yr = "univer-image-common-panel-row-vertical", Tr = "univer-image-common-panel-column", Ur = "univer-image-common-panel-column-center", Ar = "univer-image-common-panel-inline", Nr = "univer-image-common-panel-span2", jr = "univer-image-common-panel-span3", Lr = "univer-image-common-panel-input", $r = "univer-sheet-image-menu", Br = "univer-sheet-image-menu-input", k = {
   imageCommonPanel: Mr,
   imageCommonPanelGrid: br,
   imageCommonPanelBorder: Or,
@@ -781,38 +777,38 @@ const Mr = "univer-image-common-panel", br = "univer-image-common-panel-grid", O
   imageCommonPanelSpan2: Nr,
   imageCommonPanelSpan3: jr,
   imageCommonPanelInput: Lr,
-  sheetImageMenu: Br,
-  sheetImageMenuInput: Wr
-}, $r = (r) => {
+  sheetImageMenu: $r,
+  sheetImageMenuInput: Br
+}, Wr = (r) => {
   var v;
-  const e = q(W), n = q(pe), t = q(H), i = q(te), { drawings: s } = r, o = s[0];
+  const e = q(B), n = q(pe), t = q(H), i = q(te), { drawings: s } = r, o = s[0];
   if (o == null)
     return;
   const { unitId: a } = o, c = i.getRenderById(a), g = c == null ? void 0 : c.scene;
   if (g == null)
     return;
-  const l = g.getTransformerByCreate(), [d, m] = Je(!0), u = (v = o.anchorType) != null ? v : b.Position, [f, h] = Je(u);
-  function p(C, _) {
+  const l = g.getTransformerByCreate(), [d, m] = ke(!0), u = (v = o.anchorType) != null ? v : b.Position, [f, h] = ke(u);
+  function p(R, _) {
     const M = [];
-    return C.forEach((w) => {
+    return R.forEach((w) => {
       const { oKey: y } = w, D = _.getDrawingOKey(y);
       if (D == null)
         return M.push(null), !0;
-      const { unitId: T, subUnitId: U, drawingId: E, drawingType: R, anchorType: A, sheetTransform: z } = D;
+      const { unitId: T, subUnitId: U, drawingId: E, drawingType: I, anchorType: A, sheetTransform: z } = D;
       M.push({
         unitId: T,
         subUnitId: U,
         drawingId: E,
         anchorType: A,
         sheetTransform: z,
-        drawingType: R
+        drawingType: I
       });
     }), M;
   }
-  Qe(() => {
-    const C = l.onClearControlObservable.add((M) => {
+  qe(() => {
+    const R = l.clearControl$.subscribe((M) => {
       M === !0 && m(!1);
-    }), _ = l.onChangeStartObservable.add((M) => {
+    }), _ = l.changeStart$.subscribe((M) => {
       var D;
       const { objects: w } = M, y = p(w, t);
       if (y.length === 0)
@@ -824,11 +820,11 @@ const Mr = "univer-image-common-panel", br = "univer-image-common-panel-grid", O
       }
     });
     return () => {
-      _ == null || _.dispose(), C == null || C.dispose();
+      _.unsubscribe(), R.unsubscribe();
     };
   }, []);
-  function S(C) {
-    h(C);
+  function S(R) {
+    h(R);
     const _ = t.getFocusDrawings();
     if (_.length === 0)
       return;
@@ -836,33 +832,30 @@ const Mr = "univer-image-common-panel", br = "univer-image-common-panel-grid", O
       unitId: w.unitId,
       subUnitId: w.subUnitId,
       drawingId: w.drawingId,
-      anchorType: C
+      anchorType: R
     }));
-    e.executeCommand($e.id, {
+    e.executeCommand(We.id, {
       unitId: _[0].unitId,
       drawings: M
     });
   }
-  const I = (C) => C ? "block" : "none";
-  return /* @__PURE__ */ L.createElement("div", { className: De(k.imageCommonPanelGrid, k.imageCommonPanelBorder), style: { display: I(d) } }, /* @__PURE__ */ L.createElement("div", { className: k.imageCommonPanelRow }, /* @__PURE__ */ L.createElement("div", { className: De(k.imageCommonPanelColumn, k.imageCommonPanelTitle) }, /* @__PURE__ */ L.createElement("div", null, n.t("drawing-anchor.title")))), /* @__PURE__ */ L.createElement("div", { className: De(k.imageCommonPanelRow) }, /* @__PURE__ */ L.createElement("div", { className: De(k.imageCommonPanelColumn) }, /* @__PURE__ */ L.createElement(er, { value: f, onChange: S, direction: "vertical" }, /* @__PURE__ */ L.createElement(Ye, { value: b.Both }, n.t("drawing-anchor.both")), /* @__PURE__ */ L.createElement(Ye, { value: b.Position }, n.t("drawing-anchor.position")), /* @__PURE__ */ L.createElement(Ye, { value: b.None }, n.t("drawing-anchor.none"))))));
+  const C = (R) => R ? "block" : "none";
+  return /* @__PURE__ */ L.createElement("div", { className: De(k.imageCommonPanelGrid, k.imageCommonPanelBorder), style: { display: C(d) } }, /* @__PURE__ */ L.createElement("div", { className: k.imageCommonPanelRow }, /* @__PURE__ */ L.createElement("div", { className: De(k.imageCommonPanelColumn, k.imageCommonPanelTitle) }, /* @__PURE__ */ L.createElement("div", null, n.t("drawing-anchor.title")))), /* @__PURE__ */ L.createElement("div", { className: De(k.imageCommonPanelRow) }, /* @__PURE__ */ L.createElement("div", { className: De(k.imageCommonPanelColumn) }, /* @__PURE__ */ L.createElement(er, { value: f, onChange: S, direction: "vertical" }, /* @__PURE__ */ L.createElement(Fe, { value: b.Both }, n.t("drawing-anchor.both")), /* @__PURE__ */ L.createElement(Fe, { value: b.Position }, n.t("drawing-anchor.position")), /* @__PURE__ */ L.createElement(Fe, { value: b.None }, n.t("drawing-anchor.none"))))));
 }, Vr = () => {
-  const r = q(H), e = r.getFocusDrawings();
-  if (e == null || e.length === 0)
-    return;
-  const [n, t] = Je(e);
-  return Qe(() => {
+  const r = q(H), e = r.getFocusDrawings(), [n, t] = ke(e);
+  return qe(() => {
     const i = r.focus$.subscribe((s) => {
       t(s);
     });
     return () => {
       i.unsubscribe();
     };
-  }, []), /* @__PURE__ */ L.createElement("div", { className: k.imageCommonPanel }, /* @__PURE__ */ L.createElement(mn, { drawings: n }), /* @__PURE__ */ L.createElement($r, { drawings: n }));
+  }, []), !!(n != null && n.length) && /* @__PURE__ */ L.createElement("div", { className: k.imageCommonPanel }, /* @__PURE__ */ L.createElement(mn, { drawings: n }), /* @__PURE__ */ L.createElement(Wr, { drawings: n }));
 }, we = {
   id: "sheet.command.move-drawing",
   type: G.COMMAND,
   handler: (r, e) => {
-    const n = r.get(W), t = r.get(X), i = r.get(Be), { direction: s } = e, o = t.getFocusDrawings();
+    const n = r.get(B), t = r.get(X), i = r.get($e), { direction: s } = e, o = t.getFocusDrawings();
     if (o.length === 0)
       return !1;
     const a = o[0].unitId, c = o.map((l) => {
@@ -876,16 +869,16 @@ const Mr = "univer-image-common-panel", br = "univer-image-common-panel-grid", O
         sheetTransform: N(m, i)
       };
     }).filter((l) => l != null);
-    return n.syncExecuteCommand($e.id, {
+    return n.syncExecuteCommand(We.id, {
       unitId: a,
       drawings: c
     }) ? (n.syncExecuteCommand(j.id, [a]), !0) : !1;
   }
-}, zt = {
+}, Ht = {
   id: "sheet.command.delete-drawing",
   type: G.COMMAND,
   handler: (r) => {
-    const e = r.get(W), t = r.get(X).getFocusDrawings();
+    const e = r.get(B), t = r.get(X).getFocusDrawings();
     if (t.length === 0)
       return !1;
     const i = t[0].unitId, s = t.map((o) => {
@@ -897,7 +890,7 @@ const Mr = "univer-image-common-panel", br = "univer-image-common-panel-grid", O
         drawingType: l
       };
     });
-    return e.executeCommand(et.id, {
+    return e.executeCommand(Qe.id, {
       unitId: i,
       drawings: s
     });
@@ -947,7 +940,7 @@ const Gr = {
     direction: J.RIGHT
   }
 }, Xr = {
-  id: zt.id,
+  id: Ht.id,
   description: "shortcut.sheet.drawing-delete",
   group: "4_sheet-drawing-view",
   // when focusing on any other input tag do not trigger this shortcut
@@ -967,7 +960,7 @@ let he = class extends ue {
   }
   _initCustomComponents() {
     const r = this._componentManager;
-    this.disposeWithMe(r.register(Xt, Ft)), this.disposeWithMe(r.register(Yt, Ir)), this.disposeWithMe(r.register(jt, Vr));
+    this.disposeWithMe(r.register(Yt, xt)), this.disposeWithMe(r.register(Ft, Ir)), this.disposeWithMe(r.register(Nt, Vr));
   }
   _initMenus() {
     const { menu: r = {} } = this._config;
@@ -981,19 +974,19 @@ let he = class extends ue {
   }
   _initCommands() {
     [
-      We,
+      Be,
       Ae,
-      tt,
       et,
-      $e,
-      Lt,
+      Qe,
+      We,
+      jt,
       j,
+      Lt,
       Bt,
-      $t,
-      Vt,
+      Wt,
       we,
-      zt,
-      Wt
+      Ht,
+      $t
     ].forEach((r) => this.disposeWithMe(this._commandService.registerCommand(r)));
   }
   _initShortcuts() {
@@ -1014,10 +1007,10 @@ let he = class extends ue {
 };
 he = Kr([
   de(le.Rendered, he),
-  me(1, B(qe)),
-  me(2, B(Wn)),
-  me(3, $n),
-  me(4, W),
+  me(1, $(Ze)),
+  me(2, $(Bn)),
+  me(3, Wn),
+  me(4, B),
   me(5, Vn)
 ], he);
 var Jr = Object.defineProperty, Zr = Object.getOwnPropertyDescriptor, qr = (r, e, n, t) => {
@@ -1026,6 +1019,7 @@ var Jr = Object.defineProperty, Zr = Object.getOwnPropertyDescriptor, qr = (r, e
   return t && i && Jr(e, n, i), i;
 }, re = (r, e) => (n, t) => e(n, t, r);
 const Qr = [
+  wt.id,
   _t.id,
   vt.id,
   St.id,
@@ -1033,15 +1027,14 @@ const Qr = [
   It.id,
   Rt.id,
   Dt.id,
-  Mt.id,
+  ze.id,
   Ke.id,
-  ke.id,
+  Mt.id,
   bt.id,
   Ot.id,
   Pt.id,
   Et.id,
-  yt.id,
-  Tt.id
+  yt.id
 ], ei = [
   Xn.id,
   Hn.id,
@@ -1066,50 +1059,50 @@ let ye = class extends ue {
           if (r.params == null)
             return { redos: [], undos: [] };
           const e = r.id;
-          if (e === _t.id)
+          if (e === wt.id)
             return this._moveRowInterceptor(r.params, "insert");
-          if (e === vt.id)
+          if (e === _t.id)
             return this._moveColInterceptor(r.params, "insert");
-          if (e === St.id)
+          if (e === vt.id)
             return this._moveRowInterceptor(r.params, "remove");
-          if (e === Ct.id)
+          if (e === St.id)
             return this._moveColInterceptor(r.params, "remove");
-          if (e === It.id) {
+          if (e === Ct.id) {
             const { range: n } = r.params;
             return this._getRangeMoveUndo(
               n,
               0
               /* deleteLeft */
             );
-          } else if (e === Rt.id) {
+          } else if (e === It.id) {
             const { range: n } = r.params;
             return this._getRangeMoveUndo(
               n,
               1
               /* deleteUp */
             );
-          } else if (e === Dt.id) {
+          } else if (e === Rt.id) {
             const { range: n } = r.params;
             return this._getRangeMoveUndo(
               n,
               2
               /* insertDown */
             );
-          } else if (e === Mt.id) {
+          } else if (e === Dt.id) {
             const { range: n } = r.params;
             return this._getRangeMoveUndo(
               n,
               3
               /* insertRight */
             );
-          } else if (e === Pt.id || e === Et.id) {
+          } else if (e === Ot.id || e === Pt.id) {
             const n = r.params, { unitId: t, subUnitId: i, ranges: s } = n;
             return this._getDrawingUndoForRowVisible(t, i, s);
-          } else if (e === yt.id || e === Tt.id) {
+          } else if (e === Et.id || e === yt.id) {
             const n = r.params, { unitId: t, subUnitId: i, ranges: s } = n;
             return this._getDrawingUndoForColVisible(t, i, s);
-          } else if (e === Ke.id || e === ke.id || e === bt.id || e === Ot.id) {
-            const n = r.params, { unitId: t, subUnitId: i, ranges: s } = n, o = e === Ke.id || e === ke.id;
+          } else if (e === ze.id || e === Ke.id || e === Mt.id || e === bt.id) {
+            const n = r.params, { unitId: t, subUnitId: i, ranges: s } = n, o = e === ze.id || e === Ke.id;
             return this._getDrawingUndoForRowAndColSize(t, i, s, o);
           }
           return { redos: [], undos: [] };
@@ -1147,27 +1140,27 @@ let ye = class extends ue {
         updateDrawings: t,
         deleteDrawings: i
       };
-    const { startRow: S, endRow: I, startColumn: v, endColumn: C } = r;
+    const { startRow: S, endRow: C, startColumn: v, endColumn: R } = r;
     let _ = null, M = null;
-    if (e === 0 && u >= S && h <= I)
-      if (f >= v && p <= C)
+    if (e === 0 && u >= S && h <= C)
+      if (f >= v && p <= R)
         i.push({ unitId: c, subUnitId: g, drawingId: l });
       else {
-        const w = this._shrinkCol(s, a, v, C, o);
+        const w = this._shrinkCol(s, a, v, R, o);
         _ = w == null ? void 0 : w.newSheetTransform, M = w == null ? void 0 : w.newTransform;
       }
-    else if (e === 1 && f >= v && p <= C)
-      if (u >= S && h <= I)
+    else if (e === 1 && f >= v && p <= R)
+      if (u >= S && h <= C)
         i.push({ unitId: c, subUnitId: g, drawingId: l });
       else {
-        const w = this._shrinkRow(s, a, S, I, o);
+        const w = this._shrinkRow(s, a, S, C, o);
         _ = w == null ? void 0 : w.newSheetTransform, M = w == null ? void 0 : w.newTransform;
       }
     else if (e === 2) {
-      const w = this._expandRow(s, a, S, I, o);
+      const w = this._expandRow(s, a, S, C, o);
       _ = w == null ? void 0 : w.newSheetTransform, M = w == null ? void 0 : w.newTransform;
     } else if (e === 3) {
-      const w = this._expandCol(s, a, v, C, o);
+      const w = this._expandCol(s, a, v, R, o);
       _ = w == null ? void 0 : w.newSheetTransform, M = w == null ? void 0 : w.newTransform;
     }
     if (_ != null && M != null) {
@@ -1191,53 +1184,53 @@ let ye = class extends ue {
       if (f === b.None)
         this._remainDrawingSize(u, i, d);
       else {
-        const { from: h, to: p } = m, { row: S, column: I } = h, { row: v, column: C } = p;
+        const { from: h, to: p } = m, { row: S, column: C } = h, { row: v, column: R } = p;
         for (let _ = 0; _ < n.length; _++) {
           const M = n[_], { startRow: w, endRow: y, startColumn: D, endColumn: T } = M;
-          if (C < D)
+          if (R < D)
             continue;
           if (f === b.Position) {
-            let R = null, A = null;
-            if (I >= D && I <= T) {
-              const z = this._selectionRenderService.attachRangeWithCoord({ startColumn: I, endColumn: T, startRow: h.row, endRow: p.row });
+            let I = null, A = null;
+            if (C >= D && C <= T) {
+              const z = this._selectionRenderService.attachRangeWithCoord({ startColumn: C, endColumn: T, startRow: h.row, endRow: p.row });
               if (z == null)
                 return;
               A = { ...u, left: z.startX };
             }
-            if (A != null && (R = N(A, this._selectionRenderService), R != null && A != null)) {
-              i.push({ ...d, sheetTransform: R, transform: A });
+            if (A != null && (I = N(A, this._selectionRenderService), I != null && A != null)) {
+              i.push({ ...d, sheetTransform: I, transform: A });
               break;
             }
             this._remainDrawingSize(u, i, d);
             continue;
           }
-          if (I >= D && C <= T)
+          if (C >= D && R <= T)
             continue;
           let U = null, E = null;
-          if (I >= D && I <= T) {
-            const R = this._selectionRenderService.attachRangeWithCoord({ startColumn: I, endColumn: T, startRow: h.row, endRow: p.row });
-            if (R == null)
+          if (C >= D && C <= T) {
+            const I = this._selectionRenderService.attachRangeWithCoord({ startColumn: C, endColumn: T, startRow: h.row, endRow: p.row });
+            if (I == null)
               return;
             E = {
               ...u,
-              left: (R == null ? void 0 : R.startX) || 0,
-              width: ((u == null ? void 0 : u.width) || 0) - R.endX + R.startX
+              left: (I == null ? void 0 : I.startX) || 0,
+              width: ((u == null ? void 0 : u.width) || 0) - I.endX + I.startX
             };
-          } else if (C >= D && C <= T) {
-            const R = this._selectionRenderService.attachRangeWithCoord({ startColumn: D, endColumn: C, startRow: h.row, endRow: p.row });
-            if (R == null)
+          } else if (R >= D && R <= T) {
+            const I = this._selectionRenderService.attachRangeWithCoord({ startColumn: D, endColumn: R, startRow: h.row, endRow: p.row });
+            if (I == null)
               return;
             E = {
               ...u,
-              left: R.startX - ((u == null ? void 0 : u.width) || 0)
+              left: I.startX - ((u == null ? void 0 : u.width) || 0)
             };
           } else {
-            const R = this._selectionRenderService.attachRangeWithCoord({ startColumn: D, endColumn: T, startRow: h.row, endRow: p.row });
-            if (R == null)
+            const I = this._selectionRenderService.attachRangeWithCoord({ startColumn: D, endColumn: T, startRow: h.row, endRow: p.row });
+            if (I == null)
               return;
             if (E = {
               ...u,
-              width: ((u == null ? void 0 : u.width) || 0) - R.endX + R.startX
+              width: ((u == null ? void 0 : u.width) || 0) - I.endX + I.startX
             }, U = N(E, this._selectionRenderService), U != null && E != null) {
               s.push({ ...d, sheetTransform: U, transform: E });
               break;
@@ -1285,21 +1278,21 @@ let ye = class extends ue {
       if (f === b.None)
         this._remainDrawingSize(u, i, d);
       else {
-        const { from: h, to: p } = m, { row: S, column: I } = h, { row: v, column: C } = p;
+        const { from: h, to: p } = m, { row: S, column: C } = h, { row: v, column: R } = p;
         for (let _ = 0; _ < n.length; _++) {
           const M = n[_], { startRow: w, endRow: y, startColumn: D, endColumn: T } = M;
           if (v < w)
             continue;
           if (f === b.Position) {
-            let R = null, A = null;
+            let I = null, A = null;
             if (S >= w && S <= y) {
               const z = this._selectionRenderService.attachRangeWithCoord({ startColumn: h.column, endColumn: p.column, startRow: S, endRow: y });
               if (z == null)
                 return;
               A = { ...u, top: z.startY };
             }
-            if (A != null && (R = N(A, this._selectionRenderService), R != null && A != null)) {
-              i.push({ ...d, sheetTransform: R, transform: A });
+            if (A != null && (I = N(A, this._selectionRenderService), I != null && A != null)) {
+              i.push({ ...d, sheetTransform: I, transform: A });
               break;
             }
             this._remainDrawingSize(u, i, d);
@@ -1309,29 +1302,29 @@ let ye = class extends ue {
             continue;
           let U = null, E = null;
           if (S >= w && S <= y) {
-            const R = this._selectionRenderService.attachRangeWithCoord({ startColumn: h.column, endColumn: p.column, startRow: S, endRow: y });
-            if (R == null)
+            const I = this._selectionRenderService.attachRangeWithCoord({ startColumn: h.column, endColumn: p.column, startRow: S, endRow: y });
+            if (I == null)
               return;
             E = {
               ...u,
-              top: (R == null ? void 0 : R.startY) || 0,
-              height: ((u == null ? void 0 : u.height) || 0) - R.endY + R.startY
+              top: (I == null ? void 0 : I.startY) || 0,
+              height: ((u == null ? void 0 : u.height) || 0) - I.endY + I.startY
             };
           } else if (v >= w && v <= y) {
-            const R = this._selectionRenderService.attachRangeWithCoord({ startColumn: h.column, endColumn: p.column, startRow: w, endRow: v });
-            if (R == null)
+            const I = this._selectionRenderService.attachRangeWithCoord({ startColumn: h.column, endColumn: p.column, startRow: w, endRow: v });
+            if (I == null)
               return;
             E = {
               ...u,
-              top: R.startY - ((u == null ? void 0 : u.height) || 0)
+              top: I.startY - ((u == null ? void 0 : u.height) || 0)
             };
           } else {
-            const R = this._selectionRenderService.attachRangeWithCoord({ startColumn: h.column, endColumn: p.column, startRow: w, endRow: y });
-            if (R == null)
+            const I = this._selectionRenderService.attachRangeWithCoord({ startColumn: h.column, endColumn: p.column, startRow: w, endRow: y });
+            if (I == null)
               return;
             if (E = {
               ...u,
-              height: ((u == null ? void 0 : u.height) || 0) - R.endY + R.startY
+              height: ((u == null ? void 0 : u.height) || 0) - I.endY + I.startY
             }, U = N(E, this._selectionRenderService), U != null && E != null) {
               s.push({ ...d, sheetTransform: U, transform: E });
               break;
@@ -1367,10 +1360,10 @@ let ye = class extends ue {
       else {
         const { from: d, to: m } = c, { row: u, column: f } = d, { row: h, column: p } = m;
         for (let S = 0; S < n.length; S++) {
-          const I = n[S], { startRow: v, endRow: C, startColumn: _, endColumn: M } = I;
+          const C = n[S], { startRow: v, endRow: R, startColumn: _, endColumn: M } = C;
           if (h < v || p < _)
             continue;
-          if (l === b.Position && (u <= v && h >= C || f <= _ && p >= M)) {
+          if (l === b.Position && (u <= v && h >= R || f <= _ && p >= M)) {
             this._remainDrawingSize(g, s, a);
             continue;
           }
@@ -1407,23 +1400,23 @@ let ye = class extends ue {
       const f = l[u], { sheetTransform: h, transform: p, anchorType: S = b.Position } = f;
       if (h == null || p == null)
         return;
-      let I, v;
+      let C, v;
       if (e === "insert") {
         const _ = this._expandRow(h, p, o, a, S);
-        I = _ == null ? void 0 : _.newSheetTransform, v = _ == null ? void 0 : _.newTransform;
+        C = _ == null ? void 0 : _.newSheetTransform, v = _ == null ? void 0 : _.newTransform;
       } else {
         const { from: _, to: M } = h, { row: w } = _, { row: y } = M;
         if (w >= o && y <= a)
           m.push({ unitId: t, subUnitId: i, drawingId: u });
         else {
           const D = this._shrinkRow(h, p, o, a, S);
-          I = D == null ? void 0 : D.newSheetTransform, v = D == null ? void 0 : D.newTransform;
+          C = D == null ? void 0 : D.newSheetTransform, v = D == null ? void 0 : D.newTransform;
         }
       }
-      if (!I || !v)
+      if (!C || !v)
         return;
-      const C = { unitId: t, subUnitId: i, drawingId: u, transform: v, sheetTransform: I };
-      d.push(C);
+      const R = { unitId: t, subUnitId: i, drawingId: u, transform: v, sheetTransform: C };
+      d.push(R);
     }), d.length === 0 && m.length === 0)
       return { redos: [], undos: [] };
     if (d.length > 0) {
@@ -1448,23 +1441,23 @@ let ye = class extends ue {
       const f = l[u], { sheetTransform: h, transform: p, anchorType: S = b.Position } = f;
       if (h == null || p == null)
         return;
-      let I, v;
+      let C, v;
       if (e === "insert") {
         const _ = this._expandCol(h, p, o, a, S);
-        I = _ == null ? void 0 : _.newSheetTransform, v = _ == null ? void 0 : _.newTransform;
+        C = _ == null ? void 0 : _.newSheetTransform, v = _ == null ? void 0 : _.newTransform;
       } else {
         const { from: _, to: M } = h, { column: w } = _, { column: y } = M;
         if (w >= o && y <= a)
           m.push({ unitId: t, subUnitId: i, drawingId: u });
         else {
           const D = this._shrinkCol(h, p, o, a, S);
-          I = D == null ? void 0 : D.newSheetTransform, v = D == null ? void 0 : D.newTransform;
+          C = D == null ? void 0 : D.newSheetTransform, v = D == null ? void 0 : D.newTransform;
         }
       }
-      if (!I || !v)
+      if (!C || !v)
         return;
-      const C = { unitId: t, subUnitId: i, drawingId: u, transform: v, sheetTransform: I };
-      d.push(C);
+      const R = { unitId: t, subUnitId: i, drawingId: u, transform: v, sheetTransform: C };
+      d.push(R);
     }), d.length === 0 && m.length === 0)
       return { redos: [], undos: [] };
     if (d.length > 0) {
@@ -1683,13 +1676,13 @@ let ye = class extends ue {
         return !0;
       const { from: g, to: l } = a, { row: d, column: m } = g, { row: u, column: f } = l;
       for (let h = 0; h < n.length; h++) {
-        const p = n[h], { startRow: S, endRow: I, startColumn: v, endColumn: C } = p;
+        const p = n[h], { startRow: S, endRow: C, startColumn: v, endColumn: R } = p;
         if (tn.intersects(
           {
             startRow: S,
-            endRow: I,
+            endRow: C,
             startColumn: v,
-            endColumn: C
+            endColumn: R
           },
           {
             startRow: d,
@@ -1697,7 +1690,7 @@ let ye = class extends ue {
             startColumn: m,
             endColumn: f
           }
-        ) || d > I || m > C) {
+        ) || d > C || m > R) {
           i.push({
             ...o,
             transform: V(a, this._selectionRenderService)
@@ -1710,11 +1703,11 @@ let ye = class extends ue {
 };
 ye = qr([
   de(le.Rendered, ye),
-  re(0, W),
-  re(1, B(qn)),
+  re(0, B),
+  re(1, $(qn)),
   re(2, X),
   re(3, H),
-  re(4, Be),
+  re(4, $e),
   re(5, ce)
 ], ye);
 var ti = Object.defineProperty, ni = Object.getOwnPropertyDescriptor, ri = (r, e, n, t) => {
@@ -1732,7 +1725,7 @@ function ii(r, e, n, t) {
       ...r,
       absolute: a
     };
-  const { left: c, right: g, top: l, bottom: d } = r, m = t.getFreeze(), { startColumn: u, startRow: f, xSplit: h, ySplit: p } = m, S = n.getNoMergeCellPositionByIndexWithNoHeader(f - p, u - h), I = n.getNoMergeCellPositionByIndexWithNoHeader(f, u), { rowHeaderWidth: v, columnHeaderHeight: C } = n, _ = I.startX - S.startX, M = I.startY - S.startY, { top: w, left: y, viewportScrollX: D, viewportScrollY: T } = o;
+  const { left: c, right: g, top: l, bottom: d } = r, m = t.getFreeze(), { startColumn: u, startRow: f, xSplit: h, ySplit: p } = m, S = n.getNoMergeCellPositionByIndexWithNoHeader(f - p, u - h), C = n.getNoMergeCellPositionByIndexWithNoHeader(f, u), { rowHeaderWidth: v, columnHeaderHeight: R } = n, _ = C.startX - S.startX, M = C.startY - S.startY, { top: w, left: y, viewportScrollX: D, viewportScrollY: T } = o;
   let U, E;
   c < y ? (a.left = !0, U = (_ + v + (c - y)) * i, E = Math.max(
     Math.min(
@@ -1741,22 +1734,22 @@ function ii(r, e, n, t) {
     ),
     (g - D) * i
   )) : (a.left = !1, U = Math.max((c - D) * i, (_ + v) * i), E = Math.max((g - D) * i, (_ + v) * i));
-  let R, A;
-  return l < w ? (a.top = !0, R = (M + C + (l - w)) * s, A = Math.max(
+  let I, A;
+  return l < w ? (a.top = !0, I = (M + R + (l - w)) * s, A = Math.max(
     Math.min(
-      (M + C + (g - w)) * s,
-      (M + C) * s
+      (M + R + (g - w)) * s,
+      (M + R) * s
     ),
     (d - T) * s
-  )) : (a.top = !1, R = Math.max((l - T) * s, (M + C) * s), A = Math.max((d - T) * s, (M + C) * s)), {
+  )) : (a.top = !1, I = Math.max((l - T) * s, (M + R) * s), A = Math.max((d - T) * s, (M + R) * s)), {
     left: U,
     right: E,
-    top: R,
+    top: I,
     bottom: A,
     absolute: a
   };
 }
-const Xe = (r, e, n, t) => {
+const Ye = (r, e, n, t) => {
   const { scene: i } = e, { left: s, top: o, width: a, height: c, angle: g } = r, l = {
     left: s,
     right: s + a,
@@ -1774,14 +1767,14 @@ const Xe = (r, e, n, t) => {
     absolute: d.absolute
   };
 };
-let Ze = class extends ue {
+let Je = class extends ue {
   constructor(e, n, t, i, s, o, a) {
     super();
     K(this, "_domLayerMap", /* @__PURE__ */ new Map());
     K(this, "_domLayerInfoMap", /* @__PURE__ */ new Map());
-    K(this, "_transformChange$", new dt());
+    K(this, "_transformChange$", new ct());
     K(this, "transformChange$", this._transformChange$.asObservable());
-    K(this, "_remove$", new dt());
+    K(this, "_remove$", new ct());
     K(this, "remove$", this._remove$.asObservable());
     this._renderManagerService = e, this._univerInstanceService = n, this._commandService = t, this._drawingManagerService = i, this._selectionRenderService = s, this._canvasFloatDomService = o, this._sheetDrawingService = a, this._drawingAddListener(), this._scrollUpdateListener(), this._featureUpdateListener(), this._deleteListener();
   }
@@ -1806,12 +1799,12 @@ let Ze = class extends ue {
       // eslint-disable-next-line max-lines-per-function
       this._drawingManagerService.add$.subscribe((e) => {
         e.forEach((n) => {
-          var rt, it;
-          const { unitId: t, subUnitId: i, drawingId: s } = n, o = se(this._univerInstanceService, { unitId: t, subUnitId: i }), a = this._drawingManagerService.getDrawingByParam(n), c = (rt = this._renderManagerService.getRenderById(t)) == null ? void 0 : rt.with(He).getUnitSkeleton(t, i);
+          var nt, rt;
+          const { unitId: t, subUnitId: i, drawingId: s } = n, o = se(this._univerInstanceService, { unitId: t, subUnitId: i }), a = this._drawingManagerService.getDrawingByParam(n), c = (nt = this._renderManagerService.getRenderById(t)) == null ? void 0 : nt.with(Xe).getUnitSkeleton(t, i);
           if (a == null || o == null || c == null)
             return;
           const { transform: g, drawingType: l } = a;
-          if (l !== Ge.DRAWING_DOM)
+          if (l !== Ve.DRAWING_DOM)
             return;
           const d = this._getSceneAndTransformerByDrawingSearch(t);
           if (d == null)
@@ -1819,9 +1812,9 @@ let Ze = class extends ue {
           const { scene: m, canvas: u } = d;
           if (g == null)
             return !0;
-          const { left: f, top: h, width: p, height: S, angle: I, flipX: v, flipY: C, skewX: _, skewY: M } = g, w = vn({ unitId: t, subUnitId: i, drawingId: s }), y = m.getObject(w);
+          const { left: f, top: h, width: p, height: S, angle: C, flipX: v, flipY: R, skewX: _, skewY: M } = g, w = vn({ unitId: t, subUnitId: i, drawingId: s }), y = m.getObject(w);
           if (y != null) {
-            y.transformByState({ left: f, top: h, width: p, height: S, angle: I, flipX: v, flipY: C, skewX: _, skewY: M });
+            y.transformByState({ left: f, top: h, width: p, height: S, angle: C, flipX: v, flipY: R, skewX: _, skewY: M });
             return;
           }
           const D = {
@@ -1832,7 +1825,7 @@ let Ze = class extends ue {
             zIndex: this._drawingManagerService.getDrawingOrder(t, i).length - 1
           }, T = new Rn(w, D);
           m.addObject(T, Dn).attachTransformerTo(T);
-          const U = this._ensureMap(t, i), E = new nn(), R = Xe(T, d.renderObject, c.skeleton, o.worksheet), A = new Tn(R), z = {
+          const U = this._ensureMap(t, i), E = new nn(), I = Ye(T, d.renderObject, c.skeleton, o.worksheet), A = new Tn(I), z = {
             dispose: E,
             rect: T,
             position$: A,
@@ -1843,29 +1836,29 @@ let Ze = class extends ue {
             position$: A,
             id: s,
             componentKey: a.componentKey,
-            onPointerDown: ($) => {
-              u.dispatchEvent(new PointerEvent($.type, $));
+            onPointerDown: (W) => {
+              u.dispatchEvent(new PointerEvent(W.type, W));
             },
-            onPointerMove: ($) => {
-              u.dispatchEvent(new PointerEvent($.type, $));
+            onPointerMove: (W) => {
+              u.dispatchEvent(new PointerEvent(W.type, W));
             },
-            onPointerUp: ($) => {
-              u.dispatchEvent(new PointerEvent($.type, $));
+            onPointerUp: (W) => {
+              u.dispatchEvent(new PointerEvent(W.type, W));
             },
-            onWheel: ($) => {
-              u.dispatchEvent(new WheelEvent($.type, $));
+            onWheel: (W) => {
+              u.dispatchEvent(new WheelEvent(W.type, W));
             },
-            props: (it = U.get(s)) == null ? void 0 : it.props
+            props: (rt = U.get(s)) == null ? void 0 : rt.props
           });
-          const nt = T.onTransformChangeObservable.add(() => {
-            const $ = Xe(T, d.renderObject, c.skeleton, o.worksheet);
+          const tt = T.onTransformChange$.subscribeEvent(() => {
+            const W = Ye(T, d.renderObject, c.skeleton, o.worksheet);
             A.next(
-              $
+              W
             );
           });
           E.add(() => {
             this._canvasFloatDomService.removeFloatDom(s);
-          }), nt && E.add(nt), this._domLayerInfoMap.set(s, z);
+          }), tt && E.add(tt), this._domLayerInfoMap.set(s, z);
         });
       })
     );
@@ -1875,11 +1868,11 @@ let Ze = class extends ue {
       var t, i;
       const n = (s, o) => {
         var m;
-        const a = this._getSceneAndTransformerByDrawingSearch(s), c = this._ensureMap(s, o), g = Array.from(c.keys()), l = se(this._univerInstanceService, { unitId: s, subUnitId: o }), d = (m = this._renderManagerService.getRenderById(s)) == null ? void 0 : m.with(He).getUnitSkeleton(s, o);
+        const a = this._getSceneAndTransformerByDrawingSearch(s), c = this._ensureMap(s, o), g = Array.from(c.keys()), l = se(this._univerInstanceService, { unitId: s, subUnitId: o }), d = (m = this._renderManagerService.getRenderById(s)) == null ? void 0 : m.with(Xe).getUnitSkeleton(s, o);
         !a || !l || !d || g.forEach((u) => {
           const f = this._domLayerInfoMap.get(u);
           if (f) {
-            const h = Xe(f.rect, a.renderObject, d.skeleton, l.worksheet);
+            const h = Ye(f.rect, a.renderObject, d.skeleton, l.worksheet);
             f.position$.next(h);
           }
         });
@@ -1926,7 +1919,7 @@ let Ze = class extends ue {
       this._drawingManagerService.update$.subscribe((e) => {
         e.forEach((n) => {
           const t = this._drawingManagerService.getDrawingByParam(n);
-          if (!t || t.drawingType !== Ge.DRAWING_DOM)
+          if (!t || t.drawingType !== Ve.DRAWING_DOM)
             return;
           const i = {
             ...t.transform
@@ -1960,7 +1953,7 @@ let Ze = class extends ue {
       unitId: t,
       subUnitId: i,
       drawingId: a,
-      drawingType: Ge.DRAWING_DOM,
+      drawingType: Ve.DRAWING_DOM,
       componentKey: o,
       sheetTransform: c,
       transform: {
@@ -1970,7 +1963,7 @@ let Ze = class extends ue {
         height: s.endY - s.startY
       }
     };
-    return this._commandService.executeCommand(tt.id, {
+    return this._commandService.executeCommand(et.id, {
       unitId: t,
       drawings: [l]
     }), {
@@ -1997,15 +1990,15 @@ let Ze = class extends ue {
     }
   }
 };
-Ze = ri([
-  ee(0, B(te)),
+Je = ri([
+  ee(0, $(te)),
   ee(1, ce),
-  ee(2, B(W)),
+  ee(2, $(B)),
   ee(3, H),
-  ee(4, Be),
-  ee(5, B(Gn)),
+  ee(4, $e),
+  ee(5, $(Gn)),
   ee(6, X)
-], Ze);
+], Je);
 var si = Object.defineProperty, oi = Object.getOwnPropertyDescriptor, ai = (r, e, n, t) => {
   for (var i = t > 1 ? void 0 : t ? oi(e, n) : e, s = r.length - 1, o; s >= 0; s--)
     (o = r[s]) && (i = (t ? o(e, n, i) : o(i)) || i);
@@ -2036,7 +2029,7 @@ let Te = class extends ue {
             const { unitId: t, subUnitId: i } = e, s = this._renderManagerService.getRenderById(t);
             if (!s)
               return n(r);
-            const o = s.with(He).getUnitSkeleton(t, i);
+            const o = s.with(Xe).getUnitSkeleton(t, i);
             if (!o)
               return n(r);
             const a = this._drawingManagerService.getDrawingDataForUnit(t), c = a == null ? void 0 : a[e.subUnitId];
@@ -2057,8 +2050,8 @@ let Te = class extends ue {
 };
 Te = ai([
   de(le.Rendered, Te),
-  be(0, B(yn)),
-  be(1, B(gn)),
+  be(0, $(yn)),
+  be(1, $(gn)),
   be(2, H),
   be(3, te)
 ], Te);
@@ -2085,7 +2078,7 @@ let Ue = class extends ue {
             return;
           }
           const i = e.getUnitId(), s = t.getSheetId();
-          if (this._permissionService.composePermission([new ut(i).id, new Fe(i, s).id]).every((a) => a.value))
+          if (this._permissionService.composePermission([new lt(i).id, new xe(i, s).id]).every((a) => a.value))
             this._drawingManagerService.setDrawingVisible(!0);
           else {
             this._drawingManagerService.setDrawingVisible(!1);
@@ -2114,7 +2107,7 @@ let Ue = class extends ue {
             return;
           }
           const i = e.getUnitId(), s = t.getSheetId();
-          if (this._permissionService.composePermission([new ze(i).id, new Oe(i, s).id]).every((a) => a.value))
+          if (this._permissionService.composePermission([new He(i).id, new Oe(i, s).id]).every((a) => a.value))
             this._drawingManagerService.setDrawingEditable(!0);
           else {
             this._drawingManagerService.setDrawingEditable(!1);
@@ -2142,7 +2135,7 @@ let Ue = class extends ue {
           const a = this._renderManagerService.getRenderById(i), c = a == null ? void 0 : a.scene;
           if (c == null)
             return;
-          const g = c.getTransformerByCreate(), l = this._permissionService.composePermission$([new ut(i).id, new Fe(i, s).id]).pipe(lt((m) => m.every((u) => u.value)));
+          const g = c.getTransformerByCreate(), l = this._permissionService.composePermission$([new lt(i).id, new xe(i, s).id]).pipe(dt((m) => m.every((u) => u.value)));
           l == null || l.pipe(
             Ce((m) => m !== o),
             Ie()
@@ -2154,7 +2147,7 @@ let Ue = class extends ue {
                 p.classType === ne.IMAGE && h.some((S) => p.oKey.includes(S.drawingId)) && c.removeObject(p);
               }), g.clearSelectedObjects());
             }
-          }), (d = this._permissionService.getPermissionPoint$(new Fe(i, s).id)) == null || d.pipe(
+          }), (d = this._permissionService.getPermissionPoint$(new xe(i, s).id)) == null || d.pipe(
             Ce((m) => m.value !== o),
             Ie()
           ).subscribe({
@@ -2181,7 +2174,7 @@ let Ue = class extends ue {
           const a = this._renderManagerService.getRenderById(i), c = a == null ? void 0 : a.scene;
           if (c == null)
             return;
-          const g = c.getTransformerByCreate(), l = this._permissionService.composePermission$([new ze(i).id, new Oe(i, s).id]).pipe(lt((m) => m.every((u) => u.value)));
+          const g = c.getTransformerByCreate(), l = this._permissionService.composePermission$([new He(i).id, new Oe(i, s).id]).pipe(dt((m) => m.every((u) => u.value)));
           l == null || l.pipe(
             Ce((m) => m !== o),
             Ie()
@@ -2205,7 +2198,7 @@ let Ue = class extends ue {
               if (S == null)
                 return;
               this._drawingManagerService.setDrawingEditable(!0), S.getAllObjects().forEach((v) => {
-                v.classType === ne.IMAGE && h.some((C) => v.oKey.includes(C.drawingId)) && S.detachTransformerFrom(v);
+                v.classType === ne.IMAGE && h.some((R) => v.oKey.includes(R.drawingId)) && S.detachTransformerFrom(v);
               });
             }
           });
@@ -2220,13 +2213,13 @@ Ue = li([
   ge(1, te),
   ge(2, sn),
   ge(3, ce),
-  ge(4, B(rn))
+  ge(4, $(rn))
 ], Ue);
-var Kt = Object.defineProperty, ui = Object.getOwnPropertyDescriptor, mi = (r, e, n) => e in r ? Kt(r, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : r[e] = n, gi = (r, e, n, t) => {
+var zt = Object.defineProperty, ui = Object.getOwnPropertyDescriptor, mi = (r, e, n) => e in r ? zt(r, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : r[e] = n, gi = (r, e, n, t) => {
   for (var i = t > 1 ? void 0 : t ? ui(e, n) : e, s = r.length - 1, o; s >= 0; s--)
     (o = r[s]) && (i = (t ? o(e, n, i) : o(i)) || i);
-  return t && i && Kt(e, n, i), i;
-}, gt = (r, e) => (n, t) => e(n, t, r), kt = (r, e, n) => mi(r, typeof e != "symbol" ? e + "" : e, n);
+  return t && i && zt(e, n, i), i;
+}, mt = (r, e) => (n, t) => e(n, t, r), Kt = (r, e, n) => mi(r, typeof e != "symbol" ? e + "" : e, n);
 const hi = "SHEET_IMAGE_UI_PLUGIN";
 let je = class extends on {
   constructor(e = {}, n, t) {
@@ -2240,7 +2233,7 @@ let je = class extends on {
   _initDependencies(e) {
     [
       // services
-      [Ze],
+      [Je],
       // controllers
       [
         he,
@@ -2256,14 +2249,14 @@ let je = class extends on {
     ].forEach((t) => e.add(t));
   }
 };
-kt(je, "type", Y.UNIVER_SHEET);
-kt(je, "pluginName", hi);
+Kt(je, "type", Y.UNIVER_SHEET);
+Kt(je, "pluginName", hi);
 je = gi([
   an(Sn, hn, fn),
-  gt(1, B(qe)),
-  gt(2, B(pe))
+  mt(1, $(Ze)),
+  mt(2, $(pe))
 ], je);
 export {
-  Ze as SheetCanvasFloatDomManagerService,
+  Je as SheetCanvasFloatDomManagerService,
   je as UniverSheetsDrawingUIPlugin
 };