@univerjs/sheets-drawing-ui 0.5.0-nightly.202411131606 → 0.5.0-nightly.202411141606

package/lib/es/index.js

@@ -1,25 +1,25 @@
-var gn = Object.defineProperty;
-var mn = (i, e, r) => e in i ? gn(i, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : i[e] = r;
-var k = (i, e, r) => mn(i, typeof e != "symbol" ? e + "" : e, r);
-import { CommandType as H, ICommandService as W, IUndoRedoService as ue, sequenceExecute as It, LocaleService as We, IUniverInstanceService as fe, useDependency as oe, Inject as x, Injector as Ct, IContextService as Rt, RxDisposable as fn, UniverInstanceType as Y, connectInjector as pn, toDisposable as wn, FOCUSING_COMMON_DRAWINGS as me, Disposable as re, Direction as te, FOCUSING_FX_BAR_EDITOR as _n, EDITOR_ACTIVATED as vn, FOCUSING_PANEL_EDITOR as Sn, Tools as ge, UserManagerService as In, IPermissionService as Cn, Rectangle as Rn, LifecycleService as Dn, LifecycleStages as Mn, DisposableCollection as bn, fromEventSubject as yn, generateRandomId as On, DependentOn as Pn, Plugin as Tn, registerDependencies as En, touchDependencies as Xe, IConfigService as Un } from "@univerjs/core";
-import { IDrawingManagerService as K, IImageIoService as Dt, DrawingTypeEnum as V, ArrangeTypeEnum as ve, DRAWING_IMAGE_ALLOW_IMAGE_LIST as An, DRAWING_IMAGE_COUNT_LIMIT as mt, ImageUploadStatusType as He, DRAWING_IMAGE_ALLOW_SIZE as Nn, getImageSize as jn, DRAWING_IMAGE_WIDTH_LIMIT as ft, DRAWING_IMAGE_HEIGHT_LIMIT as pt, getDrawingShapeKeyByDrawingSearch as ze, UniverDrawingPlugin as xn } from "@univerjs/drawing";
-import { ImageCropperObject as Ln, COMPONENT_IMAGE_POPUP_MENU as $n, OpenImageCropOperation as Bn, ImageResetSizeOperation as Wn, DrawingCommonPanel as Gn, DrawingRenderService as kn, UniverDrawingUIPlugin as Vn } from "@univerjs/drawing-ui";
-import { IRenderManagerService as J, precisionTo as ne, getGroupState as Yn, transformObjectOutOfGroup as Fn, RENDER_CLASS_TYPE as de, Rect as wt, ObjectType as Xn, DRAWING_OBJECT_LAYER_INDEX as Hn, SHEET_VIEWPORT_KEY as zn } from "@univerjs/engine-render";
-import { ISheetDrawingService as F, SetDrawingApplyMutation as P, DrawingApplyType as T, SheetDrawingAnchorType as y, UniverSheetsDrawingPlugin as Kn } from "@univerjs/sheets-drawing";
-import { SheetCanvasPopManagerService as Jn, attachRangeWithCoord as Te, ISheetSelectionRenderService as pe, SheetSkeletonManagerService as q, getCurrentRangeDisable$ as Zn, COPY_TYPE as _t, PREDEFINED_HOOK_NAME as Se, virtualizeDiscreteRanges as qn, ISheetClipboardService as Qn, SheetPrintInterceptorService as er, VIEWPORT_KEY as tr, SetZoomRatioOperation as nr } from "@univerjs/sheets-ui";
-import { ISidebarService as rr, IUIPartsService as ir, BuiltInUIPart as sr, ILocalFileService as or, IMessageService as ar, MenuItemType as Mt, getMenuHiddenObservable as bt, RibbonStartGroup as cr, KeyCode as le, ComponentManager as dr, IMenuManagerService as lr, IShortcutService as ur, CanvasFloatDomService as hr } from "@univerjs/ui";
-import { takeUntil as vt, combineLatest as Ie, map as Ee, filter as ae, distinctUntilChanged as Ce, Subject as Ke, take as gr, BehaviorSubject as mr, switchMap as fr } from "rxjs";
-import { SheetInterceptorService as at, getSheetCommandTarget as ce, SheetsSelectionsService as pr, WorkbookEditablePermission as tt, WorksheetEditPermission as Pe, RangeProtectionPermissionEditPoint as wr, WorkbookViewPermission as St, WorksheetViewPermission as Je, InsertRowCommand as yt, InsertColCommand as Ot, RemoveRowCommand as Pt, RemoveColCommand as Tt, DeleteRangeMoveLeftCommand as Et, DeleteRangeMoveUpCommand as Ut, InsertRangeMoveDownCommand as At, InsertRangeMoveRightCommand as Nt, DeltaRowHeightCommand as nt, SetRowHeightCommand as rt, DeltaColumnWidthCommand as jt, SetColWidthCommand as xt, SetRowHiddenCommand as Lt, SetSpecificRowsVisibleCommand as $t, SetSpecificColsVisibleCommand as Bt, SetColHiddenCommand as Wt, MoveColsCommand as Gt, MoveRowsCommand as kt, MoveRangeCommand as Vt, SetRowVisibleMutation as _r, SetRowHiddenMutation as vr, SetColVisibleMutation as Sr, SetColHiddenMutation as Ir, SetWorksheetRowHeightMutation as Cr, SetWorksheetColWidthMutation as Rr, SetWorksheetActiveOperation as Dr, SetFrozenMutation as Mr } from "@univerjs/sheets";
-import Yt, { useEffect as ct, forwardRef as Ft, useRef as br, createElement as Xt, useState as it } from "react";
+var mn = Object.defineProperty;
+var fn = (i, e, n) => e in i ? mn(i, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : i[e] = n;
+var V = (i, e, n) => fn(i, typeof e != "symbol" ? e + "" : e, n);
+import { CommandType as H, ICommandService as B, IUndoRedoService as ue, sequenceExecute as Ct, LocaleService as Be, IUniverInstanceService as fe, useDependency as ae, Inject as $, Injector as Rt, IContextService as Dt, RxDisposable as pn, UniverInstanceType as Y, connectInjector as wn, toDisposable as _n, FOCUSING_COMMON_DRAWINGS as me, Disposable as ie, Direction as te, FOCUSING_FX_BAR_EDITOR as vn, EDITOR_ACTIVATED as Sn, FOCUSING_PANEL_EDITOR as In, Tools as ge, UserManagerService as Cn, IPermissionService as Rn, Rectangle as Dn, LifecycleService as Mn, LifecycleStages as bn, DisposableCollection as yn, fromEventSubject as On, generateRandomId as Pn, DependentOn as Tn, Plugin as En, registerDependencies as Un, touchDependencies as Xe, IConfigService as An } from "@univerjs/core";
+import { IDrawingManagerService as K, IImageIoService as Mt, DrawingTypeEnum as k, ArrangeTypeEnum as ve, DRAWING_IMAGE_ALLOW_IMAGE_LIST as Nn, DRAWING_IMAGE_COUNT_LIMIT as mt, ImageUploadStatusType as He, DRAWING_IMAGE_ALLOW_SIZE as jn, getImageSize as $n, DRAWING_IMAGE_WIDTH_LIMIT as ft, DRAWING_IMAGE_HEIGHT_LIMIT as pt, getDrawingShapeKeyByDrawingSearch as ze, UniverDrawingPlugin as xn } from "@univerjs/drawing";
+import { ImageCropperObject as Ln, COMPONENT_IMAGE_POPUP_MENU as Wn, OpenImageCropOperation as Bn, ImageResetSizeOperation as Gn, DrawingCommonPanel as Vn, DrawingRenderService as kn, UniverDrawingUIPlugin as Yn } from "@univerjs/drawing-ui";
+import { IRenderManagerService as J, precisionTo as ne, getGroupState as Fn, transformObjectOutOfGroup as Xn, RENDER_CLASS_TYPE as de, Rect as wt, ObjectType as Hn, DRAWING_OBJECT_LAYER_INDEX as zn, SHEET_VIEWPORT_KEY as Kn } from "@univerjs/engine-render";
+import { ISheetDrawingService as F, SetDrawingApplyMutation as P, DrawingApplyType as T, SheetDrawingAnchorType as y, UniverSheetsDrawingPlugin as Jn } from "@univerjs/sheets-drawing";
+import { SheetCanvasPopManagerService as Zn, attachRangeWithCoord as Te, ISheetSelectionRenderService as pe, SheetSkeletonManagerService as q, getCurrentRangeDisable$ as qn, COPY_TYPE as _t, PREDEFINED_HOOK_NAME as Se, virtualizeDiscreteRanges as Qn, ISheetClipboardService as er, SheetPrintInterceptorService as tr, VIEWPORT_KEY as nr, SetZoomRatioOperation as rr } from "@univerjs/sheets-ui";
+import { ISidebarService as ir, IUIPartsService as sr, BuiltInUIPart as or, ILocalFileService as ar, IMessageService as cr, MenuItemType as bt, getMenuHiddenObservable as yt, RibbonStartGroup as dr, KeyCode as le, ComponentManager as lr, IMenuManagerService as ur, IShortcutService as hr, CanvasFloatDomService as gr } from "@univerjs/ui";
+import { takeUntil as vt, combineLatest as Ie, map as Ee, filter as re, distinctUntilChanged as Ce, Subject as Ke, take as mr, BehaviorSubject as fr, switchMap as St } from "rxjs";
+import { SheetInterceptorService as at, getSheetCommandTarget as ce, SheetsSelectionsService as pr, WorkbookEditablePermission as tt, WorksheetEditPermission as Pe, RangeProtectionPermissionEditPoint as wr, WorkbookViewPermission as It, WorksheetViewPermission as Je, InsertRowCommand as Ot, InsertColCommand as Pt, RemoveRowCommand as Tt, RemoveColCommand as Et, DeleteRangeMoveLeftCommand as Ut, DeleteRangeMoveUpCommand as At, InsertRangeMoveDownCommand as Nt, InsertRangeMoveRightCommand as jt, DeltaRowHeightCommand as nt, SetRowHeightCommand as rt, DeltaColumnWidthCommand as $t, SetColWidthCommand as xt, SetRowHiddenCommand as Lt, SetSpecificRowsVisibleCommand as Wt, SetSpecificColsVisibleCommand as Bt, SetColHiddenCommand as Gt, MoveColsCommand as Vt, MoveRowsCommand as kt, MoveRangeCommand as Yt, SetRowVisibleMutation as _r, SetRowHiddenMutation as vr, SetColVisibleMutation as Sr, SetColHiddenMutation as Ir, SetWorksheetRowHeightMutation as Cr, SetWorksheetColWidthMutation as Rr, SetWorksheetActiveOperation as Dr, SetFrozenMutation as Mr } from "@univerjs/sheets";
+import Ft, { useEffect as ct, forwardRef as Xt, useRef as br, createElement as Ht, useState as it } from "react";
 import { MessageType as Re, RadioGroup as yr, Radio as Ze } from "@univerjs/design";
 const Or = "sheets-drawing-ui.config", Pr = {}, j = {
   id: "sheet.operation.clear-drawing-transformer",
   type: H.MUTATION,
   handler: (i, e) => {
-    const r = i.get(J);
+    const n = i.get(J);
     return e.forEach((t) => {
-      var n, s;
-      (s = (n = r.getRenderById(t)) == null ? void 0 : n.scene.getTransformer()) == null || s.debounceRefreshControls();
+      var r, s;
+      (s = (r = n.getRenderById(t)) == null ? void 0 : r.scene.getTransformer()) == null || s.debounceRefreshControls();
     }), !0;
   }
 }, Ge = {
@@ -27,41 +27,41 @@ const Or = "sheets-drawing-ui.config", Pr = {}, j = {
   type: H.COMMAND,
   handler: (i, e) => {
     var S, v, R;
-    const r = i.get(W), t = i.get(ue), n = i.get(at), s = i.get(F);
+    const n = i.get(B), t = i.get(ue), r = i.get(at), s = i.get(F);
     if (!e) return !1;
-    const { drawings: o } = e, c = [];
+    const { drawings: o } = e, d = [];
     o.forEach((_) => {
       const { unitId: C } = _;
-      c.push(C);
+      d.push(C);
     });
-    const l = s.getBatchRemoveOp(o), { unitId: g, subUnitId: d, undo: a, redo: h, objects: u } = l, m = n.onCommandExecute({ id: Ge.id, params: e }), f = { id: P.id, params: { unitId: g, subUnitId: d, op: h, objects: u, type: T.REMOVE } }, p = { id: P.id, params: { unitId: g, subUnitId: d, op: a, objects: u, type: T.INSERT } };
-    return It([...(S = m.preRedos) != null ? S : [], f, ...m.redos], r) ? (t.pushUndoRedo({
+    const l = s.getBatchRemoveOp(o), { unitId: g, subUnitId: c, undo: a, redo: h, objects: u } = l, m = r.onCommandExecute({ id: Ge.id, params: e }), f = { id: P.id, params: { unitId: g, subUnitId: c, op: h, objects: u, type: T.REMOVE } }, p = { id: P.id, params: { unitId: g, subUnitId: c, op: a, objects: u, type: T.INSERT } };
+    return Ct([...(S = m.preRedos) != null ? S : [], f, ...m.redos], n) ? (t.pushUndoRedo({
       unitID: g,
       undoMutations: [
         ...(v = m.preUndos) != null ? v : [],
         p,
         ...m.undos,
-        { id: j.id, params: c }
+        { id: j.id, params: d }
       ],
       redoMutations: [
         ...(R = m.preRedos) != null ? R : [],
         f,
         ...m.redos,
-        { id: j.id, params: c }
+        { id: j.id, params: d }
       ]
     }), !0) : !1;
   }
-}, Ht = "COMPONENT_SHEET_DRAWING_PANEL", zt = {
+}, zt = "COMPONENT_SHEET_DRAWING_PANEL", Kt = {
   id: "sidebar.operation.sheet-image",
   type: H.COMMAND,
   handler: async (i, e) => {
-    const r = i.get(rr), t = i.get(We), n = i.get(fe), s = i.get(K);
-    if (!ce(n)) return !1;
+    const n = i.get(ir), t = i.get(Be), r = i.get(fe), s = i.get(K);
+    if (!ce(r)) return !1;
     switch (e.value) {
       case "open":
-        r.open({
+        n.open({
           header: { title: t.t("sheetImage.panel.title") },
-          children: { label: Ht },
+          children: { label: zt },
           onClose: () => {
             s.focusDrawing(null);
           },
@@ -70,20 +70,20 @@ const Or = "sheets-drawing-ui.config", Pr = {}, j = {
         break;
       case "close":
       default:
-        r.close();
+        n.close();
         break;
     }
     return !0;
   }
-}, Kt = {
+}, Jt = {
   id: "sheet.operation.edit-sheet-image",
   type: H.OPERATION,
   handler: (i, e) => {
-    const r = i.get(K), t = i.get(W);
-    return e == null ? !1 : (r.focusDrawing([e]), t.executeCommand(zt.id, { value: "open" }), !0);
+    const n = i.get(K), t = i.get(B);
+    return e == null ? !1 : (n.focusDrawing([e]), t.executeCommand(Kt.id, { value: "open" }), !0);
   }
 };
-var Jt = { exports: {} }, ke = {};
+var Zt = { exports: {} }, Ve = {};
 /**
  * @license React
  * react-jsx-runtime.production.min.js
@@ -93,105 +93,105 @@ var Jt = { exports: {} }, ke = {};
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var Tr = Yt, Er = Symbol.for("react.element"), Ur = Symbol.for("react.fragment"), Ar = Object.prototype.hasOwnProperty, Nr = Tr.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, jr = { key: !0, ref: !0, __self: !0, __source: !0 };
-function Zt(i, e, r) {
-  var t, n = {}, s = null, o = null;
-  r !== void 0 && (s = "" + r), e.key !== void 0 && (s = "" + e.key), e.ref !== void 0 && (o = e.ref);
-  for (t in e) Ar.call(e, t) && !jr.hasOwnProperty(t) && (n[t] = e[t]);
-  if (i && i.defaultProps) for (t in e = i.defaultProps, e) n[t] === void 0 && (n[t] = e[t]);
-  return { $$typeof: Er, type: i, key: s, ref: o, props: n, _owner: Nr.current };
+var Tr = Ft, Er = Symbol.for("react.element"), Ur = Symbol.for("react.fragment"), Ar = Object.prototype.hasOwnProperty, Nr = Tr.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, jr = { key: !0, ref: !0, __self: !0, __source: !0 };
+function qt(i, e, n) {
+  var t, r = {}, s = null, o = null;
+  n !== void 0 && (s = "" + n), e.key !== void 0 && (s = "" + e.key), e.ref !== void 0 && (o = e.ref);
+  for (t in e) Ar.call(e, t) && !jr.hasOwnProperty(t) && (r[t] = e[t]);
+  if (i && i.defaultProps) for (t in e = i.defaultProps, e) r[t] === void 0 && (r[t] = e[t]);
+  return { $$typeof: Er, type: i, key: s, ref: o, props: r, _owner: Nr.current };
 }
-ke.Fragment = Ur;
-ke.jsx = Zt;
-ke.jsxs = Zt;
-Jt.exports = ke;
-var $ = Jt.exports;
-const xr = "univer-upload-loading", Lr = "univer-upload-loading-body", $r = "univer-upload-loading-body-animation", Br = "univer-UniverCircleAnimation", Wr = "univer-upload-loading-body-text", De = {
-  uploadLoading: xr,
-  uploadLoadingBody: Lr,
-  uploadLoadingBodyAnimation: $r,
-  univerCircleAnimation: Br,
-  uploadLoadingBodyText: Wr
+Ve.Fragment = Ur;
+Ve.jsx = qt;
+Ve.jsxs = qt;
+Zt.exports = Ve;
+var L = Zt.exports;
+const $r = "univer-upload-loading", xr = "univer-upload-loading-body", Lr = "univer-upload-loading-body-animation", Wr = "univer-UniverCircleAnimation", Br = "univer-upload-loading-body-text", De = {
+  uploadLoading: $r,
+  uploadLoadingBody: xr,
+  uploadLoadingBodyAnimation: Lr,
+  univerCircleAnimation: Wr,
+  uploadLoadingBodyText: Br
 }, Gr = () => {
-  const i = oe(Dt), e = oe(We), [r, t] = Yt.useState(0);
+  const i = ae(Mt), e = ae(Be), [n, t] = Ft.useState(0);
   return ct(() => {
-    const n = i.change$.subscribe((s) => {
+    const r = i.change$.subscribe((s) => {
       t(s);
     });
     return () => {
-      n.unsubscribe();
+      r.unsubscribe();
     };
-  }, [i]), /* @__PURE__ */ $.jsx("div", { style: { display: r > 0 ? "block" : "none" }, className: De.uploadLoading, children: /* @__PURE__ */ $.jsxs("div", { className: De.uploadLoadingBody, children: [
-    /* @__PURE__ */ $.jsx("div", { className: De.uploadLoadingBodyAnimation }),
-    /* @__PURE__ */ $.jsx("div", { className: De.uploadLoadingBodyText, children: `${e.t("uploadLoading.loading")}: ${r}` })
+  }, [i]), /* @__PURE__ */ L.jsx("div", { style: { display: n > 0 ? "block" : "none" }, className: De.uploadLoading, children: /* @__PURE__ */ L.jsxs("div", { className: De.uploadLoadingBody, children: [
+    /* @__PURE__ */ L.jsx("div", { className: De.uploadLoadingBodyAnimation }),
+    /* @__PURE__ */ L.jsx("div", { className: De.uploadLoadingBodyText, children: `${e.t("uploadLoading.loading")}: ${n}` })
   ] }) });
 };
-var kr = Object.defineProperty, Vr = Object.getOwnPropertyDescriptor, Yr = (i, e, r, t) => {
-  for (var n = t > 1 ? void 0 : t ? Vr(e, r) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (n = (t ? o(e, r, n) : o(n)) || n);
-  return t && n && kr(e, r, n), n;
-}, ie = (i, e) => (r, t) => e(r, t, i);
-let Ue = class extends fn {
-  constructor(e, r, t, n, s, o, c) {
+var Vr = Object.defineProperty, kr = Object.getOwnPropertyDescriptor, Yr = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? kr(e, n) : e, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (r = (t ? o(e, n, r) : o(r)) || r);
+  return t && r && Vr(e, n, r), r;
+}, se = (i, e) => (n, t) => e(n, t, i);
+let Ue = class extends pn {
+  constructor(e, n, t, r, s, o, d) {
     super();
-    k(this, "_initImagePopupMenu", /* @__PURE__ */ new Set());
-    this._injector = e, this._drawingManagerService = r, this._canvasPopManagerService = t, this._renderManagerService = n, this._univerInstanceService = s, this._contextService = o, this._uiPartsService = c, this._init();
+    V(this, "_initImagePopupMenu", /* @__PURE__ */ new Set());
+    this._injector = e, this._drawingManagerService = n, this._canvasPopManagerService = t, this._renderManagerService = r, this._univerInstanceService = s, this._contextService = o, this._uiPartsService = d, this._init();
   }
   _init() {
-    this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET).pipe(vt(this.dispose$)).subscribe((e) => this._create(e)), this._univerInstanceService.getTypeOfUnitDisposed$(Y.UNIVER_SHEET).pipe(vt(this.dispose$)).subscribe((e) => this._dispose(e)), this._univerInstanceService.getAllUnitsForType(Y.UNIVER_SHEET).forEach((e) => this._create(e)), this._uiPartsService.registerComponent(sr.CONTENT, () => pn(Gr, this._injector));
+    this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET).pipe(vt(this.dispose$)).subscribe((e) => this._create(e)), this._univerInstanceService.getTypeOfUnitDisposed$(Y.UNIVER_SHEET).pipe(vt(this.dispose$)).subscribe((e) => this._dispose(e)), this._univerInstanceService.getAllUnitsForType(Y.UNIVER_SHEET).forEach((e) => this._create(e)), this._uiPartsService.registerComponent(or.CONTENT, () => wn(Gr, this._injector));
   }
   _dispose(e) {
-    const r = e.getUnitId();
-    this._renderManagerService.removeRender(r);
+    const n = e.getUnitId();
+    this._renderManagerService.removeRender(n);
   }
   _create(e) {
     if (!e)
       return;
-    const r = e.getUnitId();
-    this._renderManagerService.has(r) && !this._initImagePopupMenu.has(r) && (this._popupMenuListener(r), this._initImagePopupMenu.add(r));
+    const n = e.getUnitId();
+    this._renderManagerService.has(n) && !this._initImagePopupMenu.has(n) && (this._popupMenuListener(n), this._initImagePopupMenu.add(n));
   }
   _hasCropObject(e) {
-    const r = e.getAllObjectsByOrder();
-    for (const t of r)
+    const n = e.getAllObjectsByOrder();
+    for (const t of n)
       if (t instanceof Ln)
         return !0;
     return !1;
   }
   _popupMenuListener(e) {
     var s;
-    const r = (s = this._renderManagerService.getRenderById(e)) == null ? void 0 : s.scene;
-    if (!r)
+    const n = (s = this._renderManagerService.getRenderById(e)) == null ? void 0 : s.scene;
+    if (!n)
       return;
-    const t = r.getTransformerByCreate();
+    const t = n.getTransformerByCreate();
     if (!t)
       return;
-    let n;
+    let r;
     this.disposeWithMe(
-      wn(
+      _n(
         t.createControl$.subscribe(() => {
-          if (this._contextService.setContextValue(me, !0), this._hasCropObject(r))
+          if (this._contextService.setContextValue(me, !0), this._hasCropObject(n))
             return;
           const o = t.getSelectedObjectMap();
           if (o.size > 1) {
-            n == null || n.dispose();
+            r == null || r.dispose();
             return;
           }
-          const c = o.values().next().value;
-          if (!c)
+          const d = o.values().next().value;
+          if (!d)
             return;
-          const l = c.oKey, g = this._drawingManagerService.getDrawingOKey(l);
+          const l = d.oKey, g = this._drawingManagerService.getDrawingOKey(l);
           if (!g)
             return;
-          const { unitId: d, subUnitId: a, drawingId: h, drawingType: u } = g, m = g.data;
-          m && m.disablePopup || (n == null || n.dispose(), n = this.disposeWithMe(this._canvasPopManagerService.attachPopupToObject(c, {
-            componentKey: $n,
+          const { unitId: c, subUnitId: a, drawingId: h, drawingType: u } = g, m = g.data;
+          m && m.disablePopup || (r == null || r.dispose(), r = this.disposeWithMe(this._canvasPopManagerService.attachPopupToObject(d, {
+            componentKey: Wn,
             direction: "horizontal",
             offset: [2, 0],
             extraProps: {
-              menuItems: this._getImageMenuItems(d, a, h, u)
+              menuItems: this._getImageMenuItems(c, a, h, u)
             }
           })), this._drawingManagerService.focusDrawing([{
-            unitId: d,
+            unitId: c,
             subUnitId: a,
             drawingId: h
           }]));
@@ -199,60 +199,60 @@ let Ue = class extends fn {
       )
     ), this.disposeWithMe(
       t.clearControl$.subscribe(() => {
-        n == null || n.dispose(), this._contextService.setContextValue(me, !1), this._drawingManagerService.focusDrawing(null);
+        r == null || r.dispose(), this._contextService.setContextValue(me, !1), this._drawingManagerService.focusDrawing(null);
       })
     ), this.disposeWithMe(
       t.changing$.subscribe(() => {
-        n == null || n.dispose();
+        r == null || r.dispose();
       })
     );
   }
-  _getImageMenuItems(e, r, t, n) {
+  _getImageMenuItems(e, n, t, r) {
     return [
       {
         label: "image-popup.edit",
         index: 0,
-        commandId: Kt.id,
-        commandParams: { unitId: e, subUnitId: r, drawingId: t },
-        disable: n === V.DRAWING_DOM
+        commandId: Jt.id,
+        commandParams: { unitId: e, subUnitId: n, drawingId: t },
+        disable: r === k.DRAWING_DOM
       },
       {
         label: "image-popup.delete",
         index: 1,
         commandId: Ge.id,
-        commandParams: { unitId: e, drawings: [{ unitId: e, subUnitId: r, drawingId: t }] },
+        commandParams: { unitId: e, drawings: [{ unitId: e, subUnitId: n, drawingId: t }] },
         disable: !1
       },
       {
         label: "image-popup.crop",
         index: 2,
         commandId: Bn.id,
-        commandParams: { unitId: e, subUnitId: r, drawingId: t },
-        disable: n === V.DRAWING_DOM
+        commandParams: { unitId: e, subUnitId: n, drawingId: t },
+        disable: r === k.DRAWING_DOM
       },
       {
         label: "image-popup.reset",
         index: 3,
-        commandId: Wn.id,
-        commandParams: [{ unitId: e, subUnitId: r, drawingId: t }],
-        disable: n === V.DRAWING_DOM
+        commandId: Gn.id,
+        commandParams: [{ unitId: e, subUnitId: n, drawingId: t }],
+        disable: r === k.DRAWING_DOM
       }
     ];
   }
 };
 Ue = Yr([
-  ie(0, x(Ct)),
-  ie(1, K),
-  ie(2, x(Jn)),
-  ie(3, J),
-  ie(4, fe),
-  ie(5, Rt),
-  ie(6, x(ir))
+  se(0, $(Rt)),
+  se(1, K),
+  se(2, $(Zn)),
+  se(3, J),
+  se(4, fe),
+  se(5, Dt),
+  se(6, $(sr))
 ], Ue);
-function B(i, e, r) {
-  const { from: t, to: n, flipY: s = !1, flipX: o = !1, angle: c = 0, skewX: l = 0, skewY: g = 0 } = i, { column: d, columnOffset: a, row: h, rowOffset: u } = t, { column: m, columnOffset: f, row: p, rowOffset: I } = n, S = r.getCurrentSkeleton(), v = Te(S, {
-    startColumn: d,
-    endColumn: d,
+function W(i, e, n) {
+  const { from: t, to: r, flipY: s = !1, flipX: o = !1, angle: d = 0, skewX: l = 0, skewY: g = 0 } = i, { column: c, columnOffset: a, row: h, rowOffset: u } = t, { column: m, columnOffset: f, row: p, rowOffset: I } = r, S = n.getCurrentSkeleton(), v = Te(S, {
+    startColumn: c,
+    endColumn: c,
     startRow: h,
     endRow: h
   });
@@ -273,7 +273,7 @@ function B(i, e, r) {
   return b + E > D && (b = D - E), A + M > U && (A = U - M), {
     flipY: s,
     flipX: o,
-    angle: c,
+    angle: d,
     skewX: l,
     skewY: g,
     left: b,
@@ -283,41 +283,41 @@ function B(i, e, r) {
   };
 }
 function N(i, e) {
-  const { left: r = 0, top: t = 0, width: n = 0, height: s = 0, flipY: o = !1, flipX: c = !1, angle: l = 0, skewX: g = 0, skewY: d = 0 } = i, a = e.getSelectionCellByPosition(r, t);
+  const { left: n = 0, top: t = 0, width: r = 0, height: s = 0, flipY: o = !1, flipX: d = !1, angle: l = 0, skewX: g = 0, skewY: c = 0 } = i, a = e.getSelectionCellByPosition(n, t);
   if (a == null)
     return;
   const h = {
     column: a.actualColumn,
-    columnOffset: ne(r - a.startX, 1),
+    columnOffset: ne(n - a.startX, 1),
     row: a.actualRow,
     rowOffset: ne(t - a.startY, 1)
-  }, u = e.getSelectionCellByPosition(r + n, t + s);
+  }, u = e.getSelectionCellByPosition(n + r, t + s);
   if (u == null)
     return;
   const m = {
     column: u.actualColumn,
-    columnOffset: ne(r + n - u.startX, 1),
+    columnOffset: ne(n + r - u.startX, 1),
     row: u.actualRow,
     rowOffset: ne(t + s - u.startY, 1)
   };
   return {
     flipY: o,
-    flipX: c,
+    flipX: d,
     angle: l,
     skewX: g,
-    skewY: d,
+    skewY: c,
     from: h,
     to: m
   };
 }
-var Fr = Object.defineProperty, Xr = Object.getOwnPropertyDescriptor, Hr = (i, e, r, t) => {
-  for (var n = t > 1 ? void 0 : t ? Xr(e, r) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (n = (t ? o(e, r, n) : o(n)) || n);
-  return t && n && Fr(e, r, n), n;
-}, Me = (i, e) => (r, t) => e(r, t, i);
-let st = class extends re {
-  constructor(i, e, r, t, n) {
-    super(), this._context = i, this._sheetDrawingService = e, this._drawingManagerService = r, this._sheetSelectionRenderService = t, this._sheetSkeletonManagerService = n, this._init();
+var Fr = Object.defineProperty, Xr = Object.getOwnPropertyDescriptor, Hr = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? Xr(e, n) : e, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (r = (t ? o(e, n, r) : o(r)) || r);
+  return t && r && Fr(e, n, r), r;
+}, Me = (i, e) => (n, t) => e(n, t, i);
+let st = class extends ie {
+  constructor(i, e, n, t, r) {
+    super(), this._context = i, this._sheetDrawingService = e, this._drawingManagerService = n, this._sheetSelectionRenderService = t, this._sheetSkeletonManagerService = r, this._init();
   }
   _init() {
     this._drawingInitializeListener();
@@ -326,10 +326,10 @@ let st = class extends re {
     this._sheetDrawingService.initializeNotification(this._context.unitId);
     const i = this._sheetDrawingService.getDrawingDataForUnit(this._context.unitId);
     for (const e in i) {
-      const r = i[e];
-      for (const t in r.data) {
-        const n = r.data[t];
-        n.transform = B(n.sheetTransform, this._sheetSelectionRenderService, this._sheetSkeletonManagerService);
+      const n = i[e];
+      for (const t in n.data) {
+        const r = n.data[t];
+        r.transform = W(r.sheetTransform, this._sheetSelectionRenderService, this._sheetSkeletonManagerService);
       }
     }
     this._drawingManagerService.registerDrawingData(this._context.unitId, this._sheetDrawingService.getDrawingDataForUnit(this._context.unitId)), this._drawingManagerService.initializeNotification(this._context.unitId);
@@ -338,86 +338,86 @@ let st = class extends re {
 st = Hr([
   Me(1, F),
   Me(2, K),
-  Me(3, x(pe)),
-  Me(4, x(q))
+  Me(3, $(pe)),
+  Me(4, $(q))
 ], st);
 var X = function() {
   return X = Object.assign || function(i) {
-    for (var e, r = 1, t = arguments.length; r < t; r++) {
-      e = arguments[r];
-      for (var n in e) Object.prototype.hasOwnProperty.call(e, n) && (i[n] = e[n]);
+    for (var e, n = 1, t = arguments.length; n < t; n++) {
+      e = arguments[n];
+      for (var r in e) Object.prototype.hasOwnProperty.call(e, r) && (i[r] = e[r]);
     }
     return i;
   }, X.apply(this, arguments);
 }, zr = function(i, e) {
-  var r = {};
-  for (var t in i) Object.prototype.hasOwnProperty.call(i, t) && e.indexOf(t) < 0 && (r[t] = i[t]);
+  var n = {};
+  for (var t in i) Object.prototype.hasOwnProperty.call(i, t) && e.indexOf(t) < 0 && (n[t] = i[t]);
   if (i != null && typeof Object.getOwnPropertySymbols == "function")
-    for (var n = 0, t = Object.getOwnPropertySymbols(i); n < t.length; n++)
-      e.indexOf(t[n]) < 0 && Object.prototype.propertyIsEnumerable.call(i, t[n]) && (r[t[n]] = i[t[n]]);
-  return r;
-}, qt = Ft(function(i, e) {
-  var r = i.icon, t = i.id, n = i.className, s = i.extend, o = zr(i, ["icon", "id", "className", "extend"]), c = "univerjs-icon univerjs-icon-".concat(t, " ").concat(n || "").trim(), l = br("_".concat(Zr()));
-  return Qt(r, "".concat(t), { defIds: r.defIds, idSuffix: l.current }, X({ ref: e, className: c }, o), s);
+    for (var r = 0, t = Object.getOwnPropertySymbols(i); r < t.length; r++)
+      e.indexOf(t[r]) < 0 && Object.prototype.propertyIsEnumerable.call(i, t[r]) && (n[t[r]] = i[t[r]]);
+  return n;
+}, Qt = Xt(function(i, e) {
+  var n = i.icon, t = i.id, r = i.className, s = i.extend, o = zr(i, ["icon", "id", "className", "extend"]), d = "univerjs-icon univerjs-icon-".concat(t, " ").concat(r || "").trim(), l = br("_".concat(Zr()));
+  return en(n, "".concat(t), { defIds: n.defIds, idSuffix: l.current }, X({ ref: e, className: d }, o), s);
 });
-function Qt(i, e, r, t, n) {
-  return Xt(i.tag, X(X({ key: e }, Kr(i, r, n)), t), (Jr(i, r).children || []).map(function(s, o) {
-    return Qt(s, "".concat(e, "-").concat(i.tag, "-").concat(o), r, void 0, n);
+function en(i, e, n, t, r) {
+  return Ht(i.tag, X(X({ key: e }, Kr(i, n, r)), t), (Jr(i, n).children || []).map(function(s, o) {
+    return en(s, "".concat(e, "-").concat(i.tag, "-").concat(o), n, void 0, r);
   }));
 }
-function Kr(i, e, r) {
+function Kr(i, e, n) {
   var t = X({}, i.attrs);
-  r != null && r.colorChannel1 && t.fill === "colorChannel1" && (t.fill = r.colorChannel1);
-  var n = e.defIds;
-  return !n || n.length === 0 || (i.tag === "use" && t["xlink:href"] && (t["xlink:href"] = t["xlink:href"] + e.idSuffix), Object.entries(t).forEach(function(s) {
-    var o = s[0], c = s[1];
-    typeof c == "string" && (t[o] = c.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+  n != null && n.colorChannel1 && t.fill === "colorChannel1" && (t.fill = n.colorChannel1);
+  var r = e.defIds;
+  return !r || r.length === 0 || (i.tag === "use" && t["xlink:href"] && (t["xlink:href"] = t["xlink:href"] + e.idSuffix), Object.entries(t).forEach(function(s) {
+    var o = s[0], d = s[1];
+    typeof d == "string" && (t[o] = d.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), t;
 }
 function Jr(i, e) {
-  var r, t = e.defIds;
-  return !t || t.length === 0 ? i : i.tag === "defs" && (!((r = i.children) === null || r === void 0) && r.length) ? X(X({}, i), { children: i.children.map(function(n) {
-    return typeof n.attrs.id == "string" && t && t.indexOf(n.attrs.id) > -1 ? X(X({}, n), { attrs: X(X({}, n.attrs), { id: n.attrs.id + e.idSuffix }) }) : n;
+  var n, t = e.defIds;
+  return !t || t.length === 0 ? i : i.tag === "defs" && (!((n = i.children) === null || n === void 0) && n.length) ? X(X({}, i), { children: i.children.map(function(r) {
+    return typeof r.attrs.id == "string" && t && t.indexOf(r.attrs.id) > -1 ? X(X({}, r), { attrs: X(X({}, r.attrs), { id: r.attrs.id + e.idSuffix }) }) : r;
   }) }) : i;
 }
 function Zr() {
   return Math.random().toString(36).substring(2, 8);
 }
-qt.displayName = "UniverIcon";
-var qr = { 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" } }] }, en = Ft(function(i, e) {
-  return Xt(qt, Object.assign({}, i, {
+Qt.displayName = "UniverIcon";
+var qr = { 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" } }] }, tn = Xt(function(i, e) {
+  return Ht(Qt, Object.assign({}, i, {
     id: "add-image-single",
     ref: e,
     icon: qr
   }));
 });
-en.displayName = "AddImageSingle";
-const tn = {
+tn.displayName = "AddImageSingle";
+const nn = {
   id: "sheet.command.delete-drawing",
   type: H.COMMAND,
   handler: (i) => {
-    const e = i.get(W), t = i.get(F).getFocusDrawings();
+    const e = i.get(B), t = i.get(F).getFocusDrawings();
     if (t.length === 0)
       return !1;
-    const n = t[0].unitId, s = t.map((o) => {
-      const { unitId: c, subUnitId: l, drawingId: g, drawingType: d } = o;
+    const r = t[0].unitId, s = t.map((o) => {
+      const { unitId: d, subUnitId: l, drawingId: g, drawingType: c } = o;
       return {
-        unitId: c,
+        unitId: d,
         subUnitId: l,
         drawingId: g,
-        drawingType: d
+        drawingType: c
       };
     });
     return e.executeCommand(Ge.id, {
-      unitId: n,
+      unitId: r,
       drawings: s
     });
   }
 };
 function Qr(i) {
   const e = [];
-  return i.forEach((r) => {
-    const { parent: t, children: n } = r, { unitId: s, subUnitId: o, drawingId: c } = t, l = Yn(0, 0, n.map((a) => a.transform || {})), g = n.map((a) => {
+  return i.forEach((n) => {
+    const { parent: t, children: r } = n, { unitId: s, subUnitId: o, drawingId: d } = t, l = Fn(0, 0, r.map((a) => a.transform || {})), g = r.map((a) => {
       const h = a.transform || { left: 0, top: 0 }, { unitId: u, subUnitId: m, drawingId: f } = a;
       return {
         unitId: u,
@@ -428,29 +428,29 @@ function Qr(i) {
           left: h.left - l.left,
           top: h.top - l.top
         },
-        groupId: c
+        groupId: d
       };
-    }), d = {
+    }), c = {
       unitId: s,
       subUnitId: o,
-      drawingId: c,
-      drawingType: V.DRAWING_GROUP,
+      drawingId: d,
+      drawingType: k.DRAWING_GROUP,
       transform: l
     };
     e.push({
-      parent: d,
+      parent: c,
       children: g
     });
   }), e;
 }
 function ei(i) {
   const e = [];
-  return i.forEach((r) => {
-    const { parent: t, children: n } = r, { unitId: s, subUnitId: o, drawingId: c, transform: l = { width: 0, height: 0 } } = t;
+  return i.forEach((n) => {
+    const { parent: t, children: r } = n, { unitId: s, subUnitId: o, drawingId: d, transform: l = { width: 0, height: 0 } } = t;
     if (l == null)
       return;
-    const g = n.map((a) => {
-      const { transform: h } = a, { unitId: u, subUnitId: m, drawingId: f } = a, p = Fn(h || {}, l, l.width || 0, l.height || 0);
+    const g = r.map((a) => {
+      const { transform: h } = a, { unitId: u, subUnitId: m, drawingId: f } = a, p = Xn(h || {}, l, l.width || 0, l.height || 0);
       return {
         unitId: u,
         subUnitId: m,
@@ -458,27 +458,27 @@ function ei(i) {
         transform: p,
         groupId: void 0
       };
-    }), d = {
+    }), c = {
       unitId: s,
       subUnitId: o,
-      drawingId: c,
-      drawingType: V.DRAWING_GROUP,
+      drawingId: d,
+      drawingType: k.DRAWING_GROUP,
       transform: {
         left: 0,
         top: 0
       }
     };
     e.push({
-      parent: d,
+      parent: c,
       children: g
     });
   }), e;
 }
-const nn = {
+const rn = {
   id: "sheet.command.group-sheet-image",
   type: H.COMMAND,
   handler: (i, e) => {
-    const r = i.get(W), t = i.get(ue), n = i.get(F);
+    const n = i.get(B), t = i.get(ue), r = i.get(F);
     if (!e) return !1;
     const s = [];
     e.forEach(({ parent: u, children: m }) => {
@@ -486,55 +486,55 @@ const nn = {
         s.push(f.unitId);
       });
     });
-    const o = n.getGroupDrawingOp(e), { unitId: c, subUnitId: l, undo: g, redo: d, objects: a } = o;
-    return r.syncExecuteCommand(P.id, { op: d, unitId: c, subUnitId: l, objects: a, type: T.GROUP }) ? (t.pushUndoRedo({
-      unitID: c,
+    const o = r.getGroupDrawingOp(e), { unitId: d, subUnitId: l, undo: g, redo: c, objects: a } = o;
+    return n.syncExecuteCommand(P.id, { op: c, unitId: d, subUnitId: l, objects: a, type: T.GROUP }) ? (t.pushUndoRedo({
+      unitID: d,
       undoMutations: [
-        { id: P.id, params: { op: g, unitId: c, subUnitId: l, objects: ei(a), type: T.UNGROUP } },
+        { id: P.id, params: { op: g, unitId: d, subUnitId: l, objects: ei(a), type: T.UNGROUP } },
         { id: j.id, params: s }
       ],
       redoMutations: [
-        { id: P.id, params: { op: d, unitId: c, subUnitId: l, objects: a, type: T.GROUP } },
+        { id: P.id, params: { op: c, unitId: d, subUnitId: l, objects: a, type: T.GROUP } },
         { id: j.id, params: s }
       ]
     }), !0) : !1;
   }
-}, Ve = {
+}, ke = {
   id: "sheet.command.insert-sheet-image",
   type: H.COMMAND,
   handler: (i, e) => {
     var S, v, R;
-    const r = i.get(W), t = i.get(ue), n = i.get(F), s = i.get(at);
+    const n = i.get(B), t = i.get(ue), r = i.get(F), s = i.get(at);
     if (!e) return !1;
-    const o = e.drawings, c = o.map((_) => _.unitId), l = n.getBatchAddOp(o), { unitId: g, subUnitId: d, undo: a, redo: h, objects: u } = l, m = s.onCommandExecute({ id: Ve.id, params: e }), f = { id: P.id, params: { op: h, unitId: g, subUnitId: d, objects: u, type: T.INSERT } }, p = { id: P.id, params: { op: a, unitId: g, subUnitId: d, objects: u, type: T.REMOVE } };
-    return It([...(S = m.preRedos) != null ? S : [], f, ...m.redos], r) ? (t.pushUndoRedo({
+    const o = e.drawings, d = o.map((_) => _.unitId), l = r.getBatchAddOp(o), { unitId: g, subUnitId: c, undo: a, redo: h, objects: u } = l, m = s.onCommandExecute({ id: ke.id, params: e }), f = { id: P.id, params: { op: h, unitId: g, subUnitId: c, objects: u, type: T.INSERT } }, p = { id: P.id, params: { op: a, unitId: g, subUnitId: c, objects: u, type: T.REMOVE } };
+    return Ct([...(S = m.preRedos) != null ? S : [], f, ...m.redos], n) ? (t.pushUndoRedo({
       unitID: g,
       undoMutations: [
         ...(v = m.preUndos) != null ? v : [],
         p,
         ...m.undos,
-        { id: j.id, params: c }
+        { id: j.id, params: d }
       ],
       redoMutations: [
         ...(R = m.preRedos) != null ? R : [],
         f,
         ...m.redos,
-        { id: j.id, params: c }
+        { id: j.id, params: d }
       ]
     }), !0) : !1;
   }
-}, rn = {
+}, sn = {
   id: "sheet.command.set-drawing-arrange",
   type: H.COMMAND,
   handler: (i, e) => {
-    const r = i.get(W), t = i.get(ue);
+    const n = i.get(B), t = i.get(ue);
     if (!e) return !1;
-    const n = i.get(F), { unitId: s, subUnitId: o, drawingIds: c, arrangeType: l } = e, g = { unitId: s, subUnitId: o, drawingIds: c };
-    let d;
-    if (l === ve.forward ? d = n.getForwardDrawingsOp(g) : l === ve.backward ? d = n.getBackwardDrawingOp(g) : l === ve.front ? d = n.getFrontDrawingsOp(g) : l === ve.back && (d = n.getBackDrawingsOp(g)), d == null)
+    const r = i.get(F), { unitId: s, subUnitId: o, drawingIds: d, arrangeType: l } = e, g = { unitId: s, subUnitId: o, drawingIds: d };
+    let c;
+    if (l === ve.forward ? c = r.getForwardDrawingsOp(g) : l === ve.backward ? c = r.getBackwardDrawingOp(g) : l === ve.front ? c = r.getFrontDrawingsOp(g) : l === ve.back && (c = r.getBackDrawingsOp(g)), c == null)
       return !1;
-    const { objects: a, redo: h, undo: u } = d;
-    return r.syncExecuteCommand(P.id, { op: h, unitId: s, subUnitId: o, objects: a, type: T.ARRANGE }) ? (t.pushUndoRedo({
+    const { objects: a, redo: h, undo: u } = c;
+    return n.syncExecuteCommand(P.id, { op: h, unitId: s, subUnitId: o, objects: a, type: T.ARRANGE }) ? (t.pushUndoRedo({
       unitID: s,
       undoMutations: [
         { id: P.id, params: { op: u, unitId: s, subUnitId: o, objects: a, type: T.ARRANGE } }
@@ -548,26 +548,26 @@ const nn = {
   id: "sheet.command.set-sheet-image",
   type: H.COMMAND,
   handler: (i, e) => {
-    const r = i.get(W), t = i.get(ue), n = i.get(F);
+    const n = i.get(B), t = i.get(ue), r = i.get(F);
     if (!e) return !1;
-    const { drawings: s } = e, o = n.getBatchUpdateOp(s), { unitId: c, subUnitId: l, undo: g, redo: d, objects: a } = o;
-    return r.syncExecuteCommand(P.id, { unitId: c, subUnitId: l, op: d, objects: a, type: T.UPDATE }) ? (t.pushUndoRedo({
-      unitID: c,
+    const { drawings: s } = e, o = r.getBatchUpdateOp(s), { unitId: d, subUnitId: l, undo: g, redo: c, objects: a } = o;
+    return n.syncExecuteCommand(P.id, { unitId: d, subUnitId: l, op: c, objects: a, type: T.UPDATE }) ? (t.pushUndoRedo({
+      unitID: d,
       undoMutations: [
-        { id: P.id, params: { unitId: c, subUnitId: l, op: g, objects: a, type: T.UPDATE } },
-        { id: j.id, params: [c] }
+        { id: P.id, params: { unitId: d, subUnitId: l, op: g, objects: a, type: T.UPDATE } },
+        { id: j.id, params: [d] }
       ],
       redoMutations: [
-        { id: P.id, params: { unitId: c, subUnitId: l, op: d, objects: a, type: T.UPDATE } },
-        { id: j.id, params: [c] }
+        { id: P.id, params: { unitId: d, subUnitId: l, op: c, objects: a, type: T.UPDATE } },
+        { id: j.id, params: [d] }
       ]
     }), !0) : !1;
   }
-}, sn = {
+}, on = {
   id: "sheet.command.ungroup-sheet-image",
   type: H.COMMAND,
   handler: (i, e) => {
-    const r = i.get(W), t = i.get(ue), n = i.get(F);
+    const n = i.get(B), t = i.get(ue), r = i.get(F);
     if (!e) return !1;
     const s = [];
     e.forEach(({ parent: u, children: m }) => {
@@ -575,50 +575,50 @@ const nn = {
         s.push(f.unitId);
       });
     });
-    const o = n.getUngroupDrawingOp(e), { unitId: c, subUnitId: l, undo: g, redo: d, objects: a } = o;
-    return r.syncExecuteCommand(P.id, { op: d, unitId: c, subUnitId: l, objects: a, type: T.UNGROUP }) ? (t.pushUndoRedo({
-      unitID: c,
+    const o = r.getUngroupDrawingOp(e), { unitId: d, subUnitId: l, undo: g, redo: c, objects: a } = o;
+    return n.syncExecuteCommand(P.id, { op: c, unitId: d, subUnitId: l, objects: a, type: T.UNGROUP }) ? (t.pushUndoRedo({
+      unitID: d,
       undoMutations: [
-        { id: P.id, params: { op: g, unitId: c, subUnitId: l, objects: Qr(a), type: T.GROUP } },
+        { id: P.id, params: { op: g, unitId: d, subUnitId: l, objects: Qr(a), type: T.GROUP } },
         { id: j.id, params: s }
       ],
       redoMutations: [
-        { id: P.id, params: { op: d, unitId: c, subUnitId: l, objects: a, type: T.UNGROUP } },
+        { id: P.id, params: { op: c, unitId: d, subUnitId: l, objects: a, type: T.UNGROUP } },
         { id: j.id, params: s }
       ]
     }), !0) : !1;
   }
 };
-var ti = Object.defineProperty, ni = Object.getOwnPropertyDescriptor, ri = (i, e, r, t) => {
-  for (var n = t > 1 ? void 0 : t ? ni(e, r) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (n = (t ? o(e, r, n) : o(n)) || n);
-  return t && n && ti(e, r, n), n;
-}, z = (i, e) => (r, t) => e(r, t, i);
-let Ae = class extends re {
-  constructor(e, r, t, n, s, o, c, l, g, d, a, h) {
+var ti = Object.defineProperty, ni = Object.getOwnPropertyDescriptor, ri = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? ni(e, n) : e, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (r = (t ? o(e, n, r) : o(r)) || r);
+  return t && r && ti(e, n, r), r;
+}, z = (i, e) => (n, t) => e(n, t, i);
+let Ae = class extends ie {
+  constructor(e, n, t, r, s, o, d, l, g, c, a, h) {
     super();
-    k(this, "_workbookSelections");
-    this._context = e, this._skeletonManagerService = r, this._commandService = t, this._selectionRenderService = n, this._imageIoService = s, this._fileOpenerService = o, this._sheetDrawingService = c, this._drawingManagerService = l, this._contextService = g, this._messageService = d, this._localeService = a, this._workbookSelections = h.getWorkbookSelections(this._context.unitId), this._updateImageListener(), this._updateOrderListener(), this._groupDrawingListener(), this._focusDrawingListener();
+    V(this, "_workbookSelections");
+    this._context = e, this._skeletonManagerService = n, this._commandService = t, this._selectionRenderService = r, this._imageIoService = s, this._fileOpenerService = o, this._sheetDrawingService = d, this._drawingManagerService = l, this._contextService = g, this._messageService = c, this._localeService = a, this._workbookSelections = h.getWorkbookSelections(this._context.unitId), this._updateImageListener(), this._updateOrderListener(), this._groupDrawingListener(), this._focusDrawingListener();
   }
   async insertFloatImage() {
     const e = await this._fileOpenerService.openFile({
       multiple: !0,
-      accept: An.map((t) => `.${t.replace("image/", "")}`).join(",")
-    }), r = e.length;
-    return r > mt ? (this._messageService.show({
+      accept: Nn.map((t) => `.${t.replace("image/", "")}`).join(",")
+    }), n = e.length;
+    return n > mt ? (this._messageService.show({
       type: Re.Error,
       content: this._localeService.t("update-status.exceedMaxCount", String(mt))
-    }), !1) : r === 0 ? !1 : (e.forEach(async (t) => await this._insertFloatImage(t)), !0);
+    }), !1) : n === 0 ? !1 : (e.forEach(async (t) => await this._insertFloatImage(t)), !0);
   }
   async _insertFloatImage(e) {
-    let r;
+    let n;
     try {
-      r = await this._imageIoService.saveImage(e);
+      n = await this._imageIoService.saveImage(e);
     } catch (S) {
       const v = S.message;
       v === He.ERROR_EXCEED_SIZE ? this._messageService.show({
         type: Re.Error,
-        content: this._localeService.t("update-status.exceedMaxSize", String(Nn / (1024 * 1024)))
+        content: this._localeService.t("update-status.exceedMaxSize", String(jn / (1024 * 1024)))
       }) : v === He.ERROR_IMAGE_TYPE ? this._messageService.show({
         type: Re.Error,
         content: this._localeService.t("update-status.invalidImageType")
@@ -627,41 +627,41 @@ let Ae = class extends re {
         content: this._localeService.t("update-status.invalidImage")
       });
     }
-    if (r == null)
+    if (n == null)
       return;
-    const t = this._getUnitInfo(), { unitId: n, subUnitId: s } = t, { imageId: o, imageSourceType: c, source: l, base64Cache: g } = r, { width: d, height: a, image: h } = await jn(g || ""), { width: u, height: m } = this._context.scene;
-    this._imageIoService.addImageSourceCache(l, c, h);
+    const t = this._getUnitInfo(), { unitId: r, subUnitId: s } = t, { imageId: o, imageSourceType: d, source: l, base64Cache: g } = n, { width: c, height: a, image: h } = await $n(g || ""), { width: u, height: m } = this._context.scene;
+    this._imageIoService.addImageSourceCache(l, d, h);
     let f = 1;
-    if (d > ft || a > pt) {
-      const S = ft / d, v = pt / a;
+    if (c > ft || a > pt) {
+      const S = ft / c, v = pt / a;
       f = Math.max(S, v);
     }
-    const p = this._getImagePosition(d * f, a * f, u, m);
+    const p = this._getImagePosition(c * f, a * f, u, m);
     if (p == null)
       return;
     const I = {
-      unitId: n,
+      unitId: r,
       subUnitId: s,
       drawingId: o,
-      drawingType: V.DRAWING_IMAGE,
-      imageSourceType: c,
+      drawingType: k.DRAWING_IMAGE,
+      imageSourceType: d,
       source: l,
-      transform: B(p, this._selectionRenderService, this._skeletonManagerService),
+      transform: W(p, this._selectionRenderService, this._skeletonManagerService),
       sheetTransform: p
     };
-    this._commandService.executeCommand(Ve.id, {
-      unitId: n,
+    this._commandService.executeCommand(ke.id, {
+      unitId: r,
       drawings: [I]
     });
   }
   _getUnitInfo() {
-    const e = this._context.unit, r = e.getActiveSheet(), t = e.getUnitId(), n = r.getSheetId();
+    const e = this._context.unit, n = e.getActiveSheet(), t = e.getUnitId(), r = n.getSheetId();
     return {
       unitId: t,
-      subUnitId: n
+      subUnitId: r
     };
   }
-  _getImagePosition(e, r, t, n) {
+  _getImagePosition(e, n, t, r) {
     const s = this._workbookSelections.getCurrentSelections();
     let o = {
       startRow: 0,
@@ -670,29 +670,29 @@ let Ae = class extends re {
       endColumn: 0
     };
     s && s.length > 0 && (o = s[s.length - 1].range);
-    const c = Te(this._skeletonManagerService.getCurrent().skeleton, o);
-    if (c == null)
+    const d = Te(this._skeletonManagerService.getCurrent().skeleton, o);
+    if (d == null)
       return;
-    let { startColumn: l, startRow: g, startX: d, startY: a } = c, h = !1;
-    if (d + e > t && (d = t - e, d < 0 && (d = 0, e = t), h = !0), a + r > n && (a = n - r, a < 0 && (a = 0, r = n), h = !0), h) {
-      const p = this._selectionRenderService.getSelectionCellByPosition(d, a);
+    let { startColumn: l, startRow: g, startX: c, startY: a } = d, h = !1;
+    if (c + e > t && (c = t - e, c < 0 && (c = 0, e = t), h = !0), a + n > r && (a = r - n, a < 0 && (a = 0, n = r), h = !0), h) {
+      const p = this._selectionRenderService.getSelectionCellByPosition(c, a);
       if (p == null)
         return;
-      d = p.startX, a = p.startY, l = p.actualColumn, g = p.actualRow;
+      c = p.startX, a = p.startY, l = p.actualColumn, g = p.actualRow;
     }
     const u = {
       column: l,
       columnOffset: 0,
       row: g,
       rowOffset: 0
-    }, m = this._selectionRenderService.getSelectionCellByPosition(d + e, a + r);
+    }, m = this._selectionRenderService.getSelectionCellByPosition(c + e, a + n);
     if (m == null)
       return;
     const f = {
       column: m.actualColumn,
-      columnOffset: d + e - m.startX,
+      columnOffset: c + e - m.startX,
       row: m.actualRow,
-      rowOffset: a + r - m.startY
+      rowOffset: a + n - m.startY
     };
     return {
       from: u,
@@ -700,49 +700,49 @@ let Ae = class extends re {
     };
   }
   _updateOrderListener() {
-    this._drawingManagerService.featurePluginOrderUpdate$.subscribe((e) => {
-      const { unitId: r, subUnitId: t, drawingIds: n, arrangeType: s } = e;
-      this._commandService.executeCommand(rn.id, {
-        unitId: r,
+    this.disposeWithMe(this._drawingManagerService.featurePluginOrderUpdate$.subscribe((e) => {
+      const { unitId: n, subUnitId: t, drawingIds: r, arrangeType: s } = e;
+      this._commandService.executeCommand(sn.id, {
+        unitId: n,
         subUnitId: t,
-        drawingIds: n,
+        drawingIds: r,
         arrangeType: s
       });
-    });
+    }));
   }
   _updateImageListener() {
-    this._drawingManagerService.featurePluginUpdate$.subscribe((e) => {
-      const r = [];
+    this.disposeWithMe(this._drawingManagerService.featurePluginUpdate$.subscribe((e) => {
+      const n = [];
       e.length !== 0 && (e.forEach((t) => {
-        const { unitId: n, subUnitId: s, drawingId: o, drawingType: c, transform: l } = t;
+        const { unitId: r, subUnitId: s, drawingId: o, drawingType: d, transform: l } = t;
         if (l == null)
           return;
-        const g = this._sheetDrawingService.getDrawingByParam({ unitId: n, subUnitId: s, drawingId: o });
+        const g = this._sheetDrawingService.getDrawingByParam({ unitId: r, subUnitId: s, drawingId: o });
         if (g == null || g.unitId !== this._context.unitId)
           return;
-        const d = N({ ...g.transform, ...l }, this._selectionRenderService);
-        if (d == null)
+        const c = N({ ...g.transform, ...l }, this._selectionRenderService);
+        if (c == null)
           return;
         const a = {
           ...t,
-          transform: { ...g.transform, ...l, ...B(d, this._selectionRenderService, this._skeletonManagerService) },
-          sheetTransform: { ...d }
+          transform: { ...g.transform, ...l, ...W(c, this._selectionRenderService, this._skeletonManagerService) },
+          sheetTransform: { ...c }
         };
-        r.push(a);
-      }), r.length > 0 && this._commandService.executeCommand(Ye.id, {
+        n.push(a);
+      }), n.length > 0 && this._commandService.executeCommand(Ye.id, {
         unitId: e[0].unitId,
-        drawings: r
+        drawings: n
       }));
-    });
+    }));
   }
   _groupDrawingListener() {
-    this._drawingManagerService.featurePluginGroupUpdate$.subscribe((e) => {
-      this._commandService.executeCommand(nn.id, e);
-      const { unitId: r, subUnitId: t, drawingId: n } = e[0].parent;
-      this._drawingManagerService.focusDrawing([{ unitId: r, subUnitId: t, drawingId: n }]);
-    }), this._drawingManagerService.featurePluginUngroupUpdate$.subscribe((e) => {
-      this._commandService.executeCommand(sn.id, e);
-    });
+    this.disposeWithMe(this._drawingManagerService.featurePluginGroupUpdate$.subscribe((e) => {
+      this._commandService.executeCommand(rn.id, e);
+      const { unitId: n, subUnitId: t, drawingId: r } = e[0].parent;
+      this._drawingManagerService.focusDrawing([{ unitId: n, subUnitId: t, drawingId: r }]);
+    })), this.disposeWithMe(this._drawingManagerService.featurePluginUngroupUpdate$.subscribe((e) => {
+      this._commandService.executeCommand(on.id, e);
+    }));
   }
   _focusDrawingListener() {
     this.disposeWithMe(
@@ -753,65 +753,65 @@ let Ae = class extends re {
   }
 };
 Ae = ri([
-  z(1, x(q)),
-  z(2, W),
+  z(1, $(q)),
+  z(2, B),
   z(3, pe),
-  z(4, Dt),
-  z(5, or),
+  z(4, Mt),
+  z(5, ar),
   z(6, F),
   z(7, K),
-  z(8, Rt),
-  z(9, ar),
-  z(10, x(We)),
-  z(11, x(pr))
+  z(8, Dt),
+  z(9, cr),
+  z(10, $(Be)),
+  z(11, $(pr))
 ], Ae);
 const dt = {
   id: "sheet.command.insert-float-image",
   type: H.COMMAND,
   handler: (i) => {
-    var r, t;
-    return (t = (r = i.get(J).getCurrentTypeOfRenderer(Y.UNIVER_SHEET)) == null ? void 0 : r.with(Ae).insertFloatImage()) != null ? t : !1;
+    var n, t;
+    return (t = (n = i.get(J).getCurrentTypeOfRenderer(Y.UNIVER_SHEET)) == null ? void 0 : n.with(Ae).insertFloatImage()) != null ? t : !1;
   }
 }, we = {
   id: "sheet.command.move-drawing",
   type: H.COMMAND,
   handler: (i, e) => {
-    const r = i.get(W), t = i.get(F), n = i.get(pe), { direction: s } = e, o = t.getFocusDrawings();
+    const n = i.get(B), t = i.get(F), r = i.get(pe), { direction: s } = e, o = t.getFocusDrawings();
     if (o.length === 0)
       return !1;
-    const c = o[0].unitId, l = o.map((d) => {
-      const { transform: a } = d;
+    const d = o[0].unitId, l = o.map((c) => {
+      const { transform: a } = c;
       if (a == null)
         return null;
       const h = { ...a }, { left: u = 0, top: m = 0 } = a;
       return s === te.UP ? h.top = m - 1 : s === te.DOWN ? h.top = m + 1 : s === te.LEFT ? h.left = u - 1 : s === te.RIGHT && (h.left = u + 1), {
-        ...d,
+        ...c,
         transform: h,
-        sheetTransform: N(h, n)
+        sheetTransform: N(h, r)
       };
-    }).filter((d) => d != null);
-    return r.syncExecuteCommand(Ye.id, {
-      unitId: c,
+    }).filter((c) => c != null);
+    return n.syncExecuteCommand(Ye.id, {
+      unitId: d,
       drawings: l
-    }) ? (r.syncExecuteCommand(j.id, [c]), !0) : !1;
+    }) ? (n.syncExecuteCommand(j.id, [d]), !0) : !1;
   }
-}, on = "addition-and-subtraction-single", an = "sheet.menu.image";
+}, an = "addition-and-subtraction-single", cn = "sheet.menu.image";
 function ii(i) {
   return {
-    id: an,
-    type: Mt.SUBITEMS,
-    icon: on,
+    id: cn,
+    type: bt.SUBITEMS,
+    icon: an,
     tooltip: "sheetImage.title",
-    hidden$: bt(i, Y.UNIVER_SHEET),
-    disabled$: Zn(i, { workbookTypes: [tt], worksheetTypes: [Pe], rangeTypes: [wr] })
+    hidden$: yt(i, Y.UNIVER_SHEET),
+    disabled$: qn(i, { workbookTypes: [tt], worksheetTypes: [Pe], rangeTypes: [wr] })
   };
 }
 function si(i) {
   return {
     id: dt.id,
     title: "sheetImage.upload.float",
-    type: Mt.BUTTON,
-    hidden$: bt(i, Y.UNIVER_SHEET)
+    type: bt.BUTTON,
+    hidden$: yt(i, Y.UNIVER_SHEET)
   };
 }
 const oi = "univer-image-common-panel", ai = "univer-image-common-panel-grid", ci = "univer-image-common-panel-border", di = "univer-image-common-panel-title", li = "univer-image-common-panel-subtitle", ui = "univer-image-common-panel-row", hi = "univer-image-common-panel-row-vertical", gi = "univer-image-common-panel-column", mi = "univer-image-common-panel-column-center", fi = "univer-image-common-panel-inline", pi = "univer-image-common-panel-span2", wi = "univer-image-common-panel-span3", _i = "univer-image-common-panel-input", vi = "univer-sheet-image-menu", Si = "univer-sheet-image-menu-input", ee = {
@@ -831,49 +831,49 @@ const oi = "univer-image-common-panel", ai = "univer-image-common-panel-grid", c
   sheetImageMenu: vi,
   sheetImageMenuInput: Si
 };
-function cn(i) {
-  var e, r, t = "";
+function dn(i) {
+  var e, n, t = "";
   if (typeof i == "string" || typeof i == "number") t += i;
   else if (typeof i == "object") if (Array.isArray(i)) {
-    var n = i.length;
-    for (e = 0; e < n; e++) i[e] && (r = cn(i[e])) && (t && (t += " "), t += r);
-  } else for (r in i) i[r] && (t && (t += " "), t += r);
+    var r = i.length;
+    for (e = 0; e < r; e++) i[e] && (n = dn(i[e])) && (t && (t += " "), t += n);
+  } else for (n in i) i[n] && (t && (t += " "), t += n);
   return t;
 }
 function be() {
-  for (var i, e, r = 0, t = "", n = arguments.length; r < n; r++) (i = arguments[r]) && (e = cn(i)) && (t && (t += " "), t += e);
+  for (var i, e, n = 0, t = "", r = arguments.length; n < r; n++) (i = arguments[n]) && (e = dn(i)) && (t && (t += " "), t += e);
   return t;
 }
 const Ii = (i) => {
   var v;
-  const e = oe(W), r = oe(We), t = oe(K), n = oe(J), { drawings: s } = i, o = s[0];
+  const e = ae(B), n = ae(Be), t = ae(K), r = ae(J), { drawings: s } = i, o = s[0];
   if (o == null)
     return;
-  const { unitId: c } = o, l = n.getRenderById(c), g = l == null ? void 0 : l.scene;
+  const { unitId: d } = o, l = r.getRenderById(d), g = l == null ? void 0 : l.scene;
   if (g == null)
     return;
-  const d = g.getTransformerByCreate(), [a, h] = it(!0), u = (v = o.anchorType) != null ? v : y.Position, [m, f] = it(u);
+  const c = g.getTransformerByCreate(), [a, h] = it(!0), u = (v = o.anchorType) != null ? v : y.Position, [m, f] = it(u);
   function p(R, _) {
     const C = [];
     return R.forEach((w) => {
       const { oKey: O } = w, b = _.getDrawingOKey(O);
       if (b == null)
         return C.push(null), !0;
-      const { unitId: A, subUnitId: E, drawingId: M, drawingType: D, anchorType: U, sheetTransform: L } = b;
+      const { unitId: A, subUnitId: E, drawingId: M, drawingType: D, anchorType: U, sheetTransform: x } = b;
       C.push({
         unitId: A,
         subUnitId: E,
         drawingId: M,
         anchorType: U,
-        sheetTransform: L,
+        sheetTransform: x,
         drawingType: D
       });
     }), C;
   }
   ct(() => {
-    const R = d.clearControl$.subscribe((C) => {
+    const R = c.clearControl$.subscribe((C) => {
       C === !0 && h(!1);
-    }), _ = d.changeStart$.subscribe((C) => {
+    }), _ = c.changeStart$.subscribe((C) => {
       var b;
       const { objects: w } = C, O = p(w, t);
       if (O.length === 0)
@@ -905,30 +905,30 @@ const Ii = (i) => {
     });
   }
   const S = (R) => R ? "block" : "none";
-  return /* @__PURE__ */ $.jsxs("div", { className: be(ee.imageCommonPanelGrid, ee.imageCommonPanelBorder), style: { display: S(a) }, children: [
-    /* @__PURE__ */ $.jsx("div", { className: ee.imageCommonPanelRow, children: /* @__PURE__ */ $.jsx("div", { className: be(ee.imageCommonPanelColumn, ee.imageCommonPanelTitle), children: /* @__PURE__ */ $.jsx("div", { children: r.t("drawing-anchor.title") }) }) }),
-    /* @__PURE__ */ $.jsx("div", { className: be(ee.imageCommonPanelRow), children: /* @__PURE__ */ $.jsx("div", { className: be(ee.imageCommonPanelColumn), children: /* @__PURE__ */ $.jsxs(yr, { value: m, onChange: I, direction: "vertical", children: [
-      /* @__PURE__ */ $.jsx(Ze, { value: y.Both, children: r.t("drawing-anchor.both") }),
-      /* @__PURE__ */ $.jsx(Ze, { value: y.Position, children: r.t("drawing-anchor.position") }),
-      /* @__PURE__ */ $.jsx(Ze, { value: y.None, children: r.t("drawing-anchor.none") })
+  return /* @__PURE__ */ L.jsxs("div", { className: be(ee.imageCommonPanelGrid, ee.imageCommonPanelBorder), style: { display: S(a) }, children: [
+    /* @__PURE__ */ L.jsx("div", { className: ee.imageCommonPanelRow, children: /* @__PURE__ */ L.jsx("div", { className: be(ee.imageCommonPanelColumn, ee.imageCommonPanelTitle), children: /* @__PURE__ */ L.jsx("div", { children: n.t("drawing-anchor.title") }) }) }),
+    /* @__PURE__ */ L.jsx("div", { className: be(ee.imageCommonPanelRow), children: /* @__PURE__ */ L.jsx("div", { className: be(ee.imageCommonPanelColumn), children: /* @__PURE__ */ L.jsxs(yr, { value: m, onChange: I, direction: "vertical", children: [
+      /* @__PURE__ */ L.jsx(Ze, { value: y.Both, children: n.t("drawing-anchor.both") }),
+      /* @__PURE__ */ L.jsx(Ze, { value: y.Position, children: n.t("drawing-anchor.position") }),
+      /* @__PURE__ */ L.jsx(Ze, { value: y.None, children: n.t("drawing-anchor.none") })
     ] }) }) })
   ] });
 }, Ci = () => {
-  const i = oe(K), e = i.getFocusDrawings(), [r, t] = it(e);
+  const i = ae(K), e = i.getFocusDrawings(), [n, t] = it(e);
   return ct(() => {
-    const n = i.focus$.subscribe((s) => {
+    const r = i.focus$.subscribe((s) => {
       t(s);
     });
     return () => {
-      n.unsubscribe();
+      r.unsubscribe();
     };
-  }, []), !!(r != null && r.length) && /* @__PURE__ */ $.jsxs("div", { className: ee.imageCommonPanel, children: [
-    /* @__PURE__ */ $.jsx(Gn, { drawings: r }),
-    /* @__PURE__ */ $.jsx(Ii, { drawings: r })
+  }, []), !!(n != null && n.length) && /* @__PURE__ */ L.jsxs("div", { className: ee.imageCommonPanel, children: [
+    /* @__PURE__ */ L.jsx(Vn, { drawings: n }),
+    /* @__PURE__ */ L.jsx(Ii, { drawings: n })
   ] });
 }, Ri = {
-  [cr.FORMULAS_INSERT]: {
-    [an]: {
+  [dr.FORMULAS_INSERT]: {
+    [cn]: {
       order: 3,
       menuItemFactory: ii,
       [dt.id]: {
@@ -939,7 +939,7 @@ const Ii = (i) => {
   }
 };
 function _e(i) {
-  return !i.getContextValue(_n) && !i.getContextValue(vn) && !i.getContextValue(Sn) && i.getContextValue(me);
+  return !i.getContextValue(vn) && !i.getContextValue(Sn) && !i.getContextValue(In) && i.getContextValue(me);
 }
 const Di = {
   id: we.id,
@@ -982,7 +982,7 @@ const Di = {
     direction: te.RIGHT
   }
 }, Oi = {
-  id: tn.id,
+  id: nn.id,
   description: "shortcut.sheet.drawing-delete",
   group: "4_sheet-drawing-view",
   // when focusing on any other input tag do not trigger this shortcut
@@ -990,18 +990,18 @@ const Di = {
   binding: le.DELETE,
   mac: le.BACKSPACE
 };
-var Pi = Object.defineProperty, Ti = Object.getOwnPropertyDescriptor, Ei = (i, e, r, t) => {
-  for (var n = t > 1 ? void 0 : t ? Ti(e, r) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (n = (t ? o(e, r, n) : o(n)) || n);
-  return t && n && Pi(e, r, n), n;
-}, ye = (i, e) => (r, t) => e(r, t, i);
-let Ne = class extends re {
-  constructor(i, e, r, t) {
-    super(), this._componentManager = i, this._menuManagerService = e, this._commandService = r, this._shortcutService = t, this._init();
+var Pi = Object.defineProperty, Ti = Object.getOwnPropertyDescriptor, Ei = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? Ti(e, n) : e, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (r = (t ? o(e, n, r) : o(r)) || r);
+  return t && r && Pi(e, n, r), r;
+}, ye = (i, e) => (n, t) => e(n, t, i);
+let Ne = class extends ie {
+  constructor(i, e, n, t) {
+    super(), this._componentManager = i, this._menuManagerService = e, this._commandService = n, this._shortcutService = t, this._init();
   }
   _initCustomComponents() {
     const i = this._componentManager;
-    this.disposeWithMe(i.register(on, en)), this.disposeWithMe(i.register(Ht, Ci));
+    this.disposeWithMe(i.register(an, tn)), this.disposeWithMe(i.register(zt, Ci));
   }
   _initMenus() {
     this._menuManagerService.mergeMenu(Ri);
@@ -1009,17 +1009,17 @@ let Ne = class extends re {
   _initCommands() {
     [
       dt,
-      Ve,
+      ke,
       Ge,
       Ye,
-      zt,
-      j,
       Kt,
-      nn,
-      sn,
+      j,
+      Jt,
+      rn,
+      on,
       we,
-      tn,
-      rn
+      nn,
+      sn
     ].forEach((i) => this.disposeWithMe(this._commandService.registerCommand(i)));
   }
   _initShortcuts() {
@@ -1039,43 +1039,43 @@ let Ne = class extends re {
   }
 };
 Ne = Ei([
-  ye(0, x(dr)),
-  ye(1, lr),
-  ye(2, W),
-  ye(3, ur)
+  ye(0, $(lr)),
+  ye(1, ur),
+  ye(2, B),
+  ye(3, hr)
 ], Ne);
-var Ui = Object.defineProperty, Ai = Object.getOwnPropertyDescriptor, Ni = (i, e, r, t) => {
-  for (var n = t > 1 ? void 0 : t ? Ai(e, r) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (n = (t ? o(e, r, n) : o(n)) || n);
-  return t && n && Ui(e, r, n), n;
-}, qe = (i, e) => (r, t) => e(r, t, i);
-let je = class extends re {
-  constructor(e, r, t) {
+var Ui = Object.defineProperty, Ai = Object.getOwnPropertyDescriptor, Ni = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? Ai(e, n) : e, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (r = (t ? o(e, n, r) : o(r)) || r);
+  return t && r && Ui(e, n, r), r;
+}, qe = (i, e) => (n, t) => e(n, t, i);
+let je = class extends ie {
+  constructor(e, n, t) {
     super();
-    k(this, "_copyInfo");
-    this._sheetClipboardService = e, this._renderManagerService = r, this._sheetDrawingService = t, this._initCopyPaste();
+    V(this, "_copyInfo");
+    this._sheetClipboardService = e, this._renderManagerService = n, this._sheetDrawingService = t, this._initCopyPaste();
   }
   _initCopyPaste() {
     this._sheetClipboardService.addClipboardHook({
       id: "SHEET_IMAGE_UI_PLUGIN",
-      onBeforeCopy: (e, r, t) => this._collect(e, r, t),
-      onPasteCells: (e, r, t, n) => {
-        const { copyType: s = _t.COPY, pasteType: o } = n, { range: c } = e || {}, { range: l, unitId: g, subUnitId: d } = r;
-        return this._generateMutations(l, { copyType: s, pasteType: o, copyRange: c, unitId: g, subUnitId: d });
+      onBeforeCopy: (e, n, t) => this._collect(e, n, t),
+      onPasteCells: (e, n, t, r) => {
+        const { copyType: s = _t.COPY, pasteType: o } = r, { range: d } = e || {}, { range: l, unitId: g, subUnitId: c } = n;
+        return this._generateMutations(l, { copyType: s, pasteType: o, copyRange: d, unitId: g, subUnitId: c });
       },
-      onPastePlainText: (e, r) => ({ undos: [], redos: [] })
+      onPastePlainText: (e, n) => ({ undos: [], redos: [] })
     });
   }
-  _collect(e, r, t) {
+  _collect(e, n, t) {
     var h;
-    const n = (h = this._renderManagerService.getRenderById(e)) == null ? void 0 : h.with(q);
-    if (!n) return;
-    const s = n.attachRangeWithCoord(t);
+    const r = (h = this._renderManagerService.getRenderById(e)) == null ? void 0 : h.with(q);
+    if (!r) return;
+    const s = r.attachRangeWithCoord(t);
     if (!s)
       return;
-    const { startX: o, endX: c, startY: l, endY: g } = s, d = this._sheetDrawingService.getDrawingData(e, r), a = [];
-    Object.keys(d).forEach((u) => {
-      const m = d[u], { transform: f } = m;
+    const { startX: o, endX: d, startY: l, endY: g } = s, c = this._sheetDrawingService.getDrawingData(e, n), a = [];
+    Object.keys(c).forEach((u) => {
+      const m = c[u], { transform: f } = m;
       if (m.anchorType !== y.Both || !f)
         return;
       const { left: p = 0, top: I = 0, width: S = 0, height: v = 0 } = f, { drawingStartX: R, drawingEndX: _, drawingStartY: C, drawingEndY: w } = {
@@ -1084,15 +1084,15 @@ let je = class extends re {
         drawingStartY: I,
         drawingEndY: I + v
       };
-      o <= R && _ <= c && l <= C && w <= g && a.push(m);
+      o <= R && _ <= d && l <= C && w <= g && a.push(m);
     }), a.length && (this._copyInfo = {
       drawings: a,
       unitId: e,
-      subUnitId: r
+      subUnitId: n
     });
   }
   // eslint-disable-next-line max-lines-per-function
-  _generateMutations(e, r) {
+  _generateMutations(e, n) {
     var b;
     if (!this._copyInfo)
       return { redos: [], undos: [] };
@@ -1102,18 +1102,18 @@ let je = class extends re {
       Se.SPECIAL_PASTE_FORMAT,
       Se.SPECIAL_PASTE_FORMULA
     ].includes(
-      r.pasteType
+      n.pasteType
     ))
       return { redos: [], undos: [] };
-    const { copyRange: t } = r;
+    const { copyRange: t } = n;
     if (!t)
       return { redos: [], undos: [] };
-    const { drawings: n, unitId: s, subUnitId: o } = this._copyInfo, { ranges: [c, l], mapFunc: g } = qn([t, e]), { row: d, col: a } = g(c.startRow, c.startColumn), { row: h, col: u } = g(l.startRow, l.startColumn), m = (b = this._renderManagerService.getRenderById(s)) == null ? void 0 : b.with(q);
+    const { drawings: r, unitId: s, subUnitId: o } = this._copyInfo, { ranges: [d, l], mapFunc: g } = Qn([t, e]), { row: c, col: a } = g(d.startRow, d.startColumn), { row: h, col: u } = g(l.startRow, l.startColumn), m = (b = this._renderManagerService.getRenderById(s)) == null ? void 0 : b.with(q);
     if (!m)
       return { redos: [], undos: [] };
     const f = m.attachRangeWithCoord({
-      startRow: d,
-      endRow: d,
+      startRow: c,
+      endRow: c,
       startColumn: a,
       endColumn: a
     }), p = m.attachRangeWithCoord({
@@ -1124,8 +1124,8 @@ let je = class extends re {
     });
     if (!f || !p)
       return { redos: [], undos: [] };
-    const I = [], S = [], v = p.startX - f.startX, R = p.startY - f.startY, _ = h - d, C = u - a, w = r.copyType === _t.CUT, { _sheetDrawingService: O } = this;
-    return n.forEach((A) => {
+    const I = [], S = [], v = p.startX - f.startX, R = p.startY - f.startY, _ = h - c, C = u - a, w = n.copyType === _t.CUT, { _sheetDrawingService: O } = this;
+    return r.forEach((A) => {
       const { transform: E, sheetTransform: M } = A;
       if (!E)
         return;
@@ -1145,14 +1145,14 @@ let je = class extends re {
         }
       };
       if (w) {
-        const { undo: U, redo: L, objects: Z } = O.getBatchUpdateOp([D]);
+        const { undo: U, redo: x, objects: Z } = O.getBatchUpdateOp([D]);
         I.push({
           id: P.id,
           params: {
             unitId: s,
             subUnitId: o,
             type: T.UPDATE,
-            op: L,
+            op: x,
             objects: Z
           }
         }), S.push({
@@ -1166,8 +1166,8 @@ let je = class extends re {
           }
         });
       } else {
-        const { undo: U, redo: L, objects: Z } = O.getBatchAddOp([D]);
-        I.push({ id: P.id, params: { op: L, unitId: s, subUnitId: o, objects: Z, type: T.INSERT } }), S.push({ id: P.id, params: { op: U, unitId: s, subUnitId: o, objects: Z, type: T.REMOVE } });
+        const { undo: U, redo: x, objects: Z } = O.getBatchAddOp([D]);
+        I.push({ id: P.id, params: { op: x, unitId: s, subUnitId: o, objects: Z, type: T.INSERT } }), S.push({ id: P.id, params: { op: U, unitId: s, subUnitId: o, objects: Z, type: T.REMOVE } });
       }
     }), {
       redos: I,
@@ -1176,23 +1176,23 @@ let je = class extends re {
   }
 };
 je = Ni([
-  qe(0, Qn),
+  qe(0, er),
   qe(1, J),
   qe(2, F)
 ], je);
-var ji = Object.defineProperty, xi = Object.getOwnPropertyDescriptor, Li = (i, e, r, t) => {
-  for (var n = t > 1 ? void 0 : t ? xi(e, r) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (n = (t ? o(e, r, n) : o(n)) || n);
-  return t && n && ji(e, r, n), n;
-}, he = (i, e) => (r, t) => e(r, t, i);
-let xe = class extends re {
-  constructor(i, e, r, t, n) {
-    super(), this._drawingManagerService = i, this._renderManagerService = e, this._permissionService = r, this._univerInstanceService = t, this._userManagerService = n, this._initDrawingVisible(), this._initDrawingEditable(), this._initViewPermissionChange(), this._initEditPermissionChange();
+var ji = Object.defineProperty, $i = Object.getOwnPropertyDescriptor, xi = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? $i(e, n) : e, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (r = (t ? o(e, n, r) : o(r)) || r);
+  return t && r && ji(e, n, r), r;
+}, he = (i, e) => (n, t) => e(n, t, i);
+let $e = class extends ie {
+  constructor(i, e, n, t, r) {
+    super(), this._drawingManagerService = i, this._renderManagerService = e, this._permissionService = n, this._univerInstanceService = t, this._userManagerService = r, this._initDrawingVisible(), this._initDrawingEditable(), this._initViewPermissionChange(), this._initEditPermissionChange();
   }
   _initDrawingVisible() {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET);
     this.disposeWithMe(
-      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, r]) => {
+      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, n]) => {
         if (!e) {
           this._drawingManagerService.setDrawingVisible(!1);
           return;
@@ -1202,16 +1202,16 @@ let xe = class extends re {
             this._drawingManagerService.setDrawingVisible(!1);
             return;
           }
-          const n = e.getUnitId(), s = t.getSheetId();
-          if (this._permissionService.composePermission([new St(n).id, new Je(n, s).id]).every((c) => c.value))
+          const r = e.getUnitId(), s = t.getSheetId();
+          if (this._permissionService.composePermission([new It(r).id, new Je(r, s).id]).every((d) => d.value))
             this._drawingManagerService.setDrawingVisible(!0);
           else {
             this._drawingManagerService.setDrawingVisible(!1);
-            const c = e.getUnitId(), l = t.getSheetId(), g = this._drawingManagerService.getDrawingData(c, l), d = Object.values(g), a = this._renderManagerService.getRenderById(c), h = a == null ? void 0 : a.scene;
+            const d = e.getUnitId(), l = t.getSheetId(), g = this._drawingManagerService.getDrawingData(d, l), c = Object.values(g), a = this._renderManagerService.getRenderById(d), h = a == null ? void 0 : a.scene;
             if (h == null)
               return;
             h.getAllObjectsByOrder().forEach((m) => {
-              m.classType === de.IMAGE && d.some((f) => m.oKey.includes(f.drawingId)) && h.removeObject(m);
+              m.classType === de.IMAGE && c.some((f) => m.oKey.includes(f.drawingId)) && h.removeObject(m);
             });
           }
         });
@@ -1221,7 +1221,7 @@ let xe = class extends re {
   _initDrawingEditable() {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET);
     this.disposeWithMe(
-      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, r]) => {
+      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, n]) => {
         if (!e) {
           this._drawingManagerService.setDrawingEditable(!1);
           return;
@@ -1231,16 +1231,16 @@ let xe = class extends re {
             this._drawingManagerService.setDrawingEditable(!1);
             return;
           }
-          const n = e.getUnitId(), s = t.getSheetId();
-          if (this._permissionService.composePermission([new tt(n).id, new Pe(n, s).id]).every((c) => c.value))
+          const r = e.getUnitId(), s = t.getSheetId();
+          if (this._permissionService.composePermission([new tt(r).id, new Pe(r, s).id]).every((d) => d.value))
             this._drawingManagerService.setDrawingEditable(!0);
           else {
             this._drawingManagerService.setDrawingEditable(!1);
-            const c = e.getUnitId(), l = t.getSheetId(), g = this._drawingManagerService.getDrawingData(c, l), d = Object.values(g), a = this._renderManagerService.getRenderById(c), h = a == null ? void 0 : a.scene;
+            const d = e.getUnitId(), l = t.getSheetId(), g = this._drawingManagerService.getDrawingData(d, l), c = Object.values(g), a = this._renderManagerService.getRenderById(d), h = a == null ? void 0 : a.scene;
             if (h == null)
               return;
             h.getAllObjectsByOrder().forEach((m) => {
-              m.classType === de.IMAGE && d.some((f) => m.oKey.includes(f.drawingId)) && h.detachTransformerFrom(m);
+              m.classType === de.IMAGE && c.some((f) => m.oKey.includes(f.drawingId)) && h.detachTransformerFrom(m);
             });
           }
         });
@@ -1250,35 +1250,35 @@ let xe = class extends re {
   _initViewPermissionChange() {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET);
     this.disposeWithMe(
-      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, r]) => {
+      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, n]) => {
         e && e.activeSheet$.subscribe((t) => {
           var a;
           if (!t)
             return;
-          const n = e.getUnitId(), s = t.getSheetId();
+          const r = e.getUnitId(), s = t.getSheetId();
           let o = !0;
-          const c = this._renderManagerService.getRenderById(n), l = c == null ? void 0 : c.scene;
+          const d = this._renderManagerService.getRenderById(r), l = d == null ? void 0 : d.scene;
           if (l == null)
             return;
-          const g = l.getTransformerByCreate(), d = this._permissionService.composePermission$([new St(n).id, new Je(n, s).id]).pipe(Ee((h) => h.every((u) => u.value)));
-          d == null || d.pipe(
-            ae((h) => h !== o),
+          const g = l.getTransformerByCreate(), c = this._permissionService.composePermission$([new It(r).id, new Je(r, s).id]).pipe(Ee((h) => h.every((u) => u.value)));
+          c == null || c.pipe(
+            re((h) => h !== o),
             Ce()
           ).subscribe({
             next: (h) => {
               o = h, this._drawingManagerService.setDrawingVisible(h);
-              const u = l.getAllObjectsByOrder(), m = this._drawingManagerService.getDrawingData(n, s), f = Object.values(m);
+              const u = l.getAllObjectsByOrder(), m = this._drawingManagerService.getDrawingData(r, s), f = Object.values(m);
               h ? this._drawingManagerService.addNotification(f) : (u.forEach((p) => {
                 p.classType === de.IMAGE && f.some((I) => p.oKey.includes(I.drawingId)) && l.removeObject(p);
               }), g.clearSelectedObjects());
             }
-          }), (a = this._permissionService.getPermissionPoint$(new Je(n, s).id)) == null || a.pipe(
-            ae((h) => h.value !== o),
+          }), (a = this._permissionService.getPermissionPoint$(new Je(r, s).id)) == null || a.pipe(
+            re((h) => h.value !== o),
             Ce()
           ).subscribe({
             complete: () => {
               o = !0, this._drawingManagerService.setDrawingVisible(!0);
-              const h = this._drawingManagerService.getDrawingData(n, s), u = Object.values(h);
+              const h = this._drawingManagerService.getDrawingData(r, s), u = Object.values(h);
               this._drawingManagerService.addNotification(u);
             }
           });
@@ -1289,32 +1289,32 @@ let xe = class extends re {
   _initEditPermissionChange() {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET);
     this.disposeWithMe(
-      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, r]) => {
+      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, n]) => {
         e && e.activeSheet$.subscribe((t) => {
           var a;
           if (!t)
             return;
-          const n = e.getUnitId(), s = t.getSheetId();
+          const r = e.getUnitId(), s = t.getSheetId();
           let o = !0;
-          const c = this._renderManagerService.getRenderById(n), l = c == null ? void 0 : c.scene;
+          const d = this._renderManagerService.getRenderById(r), l = d == null ? void 0 : d.scene;
           if (l == null)
             return;
-          const g = l.getTransformerByCreate(), d = this._permissionService.composePermission$([new tt(n).id, new Pe(n, s).id]).pipe(Ee((h) => h.every((u) => u.value)));
-          d == null || d.pipe(
-            ae((h) => h !== o),
+          const g = l.getTransformerByCreate(), c = this._permissionService.composePermission$([new tt(r).id, new Pe(r, s).id]).pipe(Ee((h) => h.every((u) => u.value)));
+          c == null || c.pipe(
+            re((h) => h !== o),
             Ce()
           ).subscribe({
             next: (h) => {
               o = h, this._drawingManagerService.setDrawingEditable(h);
-              const u = l.getAllObjectsByOrder(), m = this._drawingManagerService.getDrawingData(n, s), f = Object.values(m);
+              const u = l.getAllObjectsByOrder(), m = this._drawingManagerService.getDrawingData(r, s), f = Object.values(m);
               h ? (u.forEach((p) => {
                 p.classType === de.IMAGE && f.some((I) => p.oKey.includes(I.drawingId)) && l.attachTransformerTo(p);
               }), this._drawingManagerService.addNotification(f)) : (u.forEach((p) => {
                 p.classType === de.IMAGE && f.some((I) => p.oKey.includes(I.drawingId)) && l.detachTransformerFrom(p);
               }), g.clearSelectedObjects());
             }
-          }), (a = this._permissionService.getPermissionPoint$(new Pe(n, s).id)) == null || a.pipe(
-            ae((h) => h.value !== o),
+          }), (a = this._permissionService.getPermissionPoint$(new Pe(r, s).id)) == null || a.pipe(
+            re((h) => h.value !== o),
             Ce()
           ).subscribe({
             complete: () => {
@@ -1332,32 +1332,32 @@ let xe = class extends re {
     );
   }
 };
-xe = Li([
+$e = xi([
   he(0, K),
   he(1, J),
-  he(2, Cn),
+  he(2, Rn),
   he(3, fe),
-  he(4, x(In))
-], xe);
-var $i = Object.defineProperty, Bi = Object.getOwnPropertyDescriptor, Wi = (i, e, r, t) => {
-  for (var n = t > 1 ? void 0 : t ? Bi(e, r) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (n = (t ? o(e, r, n) : o(n)) || n);
-  return t && n && $i(e, r, n), n;
-}, Oe = (i, e) => (r, t) => e(r, t, i);
-let Le = class extends re {
-  constructor(i, e, r, t) {
-    super(), this._sheetPrintInterceptorService = i, this._drawingRenderService = e, this._drawingManagerService = r, this._renderManagerService = t, this._initPrinting();
+  he(4, $(Cn))
+], $e);
+var Li = Object.defineProperty, Wi = Object.getOwnPropertyDescriptor, Bi = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? Wi(e, n) : e, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (r = (t ? o(e, n, r) : o(r)) || r);
+  return t && r && Li(e, n, r), r;
+}, Oe = (i, e) => (n, t) => e(n, t, i);
+let xe = class extends ie {
+  constructor(i, e, n, t) {
+    super(), this._sheetPrintInterceptorService = i, this._drawingRenderService = e, this._drawingManagerService = n, this._renderManagerService = t, this._initPrinting();
   }
   _initPrinting() {
     this.disposeWithMe(
       this._sheetPrintInterceptorService.interceptor.intercept(
         this._sheetPrintInterceptorService.interceptor.getInterceptPoints().PRINTING_COMPONENT_COLLECT,
         {
-          handler: (i, e, r) => {
-            const { unitId: t, scene: n, subUnitId: s } = e, o = this._drawingManagerService.getDrawingDataForUnit(t), c = o == null ? void 0 : o[s];
-            return c && c.order.forEach((l) => {
-              this._drawingRenderService.renderDrawing(c.data[l], n);
-            }), r();
+          handler: (i, e, n) => {
+            const { unitId: t, scene: r, subUnitId: s } = e, o = this._drawingManagerService.getDrawingDataForUnit(t), d = o == null ? void 0 : o[s];
+            return d && d.order.forEach((l) => {
+              this._drawingRenderService.renderDrawing(d.data[l], r);
+            }), n();
           }
         }
       )
@@ -1365,42 +1365,41 @@ let Le = class extends re {
       this._sheetPrintInterceptorService.interceptor.intercept(
         this._sheetPrintInterceptorService.interceptor.getInterceptPoints().PRINTING_RANGE,
         {
-          handler: (i, e, r) => {
-            const { unitId: t, subUnitId: n } = e, s = this._renderManagerService.getRenderById(t);
+          handler: (i, e, n) => {
+            const { unitId: t, subUnitId: r } = e, s = this._renderManagerService.getRenderById(t);
             if (!s)
-              return r(i);
-            const o = s.with(q).getWorksheetSkeleton(n);
+              return n(i);
+            const o = s.with(q).getWorksheetSkeleton(r);
             if (!o)
-              return r(i);
-            const c = this._drawingManagerService.getDrawingDataForUnit(t), l = c == null ? void 0 : c[e.subUnitId];
+              return n(i);
+            const d = this._drawingManagerService.getDrawingDataForUnit(t), l = d == null ? void 0 : d[e.subUnitId];
             if (!l)
-              return r(i);
-            const { scaleX: g, scaleY: d } = s.scene, a = i ? { ...i } : { startColumn: 0, endColumn: 0, endRow: 0, startRow: 0 }, h = l.order.map((u) => l.data[u]).filter((u) => u.drawingType !== V.DRAWING_DOM);
+              return n(i);
+            const { scaleX: g, scaleY: c } = s.scene, a = i ? { ...i } : { startColumn: 0, endColumn: 0, endRow: 0, startRow: 0 }, h = l.order.map((u) => l.data[u]).filter((u) => u.drawingType !== k.DRAWING_DOM);
             return h.length ? (h.forEach((u) => {
               if (!u.groupId && u.transform && ge.isDefine(u.transform.left) && ge.isDefine(u.transform.top) && ge.isDefine(u.transform.width) && ge.isDefine(u.transform.height)) {
-                const m = o.skeleton.getCellPositionByOffset(u.transform.left, u.transform.top, g, d, { x: 0, y: 0 }), f = o.skeleton.getCellPositionByOffset(u.transform.left + u.transform.width, u.transform.top + u.transform.height, g, d, { x: 0, y: 0 });
+                const m = o.skeleton.getCellPositionByOffset(u.transform.left, u.transform.top, g, c, { x: 0, y: 0 }), f = o.skeleton.getCellPositionByOffset(u.transform.left + u.transform.width, u.transform.top + u.transform.height, g, c, { x: 0, y: 0 });
                 m.column < a.startColumn && (a.startColumn = m.column), m.row < a.startRow && (a.startRow = m.row), a.endRow < f.row && (a.endRow = f.row), a.endColumn < f.column && (a.endColumn = f.column);
               }
-            }), r(a)) : r(i);
+            }), n(a)) : n(i);
           }
         }
       )
     );
   }
 };
-Le = Wi([
-  Oe(0, x(er)),
-  Oe(1, x(kn)),
+xe = Bi([
+  Oe(0, $(tr)),
+  Oe(1, $(kn)),
   Oe(2, K),
   Oe(3, J)
-], Le);
-var Gi = Object.defineProperty, ki = Object.getOwnPropertyDescriptor, Vi = (i, e, r, t) => {
-  for (var n = t > 1 ? void 0 : t ? ki(e, r) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (n = (t ? o(e, r, n) : o(n)) || n);
-  return t && n && Gi(e, r, n), n;
-}, Q = (i, e) => (r, t) => e(r, t, i);
+], xe);
+var Gi = Object.defineProperty, Vi = Object.getOwnPropertyDescriptor, ki = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? Vi(e, n) : e, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (r = (t ? o(e, n, r) : o(r)) || r);
+  return t && r && Gi(e, n, r), r;
+}, Q = (i, e) => (n, t) => e(n, t, i);
 const Yi = [
-  yt.id,
   Ot.id,
   Pt.id,
   Tt.id,
@@ -1408,17 +1407,18 @@ const Yi = [
   Ut.id,
   At.id,
   Nt.id,
+  jt.id,
   nt.id,
   rt.id,
-  jt.id,
+  $t.id,
   xt.id,
   Lt.id,
-  $t.id,
-  Bt.id,
   Wt.id,
+  Bt.id,
   Gt.id,
+  Vt.id,
   kt.id,
-  Vt.id
+  Yt.id
 ], Fi = [
   _r.id,
   vr.id,
@@ -1427,9 +1427,9 @@ const Yi = [
   Cr.id,
   Rr.id
 ];
-let ot = class extends re {
-  constructor(i, e, r, t, n, s, o, c, l) {
-    super(), this._context = i, this._renderManagerService = e, this._commandService = r, this._selectionRenderService = t, this._skeletonManagerService = n, this._sheetInterceptorService = s, this._sheetDrawingService = o, this._drawingManagerService = c, this._univerInstanceService = l, this._sheetInterceptorListener(), this._commandListener(), this._sheetRefreshListener();
+let ot = class extends ie {
+  constructor(i, e, n, t, r, s, o, d, l) {
+    super(), this._context = i, this._renderManagerService = e, this._commandService = n, this._selectionRenderService = t, this._skeletonManagerService = r, this._sheetInterceptorService = s, this._sheetDrawingService = o, this._drawingManagerService = d, this._univerInstanceService = l, this._sheetInterceptorListener(), this._commandListener(), this._sheetRefreshListener();
   }
   _sheetInterceptorListener() {
     this.disposeWithMe(
@@ -1440,53 +1440,53 @@ let ot = class extends re {
           if (i.params == null)
             return { redos: [], undos: [] };
           const e = i.id;
-          if (e === yt.id)
+          if (e === Ot.id)
             return this._moveRowInterceptor(i.params, "insert");
-          if ([Gt.id, kt.id, Vt.id].includes(e))
+          if ([Vt.id, kt.id, Yt.id].includes(e))
             return this._moveRangeInterceptor(i.params);
-          if (e === Ot.id)
-            return this._moveColInterceptor(i.params, "insert");
           if (e === Pt.id)
-            return this._moveRowInterceptor(i.params, "remove");
+            return this._moveColInterceptor(i.params, "insert");
           if (e === Tt.id)
+            return this._moveRowInterceptor(i.params, "remove");
+          if (e === Et.id)
             return this._moveColInterceptor(i.params, "remove");
-          if (e === Et.id) {
-            const { range: r } = i.params;
+          if (e === Ut.id) {
+            const { range: n } = i.params;
             return this._getRangeMoveUndo(
-              r,
+              n,
               0
               /* deleteLeft */
             );
-          } else if (e === Ut.id) {
-            const { range: r } = i.params;
+          } else if (e === At.id) {
+            const { range: n } = i.params;
             return this._getRangeMoveUndo(
-              r,
+              n,
               1
               /* deleteUp */
             );
-          } else if (e === At.id) {
-            const { range: r } = i.params;
+          } else if (e === Nt.id) {
+            const { range: n } = i.params;
             return this._getRangeMoveUndo(
-              r,
+              n,
               2
               /* insertDown */
             );
-          } else if (e === Nt.id) {
-            const { range: r } = i.params;
+          } else if (e === jt.id) {
+            const { range: n } = i.params;
             return this._getRangeMoveUndo(
-              r,
+              n,
               3
               /* insertRight */
             );
-          } else if (e === Lt.id || e === $t.id) {
-            const r = i.params, { unitId: t, subUnitId: n, ranges: s } = r;
-            return this._getDrawingUndoForRowVisible(t, n, s);
-          } else if (e === Bt.id || e === Wt.id) {
-            const r = i.params, { unitId: t, subUnitId: n, ranges: s } = r;
-            return this._getDrawingUndoForColVisible(t, n, s);
-          } else if (e === nt.id || e === rt.id || e === jt.id || e === xt.id) {
-            const r = i.params, { unitId: t, subUnitId: n, ranges: s } = r, o = e === nt.id || e === rt.id;
-            return this._getDrawingUndoForRowAndColSize(t, n, s, o);
+          } else if (e === Lt.id || e === Wt.id) {
+            const n = i.params, { unitId: t, subUnitId: r, ranges: s } = n;
+            return this._getDrawingUndoForRowVisible(t, r, s);
+          } else if (e === Bt.id || e === Gt.id) {
+            const n = i.params, { unitId: t, subUnitId: r, ranges: s } = n;
+            return this._getDrawingUndoForColVisible(t, r, s);
+          } else if (e === nt.id || e === rt.id || e === $t.id || e === xt.id) {
+            const n = i.params, { unitId: t, subUnitId: r, ranges: s } = n, o = e === nt.id || e === rt.id;
+            return this._getDrawingUndoForRowAndColSize(t, r, s, o);
           }
           return { redos: [], undos: [] };
         }
@@ -1494,97 +1494,97 @@ let ot = class extends re {
     );
   }
   _getRangeMoveUndo(i, e) {
-    const r = ce(this._univerInstanceService);
-    if (r == null)
+    const n = ce(this._univerInstanceService);
+    if (n == null)
       return { redos: [], undos: [] };
-    const t = r.unitId, n = r.subUnitId, s = [], o = [], c = this._sheetDrawingService.getDrawingData(t, n), l = [], g = [];
-    if (Object.keys(c).forEach((d) => {
-      const a = c[d], { updateDrawings: h, deleteDrawings: u } = this._getUpdateOrDeleteDrawings(i, e, a);
+    const t = n.unitId, r = n.subUnitId, s = [], o = [], d = this._sheetDrawingService.getDrawingData(t, r), l = [], g = [];
+    if (Object.keys(d).forEach((c) => {
+      const a = d[c], { updateDrawings: h, deleteDrawings: u } = this._getUpdateOrDeleteDrawings(i, e, a);
       l.push(...h), g.push(...u);
     }), l.length === 0 && g.length === 0)
       return { redos: [], undos: [] };
     if (l.length > 0) {
-      const d = this._sheetDrawingService.getBatchUpdateOp(l), { undo: a, redo: h, objects: u } = d;
-      s.push({ id: P.id, params: { unitId: t, subUnitId: n, op: h, objects: u, type: T.UPDATE } }), o.push({ id: P.id, params: { unitId: t, subUnitId: n, op: a, objects: u, type: T.UPDATE } });
+      const c = this._sheetDrawingService.getBatchUpdateOp(l), { undo: a, redo: h, objects: u } = c;
+      s.push({ id: P.id, params: { unitId: t, subUnitId: r, op: h, objects: u, type: T.UPDATE } }), o.push({ id: P.id, params: { unitId: t, subUnitId: r, op: a, objects: u, type: T.UPDATE } });
     }
     if (g.length > 0) {
-      const d = this._sheetDrawingService.getBatchRemoveOp(g), a = d.undo, h = d.redo, u = d.objects;
-      s.push({ id: P.id, params: { unitId: t, subUnitId: n, op: h, objects: u, type: T.REMOVE } }), o.push({ id: P.id, params: { unitId: t, subUnitId: n, op: a, objects: u, type: T.INSERT } });
+      const c = this._sheetDrawingService.getBatchRemoveOp(g), a = c.undo, h = c.redo, u = c.objects;
+      s.push({ id: P.id, params: { unitId: t, subUnitId: r, op: h, objects: u, type: T.REMOVE } }), o.push({ id: P.id, params: { unitId: t, subUnitId: r, op: a, objects: u, type: T.INSERT } });
     }
     return s.push({ id: j.id, params: [t] }), o.push({ id: j.id, params: [t] }), {
       redos: s,
       undos: o
     };
   }
-  _getUpdateOrDeleteDrawings(i, e, r) {
-    const t = [], n = [], { sheetTransform: s, anchorType: o = y.Position, transform: c, unitId: l, subUnitId: g, drawingId: d } = r, { from: a, to: h } = s, { row: u, column: m } = a, { row: f, column: p } = h;
-    if (s == null || c == null)
+  _getUpdateOrDeleteDrawings(i, e, n) {
+    const t = [], r = [], { sheetTransform: s, anchorType: o = y.Position, transform: d, unitId: l, subUnitId: g, drawingId: c } = n, { from: a, to: h } = s, { row: u, column: m } = a, { row: f, column: p } = h;
+    if (s == null || d == null)
       return {
         updateDrawings: t,
-        deleteDrawings: n
+        deleteDrawings: r
       };
     const { startRow: I, endRow: S, startColumn: v, endColumn: R } = i;
     let _ = null, C = null;
     if (e === 0 && u >= I && f <= S)
       if (m >= v && p <= R)
-        n.push({ unitId: l, subUnitId: g, drawingId: d });
+        r.push({ unitId: l, subUnitId: g, drawingId: c });
       else {
-        const w = this._shrinkCol(s, c, v, R, o);
+        const w = this._shrinkCol(s, d, v, R, o);
         _ = w == null ? void 0 : w.newSheetTransform, C = w == null ? void 0 : w.newTransform;
       }
     else if (e === 1 && m >= v && p <= R)
       if (u >= I && f <= S)
-        n.push({ unitId: l, subUnitId: g, drawingId: d });
+        r.push({ unitId: l, subUnitId: g, drawingId: c });
       else {
-        const w = this._shrinkRow(s, c, I, S, o);
+        const w = this._shrinkRow(s, d, I, S, o);
         _ = w == null ? void 0 : w.newSheetTransform, C = w == null ? void 0 : w.newTransform;
       }
     else if (e === 2) {
-      const w = this._expandRow(s, c, I, S, o);
+      const w = this._expandRow(s, d, I, S, o);
       _ = w == null ? void 0 : w.newSheetTransform, C = w == null ? void 0 : w.newTransform;
     } else if (e === 3) {
-      const w = this._expandCol(s, c, v, R, o);
+      const w = this._expandCol(s, d, v, R, o);
       _ = w == null ? void 0 : w.newSheetTransform, C = w == null ? void 0 : w.newTransform;
     }
     if (_ != null && C != null) {
-      const w = B(_, this._selectionRenderService, this._skeletonManagerService);
-      t.push({ ...r, sheetTransform: _, transform: w });
+      const w = W(_, this._selectionRenderService, this._skeletonManagerService);
+      t.push({ ...n, sheetTransform: _, transform: w });
     }
-    return { updateDrawings: t, deleteDrawings: n };
+    return { updateDrawings: t, deleteDrawings: r };
   }
-  _remainDrawingSize(i, e, r) {
+  _remainDrawingSize(i, e, n) {
     const t = N({ ...i }, this._selectionRenderService);
     t != null && e.push({
-      ...r,
+      ...n,
       sheetTransform: t
     });
   }
   // eslint-disable-next-line max-lines-per-function
-  _getDrawingUndoForColVisible(i, e, r) {
-    const t = this._drawingManagerService.getDrawingData(i, e), n = [], s = [];
-    if (Object.keys(t).forEach((d) => {
-      const a = t[d], { sheetTransform: h, transform: u, anchorType: m = y.Position } = a;
+  _getDrawingUndoForColVisible(i, e, n) {
+    const t = this._drawingManagerService.getDrawingData(i, e), r = [], s = [];
+    if (Object.keys(t).forEach((c) => {
+      const a = t[c], { sheetTransform: h, transform: u, anchorType: m = y.Position } = a;
       if (m === y.None)
-        this._remainDrawingSize(u, n, a);
+        this._remainDrawingSize(u, r, a);
       else {
         const { from: f, to: p } = h, { row: I, column: S } = f, { row: v, column: R } = p;
-        for (let _ = 0; _ < r.length; _++) {
-          const C = r[_], { startRow: w, endRow: O, startColumn: b, endColumn: A } = C;
+        for (let _ = 0; _ < n.length; _++) {
+          const C = n[_], { startRow: w, endRow: O, startColumn: b, endColumn: A } = C;
           if (R < b)
             continue;
           if (m === y.Position) {
             let D = null, U = null;
             if (S >= b && S <= A) {
-              const L = this._skeletonManagerService.attachRangeWithCoord({ startColumn: S, endColumn: A, startRow: f.row, endRow: p.row });
-              if (L == null)
+              const x = this._skeletonManagerService.attachRangeWithCoord({ startColumn: S, endColumn: A, startRow: f.row, endRow: p.row });
+              if (x == null)
                 return;
-              U = { ...u, left: L.startX };
+              U = { ...u, left: x.startX };
             }
             if (U != null && (D = N(U, this._selectionRenderService), D != null && U != null)) {
-              n.push({ ...a, sheetTransform: D, transform: U });
+              r.push({ ...a, sheetTransform: D, transform: U });
               break;
             }
-            this._remainDrawingSize(u, n, a);
+            this._remainDrawingSize(u, r, a);
             continue;
           }
           if (S >= b && R <= A)
@@ -1620,65 +1620,65 @@ let ot = class extends re {
             }
           }
           if (M != null && (E = N(M, this._selectionRenderService)), M != null && E != null) {
-            n.push({ ...a, sheetTransform: E, transform: M });
+            r.push({ ...a, sheetTransform: E, transform: M });
             break;
           } else
-            this._remainDrawingSize(u, n, a);
+            this._remainDrawingSize(u, r, a);
         }
       }
-    }), n.length === 0 && s.length === 0)
+    }), r.length === 0 && s.length === 0)
       return { redos: [], undos: [] };
-    const { redos: o, undos: c } = this._createUndoAndRedoMutation(i, e, n), l = [], g = [];
+    const { redos: o, undos: d } = this._createUndoAndRedoMutation(i, e, r), l = [], g = [];
     if (s.length > 0) {
-      const { redos: d, undos: a } = this._createUndoAndRedoMutation(i, e, s);
-      l.push(...d), g.push(...a);
+      const { redos: c, undos: a } = this._createUndoAndRedoMutation(i, e, s);
+      l.push(...c), g.push(...a);
     }
     return {
       redos: o,
-      undos: c,
+      undos: d,
       preRedos: l,
       preUndos: g
     };
   }
-  _createUndoAndRedoMutation(i, e, r) {
-    const t = this._sheetDrawingService.getBatchUpdateOp(r), { undo: n, redo: s, objects: o } = t, c = [
+  _createUndoAndRedoMutation(i, e, n) {
+    const t = this._sheetDrawingService.getBatchUpdateOp(n), { undo: r, redo: s, objects: o } = t, d = [
       { id: P.id, params: { unitId: i, subUnitId: e, op: s, objects: o, type: T.UPDATE } },
       { id: j.id, params: [i] }
     ], l = [
-      { id: P.id, params: { unitId: i, subUnitId: e, op: n, objects: o, type: T.UPDATE } },
+      { id: P.id, params: { unitId: i, subUnitId: e, op: r, objects: o, type: T.UPDATE } },
       { id: j.id, params: [i] }
     ];
     return {
-      redos: c,
+      redos: d,
       undos: l
     };
   }
   // eslint-disable-next-line max-lines-per-function
-  _getDrawingUndoForRowVisible(i, e, r) {
-    const t = this._drawingManagerService.getDrawingData(i, e), n = [], s = [];
-    if (Object.keys(t).forEach((d) => {
-      const a = t[d], { sheetTransform: h, transform: u, anchorType: m = y.Position } = a;
+  _getDrawingUndoForRowVisible(i, e, n) {
+    const t = this._drawingManagerService.getDrawingData(i, e), r = [], s = [];
+    if (Object.keys(t).forEach((c) => {
+      const a = t[c], { sheetTransform: h, transform: u, anchorType: m = y.Position } = a;
       if (m === y.None)
-        this._remainDrawingSize(u, n, a);
+        this._remainDrawingSize(u, r, a);
       else {
         const { from: f, to: p } = h, { row: I, column: S } = f, { row: v, column: R } = p;
-        for (let _ = 0; _ < r.length; _++) {
-          const C = r[_], { startRow: w, endRow: O, startColumn: b, endColumn: A } = C;
+        for (let _ = 0; _ < n.length; _++) {
+          const C = n[_], { startRow: w, endRow: O, startColumn: b, endColumn: A } = C;
           if (v < w)
             continue;
           if (m === y.Position) {
             let D = null, U = null;
             if (I >= w && I <= O) {
-              const L = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: I, endRow: O });
-              if (L == null)
+              const x = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: I, endRow: O });
+              if (x == null)
                 return;
-              U = { ...u, top: L.startY };
+              U = { ...u, top: x.startY };
             }
             if (U != null && (D = N(U, this._selectionRenderService), D != null && U != null)) {
-              n.push({ ...a, sheetTransform: D, transform: U });
+              r.push({ ...a, sheetTransform: D, transform: U });
               break;
             }
-            this._remainDrawingSize(u, n, a);
+            this._remainDrawingSize(u, r, a);
             continue;
           }
           if (I >= w && v <= O)
@@ -1714,50 +1714,50 @@ let ot = class extends re {
             }
           }
           if (M != null && (E = N(M, this._selectionRenderService)), M != null && E != null) {
-            n.push({ ...a, sheetTransform: E, transform: M });
+            r.push({ ...a, sheetTransform: E, transform: M });
             break;
           } else
-            this._remainDrawingSize(u, n, a);
+            this._remainDrawingSize(u, r, a);
         }
       }
-    }), n.length === 0 && s.length === 0)
+    }), r.length === 0 && s.length === 0)
       return { redos: [], undos: [] };
-    const { redos: o, undos: c } = this._createUndoAndRedoMutation(i, e, n), l = [], g = [];
+    const { redos: o, undos: d } = this._createUndoAndRedoMutation(i, e, r), l = [], g = [];
     if (s.length > 0) {
-      const { redos: d, undos: a } = this._createUndoAndRedoMutation(i, e, s);
-      l.push(...d), g.push(...a);
+      const { redos: c, undos: a } = this._createUndoAndRedoMutation(i, e, s);
+      l.push(...c), g.push(...a);
     }
     return {
       redos: o,
-      undos: c,
+      undos: d,
       preRedos: l,
       preUndos: g
     };
   }
-  _getDrawingUndoForRowAndColSize(i, e, r, t) {
-    const n = this._drawingManagerService.getDrawingData(i, e), s = [];
-    return Object.keys(n).forEach((o) => {
-      const c = n[o], { sheetTransform: l, transform: g, anchorType: d = y.Position } = c;
-      if (d === y.None)
-        this._remainDrawingSize(g, s, c);
+  _getDrawingUndoForRowAndColSize(i, e, n, t) {
+    const r = this._drawingManagerService.getDrawingData(i, e), s = [];
+    return Object.keys(r).forEach((o) => {
+      const d = r[o], { sheetTransform: l, transform: g, anchorType: c = y.Position } = d;
+      if (c === y.None)
+        this._remainDrawingSize(g, s, d);
       else {
         const { from: a, to: h } = l, { row: u, column: m } = a, { row: f, column: p } = h;
-        for (let I = 0; I < r.length; I++) {
-          const S = r[I], { startRow: v, endRow: R, startColumn: _, endColumn: C } = S;
+        for (let I = 0; I < n.length; I++) {
+          const S = n[I], { startRow: v, endRow: R, startColumn: _, endColumn: C } = S;
           if (f < v || p < _)
             continue;
-          if (d === y.Position && (u <= v && f >= R || m <= _ && p >= C)) {
-            this._remainDrawingSize(g, s, c);
+          if (c === y.Position && (u <= v && f >= R || m <= _ && p >= C)) {
+            this._remainDrawingSize(g, s, d);
             continue;
           }
-          const w = B(
+          const w = W(
             { ...l },
             this._selectionRenderService,
             this._skeletonManagerService
           );
           if (w != null) {
             s.push({
-              ...c,
+              ...d,
               transform: w
             });
             break;
@@ -1767,29 +1767,29 @@ let ot = class extends re {
     }), s.length === 0 ? { redos: [], undos: [] } : this._createUndoAndRedoMutation(i, e, s);
   }
   _getUnitIdAndSubUnitId(i, e) {
-    let r, t;
+    let n, t;
     if (e === "insert")
-      r = i.unitId, t = i.subUnitId;
+      n = i.unitId, t = i.subUnitId;
     else {
-      const n = ce(this._univerInstanceService);
-      if (n == null)
+      const r = ce(this._univerInstanceService);
+      if (r == null)
         return;
-      r = n.unitId, t = n.subUnitId;
+      n = r.unitId, t = r.subUnitId;
     }
-    return { unitId: r, subUnitId: t };
+    return { unitId: n, subUnitId: t };
   }
   _moveRangeInterceptor(i) {
     var v, R;
-    const { toRange: e, fromRange: r } = i, t = ce(this._univerInstanceService);
+    const { toRange: e, fromRange: n } = i, t = ce(this._univerInstanceService);
     if (!t)
       return { redos: [], undos: [] };
-    const { unitId: n, subUnitId: s } = t, o = (R = (v = this._renderManagerService.getRenderById(n)) == null ? void 0 : v.with(q)) == null ? void 0 : R.getCurrentSkeleton();
+    const { unitId: r, subUnitId: s } = t, o = (R = (v = this._renderManagerService.getRenderById(r)) == null ? void 0 : v.with(q)) == null ? void 0 : R.getCurrentSkeleton();
     if (!o)
       return { redos: [], undos: [] };
-    const c = Te(o, r);
-    if (!c)
+    const d = Te(o, n);
+    if (!d)
       return { redos: [], undos: [] };
-    const { startX: l, endX: g, startY: d, endY: a } = c, h = this._sheetDrawingService.getDrawingData(n, s), u = [];
+    const { startX: l, endX: g, startY: c, endY: a } = d, h = this._sheetDrawingService.getDrawingData(r, s), u = [];
     Object.keys(h).forEach((_) => {
       const C = h[_];
       if (C.anchorType !== y.Both)
@@ -1797,21 +1797,21 @@ let ot = class extends re {
       const { transform: w } = C;
       if (!w)
         return;
-      const { left: O = 0, top: b = 0, width: A = 0, height: E = 0 } = w, { drawingStartX: M, drawingEndX: D, drawingStartY: U, drawingEndY: L } = {
+      const { left: O = 0, top: b = 0, width: A = 0, height: E = 0 } = w, { drawingStartX: M, drawingEndX: D, drawingStartY: U, drawingEndY: x } = {
         drawingStartX: O,
         drawingEndX: O + A,
         drawingStartY: b,
         drawingEndY: b + E
       };
-      l <= M && D <= g && d <= U && L <= a && u.push(C);
+      l <= M && D <= g && c <= U && x <= a && u.push(C);
     });
-    const m = [], f = [], p = e.startRow - r.startRow, I = e.startColumn - r.startColumn, S = u.map((_) => {
+    const m = [], f = [], p = e.startRow - n.startRow, I = e.startColumn - n.startColumn, S = u.map((_) => {
       const C = _.sheetTransform, w = {
         to: { ...C.to, row: C.to.row + p, column: C.to.column + I },
         from: { ...C.from, row: C.from.row + p, column: C.from.column + I }
-      }, O = B(w, this._selectionRenderService, this._skeletonManagerService);
+      }, O = W(w, this._selectionRenderService, this._skeletonManagerService);
       return {
-        unitId: n,
+        unitId: r,
         subUnitId: s,
         drawingId: _.drawingId,
         transform: O,
@@ -1820,45 +1820,45 @@ let ot = class extends re {
     });
     if (S.length) {
       const _ = this._sheetDrawingService.getBatchUpdateOp(S), { undo: C, redo: w, objects: O } = _;
-      m.push({ id: P.id, params: { unitId: n, subUnitId: s, op: w, objects: O, type: T.UPDATE } }), f.push({ id: P.id, params: { unitId: n, subUnitId: s, op: C, objects: O, type: T.UPDATE } });
+      m.push({ id: P.id, params: { unitId: r, subUnitId: s, op: w, objects: O, type: T.UPDATE } }), f.push({ id: P.id, params: { unitId: r, subUnitId: s, op: C, objects: O, type: T.UPDATE } });
     }
     return { redos: m, undos: f };
   }
   _moveRowInterceptor(i, e) {
-    const r = this._getUnitIdAndSubUnitId(i, e);
-    if (r == null)
+    const n = this._getUnitIdAndSubUnitId(i, e);
+    if (n == null)
       return { redos: [], undos: [] };
-    const { unitId: t, subUnitId: n } = r, { range: s } = i, o = s.startRow, c = s.endRow, l = [], g = [], d = this._sheetDrawingService.getDrawingData(t, n), a = [], h = [];
-    if (Object.keys(d).forEach((u) => {
-      const m = d[u], { sheetTransform: f, transform: p, anchorType: I = y.Position } = m;
+    const { unitId: t, subUnitId: r } = n, { range: s } = i, o = s.startRow, d = s.endRow, l = [], g = [], c = this._sheetDrawingService.getDrawingData(t, r), a = [], h = [];
+    if (Object.keys(c).forEach((u) => {
+      const m = c[u], { sheetTransform: f, transform: p, anchorType: I = y.Position } = m;
       if (f == null || p == null)
         return;
       let S, v;
       if (e === "insert") {
-        const _ = this._expandRow(f, p, o, c, I);
+        const _ = this._expandRow(f, p, o, d, I);
         S = _ == null ? void 0 : _.newSheetTransform, v = _ == null ? void 0 : _.newTransform;
       } else {
         const { from: _, to: C } = f, { row: w } = _, { row: O } = C;
-        if (I === y.Both && w >= o && O <= c)
-          h.push({ unitId: t, subUnitId: n, drawingId: u });
+        if (I === y.Both && w >= o && O <= d)
+          h.push({ unitId: t, subUnitId: r, drawingId: u });
         else {
-          const b = this._shrinkRow(f, p, o, c, I);
+          const b = this._shrinkRow(f, p, o, d, I);
           S = b == null ? void 0 : b.newSheetTransform, v = b == null ? void 0 : b.newTransform;
         }
       }
       if (!S || !v)
         return;
-      const R = { unitId: t, subUnitId: n, drawingId: u, transform: v, sheetTransform: S };
+      const R = { unitId: t, subUnitId: r, drawingId: u, transform: v, sheetTransform: S };
       a.push(R);
     }), a.length === 0 && h.length === 0)
       return { redos: [], undos: [] };
     if (a.length > 0) {
       const u = this._sheetDrawingService.getBatchUpdateOp(a), { undo: m, redo: f, objects: p } = u;
-      l.push({ id: P.id, params: { unitId: t, subUnitId: n, op: f, objects: p, type: T.UPDATE } }), g.push({ id: P.id, params: { unitId: t, subUnitId: n, op: m, objects: p, type: T.UPDATE } });
+      l.push({ id: P.id, params: { unitId: t, subUnitId: r, op: f, objects: p, type: T.UPDATE } }), g.push({ id: P.id, params: { unitId: t, subUnitId: r, op: m, objects: p, type: T.UPDATE } });
     }
     if (h.length > 0) {
       const u = this._sheetDrawingService.getBatchRemoveOp(h), m = u.undo, f = u.redo, p = u.objects;
-      l.push({ id: P.id, params: { unitId: t, subUnitId: n, op: f, objects: p, type: T.REMOVE } }), g.push({ id: P.id, params: { unitId: t, subUnitId: n, op: m, objects: p, type: T.INSERT } });
+      l.push({ id: P.id, params: { unitId: t, subUnitId: r, op: f, objects: p, type: T.REMOVE } }), g.push({ id: P.id, params: { unitId: t, subUnitId: r, op: m, objects: p, type: T.INSERT } });
     }
     return l.push({ id: j.id, params: [t] }), g.push({ id: j.id, params: [t] }), {
       redos: l,
@@ -1866,210 +1866,210 @@ let ot = class extends re {
     };
   }
   _moveColInterceptor(i, e) {
-    const r = this._getUnitIdAndSubUnitId(i, e);
-    if (r == null)
+    const n = this._getUnitIdAndSubUnitId(i, e);
+    if (n == null)
       return { redos: [], undos: [] };
-    const { unitId: t, subUnitId: n } = r, { range: s } = i, o = s.startColumn, c = s.endColumn, l = [], g = [], d = this._sheetDrawingService.getDrawingData(t, n), a = [], h = [];
-    if (Object.keys(d).forEach((u) => {
-      const m = d[u], { sheetTransform: f, transform: p, anchorType: I = y.Position } = m;
+    const { unitId: t, subUnitId: r } = n, { range: s } = i, o = s.startColumn, d = s.endColumn, l = [], g = [], c = this._sheetDrawingService.getDrawingData(t, r), a = [], h = [];
+    if (Object.keys(c).forEach((u) => {
+      const m = c[u], { sheetTransform: f, transform: p, anchorType: I = y.Position } = m;
       if (f == null || p == null)
         return;
       let S, v;
       if (e === "insert") {
-        const _ = this._expandCol(f, p, o, c, I);
+        const _ = this._expandCol(f, p, o, d, I);
         S = _ == null ? void 0 : _.newSheetTransform, v = _ == null ? void 0 : _.newTransform;
       } else {
         const { from: _, to: C } = f, { column: w } = _, { column: O } = C;
-        if (I === y.Both && w >= o && O <= c)
-          h.push({ unitId: t, subUnitId: n, drawingId: u });
+        if (I === y.Both && w >= o && O <= d)
+          h.push({ unitId: t, subUnitId: r, drawingId: u });
         else {
-          const b = this._shrinkCol(f, p, o, c, I);
+          const b = this._shrinkCol(f, p, o, d, I);
           S = b == null ? void 0 : b.newSheetTransform, v = b == null ? void 0 : b.newTransform;
         }
       }
       if (!S || !v)
         return;
-      const R = { unitId: t, subUnitId: n, drawingId: u, transform: v, sheetTransform: S };
+      const R = { unitId: t, subUnitId: r, drawingId: u, transform: v, sheetTransform: S };
       a.push(R);
     }), a.length === 0 && h.length === 0)
       return { redos: [], undos: [] };
     if (a.length > 0) {
       const u = this._sheetDrawingService.getBatchUpdateOp(a), { undo: m, redo: f, objects: p } = u;
-      l.push({ id: P.id, params: { unitId: t, subUnitId: n, op: f, objects: p, type: T.UPDATE } }), g.push({ id: P.id, params: { unitId: t, subUnitId: n, op: m, objects: p, type: T.UPDATE } });
+      l.push({ id: P.id, params: { unitId: t, subUnitId: r, op: f, objects: p, type: T.UPDATE } }), g.push({ id: P.id, params: { unitId: t, subUnitId: r, op: m, objects: p, type: T.UPDATE } });
     }
     if (h.length > 0) {
       const u = this._sheetDrawingService.getBatchRemoveOp(h), m = u.undo, f = u.redo, p = u.objects;
-      l.push({ id: P.id, params: { unitId: t, subUnitId: n, op: f, objects: p, type: T.REMOVE } }), g.push({ id: P.id, params: { unitId: t, subUnitId: n, op: m, objects: p, type: T.INSERT } });
+      l.push({ id: P.id, params: { unitId: t, subUnitId: r, op: f, objects: p, type: T.REMOVE } }), g.push({ id: P.id, params: { unitId: t, subUnitId: r, op: m, objects: p, type: T.INSERT } });
     }
     return l.push({ id: j.id, params: [t] }), g.push({ id: j.id, params: [t] }), { redos: l, undos: g };
   }
-  _expandCol(i, e, r, t, n = y.Position) {
-    const s = t - r + 1, { from: o, to: c } = i, { column: l } = o, { column: g } = c;
-    if (n === y.None)
+  _expandCol(i, e, n, t, r = y.Position) {
+    const s = t - n + 1, { from: o, to: d } = i, { column: l } = o, { column: g } = d;
+    if (r === y.None)
       return {
         newSheetTransform: N({ ...e }, this._selectionRenderService),
         newTransform: e
       };
-    let d = null, a = null;
-    if (l >= r) {
-      const h = this._skeletonManagerService.attachRangeWithCoord({ startColumn: r, endColumn: t, startRow: o.row, endRow: c.row });
+    let c = null, a = null;
+    if (l >= n) {
+      const h = this._skeletonManagerService.attachRangeWithCoord({ startColumn: n, endColumn: t, startRow: o.row, endRow: d.row });
       if (h == null)
         return;
-      a = { ...e, left: (e.left || 0) + h.endX - h.startX }, d = N(a, this._selectionRenderService);
+      a = { ...e, left: (e.left || 0) + h.endX - h.startX }, c = N(a, this._selectionRenderService);
     } else if (g >= t)
-      if (n === y.Both)
-        d = {
+      if (r === y.Both)
+        c = {
           from: { ...o },
-          to: { ...c, column: g + s }
-        }, a = B(d, this._selectionRenderService, this._skeletonManagerService);
+          to: { ...d, column: g + s }
+        }, a = W(c, this._selectionRenderService, this._skeletonManagerService);
       else
         return {
           newSheetTransform: N({ ...e }, this._selectionRenderService),
           newTransform: e
         };
-    return d != null && a != null ? {
-      newSheetTransform: d,
+    return c != null && a != null ? {
+      newSheetTransform: c,
       newTransform: a
     } : null;
   }
-  _shrinkCol(i, e, r, t, n = y.Position) {
-    const s = t - r + 1, { from: o, to: c } = i, { column: l } = o, { column: g } = c;
-    if (n === y.None)
+  _shrinkCol(i, e, n, t, r = y.Position) {
+    const s = t - n + 1, { from: o, to: d } = i, { column: l } = o, { column: g } = d;
+    if (r === y.None)
       return {
         newSheetTransform: N({ ...e }, this._selectionRenderService),
         newTransform: e
       };
-    let d = null, a = null;
+    let c = null, a = null;
     if (l > t)
-      d = {
+      c = {
         from: { ...o, column: l - s },
-        to: { ...c, column: g - s }
-      }, a = B(d, this._selectionRenderService, this._skeletonManagerService);
+        to: { ...d, column: g - s }
+      }, a = W(c, this._selectionRenderService, this._skeletonManagerService);
     else {
-      if (l >= r && g <= t)
+      if (l >= n && g <= t)
         return null;
-      if (l < r && g > t)
-        if (n === y.Both)
-          d = {
+      if (l < n && g > t)
+        if (r === y.Both)
+          c = {
             from: { ...o },
-            to: { ...c, column: g - s }
-          }, a = B(d, this._selectionRenderService, this._skeletonManagerService);
+            to: { ...d, column: g - s }
+          }, a = W(c, this._selectionRenderService, this._skeletonManagerService);
         else
           return {
             newSheetTransform: N({ ...e }, this._selectionRenderService),
             newTransform: e
           };
-      else if (l >= r && l <= t) {
-        if (l === r)
+      else if (l >= n && l <= t) {
+        if (l === n)
           a = { ...e, left: (e.left || 0) - i.from.columnOffset };
         else {
-          const h = this._skeletonManagerService.attachRangeWithCoord({ startColumn: r, endColumn: l - 1, startRow: o.row, endRow: c.row });
+          const h = this._skeletonManagerService.attachRangeWithCoord({ startColumn: n, endColumn: l - 1, startRow: o.row, endRow: d.row });
           if (h == null)
             return;
           a = { ...e, left: (e.left || 0) - h.endX + h.startX - i.from.columnOffset };
         }
-        d = N(a, this._selectionRenderService);
-      } else if (g >= r && g <= t && n === y.Both) {
+        c = N(a, this._selectionRenderService);
+      } else if (g >= n && g <= t && r === y.Both) {
         const h = this._skeletonManagerService.attachRangeWithCoord({
-          startColumn: r - 1,
-          endColumn: r - 1,
+          startColumn: n - 1,
+          endColumn: n - 1,
           startRow: o.row,
-          endRow: c.row
+          endRow: d.row
         });
         if (h == null)
           return;
-        d = {
+        c = {
           from: { ...o },
-          to: { ...c, column: r - 1, columnOffset: h.endX - h.startX }
-        }, a = B(d, this._selectionRenderService, this._skeletonManagerService);
+          to: { ...d, column: n - 1, columnOffset: h.endX - h.startX }
+        }, a = W(c, this._selectionRenderService, this._skeletonManagerService);
       }
     }
-    return d != null && a != null ? {
-      newSheetTransform: d,
+    return c != null && a != null ? {
+      newSheetTransform: c,
       newTransform: a
     } : null;
   }
-  _expandRow(i, e, r, t, n = y.Position) {
-    const s = t - r + 1, { from: o, to: c } = i, { row: l } = o, { row: g } = c;
-    if (n === y.None)
+  _expandRow(i, e, n, t, r = y.Position) {
+    const s = t - n + 1, { from: o, to: d } = i, { row: l } = o, { row: g } = d;
+    if (r === y.None)
       return {
         newSheetTransform: N({ ...e }, this._selectionRenderService),
         newTransform: e
       };
-    let d = null, a = null;
-    if (l >= r) {
-      const h = this._skeletonManagerService.attachRangeWithCoord({ startRow: r, endRow: t, startColumn: o.column, endColumn: c.column });
+    let c = null, a = null;
+    if (l >= n) {
+      const h = this._skeletonManagerService.attachRangeWithCoord({ startRow: n, endRow: t, startColumn: o.column, endColumn: d.column });
       if (h == null)
         return;
-      a = { ...e, top: (e.top || 0) + h.endY - h.startY }, d = N(a, this._selectionRenderService);
+      a = { ...e, top: (e.top || 0) + h.endY - h.startY }, c = N(a, this._selectionRenderService);
     } else if (g >= t)
-      if (n === y.Both)
-        d = {
+      if (r === y.Both)
+        c = {
           from: { ...o },
           to: {
-            ...c,
+            ...d,
             row: g + s
           }
-        }, a = B(d, this._selectionRenderService, this._skeletonManagerService);
+        }, a = W(c, this._selectionRenderService, this._skeletonManagerService);
       else
         return {
           newSheetTransform: N({ ...e }, this._selectionRenderService),
           newTransform: e
         };
-    return d != null && a != null ? {
-      newSheetTransform: d,
+    return c != null && a != null ? {
+      newSheetTransform: c,
       newTransform: a
     } : null;
   }
-  _shrinkRow(i, e, r, t, n = y.Position) {
-    const s = t - r + 1, { from: o, to: c } = i, { row: l } = o, { row: g } = c;
-    if (n === y.None)
+  _shrinkRow(i, e, n, t, r = y.Position) {
+    const s = t - n + 1, { from: o, to: d } = i, { row: l } = o, { row: g } = d;
+    if (r === y.None)
       return {
         newSheetTransform: N({ ...e }, this._selectionRenderService),
         newTransform: e
       };
-    let d = null, a = null;
+    let c = null, a = null;
     if (l > t)
-      d = {
+      c = {
         from: { ...o, row: l - s },
-        to: { ...c, row: g - s }
-      }, a = B(d, this._selectionRenderService, this._skeletonManagerService);
+        to: { ...d, row: g - s }
+      }, a = W(c, this._selectionRenderService, this._skeletonManagerService);
     else {
-      if (l >= r && g <= t)
+      if (l >= n && g <= t)
         return null;
-      if (l < r && g > t)
-        if (n === y.Both)
-          d = {
+      if (l < n && g > t)
+        if (r === y.Both)
+          c = {
             from: { ...o },
-            to: { ...c, row: g - s }
-          }, a = B(d, this._selectionRenderService, this._skeletonManagerService);
+            to: { ...d, row: g - s }
+          }, a = W(c, this._selectionRenderService, this._skeletonManagerService);
         else
           return {
             newSheetTransform: N({ ...e }, this._selectionRenderService),
             newTransform: e
           };
-      else if (l >= r && l <= t) {
-        if (l === r)
+      else if (l >= n && l <= t) {
+        if (l === n)
           a = { ...e, top: (e.top || 0) - i.from.rowOffset };
         else {
-          const h = this._skeletonManagerService.attachRangeWithCoord({ startRow: r, endRow: l - 1, startColumn: o.column, endColumn: c.column });
+          const h = this._skeletonManagerService.attachRangeWithCoord({ startRow: n, endRow: l - 1, startColumn: o.column, endColumn: d.column });
           if (h == null)
             return;
           a = { ...e, top: (e.top || 0) - h.endY + h.startY - i.from.rowOffset };
         }
-        d = N(a, this._selectionRenderService);
-      } else if (g >= r && g <= t && n === y.Both) {
-        const h = this._skeletonManagerService.attachRangeWithCoord({ startColumn: o.column, endColumn: o.column, startRow: r - 1, endRow: r - 1 });
+        c = N(a, this._selectionRenderService);
+      } else if (g >= n && g <= t && r === y.Both) {
+        const h = this._skeletonManagerService.attachRangeWithCoord({ startColumn: o.column, endColumn: o.column, startRow: n - 1, endRow: n - 1 });
         if (h == null)
           return;
-        d = {
+        c = {
           from: { ...o },
-          to: { ...c, row: r - 1, rowOffset: h.endY - h.startY }
-        }, a = B(d, this._selectionRenderService, this._skeletonManagerService);
+          to: { ...d, row: n - 1, rowOffset: h.endY - h.startY }
+        }, a = W(c, this._selectionRenderService, this._skeletonManagerService);
       }
     }
-    return d != null && a != null ? {
-      newSheetTransform: d,
+    return c != null && a != null ? {
+      newSheetTransform: c,
       newTransform: a
     } : null;
   }
@@ -2077,17 +2077,17 @@ let ot = class extends re {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((i) => {
         i.id === Dr.id && setTimeout(() => {
-          const e = i.params, { unitId: r, subUnitId: t } = e, n = this._drawingManagerService.drawingManagerData, s = [], o = [];
-          Object.keys(n).forEach((c) => {
-            const l = n[c];
+          const e = i.params, { unitId: n, subUnitId: t } = e, r = this._drawingManagerService.drawingManagerData, s = [], o = [];
+          Object.keys(r).forEach((d) => {
+            const l = r[d];
             l != null && Object.keys(l).forEach((g) => {
-              const d = l[g].data;
-              d != null && Object.keys(d).forEach((a) => {
-                if (c === r && g === t) {
-                  const h = d[a];
-                  h.transform = B(h.sheetTransform, this._selectionRenderService, this._skeletonManagerService), s.push(d[a]);
+              const c = l[g].data;
+              c != null && Object.keys(c).forEach((a) => {
+                if (d === n && g === t) {
+                  const h = c[a];
+                  h.transform = W(h.sheetTransform, this._selectionRenderService, this._skeletonManagerService), s.push(c[a]);
                 } else
-                  o.push(d[a]);
+                  o.push(c[a]);
               });
             });
           }), this._drawingManagerService.removeNotification(o), this._drawingManagerService.addNotification(s);
@@ -2099,22 +2099,22 @@ let ot = class extends re {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((i) => {
         Fi.includes(i.id) && requestIdleCallback(() => {
-          const e = i.params, { unitId: r, subUnitId: t, ranges: n } = e;
-          this._refreshDrawingTransform(r, t, n);
+          const e = i.params, { unitId: n, subUnitId: t, ranges: r } = e;
+          this._refreshDrawingTransform(n, t, r);
         });
       })
     );
   }
-  _refreshDrawingTransform(i, e, r) {
-    const t = this._drawingManagerService.getDrawingData(i, e), n = [];
+  _refreshDrawingTransform(i, e, n) {
+    const t = this._drawingManagerService.getDrawingData(i, e), r = [];
     Object.keys(t).forEach((s) => {
-      const o = t[s], { sheetTransform: c, transform: l, anchorType: g = y.Position } = o;
+      const o = t[s], { sheetTransform: d, transform: l, anchorType: g = y.Position } = o;
       if (g === y.None)
         return !0;
-      const { from: d, to: a } = c, { row: h, column: u } = d, { row: m, column: f } = a;
-      for (let p = 0; p < r.length; p++) {
-        const I = r[p], { startRow: S, endRow: v, startColumn: R, endColumn: _ } = I;
-        if (Rn.intersects(
+      const { from: c, to: a } = d, { row: h, column: u } = c, { row: m, column: f } = a;
+      for (let p = 0; p < n.length; p++) {
+        const I = n[p], { startRow: S, endRow: v, startColumn: R, endColumn: _ } = I;
+        if (Dn.intersects(
           {
             startRow: S,
             endRow: v,
@@ -2128,8 +2128,8 @@ let ot = class extends re {
             endColumn: f
           }
         ) || h > v || u > _) {
-          const C = g === y.Position, w = B(c, this._selectionRenderService, this._skeletonManagerService);
-          n.push({
+          const C = g === y.Position, w = W(d, this._selectionRenderService, this._skeletonManagerService);
+          r.push({
             ...o,
             transform: {
               ...w,
@@ -2140,100 +2140,100 @@ let ot = class extends re {
           break;
         }
       }
-    }), n.length !== 0 && (this._drawingManagerService.refreshTransform(n), this._commandService.syncExecuteCommand(j.id, [i]));
+    }), r.length !== 0 && (this._drawingManagerService.refreshTransform(r), this._commandService.syncExecuteCommand(j.id, [i]));
   }
 };
-ot = Vi([
+ot = ki([
   Q(1, J),
-  Q(2, W),
+  Q(2, B),
   Q(3, pe),
-  Q(4, x(q)),
-  Q(5, x(at)),
+  Q(4, $(q)),
+  Q(5, $(at)),
   Q(6, F),
   Q(7, K),
   Q(8, fe)
 ], ot);
-var Xi = Object.defineProperty, Hi = Object.getOwnPropertyDescriptor, zi = (i, e, r, t) => {
-  for (var n = t > 1 ? void 0 : t ? Hi(e, r) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (n = (t ? o(e, r, n) : o(n)) || n);
-  return t && n && Xi(e, r, n), n;
-}, se = (i, e) => (r, t) => e(r, t, i);
-function Ki(i, e, r, t) {
-  const { scaleX: n, scaleY: s } = e.getAncestorScale(), o = e.getViewport(zn.VIEW_MAIN), c = {
+var Xi = Object.defineProperty, Hi = Object.getOwnPropertyDescriptor, zi = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? Hi(e, n) : e, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (r = (t ? o(e, n, r) : o(r)) || r);
+  return t && r && Xi(e, n, r), r;
+}, oe = (i, e) => (n, t) => e(n, t, i);
+function Ki(i, e, n, t) {
+  const { scaleX: r, scaleY: s } = e.getAncestorScale(), o = e.getViewport(Kn.VIEW_MAIN), d = {
     left: !0,
     top: !0
   };
   if (!o)
     return {
       ...i,
-      absolute: c
+      absolute: d
     };
-  const { left: l, right: g, top: d, bottom: a } = i, h = t.getFreeze(), { startColumn: u, startRow: m, xSplit: f, ySplit: p } = h, I = r.getNoMergeCellPositionByIndexWithNoHeader(m - p, u - f), S = r.getNoMergeCellPositionByIndexWithNoHeader(m, u), { rowHeaderWidth: v, columnHeaderHeight: R } = r, _ = S.startX - I.startX, C = S.startY - I.startY, { top: w, left: O, viewportScrollX: b, viewportScrollY: A } = o;
+  const { left: l, right: g, top: c, bottom: a } = i, h = t.getFreeze(), { startColumn: u, startRow: m, xSplit: f, ySplit: p } = h, I = n.getNoMergeCellPositionByIndexWithNoHeader(m - p, u - f), S = n.getNoMergeCellPositionByIndexWithNoHeader(m, u), { rowHeaderWidth: v, columnHeaderHeight: R } = n, _ = S.startX - I.startX, C = S.startY - I.startY, { top: w, left: O, viewportScrollX: b, viewportScrollY: A } = o;
   let E, M;
-  l < O ? (c.left = !0, E = (_ + v + (l - O)) * n, M = Math.max(
+  l < O ? (d.left = !0, E = (_ + v + (l - O)) * r, M = Math.max(
     Math.min(
-      (_ + v + (g - O)) * n,
-      (_ + v) * n
+      (_ + v + (g - O)) * r,
+      (_ + v) * r
     ),
-    (g - b) * n
-  )) : (c.left = !1, E = Math.max((l - b) * n, (_ + v) * n), M = Math.max((g - b) * n, (_ + v) * n));
+    (g - b) * r
+  )) : (d.left = !1, E = Math.max((l - b) * r, (_ + v) * r), M = Math.max((g - b) * r, (_ + v) * r));
   let D, U;
-  return d < w ? (c.top = !0, D = (C + R + (d - w)) * s, U = Math.max(
+  return c < w ? (d.top = !0, D = (C + R + (c - w)) * s, U = Math.max(
     Math.min(
       (C + R + (g - w)) * s,
       (C + R) * s
     ),
     (a - A) * s
-  )) : (c.top = !1, D = Math.max((d - A) * s, (C + R) * s), U = Math.max((a - A) * s, (C + R) * s)), {
+  )) : (d.top = !1, D = Math.max((c - A) * s, (C + R) * s), U = Math.max((a - A) * s, (C + R) * s)), {
     left: E,
     right: M,
     top: D,
     bottom: U,
-    absolute: c
+    absolute: d
   };
 }
-const Qe = (i, e, r, t) => {
-  const { scene: n } = e, { left: s, top: o, width: c, height: l, angle: g } = i, d = {
+const Qe = (i, e, n, t) => {
+  const { scene: r } = e, { left: s, top: o, width: d, height: l, angle: g } = i, c = {
     left: s,
-    right: s + c,
+    right: s + d,
     top: o,
     bottom: o + l
-  }, a = Ki(d, n, r, t), { scaleX: h, scaleY: u } = n.getAncestorScale();
+  }, a = Ki(c, r, n, t), { scaleX: h, scaleY: u } = r.getAncestorScale();
   return {
     startX: a.left,
     endX: a.right,
     startY: a.top,
     endY: a.bottom,
     rotate: g,
-    width: c * h,
+    width: d * h,
     height: l * u,
     absolute: a.absolute
   };
 };
-let $e = class extends re {
-  constructor(e, r, t, n, s, o, c) {
+let Le = class extends ie {
+  constructor(e, n, t, r, s, o, d) {
     super();
-    k(this, "_domLayerMap", /* @__PURE__ */ new Map());
-    k(this, "_domLayerInfoMap", /* @__PURE__ */ new Map());
-    k(this, "_transformChange$", new Ke());
-    k(this, "transformChange$", this._transformChange$.asObservable());
-    k(this, "_add$", new Ke());
-    k(this, "add$", this._add$.asObservable());
-    k(this, "_remove$", new Ke());
-    k(this, "remove$", this._remove$.asObservable());
-    k(this, "_hooks", []);
-    this._renderManagerService = e, this._univerInstanceService = r, this._commandService = t, this._drawingManagerService = n, this._canvasFloatDomService = s, this._sheetDrawingService = o, this._lifecycleService = c, this._drawingAddListener(), this._featureUpdateListener(), this._deleteListener(), this._bindScrollEvent();
+    V(this, "_domLayerMap", /* @__PURE__ */ new Map());
+    V(this, "_domLayerInfoMap", /* @__PURE__ */ new Map());
+    V(this, "_transformChange$", new Ke());
+    V(this, "transformChange$", this._transformChange$.asObservable());
+    V(this, "_add$", new Ke());
+    V(this, "add$", this._add$.asObservable());
+    V(this, "_remove$", new Ke());
+    V(this, "remove$", this._remove$.asObservable());
+    V(this, "_hooks", []);
+    this._renderManagerService = e, this._univerInstanceService = n, this._commandService = t, this._drawingManagerService = r, this._canvasFloatDomService = s, this._sheetDrawingService = o, this._lifecycleService = d, this._drawingAddListener(), this._featureUpdateListener(), this._deleteListener(), this._bindScrollEvent();
   }
   _bindScrollEvent() {
-    this._lifecycleService.lifecycle$.pipe(ae((e) => e === Mn.Rendered), gr(1)).subscribe(() => {
+    this._lifecycleService.lifecycle$.pipe(re((e) => e === bn.Rendered), mr(1)).subscribe(() => {
       this._scrollUpdateListener();
     });
   }
-  _ensureMap(e, r) {
+  _ensureMap(e, n) {
     let t = this._domLayerMap.get(e);
     t || (t = /* @__PURE__ */ new Map(), this._domLayerMap.set(e, t));
-    let n = t.get(r);
-    return n || (n = /* @__PURE__ */ new Map(), t.set(r, n)), n;
+    let r = t.get(n);
+    return r || (r = /* @__PURE__ */ new Map(), t.set(n, r)), r;
   }
   getFloatDomInfo(e) {
     return this._domLayerInfoMap.get(e);
@@ -2241,36 +2241,36 @@ let $e = class extends re {
   _getSceneAndTransformerByDrawingSearch(e) {
     if (e == null)
       return;
-    const r = this._renderManagerService.getRenderById(e), t = r == null ? void 0 : r.scene;
-    if (r == null || t == null)
+    const n = this._renderManagerService.getRenderById(e), t = n == null ? void 0 : n.scene;
+    if (n == null || t == null)
       return null;
-    const n = t.getTransformerByCreate(), s = r.engine.getCanvasElement();
-    return { scene: t, transformer: n, renderObject: r, canvas: s };
+    const r = t.getTransformerByCreate(), s = n.engine.getCanvasElement();
+    return { scene: t, transformer: r, renderObject: n, canvas: s };
   }
   _getFloatDomProps(e) {
-    let r;
+    let n;
     return this._hooks.forEach((t) => {
-      r = t.onGetFloatDomProps(e);
-    }), r;
+      n = t.onGetFloatDomProps(e);
+    }), n;
   }
   // eslint-disable-next-line max-lines-per-function
   _drawingAddListener() {
     this.disposeWithMe(
       // eslint-disable-next-line max-lines-per-function
       this._drawingManagerService.add$.subscribe((e) => {
-        e.forEach((r) => {
+        e.forEach((n) => {
           var ut, ht, gt;
-          const { unitId: t, subUnitId: n, drawingId: s } = r, o = ce(this._univerInstanceService, { unitId: t, subUnitId: n }), c = this._drawingManagerService.getDrawingByParam(r), l = this._univerInstanceService.getUnit(t);
+          const { unitId: t, subUnitId: r, drawingId: s } = n, o = ce(this._univerInstanceService, { unitId: t, subUnitId: r }), d = this._drawingManagerService.getDrawingByParam(n), l = this._univerInstanceService.getUnit(t);
           if (!l)
             return;
           const g = l.getActiveSheet().getSheetId();
-          if (!c || !o)
+          if (!d || !o)
             return;
-          const d = (ut = this._renderManagerService.getRenderById(t)) == null ? void 0 : ut.with(q).getWorksheetSkeleton(n);
-          if (!d)
+          const c = (ut = this._renderManagerService.getRenderById(t)) == null ? void 0 : ut.with(q).getWorksheetSkeleton(r);
+          if (!c)
             return;
-          const { transform: a, drawingType: h, data: u } = c;
-          if (h !== V.DRAWING_DOM && h !== V.DRAWING_CHART)
+          const { transform: a, drawingType: h, data: u } = d;
+          if (h !== k.DRAWING_DOM && h !== k.DRAWING_CHART)
             return;
           const m = this._getSceneAndTransformerByDrawingSearch(t);
           if (m == null)
@@ -2278,9 +2278,9 @@ let $e = class extends re {
           const { scene: f, canvas: p } = m;
           if (a == null)
             return !0;
-          if (g !== n)
+          if (g !== r)
             return;
-          const { left: I, top: S, width: v, height: R, angle: _, flipX: C, flipY: w, skewX: O, skewY: b } = a, A = ze({ unitId: t, subUnitId: n, drawingId: s }), E = f.getObject(A);
+          const { left: I, top: S, width: v, height: R, angle: _, flipX: C, flipY: w, skewX: O, skewY: b } = a, A = ze({ unitId: t, subUnitId: r, drawingId: s }), E = f.getObject(A);
           if (E != null) {
             E.transformByState({ left: I, top: S, width: v, height: R, angle: _, flipX: C, flipY: w, skewX: O, skewY: b });
             return;
@@ -2290,22 +2290,22 @@ let $e = class extends re {
             top: S,
             width: v,
             height: R,
-            zIndex: this._drawingManagerService.getDrawingOrder(t, n).length - 1
-          }, D = h === V.DRAWING_CHART;
+            zIndex: this._drawingManagerService.getDrawingOrder(t, r).length - 1
+          }, D = h === k.DRAWING_CHART;
           D && (M.fill = "white", M.rotateEnabled = !1, u && u.border && (M.stroke = u.border), M.paintFirst = "stroke", M.strokeWidth = 1, M.borderEnabled = !1, M.radius = 8);
           const U = new wt(A, M);
-          D && U.setObjectType(Xn.CHART), f.addObject(U, Hn), c.allowTransform !== !1 && f.attachTransformerTo(U);
-          const L = this._ensureMap(t, n), Z = new bn(), un = Qe(U, m.renderObject, d.skeleton, o.worksheet), Fe = new mr(un), hn = {
+          D && U.setObjectType(Hn.CHART), f.addObject(U, zn), d.allowTransform !== !1 && f.attachTransformerTo(U);
+          const x = this._ensureMap(t, r), Z = new yn(), hn = Qe(U, m.renderObject, c.skeleton, o.worksheet), Fe = new fr(hn), gn = {
             dispose: Z,
             rect: U,
             position$: Fe,
             unitId: t,
-            subUnitId: n
+            subUnitId: r
           };
           this._canvasFloatDomService.addFloatDom({
             position$: Fe,
             id: s,
-            componentKey: c.componentKey,
+            componentKey: d.componentKey,
             onPointerDown: (G) => {
               p.dispatchEvent(new PointerEvent(G.type, G));
             },
@@ -2318,83 +2318,82 @@ let $e = class extends re {
             onWheel: (G) => {
               p.dispatchEvent(new WheelEvent(G.type, G));
             },
-            props: (gt = (ht = L.get(s)) == null ? void 0 : ht.props) != null ? gt : this._getFloatDomProps(s),
+            props: (gt = (ht = x.get(s)) == null ? void 0 : ht.props) != null ? gt : this._getFloatDomProps(s),
             data: u,
             unitId: t
           });
           const lt = U.onTransformChange$.subscribeEvent(() => {
-            const G = Qe(U, m.renderObject, d.skeleton, o.worksheet);
+            const G = Qe(U, m.renderObject, c.skeleton, o.worksheet);
             Fe.next(
               G
             );
           });
           Z.add(() => {
             this._canvasFloatDomService.removeFloatDom(s);
-          }), lt && Z.add(lt), this._domLayerInfoMap.set(s, hn), L.set(s, {
-            ...L.get(s)
+          }), lt && Z.add(lt), this._domLayerInfoMap.set(s, gn), x.set(s, {
+            ...x.get(s)
           });
         });
       })
     ), this.disposeWithMe(
       this._drawingManagerService.remove$.subscribe((e) => {
-        e.forEach((r) => {
-          const { unitId: t, subUnitId: n, drawingId: s } = r, o = ze({ unitId: t, subUnitId: n, drawingId: s }), c = this._getSceneAndTransformerByDrawingSearch(t);
-          if (c == null)
+        e.forEach((n) => {
+          const { unitId: t, subUnitId: r, drawingId: s } = n, o = ze({ unitId: t, subUnitId: r, drawingId: s }), d = this._getSceneAndTransformerByDrawingSearch(t);
+          if (d == null)
             return;
-          const { transformer: l, scene: g } = c, d = g.getObject(o);
-          d != null && d.oKey && l.clearControlByIds([d == null ? void 0 : d.oKey]);
+          const { transformer: l, scene: g } = d, c = g.getObject(o);
+          c != null && c.oKey && l.clearControlByIds([c == null ? void 0 : c.oKey]);
         });
       })
     );
   }
   _scrollUpdateListener() {
-    const e = this._univerInstanceService.getCurrentUnitForType(Y.UNIVER_SHEET);
-    if (!e)
-      return;
-    const r = (t, n) => {
-      var d;
-      const s = this._getSceneAndTransformerByDrawingSearch(t), o = this._ensureMap(t, n), c = Array.from(o.keys()), l = ce(this._univerInstanceService, { unitId: t, subUnitId: n }), g = (d = this._renderManagerService.getRenderById(t)) == null ? void 0 : d.with(q).getWorksheetSkeleton(n);
-      !s || !l || !g || c.forEach((a) => {
-        const h = this._domLayerInfoMap.get(a);
-        if (h) {
-          const u = Qe(h.rect, s.renderObject, g.skeleton, l.worksheet);
-          h.position$.next(u);
+    const e = (n, t) => {
+      var g;
+      const r = this._getSceneAndTransformerByDrawingSearch(n), s = this._ensureMap(n, t), o = Array.from(s.keys()), d = ce(this._univerInstanceService, { unitId: n, subUnitId: t }), l = (g = this._renderManagerService.getRenderById(n)) == null ? void 0 : g.with(q).getWorksheetSkeleton(t);
+      !r || !d || !l || o.forEach((c) => {
+        const a = this._domLayerInfoMap.get(c);
+        if (a) {
+          const h = Qe(a.rect, r.renderObject, l.skeleton, d.worksheet);
+          a.position$.next(h);
         }
       });
     };
     this.disposeWithMe(
-      e.activeSheet$.pipe(
-        ae((t) => !!t),
-        Ee((t) => {
-          const n = this._renderManagerService.getRenderById(t.getUnitId());
-          return n ? { render: n, unitId: e.getUnitId(), subUnitId: t.getSheetId() } : null;
+      this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET).pipe(
+        re((n) => !!n),
+        St((n) => n.activeSheet$),
+        re((n) => !!n),
+        Ee((n) => {
+          const t = this._renderManagerService.getRenderById(n.getUnitId());
+          return t ? { render: t, unitId: n.getUnitId(), subUnitId: n.getSheetId() } : null;
         }),
-        ae((t) => !!t),
-        fr(
-          (t) => yn(t.render.scene.getViewport(tr.VIEW_MAIN).onScrollAfter$).pipe(Ee(() => ({ unitId: t.unitId, subUnitId: t.subUnitId })))
+        re((n) => !!n),
+        St(
+          (n) => On(n.render.scene.getViewport(nr.VIEW_MAIN).onScrollAfter$).pipe(Ee(() => ({ unitId: n.unitId, subUnitId: n.subUnitId })))
         )
-      ).subscribe(({ unitId: t, subUnitId: n }) => {
-        r(t, n);
+      ).subscribe(({ unitId: n, subUnitId: t }) => {
+        e(n, t);
       })
-    ), this.disposeWithMe(this._commandService.onCommandExecuted((t) => {
-      var n, s;
-      if (t.id === nr.id) {
-        const o = t.params, { unitId: c } = o;
-        Array.from((s = (n = this._domLayerMap.get(c)) == null ? void 0 : n.keys()) != null ? s : []).forEach((g) => {
-          r(c, g);
+    ), this.disposeWithMe(this._commandService.onCommandExecuted((n) => {
+      var t, r;
+      if (n.id === rr.id) {
+        const s = n.params, { unitId: o } = s;
+        Array.from((r = (t = this._domLayerMap.get(o)) == null ? void 0 : t.keys()) != null ? r : []).forEach((l) => {
+          e(o, l);
         });
-      } else if (t.id === Mr.id) {
-        const { unitId: o, subUnitId: c } = t.params;
-        r(o, c);
+      } else if (n.id === Mr.id) {
+        const { unitId: s, subUnitId: o } = n.params;
+        e(s, o);
       }
     }));
   }
-  _getPosition(e, r) {
+  _getPosition(e, n) {
     var h;
-    const { startX: t, endX: n, startY: s, endY: o } = e, c = (h = this._renderManagerService.getRenderById(r)) == null ? void 0 : h.with(pe);
-    if (c == null)
+    const { startX: t, endX: r, startY: s, endY: o } = e, d = (h = this._renderManagerService.getRenderById(n)) == null ? void 0 : h.with(pe);
+    if (d == null)
       return;
-    const l = c.getSelectionCellByPosition(t, s);
+    const l = d.getSelectionCellByPosition(t, s);
     if (l == null)
       return;
     const g = {
@@ -2402,14 +2401,14 @@ let $e = class extends re {
       columnOffset: t - l.startX,
       row: l.actualRow,
       rowOffset: s - l.startY
-    }, d = c.getSelectionCellByPosition(n, o);
-    if (d == null)
+    }, c = d.getSelectionCellByPosition(r, o);
+    if (c == null)
       return;
     const a = {
-      column: d.actualColumn,
-      columnOffset: n - d.startX,
-      row: d.actualRow,
-      rowOffset: o - d.startY
+      column: c.actualColumn,
+      columnOffset: r - c.startX,
+      row: c.actualRow,
+      rowOffset: o - c.startY
     };
     return {
       from: g,
@@ -2419,14 +2418,14 @@ let $e = class extends re {
   _featureUpdateListener() {
     this.disposeWithMe(
       this._drawingManagerService.update$.subscribe((e) => {
-        e.forEach((r) => {
-          const t = this._drawingManagerService.getDrawingByParam(r);
-          if (!t || t.drawingType !== V.DRAWING_DOM && t.drawingType !== V.DRAWING_CHART)
+        e.forEach((n) => {
+          const t = this._drawingManagerService.getDrawingByParam(n);
+          if (!t || t.drawingType !== k.DRAWING_DOM && t.drawingType !== k.DRAWING_CHART)
             return;
-          const n = {
+          const r = {
             ...t.transform
           };
-          this._transformChange$.next({ id: r.drawingId, value: n });
+          this._transformChange$.next({ id: n.drawingId, value: r });
         });
       })
     );
@@ -2434,36 +2433,36 @@ let $e = class extends re {
   _deleteListener() {
     this.disposeWithMe(
       this._drawingManagerService.remove$.subscribe((e) => {
-        e.forEach((r) => {
-          this._removeDom(r.drawingId);
+        e.forEach((n) => {
+          this._removeDom(n.drawingId);
         });
       })
     );
   }
-  updateFloatDomProps(e, r, t, n) {
+  updateFloatDomProps(e, n, t, r) {
     const s = this._domLayerInfoMap.get(t), o = this._getSceneAndTransformerByDrawingSearch(e);
     if (s && o) {
-      const { scene: c } = o, l = ze({ unitId: e, subUnitId: r, drawingId: t }), g = c.getObject(l);
-      g && g instanceof wt && g.setProps(n);
+      const { scene: d } = o, l = ze({ unitId: e, subUnitId: n, drawingId: t }), g = d.getObject(l);
+      g && g instanceof wt && g.setProps(r);
     }
   }
-  addFloatDomToPosition(e, r) {
+  addFloatDomToPosition(e, n) {
     const t = ce(this._univerInstanceService, {
       unitId: e.unitId,
       subUnitId: e.subUnitId
     });
     if (!t)
       throw new Error("cannot find current target!");
-    const { unitId: n, subUnitId: s } = t, { initPosition: o, componentKey: c, data: l, allowTransform: g = !0 } = e, d = r != null ? r : On(), a = this._getPosition(o, n);
+    const { unitId: r, subUnitId: s } = t, { initPosition: o, componentKey: d, data: l, allowTransform: g = !0 } = e, c = n != null ? n : Pn(), a = this._getPosition(o, r);
     if (a == null)
       return;
-    this._ensureMap(n, s).set(d, e);
+    this._ensureMap(r, s).set(c, e);
     const u = {
-      unitId: n,
+      unitId: r,
       subUnitId: s,
-      drawingId: d,
-      drawingType: e.type || V.DRAWING_DOM,
-      componentKey: c,
+      drawingId: c,
+      drawingType: e.type || k.DRAWING_DOM,
+      componentKey: d,
       sheetTransform: a,
       transform: {
         left: o.startX,
@@ -2474,72 +2473,72 @@ let $e = class extends re {
       data: l,
       allowTransform: g
     };
-    return this._commandService.executeCommand(Ve.id, {
-      unitId: n,
+    return this._commandService.executeCommand(ke.id, {
+      unitId: r,
       drawings: [u]
-    }), this._add$.next({ unitId: n, subUnitId: s, id: d }), {
-      id: d,
+    }), this._add$.next({ unitId: r, subUnitId: s, id: c }), {
+      id: c,
       dispose: () => {
-        this._removeDom(d, !0);
+        this._removeDom(c, !0);
       }
     };
   }
-  _removeDom(e, r = !1) {
+  _removeDom(e, n = !1) {
     const t = this._domLayerInfoMap.get(e);
     if (!t)
       return;
-    const { unitId: n, subUnitId: s } = t;
+    const { unitId: r, subUnitId: s } = t;
     this._domLayerInfoMap.delete(e), t.dispose.dispose();
-    const o = this._getSceneAndTransformerByDrawingSearch(n);
-    if (o && o.scene.removeObject(t.rect), r) {
-      this._ensureMap(n, s).delete(e);
-      const l = this._drawingManagerService.getDrawingByParam({ unitId: n, subUnitId: s, drawingId: e });
+    const o = this._getSceneAndTransformerByDrawingSearch(r);
+    if (o && o.scene.removeObject(t.rect), n) {
+      this._ensureMap(r, s).delete(e);
+      const l = this._drawingManagerService.getDrawingByParam({ unitId: r, subUnitId: s, drawingId: e });
       if (!l)
         return;
-      const g = this._sheetDrawingService.getBatchRemoveOp([l]), { redo: d, objects: a } = g;
-      this._commandService.syncExecuteCommand(P.id, { unitId: n, subUnitId: s, op: d, objects: a, type: T.REMOVE });
+      const g = this._sheetDrawingService.getBatchRemoveOp([l]), { redo: c, objects: a } = g;
+      this._commandService.syncExecuteCommand(P.id, { unitId: r, subUnitId: s, op: c, objects: a, type: T.REMOVE });
     }
   }
   addHook(e) {
     return this._hooks.push(e), {
       dispose: () => {
-        const r = this._hooks.findIndex((t) => t === e);
-        this._hooks.splice(r, 1);
+        const n = this._hooks.findIndex((t) => t === e);
+        this._hooks.splice(n, 1);
       }
     };
   }
 };
-$e = zi([
-  se(0, x(J)),
-  se(1, fe),
-  se(2, x(W)),
-  se(3, K),
-  se(4, x(hr)),
-  se(5, F),
-  se(6, x(Dn))
-], $e);
-var dn = Object.defineProperty, Ji = Object.getOwnPropertyDescriptor, Zi = (i, e, r) => e in i ? dn(i, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : i[e] = r, qi = (i, e, r, t) => {
-  for (var n = t > 1 ? void 0 : t ? Ji(e, r) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (n = (t ? o(e, r, n) : o(n)) || n);
-  return t && n && dn(e, r, n), n;
-}, et = (i, e) => (r, t) => e(r, t, i), ln = (i, e, r) => Zi(i, typeof e != "symbol" ? e + "" : e, r);
+Le = zi([
+  oe(0, $(J)),
+  oe(1, fe),
+  oe(2, $(B)),
+  oe(3, K),
+  oe(4, $(gr)),
+  oe(5, F),
+  oe(6, $(Mn))
+], Le);
+var ln = Object.defineProperty, Ji = Object.getOwnPropertyDescriptor, Zi = (i, e, n) => e in i ? ln(i, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : i[e] = n, qi = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? Ji(e, n) : e, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (r = (t ? o(e, n, r) : o(r)) || r);
+  return t && r && ln(e, n, r), r;
+}, et = (i, e) => (n, t) => e(n, t, i), un = (i, e, n) => Zi(i, typeof e != "symbol" ? e + "" : e, n);
 const Qi = "SHEET_IMAGE_UI_PLUGIN";
-let Be = class extends Tn {
-  constructor(i = Pr, e, r, t) {
-    super(), this._config = i, this._injector = e, this._renderManagerService = r, this._configService = t;
-    const { menu: n, ...s } = this._config;
-    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(Or, s);
+let We = class extends En {
+  constructor(i = Pr, e, n, t) {
+    super(), this._config = i, this._injector = e, this._renderManagerService = n, this._configService = t;
+    const { menu: r, ...s } = this._config;
+    r && this._configService.setConfig("menu", r, { merge: !0 }), this._configService.setConfig(Or, s);
   }
   onStarting() {
-    En(this._injector, [
-      [$e],
+    Un(this._injector, [
+      [Le],
       [Ne],
       [Ue],
-      [Le],
       [xe],
+      [$e],
       [je]
     ]), Xe(this._injector, [
-      [$e]
+      [Le]
     ]);
   }
   onReady() {
@@ -2549,8 +2548,8 @@ let Be = class extends Tn {
   }
   onRendered() {
     this._registerRenderModules(), Xe(this._injector, [
+      [$e],
       [xe],
-      [Le],
       [Ne]
     ]);
   }
@@ -2567,28 +2566,28 @@ let Be = class extends Tn {
     });
   }
 };
-ln(Be, "type", Y.UNIVER_SHEET);
-ln(Be, "pluginName", Qi);
-Be = qi([
-  Pn(xn, Vn, Kn),
-  et(1, x(Ct)),
+un(We, "type", Y.UNIVER_SHEET);
+un(We, "pluginName", Qi);
+We = qi([
+  Tn(xn, Yn, Jn),
+  et(1, $(Rt)),
   et(2, J),
-  et(3, Un)
-], Be);
+  et(3, An)
+], We);
 export {
   j as ClearSheetDrawingTransformerOperation,
-  tn as DeleteDrawingsCommand,
-  Kt as EditSheetDrawingOperation,
-  nn as GroupSheetDrawingCommand,
-  an as IMAGE_MENU_ID,
+  nn as DeleteDrawingsCommand,
+  Jt as EditSheetDrawingOperation,
+  rn as GroupSheetDrawingCommand,
+  cn as IMAGE_MENU_ID,
   dt as InsertFloatImageCommand,
-  Ve as InsertSheetDrawingCommand,
+  ke as InsertSheetDrawingCommand,
   we as MoveDrawingsCommand,
   Ge as RemoveSheetDrawingCommand,
-  rn as SetDrawingArrangeCommand,
+  sn as SetDrawingArrangeCommand,
   Ye as SetSheetDrawingCommand,
-  $e as SheetCanvasFloatDomManagerService,
-  zt as SidebarSheetDrawingOperation,
-  sn as UngroupSheetDrawingCommand,
-  Be as UniverSheetsDrawingUIPlugin
+  Le as SheetCanvasFloatDomManagerService,
+  Kt as SidebarSheetDrawingOperation,
+  on as UngroupSheetDrawingCommand,
+  We as UniverSheetsDrawingUIPlugin
 };