@univerjs/sheets-drawing-ui 0.5.0-alpha.0 → 0.5.0-beta.1

package/lib/es/index.js

@@ -1,18 +1,18 @@
-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";
+var mn = Object.defineProperty;
+var fn = (i, e, n) => e in i ? mn(i, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : i[e] = n;
+var V = (i, e, n) => fn(i, typeof e != "symbol" ? e + "" : e, n);
+import { CommandType as H, ICommandService as B, IUndoRedoService as ue, sequenceExecute as It, LocaleService as Be, IUniverInstanceService as fe, useDependency as ae, Inject as W, Injector as Rt, IContextService as Dt, RxDisposable as pn, UniverInstanceType as Y, connectInjector as wn, toDisposable as _n, FOCUSING_COMMON_DRAWINGS as me, Disposable as ie, Direction as te, FOCUSING_FX_BAR_EDITOR as vn, EDITOR_ACTIVATED as Sn, FOCUSING_PANEL_EDITOR as Cn, Tools as ge, UserManagerService as In, IPermissionService as Rn, Rectangle as Dn, LifecycleService as Mn, LifecycleStages as bn, DisposableCollection as yn, fromEventSubject as On, generateRandomId as Tn, DependentOn as Pn, Plugin as En, registerDependencies as Un, touchDependencies as Xe, IConfigService as An } from "@univerjs/core";
+import { IDrawingManagerService as K, IImageIoService as Mt, DrawingTypeEnum as k, ArrangeTypeEnum as ve, DRAWING_IMAGE_ALLOW_IMAGE_LIST as Nn, DRAWING_IMAGE_COUNT_LIMIT as mt, ImageUploadStatusType as He, DRAWING_IMAGE_ALLOW_SIZE as jn, getImageSize as Wn, DRAWING_IMAGE_WIDTH_LIMIT as ft, DRAWING_IMAGE_HEIGHT_LIMIT as pt, getDrawingShapeKeyByDrawingSearch as ze, UniverDrawingPlugin as xn } from "@univerjs/drawing";
+import { ImageCropperObject as $n, COMPONENT_IMAGE_POPUP_MENU as Ln, OpenImageCropOperation as Bn, ImageResetSizeOperation as Gn, DrawingCommonPanel as Vn, DrawingRenderService as kn, UniverDrawingUIPlugin as Yn } from "@univerjs/drawing-ui";
+import { IRenderManagerService as J, precisionTo as ne, getGroupState as Fn, transformObjectOutOfGroup as Xn, RENDER_CLASS_TYPE as de, Rect as wt, ObjectType as Hn, DRAWING_OBJECT_LAYER_INDEX as zn, SHEET_VIEWPORT_KEY as Kn } from "@univerjs/engine-render";
+import { ISheetDrawingService as F, SetDrawingApplyMutation as T, DrawingApplyType as P, SheetDrawingAnchorType as y, UniverSheetsDrawingPlugin as Jn } from "@univerjs/sheets-drawing";
+import { SheetCanvasPopManagerService as Zn, attachRangeWithCoord as Pe, ISheetSelectionRenderService as pe, SheetSkeletonManagerService as q, getCurrentRangeDisable$ as qn, COPY_TYPE as _t, PREDEFINED_HOOK_NAME as Se, virtualizeDiscreteRanges as Qn, ISheetClipboardService as er, SheetPrintInterceptorService as tr, VIEWPORT_KEY as nr, SetZoomRatioOperation as rr } from "@univerjs/sheets-ui";
+import { ISidebarService as ir, IUIPartsService as sr, BuiltInUIPart as or, ILocalFileService as ar, IMessageService as cr, MenuItemType as bt, getMenuHiddenObservable as yt, RibbonStartGroup as dr, KeyCode as le, ComponentManager as lr, IMenuManagerService as ur, IShortcutService as hr, CanvasFloatDomService as gr } from "@univerjs/ui";
+import { takeUntil as vt, combineLatest as Ce, map as Ee, filter as re, distinctUntilChanged as Ie, Subject as Ke, take as mr, BehaviorSubject as fr, switchMap as St } from "rxjs";
+import { SheetInterceptorService as at, getSheetCommandTarget as ce, SheetsSelectionsService as pr, WorkbookEditablePermission as tt, WorksheetEditPermission as Te, RangeProtectionPermissionEditPoint as wr, WorkbookViewPermission as Ct, WorksheetViewPermission as Je, InsertRowCommand as Ot, InsertColCommand as Tt, RemoveRowCommand as Pt, RemoveColCommand as Et, DeleteRangeMoveLeftCommand as Ut, DeleteRangeMoveUpCommand as At, InsertRangeMoveDownCommand as Nt, InsertRangeMoveRightCommand as jt, DeltaRowHeightCommand as nt, SetRowHeightCommand as rt, DeltaColumnWidthCommand as Wt, SetColWidthCommand as xt, SetRowHiddenCommand as $t, SetSpecificRowsVisibleCommand as Lt, SetSpecificColsVisibleCommand as Bt, SetColHiddenCommand as Gt, MoveColsCommand as Vt, MoveRowsCommand as kt, MoveRangeCommand as Yt, SetRowVisibleMutation as _r, SetRowHiddenMutation as vr, SetColVisibleMutation as Sr, SetColHiddenMutation as Cr, SetWorksheetRowHeightMutation as Ir, SetWorksheetColWidthMutation as Rr, SetWorksheetActiveOperation as Dr, SetFrozenMutation as Mr } from "@univerjs/sheets";
+import Ft, { useEffect as ct, forwardRef as Xt, useRef as br, createElement as Ht, useState as it } from "react";
 import { MessageType as Re, RadioGroup as yr, Radio as Ze } from "@univerjs/design";
-const Or = "sheets-drawing-ui.config", Pr = {}, j = {
+const Or = "sheets-drawing-ui.config", Tr = {}, j = {
   id: "sheet.operation.clear-drawing-transformer",
   type: H.MUTATION,
   handler: (i, e) => {
@@ -27,14 +27,14 @@ const Or = "sheets-drawing-ui.config", Pr = {}, j = {
   type: H.COMMAND,
   handler: (i, e) => {
     var S, v, R;
-    const n = i.get(W), t = i.get(ue), r = i.get(at), s = i.get(F);
+    const n = i.get(B), t = i.get(ue), r = i.get(at), s = i.get(F);
     if (!e) return !1;
     const { drawings: o } = e, d = [];
     o.forEach((_) => {
-      const { unitId: C } = _;
-      d.push(C);
+      const { unitId: I } = _;
+      d.push(I);
     });
-    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 } };
+    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: T.id, params: { unitId: g, subUnitId: c, op: h, objects: u, type: P.REMOVE } }, p = { id: T.id, params: { unitId: g, subUnitId: c, op: a, objects: u, type: P.INSERT } };
     return It([...(S = m.preRedos) != null ? S : [], f, ...m.redos], n) ? (t.pushUndoRedo({
       unitID: g,
       undoMutations: [
@@ -51,17 +51,17 @@ const Or = "sheets-drawing-ui.config", Pr = {}, j = {
       ]
     }), !0) : !1;
   }
-}, Ht = "COMPONENT_SHEET_DRAWING_PANEL", zt = {
+}, zt = "COMPONENT_SHEET_DRAWING_PANEL", Kt = {
   id: "sidebar.operation.sheet-image",
   type: H.COMMAND,
   handler: async (i, e) => {
-    const n = i.get(rr), t = i.get(We), r = i.get(fe), s = i.get(K);
+    const n = i.get(ir), t = i.get(Be), r = i.get(fe), s = i.get(K);
     if (!ce(r)) return !1;
     switch (e.value) {
       case "open":
         n.open({
           header: { title: t.t("sheetImage.panel.title") },
-          children: { label: Ht },
+          children: { label: zt },
           onClose: () => {
             s.focusDrawing(null);
           },
@@ -75,15 +75,15 @@ const Or = "sheets-drawing-ui.config", Pr = {}, j = {
     }
     return !0;
   }
-}, Kt = {
+}, Jt = {
   id: "sheet.operation.edit-sheet-image",
   type: H.OPERATION,
   handler: (i, e) => {
-    const n = i.get(K), t = i.get(W);
-    return e == null ? !1 : (n.focusDrawing([e]), t.executeCommand(zt.id, { value: "open" }), !0);
+    const n = i.get(K), t = i.get(B);
+    return e == null ? !1 : (n.focusDrawing([e]), t.executeCommand(Kt.id, { value: "open" }), !0);
   }
 };
-var Jt = { exports: {} }, Ve = {};
+var Zt = { exports: {} }, Ve = {};
 /**
  * @license React
  * react-jsx-runtime.production.min.js
@@ -93,8 +93,8 @@ var Jt = { exports: {} }, Ve = {};
  * 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 Pr = Ft, Er = Symbol.for("react.element"), Ur = Symbol.for("react.fragment"), Ar = Object.prototype.hasOwnProperty, Nr = Pr.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, jr = { key: !0, ref: !0, __self: !0, __source: !0 };
+function qt(i, e, n) {
   var t, r = {}, s = null, o = null;
   n !== void 0 && (s = "" + n), e.key !== void 0 && (s = "" + e.key), e.ref !== void 0 && (o = e.ref);
   for (t in e) Ar.call(e, t) && !jr.hasOwnProperty(t) && (r[t] = e[t]);
@@ -102,18 +102,18 @@ function Zt(i, e, n) {
   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,
+Ve.jsx = qt;
+Ve.jsxs = qt;
+Zt.exports = Ve;
+var $ = Zt.exports;
+const Wr = "univer-upload-loading", xr = "univer-upload-loading-body", $r = "univer-upload-loading-body-animation", Lr = "univer-UniverCircleAnimation", Br = "univer-upload-loading-body-text", De = {
+  uploadLoading: Wr,
+  uploadLoadingBody: xr,
   uploadLoadingBodyAnimation: $r,
-  univerCircleAnimation: Br,
-  uploadLoadingBodyText: Wr
+  univerCircleAnimation: Lr,
+  uploadLoadingBodyText: Br
 }, Gr = () => {
-  const i = oe(Dt), e = oe(We), [n, t] = Yt.useState(0);
+  const i = ae(Mt), e = ae(Be), [n, t] = Ft.useState(0);
   return ct(() => {
     const r = i.change$.subscribe((s) => {
       t(s);
@@ -130,15 +130,15 @@ var Vr = Object.defineProperty, kr = Object.getOwnPropertyDescriptor, Yr = (i, e
   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 {
+}, se = (i, e) => (n, t) => e(n, t, i);
+let Ue = class extends pn {
   constructor(e, n, t, r, s, o, d) {
     super();
     V(this, "_initImagePopupMenu", /* @__PURE__ */ new Set());
     this._injector = e, this._drawingManagerService = n, this._canvasPopManagerService = t, this._renderManagerService = r, this._univerInstanceService = s, this._contextService = o, this._uiPartsService = d, this._init();
   }
   _init() {
-    this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET).pipe(vt(this.dispose$)).subscribe((e) => this._create(e)), this._univerInstanceService.getTypeOfUnitDisposed$(Y.UNIVER_SHEET).pipe(vt(this.dispose$)).subscribe((e) => this._dispose(e)), this._univerInstanceService.getAllUnitsForType(Y.UNIVER_SHEET).forEach((e) => this._create(e)), this._uiPartsService.registerComponent(sr.CONTENT, () => pn(Gr, this._injector));
+    this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET).pipe(vt(this.dispose$)).subscribe((e) => this._create(e)), this._univerInstanceService.getTypeOfUnitDisposed$(Y.UNIVER_SHEET).pipe(vt(this.dispose$)).subscribe((e) => this._dispose(e)), this._univerInstanceService.getAllUnitsForType(Y.UNIVER_SHEET).forEach((e) => this._create(e)), this._uiPartsService.registerComponent(or.CONTENT, () => wn(Gr, this._injector));
   }
   _dispose(e) {
     const n = e.getUnitId();
@@ -153,7 +153,7 @@ let Ue = class extends fn {
   _hasCropObject(e) {
     const n = e.getAllObjectsByOrder();
     for (const t of n)
-      if (t instanceof Ln)
+      if (t instanceof $n)
         return !0;
     return !1;
   }
@@ -167,7 +167,7 @@ let Ue = class extends fn {
       return;
     let r;
     this.disposeWithMe(
-      wn(
+      _n(
         t.createControl$.subscribe(() => {
           if (this._contextService.setContextValue(me, !0), this._hasCropObject(n))
             return;
@@ -184,7 +184,7 @@ let Ue = class extends fn {
             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: $n,
+            componentKey: Ln,
             direction: "horizontal",
             offset: [2, 0],
             extraProps: {
@@ -212,7 +212,7 @@ let Ue = class extends fn {
       {
         label: "image-popup.edit",
         index: 0,
-        commandId: Kt.id,
+        commandId: Jt.id,
         commandParams: { unitId: e, subUnitId: n, drawingId: t },
         disable: r === k.DRAWING_DOM
       },
@@ -233,7 +233,7 @@ let Ue = class extends fn {
       {
         label: "image-popup.reset",
         index: 3,
-        commandId: Wn.id,
+        commandId: Gn.id,
         commandParams: [{ unitId: e, subUnitId: n, drawingId: t }],
         disable: r === k.DRAWING_DOM
       }
@@ -241,16 +241,16 @@ let Ue = class extends fn {
   }
 };
 Ue = Yr([
-  ie(0, x(Ct)),
-  ie(1, K),
-  ie(2, x(Jn)),
-  ie(3, J),
-  ie(4, fe),
-  ie(5, Rt),
-  ie(6, x(ir))
+  se(0, W(Rt)),
+  se(1, K),
+  se(2, W(Zn)),
+  se(3, J),
+  se(4, fe),
+  se(5, Dt),
+  se(6, W(sr))
 ], 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, {
+function L(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: C } = r, S = n.getCurrentSkeleton(), v = Pe(S, {
     startColumn: c,
     endColumn: c,
     startRow: h,
@@ -258,7 +258,7 @@ function B(i, e, n) {
   });
   if (v == null)
     return;
-  const R = Te(S, {
+  const R = Pe(S, {
     startColumn: m,
     endColumn: m,
     startRow: p,
@@ -266,8 +266,8 @@ function B(i, e, n) {
   });
   if (R == null)
     return;
-  const { startX: _, startY: C } = v, { startX: w, startY: O } = R;
-  let b = ne(_ + a, 1), A = ne(C + u, 1), E = ne(w + f - b, 1), M = ne(O + I - A, 1);
+  const { startX: _, startY: I } = v, { startX: w, startY: O } = R;
+  let b = ne(_ + a, 1), A = ne(I + u, 1), E = ne(w + f - b, 1), M = ne(O + C - A, 1);
   v.startX === R.endX && (E = 0), v.startY === R.endY && (M = 0);
   const D = S.rowHeaderWidth + S.columnTotalWidth, U = S.columnHeaderHeight + S.rowTotalHeight;
   return b + E > D && (b = D - E), A + M > U && (A = U - M), {
@@ -283,7 +283,7 @@ function B(i, e, n) {
   };
 }
 function N(i, e) {
-  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);
+  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.getCellWithCoordByOffset(n, t);
   if (a == null)
     return;
   const h = {
@@ -291,7 +291,7 @@ function N(i, e) {
     columnOffset: ne(n - a.startX, 1),
     row: a.actualRow,
     rowOffset: ne(t - a.startY, 1)
-  }, u = e.getSelectionCellByPosition(n + r, t + s);
+  }, u = e.getCellWithCoordByOffset(n + r, t + s);
   if (u == null)
     return;
   const m = {
@@ -315,7 +315,7 @@ var Fr = Object.defineProperty, Xr = Object.getOwnPropertyDescriptor, Hr = (i, e
     (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 {
+let st = class extends ie {
   constructor(i, e, n, t, r) {
     super(), this._context = i, this._sheetDrawingService = e, this._drawingManagerService = n, this._sheetSelectionRenderService = t, this._sheetSkeletonManagerService = r, this._init();
   }
@@ -329,7 +329,7 @@ let st = class extends re {
       const n = i[e];
       for (const t in n.data) {
         const r = n.data[t];
-        r.transform = B(r.sheetTransform, this._sheetSelectionRenderService, this._sheetSkeletonManagerService);
+        r.transform = L(r.sheetTransform, this._sheetSelectionRenderService, this._sheetSkeletonManagerService);
       }
     }
     this._drawingManagerService.registerDrawingData(this._context.unitId, this._sheetDrawingService.getDrawingDataForUnit(this._context.unitId)), this._drawingManagerService.initializeNotification(this._context.unitId);
@@ -338,8 +338,8 @@ let st = class extends re {
 st = Hr([
   Me(1, F),
   Me(2, K),
-  Me(3, x(pe)),
-  Me(4, x(q))
+  Me(3, W(pe)),
+  Me(4, W(q))
 ], st);
 var X = function() {
   return X = Object.assign || function(i) {
@@ -356,13 +356,13 @@ var X = function() {
     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) {
+}, Qt = Xt(function(i, e) {
   var n = i.icon, t = i.id, r = i.className, s = i.extend, o = zr(i, ["icon", "id", "className", "extend"]), d = "univerjs-icon univerjs-icon-".concat(t, " ").concat(r || "").trim(), l = br("_".concat(Zr()));
-  return Qt(n, "".concat(t), { defIds: n.defIds, idSuffix: l.current }, X({ ref: e, className: d }, o), s);
+  return en(n, "".concat(t), { defIds: n.defIds, idSuffix: l.current }, X({ ref: e, className: d }, o), s);
 });
-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 en(i, e, n, t, r) {
+  return Ht(i.tag, X(X({ key: e }, Kr(i, n, r)), t), (Jr(i, n).children || []).map(function(s, o) {
+    return en(s, "".concat(e, "-").concat(i.tag, "-").concat(o), n, void 0, r);
   }));
 }
 function Kr(i, e, n) {
@@ -383,20 +383,20 @@ function Jr(i, e) {
 function Zr() {
   return Math.random().toString(36).substring(2, 8);
 }
-qt.displayName = "UniverIcon";
-var qr = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M2.2498 3.65005C2.2498 2.87685 2.87661 2.25005 3.64981 2.25005H7.9998C8.33118 2.25005 8.5998 1.98142 8.5998 1.65005C8.5998 1.31868 8.33118 1.05005 7.9998 1.05005H3.64981C2.21387 1.05005 1.0498 2.21411 1.0498 3.65005V12.35C1.0498 13.786 2.21386 14.95 3.6498 14.95H12.3498C13.7857 14.95 14.9498 13.786 14.9498 12.3501V8.00005C14.9498 7.66868 14.6812 7.40005 14.3498 7.40005C14.0184 7.40005 13.7498 7.66868 13.7498 8.00005V9.23974L12.2385 8.1063C11.7252 7.72129 11.0068 7.7723 10.5531 8.22605L9.00869 9.77041L6.73916 7.8251C6.24387 7.40055 5.5095 7.41278 5.02864 7.85359L2.2498 10.4009V3.65005ZM2.2498 12.0287V12.35C2.2498 13.1232 2.87661 13.75 3.6498 13.75H12.3498C13.123 13.75 13.7498 13.1232 13.7498 12.3501V10.7397L11.5186 9.06631C11.4829 9.03956 11.433 9.04314 11.4016 9.07458L9.92249 10.5537L11.1015 11.5642C11.3531 11.7799 11.3822 12.1587 11.1666 12.4103C10.9509 12.6619 10.5721 12.691 10.3205 12.4753L5.9582 8.7362C5.92384 8.70674 5.87288 8.70758 5.83952 8.73816L2.2498 12.0287Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M11.8097 1.14783C12.1411 1.14783 12.4097 1.41646 12.4097 1.74783V3.297H14.1541C14.4855 3.297 14.7541 3.56563 14.7541 3.897C14.7541 4.22837 14.4855 4.497 14.1541 4.497H12.4097V6.24167C12.4097 6.57304 12.1411 6.84167 11.8097 6.84167C11.4783 6.84167 11.2097 6.57304 11.2097 6.24167V4.497H9.6603C9.32893 4.497 9.0603 4.22837 9.0603 3.897C9.0603 3.56563 9.32893 3.297 9.6603 3.297H11.2097V1.74783C11.2097 1.41646 11.4783 1.14783 11.8097 1.14783Z" } }] }, en = Ft(function(i, e) {
-  return Xt(qt, Object.assign({}, i, {
+Qt.displayName = "UniverIcon";
+var qr = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M2.2498 3.65005C2.2498 2.87685 2.87661 2.25005 3.64981 2.25005H7.9998C8.33118 2.25005 8.5998 1.98142 8.5998 1.65005C8.5998 1.31868 8.33118 1.05005 7.9998 1.05005H3.64981C2.21387 1.05005 1.0498 2.21411 1.0498 3.65005V12.35C1.0498 13.786 2.21386 14.95 3.6498 14.95H12.3498C13.7857 14.95 14.9498 13.786 14.9498 12.3501V8.00005C14.9498 7.66868 14.6812 7.40005 14.3498 7.40005C14.0184 7.40005 13.7498 7.66868 13.7498 8.00005V9.23974L12.2385 8.1063C11.7252 7.72129 11.0068 7.7723 10.5531 8.22605L9.00869 9.77041L6.73916 7.8251C6.24387 7.40055 5.5095 7.41278 5.02864 7.85359L2.2498 10.4009V3.65005ZM2.2498 12.0287V12.35C2.2498 13.1232 2.87661 13.75 3.6498 13.75H12.3498C13.123 13.75 13.7498 13.1232 13.7498 12.3501V10.7397L11.5186 9.06631C11.4829 9.03956 11.433 9.04314 11.4016 9.07458L9.92249 10.5537L11.1015 11.5642C11.3531 11.7799 11.3822 12.1587 11.1666 12.4103C10.9509 12.6619 10.5721 12.691 10.3205 12.4753L5.9582 8.7362C5.92384 8.70674 5.87288 8.70758 5.83952 8.73816L2.2498 12.0287Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M11.8097 1.14783C12.1411 1.14783 12.4097 1.41646 12.4097 1.74783V3.297H14.1541C14.4855 3.297 14.7541 3.56563 14.7541 3.897C14.7541 4.22837 14.4855 4.497 14.1541 4.497H12.4097V6.24167C12.4097 6.57304 12.1411 6.84167 11.8097 6.84167C11.4783 6.84167 11.2097 6.57304 11.2097 6.24167V4.497H9.6603C9.32893 4.497 9.0603 4.22837 9.0603 3.897C9.0603 3.56563 9.32893 3.297 9.6603 3.297H11.2097V1.74783C11.2097 1.41646 11.4783 1.14783 11.8097 1.14783Z" } }] }, tn = Xt(function(i, e) {
+  return Ht(Qt, Object.assign({}, i, {
     id: "add-image-single",
     ref: e,
     icon: qr
   }));
 });
-en.displayName = "AddImageSingle";
-const tn = {
+tn.displayName = "AddImageSingle";
+const nn = {
   id: "sheet.command.delete-drawing",
   type: H.COMMAND,
   handler: (i) => {
-    const e = i.get(W), t = i.get(F).getFocusDrawings();
+    const e = i.get(B), t = i.get(F).getFocusDrawings();
     if (t.length === 0)
       return !1;
     const r = t[0].unitId, s = t.map((o) => {
@@ -417,7 +417,7 @@ const tn = {
 function Qr(i) {
   const e = [];
   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 { parent: t, children: r } = n, { unitId: s, subUnitId: o, drawingId: d } = t, l = Fn(0, 0, r.map((a) => a.transform || {})), g = r.map((a) => {
       const h = a.transform || { left: 0, top: 0 }, { unitId: u, subUnitId: m, drawingId: f } = a;
       return {
         unitId: u,
@@ -450,7 +450,7 @@ function ei(i) {
     if (l == null)
       return;
     const g = r.map((a) => {
-      const { transform: h } = a, { unitId: u, subUnitId: m, drawingId: f } = a, p = Fn(h || {}, l, l.width || 0, l.height || 0);
+      const { transform: h } = a, { unitId: u, subUnitId: m, drawingId: f } = a, p = Xn(h || {}, l, l.width || 0, l.height || 0);
       return {
         unitId: u,
         subUnitId: m,
@@ -474,11 +474,11 @@ function ei(i) {
     });
   }), e;
 }
-const nn = {
+const rn = {
   id: "sheet.command.group-sheet-image",
   type: H.COMMAND,
   handler: (i, e) => {
-    const n = i.get(W), t = i.get(ue), r = i.get(F);
+    const n = i.get(B), t = i.get(ue), r = i.get(F);
     if (!e) return !1;
     const s = [];
     e.forEach(({ parent: u, children: m }) => {
@@ -487,14 +487,14 @@ const nn = {
       });
     });
     const o = r.getGroupDrawingOp(e), { unitId: d, subUnitId: l, undo: g, redo: c, objects: a } = o;
-    return n.syncExecuteCommand(P.id, { op: c, unitId: d, subUnitId: l, objects: a, type: T.GROUP }) ? (t.pushUndoRedo({
+    return n.syncExecuteCommand(T.id, { op: c, unitId: d, subUnitId: l, objects: a, type: P.GROUP }) ? (t.pushUndoRedo({
       unitID: d,
       undoMutations: [
-        { id: P.id, params: { op: g, unitId: d, subUnitId: l, objects: ei(a), type: T.UNGROUP } },
+        { id: T.id, params: { op: g, unitId: d, subUnitId: l, objects: ei(a), type: P.UNGROUP } },
         { id: j.id, params: s }
       ],
       redoMutations: [
-        { id: P.id, params: { op: c, unitId: d, subUnitId: l, objects: a, type: T.GROUP } },
+        { id: T.id, params: { op: c, unitId: d, subUnitId: l, objects: a, type: P.GROUP } },
         { id: j.id, params: s }
       ]
     }), !0) : !1;
@@ -504,9 +504,9 @@ const nn = {
   type: H.COMMAND,
   handler: (i, e) => {
     var S, v, R;
-    const n = i.get(W), t = i.get(ue), r = i.get(F), s = i.get(at);
+    const n = i.get(B), t = i.get(ue), r = i.get(F), s = i.get(at);
     if (!e) return !1;
-    const o = e.drawings, 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 } };
+    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: T.id, params: { op: h, unitId: g, subUnitId: c, objects: u, type: P.INSERT } }, p = { id: T.id, params: { op: a, unitId: g, subUnitId: c, objects: u, type: P.REMOVE } };
     return It([...(S = m.preRedos) != null ? S : [], f, ...m.redos], n) ? (t.pushUndoRedo({
       unitID: g,
       undoMutations: [
@@ -523,24 +523,24 @@ const nn = {
       ]
     }), !0) : !1;
   }
-}, rn = {
+}, sn = {
   id: "sheet.command.set-drawing-arrange",
   type: H.COMMAND,
   handler: (i, e) => {
-    const n = i.get(W), t = i.get(ue);
+    const n = i.get(B), 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 n.syncExecuteCommand(P.id, { op: h, unitId: s, subUnitId: o, objects: a, type: T.ARRANGE }) ? (t.pushUndoRedo({
+    return n.syncExecuteCommand(T.id, { op: h, unitId: s, subUnitId: o, objects: a, type: P.ARRANGE }) ? (t.pushUndoRedo({
       unitID: s,
       undoMutations: [
-        { id: P.id, params: { op: u, unitId: s, subUnitId: o, objects: a, type: T.ARRANGE } }
+        { id: T.id, params: { op: u, unitId: s, subUnitId: o, objects: a, type: P.ARRANGE } }
       ],
       redoMutations: [
-        { id: P.id, params: { op: h, unitId: s, subUnitId: o, objects: a, type: T.ARRANGE } }
+        { id: T.id, params: { op: h, unitId: s, subUnitId: o, objects: a, type: P.ARRANGE } }
       ]
     }), !0) : !1;
   }
@@ -548,26 +548,26 @@ const nn = {
   id: "sheet.command.set-sheet-image",
   type: H.COMMAND,
   handler: (i, e) => {
-    const n = i.get(W), t = i.get(ue), r = i.get(F);
+    const n = i.get(B), t = i.get(ue), r = i.get(F);
     if (!e) return !1;
     const { drawings: s } = e, o = r.getBatchUpdateOp(s), { unitId: d, subUnitId: l, undo: g, redo: c, objects: a } = o;
-    return n.syncExecuteCommand(P.id, { unitId: d, subUnitId: l, op: c, objects: a, type: T.UPDATE }) ? (t.pushUndoRedo({
+    return n.syncExecuteCommand(T.id, { unitId: d, subUnitId: l, op: c, objects: a, type: P.UPDATE }) ? (t.pushUndoRedo({
       unitID: d,
       undoMutations: [
-        { id: P.id, params: { unitId: d, subUnitId: l, op: g, objects: a, type: T.UPDATE } },
+        { id: T.id, params: { unitId: d, subUnitId: l, op: g, objects: a, type: P.UPDATE } },
         { id: j.id, params: [d] }
       ],
       redoMutations: [
-        { id: P.id, params: { unitId: d, subUnitId: l, op: c, objects: a, type: T.UPDATE } },
+        { id: T.id, params: { unitId: d, subUnitId: l, op: c, objects: a, type: P.UPDATE } },
         { id: j.id, params: [d] }
       ]
     }), !0) : !1;
   }
-}, sn = {
+}, on = {
   id: "sheet.command.ungroup-sheet-image",
   type: H.COMMAND,
   handler: (i, e) => {
-    const n = i.get(W), t = i.get(ue), r = i.get(F);
+    const n = i.get(B), t = i.get(ue), r = i.get(F);
     if (!e) return !1;
     const s = [];
     e.forEach(({ parent: u, children: m }) => {
@@ -576,14 +576,14 @@ const nn = {
       });
     });
     const o = r.getUngroupDrawingOp(e), { unitId: d, subUnitId: l, undo: g, redo: c, objects: a } = o;
-    return n.syncExecuteCommand(P.id, { op: c, unitId: d, subUnitId: l, objects: a, type: T.UNGROUP }) ? (t.pushUndoRedo({
+    return n.syncExecuteCommand(T.id, { op: c, unitId: d, subUnitId: l, objects: a, type: P.UNGROUP }) ? (t.pushUndoRedo({
       unitID: d,
       undoMutations: [
-        { id: P.id, params: { op: g, unitId: d, subUnitId: l, objects: Qr(a), type: T.GROUP } },
+        { id: T.id, params: { op: g, unitId: d, subUnitId: l, objects: Qr(a), type: P.GROUP } },
         { id: j.id, params: s }
       ],
       redoMutations: [
-        { id: P.id, params: { op: c, unitId: d, subUnitId: l, objects: a, type: T.UNGROUP } },
+        { id: T.id, params: { op: c, unitId: d, subUnitId: l, objects: a, type: P.UNGROUP } },
         { id: j.id, params: s }
       ]
     }), !0) : !1;
@@ -594,7 +594,7 @@ var ti = Object.defineProperty, ni = Object.getOwnPropertyDescriptor, ri = (i, e
     (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 {
+let Ae = class extends ie {
   constructor(e, n, t, r, s, o, d, l, g, c, a, h) {
     super();
     V(this, "_workbookSelections");
@@ -603,7 +603,7 @@ let Ae = class extends re {
   async insertFloatImage() {
     const e = await this._fileOpenerService.openFile({
       multiple: !0,
-      accept: An.map((t) => `.${t.replace("image/", "")}`).join(",")
+      accept: Nn.map((t) => `.${t.replace("image/", "")}`).join(",")
     }), n = e.length;
     return n > mt ? (this._messageService.show({
       type: Re.Error,
@@ -618,7 +618,7 @@ let Ae = class extends re {
       const v = S.message;
       v === He.ERROR_EXCEED_SIZE ? this._messageService.show({
         type: Re.Error,
-        content: this._localeService.t("update-status.exceedMaxSize", String(Nn / (1024 * 1024)))
+        content: this._localeService.t("update-status.exceedMaxSize", String(jn / (1024 * 1024)))
       }) : v === He.ERROR_IMAGE_TYPE ? this._messageService.show({
         type: Re.Error,
         content: this._localeService.t("update-status.invalidImageType")
@@ -629,7 +629,7 @@ let Ae = class extends re {
     }
     if (n == null)
       return;
-    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;
+    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 Wn(g || ""), { width: u, height: m } = this._context.scene;
     this._imageIoService.addImageSourceCache(l, d, h);
     let f = 1;
     if (c > ft || a > pt) {
@@ -639,19 +639,19 @@ let Ae = class extends re {
     const p = this._getImagePosition(c * f, a * f, u, m);
     if (p == null)
       return;
-    const I = {
+    const C = {
       unitId: r,
       subUnitId: s,
       drawingId: o,
       drawingType: k.DRAWING_IMAGE,
       imageSourceType: d,
       source: l,
-      transform: B(p, this._selectionRenderService, this._skeletonManagerService),
+      transform: L(p, this._selectionRenderService, this._skeletonManagerService),
       sheetTransform: p
     };
     this._commandService.executeCommand(ke.id, {
       unitId: r,
-      drawings: [I]
+      drawings: [C]
     });
   }
   _getUnitInfo() {
@@ -670,12 +670,12 @@ let Ae = class extends re {
       endColumn: 0
     };
     s && s.length > 0 && (o = s[s.length - 1].range);
-    const d = Te(this._skeletonManagerService.getCurrent().skeleton, o);
+    const d = Pe(this._skeletonManagerService.getCurrent().skeleton, o);
     if (d == null)
       return;
     let { startColumn: l, startRow: g, startX: c, startY: a } = d, h = !1;
     if (c + e > t && (c = t - e, c < 0 && (c = 0, e = t), h = !0), a + n > r && (a = r - n, a < 0 && (a = 0, n = r), h = !0), h) {
-      const p = this._selectionRenderService.getSelectionCellByPosition(c, a);
+      const p = this._selectionRenderService.getCellWithCoordByOffset(c, a);
       if (p == null)
         return;
       c = p.startX, a = p.startY, l = p.actualColumn, g = p.actualRow;
@@ -685,7 +685,7 @@ let Ae = class extends re {
       columnOffset: 0,
       row: g,
       rowOffset: 0
-    }, m = this._selectionRenderService.getSelectionCellByPosition(c + e, a + n);
+    }, m = this._selectionRenderService.getCellWithCoordByOffset(c + e, a + n);
     if (m == null)
       return;
     const f = {
@@ -700,18 +700,18 @@ let Ae = class extends re {
     };
   }
   _updateOrderListener() {
-    this._drawingManagerService.featurePluginOrderUpdate$.subscribe((e) => {
+    this.disposeWithMe(this._drawingManagerService.featurePluginOrderUpdate$.subscribe((e) => {
       const { unitId: n, subUnitId: t, drawingIds: r, arrangeType: s } = e;
-      this._commandService.executeCommand(rn.id, {
+      this._commandService.executeCommand(sn.id, {
         unitId: n,
         subUnitId: t,
         drawingIds: r,
         arrangeType: s
       });
-    });
+    }));
   }
   _updateImageListener() {
-    this._drawingManagerService.featurePluginUpdate$.subscribe((e) => {
+    this.disposeWithMe(this._drawingManagerService.featurePluginUpdate$.subscribe((e) => {
       const n = [];
       e.length !== 0 && (e.forEach((t) => {
         const { unitId: r, subUnitId: s, drawingId: o, drawingType: d, transform: l } = t;
@@ -725,7 +725,7 @@ let Ae = class extends re {
           return;
         const a = {
           ...t,
-          transform: { ...g.transform, ...l, ...B(c, this._selectionRenderService, this._skeletonManagerService) },
+          transform: { ...g.transform, ...l, ...L(c, this._selectionRenderService, this._skeletonManagerService) },
           sheetTransform: { ...c }
         };
         n.push(a);
@@ -733,16 +733,16 @@ let Ae = class extends re {
         unitId: e[0].unitId,
         drawings: n
       }));
-    });
+    }));
   }
   _groupDrawingListener() {
-    this._drawingManagerService.featurePluginGroupUpdate$.subscribe((e) => {
-      this._commandService.executeCommand(nn.id, e);
+    this.disposeWithMe(this._drawingManagerService.featurePluginGroupUpdate$.subscribe((e) => {
+      this._commandService.executeCommand(rn.id, e);
       const { unitId: n, subUnitId: t, drawingId: r } = e[0].parent;
       this._drawingManagerService.focusDrawing([{ unitId: n, subUnitId: t, drawingId: r }]);
-    }), this._drawingManagerService.featurePluginUngroupUpdate$.subscribe((e) => {
-      this._commandService.executeCommand(sn.id, e);
-    });
+    })), this.disposeWithMe(this._drawingManagerService.featurePluginUngroupUpdate$.subscribe((e) => {
+      this._commandService.executeCommand(on.id, e);
+    }));
   }
   _focusDrawingListener() {
     this.disposeWithMe(
@@ -753,17 +753,17 @@ let Ae = class extends re {
   }
 };
 Ae = ri([
-  z(1, x(q)),
-  z(2, W),
+  z(1, W(q)),
+  z(2, B),
   z(3, pe),
-  z(4, Dt),
-  z(5, or),
+  z(4, Mt),
+  z(5, ar),
   z(6, F),
   z(7, K),
-  z(8, Rt),
-  z(9, ar),
-  z(10, x(We)),
-  z(11, x(pr))
+  z(8, Dt),
+  z(9, cr),
+  z(10, W(Be)),
+  z(11, W(pr))
 ], Ae);
 const dt = {
   id: "sheet.command.insert-float-image",
@@ -776,7 +776,7 @@ const dt = {
   id: "sheet.command.move-drawing",
   type: H.COMMAND,
   handler: (i, e) => {
-    const n = i.get(W), t = i.get(F), r = i.get(pe), { direction: s } = e, o = t.getFocusDrawings();
+    const n = i.get(B), t = i.get(F), r = i.get(pe), { direction: s } = e, o = t.getFocusDrawings();
     if (o.length === 0)
       return !1;
     const d = o[0].unitId, l = o.map((c) => {
@@ -795,23 +795,23 @@ const dt = {
       drawings: l
     }) ? (n.syncExecuteCommand(j.id, [d]), !0) : !1;
   }
-}, on = "addition-and-subtraction-single", an = "sheet.menu.image";
+}, an = "addition-and-subtraction-single", cn = "sheet.menu.image";
 function ii(i) {
   return {
-    id: an,
-    type: Mt.SUBITEMS,
-    icon: on,
+    id: cn,
+    type: bt.SUBITEMS,
+    icon: an,
     tooltip: "sheetImage.title",
-    hidden$: bt(i, Y.UNIVER_SHEET),
-    disabled$: Zn(i, { workbookTypes: [tt], worksheetTypes: [Pe], rangeTypes: [wr] })
+    hidden$: yt(i, Y.UNIVER_SHEET),
+    disabled$: qn(i, { workbookTypes: [tt], worksheetTypes: [Te], rangeTypes: [wr] })
   };
 }
 function si(i) {
   return {
     id: dt.id,
     title: "sheetImage.upload.float",
-    type: Mt.BUTTON,
-    hidden$: bt(i, Y.UNIVER_SHEET)
+    type: bt.BUTTON,
+    hidden$: yt(i, Y.UNIVER_SHEET)
   };
 }
 const oi = "univer-image-common-panel", ai = "univer-image-common-panel-grid", ci = "univer-image-common-panel-border", di = "univer-image-common-panel-title", li = "univer-image-common-panel-subtitle", ui = "univer-image-common-panel-row", hi = "univer-image-common-panel-row-vertical", gi = "univer-image-common-panel-column", mi = "univer-image-common-panel-column-center", fi = "univer-image-common-panel-inline", pi = "univer-image-common-panel-span2", wi = "univer-image-common-panel-span3", _i = "univer-image-common-panel-input", vi = "univer-sheet-image-menu", Si = "univer-sheet-image-menu-input", ee = {
@@ -831,22 +831,22 @@ const oi = "univer-image-common-panel", ai = "univer-image-common-panel-grid", c
   sheetImageMenu: vi,
   sheetImageMenuInput: Si
 };
-function cn(i) {
+function dn(i) {
   var e, n, t = "";
   if (typeof i == "string" || typeof i == "number") t += i;
   else if (typeof i == "object") if (Array.isArray(i)) {
     var r = i.length;
-    for (e = 0; e < r; e++) i[e] && (n = cn(i[e])) && (t && (t += " "), t += n);
+    for (e = 0; e < r; e++) i[e] && (n = dn(i[e])) && (t && (t += " "), t += n);
   } else for (n in i) i[n] && (t && (t += " "), t += n);
   return t;
 }
 function be() {
-  for (var i, e, n = 0, t = "", r = arguments.length; n < r; n++) (i = arguments[n]) && (e = cn(i)) && (t && (t += " "), t += e);
+  for (var i, e, n = 0, t = "", r = arguments.length; n < r; n++) (i = arguments[n]) && (e = dn(i)) && (t && (t += " "), t += e);
   return t;
 }
-const Ii = (i) => {
+const Ci = (i) => {
   var v;
-  const e = oe(W), n = oe(We), t = oe(K), r = oe(J), { drawings: s } = i, o = s[0];
+  const e = ae(B), n = ae(Be), t = ae(K), r = ae(J), { drawings: s } = i, o = s[0];
   if (o == null)
     return;
   const { unitId: d } = o, l = r.getRenderById(d), g = l == null ? void 0 : l.scene;
@@ -854,28 +854,28 @@ const Ii = (i) => {
     return;
   const c = g.getTransformerByCreate(), [a, h] = it(!0), u = (v = o.anchorType) != null ? v : y.Position, [m, f] = it(u);
   function p(R, _) {
-    const C = [];
+    const I = [];
     return R.forEach((w) => {
       const { oKey: O } = w, b = _.getDrawingOKey(O);
       if (b == null)
-        return C.push(null), !0;
-      const { unitId: A, subUnitId: E, drawingId: M, drawingType: D, anchorType: U, sheetTransform: L } = b;
-      C.push({
+        return I.push(null), !0;
+      const { unitId: A, subUnitId: E, drawingId: M, drawingType: D, anchorType: U, sheetTransform: x } = b;
+      I.push({
         unitId: A,
         subUnitId: E,
         drawingId: M,
         anchorType: U,
-        sheetTransform: L,
+        sheetTransform: x,
         drawingType: D
       });
-    }), C;
+    }), I;
   }
   ct(() => {
-    const R = c.clearControl$.subscribe((C) => {
-      C === !0 && h(!1);
-    }), _ = c.changeStart$.subscribe((C) => {
+    const R = c.clearControl$.subscribe((I) => {
+      I === !0 && h(!1);
+    }), _ = c.changeStart$.subscribe((I) => {
       var b;
-      const { objects: w } = C, O = p(w, t);
+      const { objects: w } = I, O = p(w, t);
       if (O.length === 0)
         h(!1);
       else if (O.length >= 1) {
@@ -888,12 +888,12 @@ const Ii = (i) => {
       _.unsubscribe(), R.unsubscribe();
     };
   }, []);
-  function I(R) {
+  function C(R) {
     f(R);
     const _ = t.getFocusDrawings();
     if (_.length === 0)
       return;
-    const C = _.map((w) => ({
+    const I = _.map((w) => ({
       unitId: w.unitId,
       subUnitId: w.subUnitId,
       drawingId: w.drawingId,
@@ -901,20 +901,20 @@ const Ii = (i) => {
     }));
     e.executeCommand(Ye.id, {
       unitId: _[0].unitId,
-      drawings: C
+      drawings: I
     });
   }
   const S = (R) => R ? "block" : "none";
   return /* @__PURE__ */ $.jsxs("div", { className: be(ee.imageCommonPanelGrid, ee.imageCommonPanelBorder), style: { display: S(a) }, children: [
     /* @__PURE__ */ $.jsx("div", { className: ee.imageCommonPanelRow, children: /* @__PURE__ */ $.jsx("div", { className: be(ee.imageCommonPanelColumn, ee.imageCommonPanelTitle), children: /* @__PURE__ */ $.jsx("div", { children: 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("div", { className: be(ee.imageCommonPanelRow), children: /* @__PURE__ */ $.jsx("div", { className: be(ee.imageCommonPanelColumn), children: /* @__PURE__ */ $.jsxs(yr, { value: m, onChange: C, 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") })
     ] }) }) })
   ] });
-}, Ci = () => {
-  const i = oe(K), e = i.getFocusDrawings(), [n, t] = it(e);
+}, Ii = () => {
+  const i = ae(K), e = i.getFocusDrawings(), [n, t] = it(e);
   return ct(() => {
     const r = i.focus$.subscribe((s) => {
       t(s);
@@ -923,12 +923,12 @@ const Ii = (i) => {
       r.unsubscribe();
     };
   }, []), !!(n != null && n.length) && /* @__PURE__ */ $.jsxs("div", { className: ee.imageCommonPanel, children: [
-    /* @__PURE__ */ $.jsx(Gn, { drawings: n }),
-    /* @__PURE__ */ $.jsx(Ii, { drawings: n })
+    /* @__PURE__ */ $.jsx(Vn, { drawings: n }),
+    /* @__PURE__ */ $.jsx(Ci, { drawings: n })
   ] });
 }, Ri = {
-  [cr.FORMULAS_INSERT]: {
-    [an]: {
+  [dr.FORMULAS_INSERT]: {
+    [cn]: {
       order: 3,
       menuItemFactory: ii,
       [dt.id]: {
@@ -939,7 +939,7 @@ const Ii = (i) => {
   }
 };
 function _e(i) {
-  return !i.getContextValue(_n) && !i.getContextValue(vn) && !i.getContextValue(Sn) && i.getContextValue(me);
+  return !i.getContextValue(vn) && !i.getContextValue(Sn) && !i.getContextValue(Cn) && i.getContextValue(me);
 }
 const Di = {
   id: we.id,
@@ -982,7 +982,7 @@ const Di = {
     direction: te.RIGHT
   }
 }, Oi = {
-  id: tn.id,
+  id: nn.id,
   description: "shortcut.sheet.drawing-delete",
   group: "4_sheet-drawing-view",
   // when focusing on any other input tag do not trigger this shortcut
@@ -990,18 +990,18 @@ const Di = {
   binding: le.DELETE,
   mac: le.BACKSPACE
 };
-var Pi = Object.defineProperty, Ti = Object.getOwnPropertyDescriptor, Ei = (i, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Ti(e, n) : e, s = i.length - 1, o; s >= 0; s--)
+var Ti = Object.defineProperty, Pi = Object.getOwnPropertyDescriptor, Ei = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? Pi(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;
+  return t && r && Ti(e, n, r), r;
 }, ye = (i, e) => (n, t) => e(n, t, i);
-let Ne = class extends re {
+let Ne = class extends ie {
   constructor(i, e, n, t) {
     super(), this._componentManager = i, this._menuManagerService = e, this._commandService = n, this._shortcutService = t, this._init();
   }
   _initCustomComponents() {
     const i = this._componentManager;
-    this.disposeWithMe(i.register(on, en)), this.disposeWithMe(i.register(Ht, Ci));
+    this.disposeWithMe(i.register(an, tn)), this.disposeWithMe(i.register(zt, Ii));
   }
   _initMenus() {
     this._menuManagerService.mergeMenu(Ri);
@@ -1012,14 +1012,14 @@ let Ne = class extends re {
       ke,
       Ge,
       Ye,
-      zt,
-      j,
       Kt,
-      nn,
-      sn,
+      j,
+      Jt,
+      rn,
+      on,
       we,
-      tn,
-      rn
+      nn,
+      sn
     ].forEach((i) => this.disposeWithMe(this._commandService.registerCommand(i)));
   }
   _initShortcuts() {
@@ -1039,17 +1039,17 @@ let Ne = class extends re {
   }
 };
 Ne = Ei([
-  ye(0, x(dr)),
-  ye(1, lr),
-  ye(2, W),
-  ye(3, ur)
+  ye(0, W(lr)),
+  ye(1, ur),
+  ye(2, B),
+  ye(3, hr)
 ], 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 {
+let je = class extends ie {
   constructor(e, n, t) {
     super();
     V(this, "_copyInfo");
@@ -1078,13 +1078,13 @@ let je = class extends re {
       const m = c[u], { transform: f } = m;
       if (m.anchorType !== y.Both || !f)
         return;
-      const { left: p = 0, top: I = 0, width: S = 0, height: v = 0 } = f, { drawingStartX: R, drawingEndX: _, drawingStartY: C, drawingEndY: w } = {
+      const { left: p = 0, top: C = 0, width: S = 0, height: v = 0 } = f, { drawingStartX: R, drawingEndX: _, drawingStartY: I, drawingEndY: w } = {
         drawingStartX: p,
         drawingEndX: p + S,
-        drawingStartY: I,
-        drawingEndY: I + v
+        drawingStartY: C,
+        drawingEndY: C + v
       };
-      o <= R && _ <= d && l <= C && w <= g && a.push(m);
+      o <= R && _ <= d && l <= I && w <= g && a.push(m);
     }), a.length && (this._copyInfo = {
       drawings: a,
       unitId: e,
@@ -1108,7 +1108,7 @@ let je = class extends re {
     const { copyRange: t } = n;
     if (!t)
       return { redos: [], undos: [] };
-    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);
+    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({
@@ -1124,7 +1124,7 @@ let je = class extends re {
     });
     if (!f || !p)
       return { redos: [], undos: [] };
-    const I = [], S = [], v = p.startX - f.startX, R = p.startY - f.startY, _ = h - c, C = u - a, w = n.copyType === _t.CUT, { _sheetDrawingService: O } = this;
+    const C = [], S = [], v = p.startX - f.startX, R = p.startY - f.startY, _ = h - c, I = u - a, w = n.copyType === _t.CUT, { _sheetDrawingService: O } = this;
     return r.forEach((A) => {
       const { transform: E, sheetTransform: M } = A;
       if (!E)
@@ -1140,59 +1140,59 @@ let je = class extends re {
           top: E.top + R
         },
         sheetTransform: {
-          to: { ...M.to, row: M.to.row + _, column: M.to.column + C },
-          from: { ...M.from, row: M.from.row + _, column: M.from.column + C }
+          to: { ...M.to, row: M.to.row + _, column: M.to.column + I },
+          from: { ...M.from, row: M.from.row + _, column: M.from.column + I }
         }
       };
       if (w) {
-        const { undo: U, redo: L, objects: Z } = O.getBatchUpdateOp([D]);
-        I.push({
-          id: P.id,
+        const { undo: U, redo: x, objects: Z } = O.getBatchUpdateOp([D]);
+        C.push({
+          id: T.id,
           params: {
             unitId: s,
             subUnitId: o,
-            type: T.UPDATE,
-            op: L,
+            type: P.UPDATE,
+            op: x,
             objects: Z
           }
         }), S.push({
-          id: P.id,
+          id: T.id,
           params: {
             unitId: s,
             subUnitId: o,
-            type: T.UPDATE,
+            type: P.UPDATE,
             op: U,
             objects: Z
           }
         });
       } else {
-        const { undo: U, redo: L, objects: Z } = O.getBatchAddOp([D]);
-        I.push({ id: P.id, params: { op: L, unitId: s, subUnitId: o, objects: Z, type: T.INSERT } }), S.push({ id: P.id, params: { op: U, unitId: s, subUnitId: o, objects: Z, type: T.REMOVE } });
+        const { undo: U, redo: x, objects: Z } = O.getBatchAddOp([D]);
+        C.push({ id: T.id, params: { op: x, unitId: s, subUnitId: o, objects: Z, type: P.INSERT } }), S.push({ id: T.id, params: { op: U, unitId: s, subUnitId: o, objects: Z, type: P.REMOVE } });
       }
     }), {
-      redos: I,
+      redos: C,
       undos: S
     };
   }
 };
 je = Ni([
-  qe(0, Qn),
+  qe(0, er),
   qe(1, J),
   qe(2, F)
 ], je);
-var ji = Object.defineProperty, xi = Object.getOwnPropertyDescriptor, Li = (i, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? xi(e, n) : e, s = i.length - 1, o; s >= 0; s--)
+var ji = Object.defineProperty, Wi = Object.getOwnPropertyDescriptor, xi = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? Wi(e, n) : e, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = (t ? o(e, n, r) : o(r)) || r);
   return t && r && ji(e, n, r), r;
 }, he = (i, e) => (n, t) => e(n, t, i);
-let xe = class extends re {
+let We = class extends ie {
   constructor(i, e, n, t, r) {
     super(), this._drawingManagerService = i, this._renderManagerService = e, this._permissionService = n, this._univerInstanceService = t, this._userManagerService = r, this._initDrawingVisible(), this._initDrawingEditable(), this._initViewPermissionChange(), this._initEditPermissionChange();
   }
   _initDrawingVisible() {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET);
     this.disposeWithMe(
-      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, n]) => {
+      Ce([i, this._userManagerService.currentUser$]).subscribe(([e, n]) => {
         if (!e) {
           this._drawingManagerService.setDrawingVisible(!1);
           return;
@@ -1203,7 +1203,7 @@ let xe = class extends re {
             return;
           }
           const r = e.getUnitId(), s = t.getSheetId();
-          if (this._permissionService.composePermission([new St(r).id, new Je(r, s).id]).every((d) => d.value))
+          if (this._permissionService.composePermission([new Ct(r).id, new Je(r, s).id]).every((d) => d.value))
             this._drawingManagerService.setDrawingVisible(!0);
           else {
             this._drawingManagerService.setDrawingVisible(!1);
@@ -1221,7 +1221,7 @@ let xe = class extends re {
   _initDrawingEditable() {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET);
     this.disposeWithMe(
-      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, n]) => {
+      Ce([i, this._userManagerService.currentUser$]).subscribe(([e, n]) => {
         if (!e) {
           this._drawingManagerService.setDrawingEditable(!1);
           return;
@@ -1232,7 +1232,7 @@ let xe = class extends re {
             return;
           }
           const r = e.getUnitId(), s = t.getSheetId();
-          if (this._permissionService.composePermission([new tt(r).id, new Pe(r, s).id]).every((d) => d.value))
+          if (this._permissionService.composePermission([new tt(r).id, new Te(r, s).id]).every((d) => d.value))
             this._drawingManagerService.setDrawingEditable(!0);
           else {
             this._drawingManagerService.setDrawingEditable(!1);
@@ -1250,7 +1250,7 @@ let xe = class extends re {
   _initViewPermissionChange() {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET);
     this.disposeWithMe(
-      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, n]) => {
+      Ce([i, this._userManagerService.currentUser$]).subscribe(([e, n]) => {
         e && e.activeSheet$.subscribe((t) => {
           var a;
           if (!t)
@@ -1260,21 +1260,21 @@ let xe = class extends re {
           const d = this._renderManagerService.getRenderById(r), l = d == null ? void 0 : d.scene;
           if (l == null)
             return;
-          const g = l.getTransformerByCreate(), c = this._permissionService.composePermission$([new St(r).id, new Je(r, s).id]).pipe(Ee((h) => h.every((u) => u.value)));
+          const g = l.getTransformerByCreate(), c = this._permissionService.composePermission$([new Ct(r).id, new Je(r, s).id]).pipe(Ee((h) => h.every((u) => u.value)));
           c == null || c.pipe(
-            ae((h) => h !== o),
-            Ce()
+            re((h) => h !== o),
+            Ie()
           ).subscribe({
             next: (h) => {
               o = h, this._drawingManagerService.setDrawingVisible(h);
               const u = l.getAllObjectsByOrder(), m = this._drawingManagerService.getDrawingData(r, s), f = Object.values(m);
               h ? this._drawingManagerService.addNotification(f) : (u.forEach((p) => {
-                p.classType === de.IMAGE && f.some((I) => p.oKey.includes(I.drawingId)) && l.removeObject(p);
+                p.classType === de.IMAGE && f.some((C) => p.oKey.includes(C.drawingId)) && l.removeObject(p);
               }), g.clearSelectedObjects());
             }
           }), (a = this._permissionService.getPermissionPoint$(new Je(r, s).id)) == null || a.pipe(
-            ae((h) => h.value !== o),
-            Ce()
+            re((h) => h.value !== o),
+            Ie()
           ).subscribe({
             complete: () => {
               o = !0, this._drawingManagerService.setDrawingVisible(!0);
@@ -1289,7 +1289,7 @@ let xe = class extends re {
   _initEditPermissionChange() {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET);
     this.disposeWithMe(
-      Ie([i, this._userManagerService.currentUser$]).subscribe(([e, n]) => {
+      Ce([i, this._userManagerService.currentUser$]).subscribe(([e, n]) => {
         e && e.activeSheet$.subscribe((t) => {
           var a;
           if (!t)
@@ -1299,31 +1299,31 @@ let xe = class extends re {
           const d = this._renderManagerService.getRenderById(r), l = d == null ? void 0 : d.scene;
           if (l == null)
             return;
-          const g = l.getTransformerByCreate(), c = this._permissionService.composePermission$([new tt(r).id, new Pe(r, s).id]).pipe(Ee((h) => h.every((u) => u.value)));
+          const g = l.getTransformerByCreate(), c = this._permissionService.composePermission$([new tt(r).id, new Te(r, s).id]).pipe(Ee((h) => h.every((u) => u.value)));
           c == null || c.pipe(
-            ae((h) => h !== o),
-            Ce()
+            re((h) => h !== o),
+            Ie()
           ).subscribe({
             next: (h) => {
               o = h, this._drawingManagerService.setDrawingEditable(h);
               const u = l.getAllObjectsByOrder(), m = this._drawingManagerService.getDrawingData(r, s), f = Object.values(m);
               h ? (u.forEach((p) => {
-                p.classType === de.IMAGE && f.some((I) => p.oKey.includes(I.drawingId)) && l.attachTransformerTo(p);
+                p.classType === de.IMAGE && f.some((C) => p.oKey.includes(C.drawingId)) && l.attachTransformerTo(p);
               }), this._drawingManagerService.addNotification(f)) : (u.forEach((p) => {
-                p.classType === de.IMAGE && f.some((I) => p.oKey.includes(I.drawingId)) && l.detachTransformerFrom(p);
+                p.classType === de.IMAGE && f.some((C) => p.oKey.includes(C.drawingId)) && l.detachTransformerFrom(p);
               }), g.clearSelectedObjects());
             }
-          }), (a = this._permissionService.getPermissionPoint$(new Pe(r, s).id)) == null || a.pipe(
-            ae((h) => h.value !== o),
-            Ce()
+          }), (a = this._permissionService.getPermissionPoint$(new Te(r, s).id)) == null || a.pipe(
+            re((h) => h.value !== o),
+            Ie()
           ).subscribe({
             complete: () => {
               o = !0;
-              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)
+              const h = e.getUnitId(), u = t.getSheetId(), m = this._drawingManagerService.getDrawingData(h, u), f = Object.values(m), p = this._renderManagerService.getRenderById(h), C = p == null ? void 0 : p.scene;
+              if (C == null)
                 return;
-              this._drawingManagerService.setDrawingEditable(!0), I.getAllObjectsByOrder().forEach((v) => {
-                v.classType === de.IMAGE && f.some((R) => v.oKey.includes(R.drawingId)) && I.detachTransformerFrom(v);
+              this._drawingManagerService.setDrawingEditable(!0), C.getAllObjectsByOrder().forEach((v) => {
+                v.classType === de.IMAGE && f.some((R) => v.oKey.includes(R.drawingId)) && C.detachTransformerFrom(v);
               });
             }
           });
@@ -1332,19 +1332,19 @@ let xe = class extends re {
     );
   }
 };
-xe = Li([
+We = xi([
   he(0, K),
   he(1, J),
-  he(2, Cn),
+  he(2, Rn),
   he(3, fe),
-  he(4, x(In))
-], xe);
-var $i = Object.defineProperty, Bi = Object.getOwnPropertyDescriptor, Wi = (i, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Bi(e, n) : e, s = i.length - 1, o; s >= 0; s--)
+  he(4, W(In))
+], We);
+var $i = Object.defineProperty, Li = Object.getOwnPropertyDescriptor, Bi = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? Li(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 {
+let xe = class extends ie {
   constructor(i, e, n, t) {
     super(), this._sheetPrintInterceptorService = i, this._drawingRenderService = e, this._drawingManagerService = n, this._renderManagerService = t, this._initPrinting();
   }
@@ -1378,7 +1378,7 @@ let Le = class extends re {
             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 });
+                const m = o.skeleton.getCellIndexByOffset(u.transform.left, u.transform.top, g, c, { x: 0, y: 0 }), f = o.skeleton.getCellIndexByOffset(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);
               }
             }), n(a)) : n(i);
@@ -1388,46 +1388,46 @@ let Le = class extends re {
     );
   }
 };
-Le = Wi([
-  Oe(0, x(er)),
-  Oe(1, x(Vn)),
+xe = Bi([
+  Oe(0, W(tr)),
+  Oe(1, W(kn)),
   Oe(2, K),
   Oe(3, J)
-], Le);
+], xe);
 var Gi = Object.defineProperty, Vi = Object.getOwnPropertyDescriptor, ki = (i, e, n, t) => {
   for (var r = t > 1 ? void 0 : t ? Vi(e, n) : e, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = (t ? o(e, n, r) : o(r)) || r);
   return t && r && Gi(e, n, r), r;
 }, Q = (i, e) => (n, t) => e(n, t, i);
 const Yi = [
-  yt.id,
   Ot.id,
-  Pt.id,
   Tt.id,
+  Pt.id,
   Et.id,
   Ut.id,
   At.id,
   Nt.id,
+  jt.id,
   nt.id,
   rt.id,
-  jt.id,
+  Wt.id,
   xt.id,
-  Lt.id,
   $t.id,
+  Lt.id,
   Bt.id,
-  Wt.id,
   Gt.id,
   Vt.id,
-  kt.id
+  kt.id,
+  Yt.id
 ], Fi = [
   _r.id,
   vr.id,
   Sr.id,
-  Ir.id,
   Cr.id,
+  Ir.id,
   Rr.id
 ];
-let ot = class extends re {
+let ot = class extends ie {
   constructor(i, e, n, t, r, s, o, d, l) {
     super(), this._context = i, this._renderManagerService = e, this._commandService = n, this._selectionRenderService = t, this._skeletonManagerService = r, this._sheetInterceptorService = s, this._sheetDrawingService = o, this._drawingManagerService = d, this._univerInstanceService = l, this._sheetInterceptorListener(), this._commandListener(), this._sheetRefreshListener();
   }
@@ -1440,51 +1440,51 @@ let ot = class extends re {
           if (i.params == null)
             return { redos: [], undos: [] };
           const e = i.id;
-          if (e === yt.id)
+          if (e === Ot.id)
             return this._moveRowInterceptor(i.params, "insert");
-          if ([Gt.id, Vt.id, kt.id].includes(e))
+          if ([Vt.id, kt.id, Yt.id].includes(e))
             return this._moveRangeInterceptor(i.params);
-          if (e === Ot.id)
+          if (e === Tt.id)
             return this._moveColInterceptor(i.params, "insert");
           if (e === Pt.id)
             return this._moveRowInterceptor(i.params, "remove");
-          if (e === Tt.id)
+          if (e === Et.id)
             return this._moveColInterceptor(i.params, "remove");
-          if (e === Et.id) {
+          if (e === Ut.id) {
             const { range: n } = i.params;
             return this._getRangeMoveUndo(
               n,
               0
               /* deleteLeft */
             );
-          } else if (e === Ut.id) {
+          } else if (e === At.id) {
             const { range: n } = i.params;
             return this._getRangeMoveUndo(
               n,
               1
               /* deleteUp */
             );
-          } else if (e === At.id) {
+          } else if (e === Nt.id) {
             const { range: n } = i.params;
             return this._getRangeMoveUndo(
               n,
               2
               /* insertDown */
             );
-          } else if (e === Nt.id) {
+          } else if (e === jt.id) {
             const { range: n } = i.params;
             return this._getRangeMoveUndo(
               n,
               3
               /* insertRight */
             );
-          } else if (e === Lt.id || e === $t.id) {
+          } else if (e === $t.id || e === Lt.id) {
             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) {
+          } else if (e === Bt.id || e === Gt.id) {
             const n = i.params, { unitId: t, subUnitId: r, ranges: s } = n;
             return this._getDrawingUndoForColVisible(t, r, s);
-          } else if (e === nt.id || e === rt.id || e === jt.id || e === xt.id) {
+          } else if (e === nt.id || e === rt.id || e === Wt.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);
           }
@@ -1505,11 +1505,11 @@ 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: 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 } });
+      s.push({ id: T.id, params: { unitId: t, subUnitId: r, op: h, objects: u, type: P.UPDATE } }), o.push({ id: T.id, params: { unitId: t, subUnitId: r, op: a, objects: u, type: P.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: 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 } });
+      s.push({ id: T.id, params: { unitId: t, subUnitId: r, op: h, objects: u, type: P.REMOVE } }), o.push({ id: T.id, params: { unitId: t, subUnitId: r, op: a, objects: u, type: P.INSERT } });
     }
     return s.push({ id: j.id, params: [t] }), o.push({ id: j.id, params: [t] }), {
       redos: s,
@@ -1523,31 +1523,31 @@ let ot = class extends re {
         updateDrawings: t,
         deleteDrawings: r
       };
-    const { startRow: I, endRow: S, startColumn: v, endColumn: R } = i;
-    let _ = null, C = null;
-    if (e === 0 && u >= I && f <= S)
+    const { startRow: C, endRow: S, startColumn: v, endColumn: R } = i;
+    let _ = null, I = null;
+    if (e === 0 && u >= C && f <= S)
       if (m >= v && p <= R)
         r.push({ unitId: l, subUnitId: g, drawingId: c });
       else {
         const w = this._shrinkCol(s, d, v, R, o);
-        _ = w == null ? void 0 : w.newSheetTransform, C = w == null ? void 0 : w.newTransform;
+        _ = w == null ? void 0 : w.newSheetTransform, I = w == null ? void 0 : w.newTransform;
       }
     else if (e === 1 && m >= v && p <= R)
-      if (u >= I && f <= S)
+      if (u >= C && f <= S)
         r.push({ unitId: l, subUnitId: g, drawingId: c });
       else {
-        const w = this._shrinkRow(s, d, I, S, o);
-        _ = w == null ? void 0 : w.newSheetTransform, C = w == null ? void 0 : w.newTransform;
+        const w = this._shrinkRow(s, d, C, S, o);
+        _ = w == null ? void 0 : w.newSheetTransform, I = w == null ? void 0 : w.newTransform;
       }
     else if (e === 2) {
-      const w = this._expandRow(s, d, I, S, o);
-      _ = w == null ? void 0 : w.newSheetTransform, C = w == null ? void 0 : w.newTransform;
+      const w = this._expandRow(s, d, C, S, o);
+      _ = w == null ? void 0 : w.newSheetTransform, I = w == null ? void 0 : w.newTransform;
     } else if (e === 3) {
       const w = this._expandCol(s, d, v, R, o);
-      _ = w == null ? void 0 : w.newSheetTransform, C = w == null ? void 0 : w.newTransform;
+      _ = w == null ? void 0 : w.newSheetTransform, I = w == null ? void 0 : w.newTransform;
     }
-    if (_ != null && C != null) {
-      const w = B(_, this._selectionRenderService, this._skeletonManagerService);
+    if (_ != null && I != null) {
+      const w = L(_, this._selectionRenderService, this._skeletonManagerService);
       t.push({ ...n, sheetTransform: _, transform: w });
     }
     return { updateDrawings: t, deleteDrawings: r };
@@ -1567,18 +1567,18 @@ let ot = class extends re {
       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;
+        const { from: f, to: p } = h, { row: C, column: S } = f, { row: v, column: R } = p;
         for (let _ = 0; _ < n.length; _++) {
-          const C = n[_], { startRow: w, endRow: O, startColumn: b, endColumn: A } = C;
+          const I = n[_], { startRow: w, endRow: O, startColumn: b, endColumn: A } = I;
           if (R < b)
             continue;
           if (m === y.Position) {
             let D = null, U = null;
             if (S >= b && S <= A) {
-              const L = this._skeletonManagerService.attachRangeWithCoord({ startColumn: S, endColumn: A, startRow: f.row, endRow: p.row });
-              if (L == null)
+              const x = this._skeletonManagerService.attachRangeWithCoord({ startColumn: S, endColumn: A, startRow: f.row, endRow: p.row });
+              if (x == null)
                 return;
-              U = { ...u, left: L.startX };
+              U = { ...u, left: x.startX };
             }
             if (U != null && (D = N(U, this._selectionRenderService), D != null && U != null)) {
               r.push({ ...a, sheetTransform: D, transform: U });
@@ -1642,10 +1642,10 @@ let ot = class extends re {
   }
   _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: T.id, params: { unitId: i, subUnitId: e, op: s, objects: o, type: P.UPDATE } },
       { id: j.id, params: [i] }
     ], l = [
-      { id: P.id, params: { unitId: i, subUnitId: e, op: r, objects: o, type: T.UPDATE } },
+      { id: T.id, params: { unitId: i, subUnitId: e, op: r, objects: o, type: P.UPDATE } },
       { id: j.id, params: [i] }
     ];
     return {
@@ -1661,18 +1661,18 @@ let ot = class extends re {
       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;
+        const { from: f, to: p } = h, { row: C, column: S } = f, { row: v, column: R } = p;
         for (let _ = 0; _ < n.length; _++) {
-          const C = n[_], { startRow: w, endRow: O, startColumn: b, endColumn: A } = C;
+          const I = n[_], { startRow: w, endRow: O, startColumn: b, endColumn: A } = I;
           if (v < w)
             continue;
           if (m === y.Position) {
             let D = null, U = null;
-            if (I >= w && I <= O) {
-              const L = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: I, endRow: O });
-              if (L == null)
+            if (C >= w && C <= O) {
+              const x = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: C, endRow: O });
+              if (x == null)
                 return;
-              U = { ...u, top: L.startY };
+              U = { ...u, top: x.startY };
             }
             if (U != null && (D = N(U, this._selectionRenderService), D != null && U != null)) {
               r.push({ ...a, sheetTransform: D, transform: U });
@@ -1681,11 +1681,11 @@ let ot = class extends re {
             this._remainDrawingSize(u, r, a);
             continue;
           }
-          if (I >= w && v <= O)
+          if (C >= w && v <= O)
             continue;
           let E = null, M = null;
-          if (I >= w && I <= O) {
-            const D = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: I, endRow: O });
+          if (C >= w && C <= O) {
+            const D = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: C, endRow: O });
             if (D == null)
               return;
             M = {
@@ -1742,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 < n.length; I++) {
-          const S = n[I], { startRow: v, endRow: R, startColumn: _, endColumn: C } = S;
+        for (let C = 0; C < n.length; C++) {
+          const S = n[C], { startRow: v, endRow: R, startColumn: _, endColumn: I } = S;
           if (f < v || p < _)
             continue;
-          if (c === y.Position && (u <= v && f >= R || m <= _ && p >= C)) {
+          if (c === y.Position && (u <= v && f >= R || m <= _ && p >= I)) {
             this._remainDrawingSize(g, s, d);
             continue;
           }
-          const w = B(
+          const w = L(
             { ...l },
             this._selectionRenderService,
             this._skeletonManagerService
@@ -1786,30 +1786,30 @@ let ot = class extends re {
     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, n);
+    const d = Pe(o, n);
     if (!d)
       return { redos: [], undos: [] };
     const { startX: l, endX: g, startY: c, endY: a } = d, h = this._sheetDrawingService.getDrawingData(r, s), u = [];
     Object.keys(h).forEach((_) => {
-      const C = h[_];
-      if (C.anchorType !== y.Both)
+      const I = h[_];
+      if (I.anchorType !== y.Both)
         return;
-      const { transform: w } = C;
+      const { transform: w } = I;
       if (!w)
         return;
-      const { left: O = 0, top: b = 0, width: A = 0, height: E = 0 } = w, { drawingStartX: M, drawingEndX: D, drawingStartY: U, drawingEndY: L } = {
+      const { left: O = 0, top: b = 0, width: A = 0, height: E = 0 } = w, { drawingStartX: M, drawingEndX: D, drawingStartY: U, drawingEndY: x } = {
         drawingStartX: O,
         drawingEndX: O + A,
         drawingStartY: b,
         drawingEndY: b + E
       };
-      l <= M && D <= g && c <= U && L <= a && u.push(C);
+      l <= M && D <= g && c <= U && x <= a && u.push(I);
     });
-    const m = [], f = [], p = e.startRow - n.startRow, I = e.startColumn - n.startColumn, S = u.map((_) => {
-      const C = _.sheetTransform, w = {
-        to: { ...C.to, row: C.to.row + p, column: C.to.column + I },
-        from: { ...C.from, row: C.from.row + p, column: C.from.column + I }
-      }, O = B(w, this._selectionRenderService, this._skeletonManagerService);
+    const m = [], f = [], p = e.startRow - n.startRow, C = e.startColumn - n.startColumn, S = u.map((_) => {
+      const I = _.sheetTransform, w = {
+        to: { ...I.to, row: I.to.row + p, column: I.to.column + C },
+        from: { ...I.from, row: I.from.row + p, column: I.from.column + C }
+      }, O = L(w, this._selectionRenderService, this._skeletonManagerService);
       return {
         unitId: r,
         subUnitId: s,
@@ -1819,8 +1819,8 @@ let ot = class extends re {
       };
     });
     if (S.length) {
-      const _ = this._sheetDrawingService.getBatchUpdateOp(S), { undo: C, redo: w, objects: O } = _;
-      m.push({ id: P.id, params: { unitId: r, subUnitId: s, op: w, objects: O, type: T.UPDATE } }), f.push({ id: P.id, params: { unitId: r, subUnitId: s, op: C, objects: O, type: T.UPDATE } });
+      const _ = this._sheetDrawingService.getBatchUpdateOp(S), { undo: I, redo: w, objects: O } = _;
+      m.push({ id: T.id, params: { unitId: r, subUnitId: s, op: w, objects: O, type: P.UPDATE } }), f.push({ id: T.id, params: { unitId: r, subUnitId: s, op: I, objects: O, type: P.UPDATE } });
     }
     return { redos: m, undos: f };
   }
@@ -1830,19 +1830,19 @@ let ot = class extends re {
       return { redos: [], undos: [] };
     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;
+      const m = c[u], { sheetTransform: f, transform: p, anchorType: C = y.Position } = m;
       if (f == null || p == null)
         return;
       let S, v;
       if (e === "insert") {
-        const _ = this._expandRow(f, p, o, d, I);
+        const _ = this._expandRow(f, p, o, d, C);
         S = _ == null ? void 0 : _.newSheetTransform, v = _ == null ? void 0 : _.newTransform;
       } else {
-        const { from: _, to: C } = f, { row: w } = _, { row: O } = C;
-        if (I === y.Both && w >= o && O <= d)
+        const { from: _, to: I } = f, { row: w } = _, { row: O } = I;
+        if (C === y.Both && w >= o && O <= d)
           h.push({ unitId: t, subUnitId: r, drawingId: u });
         else {
-          const b = this._shrinkRow(f, p, o, d, I);
+          const b = this._shrinkRow(f, p, o, d, C);
           S = b == null ? void 0 : b.newSheetTransform, v = b == null ? void 0 : b.newTransform;
         }
       }
@@ -1854,11 +1854,11 @@ let ot = class extends re {
       return { redos: [], undos: [] };
     if (a.length > 0) {
       const u = this._sheetDrawingService.getBatchUpdateOp(a), { undo: m, redo: f, objects: p } = u;
-      l.push({ id: P.id, params: { unitId: t, subUnitId: 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 } });
+      l.push({ id: T.id, params: { unitId: t, subUnitId: r, op: f, objects: p, type: P.UPDATE } }), g.push({ id: T.id, params: { unitId: t, subUnitId: r, op: m, objects: p, type: P.UPDATE } });
     }
     if (h.length > 0) {
       const u = this._sheetDrawingService.getBatchRemoveOp(h), m = u.undo, f = u.redo, p = u.objects;
-      l.push({ id: P.id, params: { unitId: t, subUnitId: 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 } });
+      l.push({ id: T.id, params: { unitId: t, subUnitId: r, op: f, objects: p, type: P.REMOVE } }), g.push({ id: T.id, params: { unitId: t, subUnitId: r, op: m, objects: p, type: P.INSERT } });
     }
     return l.push({ id: j.id, params: [t] }), g.push({ id: j.id, params: [t] }), {
       redos: l,
@@ -1871,19 +1871,19 @@ let ot = class extends re {
       return { redos: [], undos: [] };
     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;
+      const m = c[u], { sheetTransform: f, transform: p, anchorType: C = y.Position } = m;
       if (f == null || p == null)
         return;
       let S, v;
       if (e === "insert") {
-        const _ = this._expandCol(f, p, o, d, I);
+        const _ = this._expandCol(f, p, o, d, C);
         S = _ == null ? void 0 : _.newSheetTransform, v = _ == null ? void 0 : _.newTransform;
       } else {
-        const { from: _, to: C } = f, { column: w } = _, { column: O } = C;
-        if (I === y.Both && w >= o && O <= d)
+        const { from: _, to: I } = f, { column: w } = _, { column: O } = I;
+        if (C === y.Both && w >= o && O <= d)
           h.push({ unitId: t, subUnitId: r, drawingId: u });
         else {
-          const b = this._shrinkCol(f, p, o, d, I);
+          const b = this._shrinkCol(f, p, o, d, C);
           S = b == null ? void 0 : b.newSheetTransform, v = b == null ? void 0 : b.newTransform;
         }
       }
@@ -1895,11 +1895,11 @@ let ot = class extends re {
       return { redos: [], undos: [] };
     if (a.length > 0) {
       const u = this._sheetDrawingService.getBatchUpdateOp(a), { undo: m, redo: f, objects: p } = u;
-      l.push({ id: P.id, params: { unitId: t, subUnitId: 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 } });
+      l.push({ id: T.id, params: { unitId: t, subUnitId: r, op: f, objects: p, type: P.UPDATE } }), g.push({ id: T.id, params: { unitId: t, subUnitId: r, op: m, objects: p, type: P.UPDATE } });
     }
     if (h.length > 0) {
       const u = this._sheetDrawingService.getBatchRemoveOp(h), m = u.undo, f = u.redo, p = u.objects;
-      l.push({ id: P.id, params: { unitId: t, subUnitId: 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 } });
+      l.push({ id: T.id, params: { unitId: t, subUnitId: r, op: f, objects: p, type: P.REMOVE } }), g.push({ id: T.id, params: { unitId: t, subUnitId: r, op: m, objects: p, type: P.INSERT } });
     }
     return l.push({ id: j.id, params: [t] }), g.push({ id: j.id, params: [t] }), { redos: l, undos: g };
   }
@@ -1921,7 +1921,7 @@ let ot = class extends re {
         c = {
           from: { ...o },
           to: { ...d, column: g + s }
-        }, a = B(c, this._selectionRenderService, this._skeletonManagerService);
+        }, a = L(c, this._selectionRenderService, this._skeletonManagerService);
       else
         return {
           newSheetTransform: N({ ...e }, this._selectionRenderService),
@@ -1944,7 +1944,7 @@ let ot = class extends re {
       c = {
         from: { ...o, column: l - s },
         to: { ...d, column: g - s }
-      }, a = B(c, this._selectionRenderService, this._skeletonManagerService);
+      }, a = L(c, this._selectionRenderService, this._skeletonManagerService);
     else {
       if (l >= n && g <= t)
         return null;
@@ -1953,7 +1953,7 @@ let ot = class extends re {
           c = {
             from: { ...o },
             to: { ...d, column: g - s }
-          }, a = B(c, this._selectionRenderService, this._skeletonManagerService);
+          }, a = L(c, this._selectionRenderService, this._skeletonManagerService);
         else
           return {
             newSheetTransform: N({ ...e }, this._selectionRenderService),
@@ -1981,7 +1981,7 @@ let ot = class extends re {
         c = {
           from: { ...o },
           to: { ...d, column: n - 1, columnOffset: h.endX - h.startX }
-        }, a = B(c, this._selectionRenderService, this._skeletonManagerService);
+        }, a = L(c, this._selectionRenderService, this._skeletonManagerService);
       }
     }
     return c != null && a != null ? {
@@ -2010,7 +2010,7 @@ let ot = class extends re {
             ...d,
             row: g + s
           }
-        }, a = B(c, this._selectionRenderService, this._skeletonManagerService);
+        }, a = L(c, this._selectionRenderService, this._skeletonManagerService);
       else
         return {
           newSheetTransform: N({ ...e }, this._selectionRenderService),
@@ -2033,7 +2033,7 @@ let ot = class extends re {
       c = {
         from: { ...o, row: l - s },
         to: { ...d, row: g - s }
-      }, a = B(c, this._selectionRenderService, this._skeletonManagerService);
+      }, a = L(c, this._selectionRenderService, this._skeletonManagerService);
     else {
       if (l >= n && g <= t)
         return null;
@@ -2042,7 +2042,7 @@ let ot = class extends re {
           c = {
             from: { ...o },
             to: { ...d, row: g - s }
-          }, a = B(c, this._selectionRenderService, this._skeletonManagerService);
+          }, a = L(c, this._selectionRenderService, this._skeletonManagerService);
         else
           return {
             newSheetTransform: N({ ...e }, this._selectionRenderService),
@@ -2065,7 +2065,7 @@ let ot = class extends re {
         c = {
           from: { ...o },
           to: { ...d, row: n - 1, rowOffset: h.endY - h.startY }
-        }, a = B(c, this._selectionRenderService, this._skeletonManagerService);
+        }, a = L(c, this._selectionRenderService, this._skeletonManagerService);
       }
     }
     return c != null && a != null ? {
@@ -2085,7 +2085,7 @@ let ot = class extends re {
               c != null && Object.keys(c).forEach((a) => {
                 if (d === n && g === t) {
                   const h = c[a];
-                  h.transform = B(h.sheetTransform, this._selectionRenderService, this._skeletonManagerService), s.push(c[a]);
+                  h.transform = L(h.sheetTransform, this._selectionRenderService, this._skeletonManagerService), s.push(c[a]);
                 } else
                   o.push(c[a]);
               });
@@ -2113,8 +2113,8 @@ let ot = class extends re {
         return !0;
       const { from: c, to: a } = d, { row: h, column: u } = c, { row: m, column: f } = a;
       for (let p = 0; p < n.length; p++) {
-        const I = n[p], { startRow: S, endRow: v, startColumn: R, endColumn: _ } = I;
-        if (Rn.intersects(
+        const C = n[p], { startRow: S, endRow: v, startColumn: R, endColumn: _ } = C;
+        if (Dn.intersects(
           {
             startRow: S,
             endRow: v,
@@ -2128,13 +2128,13 @@ let ot = class extends re {
             endColumn: f
           }
         ) || h > v || u > _) {
-          const C = g === y.Position, w = B(d, this._selectionRenderService, this._skeletonManagerService);
+          const I = g === y.Position, w = L(d, this._selectionRenderService, this._skeletonManagerService);
           r.push({
             ...o,
             transform: {
               ...w,
-              width: C ? l == null ? void 0 : l.width : w == null ? void 0 : w.width,
-              height: C ? l == null ? void 0 : l.height : w == null ? void 0 : w.height
+              width: I ? l == null ? void 0 : l.width : w == null ? void 0 : w.width,
+              height: I ? l == null ? void 0 : l.height : w == null ? void 0 : w.height
             }
           });
           break;
@@ -2145,10 +2145,10 @@ let ot = class extends re {
 };
 ot = ki([
   Q(1, J),
-  Q(2, W),
+  Q(2, B),
   Q(3, pe),
-  Q(4, x(q)),
-  Q(5, x(at)),
+  Q(4, W(q)),
+  Q(5, W(at)),
   Q(6, F),
   Q(7, K),
   Q(8, fe)
@@ -2157,9 +2157,9 @@ var Xi = Object.defineProperty, Hi = Object.getOwnPropertyDescriptor, zi = (i, e
   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);
+}, oe = (i, e) => (n, t) => e(n, t, i);
 function Ki(i, e, n, t) {
-  const { scaleX: r, scaleY: s } = e.getAncestorScale(), o = e.getViewport(zn.VIEW_MAIN), d = {
+  const { scaleX: r, scaleY: s } = e.getAncestorScale(), o = e.getViewport(Kn.VIEW_MAIN), d = {
     left: !0,
     top: !0
   };
@@ -2168,7 +2168,7 @@ function Ki(i, e, n, t) {
       ...i,
       absolute: d
     };
-  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;
+  const { left: l, right: g, top: c, bottom: a } = i, h = t.getFreeze(), { startColumn: u, startRow: m, xSplit: f, ySplit: p } = h, C = n.getNoMergeCellPositionByIndexWithNoHeader(m - p, u - f), S = n.getNoMergeCellPositionByIndexWithNoHeader(m, u), { rowHeaderWidth: v, columnHeaderHeight: R } = n, _ = S.startX - C.startX, I = S.startY - C.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(
@@ -2178,13 +2178,13 @@ function Ki(i, e, n, t) {
     (g - b) * r
   )) : (d.left = !1, E = Math.max((l - b) * r, (_ + v) * r), M = Math.max((g - b) * r, (_ + v) * r));
   let D, U;
-  return c < w ? (d.top = !0, D = (C + R + (c - w)) * s, U = Math.max(
+  return c < w ? (d.top = !0, D = (I + R + (c - w)) * s, U = Math.max(
     Math.min(
-      (C + R + (g - w)) * s,
-      (C + R) * s
+      (I + R + (g - w)) * s,
+      (I + R) * s
     ),
     (a - A) * s
-  )) : (d.top = !1, D = Math.max((c - A) * s, (C + R) * s), U = Math.max((a - A) * s, (C + R) * s)), {
+  )) : (d.top = !1, D = Math.max((c - A) * s, (I + R) * s), U = Math.max((a - A) * s, (I + R) * s)), {
     left: E,
     right: M,
     top: D,
@@ -2210,7 +2210,7 @@ const Qe = (i, e, n, t) => {
     absolute: a.absolute
   };
 };
-let $e = class extends re {
+let $e = class extends ie {
   constructor(e, n, t, r, s, o, d) {
     super();
     V(this, "_domLayerMap", /* @__PURE__ */ new Map());
@@ -2225,7 +2225,7 @@ let $e = class extends re {
     this._renderManagerService = e, this._univerInstanceService = n, this._commandService = t, this._drawingManagerService = r, this._canvasFloatDomService = s, this._sheetDrawingService = o, this._lifecycleService = d, this._drawingAddListener(), this._featureUpdateListener(), this._deleteListener(), this._bindScrollEvent();
   }
   _bindScrollEvent() {
-    this._lifecycleService.lifecycle$.pipe(ae((e) => e === Mn.Rendered), gr(1)).subscribe(() => {
+    this._lifecycleService.lifecycle$.pipe(re((e) => e === bn.Rendered), mr(1)).subscribe(() => {
       this._scrollUpdateListener();
     });
   }
@@ -2280,13 +2280,13 @@ let $e = 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: t, subUnitId: r, drawingId: s }), E = f.getObject(A);
+          const { left: C, top: S, width: v, height: R, angle: _, flipX: I, 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 });
+            E.transformByState({ left: C, top: S, width: v, height: R, angle: _, flipX: I, flipY: w, skewX: O, skewY: b });
             return;
           }
           const M = {
-            left: I,
+            left: C,
             top: S,
             width: v,
             height: R,
@@ -2294,8 +2294,8 @@ let $e = class extends re {
           }, D = h === k.DRAWING_CHART;
           D && (M.fill = "white", M.rotateEnabled = !1, u && u.border && (M.stroke = u.border), M.paintFirst = "stroke", M.strokeWidth = 1, M.borderEnabled = !1, M.radius = 8);
           const U = new wt(A, M);
-          D && U.setObjectType(Xn.CHART), f.addObject(U, Hn), 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 = {
+          D && U.setObjectType(Hn.CHART), f.addObject(U, zn), d.allowTransform !== !1 && f.attachTransformerTo(U);
+          const x = this._ensureMap(t, r), Z = new yn(), hn = Qe(U, m.renderObject, c.skeleton, o.worksheet), Fe = new fr(hn), gn = {
             dispose: Z,
             rect: U,
             position$: Fe,
@@ -2318,7 +2318,7 @@ let $e = class extends re {
             onWheel: (G) => {
               p.dispatchEvent(new WheelEvent(G.type, G));
             },
-            props: (gt = (ht = L.get(s)) == null ? void 0 : ht.props) != null ? gt : this._getFloatDomProps(s),
+            props: (gt = (ht = x.get(s)) == null ? void 0 : ht.props) != null ? gt : this._getFloatDomProps(s),
             data: u,
             unitId: t
           });
@@ -2330,8 +2330,8 @@ let $e = class extends re {
           });
           Z.add(() => {
             this._canvasFloatDomService.removeFloatDom(s);
-          }), lt && Z.add(lt), this._domLayerInfoMap.set(s, hn), L.set(s, {
-            ...L.get(s)
+          }), lt && Z.add(lt), this._domLayerInfoMap.set(s, gn), x.set(s, {
+            ...x.get(s)
           });
         });
       })
@@ -2361,21 +2361,23 @@ let $e = class extends re {
     };
     this.disposeWithMe(
       this._univerInstanceService.getCurrentTypeOfUnit$(Y.UNIVER_SHEET).pipe(
-        ae((n) => !!n),
+        re((n) => !!n),
+        St((n) => n.activeSheet$),
+        re((n) => !!n),
         Ee((n) => {
           const t = this._renderManagerService.getRenderById(n.getUnitId());
-          return t ? { render: t, unitId: n.getUnitId(), subUnitId: n.getActiveSheet().getSheetId() } : null;
+          return t ? { render: t, unitId: n.getUnitId(), subUnitId: n.getSheetId() } : null;
         }),
-        ae((n) => !!n),
-        fr(
-          (n) => yn(n.render.scene.getViewport(tr.VIEW_MAIN).onScrollAfter$).pipe(Ee(() => ({ unitId: n.unitId, subUnitId: n.subUnitId })))
+        re((n) => !!n),
+        St(
+          (n) => On(n.render.scene.getViewport(nr.VIEW_MAIN).onScrollAfter$).pipe(Ee(() => ({ unitId: n.unitId, subUnitId: n.subUnitId })))
         )
       ).subscribe(({ unitId: n, subUnitId: t }) => {
         e(n, t);
       })
     ), this.disposeWithMe(this._commandService.onCommandExecuted((n) => {
       var t, r;
-      if (n.id === nr.id) {
+      if (n.id === rr.id) {
         const s = n.params, { unitId: o } = s;
         Array.from((r = (t = this._domLayerMap.get(o)) == null ? void 0 : t.keys()) != null ? r : []).forEach((l) => {
           e(o, l);
@@ -2391,7 +2393,7 @@ let $e = class extends re {
     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(t, s);
+    const l = d.getCellWithCoordByOffset(t, s);
     if (l == null)
       return;
     const g = {
@@ -2399,7 +2401,7 @@ let $e = class extends re {
       columnOffset: t - l.startX,
       row: l.actualRow,
       rowOffset: s - l.startY
-    }, c = d.getSelectionCellByPosition(r, o);
+    }, c = d.getCellWithCoordByOffset(r, o);
     if (c == null)
       return;
     const a = {
@@ -2451,7 +2453,7 @@ let $e = class extends re {
     });
     if (!t)
       throw new Error("cannot find current target!");
-    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);
+    const { unitId: r, subUnitId: s } = t, { initPosition: o, componentKey: d, data: l, allowTransform: g = !0 } = e, c = n != null ? n : Tn(), a = this._getPosition(o, r);
     if (a == null)
       return;
     this._ensureMap(r, s).set(c, e);
@@ -2494,7 +2496,7 @@ let $e = class extends re {
       if (!l)
         return;
       const g = this._sheetDrawingService.getBatchRemoveOp([l]), { redo: c, objects: a } = g;
-      this._commandService.syncExecuteCommand(P.id, { unitId: r, subUnitId: s, op: c, objects: a, type: T.REMOVE });
+      this._commandService.syncExecuteCommand(T.id, { unitId: r, subUnitId: s, op: c, objects: a, type: P.REMOVE });
     }
   }
   addHook(e) {
@@ -2507,33 +2509,33 @@ let $e = class extends re {
   }
 };
 $e = zi([
-  se(0, x(J)),
-  se(1, fe),
-  se(2, x(W)),
-  se(3, K),
-  se(4, x(hr)),
-  se(5, F),
-  se(6, x(Dn))
+  oe(0, W(J)),
+  oe(1, fe),
+  oe(2, W(B)),
+  oe(3, K),
+  oe(4, W(gr)),
+  oe(5, F),
+  oe(6, W(Mn))
 ], $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) => {
+var ln = Object.defineProperty, Ji = Object.getOwnPropertyDescriptor, Zi = (i, e, n) => e in i ? ln(i, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : i[e] = n, qi = (i, e, n, t) => {
   for (var r = t > 1 ? void 0 : t ? Ji(e, n) : e, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = (t ? o(e, n, r) : o(r)) || r);
-  return t && r && 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);
+  return t && r && ln(e, n, r), r;
+}, et = (i, e) => (n, t) => e(n, t, i), un = (i, e, n) => Zi(i, typeof e != "symbol" ? e + "" : e, n);
 const Qi = "SHEET_IMAGE_UI_PLUGIN";
-let Be = class extends Tn {
-  constructor(i = Pr, e, n, t) {
+let Le = class extends En {
+  constructor(i = Tr, e, n, t) {
     super(), this._config = i, this._injector = e, this._renderManagerService = n, this._configService = t;
     const { menu: r, ...s } = this._config;
     r && this._configService.setConfig("menu", r, { merge: !0 }), this._configService.setConfig(Or, s);
   }
   onStarting() {
-    En(this._injector, [
+    Un(this._injector, [
       [$e],
       [Ne],
       [Ue],
-      [Le],
       [xe],
+      [We],
       [je]
     ]), Xe(this._injector, [
       [$e]
@@ -2546,8 +2548,8 @@ let Be = class extends Tn {
   }
   onRendered() {
     this._registerRenderModules(), Xe(this._injector, [
+      [We],
       [xe],
-      [Le],
       [Ne]
     ]);
   }
@@ -2564,28 +2566,28 @@ let Be = class extends Tn {
     });
   }
 };
-ln(Be, "type", Y.UNIVER_SHEET);
-ln(Be, "pluginName", Qi);
-Be = qi([
-  Pn(xn, kn, Kn),
-  et(1, x(Ct)),
+un(Le, "type", Y.UNIVER_SHEET);
+un(Le, "pluginName", Qi);
+Le = qi([
+  Pn(xn, Yn, Jn),
+  et(1, W(Rt)),
   et(2, J),
-  et(3, Un)
-], Be);
+  et(3, An)
+], Le);
 export {
   j as ClearSheetDrawingTransformerOperation,
-  tn as DeleteDrawingsCommand,
-  Kt as EditSheetDrawingOperation,
-  nn as GroupSheetDrawingCommand,
-  an as IMAGE_MENU_ID,
+  nn as DeleteDrawingsCommand,
+  Jt as EditSheetDrawingOperation,
+  rn as GroupSheetDrawingCommand,
+  cn as IMAGE_MENU_ID,
   dt as InsertFloatImageCommand,
   ke as InsertSheetDrawingCommand,
   we as MoveDrawingsCommand,
   Ge as RemoveSheetDrawingCommand,
-  rn as SetDrawingArrangeCommand,
+  sn as SetDrawingArrangeCommand,
   Ye as SetSheetDrawingCommand,
   $e as SheetCanvasFloatDomManagerService,
-  zt as SidebarSheetDrawingOperation,
-  sn as UngroupSheetDrawingCommand,
-  Be as UniverSheetsDrawingUIPlugin
+  Kt as SidebarSheetDrawingOperation,
+  on as UngroupSheetDrawingCommand,
+  Le as UniverSheetsDrawingUIPlugin
 };