npm - @univerjs/sheets-drawing-ui - Versions diffs - 0.4.2-nightly.202411081606 → 0.4.2-nightly.202411091134 - Mend

@univerjs/sheets-drawing-ui 0.4.2-nightly.202411081606 → 0.4.2-nightly.202411091134

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/lib/cjs/facade.js +1 -1
package/lib/cjs/index.js +9 -1
package/lib/es/facade.js +12 -418
package/lib/es/index.js +695 -672
package/lib/types/facade/f-worksheet.d.ts +1 -1
package/lib/umd/facade.js +1 -1
package/lib/umd/index.js +9 -1
package/package.json +10 -10

package/lib/es/index.js CHANGED Viewed

@@ -1,42 +1,41 @@
-var ln = Object.defineProperty;
-var un = (i, e, t) => e in i ? ln(i, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : i[e] = t;
-var x = (i, e, t) => un(i, typeof e != "symbol" ? e + "" : e, t);
-import { CommandType as H, ICommandService as W, IUndoRedoService as ue, sequenceExecute as It, LocaleService as xe, IUniverInstanceService as fe, useDependency as oe, Inject as B, Injector as Ct, IContextService as Rt, RxDisposable as hn, UniverInstanceType as Y, connectInjector as gn, toDisposable as mn, FOCUSING_COMMON_DRAWINGS as me, Disposable as re, Direction as te, FOCUSING_FX_BAR_EDITOR as fn, EDITOR_ACTIVATED as pn, FOCUSING_PANEL_EDITOR as wn, Tools as ge, UserManagerService as _n, IPermissionService as vn, Rectangle as Sn, LifecycleService as In, LifecycleStages as Cn, DisposableCollection as Rn, fromEventSubject as Dn, generateRandomId as Mn, DependentOn as bn, Plugin as yn, registerDependencies as On, touchDependencies as Xe, IConfigService as Pn } from "@univerjs/core";
-import { IDrawingManagerService as K, IImageIoService as Dt, DrawingTypeEnum as k, ArrangeTypeEnum as ve, DRAWING_IMAGE_ALLOW_IMAGE_LIST as Tn, DRAWING_IMAGE_COUNT_LIMIT as mt, ImageUploadStatusType as He, DRAWING_IMAGE_ALLOW_SIZE as En, getImageSize as Un, DRAWING_IMAGE_WIDTH_LIMIT as ft, DRAWING_IMAGE_HEIGHT_LIMIT as pt, getDrawingShapeKeyByDrawingSearch as ze, UniverDrawingPlugin as An } from "@univerjs/drawing";
-import { ImageCropperObject as Nn, COMPONENT_IMAGE_POPUP_MENU as jn, OpenImageCropOperation as Bn, ImageResetSizeOperation as Ln, DrawingCommonPanel as $n, DrawingRenderService as Wn, UniverDrawingUIPlugin as Gn } from "@univerjs/drawing-ui";
-import { IRenderManagerService as J, precisionTo as ne, getGroupState as xn, transformObjectOutOfGroup as Vn, RENDER_CLASS_TYPE as de, Rect as wt, ObjectType as kn, DRAWING_OBJECT_LAYER_INDEX as Yn, SHEET_VIEWPORT_KEY as Fn } from "@univerjs/engine-render";
-import { ISheetDrawingService as F, SetDrawingApplyMutation as P, DrawingApplyType as T, SheetDrawingAnchorType as y, UniverSheetsDrawingPlugin as Xn } from "@univerjs/sheets-drawing";
-import { SheetCanvasPopManagerService as Hn, attachRangeWithCoord as Te, ISheetSelectionRenderService as pe, SheetSkeletonManagerService as q, getCurrentRangeDisable$ as zn, COPY_TYPE as _t, PREDEFINED_HOOK_NAME as Se, virtualizeDiscreteRanges as Kn, ISheetClipboardService as Jn, SheetPrintInterceptorService as Zn, VIEWPORT_KEY as qn, SetZoomRatioOperation as Qn } from "@univerjs/sheets-ui";
-import { ISidebarService as er, IUIPartsService as tr, BuiltInUIPart as nr, ILocalFileService as rr, IMessageService as ir, MenuItemType as Mt, getMenuHiddenObservable as bt, RibbonStartGroup as sr, KeyCode as le, ComponentManager as or, IMenuManagerService as ar, IShortcutService as cr, CanvasFloatDomService as dr } from "@univerjs/ui";
-import { takeUntil as vt, combineLatest as Ie, map as Ee, filter as ae, distinctUntilChanged as Ce, Subject as Ke, take as lr, BehaviorSubject as ur, switchMap as hr } from "rxjs";
-import { SheetInterceptorService as at, getSheetCommandTarget as ce, SheetsSelectionsService as gr, WorkbookEditablePermission as tt, WorksheetEditPermission as Pe, RangeProtectionPermissionEditPoint as mr, 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 Bt, SetRowHiddenCommand as Lt, SetSpecificRowsVisibleCommand as $t, SetSpecificColsVisibleCommand as Wt, SetColHiddenCommand as Gt, MoveColsCommand as xt, MoveRowsCommand as Vt, MoveRangeCommand as kt, SetRowVisibleMutation as fr, SetRowHiddenMutation as pr, SetColVisibleMutation as wr, SetColHiddenMutation as _r, SetWorksheetRowHeightMutation as vr, SetWorksheetColWidthMutation as Sr, SetWorksheetActiveOperation as Ir, SetFrozenMutation as Cr } from "@univerjs/sheets";
-import { jsx as V, jsxs as Ue } from "react/jsx-runtime";
-import Rr, { useEffect as ct, forwardRef as Yt, useRef as Dr, createElement as Ft, useState as it } from "react";
-import { MessageType as Re, RadioGroup as Mr, Radio as Ze } from "@univerjs/design";
-const br = "sheets-drawing-ui.config", yr = {}, j = {
+var gn = Object.defineProperty;
+var mn = (i, e, n) => e in i ? gn(i, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : i[e] = n;
+var V = (i, e, n) => mn(i, typeof e != "symbol" ? e + "" : e, n);
+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 k, 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 Vn, UniverDrawingUIPlugin as kn } 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 Vt, MoveRangeCommand as kt, 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";
+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 t = i.get(J);
-    return e.forEach((n) => {
+    const n = i.get(J);
+    return e.forEach((t) => {
       var r, s;
-      (s = (r = t.getRenderById(n)) == null ? void 0 : r.scene.getTransformer()) == null || s.debounceRefreshControls();
+      (s = (r = n.getRenderById(t)) == null ? void 0 : r.scene.getTransformer()) == null || s.debounceRefreshControls();
     }), !0;
   }
-}, Ve = {
+}, Ge = {
   id: "sheet.command.remove-sheet-image",
   type: H.COMMAND,
   handler: (i, e) => {
     var S, v, R;
-    const t = i.get(W), n = i.get(ue), r = i.get(at), s = i.get(F);
+    const n = i.get(W), t = i.get(ue), r = i.get(at), s = i.get(F);
     if (!e) return !1;
     const { drawings: o } = e, d = [];
     o.forEach((_) => {
       const { unitId: C } = _;
       d.push(C);
     });
-    const l = s.getBatchRemoveOp(o), { unitId: g, subUnitId: c, undo: a, redo: h, objects: u } = l, m = r.onCommandExecute({ id: Ve.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 It([...(S = m.preRedos) != null ? S : [], f, ...m.redos], t) ? (n.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 It([...(S = m.preRedos) != null ? S : [], f, ...m.redos], n) ? (t.pushUndoRedo({
       unitID: g,
       undoMutations: [
         ...(v = m.preUndos) != null ? v : [],
@@ -52,17 +51,17 @@ const br = "sheets-drawing-ui.config", yr = {}, j = {
       ]
     }), !0) : !1;
   }
-}, Xt = "COMPONENT_SHEET_DRAWING_PANEL", Ht = {
+}, Ht = "COMPONENT_SHEET_DRAWING_PANEL", zt = {
   id: "sidebar.operation.sheet-image",
   type: H.COMMAND,
   handler: async (i, e) => {
-    const t = i.get(er), n = i.get(xe), r = i.get(fe), s = i.get(K);
+    const n = i.get(rr), t = i.get(We), r = i.get(fe), s = i.get(K);
     if (!ce(r)) return !1;
     switch (e.value) {
       case "open":
-        t.open({
-          header: { title: n.t("sheetImage.panel.title") },
-          children: { label: Xt },
+        n.open({
+          header: { title: t.t("sheetImage.panel.title") },
+          children: { label: Ht },
           onClose: () => {
             s.focusDrawing(null);
           },
@@ -71,84 +70,108 @@ const br = "sheets-drawing-ui.config", yr = {}, j = {
         break;
       case "close":
       default:
-        t.close();
+        n.close();
         break;
     }
     return !0;
   }
-}, zt = {
+}, Kt = {
   id: "sheet.operation.edit-sheet-image",
   type: H.OPERATION,
   handler: (i, e) => {
-    const t = i.get(K), n = i.get(W);
-    return e == null ? !1 : (t.focusDrawing([e]), n.executeCommand(Ht.id, { value: "open" }), !0);
-  }
-}, Or = "univer-upload-loading", Pr = "univer-upload-loading-body", Tr = "univer-upload-loading-body-animation", Er = "univer-UniverCircleAnimation", Ur = "univer-upload-loading-body-text", De = {
-  uploadLoading: Or,
-  uploadLoadingBody: Pr,
-  uploadLoadingBodyAnimation: Tr,
-  univerCircleAnimation: Er,
-  uploadLoadingBodyText: Ur
-}, Ar = () => {
-  const i = oe(Dt), e = oe(xe), [t, n] = Rr.useState(0);
+    const n = i.get(K), t = i.get(W);
+    return e == null ? !1 : (n.focusDrawing([e]), t.executeCommand(zt.id, { value: "open" }), !0);
+  }
+};
+var Jt = { exports: {} }, Ve = {};
+/**
+ * @license React
+ * react-jsx-runtime.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+var 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, 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 };
+}
+Ve.Fragment = Ur;
+Ve.jsx = Zt;
+Ve.jsxs = Zt;
+Jt.exports = Ve;
+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
+}, Gr = () => {
+  const i = oe(Dt), e = oe(We), [n, t] = Yt.useState(0);
   return ct(() => {
     const r = i.change$.subscribe((s) => {
-      n(s);
+      t(s);
     });
     return () => {
       r.unsubscribe();
     };
-  }, [i]), /* @__PURE__ */ V("div", { style: { display: t > 0 ? "block" : "none" }, className: De.uploadLoading, children: /* @__PURE__ */ Ue("div", { className: De.uploadLoadingBody, children: [
-    /* @__PURE__ */ V("div", { className: De.uploadLoadingBodyAnimation }),
-    /* @__PURE__ */ V("div", { className: De.uploadLoadingBodyText, children: `${e.t("uploadLoading.loading")}: ${t}` })
+  }, [i]), /* @__PURE__ */ $.jsx("div", { style: { display: n > 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")}: ${n}` })
   ] }) });
 };
-var Nr = Object.defineProperty, jr = Object.getOwnPropertyDescriptor, Br = (i, e, t, n) => {
-  for (var r = n > 1 ? void 0 : n ? jr(e, t) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (r = (n ? o(e, t, r) : o(r)) || r);
-  return n && r && Nr(e, t, r), r;
-}, ie = (i, e) => (t, n) => e(t, n, i);
-let Ae = class extends hn {
-  constructor(e, t, n, r, s, o, d) {
+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;
+}, ie = (i, e) => (n, t) => e(n, t, i);
+let Ue = class extends fn {
+  constructor(e, n, t, r, s, o, d) {
     super();
-    x(this, "_initImagePopupMenu", /* @__PURE__ */ new Set());
-    this._injector = e, this._drawingManagerService = t, this._canvasPopManagerService = n, this._renderManagerService = r, this._univerInstanceService = s, this._contextService = o, this._uiPartsService = d, 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(nr.CONTENT, () => gn(Ar, 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(sr.CONTENT, () => pn(Gr, this._injector));
   }
   _dispose(e) {
-    const t = e.getUnitId();
-    this._renderManagerService.removeRender(t);
+    const n = e.getUnitId();
+    this._renderManagerService.removeRender(n);
   }
   _create(e) {
     if (!e)
       return;
-    const t = e.getUnitId();
-    this._renderManagerService.has(t) && !this._initImagePopupMenu.has(t) && (this._popupMenuListener(t), this._initImagePopupMenu.add(t));
+    const n = e.getUnitId();
+    this._renderManagerService.has(n) && !this._initImagePopupMenu.has(n) && (this._popupMenuListener(n), this._initImagePopupMenu.add(n));
   }
   _hasCropObject(e) {
-    const t = e.getAllObjectsByOrder();
-    for (const n of t)
-      if (n instanceof Nn)
+    const n = e.getAllObjectsByOrder();
+    for (const t of n)
+      if (t instanceof Ln)
         return !0;
     return !1;
   }
   _popupMenuListener(e) {
     var s;
-    const t = (s = this._renderManagerService.getRenderById(e)) == null ? void 0 : s.scene;
-    if (!t)
-      return;
-    const n = t.getTransformerByCreate();
+    const n = (s = this._renderManagerService.getRenderById(e)) == null ? void 0 : s.scene;
     if (!n)
       return;
+    const t = n.getTransformerByCreate();
+    if (!t)
+      return;
     let r;
     this.disposeWithMe(
-      mn(
-        n.createControl$.subscribe(() => {
-          if (this._contextService.setContextValue(me, !0), this._hasCropObject(t))
+      wn(
+        t.createControl$.subscribe(() => {
+          if (this._contextService.setContextValue(me, !0), this._hasCropObject(n))
             return;
-          const o = n.getSelectedObjectMap();
+          const o = t.getSelectedObjectMap();
           if (o.size > 1) {
             r == null || r.dispose();
             return;
@@ -161,7 +184,7 @@ let Ae = class extends hn {
             return;
           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: jn,
+            componentKey: $n,
             direction: "horizontal",
             offset: [2, 0],
             extraProps: {
@@ -175,59 +198,59 @@ let Ae = class extends hn {
         })
       )
     ), this.disposeWithMe(
-      n.clearControl$.subscribe(() => {
+      t.clearControl$.subscribe(() => {
         r == null || r.dispose(), this._contextService.setContextValue(me, !1), this._drawingManagerService.focusDrawing(null);
       })
     ), this.disposeWithMe(
-      n.changing$.subscribe(() => {
+      t.changing$.subscribe(() => {
         r == null || r.dispose();
       })
     );
   }
-  _getImageMenuItems(e, t, n, r) {
+  _getImageMenuItems(e, n, t, r) {
     return [
       {
         label: "image-popup.edit",
         index: 0,
-        commandId: zt.id,
-        commandParams: { unitId: e, subUnitId: t, drawingId: n },
+        commandId: Kt.id,
+        commandParams: { unitId: e, subUnitId: n, drawingId: t },
         disable: r === k.DRAWING_DOM
       },
       {
         label: "image-popup.delete",
         index: 1,
-        commandId: Ve.id,
-        commandParams: { unitId: e, drawings: [{ unitId: e, subUnitId: t, drawingId: n }] },
+        commandId: Ge.id,
+        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: t, drawingId: n },
+        commandParams: { unitId: e, subUnitId: n, drawingId: t },
         disable: r === k.DRAWING_DOM
       },
       {
         label: "image-popup.reset",
         index: 3,
-        commandId: Ln.id,
-        commandParams: [{ unitId: e, subUnitId: t, drawingId: n }],
+        commandId: Wn.id,
+        commandParams: [{ unitId: e, subUnitId: n, drawingId: t }],
         disable: r === k.DRAWING_DOM
       }
     ];
   }
 };
-Ae = Br([
-  ie(0, B(Ct)),
+Ue = Yr([
+  ie(0, x(Ct)),
   ie(1, K),
-  ie(2, B(Hn)),
+  ie(2, x(Jn)),
   ie(3, J),
   ie(4, fe),
   ie(5, Rt),
-  ie(6, B(tr))
-], Ae);
-function $(i, e, t) {
-  const { from: n, 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 } = n, { column: m, columnOffset: f, row: p, rowOffset: I } = r, S = t.getCurrentSkeleton(), v = Te(S, {
+  ie(6, x(ir))
+], Ue);
+function B(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,
@@ -260,22 +283,22 @@ function $(i, e, t) {
   };
 }
 function N(i, e) {
-  const { left: t = 0, top: n = 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(t, n);
+  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(t - a.startX, 1),
+    columnOffset: ne(n - a.startX, 1),
     row: a.actualRow,
-    rowOffset: ne(n - a.startY, 1)
-  }, u = e.getSelectionCellByPosition(t + r, n + s);
+    rowOffset: ne(t - a.startY, 1)
+  }, u = e.getSelectionCellByPosition(n + r, t + s);
   if (u == null)
     return;
   const m = {
     column: u.actualColumn,
-    columnOffset: ne(t + r - u.startX, 1),
+    columnOffset: ne(n + r - u.startX, 1),
     row: u.actualRow,
-    rowOffset: ne(n + s - u.startY, 1)
+    rowOffset: ne(t + s - u.startY, 1)
   };
   return {
     flipY: o,
@@ -287,14 +310,14 @@ function N(i, e) {
     to: m
   };
 }
-var Lr = Object.defineProperty, $r = Object.getOwnPropertyDescriptor, Wr = (i, e, t, n) => {
-  for (var r = n > 1 ? void 0 : n ? $r(e, t) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (r = (n ? o(e, t, r) : o(r)) || r);
-  return n && r && Lr(e, t, r), r;
-}, Me = (i, e) => (t, n) => e(t, n, i);
+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 re {
-  constructor(i, e, t, n, r) {
-    super(), this._context = i, this._sheetDrawingService = e, this._drawingManagerService = t, this._sheetSelectionRenderService = n, this._sheetSkeletonManagerService = r, this._init();
+  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();
@@ -303,80 +326,80 @@ 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 t = i[e];
-      for (const n in t.data) {
-        const r = t.data[n];
-        r.transform = $(r.sheetTransform, this._sheetSelectionRenderService, this._sheetSkeletonManagerService);
+      const n = i[e];
+      for (const t in n.data) {
+        const r = n.data[t];
+        r.transform = B(r.sheetTransform, this._sheetSelectionRenderService, this._sheetSkeletonManagerService);
       }
     }
     this._drawingManagerService.registerDrawingData(this._context.unitId, this._sheetDrawingService.getDrawingDataForUnit(this._context.unitId)), this._drawingManagerService.initializeNotification(this._context.unitId);
   }
 };
-st = Wr([
+st = Hr([
   Me(1, F),
   Me(2, K),
-  Me(3, B(pe)),
-  Me(4, B(q))
+  Me(3, x(pe)),
+  Me(4, x(q))
 ], st);
 var X = function() {
   return X = Object.assign || function(i) {
-    for (var e, t = 1, n = arguments.length; t < n; t++) {
-      e = arguments[t];
+    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);
-}, Gr = function(i, e) {
-  var t = {};
-  for (var n in i) Object.prototype.hasOwnProperty.call(i, n) && e.indexOf(n) < 0 && (t[n] = i[n]);
+}, zr = function(i, e) {
+  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 r = 0, n = Object.getOwnPropertySymbols(i); r < n.length; r++)
-      e.indexOf(n[r]) < 0 && Object.prototype.propertyIsEnumerable.call(i, n[r]) && (t[n[r]] = i[n[r]]);
-  return t;
-}, Kt = Yt(function(i, e) {
-  var t = i.icon, n = i.id, r = i.className, s = i.extend, o = Gr(i, ["icon", "id", "className", "extend"]), d = "univerjs-icon univerjs-icon-".concat(n, " ").concat(r || "").trim(), l = Dr("_".concat(kr()));
-  return Jt(t, "".concat(n), { defIds: t.defIds, idSuffix: l.current }, X({ ref: e, className: d }, 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 = Ft(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 Qt(n, "".concat(t), { defIds: n.defIds, idSuffix: l.current }, X({ ref: e, className: d }, o), s);
 });
-function Jt(i, e, t, n, r) {
-  return Ft(i.tag, X(X({ key: e }, xr(i, t, r)), n), (Vr(i, t).children || []).map(function(s, o) {
-    return Jt(s, "".concat(e, "-").concat(i.tag, "-").concat(o), t, void 0, r);
+function Qt(i, e, n, t, r) {
+  return Xt(i.tag, X(X({ key: e }, Kr(i, n, r)), t), (Jr(i, n).children || []).map(function(s, o) {
+    return Qt(s, "".concat(e, "-").concat(i.tag, "-").concat(o), n, void 0, r);
   }));
 }
-function xr(i, e, t) {
-  var n = X({}, i.attrs);
-  t != null && t.colorChannel1 && n.fill === "colorChannel1" && (n.fill = t.colorChannel1);
+function Kr(i, e, n) {
+  var t = X({}, i.attrs);
+  n != null && n.colorChannel1 && t.fill === "colorChannel1" && (t.fill = n.colorChannel1);
   var r = e.defIds;
-  return !r || r.length === 0 || (i.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + e.idSuffix), Object.entries(n).forEach(function(s) {
+  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" && (n[o] = d.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
-  })), n;
+    typeof d == "string" && (t[o] = d.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+  })), t;
 }
-function Vr(i, e) {
-  var t, n = e.defIds;
-  return !n || n.length === 0 ? i : i.tag === "defs" && (!((t = i.children) === null || t === void 0) && t.length) ? X(X({}, i), { children: i.children.map(function(r) {
-    return typeof r.attrs.id == "string" && n && n.indexOf(r.attrs.id) > -1 ? X(X({}, r), { attrs: X(X({}, r.attrs), { id: r.attrs.id + e.idSuffix }) }) : r;
+function Jr(i, e) {
+  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 kr() {
+function Zr() {
   return Math.random().toString(36).substring(2, 8);
 }
-Kt.displayName = "UniverIcon";
-var Yr = { 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" } }] }, Zt = Yt(function(i, e) {
-  return Ft(Kt, 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" } }] }, en = Ft(function(i, e) {
+  return Xt(qt, Object.assign({}, i, {
     id: "add-image-single",
     ref: e,
-    icon: Yr
+    icon: qr
   }));
 });
-Zt.displayName = "AddImageSingle";
-const qt = {
+en.displayName = "AddImageSingle";
+const tn = {
   id: "sheet.command.delete-drawing",
   type: H.COMMAND,
   handler: (i) => {
-    const e = i.get(W), n = i.get(F).getFocusDrawings();
-    if (n.length === 0)
+    const e = i.get(W), t = i.get(F).getFocusDrawings();
+    if (t.length === 0)
       return !1;
-    const r = n[0].unitId, s = n.map((o) => {
+    const r = t[0].unitId, s = t.map((o) => {
       const { unitId: d, subUnitId: l, drawingId: g, drawingType: c } = o;
       return {
         unitId: d,
@@ -385,16 +408,16 @@ const qt = {
         drawingType: c
       };
     });
-    return e.executeCommand(Ve.id, {
+    return e.executeCommand(Ge.id, {
       unitId: r,
       drawings: s
     });
   }
 };
-function Fr(i) {
+function Qr(i) {
   const e = [];
-  return i.forEach((t) => {
-    const { parent: n, children: r } = t, { unitId: s, subUnitId: o, drawingId: d } = n, l = xn(0, 0, r.map((a) => a.transform || {})), g = r.map((a) => {
+  return i.forEach((n) => {
+    const { parent: t, children: r } = n, { unitId: s, subUnitId: o, drawingId: d } = t, l = Yn(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,
@@ -420,14 +443,14 @@ function Fr(i) {
     });
   }), e;
 }
-function Xr(i) {
+function ei(i) {
   const e = [];
-  return i.forEach((t) => {
-    const { parent: n, children: r } = t, { unitId: s, subUnitId: o, drawingId: d, transform: l = { width: 0, height: 0 } } = n;
+  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 = r.map((a) => {
-      const { transform: h } = a, { unitId: u, subUnitId: m, drawingId: f } = a, p = Vn(h || {}, l, l.width || 0, l.height || 0);
+      const { transform: h } = a, { unitId: u, subUnitId: m, drawingId: f } = a, p = Fn(h || {}, l, l.width || 0, l.height || 0);
       return {
         unitId: u,
         subUnitId: m,
@@ -451,11 +474,11 @@ function Xr(i) {
     });
   }), e;
 }
-const Qt = {
+const nn = {
   id: "sheet.command.group-sheet-image",
   type: H.COMMAND,
   handler: (i, e) => {
-    const t = i.get(W), n = i.get(ue), r = i.get(F);
+    const n = i.get(W), t = i.get(ue), r = i.get(F);
     if (!e) return !1;
     const s = [];
     e.forEach(({ parent: u, children: m }) => {
@@ -464,10 +487,10 @@ const Qt = {
       });
     });
     const o = r.getGroupDrawingOp(e), { unitId: d, subUnitId: l, undo: g, redo: c, objects: a } = o;
-    return t.syncExecuteCommand(P.id, { op: c, unitId: d, subUnitId: l, objects: a, type: T.GROUP }) ? (n.pushUndoRedo({
+    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: d, subUnitId: l, objects: Xr(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: [
@@ -481,10 +504,10 @@ const Qt = {
   type: H.COMMAND,
   handler: (i, e) => {
     var S, v, R;
-    const t = i.get(W), n = i.get(ue), r = i.get(F), s = i.get(at);
+    const n = i.get(W), t = i.get(ue), r = i.get(F), s = i.get(at);
     if (!e) return !1;
     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 It([...(S = m.preRedos) != null ? S : [], f, ...m.redos], t) ? (n.pushUndoRedo({
+    return It([...(S = m.preRedos) != null ? S : [], f, ...m.redos], n) ? (t.pushUndoRedo({
       unitID: g,
       undoMutations: [
         ...(v = m.preUndos) != null ? v : [],
@@ -500,18 +523,18 @@ const Qt = {
       ]
     }), !0) : !1;
   }
-}, en = {
+}, rn = {
   id: "sheet.command.set-drawing-arrange",
   type: H.COMMAND,
   handler: (i, e) => {
-    const t = i.get(W), n = i.get(ue);
+    const n = i.get(W), t = i.get(ue);
     if (!e) return !1;
     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 } = c;
-    return t.syncExecuteCommand(P.id, { op: h, unitId: s, subUnitId: o, objects: a, type: T.ARRANGE }) ? (n.pushUndoRedo({
+    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 } }
@@ -525,10 +548,10 @@ const Qt = {
   id: "sheet.command.set-sheet-image",
   type: H.COMMAND,
   handler: (i, e) => {
-    const t = i.get(W), n = i.get(ue), r = i.get(F);
+    const n = i.get(W), t = i.get(ue), r = i.get(F);
     if (!e) return !1;
     const { drawings: s } = e, o = r.getBatchUpdateOp(s), { unitId: d, subUnitId: l, undo: g, redo: c, objects: a } = o;
-    return t.syncExecuteCommand(P.id, { unitId: d, subUnitId: l, op: c, objects: a, type: T.UPDATE }) ? (n.pushUndoRedo({
+    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: d, subUnitId: l, op: g, objects: a, type: T.UPDATE } },
@@ -540,11 +563,11 @@ const Qt = {
       ]
     }), !0) : !1;
   }
-}, tn = {
+}, sn = {
   id: "sheet.command.ungroup-sheet-image",
   type: H.COMMAND,
   handler: (i, e) => {
-    const t = i.get(W), n = i.get(ue), r = i.get(F);
+    const n = i.get(W), t = i.get(ue), r = i.get(F);
     if (!e) return !1;
     const s = [];
     e.forEach(({ parent: u, children: m }) => {
@@ -553,10 +576,10 @@ const Qt = {
       });
     });
     const o = r.getUngroupDrawingOp(e), { unitId: d, subUnitId: l, undo: g, redo: c, objects: a } = o;
-    return t.syncExecuteCommand(P.id, { op: c, unitId: d, subUnitId: l, objects: a, type: T.UNGROUP }) ? (n.pushUndoRedo({
+    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: d, subUnitId: l, objects: Fr(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: [
@@ -566,36 +589,36 @@ const Qt = {
     }), !0) : !1;
   }
 };
-var Hr = Object.defineProperty, zr = Object.getOwnPropertyDescriptor, Kr = (i, e, t, n) => {
-  for (var r = n > 1 ? void 0 : n ? zr(e, t) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (r = (n ? o(e, t, r) : o(r)) || r);
-  return n && r && Hr(e, t, r), r;
-}, z = (i, e) => (t, n) => e(t, n, i);
-let Ne = class extends re {
-  constructor(e, t, n, r, s, o, d, l, g, c, 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 re {
+  constructor(e, n, t, r, s, o, d, l, g, c, a, h) {
     super();
-    x(this, "_workbookSelections");
-    this._context = e, this._skeletonManagerService = t, this._commandService = n, 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();
+    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: Tn.map((n) => `.${n.replace("image/", "")}`).join(",")
-    }), t = e.length;
-    return t > mt ? (this._messageService.show({
+      accept: An.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) : t === 0 ? !1 : (e.forEach(async (n) => await this._insertFloatImage(n)), !0);
+    }), !1) : n === 0 ? !1 : (e.forEach(async (t) => await this._insertFloatImage(t)), !0);
   }
   async _insertFloatImage(e) {
-    let t;
+    let n;
     try {
-      t = 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(En / (1024 * 1024)))
+        content: this._localeService.t("update-status.exceedMaxSize", String(Nn / (1024 * 1024)))
       }) : v === He.ERROR_IMAGE_TYPE ? this._messageService.show({
         type: Re.Error,
         content: this._localeService.t("update-status.invalidImageType")
@@ -604,9 +627,9 @@ let Ne = class extends re {
         content: this._localeService.t("update-status.invalidImage")
       });
     }
-    if (t == null)
+    if (n == null)
       return;
-    const n = this._getUnitInfo(), { unitId: r, subUnitId: s } = n, { imageId: o, imageSourceType: d, source: l, base64Cache: g } = t, { width: c, height: a, image: h } = await Un(g || ""), { width: u, height: m } = this._context.scene;
+    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 jn(g || ""), { width: u, height: m } = this._context.scene;
     this._imageIoService.addImageSourceCache(l, d, h);
     let f = 1;
     if (c > ft || a > pt) {
@@ -623,7 +646,7 @@ let Ne = class extends re {
       drawingType: k.DRAWING_IMAGE,
       imageSourceType: d,
       source: l,
-      transform: $(p, this._selectionRenderService, this._skeletonManagerService),
+      transform: B(p, this._selectionRenderService, this._skeletonManagerService),
       sheetTransform: p
     };
     this._commandService.executeCommand(ke.id, {
@@ -632,13 +655,13 @@ let Ne = class extends re {
     });
   }
   _getUnitInfo() {
-    const e = this._context.unit, t = e.getActiveSheet(), n = e.getUnitId(), r = t.getSheetId();
+    const e = this._context.unit, n = e.getActiveSheet(), t = e.getUnitId(), r = n.getSheetId();
     return {
-      unitId: n,
+      unitId: t,
       subUnitId: r
     };
   }
-  _getImagePosition(e, t, n, r) {
+  _getImagePosition(e, n, t, r) {
     const s = this._workbookSelections.getCurrentSelections();
     let o = {
       startRow: 0,
@@ -651,7 +674,7 @@ let Ne = class extends re {
     if (d == null)
       return;
     let { startColumn: l, startRow: g, startX: c, startY: a } = d, h = !1;
-    if (c + e > n && (c = n - e, c < 0 && (c = 0, e = n), h = !0), a + t > r && (a = r - t, a < 0 && (a = 0, t = r), h = !0), h) {
+    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;
@@ -662,14 +685,14 @@ let Ne = class extends re {
       columnOffset: 0,
       row: g,
       rowOffset: 0
-    }, m = this._selectionRenderService.getSelectionCellByPosition(c + e, a + t);
+    }, m = this._selectionRenderService.getSelectionCellByPosition(c + e, a + n);
     if (m == null)
       return;
     const f = {
       column: m.actualColumn,
       columnOffset: c + e - m.startX,
       row: m.actualRow,
-      rowOffset: a + t - m.startY
+      rowOffset: a + n - m.startY
     };
     return {
       from: u,
@@ -678,10 +701,10 @@ let Ne = class extends re {
   }
   _updateOrderListener() {
     this._drawingManagerService.featurePluginOrderUpdate$.subscribe((e) => {
-      const { unitId: t, subUnitId: n, drawingIds: r, arrangeType: s } = e;
-      this._commandService.executeCommand(en.id, {
-        unitId: t,
-        subUnitId: n,
+      const { unitId: n, subUnitId: t, drawingIds: r, arrangeType: s } = e;
+      this._commandService.executeCommand(rn.id, {
+        unitId: n,
+        subUnitId: t,
         drawingIds: r,
         arrangeType: s
       });
@@ -689,9 +712,9 @@ let Ne = class extends re {
   }
   _updateImageListener() {
     this._drawingManagerService.featurePluginUpdate$.subscribe((e) => {
-      const t = [];
-      e.length !== 0 && (e.forEach((n) => {
-        const { unitId: r, subUnitId: s, drawingId: o, drawingType: d, transform: l } = n;
+      const n = [];
+      e.length !== 0 && (e.forEach((t) => {
+        const { unitId: r, subUnitId: s, drawingId: o, drawingType: d, transform: l } = t;
         if (l == null)
           return;
         const g = this._sheetDrawingService.getDrawingByParam({ unitId: r, subUnitId: s, drawingId: o });
@@ -701,24 +724,24 @@ let Ne = class extends re {
         if (c == null)
           return;
         const a = {
-          ...n,
-          transform: { ...g.transform, ...l, ...$(c, this._selectionRenderService, this._skeletonManagerService) },
+          ...t,
+          transform: { ...g.transform, ...l, ...B(c, this._selectionRenderService, this._skeletonManagerService) },
           sheetTransform: { ...c }
         };
-        t.push(a);
-      }), t.length > 0 && this._commandService.executeCommand(Ye.id, {
+        n.push(a);
+      }), n.length > 0 && this._commandService.executeCommand(Ye.id, {
         unitId: e[0].unitId,
-        drawings: t
+        drawings: n
       }));
     });
   }
   _groupDrawingListener() {
     this._drawingManagerService.featurePluginGroupUpdate$.subscribe((e) => {
-      this._commandService.executeCommand(Qt.id, e);
-      const { unitId: t, subUnitId: n, drawingId: r } = e[0].parent;
-      this._drawingManagerService.focusDrawing([{ unitId: t, subUnitId: n, drawingId: r }]);
+      this._commandService.executeCommand(nn.id, e);
+      const { unitId: n, subUnitId: t, drawingId: r } = e[0].parent;
+      this._drawingManagerService.focusDrawing([{ unitId: n, subUnitId: t, drawingId: r }]);
     }), this._drawingManagerService.featurePluginUngroupUpdate$.subscribe((e) => {
-      this._commandService.executeCommand(tn.id, e);
+      this._commandService.executeCommand(sn.id, e);
     });
   }
   _focusDrawingListener() {
@@ -729,31 +752,31 @@ let Ne = class extends re {
     );
   }
 };
-Ne = Kr([
-  z(1, B(q)),
+Ae = ri([
+  z(1, x(q)),
   z(2, W),
   z(3, pe),
   z(4, Dt),
-  z(5, rr),
+  z(5, or),
   z(6, F),
   z(7, K),
   z(8, Rt),
-  z(9, ir),
-  z(10, B(xe)),
-  z(11, B(gr))
-], Ne);
+  z(9, ar),
+  z(10, x(We)),
+  z(11, x(pr))
+], Ae);
 const dt = {
   id: "sheet.command.insert-float-image",
   type: H.COMMAND,
   handler: (i) => {
-    var t, n;
-    return (n = (t = i.get(J).getCurrentTypeOfRenderer(Y.UNIVER_SHEET)) == null ? void 0 : t.with(Ne).insertFloatImage()) != null ? n : !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 t = i.get(W), n = i.get(F), r = i.get(pe), { direction: s } = e, o = n.getFocusDrawings();
+    const n = i.get(W), t = i.get(F), r = i.get(pe), { direction: s } = e, o = t.getFocusDrawings();
     if (o.length === 0)
       return !1;
     const d = o[0].unitId, l = o.map((c) => {
@@ -767,23 +790,23 @@ const dt = {
         sheetTransform: N(h, r)
       };
     }).filter((c) => c != null);
-    return t.syncExecuteCommand(Ye.id, {
+    return n.syncExecuteCommand(Ye.id, {
       unitId: d,
       drawings: l
-    }) ? (t.syncExecuteCommand(j.id, [d]), !0) : !1;
+    }) ? (n.syncExecuteCommand(j.id, [d]), !0) : !1;
   }
-}, nn = "addition-and-subtraction-single", rn = "sheet.menu.image";
-function Jr(i) {
+}, on = "addition-and-subtraction-single", an = "sheet.menu.image";
+function ii(i) {
   return {
-    id: rn,
+    id: an,
     type: Mt.SUBITEMS,
-    icon: nn,
+    icon: on,
     tooltip: "sheetImage.title",
     hidden$: bt(i, Y.UNIVER_SHEET),
-    disabled$: zn(i, { workbookTypes: [tt], worksheetTypes: [Pe], rangeTypes: [mr] })
+    disabled$: Zn(i, { workbookTypes: [tt], worksheetTypes: [Pe], rangeTypes: [wr] })
   };
 }
-function Zr(i) {
+function si(i) {
   return {
     id: dt.id,
     title: "sheetImage.upload.float",
@@ -791,39 +814,39 @@ function Zr(i) {
     hidden$: bt(i, Y.UNIVER_SHEET)
   };
 }
-const qr = "univer-image-common-panel", Qr = "univer-image-common-panel-grid", ei = "univer-image-common-panel-border", ti = "univer-image-common-panel-title", ni = "univer-image-common-panel-subtitle", ri = "univer-image-common-panel-row", ii = "univer-image-common-panel-row-vertical", si = "univer-image-common-panel-column", oi = "univer-image-common-panel-column-center", ai = "univer-image-common-panel-inline", ci = "univer-image-common-panel-span2", di = "univer-image-common-panel-span3", li = "univer-image-common-panel-input", ui = "univer-sheet-image-menu", hi = "univer-sheet-image-menu-input", ee = {
-  imageCommonPanel: qr,
-  imageCommonPanelGrid: Qr,
-  imageCommonPanelBorder: ei,
-  imageCommonPanelTitle: ti,
-  imageCommonPanelSubtitle: ni,
-  imageCommonPanelRow: ri,
-  imageCommonPanelRowVertical: ii,
-  imageCommonPanelColumn: si,
-  imageCommonPanelColumnCenter: oi,
-  imageCommonPanelInline: ai,
-  imageCommonPanelSpan2: ci,
-  imageCommonPanelSpan3: di,
-  imageCommonPanelInput: li,
-  sheetImageMenu: ui,
-  sheetImageMenuInput: hi
+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 = {
+  imageCommonPanel: oi,
+  imageCommonPanelGrid: ai,
+  imageCommonPanelBorder: ci,
+  imageCommonPanelTitle: di,
+  imageCommonPanelSubtitle: li,
+  imageCommonPanelRow: ui,
+  imageCommonPanelRowVertical: hi,
+  imageCommonPanelColumn: gi,
+  imageCommonPanelColumnCenter: mi,
+  imageCommonPanelInline: fi,
+  imageCommonPanelSpan2: pi,
+  imageCommonPanelSpan3: wi,
+  imageCommonPanelInput: _i,
+  sheetImageMenu: vi,
+  sheetImageMenuInput: Si
 };
-function sn(i) {
-  var e, t, n = "";
-  if (typeof i == "string" || typeof i == "number") n += i;
+function cn(i) {
+  var e, n, t = "";
+  if (typeof i == "string" || typeof i == "number") t += i;
   else if (typeof i == "object") if (Array.isArray(i)) {
     var r = i.length;
-    for (e = 0; e < r; e++) i[e] && (t = sn(i[e])) && (n && (n += " "), n += t);
-  } else for (t in i) i[t] && (n && (n += " "), n += t);
-  return n;
+    for (e = 0; e < r; e++) i[e] && (n = cn(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, t = 0, n = "", r = arguments.length; t < r; t++) (i = arguments[t]) && (e = sn(i)) && (n && (n += " "), n += e);
-  return n;
+  for (var i, e, n = 0, t = "", r = arguments.length; n < r; n++) (i = arguments[n]) && (e = cn(i)) && (t && (t += " "), t += e);
+  return t;
 }
-const gi = (i) => {
+const Ii = (i) => {
   var v;
-  const e = oe(W), t = oe(xe), n = oe(K), r = oe(J), { drawings: s } = i, o = s[0];
+  const e = oe(W), n = oe(We), t = oe(K), r = oe(J), { drawings: s } = i, o = s[0];
   if (o == null)
     return;
   const { unitId: d } = o, l = r.getRenderById(d), g = l == null ? void 0 : l.scene;
@@ -852,7 +875,7 @@ const gi = (i) => {
       C === !0 && h(!1);
     }), _ = c.changeStart$.subscribe((C) => {
       var b;
-      const { objects: w } = C, O = p(w, n);
+      const { objects: w } = C, O = p(w, t);
       if (O.length === 0)
         h(!1);
       else if (O.length >= 1) {
@@ -867,7 +890,7 @@ const gi = (i) => {
   }, []);
   function I(R) {
     f(R);
-    const _ = n.getFocusDrawings();
+    const _ = t.getFocusDrawings();
     if (_.length === 0)
       return;
     const C = _.map((w) => ({
@@ -882,43 +905,43 @@ const gi = (i) => {
     });
   }
   const S = (R) => R ? "block" : "none";
-  return /* @__PURE__ */ Ue("div", { className: be(ee.imageCommonPanelGrid, ee.imageCommonPanelBorder), style: { display: S(a) }, children: [
-    /* @__PURE__ */ V("div", { className: ee.imageCommonPanelRow, children: /* @__PURE__ */ V("div", { className: be(ee.imageCommonPanelColumn, ee.imageCommonPanelTitle), children: /* @__PURE__ */ V("div", { children: t.t("drawing-anchor.title") }) }) }),
-    /* @__PURE__ */ V("div", { className: be(ee.imageCommonPanelRow), children: /* @__PURE__ */ V("div", { className: be(ee.imageCommonPanelColumn), children: /* @__PURE__ */ Ue(Mr, { value: m, onChange: I, direction: "vertical", children: [
-      /* @__PURE__ */ V(Ze, { value: y.Both, children: t.t("drawing-anchor.both") }),
-      /* @__PURE__ */ V(Ze, { value: y.Position, children: t.t("drawing-anchor.position") }),
-      /* @__PURE__ */ V(Ze, { value: y.None, children: t.t("drawing-anchor.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: n.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: n.t("drawing-anchor.both") }),
+      /* @__PURE__ */ $.jsx(Ze, { value: y.Position, children: n.t("drawing-anchor.position") }),
+      /* @__PURE__ */ $.jsx(Ze, { value: y.None, children: n.t("drawing-anchor.none") })
     ] }) }) })
   ] });
-}, mi = () => {
-  const i = oe(K), e = i.getFocusDrawings(), [t, n] = it(e);
+}, Ci = () => {
+  const i = oe(K), e = i.getFocusDrawings(), [n, t] = it(e);
   return ct(() => {
     const r = i.focus$.subscribe((s) => {
-      n(s);
+      t(s);
     });
     return () => {
       r.unsubscribe();
     };
-  }, []), !!(t != null && t.length) && /* @__PURE__ */ Ue("div", { className: ee.imageCommonPanel, children: [
-    /* @__PURE__ */ V($n, { drawings: t }),
-    /* @__PURE__ */ V(gi, { drawings: t })
+  }, []), !!(n != null && n.length) && /* @__PURE__ */ $.jsxs("div", { className: ee.imageCommonPanel, children: [
+    /* @__PURE__ */ $.jsx(Gn, { drawings: n }),
+    /* @__PURE__ */ $.jsx(Ii, { drawings: n })
   ] });
-}, fi = {
-  [sr.FORMULAS_INSERT]: {
-    [rn]: {
+}, Ri = {
+  [cr.FORMULAS_INSERT]: {
+    [an]: {
       order: 3,
-      menuItemFactory: Jr,
+      menuItemFactory: ii,
       [dt.id]: {
         order: 0,
-        menuItemFactory: Zr
+        menuItemFactory: si
       }
     }
   }
 };
 function _e(i) {
-  return !i.getContextValue(fn) && !i.getContextValue(pn) && !i.getContextValue(wn) && i.getContextValue(me);
+  return !i.getContextValue(_n) && !i.getContextValue(vn) && !i.getContextValue(Sn) && i.getContextValue(me);
 }
-const pi = {
+const Di = {
   id: we.id,
   description: "shortcut.sheet.drawing-move-down",
   group: "4_sheet-drawing-view",
@@ -928,7 +951,7 @@ const pi = {
   staticParameters: {
     direction: te.DOWN
   }
-}, wi = {
+}, Mi = {
   id: we.id,
   description: "shortcut.sheet.drawing-move-up",
   group: "4_sheet-drawing-view",
@@ -938,7 +961,7 @@ const pi = {
   staticParameters: {
     direction: te.UP
   }
-}, _i = {
+}, bi = {
   id: we.id,
   description: "shortcut.sheet.drawing-move-left",
   group: "4_sheet-drawing-view",
@@ -948,7 +971,7 @@ const pi = {
   staticParameters: {
     direction: te.LEFT
   }
-}, vi = {
+}, yi = {
   id: we.id,
   description: "shortcut.sheet.drawing-move-right",
   group: "4_sheet-drawing-view",
@@ -958,8 +981,8 @@ const pi = {
   staticParameters: {
     direction: te.RIGHT
   }
-}, Si = {
-  id: qt.id,
+}, Oi = {
+  id: tn.id,
   description: "shortcut.sheet.drawing-delete",
   group: "4_sheet-drawing-view",
   // when focusing on any other input tag do not trigger this shortcut
@@ -967,46 +990,46 @@ const pi = {
   binding: le.DELETE,
   mac: le.BACKSPACE
 };
-var Ii = Object.defineProperty, Ci = Object.getOwnPropertyDescriptor, Ri = (i, e, t, n) => {
-  for (var r = n > 1 ? void 0 : n ? Ci(e, t) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (r = (n ? o(e, t, r) : o(r)) || r);
-  return n && r && Ii(e, t, r), r;
-}, ye = (i, e) => (t, n) => e(t, n, i);
-let je = class extends re {
-  constructor(i, e, t, n) {
-    super(), this._componentManager = i, this._menuManagerService = e, this._commandService = t, this._shortcutService = n, 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 re {
+  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(nn, Zt)), this.disposeWithMe(i.register(Xt, mi));
+    this.disposeWithMe(i.register(on, en)), this.disposeWithMe(i.register(Ht, Ci));
   }
   _initMenus() {
-    this._menuManagerService.mergeMenu(fi);
+    this._menuManagerService.mergeMenu(Ri);
   }
   _initCommands() {
     [
       dt,
       ke,
-      Ve,
+      Ge,
       Ye,
-      Ht,
-      j,
       zt,
-      Qt,
-      tn,
+      j,
+      Kt,
+      nn,
+      sn,
       we,
-      qt,
-      en
+      tn,
+      rn
     ].forEach((i) => this.disposeWithMe(this._commandService.registerCommand(i)));
   }
   _initShortcuts() {
     [
       // sheet drawing shortcuts
-      pi,
-      wi,
-      _i,
-      vi,
-      Si
+      Di,
+      Mi,
+      bi,
+      yi,
+      Oi
     ].forEach((i) => {
       this.disposeWithMe(this._shortcutService.registerShortcut(i));
     });
@@ -1015,42 +1038,42 @@ let je = class extends re {
     this._initCommands(), this._initCustomComponents(), this._initMenus(), this._initShortcuts();
   }
 };
-je = Ri([
-  ye(0, B(or)),
-  ye(1, ar),
+Ne = Ei([
+  ye(0, x(dr)),
+  ye(1, lr),
   ye(2, W),
-  ye(3, cr)
-], je);
-var Di = Object.defineProperty, Mi = Object.getOwnPropertyDescriptor, bi = (i, e, t, n) => {
-  for (var r = n > 1 ? void 0 : n ? Mi(e, t) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (r = (n ? o(e, t, r) : o(r)) || r);
-  return n && r && Di(e, t, r), r;
-}, qe = (i, e) => (t, n) => e(t, n, i);
-let Be = class extends re {
-  constructor(e, t, n) {
+  ye(3, ur)
+], Ne);
+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 re {
+  constructor(e, n, t) {
     super();
-    x(this, "_copyInfo");
-    this._sheetClipboardService = e, this._renderManagerService = t, this._sheetDrawingService = n, 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, t, n) => this._collect(e, t, n),
-      onPasteCells: (e, t, n, r) => {
-        const { copyType: s = _t.COPY, pasteType: o } = r, { range: d } = e || {}, { range: l, unitId: g, subUnitId: c } = t;
+      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, t) => ({ undos: [], redos: [] })
+      onPastePlainText: (e, n) => ({ undos: [], redos: [] })
     });
   }
-  _collect(e, t, n) {
+  _collect(e, n, t) {
     var h;
     const r = (h = this._renderManagerService.getRenderById(e)) == null ? void 0 : h.with(q);
     if (!r) return;
-    const s = r.attachRangeWithCoord(n);
+    const s = r.attachRangeWithCoord(t);
     if (!s)
       return;
-    const { startX: o, endX: d, startY: l, endY: g } = s, c = this._sheetDrawingService.getDrawingData(e, t), a = [];
+    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)
@@ -1065,11 +1088,11 @@ let Be = class extends re {
     }), a.length && (this._copyInfo = {
       drawings: a,
       unitId: e,
-      subUnitId: t
+      subUnitId: n
     });
   }
   // eslint-disable-next-line max-lines-per-function
-  _generateMutations(e, t) {
+  _generateMutations(e, n) {
     var b;
     if (!this._copyInfo)
       return { redos: [], undos: [] };
@@ -1079,13 +1102,13 @@ let Be = class extends re {
       Se.SPECIAL_PASTE_FORMAT,
       Se.SPECIAL_PASTE_FORMULA
     ].includes(
-      t.pasteType
+      n.pasteType
     ))
       return { redos: [], undos: [] };
-    const { copyRange: n } = t;
-    if (!n)
+    const { copyRange: t } = n;
+    if (!t)
       return { redos: [], undos: [] };
-    const { drawings: r, unitId: s, subUnitId: o } = this._copyInfo, { ranges: [d, l], mapFunc: g } = Kn([n, 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);
+    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({
@@ -1101,7 +1124,7 @@ let Be = class extends re {
     });
     if (!f || !p)
       return { redos: [], undos: [] };
-    const I = [], S = [], v = p.startX - f.startX, R = p.startY - f.startY, _ = h - c, C = u - a, w = t.copyType === _t.CUT, { _sheetDrawingService: O } = this;
+    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)
@@ -1152,39 +1175,39 @@ let Be = class extends re {
     };
   }
 };
-Be = bi([
-  qe(0, Jn),
+je = Ni([
+  qe(0, Qn),
   qe(1, J),
   qe(2, F)
-], Be);
-var yi = Object.defineProperty, Oi = Object.getOwnPropertyDescriptor, Pi = (i, e, t, n) => {
-  for (var r = n > 1 ? void 0 : n ? Oi(e, t) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (r = (n ? o(e, t, r) : o(r)) || r);
-  return n && r && yi(e, t, r), r;
-}, he = (i, e) => (t, n) => e(t, n, i);
-let Le = class extends re {
-  constructor(i, e, t, n, r) {
-    super(), this._drawingManagerService = i, this._renderManagerService = e, this._permissionService = t, this._univerInstanceService = n, this._userManagerService = r, this._initDrawingVisible(), this._initDrawingEditable(), this._initViewPermissionChange(), this._initEditPermissionChange();
+], je);
+var ji = Object.defineProperty, xi = Object.getOwnPropertyDescriptor, Li = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? xi(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 xe = class extends re {
+  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, t]) => {
+      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, n]) => {
         if (!e) {
           this._drawingManagerService.setDrawingVisible(!1);
           return;
         }
-        e.activeSheet$.subscribe((n) => {
-          if (!n) {
+        e.activeSheet$.subscribe((t) => {
+          if (!t) {
             this._drawingManagerService.setDrawingVisible(!1);
             return;
           }
-          const r = e.getUnitId(), s = n.getSheetId();
+          const r = e.getUnitId(), s = t.getSheetId();
           if (this._permissionService.composePermission([new St(r).id, new Je(r, s).id]).every((d) => d.value))
             this._drawingManagerService.setDrawingVisible(!0);
           else {
             this._drawingManagerService.setDrawingVisible(!1);
-            const d = e.getUnitId(), l = n.getSheetId(), g = this._drawingManagerService.getDrawingData(d, l), c = Object.values(g), a = this._renderManagerService.getRenderById(d), 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) => {
@@ -1198,22 +1221,22 @@ let Le = class extends re {
   _initDrawingEditable() {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET);
     this.disposeWithMe(
-      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, t]) => {
+      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, n]) => {
         if (!e) {
           this._drawingManagerService.setDrawingEditable(!1);
           return;
         }
-        e.activeSheet$.subscribe((n) => {
-          if (!n) {
+        e.activeSheet$.subscribe((t) => {
+          if (!t) {
             this._drawingManagerService.setDrawingEditable(!1);
             return;
           }
-          const r = e.getUnitId(), s = n.getSheetId();
+          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 d = e.getUnitId(), l = n.getSheetId(), g = this._drawingManagerService.getDrawingData(d, l), c = Object.values(g), a = this._renderManagerService.getRenderById(d), 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) => {
@@ -1227,12 +1250,12 @@ let Le = class extends re {
   _initViewPermissionChange() {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET);
     this.disposeWithMe(
-      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, t]) => {
-        e && e.activeSheet$.subscribe((n) => {
+      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, n]) => {
+        e && e.activeSheet$.subscribe((t) => {
           var a;
-          if (!n)
+          if (!t)
             return;
-          const r = e.getUnitId(), s = n.getSheetId();
+          const r = e.getUnitId(), s = t.getSheetId();
           let o = !0;
           const d = this._renderManagerService.getRenderById(r), l = d == null ? void 0 : d.scene;
           if (l == null)
@@ -1266,12 +1289,12 @@ let Le = class extends re {
   _initEditPermissionChange() {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET);
     this.disposeWithMe(
-      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, t]) => {
-        e && e.activeSheet$.subscribe((n) => {
+      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, n]) => {
+        e && e.activeSheet$.subscribe((t) => {
           var a;
-          if (!n)
+          if (!t)
             return;
-          const r = e.getUnitId(), s = n.getSheetId();
+          const r = e.getUnitId(), s = t.getSheetId();
           let o = !0;
           const d = this._renderManagerService.getRenderById(r), l = d == null ? void 0 : d.scene;
           if (l == null)
@@ -1296,7 +1319,7 @@ let Le = class extends re {
           ).subscribe({
             complete: () => {
               o = !0;
-              const h = e.getUnitId(), u = n.getSheetId(), m = this._drawingManagerService.getDrawingData(h, u), f = Object.values(m), p = this._renderManagerService.getRenderById(h), I = p == null ? void 0 : p.scene;
+              const h = e.getUnitId(), u = t.getSheetId(), m = this._drawingManagerService.getDrawingData(h, u), f = Object.values(m), p = this._renderManagerService.getRenderById(h), I = p == null ? void 0 : p.scene;
               if (I == null)
                 return;
               this._drawingManagerService.setDrawingEditable(!0), I.getAllObjectsByOrder().forEach((v) => {
@@ -1309,32 +1332,32 @@ let Le = class extends re {
     );
   }
 };
-Le = Pi([
+xe = Li([
   he(0, K),
   he(1, J),
-  he(2, vn),
+  he(2, Cn),
   he(3, fe),
-  he(4, B(_n))
-], Le);
-var Ti = Object.defineProperty, Ei = Object.getOwnPropertyDescriptor, Ui = (i, e, t, n) => {
-  for (var r = n > 1 ? void 0 : n ? Ei(e, t) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (r = (n ? o(e, t, r) : o(r)) || r);
-  return n && r && Ti(e, t, r), r;
-}, Oe = (i, e) => (t, n) => e(t, n, i);
-let $e = class extends re {
-  constructor(i, e, t, n) {
-    super(), this._sheetPrintInterceptorService = i, this._drawingRenderService = e, this._drawingManagerService = t, this._renderManagerService = n, this._initPrinting();
+  he(4, x(In))
+], xe);
+var $i = Object.defineProperty, Bi = Object.getOwnPropertyDescriptor, Wi = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? Bi(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 && $i(e, n, r), r;
+}, Oe = (i, e) => (n, t) => e(n, t, i);
+let Le = class extends re {
+  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, t) => {
-            const { unitId: n, scene: r, subUnitId: s } = e, o = this._drawingManagerService.getDrawingDataForUnit(n), d = o == null ? void 0 : o[s];
+          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);
-            }), t();
+            }), n();
           }
         }
       )
@@ -1342,41 +1365,41 @@ let $e = class extends re {
       this._sheetPrintInterceptorService.interceptor.intercept(
         this._sheetPrintInterceptorService.interceptor.getInterceptPoints().PRINTING_RANGE,
         {
-          handler: (i, e, t) => {
-            const { unitId: n, subUnitId: r } = e, s = this._renderManagerService.getRenderById(n);
+          handler: (i, e, n) => {
+            const { unitId: t, subUnitId: r } = e, s = this._renderManagerService.getRenderById(t);
             if (!s)
-              return t(i);
+              return n(i);
             const o = s.with(q).getWorksheetSkeleton(r);
             if (!o)
-              return t(i);
-            const d = this._drawingManagerService.getDrawingDataForUnit(n), l = d == null ? void 0 : d[e.subUnitId];
+              return n(i);
+            const d = this._drawingManagerService.getDrawingDataForUnit(t), l = d == null ? void 0 : d[e.subUnitId];
             if (!l)
-              return t(i);
+              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, 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);
               }
-            }), t(a)) : t(i);
+            }), n(a)) : n(i);
           }
         }
       )
     );
   }
 };
-$e = Ui([
-  Oe(0, B(Zn)),
-  Oe(1, B(Wn)),
+Le = Wi([
+  Oe(0, x(er)),
+  Oe(1, x(Vn)),
   Oe(2, K),
   Oe(3, J)
-], $e);
-var Ai = Object.defineProperty, Ni = Object.getOwnPropertyDescriptor, ji = (i, e, t, n) => {
-  for (var r = n > 1 ? void 0 : n ? Ni(e, t) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (r = (n ? o(e, t, r) : o(r)) || r);
-  return n && r && Ai(e, t, r), r;
-}, Q = (i, e) => (t, n) => e(t, n, i);
-const Bi = [
+], Le);
+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,
@@ -1388,38 +1411,38 @@ const Bi = [
   nt.id,
   rt.id,
   jt.id,
-  Bt.id,
+  xt.id,
   Lt.id,
   $t.id,
+  Bt.id,
   Wt.id,
   Gt.id,
-  xt.id,
   Vt.id,
   kt.id
-], Li = [
-  fr.id,
-  pr.id,
-  wr.id,
+], Fi = [
   _r.id,
   vr.id,
-  Sr.id
+  Sr.id,
+  Ir.id,
+  Cr.id,
+  Rr.id
 ];
 let ot = class extends re {
-  constructor(i, e, t, n, r, s, o, d, l) {
-    super(), this._context = i, this._renderManagerService = e, this._commandService = t, this._selectionRenderService = n, this._skeletonManagerService = r, this._sheetInterceptorService = s, this._sheetDrawingService = o, this._drawingManagerService = d, this._univerInstanceService = l, this._sheetInterceptorListener(), this._commandListener(), this._sheetRefreshListener();
+  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(
       this._sheetInterceptorService.interceptCommand({
         getMutations: (i) => {
-          if (!Bi.includes(i.id))
+          if (!Yi.includes(i.id))
             return { redos: [], undos: [] };
           if (i.params == null)
             return { redos: [], undos: [] };
           const e = i.id;
           if (e === yt.id)
             return this._moveRowInterceptor(i.params, "insert");
-          if ([xt.id, Vt.id, kt.id].includes(e))
+          if ([Gt.id, Vt.id, kt.id].includes(e))
             return this._moveRangeInterceptor(i.params);
           if (e === Ot.id)
             return this._moveColInterceptor(i.params, "insert");
@@ -1428,42 +1451,42 @@ let ot = class extends re {
           if (e === Tt.id)
             return this._moveColInterceptor(i.params, "remove");
           if (e === Et.id) {
-            const { range: t } = i.params;
+            const { range: n } = i.params;
             return this._getRangeMoveUndo(
-              t,
+              n,
               0
               /* deleteLeft */
             );
           } else if (e === Ut.id) {
-            const { range: t } = i.params;
+            const { range: n } = i.params;
             return this._getRangeMoveUndo(
-              t,
+              n,
               1
               /* deleteUp */
             );
           } else if (e === At.id) {
-            const { range: t } = i.params;
+            const { range: n } = i.params;
             return this._getRangeMoveUndo(
-              t,
+              n,
               2
               /* insertDown */
             );
           } else if (e === Nt.id) {
-            const { range: t } = i.params;
+            const { range: n } = i.params;
             return this._getRangeMoveUndo(
-              t,
+              n,
               3
               /* insertRight */
             );
           } else if (e === Lt.id || e === $t.id) {
-            const t = i.params, { unitId: n, subUnitId: r, ranges: s } = t;
-            return this._getDrawingUndoForRowVisible(n, r, s);
-          } else if (e === Wt.id || e === Gt.id) {
-            const t = i.params, { unitId: n, subUnitId: r, ranges: s } = t;
-            return this._getDrawingUndoForColVisible(n, r, s);
-          } else if (e === nt.id || e === rt.id || e === jt.id || e === Bt.id) {
-            const t = i.params, { unitId: n, subUnitId: r, ranges: s } = t, o = e === nt.id || e === rt.id;
-            return this._getDrawingUndoForRowAndColSize(n, r, s, o);
+            const n = i.params, { unitId: t, subUnitId: r, ranges: s } = n;
+            return this._getDrawingUndoForRowVisible(t, r, s);
+          } else if (e === Bt.id || e === Wt.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 === jt.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: [] };
         }
@@ -1471,10 +1494,10 @@ let ot = class extends re {
     );
   }
   _getRangeMoveUndo(i, e) {
-    const t = ce(this._univerInstanceService);
-    if (t == null)
+    const n = ce(this._univerInstanceService);
+    if (n == null)
       return { redos: [], undos: [] };
-    const n = t.unitId, r = t.subUnitId, s = [], o = [], d = this._sheetDrawingService.getDrawingData(n, r), l = [], g = [];
+    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);
@@ -1482,22 +1505,22 @@ let ot = class extends re {
       return { redos: [], undos: [] };
     if (l.length > 0) {
       const c = this._sheetDrawingService.getBatchUpdateOp(l), { undo: a, redo: h, objects: u } = c;
-      s.push({ id: P.id, params: { unitId: n, subUnitId: r, op: h, objects: u, type: T.UPDATE } }), o.push({ id: P.id, params: { unitId: n, subUnitId: r, op: a, objects: u, type: T.UPDATE } });
+      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 c = this._sheetDrawingService.getBatchRemoveOp(g), a = c.undo, h = c.redo, u = c.objects;
-      s.push({ id: P.id, params: { unitId: n, subUnitId: r, op: h, objects: u, type: T.REMOVE } }), o.push({ id: P.id, params: { unitId: n, subUnitId: r, op: a, objects: u, type: T.INSERT } });
+      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: [n] }), o.push({ id: j.id, params: [n] }), {
+    return s.push({ id: j.id, params: [t] }), o.push({ id: j.id, params: [t] }), {
       redos: s,
       undos: o
     };
   }
-  _getUpdateOrDeleteDrawings(i, e, t) {
-    const n = [], r = [], { sheetTransform: s, anchorType: o = y.Position, transform: d, unitId: l, subUnitId: g, drawingId: c } = t, { from: a, to: h } = s, { row: u, column: m } = a, { row: f, column: p } = h;
+  _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: n,
+        updateDrawings: t,
         deleteDrawings: r
       };
     const { startRow: I, endRow: S, startColumn: v, endColumn: R } = i;
@@ -1524,29 +1547,29 @@ let ot = class extends re {
       _ = w == null ? void 0 : w.newSheetTransform, C = w == null ? void 0 : w.newTransform;
     }
     if (_ != null && C != null) {
-      const w = $(_, this._selectionRenderService, this._skeletonManagerService);
-      n.push({ ...t, sheetTransform: _, transform: w });
+      const w = B(_, this._selectionRenderService, this._skeletonManagerService);
+      t.push({ ...n, sheetTransform: _, transform: w });
     }
-    return { updateDrawings: n, deleteDrawings: r };
+    return { updateDrawings: t, deleteDrawings: r };
   }
-  _remainDrawingSize(i, e, t) {
-    const n = N({ ...i }, this._selectionRenderService);
-    n != null && e.push({
-      ...t,
-      sheetTransform: n
+  _remainDrawingSize(i, e, n) {
+    const t = N({ ...i }, this._selectionRenderService);
+    t != null && e.push({
+      ...n,
+      sheetTransform: t
     });
   }
   // eslint-disable-next-line max-lines-per-function
-  _getDrawingUndoForColVisible(i, e, t) {
-    const n = this._drawingManagerService.getDrawingData(i, e), r = [], s = [];
-    if (Object.keys(n).forEach((c) => {
-      const a = n[c], { 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, r, a);
       else {
         const { from: f, to: p } = h, { row: I, column: S } = f, { row: v, column: R } = p;
-        for (let _ = 0; _ < t.length; _++) {
-          const C = t[_], { 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) {
@@ -1617,8 +1640,8 @@ let ot = class extends re {
       preUndos: g
     };
   }
-  _createUndoAndRedoMutation(i, e, t) {
-    const n = this._sheetDrawingService.getBatchUpdateOp(t), { undo: r, redo: s, objects: o } = n, d = [
+  _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 = [
@@ -1631,16 +1654,16 @@ let ot = class extends re {
     };
   }
   // eslint-disable-next-line max-lines-per-function
-  _getDrawingUndoForRowVisible(i, e, t) {
-    const n = this._drawingManagerService.getDrawingData(i, e), r = [], s = [];
-    if (Object.keys(n).forEach((c) => {
-      const a = n[c], { 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, r, a);
       else {
         const { from: f, to: p } = h, { row: I, column: S } = f, { row: v, column: R } = p;
-        for (let _ = 0; _ < t.length; _++) {
-          const C = t[_], { 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) {
@@ -1711,7 +1734,7 @@ let ot = class extends re {
       preUndos: g
     };
   }
-  _getDrawingUndoForRowAndColSize(i, e, t, n) {
+  _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;
@@ -1719,15 +1742,15 @@ let ot = class extends re {
         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 < t.length; I++) {
-          const S = t[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 (c === y.Position && (u <= v && f >= R || m <= _ && p >= C)) {
             this._remainDrawingSize(g, s, d);
             continue;
           }
-          const w = $(
+          const w = B(
             { ...l },
             this._selectionRenderService,
             this._skeletonManagerService
@@ -1744,26 +1767,26 @@ let ot = class extends re {
     }), s.length === 0 ? { redos: [], undos: [] } : this._createUndoAndRedoMutation(i, e, s);
   }
   _getUnitIdAndSubUnitId(i, e) {
-    let t, n;
+    let n, t;
     if (e === "insert")
-      t = i.unitId, n = i.subUnitId;
+      n = i.unitId, t = i.subUnitId;
     else {
       const r = ce(this._univerInstanceService);
       if (r == null)
         return;
-      t = r.unitId, n = r.subUnitId;
+      n = r.unitId, t = r.subUnitId;
     }
-    return { unitId: t, subUnitId: n };
+    return { unitId: n, subUnitId: t };
   }
   _moveRangeInterceptor(i) {
     var v, R;
-    const { toRange: e, fromRange: t } = i, n = ce(this._univerInstanceService);
-    if (!n)
+    const { toRange: e, fromRange: n } = i, t = ce(this._univerInstanceService);
+    if (!t)
       return { redos: [], undos: [] };
-    const { unitId: r, subUnitId: s } = n, o = (R = (v = this._renderManagerService.getRenderById(r)) == 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 d = Te(o, t);
+    const d = Te(o, n);
     if (!d)
       return { redos: [], undos: [] };
     const { startX: l, endX: g, startY: c, endY: a } = d, h = this._sheetDrawingService.getDrawingData(r, s), u = [];
@@ -1782,11 +1805,11 @@ let ot = class extends re {
       };
       l <= M && D <= g && c <= U && L <= a && u.push(C);
     });
-    const m = [], f = [], p = e.startRow - t.startRow, I = e.startColumn - t.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 = $(w, this._selectionRenderService, this._skeletonManagerService);
+      }, O = B(w, this._selectionRenderService, this._skeletonManagerService);
       return {
         unitId: r,
         subUnitId: s,
@@ -1802,10 +1825,10 @@ let ot = class extends re {
     return { redos: m, undos: f };
   }
   _moveRowInterceptor(i, e) {
-    const t = this._getUnitIdAndSubUnitId(i, e);
-    if (t == null)
+    const n = this._getUnitIdAndSubUnitId(i, e);
+    if (n == null)
       return { redos: [], undos: [] };
-    const { unitId: n, subUnitId: r } = t, { range: s } = i, o = s.startRow, d = s.endRow, l = [], g = [], c = this._sheetDrawingService.getDrawingData(n, r), a = [], h = [];
+    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)
@@ -1817,7 +1840,7 @@ let ot = class extends re {
       } else {
         const { from: _, to: C } = f, { row: w } = _, { row: O } = C;
         if (I === y.Both && w >= o && O <= d)
-          h.push({ unitId: n, subUnitId: r, drawingId: u });
+          h.push({ unitId: t, subUnitId: r, drawingId: u });
         else {
           const b = this._shrinkRow(f, p, o, d, I);
           S = b == null ? void 0 : b.newSheetTransform, v = b == null ? void 0 : b.newTransform;
@@ -1825,28 +1848,28 @@ let ot = class extends re {
       }
       if (!S || !v)
         return;
-      const R = { unitId: n, subUnitId: r, 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: n, subUnitId: r, op: f, objects: p, type: T.UPDATE } }), g.push({ id: P.id, params: { unitId: n, subUnitId: r, 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: n, subUnitId: r, op: f, objects: p, type: T.REMOVE } }), g.push({ id: P.id, params: { unitId: n, subUnitId: r, 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: [n] }), g.push({ id: j.id, params: [n] }), {
+    return l.push({ id: j.id, params: [t] }), g.push({ id: j.id, params: [t] }), {
       redos: l,
       undos: g
     };
   }
   _moveColInterceptor(i, e) {
-    const t = this._getUnitIdAndSubUnitId(i, e);
-    if (t == null)
+    const n = this._getUnitIdAndSubUnitId(i, e);
+    if (n == null)
       return { redos: [], undos: [] };
-    const { unitId: n, subUnitId: r } = t, { range: s } = i, o = s.startColumn, d = s.endColumn, l = [], g = [], c = this._sheetDrawingService.getDrawingData(n, r), a = [], h = [];
+    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)
@@ -1858,7 +1881,7 @@ let ot = class extends re {
       } else {
         const { from: _, to: C } = f, { column: w } = _, { column: O } = C;
         if (I === y.Both && w >= o && O <= d)
-          h.push({ unitId: n, subUnitId: r, drawingId: u });
+          h.push({ unitId: t, subUnitId: r, drawingId: u });
         else {
           const b = this._shrinkCol(f, p, o, d, I);
           S = b == null ? void 0 : b.newSheetTransform, v = b == null ? void 0 : b.newTransform;
@@ -1866,39 +1889,39 @@ let ot = class extends re {
       }
       if (!S || !v)
         return;
-      const R = { unitId: n, subUnitId: r, 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: n, subUnitId: r, op: f, objects: p, type: T.UPDATE } }), g.push({ id: P.id, params: { unitId: n, subUnitId: r, 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: n, subUnitId: r, op: f, objects: p, type: T.REMOVE } }), g.push({ id: P.id, params: { unitId: n, subUnitId: r, 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: [n] }), g.push({ id: j.id, params: [n] }), { redos: l, undos: g };
+    return l.push({ id: j.id, params: [t] }), g.push({ id: j.id, params: [t] }), { redos: l, undos: g };
   }
-  _expandCol(i, e, t, n, r = y.Position) {
-    const s = n - t + 1, { from: o, to: d } = i, { column: l } = o, { column: g } = d;
+  _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 c = null, a = null;
-    if (l >= t) {
-      const h = this._skeletonManagerService.attachRangeWithCoord({ startColumn: t, endColumn: n, startRow: o.row, endRow: d.row });
+    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 }, c = N(a, this._selectionRenderService);
-    } else if (g >= n)
+    } else if (g >= t)
       if (r === y.Both)
         c = {
           from: { ...o },
           to: { ...d, column: g + s }
-        }, a = $(c, this._selectionRenderService, this._skeletonManagerService);
+        }, a = B(c, this._selectionRenderService, this._skeletonManagerService);
       else
         return {
           newSheetTransform: N({ ...e }, this._selectionRenderService),
@@ -1909,47 +1932,47 @@ let ot = class extends re {
       newTransform: a
     } : null;
   }
-  _shrinkCol(i, e, t, n, r = y.Position) {
-    const s = n - t + 1, { from: o, to: d } = i, { column: l } = o, { column: g } = d;
+  _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 c = null, a = null;
-    if (l > n)
+    if (l > t)
       c = {
         from: { ...o, column: l - s },
         to: { ...d, column: g - s }
-      }, a = $(c, this._selectionRenderService, this._skeletonManagerService);
+      }, a = B(c, this._selectionRenderService, this._skeletonManagerService);
     else {
-      if (l >= t && g <= n)
+      if (l >= n && g <= t)
         return null;
-      if (l < t && g > n)
+      if (l < n && g > t)
         if (r === y.Both)
           c = {
             from: { ...o },
             to: { ...d, column: g - s }
-          }, a = $(c, this._selectionRenderService, this._skeletonManagerService);
+          }, a = B(c, this._selectionRenderService, this._skeletonManagerService);
         else
           return {
             newSheetTransform: N({ ...e }, this._selectionRenderService),
             newTransform: e
           };
-      else if (l >= t && l <= n) {
-        if (l === t)
+      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: t, endColumn: l - 1, startRow: o.row, endRow: d.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 };
         }
         c = N(a, this._selectionRenderService);
-      } else if (g >= t && g <= n && r === y.Both) {
+      } else if (g >= n && g <= t && r === y.Both) {
         const h = this._skeletonManagerService.attachRangeWithCoord({
-          startColumn: t - 1,
-          endColumn: t - 1,
+          startColumn: n - 1,
+          endColumn: n - 1,
           startRow: o.row,
           endRow: d.row
         });
@@ -1957,8 +1980,8 @@ let ot = class extends re {
           return;
         c = {
           from: { ...o },
-          to: { ...d, column: t - 1, columnOffset: h.endX - h.startX }
-        }, a = $(c, this._selectionRenderService, this._skeletonManagerService);
+          to: { ...d, column: n - 1, columnOffset: h.endX - h.startX }
+        }, a = B(c, this._selectionRenderService, this._skeletonManagerService);
       }
     }
     return c != null && a != null ? {
@@ -1966,20 +1989,20 @@ let ot = class extends re {
       newTransform: a
     } : null;
   }
-  _expandRow(i, e, t, n, r = y.Position) {
-    const s = n - t + 1, { from: o, to: d } = i, { row: l } = o, { row: g } = d;
+  _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 c = null, a = null;
-    if (l >= t) {
-      const h = this._skeletonManagerService.attachRangeWithCoord({ startRow: t, endRow: n, startColumn: o.column, endColumn: d.column });
+    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 }, c = N(a, this._selectionRenderService);
-    } else if (g >= n)
+    } else if (g >= t)
       if (r === y.Both)
         c = {
           from: { ...o },
@@ -1987,7 +2010,7 @@ let ot = class extends re {
             ...d,
             row: g + s
           }
-        }, a = $(c, this._selectionRenderService, this._skeletonManagerService);
+        }, a = B(c, this._selectionRenderService, this._skeletonManagerService);
       else
         return {
           newSheetTransform: N({ ...e }, this._selectionRenderService),
@@ -1998,51 +2021,51 @@ let ot = class extends re {
       newTransform: a
     } : null;
   }
-  _shrinkRow(i, e, t, n, r = y.Position) {
-    const s = n - t + 1, { from: o, to: d } = i, { row: l } = o, { row: g } = d;
+  _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 c = null, a = null;
-    if (l > n)
+    if (l > t)
       c = {
         from: { ...o, row: l - s },
         to: { ...d, row: g - s }
-      }, a = $(c, this._selectionRenderService, this._skeletonManagerService);
+      }, a = B(c, this._selectionRenderService, this._skeletonManagerService);
     else {
-      if (l >= t && g <= n)
+      if (l >= n && g <= t)
         return null;
-      if (l < t && g > n)
+      if (l < n && g > t)
         if (r === y.Both)
           c = {
             from: { ...o },
             to: { ...d, row: g - s }
-          }, a = $(c, this._selectionRenderService, this._skeletonManagerService);
+          }, a = B(c, this._selectionRenderService, this._skeletonManagerService);
         else
           return {
             newSheetTransform: N({ ...e }, this._selectionRenderService),
             newTransform: e
           };
-      else if (l >= t && l <= n) {
-        if (l === t)
+      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: t, endRow: l - 1, startColumn: o.column, endColumn: d.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 };
         }
         c = N(a, this._selectionRenderService);
-      } else if (g >= t && g <= n && r === y.Both) {
-        const h = this._skeletonManagerService.attachRangeWithCoord({ startColumn: o.column, endColumn: o.column, startRow: t - 1, endRow: t - 1 });
+      } 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;
         c = {
           from: { ...o },
-          to: { ...d, row: t - 1, rowOffset: h.endY - h.startY }
-        }, a = $(c, this._selectionRenderService, this._skeletonManagerService);
+          to: { ...d, row: n - 1, rowOffset: h.endY - h.startY }
+        }, a = B(c, this._selectionRenderService, this._skeletonManagerService);
       }
     }
     return c != null && a != null ? {
@@ -2053,16 +2076,16 @@ let ot = class extends re {
   _commandListener() {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((i) => {
-        i.id === Ir.id && setTimeout(() => {
-          const e = i.params, { unitId: t, subUnitId: n } = e, r = this._drawingManagerService.drawingManagerData, s = [], o = [];
+        i.id === Dr.id && setTimeout(() => {
+          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 c = l[g].data;
               c != null && Object.keys(c).forEach((a) => {
-                if (d === t && g === n) {
+                if (d === n && g === t) {
                   const h = c[a];
-                  h.transform = $(h.sheetTransform, this._selectionRenderService, this._skeletonManagerService), s.push(c[a]);
+                  h.transform = B(h.sheetTransform, this._selectionRenderService, this._skeletonManagerService), s.push(c[a]);
                 } else
                   o.push(c[a]);
               });
@@ -2075,23 +2098,23 @@ let ot = class extends re {
   _sheetRefreshListener() {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((i) => {
-        Li.includes(i.id) && requestIdleCallback(() => {
-          const e = i.params, { unitId: t, subUnitId: n, ranges: r } = e;
-          this._refreshDrawingTransform(t, n, r);
+        Fi.includes(i.id) && requestIdleCallback(() => {
+          const e = i.params, { unitId: n, subUnitId: t, ranges: r } = e;
+          this._refreshDrawingTransform(n, t, r);
         });
       })
     );
   }
-  _refreshDrawingTransform(i, e, t) {
-    const n = this._drawingManagerService.getDrawingData(i, e), r = [];
-    Object.keys(n).forEach((s) => {
-      const o = n[s], { sheetTransform: d, transform: l, anchorType: g = y.Position } = o;
+  _refreshDrawingTransform(i, e, n) {
+    const t = this._drawingManagerService.getDrawingData(i, e), r = [];
+    Object.keys(t).forEach((s) => {
+      const o = t[s], { sheetTransform: d, transform: l, anchorType: g = y.Position } = o;
       if (g === y.None)
         return !0;
       const { from: c, to: a } = d, { row: h, column: u } = c, { row: m, column: f } = a;
-      for (let p = 0; p < t.length; p++) {
-        const I = t[p], { startRow: S, endRow: v, startColumn: R, endColumn: _ } = I;
-        if (Sn.intersects(
+      for (let p = 0; p < n.length; p++) {
+        const I = n[p], { startRow: S, endRow: v, startColumn: R, endColumn: _ } = I;
+        if (Rn.intersects(
           {
             startRow: S,
             endRow: v,
@@ -2105,7 +2128,7 @@ let ot = class extends re {
             endColumn: f
           }
         ) || h > v || u > _) {
-          const C = g === y.Position, w = $(d, this._selectionRenderService, this._skeletonManagerService);
+          const C = g === y.Position, w = B(d, this._selectionRenderService, this._skeletonManagerService);
           r.push({
             ...o,
             transform: {
@@ -2120,23 +2143,23 @@ let ot = class extends re {
     }), r.length !== 0 && (this._drawingManagerService.refreshTransform(r), this._commandService.syncExecuteCommand(j.id, [i]));
   }
 };
-ot = ji([
+ot = ki([
   Q(1, J),
   Q(2, W),
   Q(3, pe),
-  Q(4, B(q)),
-  Q(5, B(at)),
+  Q(4, x(q)),
+  Q(5, x(at)),
   Q(6, F),
   Q(7, K),
   Q(8, fe)
 ], ot);
-var $i = Object.defineProperty, Wi = Object.getOwnPropertyDescriptor, Gi = (i, e, t, n) => {
-  for (var r = n > 1 ? void 0 : n ? Wi(e, t) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (r = (n ? o(e, t, r) : o(r)) || r);
-  return n && r && $i(e, t, r), r;
-}, se = (i, e) => (t, n) => e(t, n, i);
-function xi(i, e, t, n) {
-  const { scaleX: r, scaleY: s } = e.getAncestorScale(), o = e.getViewport(Fn.VIEW_MAIN), d = {
+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;
+}, se = (i, e) => (n, t) => e(n, t, i);
+function Ki(i, e, n, t) {
+  const { scaleX: r, scaleY: s } = e.getAncestorScale(), o = e.getViewport(zn.VIEW_MAIN), d = {
     left: !0,
     top: !0
   };
@@ -2145,7 +2168,7 @@ function xi(i, e, t, n) {
       ...i,
       absolute: d
     };
-  const { left: l, right: g, top: c, bottom: a } = i, h = n.getFreeze(), { startColumn: u, startRow: m, xSplit: f, ySplit: p } = h, I = t.getNoMergeCellPositionByIndexWithNoHeader(m - p, u - f), S = t.getNoMergeCellPositionByIndexWithNoHeader(m, u), { rowHeaderWidth: v, columnHeaderHeight: R } = t, _ = 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 ? (d.left = !0, E = (_ + v + (l - O)) * r, M = Math.max(
     Math.min(
@@ -2169,13 +2192,13 @@ function xi(i, e, t, n) {
     absolute: d
   };
 }
-const Qe = (i, e, t, n) => {
+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 + d,
     top: o,
     bottom: o + l
-  }, a = xi(c, r, t, n), { scaleX: h, scaleY: u } = r.getAncestorScale();
+  }, a = Ki(c, r, n, t), { scaleX: h, scaleY: u } = r.getAncestorScale();
   return {
     startX: a.left,
     endX: a.right,
@@ -2187,30 +2210,30 @@ const Qe = (i, e, t, n) => {
     absolute: a.absolute
   };
 };
-let We = class extends re {
-  constructor(e, t, n, r, s, o, d) {
+let $e = class extends re {
+  constructor(e, n, t, r, s, o, d) {
     super();
-    x(this, "_domLayerMap", /* @__PURE__ */ new Map());
-    x(this, "_domLayerInfoMap", /* @__PURE__ */ new Map());
-    x(this, "_transformChange$", new Ke());
-    x(this, "transformChange$", this._transformChange$.asObservable());
-    x(this, "_add$", new Ke());
-    x(this, "add$", this._add$.asObservable());
-    x(this, "_remove$", new Ke());
-    x(this, "remove$", this._remove$.asObservable());
-    x(this, "_hooks", []);
-    this._renderManagerService = e, this._univerInstanceService = t, this._commandService = n, this._drawingManagerService = r, this._canvasFloatDomService = s, this._sheetDrawingService = o, this._lifecycleService = d, 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 === Cn.Rendered), lr(1)).subscribe(() => {
+    this._lifecycleService.lifecycle$.pipe(ae((e) => e === Mn.Rendered), gr(1)).subscribe(() => {
       this._scrollUpdateListener();
     });
   }
-  _ensureMap(e, t) {
-    let n = this._domLayerMap.get(e);
-    n || (n = /* @__PURE__ */ new Map(), this._domLayerMap.set(e, n));
-    let r = n.get(t);
-    return r || (r = /* @__PURE__ */ new Map(), n.set(t, r)), r;
+  _ensureMap(e, n) {
+    let t = this._domLayerMap.get(e);
+    t || (t = /* @__PURE__ */ new Map(), this._domLayerMap.set(e, t));
+    let r = t.get(n);
+    return r || (r = /* @__PURE__ */ new Map(), t.set(n, r)), r;
   }
   getFloatDomInfo(e) {
     return this._domLayerInfoMap.get(e);
@@ -2218,38 +2241,38 @@ let We = class extends re {
   _getSceneAndTransformerByDrawingSearch(e) {
     if (e == null)
       return;
-    const t = this._renderManagerService.getRenderById(e), n = t == null ? void 0 : t.scene;
-    if (t == null || n == null)
+    const n = this._renderManagerService.getRenderById(e), t = n == null ? void 0 : n.scene;
+    if (n == null || t == null)
       return null;
-    const r = n.getTransformerByCreate(), s = t.engine.getCanvasElement();
-    return { scene: n, transformer: r, renderObject: t, canvas: s };
+    const r = t.getTransformerByCreate(), s = n.engine.getCanvasElement();
+    return { scene: t, transformer: r, renderObject: n, canvas: s };
   }
   _getFloatDomProps(e) {
-    let t;
-    return this._hooks.forEach((n) => {
-      t = n.onGetFloatDomProps(e);
-    }), t;
+    let n;
+    return this._hooks.forEach((t) => {
+      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((t) => {
+        e.forEach((n) => {
           var ut, ht, gt;
-          const { unitId: n, subUnitId: r, drawingId: s } = t, o = ce(this._univerInstanceService, { unitId: n, subUnitId: r }), d = this._drawingManagerService.getDrawingByParam(t), l = this._univerInstanceService.getUnit(n);
+          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 (!d || !o)
             return;
-          const c = (ut = this._renderManagerService.getRenderById(n)) == null ? void 0 : ut.with(q).getWorksheetSkeleton(r);
+          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 } = d;
           if (h !== k.DRAWING_DOM && h !== k.DRAWING_CHART)
             return;
-          const m = this._getSceneAndTransformerByDrawingSearch(n);
+          const m = this._getSceneAndTransformerByDrawingSearch(t);
           if (m == null)
             return;
           const { scene: f, canvas: p } = m;
@@ -2257,7 +2280,7 @@ let We = class extends re {
             return !0;
           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: n, subUnitId: r, 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;
@@ -2267,16 +2290,16 @@ let We = class extends re {
             top: S,
             width: v,
             height: R,
-            zIndex: this._drawingManagerService.getDrawingOrder(n, r).length - 1
+            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(kn.CHART), f.addObject(U, Yn), d.allowTransform !== !1 && f.attachTransformerTo(U);
-          const L = this._ensureMap(n, r), Z = new Rn(), cn = Qe(U, m.renderObject, c.skeleton, o.worksheet), Fe = new ur(cn), dn = {
+          D && U.setObjectType(Xn.CHART), f.addObject(U, Hn), d.allowTransform !== !1 && f.attachTransformerTo(U);
+          const L = this._ensureMap(t, r), Z = new bn(), un = Qe(U, m.renderObject, c.skeleton, o.worksheet), Fe = new mr(un), hn = {
             dispose: Z,
             rect: U,
             position$: Fe,
-            unitId: n,
+            unitId: t,
             subUnitId: r
           };
           this._canvasFloatDomService.addFloatDom({
@@ -2297,7 +2320,7 @@ let We = class extends re {
             },
             props: (gt = (ht = L.get(s)) == null ? void 0 : ht.props) != null ? gt : this._getFloatDomProps(s),
             data: u,
-            unitId: n
+            unitId: t
           });
           const lt = U.onTransformChange$.subscribeEvent(() => {
             const G = Qe(U, m.renderObject, c.skeleton, o.worksheet);
@@ -2307,15 +2330,15 @@ let We = class extends re {
           });
           Z.add(() => {
             this._canvasFloatDomService.removeFloatDom(s);
-          }), lt && Z.add(lt), this._domLayerInfoMap.set(s, dn), L.set(s, {
+          }), lt && Z.add(lt), this._domLayerInfoMap.set(s, hn), L.set(s, {
             ...L.get(s)
           });
         });
       })
     ), this.disposeWithMe(
       this._drawingManagerService.remove$.subscribe((e) => {
-        e.forEach((t) => {
-          const { unitId: n, subUnitId: r, drawingId: s } = t, o = ze({ unitId: n, subUnitId: r, drawingId: s }), d = this._getSceneAndTransformerByDrawingSearch(n);
+        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 } = d, c = g.getObject(o);
@@ -2325,9 +2348,9 @@ let We = class extends re {
     );
   }
   _scrollUpdateListener() {
-    const e = (t, n) => {
+    const e = (n, t) => {
       var g;
-      const r = this._getSceneAndTransformerByDrawingSearch(t), s = this._ensureMap(t, n), o = Array.from(s.keys()), d = ce(this._univerInstanceService, { unitId: t, subUnitId: n }), l = (g = this._renderManagerService.getRenderById(t)) == null ? void 0 : g.with(q).getWorksheetSkeleton(n);
+      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) {
@@ -2338,42 +2361,42 @@ let We = class extends re {
     };
     this.disposeWithMe(
       this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET).pipe(
-        ae((t) => !!t),
-        Ee((t) => {
-          const n = this._renderManagerService.getRenderById(t.getUnitId());
-          return n ? { render: n, unitId: t.getUnitId(), subUnitId: t.getActiveSheet().getSheetId() } : null;
+        ae((n) => !!n),
+        Ee((n) => {
+          const t = this._renderManagerService.getRenderById(n.getUnitId());
+          return t ? { render: t, unitId: n.getUnitId(), subUnitId: n.getActiveSheet().getSheetId() } : null;
         }),
-        ae((t) => !!t),
-        hr(
-          (t) => Dn(t.render.scene.getViewport(qn.VIEW_MAIN).onScrollAfter$).pipe(Ee(() => ({ unitId: t.unitId, subUnitId: t.subUnitId })))
+        ae((n) => !!n),
+        fr(
+          (n) => yn(n.render.scene.getViewport(tr.VIEW_MAIN).onScrollAfter$).pipe(Ee(() => ({ unitId: n.unitId, subUnitId: n.subUnitId })))
         )
-      ).subscribe(({ unitId: t, subUnitId: n }) => {
-        e(t, n);
+      ).subscribe(({ unitId: n, subUnitId: t }) => {
+        e(n, t);
       })
-    ), this.disposeWithMe(this._commandService.onCommandExecuted((t) => {
-      var n, r;
-      if (t.id === Qn.id) {
-        const s = t.params, { unitId: o } = s;
-        Array.from((r = (n = this._domLayerMap.get(o)) == null ? void 0 : n.keys()) != null ? r : []).forEach((l) => {
+    ), this.disposeWithMe(this._commandService.onCommandExecuted((n) => {
+      var t, r;
+      if (n.id === nr.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 === Cr.id) {
-        const { unitId: s, subUnitId: o } = t.params;
+      } else if (n.id === Mr.id) {
+        const { unitId: s, subUnitId: o } = n.params;
         e(s, o);
       }
     }));
   }
-  _getPosition(e, t) {
+  _getPosition(e, n) {
     var h;
-    const { startX: n, endX: r, startY: s, endY: o } = e, d = (h = this._renderManagerService.getRenderById(t)) == null ? void 0 : h.with(pe);
+    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 = d.getSelectionCellByPosition(n, s);
+    const l = d.getSelectionCellByPosition(t, s);
     if (l == null)
       return;
     const g = {
       column: l.actualColumn,
-      columnOffset: n - l.startX,
+      columnOffset: t - l.startX,
       row: l.actualRow,
       rowOffset: s - l.startY
     }, c = d.getSelectionCellByPosition(r, o);
@@ -2393,14 +2416,14 @@ let We = class extends re {
   _featureUpdateListener() {
     this.disposeWithMe(
       this._drawingManagerService.update$.subscribe((e) => {
-        e.forEach((t) => {
-          const n = this._drawingManagerService.getDrawingByParam(t);
-          if (!n || n.drawingType !== k.DRAWING_DOM && n.drawingType !== k.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 r = {
-            ...n.transform
+            ...t.transform
           };
-          this._transformChange$.next({ id: t.drawingId, value: r });
+          this._transformChange$.next({ id: n.drawingId, value: r });
         });
       })
     );
@@ -2408,27 +2431,27 @@ let We = class extends re {
   _deleteListener() {
     this.disposeWithMe(
       this._drawingManagerService.remove$.subscribe((e) => {
-        e.forEach((t) => {
-          this._removeDom(t.drawingId);
+        e.forEach((n) => {
+          this._removeDom(n.drawingId);
         });
       })
     );
   }
-  updateFloatDomProps(e, t, n, r) {
-    const s = this._domLayerInfoMap.get(n), o = this._getSceneAndTransformerByDrawingSearch(e);
+  updateFloatDomProps(e, n, t, r) {
+    const s = this._domLayerInfoMap.get(t), o = this._getSceneAndTransformerByDrawingSearch(e);
     if (s && o) {
-      const { scene: d } = o, l = ze({ unitId: e, subUnitId: t, drawingId: n }), g = d.getObject(l);
+      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, t) {
-    const n = ce(this._univerInstanceService, {
+  addFloatDomToPosition(e, n) {
+    const t = ce(this._univerInstanceService, {
       unitId: e.unitId,
       subUnitId: e.subUnitId
     });
-    if (!n)
+    if (!t)
       throw new Error("cannot find current target!");
-    const { unitId: r, subUnitId: s } = n, { initPosition: o, componentKey: d, data: l, allowTransform: g = !0 } = e, c = t != null ? t : Mn(), a = this._getPosition(o, r);
+    const { unitId: r, subUnitId: s } = t, { initPosition: o, componentKey: d, data: l, allowTransform: g = !0 } = e, c = n != null ? n : On(), a = this._getPosition(o, r);
     if (a == null)
       return;
     this._ensureMap(r, s).set(c, e);
@@ -2458,14 +2481,14 @@ let We = class extends re {
       }
     };
   }
-  _removeDom(e, t = !1) {
-    const n = this._domLayerInfoMap.get(e);
-    if (!n)
+  _removeDom(e, n = !1) {
+    const t = this._domLayerInfoMap.get(e);
+    if (!t)
       return;
-    const { unitId: r, subUnitId: s } = n;
-    this._domLayerInfoMap.delete(e), n.dispose.dispose();
+    const { unitId: r, subUnitId: s } = t;
+    this._domLayerInfoMap.delete(e), t.dispose.dispose();
     const o = this._getSceneAndTransformerByDrawingSearch(r);
-    if (o && o.scene.removeObject(n.rect), t) {
+    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)
@@ -2477,63 +2500,63 @@ let We = class extends re {
   addHook(e) {
     return this._hooks.push(e), {
       dispose: () => {
-        const t = this._hooks.findIndex((n) => n === e);
-        this._hooks.splice(t, 1);
+        const n = this._hooks.findIndex((t) => t === e);
+        this._hooks.splice(n, 1);
       }
     };
   }
 };
-We = Gi([
-  se(0, B(J)),
+$e = zi([
+  se(0, x(J)),
   se(1, fe),
-  se(2, B(W)),
+  se(2, x(W)),
   se(3, K),
-  se(4, B(dr)),
+  se(4, x(hr)),
   se(5, F),
-  se(6, B(In))
-], We);
-var on = Object.defineProperty, Vi = Object.getOwnPropertyDescriptor, ki = (i, e, t) => e in i ? on(i, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : i[e] = t, Yi = (i, e, t, n) => {
-  for (var r = n > 1 ? void 0 : n ? Vi(e, t) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (r = (n ? o(e, t, r) : o(r)) || r);
-  return n && r && on(e, t, r), r;
-}, et = (i, e) => (t, n) => e(t, n, i), an = (i, e, t) => ki(i, typeof e != "symbol" ? e + "" : e, t);
-const Fi = "SHEET_IMAGE_UI_PLUGIN";
-let Ge = class extends yn {
-  constructor(i = yr, e, t, n) {
-    super(), this._config = i, this._injector = e, this._renderManagerService = t, this._configService = n;
+  se(6, x(Dn))
+], $e);
+var dn = Object.defineProperty, Ji = Object.getOwnPropertyDescriptor, Zi = (i, e, n) => e in i ? dn(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 && dn(e, n, r), r;
+}, et = (i, e) => (n, t) => e(n, t, i), ln = (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, 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(br, s);
+    r && this._configService.setConfig("menu", r, { merge: !0 }), this._configService.setConfig(Or, s);
   }
   onStarting() {
-    On(this._injector, [
-      [We],
-      [je],
-      [Ae],
+    En(this._injector, [
       [$e],
+      [Ne],
+      [Ue],
       [Le],
-      [Be]
+      [xe],
+      [je]
     ]), Xe(this._injector, [
-      [We]
+      [$e]
     ]);
   }
   onReady() {
     Xe(this._injector, [
-      [Be]
+      [je]
     ]);
   }
   onRendered() {
     this._registerRenderModules(), Xe(this._injector, [
+      [xe],
       [Le],
-      [$e],
-      [je]
+      [Ne]
     ]);
   }
   onSteady() {
-    this._injector.get(Ae);
+    this._injector.get(Ue);
   }
   _registerRenderModules() {
     [
-      [Ne],
+      [Ae],
       [ot],
       [st]
     ].forEach((i) => {
@@ -2541,28 +2564,28 @@ let Ge = class extends yn {
     });
   }
 };
-an(Ge, "type", Y.UNIVER_SHEET);
-an(Ge, "pluginName", Fi);
-Ge = Yi([
-  bn(An, Gn, Xn),
-  et(1, B(Ct)),
+ln(Be, "type", Y.UNIVER_SHEET);
+ln(Be, "pluginName", Qi);
+Be = qi([
+  Pn(xn, kn, Kn),
+  et(1, x(Ct)),
   et(2, J),
-  et(3, Pn)
-], Ge);
+  et(3, Un)
+], Be);
 export {
   j as ClearSheetDrawingTransformerOperation,
-  qt as DeleteDrawingsCommand,
-  zt as EditSheetDrawingOperation,
-  Qt as GroupSheetDrawingCommand,
-  rn as IMAGE_MENU_ID,
+  tn as DeleteDrawingsCommand,
+  Kt as EditSheetDrawingOperation,
+  nn as GroupSheetDrawingCommand,
+  an as IMAGE_MENU_ID,
   dt as InsertFloatImageCommand,
   ke as InsertSheetDrawingCommand,
   we as MoveDrawingsCommand,
-  Ve as RemoveSheetDrawingCommand,
-  en as SetDrawingArrangeCommand,
+  Ge as RemoveSheetDrawingCommand,
+  rn as SetDrawingArrangeCommand,
   Ye as SetSheetDrawingCommand,
-  We as SheetCanvasFloatDomManagerService,
-  Ht as SidebarSheetDrawingOperation,
-  tn as UngroupSheetDrawingCommand,
-  Ge as UniverSheetsDrawingUIPlugin
+  $e as SheetCanvasFloatDomManagerService,
+  zt as SidebarSheetDrawingOperation,
+  sn as UngroupSheetDrawingCommand,
+  Be as UniverSheetsDrawingUIPlugin
 };