@univerjs/sheets-drawing-ui 0.15.0-insiders.20260107-3d1cfdf → 0.15.0-insiders.20260108-47c73e3

package/lib/es/index.js

@@ -1,33 +1,33 @@
-var Jr = Object.defineProperty;
-var Zr = (i, t, e) => t in i ? Jr(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
-var Q = (i, t, e) => Zr(i, typeof t != "symbol" ? t + "" : t, e);
-import { precisionTo as bt, IRenderManagerService as ee, transformObjectOutOfGroup as qr, getGroupState as Qr, getCurrentTypeOfRenderer as bn, CURSOR_TYPE as ei, RENDER_CLASS_TYPE as ke, Rect as $e, ObjectType as Nn, DRAWING_OBJECT_LAYER_INDEX as qt, SHEET_VIEWPORT_KEY as cr } from "@univerjs/engine-render";
-import { convertPositionSheetOverGridToAbsolute as ti, SheetSkeletonManagerService as X, ISheetSelectionRenderService as Je, attachRangeWithCoord as dr, SheetCanvasPopManagerService as ni, HoverManagerService as ri, IEditorBridgeService as ii, IAutoFillService as si, EditingRenderController as oi, SetCellEditVisibleOperation as kn, PREDEFINED_HOOK_NAME_PASTE as Le, COPY_TYPE as Re, discreteRangeToRange as $n, virtualizeDiscreteRanges as ai, ISheetClipboardService as ci, SetZoomRatioOperation as xn, SetScrollOperation as di, SheetPrintInterceptorService as li, useHighlightRange as ui, getCurrentRangeDisable$ as hi } from "@univerjs/sheets-ui";
-import { CommandType as q, ICommandService as G, IUndoRedoService as Ze, sequenceExecute as lr, DrawingTypeEnum as x, ArrangeTypeEnum as Mt, Inject as A, IContextService as ur, LocaleService as Te, Injector as qe, Disposable as te, createDocumentModelWithStyle as hn, ObjectRelativeFromV as Wn, ObjectRelativeFromH as Bn, WrapTextType as jn, PositionedObjectLayoutType as Fn, BooleanNumber as Ln, BuildTextUtils as gn, ImageSourceType as de, generateRandomId as He, FOCUSING_COMMON_DRAWINGS as Ye, IUniverInstanceService as le, UniverInstanceType as k, Direction as Ie, createIdentifier as gi, IImageIoService as hr, toDisposable as mi, RxDisposable as fi, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as ot, DOCS_ZEN_EDITOR_UNIT_ID_KEY as Ve, InterceptorEffectEnum as pi, ObjectMatrix as wi, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as _i, IPermissionService as Si, UserManagerService as vi, LifecycleService as Ii, LifecycleStages as Ci, DisposableCollection as yt, fromEventSubject as Ri, Tools as Ge, PRINT_CHART_COMPONENT_KEY as Di, Rectangle as bi, FOCUSING_SHEET as Mi, FOCUSING_FX_BAR_EDITOR as yi, EDITOR_ACTIVATED as Ei, FOCUSING_PANEL_EDITOR as Ti, DependentOn as Oi, IConfigService as Ui, Plugin as Pi, merge as Ai, registerDependencies as Ni, touchDependencies as Qt } from "@univerjs/core";
+var Zr = Object.defineProperty;
+var qr = (i, t, e) => t in i ? Zr(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
+var ie = (i, t, e) => qr(i, typeof t != "symbol" ? t + "" : t, e);
+import { precisionTo as bt, IRenderManagerService as ee, transformObjectOutOfGroup as Qr, getGroupState as ei, getCurrentTypeOfRenderer as Dn, CURSOR_TYPE as ti, RENDER_CLASS_TYPE as ke, Rect as $e, ObjectType as An, DRAWING_OBJECT_LAYER_INDEX as Qt, SHEET_VIEWPORT_KEY as cr } from "@univerjs/engine-render";
+import { convertPositionSheetOverGridToAbsolute as ni, SheetSkeletonManagerService as X, ISheetSelectionRenderService as Je, attachRangeWithCoord as dr, SheetCanvasPopManagerService as ri, HoverManagerService as ii, IEditorBridgeService as si, IAutoFillService as oi, EditingRenderController as ai, SetCellEditVisibleOperation as Nn, PREDEFINED_HOOK_NAME_PASTE as Le, COPY_TYPE as Re, discreteRangeToRange as kn, virtualizeDiscreteRanges as ci, ISheetClipboardService as di, SetZoomRatioOperation as $n, SetScrollOperation as li, SheetPrintInterceptorService as ui, useHighlightRange as hi, getCurrentRangeDisable$ as gi } from "@univerjs/sheets-ui";
+import { CommandType as q, ICommandService as G, IUndoRedoService as Ze, sequenceExecute as lr, DrawingTypeEnum as x, ArrangeTypeEnum as Mt, Inject as A, IContextService as ur, LocaleService as Te, Injector as qe, IURLImageService as hr, Disposable as te, createDocumentModelWithStyle as un, ObjectRelativeFromV as xn, ObjectRelativeFromH as Wn, WrapTextType as Bn, PositionedObjectLayoutType as jn, BooleanNumber as Fn, BuildTextUtils as hn, ImageSourceType as we, generateRandomId as He, FOCUSING_COMMON_DRAWINGS as Ye, IUniverInstanceService as de, UniverInstanceType as k, Direction as Ie, createIdentifier as mi, IImageIoService as gr, RxDisposable as fi, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as ot, DOCS_ZEN_EDITOR_UNIT_ID_KEY as Ve, InterceptorEffectEnum as pi, ObjectMatrix as wi, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as _i, IPermissionService as Si, UserManagerService as vi, LifecycleService as Ii, LifecycleStages as Ci, DisposableCollection as yt, fromEventSubject as Ri, Tools as Ge, PRINT_CHART_COMPONENT_KEY as Di, Rectangle as bi, FOCUSING_SHEET as Mi, FOCUSING_FX_BAR_EDITOR as yi, EDITOR_ACTIVATED as Ei, FOCUSING_PANEL_EDITOR as Ti, DependentOn as Oi, IConfigService as Ui, Plugin as Pi, merge as Ai, registerDependencies as Ni, touchDependencies as en } from "@univerjs/core";
 import { ISheetDrawingService as oe, DrawingApplyType as U, SetDrawingApplyMutation as P, SheetDrawingAnchorType as O, UniverSheetsDrawingPlugin as ki } from "@univerjs/sheets-drawing";
-import { SheetInterceptorService as Ht, SheetsSelectionsService as ut, SetRangeValuesCommand as Hn, getSheetCommandTarget as se, INTERCEPTOR_POINT as $i, InterceptCellContentPriority as xi, WorkbookViewPermission as Vn, WorksheetViewPermission as Gn, WorkbookEditablePermission as mn, WorksheetEditPermission as fn, SetFrozenMutation as Wi, SetSelectionsOperation as Bi, SetWorksheetRowAutoHeightMutation as gr, COMMAND_LISTENER_SKELETON_CHANGE as ji, InsertRowCommand as mr, InsertColCommand as fr, RemoveRowCommand as pr, RemoveColCommand as wr, DeleteRangeMoveLeftCommand as _r, DeleteRangeMoveUpCommand as Sr, InsertRangeMoveDownCommand as vr, InsertRangeMoveRightCommand as Ir, DeltaRowHeightCommand as pn, SetRowHeightCommand as wn, DeltaColumnWidthCommand as Cr, SetColWidthCommand as Rr, SetRowHiddenCommand as Dr, SetSpecificRowsVisibleCommand as br, SetSpecificColsVisibleCommand as Mr, SetColHiddenCommand as yr, MoveColsCommand as Er, MoveRowsCommand as Tr, MoveRangeCommand as Or, SetRowVisibleMutation as Fi, SetRowHiddenMutation as Li, SetColVisibleMutation as Hi, SetColHiddenMutation as Vi, SetWorksheetRowHeightMutation as Gi, SetWorksheetRowIsAutoHeightMutation as Yi, SetWorksheetColWidthMutation as Xi, SetWorksheetActiveOperation as zi, RangeProtectionPermissionEditPoint as Ki } from "@univerjs/sheets";
-import { MessageType as ve, render as Ji, unmount as Zi, FormLayout as en, CheckboxGroup as qi, Checkbox as Yn, Select as Qi, Button as Xn, clsx as es, RadioGroup as ts, Radio as tn } from "@univerjs/design";
-import { docDrawingPositionToTransform as zn, ReplaceSnapshotCommand as ns, InnerPasteCommand as rs } from "@univerjs/docs-ui";
-import { IImageIoService as is, IDrawingManagerService as ae, DRAWING_IMAGE_ALLOW_IMAGE_LIST as Kn, DRAWING_IMAGE_COUNT_LIMIT as Jn, ImageUploadStatusType as xe, DRAWING_IMAGE_ALLOW_SIZE as Zn, getImageSize as nn, SetDrawingSelectedOperation as Vt, DRAWING_IMAGE_WIDTH_LIMIT as qn, DRAWING_IMAGE_HEIGHT_LIMIT as Qn, ImageSourceType as ss, getDrawingShapeKeyByDrawingSearch as De, UniverDrawingPlugin as os } from "@univerjs/drawing";
-import { ILocalFileService as as, IMessageService as Ur, IDialogService as Mn, ISidebarService as cs, IClipboardInterfaceService as ds, CanvasFloatDomService as ls, PrintFloatDomSingle as us, ComponentManager as Pr, connectInjector as hs, useDependency as Ce, getMenuHiddenObservable as Gt, MenuItemType as Yt, ContextMenuPosition as rn, ContextMenuGroup as sn, RibbonInsertGroup as gs, KeyCode as Ke, IMenuManagerService as ms, IShortcutService as fs } from "@univerjs/ui";
+import { SheetInterceptorService as Vt, SheetsSelectionsService as ut, SetRangeValuesCommand as Ln, getSheetCommandTarget as se, INTERCEPTOR_POINT as $i, InterceptCellContentPriority as xi, WorkbookViewPermission as Hn, WorksheetViewPermission as Vn, WorkbookEditablePermission as gn, WorksheetEditPermission as mn, SetFrozenMutation as Wi, SetSelectionsOperation as Bi, SetWorksheetRowAutoHeightMutation as mr, COMMAND_LISTENER_SKELETON_CHANGE as ji, InsertRowCommand as fr, InsertColCommand as pr, RemoveRowCommand as wr, RemoveColCommand as _r, DeleteRangeMoveLeftCommand as Sr, DeleteRangeMoveUpCommand as vr, InsertRangeMoveDownCommand as Ir, InsertRangeMoveRightCommand as Cr, DeltaRowHeightCommand as fn, SetRowHeightCommand as pn, DeltaColumnWidthCommand as Rr, SetColWidthCommand as Dr, SetRowHiddenCommand as br, SetSpecificRowsVisibleCommand as Mr, SetSpecificColsVisibleCommand as yr, SetColHiddenCommand as Er, MoveColsCommand as Tr, MoveRowsCommand as Or, MoveRangeCommand as Ur, SetRowVisibleMutation as Fi, SetRowHiddenMutation as Li, SetColVisibleMutation as Hi, SetColHiddenMutation as Vi, SetWorksheetRowHeightMutation as Gi, SetWorksheetRowIsAutoHeightMutation as Yi, SetWorksheetColWidthMutation as Xi, SetWorksheetActiveOperation as zi, RangeProtectionPermissionEditPoint as Ki } from "@univerjs/sheets";
+import { MessageType as ve, render as Ji, unmount as Zi, FormLayout as tn, CheckboxGroup as qi, Checkbox as Gn, Select as Qi, Button as Yn, clsx as es, RadioGroup as ts, Radio as nn } from "@univerjs/design";
+import { docDrawingPositionToTransform as Xn, ReplaceSnapshotCommand as ns, InnerPasteCommand as rs } from "@univerjs/docs-ui";
+import { IImageIoService as is, IDrawingManagerService as ae, DRAWING_IMAGE_ALLOW_IMAGE_LIST as zn, DRAWING_IMAGE_COUNT_LIMIT as Kn, ImageUploadStatusType as xe, DRAWING_IMAGE_ALLOW_SIZE as Jn, getImageSize as rn, SetDrawingSelectedOperation as Gt, DRAWING_IMAGE_WIDTH_LIMIT as Zn, DRAWING_IMAGE_HEIGHT_LIMIT as qn, ImageSourceType as ss, getDrawingShapeKeyByDrawingSearch as De, UniverDrawingPlugin as os } from "@univerjs/drawing";
+import { ILocalFileService as as, IMessageService as Pr, IDialogService as bn, ISidebarService as cs, IClipboardInterfaceService as ds, CanvasFloatDomService as ls, PrintFloatDomSingle as us, ComponentManager as Ar, connectInjector as hs, useDependency as Ce, getMenuHiddenObservable as Yt, MenuItemType as Xt, ContextMenuPosition as sn, ContextMenuGroup as on, RibbonInsertGroup as gs, KeyCode as Ke, IMenuManagerService as ms, IShortcutService as fs } from "@univerjs/ui";
 import { DocDrawingController as ps, UniverDocsDrawingPlugin as ws } from "@univerjs/docs-drawing";
-import { ImageCropperObject as _s, COMPONENT_IMAGE_POPUP_MENU as Ss, OpenImageCropOperation as vs, ImageResetSizeOperation as Is, DrawingRenderService as Ar, DrawingCommonPanel as Cs, UniverDrawingUIPlugin as Rs } from "@univerjs/drawing-ui";
-import { takeUntil as er, throttleTime as Ds, combineLatest as at, switchMap as pe, EMPTY as _e, tap as tr, map as we, distinctUntilChanged as nr, Subject as on, filter as bs, take as Ms, BehaviorSubject as je, of as _n } from "rxjs";
+import { ImageCropperObject as _s, COMPONENT_IMAGE_POPUP_MENU as Ss, OpenImageCropOperation as vs, ImageResetSizeOperation as Is, DrawingRenderService as Nr, DrawingCommonPanel as Cs, UniverDrawingUIPlugin as Rs } from "@univerjs/drawing-ui";
+import { takeUntil as Qn, throttleTime as Ds, combineLatest as at, switchMap as fe, EMPTY as _e, tap as er, map as pe, distinctUntilChanged as tr, Subject as an, filter as bs, take as Ms, BehaviorSubject as je, of as wn } from "rxjs";
 import { jsx as L, jsxs as Xe } from "react/jsx-runtime";
-import { useMemo as Fe, useState as Ee, useCallback as Et, useEffect as Nr } from "react";
+import { useMemo as Fe, useState as Ee, useCallback as Et, useEffect as kr } from "react";
 function J(i, t, e) {
   const { from: n, to: r, flipY: s = !1, flipX: o = !1, angle: a = 0, skewX: d = 0, skewY: u = 0 } = i, c = e.getCurrent();
   if (c == null)
     return;
-  const l = ti(
+  const l = ni(
     c.unitId,
     c.sheetId,
     { from: n, to: r },
     e
   );
-  let { left: g, top: h, width: m, height: p } = l;
-  const f = e.getCurrentSkeleton(), w = f.rowHeaderWidth + f.columnTotalWidth, _ = f.columnHeaderHeight + f.rowTotalHeight;
-  return g + m > w && (g = w - m), h + p > _ && (h = _ - p), {
+  let { left: g, top: h, width: m, height: f } = l;
+  const p = e.getCurrentSkeleton(), w = p.rowHeaderWidth + p.columnTotalWidth, S = p.columnHeaderHeight + p.rowTotalHeight;
+  return g + m > w && (g = w - m), h + f > S && (h = S - f), {
     flipY: s,
     flipX: o,
     angle: a,
@@ -36,7 +36,7 @@ function J(i, t, e) {
     left: g,
     top: h,
     width: m,
-    height: p
+    height: f
   };
 }
 function j(i, t) {
@@ -81,32 +81,32 @@ const H = {
   id: "sheet.command.remove-sheet-image",
   type: q.COMMAND,
   handler: (i, t) => {
-    var _, I, R;
-    const e = i.get(G), n = i.get(Ze), r = i.get(Ht), s = i.get(oe);
+    var S, I, D;
+    const e = i.get(G), n = i.get(Ze), r = i.get(Vt), s = i.get(oe);
     if (!t) return !1;
     const { drawings: o } = t, a = [];
     o.forEach((v) => {
       const { unitId: C } = v;
       a.push(C);
     });
-    const d = s.getBatchRemoveOp(o), { unitId: u, subUnitId: c, undo: l, redo: g, objects: h } = d, m = r.onCommandExecute({ id: ht.id, params: t }), p = { id: P.id, params: { unitId: u, subUnitId: c, op: g, objects: h, type: U.REMOVE } }, f = { id: P.id, params: { unitId: u, subUnitId: c, op: l, objects: h, type: U.INSERT } };
-    return lr([...(_ = m.preRedos) != null ? _ : [], p, ...m.redos], e) ? (n.pushUndoRedo({
+    const d = s.getBatchRemoveOp(o), { unitId: u, subUnitId: c, undo: l, redo: g, objects: h } = d, m = r.onCommandExecute({ id: ht.id, params: t }), f = { id: P.id, params: { unitId: u, subUnitId: c, op: g, objects: h, type: U.REMOVE } }, p = { id: P.id, params: { unitId: u, subUnitId: c, op: l, objects: h, type: U.INSERT } };
+    return lr([...(S = m.preRedos) != null ? S : [], f, ...m.redos], e) ? (n.pushUndoRedo({
       unitID: u,
       undoMutations: [
         ...(I = m.preUndos) != null ? I : [],
-        f,
+        p,
         ...m.undos,
         { id: H.id, params: a }
       ],
       redoMutations: [
-        ...(R = m.preRedos) != null ? R : [],
-        p,
+        ...(D = m.preRedos) != null ? D : [],
+        f,
         ...m.redos,
         { id: H.id, params: a }
       ]
     }), !0) : !1;
   }
-}, kr = {
+}, $r = {
   id: "sheet.command.delete-drawing",
   type: q.COMMAND,
   handler: (i) => {
@@ -131,12 +131,12 @@ const H = {
 function ys(i) {
   const t = [];
   return i.forEach((e) => {
-    const { parent: n, children: r } = e, { unitId: s, subUnitId: o, drawingId: a } = n, d = Qr(0, 0, r.map((l) => l.transform || {})), u = r.map((l) => {
-      const g = l.transform || { left: 0, top: 0 }, { unitId: h, subUnitId: m, drawingId: p } = l;
+    const { parent: n, children: r } = e, { unitId: s, subUnitId: o, drawingId: a } = n, d = ei(0, 0, r.map((l) => l.transform || {})), u = r.map((l) => {
+      const g = l.transform || { left: 0, top: 0 }, { unitId: h, subUnitId: m, drawingId: f } = l;
       return {
         unitId: h,
         subUnitId: m,
-        drawingId: p,
+        drawingId: f,
         transform: {
           ...g,
           left: g.left - d.left,
@@ -164,12 +164,12 @@ function Es(i) {
     if (d == null)
       return;
     const u = r.map((l) => {
-      const { transform: g } = l, { unitId: h, subUnitId: m, drawingId: p } = l, f = qr(g || {}, d, d.width || 0, d.height || 0);
+      const { transform: g } = l, { unitId: h, subUnitId: m, drawingId: f } = l, p = Qr(g || {}, d, d.width || 0, d.height || 0);
       return {
         unitId: h,
         subUnitId: m,
-        drawingId: p,
-        transform: f,
+        drawingId: f,
+        transform: p,
         groupId: void 0
       };
     }), c = {
@@ -188,7 +188,7 @@ function Es(i) {
     });
   }), t;
 }
-const $r = {
+const xr = {
   id: "sheet.command.group-sheet-image",
   type: q.COMMAND,
   handler: (i, t) => {
@@ -196,8 +196,8 @@ const $r = {
     if (!t) return !1;
     const s = [];
     t.forEach(({ parent: h, children: m }) => {
-      s.push(h.unitId), m.forEach((p) => {
-        s.push(p.unitId);
+      s.push(h.unitId), m.forEach((f) => {
+        s.push(f.unitId);
       });
     });
     const o = r.getGroupDrawingOp(t), { unitId: a, subUnitId: d, undo: u, redo: c, objects: l } = o;
@@ -213,31 +213,31 @@ const $r = {
       ]
     }), !0) : !1;
   }
-}, Xt = {
+}, zt = {
   id: "sheet.command.insert-sheet-image",
   type: q.COMMAND,
   handler: (i, t) => {
-    var _, I, R;
-    const e = i.get(G), n = i.get(Ze), r = i.get(oe), s = i.get(Ht);
+    var S, I, D;
+    const e = i.get(G), n = i.get(Ze), r = i.get(oe), s = i.get(Vt);
     if (!t) return !1;
-    const o = t.drawings, a = o.map((v) => v.unitId), d = r.getBatchAddOp(o), { unitId: u, subUnitId: c, undo: l, redo: g, objects: h } = d, m = s.onCommandExecute({ id: Xt.id, params: t }), p = { id: P.id, params: { op: g, unitId: u, subUnitId: c, objects: h, type: U.INSERT } }, f = { id: P.id, params: { op: l, unitId: u, subUnitId: c, objects: h, type: U.REMOVE } };
-    return lr([...(_ = m.preRedos) != null ? _ : [], p, ...m.redos], e) ? (n.pushUndoRedo({
+    const o = t.drawings, a = o.map((v) => v.unitId), d = r.getBatchAddOp(o), { unitId: u, subUnitId: c, undo: l, redo: g, objects: h } = d, m = s.onCommandExecute({ id: zt.id, params: t }), f = { id: P.id, params: { op: g, unitId: u, subUnitId: c, objects: h, type: U.INSERT } }, p = { id: P.id, params: { op: l, unitId: u, subUnitId: c, objects: h, type: U.REMOVE } };
+    return lr([...(S = m.preRedos) != null ? S : [], f, ...m.redos], e) ? (n.pushUndoRedo({
       unitID: u,
       undoMutations: [
         ...(I = m.preUndos) != null ? I : [],
-        f,
+        p,
         ...m.undos,
         { id: H.id, params: a }
       ],
       redoMutations: [
-        ...(R = m.preRedos) != null ? R : [],
-        p,
+        ...(D = m.preRedos) != null ? D : [],
+        f,
         ...m.redos,
         { id: H.id, params: a }
       ]
     }), !0) : !1;
   }
-}, xr = {
+}, Wr = {
   id: "sheet.command.set-drawing-arrange",
   type: q.COMMAND,
   handler: (i, t) => {
@@ -258,7 +258,7 @@ const $r = {
       ]
     }), !0) : !1;
   }
-}, zt = {
+}, Kt = {
   id: "sheet.command.set-sheet-image",
   type: q.COMMAND,
   handler: (i, t) => {
@@ -277,7 +277,7 @@ const $r = {
       ]
     }), !0) : !1;
   }
-}, Wr = {
+}, Br = {
   id: "sheet.command.ungroup-sheet-image",
   type: q.COMMAND,
   handler: (i, t) => {
@@ -285,8 +285,8 @@ const $r = {
     if (!t) return !1;
     const s = [];
     t.forEach(({ parent: h, children: m }) => {
-      s.push(h.unitId), m.forEach((p) => {
-        s.push(p.unitId);
+      s.push(h.unitId), m.forEach((f) => {
+        s.push(f.unitId);
       });
     });
     const o = r.getUngroupDrawingOp(t), { unitId: a, subUnitId: d, undo: u, redo: c, objects: l } = o;
@@ -307,45 +307,45 @@ var Ts = Object.getOwnPropertyDescriptor, Os = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? Ts(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, ie = (i, t) => (e, n) => t(e, n, i);
+}, Q = (i, t) => (e, n) => t(e, n, i);
 function Us(i, t, e) {
   const n = e * Math.PI / 180, r = Math.abs(i * Math.cos(n)) + Math.abs(t * Math.sin(n)), s = Math.abs(i * Math.sin(n)) + Math.abs(t * Math.cos(n));
   return { rotatedWidth: r, rotatedHeight: s };
 }
-function Sn(i, t, e, n, r) {
-  var _;
+function _n(i, t, e, n, r) {
+  var S;
   const { rotatedHeight: s, rotatedWidth: o } = Us(e, n, r), d = i.get(ee).getRenderById(t.unitId);
   if (!d)
     return !1;
-  const c = (_ = d.with(X).getSkeletonParam(t.subUnitId)) == null ? void 0 : _.skeleton;
+  const c = (S = d.with(X).getSkeletonParam(t.subUnitId)) == null ? void 0 : S.skeleton;
   if (c == null)
     return !1;
-  const l = c.getCellByIndex(t.row, t.col), g = l.mergeInfo.endX - l.mergeInfo.startX - 2, h = l.mergeInfo.endY - l.mergeInfo.startY - 2, m = o / s, f = Math.ceil(Math.min(g, h * m)) / o, w = !f || Number.isNaN(f) ? 1e-3 : f;
+  const l = c.getCellByIndex(t.row, t.col), g = l.mergeInfo.endX - l.mergeInfo.startX - 2, h = l.mergeInfo.endY - l.mergeInfo.startY - 2, m = o / s, p = Math.ceil(Math.min(g, h * m)) / o, w = !p || Number.isNaN(p) ? 1e-3 : p;
   return {
     width: e * w,
     height: n * w
   };
 }
 let dt = class extends te {
-  constructor(t, e, n, r, s, o, a, d, u, c, l, g, h) {
+  constructor(t, e, n, r, s, o, a, d, u, c, l, g, h, m) {
     super();
-    Q(this, "_workbookSelections");
-    this._context = t, this._skeletonManagerService = e, this._commandService = n, this._selectionRenderService = r, this._imageIoService = s, this._fileOpenerService = o, this._sheetDrawingService = a, this._drawingManagerService = d, this._contextService = u, this._messageService = c, this._localeService = l, this._injector = h, this._workbookSelections = g.getWorkbookSelections(this._context.unitId), this._updateImageListener(), this._updateOrderListener(), this._groupDrawingListener(), this._focusDrawingListener();
+    ie(this, "_workbookSelections");
+    this._context = t, this._skeletonManagerService = e, this._commandService = n, this._selectionRenderService = r, this._imageIoService = s, this._fileOpenerService = o, this._sheetDrawingService = a, this._drawingManagerService = d, this._contextService = u, this._messageService = c, this._localeService = l, this._injector = h, this._urlImageService = m, this._workbookSelections = g.getWorkbookSelections(this._context.unitId), this._updateImageListener(), this._updateOrderListener(), this._groupDrawingListener(), this._focusDrawingListener();
   }
   async insertFloatImage() {
     const t = await this._fileOpenerService.openFile({
       multiple: !0,
-      accept: Kn.map((n) => `.${n.replace("image/", "")}`).join(",")
+      accept: zn.map((n) => `.${n.replace("image/", "")}`).join(",")
     }), e = t.length;
-    return e > Jn ? (this._messageService.show({
+    return e > Kn ? (this._messageService.show({
       type: ve.Error,
-      content: this._localeService.t("update-status.exceedMaxCount", String(Jn))
+      content: this._localeService.t("update-status.exceedMaxCount", String(Kn))
     }), !1) : e === 0 ? !1 : (t.forEach(async (n) => await this.insertFloatImageByFile(n)), !0);
   }
   async insertCellImage() {
     const e = (await this._fileOpenerService.openFile({
       multiple: !1,
-      accept: Kn.map((n) => `.${n.replace("image/", "")}`).join(",")
+      accept: zn.map((n) => `.${n.replace("image/", "")}`).join(",")
     }))[0];
     return e ? (await this._insertCellImage(e), !0) : !1;
   }
@@ -356,11 +356,11 @@ let dt = class extends te {
     let e;
     try {
       e = await this._imageIoService.saveImage(t);
-    } catch (_) {
-      const I = _.message;
+    } catch (S) {
+      const I = S.message;
       I === xe.ERROR_EXCEED_SIZE ? this._messageService.show({
         type: ve.Error,
-        content: this._localeService.t("update-status.exceedMaxSize", String(Zn / (1024 * 1024)))
+        content: this._localeService.t("update-status.exceedMaxSize", String(Jn / (1024 * 1024)))
       }) : I === xe.ERROR_IMAGE_TYPE ? this._messageService.show({
         type: ve.Error,
         content: this._localeService.t("update-status.invalidImageType")
@@ -371,15 +371,15 @@ let dt = class extends te {
     }
     if (e == null)
       return;
-    const n = this._getUnitInfo(), { unitId: r, subUnitId: s } = n, { imageId: o, imageSourceType: a, source: d, base64Cache: u } = e, { width: c, height: l, image: g } = await nn(u || ""), { width: h, height: m } = this._context.scene;
+    const n = this._getUnitInfo(), { unitId: r, subUnitId: s } = n, { imageId: o, imageSourceType: a, source: d, base64Cache: u } = e, { width: c, height: l, image: g } = await rn(u || ""), { width: h, height: m } = this._context.scene;
     this._imageIoService.addImageSourceCache(d, a, g);
-    let p = 1;
-    if (c > qn || l > Qn) {
-      const _ = qn / c, I = Qn / l;
-      p = Math.max(_, I);
+    let f = 1;
+    if (c > Zn || l > qn) {
+      const S = Zn / c, I = qn / l;
+      f = Math.max(S, I);
     }
-    const f = this._getImagePosition(c * p, l * p, h, m);
-    if (f == null)
+    const p = this._getImagePosition(c * f, l * f, h, m);
+    if (p == null)
       return;
     const w = {
       unitId: r,
@@ -388,17 +388,17 @@ let dt = class extends te {
       drawingType: x.DRAWING_IMAGE,
       imageSourceType: a,
       source: d,
-      transform: J(f, this._selectionRenderService, this._skeletonManagerService),
-      sheetTransform: f
+      transform: J(p, this._selectionRenderService, this._skeletonManagerService),
+      sheetTransform: p
     };
-    return this._commandService.executeCommand(Xt.id, {
+    return this._commandService.executeCommand(zt.id, {
       unitId: r,
       drawings: [w]
     });
   }
   // eslint-disable-next-line max-lines-per-function
   async _insertCellImage(t, e) {
-    var I, R;
+    var I, D;
     let n;
     try {
       n = await this._imageIoService.saveImage(t);
@@ -406,7 +406,7 @@ let dt = class extends te {
       const C = v.message;
       C === xe.ERROR_EXCEED_SIZE ? this._messageService.show({
         type: ve.Error,
-        content: this._localeService.t("update-status.exceedMaxSize", String(Zn / (1024 * 1024)))
+        content: this._localeService.t("update-status.exceedMaxSize", String(Jn / (1024 * 1024)))
       }) : C === xe.ERROR_IMAGE_TYPE ? this._messageService.show({
         type: ve.Error,
         content: this._localeService.t("update-status.invalidImageType")
@@ -417,14 +417,14 @@ let dt = class extends te {
     }
     if (n == null)
       return !1;
-    const { imageId: r, imageSourceType: s, source: o, base64Cache: a } = n, { width: d, height: u, image: c } = await nn(a || "");
+    const { imageId: r, imageSourceType: s, source: o, base64Cache: a } = n, { width: d, height: u, image: c } = await rn(a || "");
     this._imageIoService.addImageSourceCache(o, s, c);
     const l = this._workbookSelections.getCurrentLastSelection();
     if (!l)
       return !1;
     let g = l.primary.actualRow, h = l.primary.actualColumn;
     l.primary.isMerged && (g = l.primary.startRow, h = l.primary.startColumn);
-    const m = hn("", {}), p = Sn(
+    const m = un("", {}), f = _n(
       this._injector,
       {
         unitId: this._context.unitId,
@@ -436,19 +436,19 @@ let dt = class extends te {
       u,
       0
     );
-    if (!p)
+    if (!f)
       return !1;
-    const f = {
+    const p = {
       size: {
-        width: p.width,
-        height: p.height
+        width: f.width,
+        height: f.height
       },
       positionH: {
-        relativeFrom: Bn.PAGE,
+        relativeFrom: Wn.PAGE,
         posOffset: 0
       },
       positionV: {
-        relativeFrom: Wn.PARAGRAPH,
+        relativeFrom: xn.PARAGRAPH,
         posOffset: 0
       },
       angle: 0
@@ -459,19 +459,19 @@ let dt = class extends te {
       drawingType: x.DRAWING_IMAGE,
       imageSourceType: s,
       source: o,
-      transform: zn(f),
-      docTransform: f,
-      behindDoc: Ln.FALSE,
+      transform: Xn(p),
+      docTransform: p,
+      behindDoc: Fn.FALSE,
       title: "",
       description: "",
-      layoutType: Fn.INLINE,
+      layoutType: jn.INLINE,
       // Insert inline drawing by default.
-      wrapText: jn.BOTH_SIDES,
+      wrapText: Bn.BOTH_SIDES,
       distB: 0,
       distL: 0,
       distR: 0,
       distT: 0
-    }, _ = gn.drawing.add({
+    }, S = hn.drawing.add({
       documentDataModel: m,
       drawings: [w],
       selection: {
@@ -480,10 +480,10 @@ let dt = class extends te {
         endOffset: 0
       }
     });
-    return _ ? (m.apply(_), this._commandService.syncExecuteCommand(Hn.id, {
+    return S ? (m.apply(S), this._commandService.syncExecuteCommand(Ln.id, {
       value: {
         [(I = e == null ? void 0 : e.row) != null ? I : g]: {
-          [(R = e == null ? void 0 : e.col) != null ? R : h]: {
+          [(D = e == null ? void 0 : e.col) != null ? D : h]: {
             p: m.getSnapshot(),
             t: 1
           }
@@ -495,73 +495,79 @@ let dt = class extends te {
   }
   // eslint-disable-next-line max-lines-per-function
   async insertCellImageByUrl(t, e) {
-    var g, h;
-    const { width: n, height: r, image: s } = await nn(t || "");
-    this._imageIoService.addImageSourceCache(t, de.URL, s);
-    const o = this._workbookSelections.getCurrentLastSelection();
-    if (!o)
+    var h, m;
+    let n = t;
+    try {
+      n = await this._urlImageService.getImage(t);
+    } catch (f) {
+      console.error(`Failed to get image from URLImageService: ${t}`, f);
+    }
+    const { width: r, height: s, image: o } = await rn(n || "");
+    this._imageIoService.addImageSourceCache(t, we.URL, o);
+    const a = this._workbookSelections.getCurrentLastSelection();
+    if (!a)
       return !1;
-    const a = hn("", {}), d = Sn(
+    const d = un("", {}), u = _n(
       this._injector,
       {
         unitId: this._context.unitId,
         subUnitId: this._context.unit.getActiveSheet().getSheetId(),
-        row: o.primary.actualRow,
-        col: o.primary.actualColumn
+        row: a.primary.actualRow,
+        col: a.primary.actualColumn
       },
-      n,
       r,
+      s,
       0
     );
-    if (!d)
+    if (!u)
       return !1;
-    const u = {
+    const c = {
       size: {
-        width: d.width,
-        height: d.height
+        width: u.width,
+        height: u.height
       },
       positionH: {
-        relativeFrom: Bn.PAGE,
+        relativeFrom: Wn.PAGE,
         posOffset: 0
       },
       positionV: {
-        relativeFrom: Wn.PARAGRAPH,
+        relativeFrom: xn.PARAGRAPH,
         posOffset: 0
       },
       angle: 0
-    }, c = {
-      unitId: a.getUnitId(),
-      subUnitId: a.getUnitId(),
+    }, l = {
+      unitId: d.getUnitId(),
+      subUnitId: d.getUnitId(),
       drawingId: He(),
       drawingType: x.DRAWING_IMAGE,
-      imageSourceType: de.URL,
+      imageSourceType: we.URL,
       source: t,
-      transform: zn(u),
-      docTransform: u,
-      behindDoc: Ln.FALSE,
+      transform: Xn(c),
+      docTransform: c,
+      behindDoc: Fn.FALSE,
       title: "",
       description: "",
-      layoutType: Fn.INLINE,
+      layoutType: jn.INLINE,
       // Insert inline drawing by default.
-      wrapText: jn.BOTH_SIDES,
+      wrapText: Bn.BOTH_SIDES,
       distB: 0,
       distL: 0,
       distR: 0,
       distT: 0
-    }, l = gn.drawing.add({
-      documentDataModel: a,
-      drawings: [c],
+    }, g = hn.drawing.add({
+      documentDataModel: d,
+      drawings: [l],
       selection: {
         collapsed: !0,
         startOffset: 0,
         endOffset: 0
       }
     });
-    return l ? (a.apply(l), this._commandService.syncExecuteCommand(Hn.id, {
+    return g ? (d.apply(g), this._commandService.syncExecuteCommand(Ln.id, {
       value: {
-        [(g = e == null ? void 0 : e.row) != null ? g : o.primary.actualRow]: {
-          [(h = e == null ? void 0 : e.col) != null ? h : o.primary.actualColumn]: {
-            p: a.getSnapshot(),
+        [(h = e == null ? void 0 : e.row) != null ? h : a.primary.actualRow]: {
+          [(m = e == null ? void 0 : e.col) != null ? m : a.primary.actualColumn]: {
+            p: d.getSnapshot(),
             t: 1
           }
         }
@@ -591,10 +597,10 @@ let dt = class extends te {
       return;
     let { startColumn: d, startRow: u, startX: c, startY: l } = a, g = !1;
     if (c + t > n && (c = n - t, c < 0 && (c = 0, t = n), g = !0), l + e > r && (l = r - e, l < 0 && (l = 0, e = r), g = !0), g) {
-      const f = this._selectionRenderService.getCellWithCoordByOffset(c, l);
-      if (f == null)
+      const p = this._selectionRenderService.getCellWithCoordByOffset(c, l);
+      if (p == null)
         return;
-      c = f.startX, l = f.startY, d = f.actualColumn, u = f.actualRow;
+      c = p.startX, l = p.startY, d = p.actualColumn, u = p.actualRow;
     }
     const h = {
       column: d,
@@ -604,7 +610,7 @@ let dt = class extends te {
     }, m = this._selectionRenderService.getCellWithCoordByOffset(c + t, l + e);
     if (m == null)
       return;
-    const p = {
+    const f = {
       column: m.actualColumn,
       columnOffset: c + t - m.startX,
       row: m.actualRow,
@@ -612,13 +618,13 @@ let dt = class extends te {
     };
     return {
       from: h,
-      to: p
+      to: f
     };
   }
   _updateOrderListener() {
     this.disposeWithMe(this._drawingManagerService.featurePluginOrderUpdate$.subscribe((t) => {
       const { unitId: e, subUnitId: n, drawingIds: r, arrangeType: s } = t;
-      this._commandService.executeCommand(xr.id, {
+      this._commandService.executeCommand(Wr.id, {
         unitId: e,
         subUnitId: n,
         drawingIds: r,
@@ -645,7 +651,7 @@ let dt = class extends te {
           sheetTransform: { ...c }
         };
         e.push(l);
-      }), e.length > 0 && this._commandService.executeCommand(zt.id, {
+      }), e.length > 0 && this._commandService.executeCommand(Kt.id, {
         unitId: t[0].unitId,
         drawings: e
       }));
@@ -653,11 +659,11 @@ let dt = class extends te {
   }
   _groupDrawingListener() {
     this.disposeWithMe(this._drawingManagerService.featurePluginGroupUpdate$.subscribe((t) => {
-      this._commandService.executeCommand($r.id, t);
+      this._commandService.executeCommand(xr.id, t);
       const { unitId: e, subUnitId: n, drawingId: r } = t[0].parent;
-      this._commandService.syncExecuteCommand(Vt.id, [{ unitId: e, subUnitId: n, drawingId: r }]);
+      this._commandService.syncExecuteCommand(Gt.id, [{ unitId: e, subUnitId: n, drawingId: r }]);
     })), this.disposeWithMe(this._drawingManagerService.featurePluginUngroupUpdate$.subscribe((t) => {
-      this._commandService.executeCommand(Wr.id, t);
+      this._commandService.executeCommand(Br.id, t);
     }));
   }
   _focusDrawingListener() {
@@ -669,25 +675,26 @@ let dt = class extends te {
   }
 };
 dt = Os([
-  ie(1, A(X)),
-  ie(2, G),
-  ie(3, Je),
-  ie(4, is),
-  ie(5, as),
-  ie(6, oe),
-  ie(7, ae),
-  ie(8, ur),
-  ie(9, Ur),
-  ie(10, A(Te)),
-  ie(11, A(ut)),
-  ie(12, A(qe))
+  Q(1, A(X)),
+  Q(2, G),
+  Q(3, Je),
+  Q(4, is),
+  Q(5, as),
+  Q(6, oe),
+  Q(7, ae),
+  Q(8, ur),
+  Q(9, Pr),
+  Q(10, A(Te)),
+  Q(11, A(ut)),
+  Q(12, A(qe)),
+  Q(13, hr)
 ], dt);
-const Kt = {
+const Jt = {
   id: "sheet.command.insert-float-image",
   type: q.COMMAND,
   handler: async (i, t) => {
     var o, a;
-    const e = i.get(le), n = i.get(ee), r = (o = bn(
+    const e = i.get(de), n = i.get(ee), r = (o = Dn(
       k.UNIVER_SHEET,
       e,
       n
@@ -701,13 +708,13 @@ const Kt = {
     } else
       return (a = r.insertFloatImage()) != null ? a : !1;
   }
-}, yn = {
+}, Mn = {
   id: "sheet.command.insert-cell-image",
   type: q.COMMAND,
   handler: (i) => {
     var n, r;
-    const t = i.get(le), e = i.get(ee);
-    return (r = (n = bn(
+    const t = i.get(de), e = i.get(ee);
+    return (r = (n = Dn(
       k.UNIVER_SHEET,
       t,
       e
@@ -731,7 +738,7 @@ const Kt = {
         sheetTransform: j(g, r)
       };
     }).filter((c) => c != null);
-    return e.syncExecuteCommand(zt.id, {
+    return e.syncExecuteCommand(Kt.id, {
       unitId: a,
       drawings: d
     }) ? (e.syncExecuteCommand(H.id, [a]), !0) : !1;
@@ -741,26 +748,26 @@ var Ps = Object.getOwnPropertyDescriptor, As = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? Ps(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, an = (i, t) => (e, n) => t(e, n, i), ye = /* @__PURE__ */ ((i) => (i.CELL_ADDRESS = "cellAddress", i.COLUMN_VALUE = "columnValue", i))(ye || {});
-const En = gi("sheets-drawing-ui.batch-save-images.service");
-function vn(i) {
+}, Tt = (i, t) => (e, n) => t(e, n, i), ye = /* @__PURE__ */ ((i) => (i.CELL_ADDRESS = "cellAddress", i.COLUMN_VALUE = "columnValue", i))(ye || {});
+const yn = mi("sheets-drawing-ui.batch-save-images.service");
+function Sn(i) {
   let t = "", e = i;
   for (; e >= 0; )
     t = String.fromCharCode(e % 26 + 65) + t, e = Math.floor(e / 26) - 1;
   return t;
 }
-function At(i, t) {
-  return `${vn(t)}${i + 1}`;
+function Nt(i, t) {
+  return `${Sn(t)}${i + 1}`;
 }
 function Ns(i) {
-  const t = At(i.startRow, i.startColumn), e = At(i.endRow, i.endColumn);
+  const t = Nt(i.startRow, i.startColumn), e = Nt(i.endRow, i.endColumn);
   return t === e ? t : `${t}:${e}`;
 }
-function rr(i) {
+function nr(i) {
   var t, e, n, r;
   return !!((e = (t = i == null ? void 0 : i.p) == null ? void 0 : t.drawingsOrder) != null && e.length && ((r = (n = i == null ? void 0 : i.p) == null ? void 0 : n.drawingsOrder) == null ? void 0 : r.length) > 0);
 }
-function ir(i) {
+function rr(i) {
   var n, r, s;
   if (!((r = (n = i.p) == null ? void 0 : n.drawingsOrder) != null && r.length) || !((s = i.p) != null && s.drawings))
     return null;
@@ -768,81 +775,80 @@ function ir(i) {
   return !e || !("source" in e) || !("imageSourceType" in e) ? null : e;
 }
 function cn(i, t) {
-  if (t === de.BASE64) {
+  if (t === we.BASE64) {
     const e = i.match(/^data:image\/(\w+);/);
     if (e)
       return e[1] === "jpeg" ? "jpg" : e[1];
   }
-  if (t === de.URL) {
+  if (t === we.URL) {
     const e = i.match(/\.(\w+)(?:\?|$)/);
     if (e)
       return e[1].toLowerCase();
   }
   return "png";
 }
-async function dn(i, t) {
-  if (t === de.BASE64)
+async function ir(i, t) {
+  if (t === we.BASE64)
     return (await fetch(i)).blob();
-  if (t === de.URL)
+  if (t === we.URL)
     return (await fetch(i)).blob();
   throw new Error("UUID image type requires additional handling");
 }
-let In = class extends te {
-  constructor(t, e, n) {
-    super();
-    Q(this, "_urlImageDownloader", null);
-    this._univerInstanceService = t, this._selectionService = e, this._imageIoService = n;
+let vn = class extends te {
+  constructor(i, t, e, n) {
+    super(), this._univerInstanceService = i, this._selectionService = t, this._imageIoService = e, this._urlImageService = n;
   }
-  registerURLImageDownloader(t) {
-    return this._urlImageDownloader = t, mi(() => {
-      this._urlImageDownloader === t && (this._urlImageDownloader = null);
-    });
+  /**
+   * @deprecated Use IURLImageService directly
+   */
+  registerURLImageDownloader(i) {
+    return this._urlImageService.registerURLImageDownloader(i);
   }
   getCellImagesInSelection() {
-    const t = this._univerInstanceService.getCurrentUnitForType(k.UNIVER_SHEET);
+    const i = this._univerInstanceService.getCurrentUnitForType(k.UNIVER_SHEET);
+    if (!i) return [];
+    const t = i.getActiveSheet();
     if (!t) return [];
-    const e = t.getActiveSheet();
-    if (!e) return [];
-    const n = this._selectionService.getCurrentSelections();
-    if (!n || n.length === 0) return [];
-    const r = e.getCellMatrix(), s = [];
-    for (const o of n) {
-      const { startRow: a, endRow: d, startColumn: u, endColumn: c } = o.range;
-      for (let l = a; l <= d; l++)
-        for (let g = u; g <= c; g++) {
-          const h = r.getValue(l, g);
-          if (rr(h)) {
-            const m = ir(h);
-            m && s.push({
-              row: l,
-              col: g,
-              cellAddress: At(l, g),
-              source: m.source,
-              imageSourceType: m.imageSourceType,
-              imageId: m.drawingId
+    const e = this._selectionService.getCurrentSelections();
+    if (!e || e.length === 0) return [];
+    const n = t.getCellMatrix(), r = [];
+    for (const s of e) {
+      const { startRow: o, endRow: a, startColumn: d, endColumn: u } = s.range;
+      for (let c = o; c <= a; c++)
+        for (let l = d; l <= u; l++) {
+          const g = n.getValue(c, l);
+          if (nr(g)) {
+            const h = rr(g);
+            h && r.push({
+              row: c,
+              col: l,
+              cellAddress: Nt(c, l),
+              source: h.source,
+              imageSourceType: h.imageSourceType,
+              imageId: h.drawingId
             });
           }
         }
     }
-    return s;
+    return r;
   }
-  getCellImagesFromRanges(t, e, n) {
-    const r = this._univerInstanceService.getUnit(t, k.UNIVER_SHEET);
+  getCellImagesFromRanges(i, t, e) {
+    const n = this._univerInstanceService.getUnit(i, k.UNIVER_SHEET);
+    if (!n) return [];
+    const r = n.getSheetBySheetId(t);
     if (!r) return [];
-    const s = r.getSheetBySheetId(e);
-    if (!s) return [];
-    const o = s.getCellMatrix(), a = [];
-    for (const d of n) {
-      const { startRow: u, endRow: c, startColumn: l, endColumn: g } = d;
-      for (let h = u; h <= c; h++)
-        for (let m = l; m <= g; m++) {
-          const p = o.getValue(h, m);
-          if (rr(p)) {
-            const f = ir(p);
-            f && a.push({
-              row: h,
-              col: m,
-              cellAddress: At(h, m),
+    const s = r.getCellMatrix(), o = [];
+    for (const a of e) {
+      const { startRow: d, endRow: u, startColumn: c, endColumn: l } = a;
+      for (let g = d; g <= u; g++)
+        for (let h = c; h <= l; h++) {
+          const m = s.getValue(g, h);
+          if (nr(m)) {
+            const f = rr(m);
+            f && o.push({
+              row: g,
+              col: h,
+              cellAddress: Nt(g, h),
               source: f.source,
               imageSourceType: f.imageSourceType,
               imageId: f.drawingId
@@ -850,201 +856,195 @@ let In = class extends te {
           }
         }
     }
-    return a;
+    return o;
   }
   getDataColumns() {
-    var g, h, m, p;
-    const t = this._univerInstanceService.getCurrentUnitForType(k.UNIVER_SHEET);
+    var l, g, h, m;
+    const i = this._univerInstanceService.getCurrentUnitForType(k.UNIVER_SHEET);
+    if (!i) return [];
+    const t = i.getActiveSheet();
     if (!t) return [];
-    const e = t.getActiveSheet();
-    if (!e) return [];
-    const n = this._selectionService.getCurrentSelections();
-    if (!n || n.length === 0) return [];
-    const r = e.getCellMatrix(), s = r.getDataRange();
-    let o = 1 / 0, a = -1 / 0;
-    const d = /* @__PURE__ */ new Set();
-    for (const f of n) {
-      o = Math.min(o, f.range.startRow), a = Math.max(a, f.range.endRow);
-      for (let w = f.range.startColumn; w <= f.range.endColumn; w++)
-        d.add(w);
+    const e = this._selectionService.getCurrentSelections();
+    if (!e || e.length === 0) return [];
+    const n = t.getCellMatrix(), r = n.getDataRange();
+    let s = 1 / 0, o = -1 / 0;
+    const a = /* @__PURE__ */ new Set();
+    for (const f of e) {
+      s = Math.min(s, f.range.startRow), o = Math.max(o, f.range.endRow);
+      for (let p = f.range.startColumn; p <= f.range.endColumn; p++)
+        a.add(p);
     }
-    const u = /* @__PURE__ */ new Set();
-    for (let f = s.startColumn; f <= s.endColumn; f++)
-      if (!d.has(f))
-        for (let w = o; w <= a; w++) {
-          const _ = r.getValue(w, f);
-          if (_ && (((g = _.v) == null ? void 0 : g.toString()) || ((p = (m = (h = _.p) == null ? void 0 : h.body) == null ? void 0 : m.dataStream) == null ? void 0 : p.trim()) || "")) {
-            u.add(f);
+    const d = /* @__PURE__ */ new Set();
+    for (let f = r.startColumn; f <= r.endColumn; f++)
+      if (!a.has(f))
+        for (let p = s; p <= o; p++) {
+          const w = n.getValue(p, f);
+          if (w && (((l = w.v) == null ? void 0 : l.toString()) || ((m = (h = (g = w.p) == null ? void 0 : g.body) == null ? void 0 : h.dataStream) == null ? void 0 : m.trim()) || "")) {
+            d.add(f);
             break;
           }
         }
-    const c = [], l = Array.from(u).sort((f, w) => f - w);
-    for (const f of l)
-      c.push({
+    const u = [], c = Array.from(d).sort((f, p) => f - p);
+    for (const f of c)
+      u.push({
         index: f,
-        label: vn(f)
+        label: Sn(f)
       });
-    return c;
+    return u;
   }
-  getDataColumnsForRanges(t, e, n) {
-    var m, p, f, w;
-    const r = this._univerInstanceService.getUnit(t, k.UNIVER_SHEET);
+  getDataColumnsForRanges(i, t, e) {
+    var h, m, f, p;
+    const n = this._univerInstanceService.getUnit(i, k.UNIVER_SHEET);
+    if (!n) return [];
+    const r = n.getSheetBySheetId(t);
     if (!r) return [];
-    const s = r.getSheetBySheetId(e);
-    if (!s) return [];
-    const o = s.getCellMatrix(), a = o.getDataRange();
-    let d = 1 / 0, u = -1 / 0;
-    const c = /* @__PURE__ */ new Set();
-    for (const _ of n) {
-      d = Math.min(d, _.startRow), u = Math.max(u, _.endRow);
-      for (let I = _.startColumn; I <= _.endColumn; I++)
-        c.add(I);
+    const s = r.getCellMatrix(), o = s.getDataRange();
+    let a = 1 / 0, d = -1 / 0;
+    const u = /* @__PURE__ */ new Set();
+    for (const w of e) {
+      a = Math.min(a, w.startRow), d = Math.max(d, w.endRow);
+      for (let S = w.startColumn; S <= w.endColumn; S++)
+        u.add(S);
     }
-    const l = /* @__PURE__ */ new Set();
-    for (let _ = a.startColumn; _ <= a.endColumn; _++)
-      if (!c.has(_))
-        for (let I = d; I <= u; I++) {
-          const R = o.getValue(I, _);
-          if (R && (((m = R.v) == null ? void 0 : m.toString()) || ((w = (f = (p = R.p) == null ? void 0 : p.body) == null ? void 0 : f.dataStream) == null ? void 0 : w.trim()) || "")) {
-            l.add(_);
+    const c = /* @__PURE__ */ new Set();
+    for (let w = o.startColumn; w <= o.endColumn; w++)
+      if (!u.has(w))
+        for (let S = a; S <= d; S++) {
+          const I = s.getValue(S, w);
+          if (I && (((h = I.v) == null ? void 0 : h.toString()) || ((p = (f = (m = I.p) == null ? void 0 : m.body) == null ? void 0 : f.dataStream) == null ? void 0 : p.trim()) || "")) {
+            c.add(w);
             break;
           }
         }
-    const g = [], h = Array.from(l).sort((_, I) => _ - I);
-    for (const _ of h)
-      g.push({
-        index: _,
-        label: vn(_)
+    const l = [], g = Array.from(c).sort((w, S) => w - S);
+    for (const w of g)
+      l.push({
+        index: w,
+        label: Sn(w)
       });
-    return g;
+    return l;
   }
   getSelectionRangeNotation() {
-    const t = this._selectionService.getCurrentSelections();
-    return !t || t.length === 0 ? "" : t.map((e) => Ns(e.range)).join(", ");
+    const i = this._selectionService.getCurrentSelections();
+    return !i || i.length === 0 ? "" : i.map((t) => Ns(t.range)).join(", ");
   }
   getSelectionRowRange() {
-    const t = this._selectionService.getCurrentSelections();
-    if (!t || t.length === 0) return null;
-    let e = 1 / 0, n = -1 / 0;
-    for (const r of t)
-      e = Math.min(e, r.range.startRow), n = Math.max(n, r.range.endRow);
-    return { startRow: e, endRow: n };
+    const i = this._selectionService.getCurrentSelections();
+    if (!i || i.length === 0) return null;
+    let t = 1 / 0, e = -1 / 0;
+    for (const n of i)
+      t = Math.min(t, n.range.startRow), e = Math.max(e, n.range.endRow);
+    return { startRow: t, endRow: e };
   }
   getSelectionColumnIndices() {
-    const t = this._selectionService.getCurrentSelections();
-    if (!t || t.length === 0) return /* @__PURE__ */ new Set();
-    const e = /* @__PURE__ */ new Set();
-    for (const n of t)
-      for (let r = n.range.startColumn; r <= n.range.endColumn; r++)
-        e.add(r);
-    return e;
-  }
-  generateFileName(t, e) {
-    var o, a, d, u;
-    const n = this._univerInstanceService.getCurrentUnitForType(k.UNIVER_SHEET), r = cn(t.source, t.imageSourceType), s = [];
-    for (const c of e.fileNameParts)
-      if (c === "cellAddress")
-        s.push(t.cellAddress);
-      else if (c === "columnValue" && e.columnIndex !== void 0) {
-        const l = n == null ? void 0 : n.getActiveSheet();
-        if (l) {
-          const h = l.getCellMatrix().getValue(t.row, e.columnIndex);
-          if (h) {
-            const m = ((o = h.v) == null ? void 0 : o.toString()) || ((u = (d = (a = h.p) == null ? void 0 : a.body) == null ? void 0 : d.dataStream) == null ? void 0 : u.trim()) || "";
-            if (m) {
-              const p = m.replace(/[<>:"/\\|?*]/g, "_").trim();
-              p && s.push(p);
+    const i = this._selectionService.getCurrentSelections();
+    if (!i || i.length === 0) return /* @__PURE__ */ new Set();
+    const t = /* @__PURE__ */ new Set();
+    for (const e of i)
+      for (let n = e.range.startColumn; n <= e.range.endColumn; n++)
+        t.add(n);
+    return t;
+  }
+  generateFileName(i, t) {
+    var s, o, a, d;
+    const e = this._univerInstanceService.getCurrentUnitForType(k.UNIVER_SHEET), n = cn(i.source, i.imageSourceType), r = [];
+    for (const u of t.fileNameParts)
+      if (u === "cellAddress")
+        r.push(i.cellAddress);
+      else if (u === "columnValue" && t.columnIndex !== void 0) {
+        const c = e == null ? void 0 : e.getActiveSheet();
+        if (c) {
+          const g = c.getCellMatrix().getValue(i.row, t.columnIndex);
+          if (g) {
+            const h = ((s = g.v) == null ? void 0 : s.toString()) || ((d = (a = (o = g.p) == null ? void 0 : o.body) == null ? void 0 : a.dataStream) == null ? void 0 : d.trim()) || "";
+            if (h) {
+              const m = h.replace(/[<>:"/\\|?*]/g, "_").trim();
+              m && r.push(m);
             }
           }
         }
       }
-    return s.length === 0 ? `${t.cellAddress}.${r}` : `${s.join("_")}.${r}`;
-  }
-  generateFileNameWithContext(t, e, n, r) {
-    var d, u, c, l;
-    const s = this._univerInstanceService.getUnit(n, k.UNIVER_SHEET), o = cn(t.source, t.imageSourceType), a = [];
-    for (const g of e.fileNameParts)
-      if (g === "cellAddress")
-        a.push(t.cellAddress);
-      else if (g === "columnValue" && e.columnIndex !== void 0) {
-        const h = s == null ? void 0 : s.getSheetBySheetId(r);
-        if (h) {
-          const p = h.getCellMatrix().getValue(t.row, e.columnIndex);
-          if (p) {
-            const f = ((d = p.v) == null ? void 0 : d.toString()) || ((l = (c = (u = p.p) == null ? void 0 : u.body) == null ? void 0 : c.dataStream) == null ? void 0 : l.trim()) || "";
+    return r.length === 0 ? `${i.cellAddress}.${n}` : `${r.join("_")}.${n}`;
+  }
+  generateFileNameWithContext(i, t, e, n) {
+    var a, d, u, c;
+    const r = this._univerInstanceService.getUnit(e, k.UNIVER_SHEET), s = cn(i.source, i.imageSourceType), o = [];
+    for (const l of t.fileNameParts)
+      if (l === "cellAddress")
+        o.push(i.cellAddress);
+      else if (l === "columnValue" && t.columnIndex !== void 0) {
+        const g = r == null ? void 0 : r.getSheetBySheetId(n);
+        if (g) {
+          const m = g.getCellMatrix().getValue(i.row, t.columnIndex);
+          if (m) {
+            const f = ((a = m.v) == null ? void 0 : a.toString()) || ((c = (u = (d = m.p) == null ? void 0 : d.body) == null ? void 0 : u.dataStream) == null ? void 0 : c.trim()) || "";
             if (f) {
-              const w = f.replace(/[<>:"/\\|?*]/g, "_").trim();
-              w && a.push(w);
+              const p = f.replace(/[<>:"/\\|?*]/g, "_").trim();
+              p && o.push(p);
             }
           }
         }
       }
-    return a.length === 0 ? `${t.cellAddress}.${o}` : `${a.join("_")}.${o}`;
+    return o.length === 0 ? `${i.cellAddress}.${s}` : `${o.join("_")}.${s}`;
   }
-  async saveImages(t, e) {
-    var s;
-    const n = await window.showDirectoryPicker({ mode: "readwrite" }), r = /* @__PURE__ */ new Map();
-    for (const o of t) {
-      let a = this.generateFileName(o, e);
-      const d = a.replace(/\.\w+$/, ""), u = ((s = a.match(/\.\w+$/)) == null ? void 0 : s[0]) || ".png", c = r.get(d) || 0;
-      c > 0 && (a = `${d}_${c}${u}`), r.set(d, c + 1);
+  async saveImages(i, t) {
+    var r;
+    const e = await window.showDirectoryPicker({ mode: "readwrite" }), n = /* @__PURE__ */ new Map();
+    for (const s of i) {
+      let o = this.generateFileName(s, t);
+      const a = o.replace(/\.\w+$/, ""), d = ((r = o.match(/\.\w+$/)) == null ? void 0 : r[0]) || ".png", u = n.get(a) || 0;
+      u > 0 && (o = `${a}_${u}${d}`), n.set(a, u + 1);
       try {
-        const l = await this._getImageBlob(o), h = await (await n.getFileHandle(a, { create: !0 })).createWritable();
-        await h.write(l), await h.close();
-      } catch (l) {
-        throw console.error(`Failed to save image ${a}:`, l), l;
+        const c = await this._getImageBlob(s), g = await (await e.getFileHandle(o, { create: !0 })).createWritable();
+        await g.write(c), await g.close();
+      } catch (c) {
+        throw console.error(`Failed to save image ${o}:`, c), c;
       }
     }
   }
-  async saveImagesWithContext(t, e, n, r) {
-    var a;
-    const s = await window.showDirectoryPicker({ mode: "readwrite" }), o = /* @__PURE__ */ new Map();
-    for (const d of t) {
-      let u = this.generateFileNameWithContext(d, e, n, r);
-      const c = u.replace(/\.\w+$/, ""), l = ((a = u.match(/\.\w+$/)) == null ? void 0 : a[0]) || ".png", g = o.get(c) || 0;
-      g > 0 && (u = `${c}_${g}${l}`), o.set(c, g + 1);
+  async saveImagesWithContext(i, t, e, n) {
+    var o;
+    const r = await window.showDirectoryPicker({ mode: "readwrite" }), s = /* @__PURE__ */ new Map();
+    for (const a of i) {
+      let d = this.generateFileNameWithContext(a, t, e, n);
+      const u = d.replace(/\.\w+$/, ""), c = ((o = d.match(/\.\w+$/)) == null ? void 0 : o[0]) || ".png", l = s.get(u) || 0;
+      l > 0 && (d = `${u}_${l}${c}`), s.set(u, l + 1);
       try {
-        const h = await this._getImageBlob(d), p = await (await s.getFileHandle(u, { create: !0 })).createWritable();
-        await p.write(h), await p.close();
-      } catch (h) {
-        throw console.error(`Failed to save image ${u}:`, h), h;
+        const g = await this._getImageBlob(a), m = await (await r.getFileHandle(d, { create: !0 })).createWritable();
+        await m.write(g), await m.close();
+      } catch (g) {
+        throw console.error(`Failed to save image ${d}:`, g), g;
       }
     }
   }
-  async downloadSingleImage(t) {
-    const e = cn(t.source, t.imageSourceType), n = `${t.cellAddress}.${e}`;
+  async downloadSingleImage(i) {
+    const t = cn(i.source, i.imageSourceType), e = `${i.cellAddress}.${t}`;
     try {
-      const r = await this._getImageBlob(t), s = URL.createObjectURL(r), o = document.createElement("a");
-      o.href = s, o.download = n, document.body.appendChild(o), o.click(), document.body.removeChild(o), URL.revokeObjectURL(s);
-    } catch (r) {
-      throw console.error(`Failed to download image ${n}:`, r), r;
+      const n = await this._getImageBlob(i), r = URL.createObjectURL(n), s = document.createElement("a");
+      s.href = r, s.download = e, document.body.appendChild(s), s.click(), document.body.removeChild(s), URL.revokeObjectURL(r);
+    } catch (n) {
+      throw console.error(`Failed to download image ${e}:`, n), n;
     }
   }
-  async _getImageBlob(t) {
-    if (t.imageSourceType === de.UUID) {
-      const e = await this._imageIoService.getImage(t.source);
-      return dn(e, de.URL);
+  async _getImageBlob(i) {
+    if (i.imageSourceType === we.UUID) {
+      const t = await this._imageIoService.getImage(i.source);
+      return ir(t, we.URL);
     }
-    if (t.imageSourceType === de.URL && this._urlImageDownloader)
-      try {
-        const e = await this._urlImageDownloader(t.source);
-        return dn(e, de.BASE64);
-      } catch (e) {
-        console.error(`Custom downloader failed for ${t.source}, falling back to default fetch:`, e);
-      }
-    return dn(t.source, t.imageSourceType);
+    return i.imageSourceType === we.URL ? this._urlImageService.downloadImage(i.source) : ir(i.source, i.imageSourceType);
   }
 };
-In = As([
-  an(0, le),
-  an(1, A(ut)),
-  an(2, hr)
-], In);
+vn = As([
+  Tt(0, de),
+  Tt(1, A(ut)),
+  Tt(2, gr),
+  Tt(3, hr)
+], vn);
 const ze = "sheet.dialog.batch-save-images", ct = {
   id: "sheet.command.save-cell-images",
   type: q.COMMAND,
   handler: async (i) => {
-    const t = i.get(Mn), e = i.get(En), n = e.getCellImagesInSelection();
+    const t = i.get(bn), e = i.get(yn), n = e.getCellImagesInSelection();
     if (n.length === 1)
       try {
         return await e.downloadSingleImage(n[0]), !0;
@@ -1065,26 +1065,26 @@ const ze = "sheet.dialog.batch-save-images", ct = {
       onClose: () => t.close(ze)
     }), !0;
   }
-}, Br = "COMPONENT_SHEET_DRAWING_PANEL", jr = {
+}, jr = "COMPONENT_SHEET_DRAWING_PANEL", Fr = {
   id: "sidebar.operation.sheet-image",
   type: q.COMMAND,
   handler: async (i, t) => {
-    const e = i.get(cs), n = i.get(Te), r = i.get(le), s = i.get(G);
+    const e = i.get(cs), n = i.get(Te), r = i.get(de), s = i.get(G);
     return se(r) ? (t.value === "open" ? e.open({
       header: { title: n.t("sheetImage.panel.title") },
-      children: { label: Br },
+      children: { label: jr },
       onClose: () => {
-        s.syncExecuteCommand(Vt.id, []);
+        s.syncExecuteCommand(Gt.id, []);
       },
       width: 360
     }) : e.close(), !0) : !1;
   }
-}, Fr = {
+}, Lr = {
   id: "sheet.operation.edit-sheet-image",
   type: q.OPERATION,
   handler: (i, t) => {
     const e = i.get(G);
-    return t == null ? !1 : (e.syncExecuteCommand(Vt.id, [t]), e.executeCommand(jr.id, { value: "open" }), !0);
+    return t == null ? !1 : (e.syncExecuteCommand(Gt.id, [t]), e.executeCommand(Fr.id, { value: "open" }), !0);
   }
 }, ks = "sheets-drawing-ui.config", sr = {};
 var $s = Object.getOwnPropertyDescriptor, xs = (i, t, e, n) => {
@@ -1092,14 +1092,14 @@ var $s = Object.getOwnPropertyDescriptor, xs = (i, t, e, n) => {
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, ce = (i, t) => (e, n) => t(e, n, i);
-let Nt = class extends fi {
+let kt = class extends fi {
   constructor(t, e, n, r, s, o, a, d, u, c) {
     super();
-    Q(this, "_initImagePopupMenu", /* @__PURE__ */ new Set());
+    ie(this, "_initImagePopupMenu", /* @__PURE__ */ new Set());
     this._injector = t, this._localeService = e, this._drawingManagerService = n, this._canvasPopManagerService = r, this._renderManagerService = s, this._univerInstanceService = o, this._messageService = a, this._contextService = d, this._ioService = u, this._commandService = c, this._init();
   }
   _init() {
-    this._univerInstanceService.getCurrentTypeOfUnit$(k.UNIVER_SHEET).pipe(er(this.dispose$)).subscribe((t) => this._create(t)), this._univerInstanceService.getTypeOfUnitDisposed$(k.UNIVER_SHEET).pipe(er(this.dispose$)).subscribe((t) => this._dispose(t)), this._univerInstanceService.getAllUnitsForType(k.UNIVER_SHEET).forEach((t) => this._create(t)), this._setupLoadingStatus();
+    this._univerInstanceService.getCurrentTypeOfUnit$(k.UNIVER_SHEET).pipe(Qn(this.dispose$)).subscribe((t) => this._create(t)), this._univerInstanceService.getTypeOfUnitDisposed$(k.UNIVER_SHEET).pipe(Qn(this.dispose$)).subscribe((t) => this._dispose(t)), this._univerInstanceService.getAllUnitsForType(k.UNIVER_SHEET).forEach((t) => this._create(t)), this._setupLoadingStatus();
   }
   _setupLoadingStatus() {
     const t = "image-upload-loading";
@@ -1159,19 +1159,19 @@ let Nt = class extends fi {
         if (m && m.disablePopup)
           return;
         r == null || r.dispose();
-        const p = this._canvasPopManagerService.getFeatureMenu(c, l, g, h);
+        const f = this._canvasPopManagerService.getFeatureMenu(c, l, g, h);
         r = this.disposeWithMe(this._canvasPopManagerService.attachPopupToObject(a, {
           componentKey: Ss,
           direction: "horizontal",
           offset: [2, 0],
           extraProps: {
-            menuItems: p || this._getImageMenuItems(c, l, g, h)
+            menuItems: f || this._getImageMenuItems(c, l, g, h)
           }
         }));
       })
     ), this.disposeWithMe(
       n.clearControl$.subscribe(() => {
-        r == null || r.dispose(), this._contextService.setContextValue(Ye, !1), this._commandService.syncExecuteCommand(Vt.id, []);
+        r == null || r.dispose(), this._contextService.setContextValue(Ye, !1), this._commandService.syncExecuteCommand(Gt.id, []);
       })
     ), this.disposeWithMe(
       this._contextService.contextChanged$.subscribe((o) => {
@@ -1188,7 +1188,7 @@ let Nt = class extends fi {
       {
         label: "image-popup.edit",
         index: 0,
-        commandId: Fr.id,
+        commandId: Lr.id,
         commandParams: { unitId: t, subUnitId: e, drawingId: n },
         disable: r === x.DRAWING_DOM
       },
@@ -1216,34 +1216,34 @@ let Nt = class extends fi {
     ];
   }
 };
-Nt = xs([
+kt = xs([
   ce(0, A(qe)),
   ce(1, A(Te)),
   ce(2, ae),
-  ce(3, A(ni)),
+  ce(3, A(ri)),
   ce(4, ee),
-  ce(5, le),
-  ce(6, Ur),
+  ce(5, de),
+  ce(6, Pr),
   ce(7, ur),
-  ce(8, hr),
+  ce(8, gr),
   ce(9, G)
-], Nt);
+], kt);
 var Ws = Object.getOwnPropertyDescriptor, Bs = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? Ws(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, Tt = (i, t) => (e, n) => t(e, n, i);
-let Cn = class extends te {
+}, Ot = (i, t) => (e, n) => t(e, n, i);
+let In = class extends te {
   constructor(t, e, n, r, s) {
     super();
-    Q(this, "_isSetCursor", !1);
+    ie(this, "_isSetCursor", !1);
     this._context = t, this._hoverManagerService = e, this._selectionsService = n, this._drawingRenderService = r, this._sheetSkeletonManagerService = s, this._initHover(), this._initImageClick();
   }
   _initHover() {
     this.disposeWithMe(this._hoverManagerService.currentRichTextNoDistinct$.pipe(Ds(33)).subscribe((t) => {
       var n, r;
       let e = [];
-      t !== null && (e = this._selectionsService.getWorkbookSelections(this._context.unitId).getCurrentSelections()), e.length > 0 && (t == null ? void 0 : t.unitId) === this._context.unitId && (t != null && t.drawing) && e.length === 1 && ((n = e[0].primary) == null ? void 0 : n.actualRow) === t.row && ((r = e[0].primary) == null ? void 0 : r.actualColumn) === t.col ? (this._isSetCursor = !0, this._context.scene.setCursor(ei.ZOOM_IN)) : this._isSetCursor && (this._isSetCursor = !1, this._context.scene.resetCursor());
+      t !== null && (e = this._selectionsService.getWorkbookSelections(this._context.unitId).getCurrentSelections()), e.length > 0 && (t == null ? void 0 : t.unitId) === this._context.unitId && (t != null && t.drawing) && e.length === 1 && ((n = e[0].primary) == null ? void 0 : n.actualRow) === t.row && ((r = e[0].primary) == null ? void 0 : r.actualColumn) === t.col ? (this._isSetCursor = !0, this._context.scene.setCursor(ti.ZOOM_IN)) : this._isSetCursor && (this._isSetCursor = !1, this._context.scene.resetCursor());
     }));
   }
   _initImageClick() {
@@ -1257,18 +1257,18 @@ let Cn = class extends te {
     }));
   }
 };
-Cn = Bs([
-  Tt(1, A(ri)),
-  Tt(2, A(ut)),
-  Tt(3, A(Ar)),
-  Tt(4, A(X))
-], Cn);
+In = Bs([
+  Ot(1, A(ii)),
+  Ot(2, A(ut)),
+  Ot(3, A(Nr)),
+  Ot(4, A(X))
+], In);
 var js = Object.getOwnPropertyDescriptor, Fs = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? js(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, Ot = (i, t) => (e, n) => t(e, n, i);
-let Rn = class extends te {
+}, Ut = (i, t) => (e, n) => t(e, n, i);
+let Cn = class extends te {
   constructor(i, t, e, n, r) {
     super(), this._context = i, this._sheetDrawingService = t, this._drawingManagerService = e, this._sheetSelectionRenderService = n, this._sheetSkeletonManagerService = r, this._init();
   }
@@ -1288,21 +1288,21 @@ let Rn = class extends te {
     this._drawingManagerService.registerDrawingData(this._context.unitId, this._sheetDrawingService.getDrawingDataForUnit(this._context.unitId)), this._drawingManagerService.initializeNotification(this._context.unitId);
   }
 };
-Rn = Fs([
-  Ot(1, oe),
-  Ot(2, ae),
-  Ot(3, A(Je)),
-  Ot(4, A(X))
-], Rn);
+Cn = Fs([
+  Ut(1, oe),
+  Ut(2, ae),
+  Ut(3, A(Je)),
+  Ut(4, A(X))
+], Cn);
 var Ls = Object.getOwnPropertyDescriptor, Hs = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? Ls(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, We = (i, t) => (e, n) => t(e, n, i);
-function Lr(i, t, e) {
+function Hr(i, t, e) {
   var n, r, s, o;
   if (((r = (n = e == null ? void 0 : e.p) == null ? void 0 : n.body) == null ? void 0 : r.dataStream.length) === 3 && ((o = (s = e.p) == null ? void 0 : s.drawingsOrder) == null ? void 0 : o.length) === 1) {
-    const a = e.p.drawings[e.p.drawingsOrder[0]], d = Sn(
+    const a = e.p.drawings[e.p.drawingsOrder[0]], d = _n(
       i,
       {
         unitId: t.unitId,
@@ -1319,7 +1319,7 @@ function Lr(i, t, e) {
   }
   return !1;
 }
-let kt = class extends te {
+let $t = class extends te {
   constructor(i, t, e, n, r, s) {
     super(), this._commandService = i, this._sheetInterceptorService = t, this._injector = e, this._drawingManagerService = n, this._docDrawingController = r, this._editorBridgeService = s, this._handleInitEditor(), this._initCellContentInterceptor();
   }
@@ -1339,27 +1339,27 @@ let kt = class extends te {
           priority: xi.CELL_IMAGE,
           handler: (i, t, e) => {
             var n;
-            return i != null && i.p && ((n = i.p.drawingsOrder) != null && n.length) && (i === t.rawData && (i = { ...t.rawData }), i.interceptorStyle || (i.interceptorStyle = {}), i.interceptorStyle.tr = { a: 0 }, Lr(this._injector, { unitId: t.unitId, subUnitId: t.subUnitId, row: t.row, col: t.col }, i)), e(i);
+            return i != null && i.p && ((n = i.p.drawingsOrder) != null && n.length) && (i === t.rawData && (i = { ...t.rawData }), i.interceptorStyle || (i.interceptorStyle = {}), i.interceptorStyle.tr = { a: 0 }, Hr(this._injector, { unitId: t.unitId, subUnitId: t.subUnitId, row: t.row, col: t.col }, i)), e(i);
           }
         }
       )
     );
   }
 };
-kt = Hs([
+$t = Hs([
   We(0, G),
-  We(1, A(Ht)),
+  We(1, A(Vt)),
   We(2, A(qe)),
   We(3, ae),
   We(4, A(ps)),
-  We(5, A(ii))
-], kt);
+  We(5, A(si))
+], $t);
 var Vs = Object.getOwnPropertyDescriptor, Gs = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? Vs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, or = (i, t) => (e, n) => t(e, n, i);
-let $t = class extends te {
+let xt = class extends te {
   constructor(i, t) {
     super(), this._autoFillService = i, this._injector = t, this._initAutoFillHooks();
   }
@@ -1369,17 +1369,17 @@ let $t = class extends te {
         id: "sheet-cell-image-autofill",
         onBeforeSubmit: (i, t, e, n) => {
           new wi(n).forValue((r, s, o) => {
-            Lr(this._injector, { unitId: i.unitId, subUnitId: i.subUnitId, row: r, col: s }, o);
+            Hr(this._injector, { unitId: i.unitId, subUnitId: i.subUnitId, row: r, col: s }, o);
           });
         }
       })
     );
   }
 };
-$t = Gs([
-  or(0, A(si)),
+xt = Gs([
+  or(0, A(oi)),
   or(1, A(qe))
-], $t);
+], xt);
 var Ys = Object.getOwnPropertyDescriptor, Xs = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? Ys(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
@@ -1390,13 +1390,13 @@ const zs = [
   _i,
   Ve
 ];
-let xt = class extends te {
+let Wt = class extends te {
   constructor(i, t, e, n, r) {
     super(), this._commandService = i, this._univerInstanceService = t, this._dialogService = e, this._renderManagerService = n, this._localeService = r, this._initDocImageCopyPasteHooks();
   }
   _setCellImage(i) {
     var r;
-    const t = hn("", {}), e = (r = bn(k.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.with(oi), n = gn.drawing.add({
+    const t = un("", {}), e = (r = Dn(k.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.with(ai), n = hn.drawing.add({
       documentDataModel: t,
       drawings: [i],
       selection: {
@@ -1419,12 +1419,12 @@ let xt = class extends te {
           if (zs.includes(o)) {
             if (o !== Ve) {
               const a = () => {
-                this._dialogService.close("sheet-cell-image-copy-paste"), this._commandService.syncExecuteCommand(kn.id, {
+                this._dialogService.close("sheet-cell-image-copy-paste"), this._commandService.syncExecuteCommand(Nn.id, {
                   visible: !1
                 });
               };
               ((e = s.getBody()) == null ? void 0 : e.dataStream) === `\r
-` ? (this._commandService.syncExecuteCommand(kn.id, {
+` ? (this._commandService.syncExecuteCommand(Nn.id, {
                 visible: !1
               }), this._setCellImage(Object.values(r.drawings)[0])) : this._dialogService.open({
                 id: "sheet-cell-image-copy-paste",
@@ -1452,27 +1452,27 @@ let xt = class extends te {
     );
   }
 };
-xt = Xs([
+Wt = Xs([
   nt(0, G),
-  nt(1, le),
-  nt(2, Mn),
+  nt(1, de),
+  nt(2, bn),
   nt(3, ee),
   nt(4, A(Te))
-], xt);
+], Wt);
 var Ks = Object.getOwnPropertyDescriptor, Js = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? Ks(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, rt = (i, t) => (e, n) => t(e, n, i);
-const Hr = "image/png";
+const Vr = "image/png";
 function Zs(i) {
   const t = i.split(","), e = atob(t[1]), n = e.length, r = new Uint8Array(n);
   for (let s = 0; s < n; s++)
     r[s] = e.charCodeAt(s);
-  return new Blob([r], { type: Hr });
+  return new Blob([r], { type: Vr });
 }
 function qs(i) {
-  const t = new ClipboardItem({ [Hr]: Zs(i) });
+  const t = new ClipboardItem({ [Vr]: Zs(i) });
   navigator.clipboard.write([t]).catch((e) => {
     console.error("Could not copy image using clipboard API: ", e);
   });
@@ -1493,10 +1493,10 @@ const ar = [
   Le.SPECIAL_PASTE_FORMAT,
   Le.SPECIAL_PASTE_FORMULA
 ];
-let Wt = class extends te {
+let Bt = class extends te {
   constructor(t, e, n, r, s) {
     super();
-    Q(this, "_copyInfo");
+    ie(this, "_copyInfo");
     this._sheetClipboardService = t, this._renderManagerService = e, this._drawingService = n, this._clipboardInterfaceService = r, this._commandService = s, this._initCopyPaste();
   }
   get _focusedDrawings() {
@@ -1553,7 +1553,7 @@ let Wt = class extends te {
               undos: [],
               redos: [
                 {
-                  id: Kt.id,
+                  id: Jt.id,
                   params: { files: n }
                 }
               ]
@@ -1575,16 +1575,16 @@ let Wt = class extends te {
       const m = c[h];
       if (m.drawingType !== x.DRAWING_IMAGE)
         return;
-      const { transform: p } = m;
-      if (m.anchorType !== O.Both || !p)
+      const { transform: f } = m;
+      if (m.anchorType !== O.Both || !f)
         return;
-      const { left: f = 0, top: w = 0, width: _ = 0, height: I = 0 } = p, { drawingStartX: R, drawingEndX: v, drawingStartY: C, drawingEndY: S } = {
-        drawingStartX: f,
-        drawingEndX: f + _,
+      const { left: p = 0, top: w = 0, width: S = 0, height: I = 0 } = f, { drawingStartX: D, drawingEndX: v, drawingStartY: C, drawingEndY: _ } = {
+        drawingStartX: p,
+        drawingEndX: p + S,
         drawingStartY: w,
         drawingEndY: w + I
       };
-      o <= R && v <= a && d <= C && S <= u && l.push(m);
+      o <= D && v <= a && d <= C && _ <= u && l.push(m);
     }), l.length)
       return {
         copyRange: n,
@@ -1600,26 +1600,26 @@ let Wt = class extends te {
     const { unitId: s, subUnitId: o, range: a } = r, d = this._renderManagerService.getRenderById(s), u = d == null ? void 0 : d.with(X), c = d == null ? void 0 : d.with(Je), l = this._copyInfo;
     if (!u || !c)
       return { redos: [], undos: [] };
-    const { drawings: g } = l, h = $n(a);
+    const { drawings: g } = l, h = kn(a);
     return this._generateMutations(g, {
       unitId: s,
       subUnitId: o,
       isCut: e === Re.CUT,
-      getTransform: (m, p) => {
-        var _;
-        const f = u.attachRangeWithCoord({
+      getTransform: (m, f) => {
+        var S;
+        const p = u.attachRangeWithCoord({
           startRow: h.startRow,
           endRow: h.endRow,
           startColumn: h.startColumn,
           endColumn: h.endColumn
         }), w = {
           ...m,
-          left: f == null ? void 0 : f.startX,
-          top: f == null ? void 0 : f.startY
+          left: p == null ? void 0 : p.startX,
+          top: p == null ? void 0 : p.startY
         };
         return {
           transform: w,
-          sheetTransform: (_ = j(w, c)) != null ? _ : p
+          sheetTransform: (S = j(w, c)) != null ? S : f
         };
       }
     });
@@ -1644,14 +1644,14 @@ let Wt = class extends te {
         sheetTransform: h.sheetTransform
       };
       if (o) {
-        const { undo: p, redo: f, objects: w } = u.getBatchUpdateOp([m]);
+        const { undo: f, redo: p, objects: w } = u.getBatchUpdateOp([m]);
         a.push({
           id: P.id,
           params: {
             unitId: n,
             subUnitId: r,
             type: U.UPDATE,
-            op: f,
+            op: p,
             objects: w
           }
         }), d.push({
@@ -1660,13 +1660,13 @@ let Wt = class extends te {
             unitId: n,
             subUnitId: r,
             type: U.UPDATE,
-            op: p,
+            op: f,
             objects: w
           }
         });
       } else {
-        const { undo: p, redo: f, objects: w } = u.getBatchAddOp([m]);
-        a.push({ id: P.id, params: { op: f, unitId: n, subUnitId: r, objects: w, type: U.INSERT } }), d.push({ id: P.id, params: { op: p, unitId: n, subUnitId: r, objects: w, type: U.REMOVE } });
+        const { undo: f, redo: p, objects: w } = u.getBatchAddOp([m]);
+        a.push({ id: P.id, params: { op: p, unitId: n, subUnitId: r, objects: w, type: U.INSERT } }), d.push({ id: P.id, params: { op: f, unitId: n, subUnitId: r, objects: w, type: U.REMOVE } });
       }
     }), { redos: a, undos: d };
   }
@@ -1690,45 +1690,45 @@ let Wt = class extends te {
     const { drawings: c } = this._copyInfo;
     if (!a)
       return this._generateSingleDrawingPasteMutations({
-        pasteTo: { unitId: n, subUnitId: r, range: $n(o) },
+        pasteTo: { unitId: n, subUnitId: r, range: kn(o) },
         pasteType: s
       }, d);
-    const { ranges: [l, g], mapFunc: h } = ai([a, o]), { row: m, col: p } = h(l.startRow, l.startColumn), { row: f, col: w } = h(g.startRow, g.startColumn), _ = u.attachRangeWithCoord({
+    const { ranges: [l, g], mapFunc: h } = ci([a, o]), { row: m, col: f } = h(l.startRow, l.startColumn), { row: p, col: w } = h(g.startRow, g.startColumn), S = u.attachRangeWithCoord({
       startRow: m,
       endRow: m,
-      startColumn: p,
-      endColumn: p
+      startColumn: f,
+      endColumn: f
     }), I = u.attachRangeWithCoord({
-      startRow: f,
-      endRow: f,
+      startRow: p,
+      endRow: p,
       startColumn: w,
       endColumn: w
     });
-    if (!_ || !I || !this._copyInfo)
+    if (!S || !I || !this._copyInfo)
       return { redos: [], undos: [] };
-    const R = I.startX - _.startX, v = I.startY - _.startY, C = f - m, S = w - p;
+    const D = I.startX - S.startX, v = I.startY - S.startY, C = p - m, _ = w - f;
     return this._generateMutations(c, {
       unitId: n,
       subUnitId: r,
-      getTransform: (D, E) => {
+      getTransform: (R, E) => {
         var T, M;
         return {
           transform: {
-            ...D,
-            left: ((T = D == null ? void 0 : D.left) != null ? T : 0) + R,
-            top: ((M = D == null ? void 0 : D.top) != null ? M : 0) + v
+            ...R,
+            left: ((T = R == null ? void 0 : R.left) != null ? T : 0) + D,
+            top: ((M = R == null ? void 0 : R.top) != null ? M : 0) + v
           },
           sheetTransform: {
             ...E,
             to: {
               ...E.to,
               row: E.to.row + C,
-              column: E.to.column + S
+              column: E.to.column + _
             },
             from: {
               ...E.from,
               row: E.from.row + C,
-              column: E.from.column + S
+              column: E.from.column + _
             }
           }
         };
@@ -1737,19 +1737,19 @@ let Wt = class extends te {
     });
   }
 };
-Wt = Js([
-  rt(0, ci),
+Bt = Js([
+  rt(0, di),
   rt(1, ee),
   rt(2, ae),
   rt(3, ds),
   rt(4, G)
-], Wt);
+], Bt);
 var eo = Object.getOwnPropertyDescriptor, to = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? eo(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, it = (i, t) => (e, n) => t(e, n, i);
-let Bt = class extends te {
+let jt = class extends te {
   constructor(i, t, e, n, r) {
     super(), this._drawingManagerService = i, this._renderManagerService = t, this._permissionService = e, this._univerInstanceService = n, this._userManagerService = r, this._initDrawingVisible(), this._initDrawingEditable(), this._initViewPermissionChange(), this._initEditPermissionChange();
   }
@@ -1757,16 +1757,16 @@ let Bt = class extends te {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(k.UNIVER_SHEET), t = this._userManagerService.currentUser$, e = at([i, t]);
     this.disposeWithMe(
       e.pipe(
-        pe(([n, r]) => n ? n.activeSheet$.pipe(
-          tr((s) => {
+        fe(([n, r]) => n ? n.activeSheet$.pipe(
+          er((s) => {
             if (!s) {
               this._drawingManagerService.setDrawingVisible(!1);
               return;
             }
             const o = n.getUnitId(), a = s.getSheetId();
             this._permissionService.composePermission([
-              new Vn(o).id,
-              new Gn(o, a).id
+              new Hn(o).id,
+              new Vn(o, a).id
             ]).every((u) => u.value) ? this._drawingManagerService.setDrawingVisible(!0) : this._handleDrawingVisibilityFalse(n, s);
           })
         ) : (this._drawingManagerService.setDrawingVisible(!1), _e))
@@ -1786,16 +1786,16 @@ let Bt = class extends te {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(k.UNIVER_SHEET), t = this._userManagerService.currentUser$, e = at([i, t]);
     this.disposeWithMe(
       e.pipe(
-        pe(([n, r]) => n ? n.activeSheet$.pipe(
-          tr((s) => {
+        fe(([n, r]) => n ? n.activeSheet$.pipe(
+          er((s) => {
             if (!s) {
               this._drawingManagerService.setDrawingEditable(!1);
               return;
             }
             const o = n.getUnitId(), a = s.getSheetId();
             this._permissionService.composePermission([
-              new mn(o).id,
-              new fn(o, a).id
+              new gn(o).id,
+              new mn(o, a).id
             ]).every((u) => u.value) ? this._drawingManagerService.setDrawingEditable(!0) : this._handleDrawingEditableFalse(n, s);
           })
         ) : (this._drawingManagerService.setDrawingEditable(!1), _e))
@@ -1815,8 +1815,8 @@ let Bt = class extends te {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(k.UNIVER_SHEET), t = this._userManagerService.currentUser$;
     this.disposeWithMe(
       at([i, t]).pipe(
-        pe(([e, n]) => e ? e.activeSheet$.pipe(
-          pe((r) => {
+        fe(([e, n]) => e ? e.activeSheet$.pipe(
+          fe((r) => {
             if (!r)
               return _e;
             const s = e.getUnitId(), o = r.getSheetId(), a = this._renderManagerService.getRenderById(s), d = a == null ? void 0 : a.scene;
@@ -1824,13 +1824,13 @@ let Bt = class extends te {
               return _e;
             const u = d.getTransformerByCreate();
             return this._permissionService.composePermission$([
-              new Vn(s).id,
-              new Gn(s, o).id
+              new Hn(s).id,
+              new Vn(s, o).id
             ]).pipe(
-              we((l) => l.every((g) => g.value)),
-              nr()
+              pe((l) => l.every((g) => g.value)),
+              tr()
             ).pipe(
-              we((l) => ({
+              pe((l) => ({
                 permission: l,
                 scene: d,
                 transformer: u,
@@ -1863,8 +1863,8 @@ let Bt = class extends te {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(k.UNIVER_SHEET), t = this._userManagerService.currentUser$;
     this.disposeWithMe(
       at([i, t]).pipe(
-        pe(([e, n]) => e ? e.activeSheet$.pipe(
-          pe((r) => {
+        fe(([e, n]) => e ? e.activeSheet$.pipe(
+          fe((r) => {
             if (!r)
               return _e;
             const s = e.getUnitId(), o = r.getSheetId(), a = this._renderManagerService.getRenderById(s), d = a == null ? void 0 : a.scene;
@@ -1872,13 +1872,13 @@ let Bt = class extends te {
               return _e;
             const u = d.getTransformerByCreate();
             return this._permissionService.composePermission$([
-              new mn(s).id,
-              new fn(s, o).id
+              new gn(s).id,
+              new mn(s, o).id
             ]).pipe(
-              we((l) => l.every((g) => g.value)),
-              nr()
+              pe((l) => l.every((g) => g.value)),
+              tr()
             ).pipe(
-              we((l) => ({
+              pe((l) => ({
                 permission: l,
                 scene: d,
                 transformer: u,
@@ -1917,20 +1917,20 @@ let Bt = class extends te {
     );
   }
 };
-Bt = to([
+jt = to([
   it(0, ae),
   it(1, ee),
   it(2, Si),
-  it(3, le),
+  it(3, de),
   it(4, A(vi))
-], Bt);
+], jt);
 var no = Object.getOwnPropertyDescriptor, ro = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? no(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, be = (i, t) => (e, n) => t(e, n, i);
 const io = "univer-sheet-float-dom-";
-function Vr(i, t, e, n, r, s = !1) {
+function Gr(i, t, e, n, r, s = !1) {
   const { scaleX: o, scaleY: a } = t.getAncestorScale(), d = t.getViewport(cr.VIEW_MAIN), u = n.getFreeze(), { startColumn: c, startRow: l, xSplit: g, ySplit: h } = u, m = {
     left: !0,
     // left means the left of pic is in a viewMainLeft
@@ -1941,27 +1941,27 @@ function Vr(i, t, e, n, r, s = !1) {
       ...i,
       absolute: m
     };
-  const { left: p, right: f, top: w, bottom: _ } = i;
-  let { top: I, left: R, viewportScrollX: v, viewportScrollY: C } = d;
-  const { boundsOfViewArea: S, scrollDirectionResponse: y } = r || {}, { rowHeaderWidth: D, columnHeaderHeight: E } = e, T = {
+  const { left: f, right: p, top: w, bottom: S } = i;
+  let { top: I, left: D, viewportScrollX: v, viewportScrollY: C } = d;
+  const { boundsOfViewArea: _, scrollDirectionResponse: y } = r || {}, { rowHeaderWidth: R, columnHeaderHeight: E } = e, T = {
     top: s ? 0 : E,
-    left: s ? 0 : D
+    left: s ? 0 : R
   };
-  S && (Ge.isDefine(T.top) && (T.top = S.top), Ge.isDefine(T.left) && (T.left = S.left)), y === "HORIZONTAL" && (C = 0), y === "VERTICAL" && (v = 0);
+  _ && (Ge.isDefine(T.top) && (T.top = _.top), Ge.isDefine(T.left) && (T.left = _.left)), y === "HORIZONTAL" && (C = 0), y === "VERTICAL" && (v = 0);
   let M = 0, b = 0;
-  const N = e.rowStartY(l - h) + E, F = e.colStartX(c - g) + D, ne = e.rowStartY(l) + E, z = e.colStartX(c) + D;
+  const N = e.rowStartY(l - h) + E, F = e.colStartX(c - g) + R, ne = e.rowStartY(l) + E, z = e.colStartX(c) + R;
   if (g === 0)
-    m.left = !1, M = (p - v) * o, b = (f - v) * o;
+    m.left = !1, M = (f - v) * o, b = (p - v) * o;
   else {
-    const K = p - (F - D), W = f - (F - D);
-    f < z ? (M = K * o, b = W * o) : p <= z && f >= z ? (M = K * o, b = Math.max(R, (f - v) * o)) : p > z && (m.left = !1, M = Math.max((p - v) * o, R), b = Math.max((f - v) * o, R));
+    const K = f - (F - R), W = p - (F - R);
+    p < z ? (M = K * o, b = W * o) : f <= z && p >= z ? (M = K * o, b = Math.max(D, (p - v) * o)) : f > z && (m.left = !1, M = Math.max((f - v) * o, D), b = Math.max((p - v) * o, D));
   }
   let V = 0, Y = 0;
   if (h === 0)
-    m.top = !1, V = (w - C) * a, Y = (_ - C) * a;
+    m.top = !1, V = (w - C) * a, Y = (S - C) * a;
   else {
-    const K = w - (N - E), W = _ - (N - E);
-    _ < ne ? (V = K * a, Y = W * a) : w <= ne && _ >= ne ? (V = K * a, Y = Math.max(I, (_ - C) * a)) : w > ne && (m.top = !1, V = Math.max((w - C) * a, I), Y = Math.max((_ - C) * a, I));
+    const K = w - (N - E), W = S - (N - E);
+    S < ne ? (V = K * a, Y = W * a) : w <= ne && S >= ne ? (V = K * a, Y = Math.max(I, (S - C) * a)) : w > ne && (m.top = !1, V = Math.max((w - C) * a, I), Y = Math.max((S - C) * a, I));
   }
   return M = Math.max(M, T.left), V = Math.max(V, T.top), b = Math.max(b, T.left), Y = Math.max(Y, T.top), {
     left: M,
@@ -1971,13 +1971,13 @@ function Vr(i, t, e, n, r, s = !1) {
     absolute: m
   };
 }
-const fe = (i, t, e, n, r) => {
+const me = (i, t, e, n, r) => {
   const { left: s, top: o, width: a, height: d, angle: u } = i, c = {
     left: s,
     right: s + a,
     top: o,
     bottom: o + d
-  }, l = Vr(c, t, e, n, r), { scaleX: g, scaleY: h } = t.getAncestorScale();
+  }, l = Gr(c, t, e, n, r), { scaleX: g, scaleY: h } = t.getAncestorScale();
   return {
     startX: l.left,
     endX: l.right,
@@ -1995,13 +1995,13 @@ let lt = class extends te {
     /**
      * for update dom container position when scrolling and zoom
      */
-    Q(this, "_domLayerInfoMap", /* @__PURE__ */ new Map());
-    Q(this, "_transformChange$", new on());
-    Q(this, "transformChange$", this._transformChange$.asObservable());
-    Q(this, "_add$", new on());
-    Q(this, "add$", this._add$.asObservable());
-    Q(this, "_remove$", new on());
-    Q(this, "remove$", this._remove$.asObservable());
+    ie(this, "_domLayerInfoMap", /* @__PURE__ */ new Map());
+    ie(this, "_transformChange$", new an());
+    ie(this, "transformChange$", this._transformChange$.asObservable());
+    ie(this, "_add$", new an());
+    ie(this, "add$", this._add$.asObservable());
+    ie(this, "_remove$", new an());
+    ie(this, "remove$", this._remove$.asObservable());
     this._renderManagerService = t, this._univerInstanceService = e, this._commandService = n, this._drawingManagerService = r, this._canvasFloatDomService = s, this._sheetDrawingService = o, this._lifecycleService = a, this._drawingAddListener(), this._featureUpdateListener(), this._deleteListener(), this._bindScrollEvent();
   }
   _bindScrollEvent() {
@@ -2046,21 +2046,21 @@ let lt = class extends te {
           const m = this._getSceneAndTransformerByDrawingSearch(n);
           if (m == null)
             return;
-          const { scene: p, canvas: f } = m;
+          const { scene: f, canvas: p } = m;
           if (l == null)
             return !0;
           if (u !== r)
             return;
-          const { left: w, top: _, width: I, height: R, angle: v, flipX: C, flipY: S, skewX: y, skewY: D } = l, E = De({ unitId: n, subUnitId: r, drawingId: s }), T = p.getObject(E);
+          const { left: w, top: S, width: I, height: D, angle: v, flipX: C, flipY: _, skewX: y, skewY: R } = l, E = De({ unitId: n, subUnitId: r, drawingId: s }), T = f.getObject(E);
           if (T != null) {
-            T.transformByState({ left: w, top: _, width: I, height: R, angle: v, flipX: C, flipY: S, skewX: y, skewY: D });
+            T.transformByState({ left: w, top: S, width: I, height: D, angle: v, flipX: C, flipY: _, skewX: y, skewY: R });
             return;
           }
           const M = {
             left: w,
-            top: _,
+            top: S,
             width: I,
-            height: R,
+            height: D,
             zIndex: this._drawingManagerService.getDrawingOrder(n, r).length - 1
           }, b = g === x.DRAWING_CHART;
           if (M.rotateEnabled = !1, b) {
@@ -2068,8 +2068,8 @@ let lt = class extends te {
             M.fill = W, h && h.border && (M.stroke = h.border), M.paintFirst = "stroke", M.strokeWidth = 1, M.borderEnabled = !1, M.radius = 8;
           }
           const N = new $e(E, M);
-          b && N.setObjectType(Nn.CHART), p.addObject(N, qt), a.allowTransform !== !1 && p.attachTransformerTo(N);
-          const F = new yt(), ne = fe(N, m.renderUnit.scene, c.skeleton, o.worksheet), z = new je(ne), V = `${io}${He(6)}`, Y = {
+          b && N.setObjectType(An.CHART), f.addObject(N, Qt), a.allowTransform !== !1 && f.attachTransformerTo(N);
+          const F = new yt(), ne = me(N, m.renderUnit.scene, c.skeleton, o.worksheet), z = new je(ne), V = `${io}${He(6)}`, Y = {
             dispose: F,
             rect: N,
             position$: z,
@@ -2084,22 +2084,22 @@ let lt = class extends te {
             domId: V,
             componentKey: a.componentKey,
             onPointerDown: (W) => {
-              f.dispatchEvent(new PointerEvent(W.type, W));
+              p.dispatchEvent(new PointerEvent(W.type, W));
             },
             onPointerMove: (W) => {
-              f.dispatchEvent(new PointerEvent(W.type, W));
+              p.dispatchEvent(new PointerEvent(W.type, W));
             },
             onPointerUp: (W) => {
-              f.dispatchEvent(new PointerEvent(W.type, W));
+              p.dispatchEvent(new PointerEvent(W.type, W));
             },
             onWheel: (W) => {
-              f.dispatchEvent(new WheelEvent(W.type, W));
+              p.dispatchEvent(new WheelEvent(W.type, W));
             },
             data: h,
             unitId: n
           });
           const Z = N.onTransformChange$.subscribeEvent(() => {
-            const W = fe(N, m.renderUnit.scene, c.skeleton, o.worksheet);
+            const W = me(N, m.renderUnit.scene, c.skeleton, o.worksheet);
             z.next(
               W
             );
@@ -2129,21 +2129,21 @@ let lt = class extends te {
       !r || !o || !a || s.forEach((u) => {
         const c = this._domLayerInfoMap.get(u);
         if (c) {
-          const l = fe(c.rect, r.renderUnit.scene, a.skeleton, o.worksheet, c);
+          const l = me(c.rect, r.renderUnit.scene, a.skeleton, o.worksheet, c);
           c.position$.next(l);
         }
       });
     };
     this.disposeWithMe(
       this._univerInstanceService.getCurrentTypeOfUnit$(k.UNIVER_SHEET).pipe(
-        pe((e) => e ? e.activeSheet$ : _n(null)),
-        we((e) => {
+        fe((e) => e ? e.activeSheet$ : wn(null)),
+        pe((e) => {
           if (!e) return null;
           const n = e.getUnitId(), r = this._renderManagerService.getRenderById(n);
           return r ? { render: r, unitId: n, subUnitId: e.getSheetId() } : null;
         }),
-        pe(
-          (e) => e ? Ri(e.render.scene.getViewport(cr.VIEW_MAIN).onScrollAfter$).pipe(we(() => ({ unitId: e.unitId, subUnitId: e.subUnitId }))) : _n(null)
+        fe(
+          (e) => e ? Ri(e.render.scene.getViewport(cr.VIEW_MAIN).onScrollAfter$).pipe(pe(() => ({ unitId: e.unitId, subUnitId: e.subUnitId }))) : wn(null)
         )
       ).subscribe((e) => {
         if (!e) return;
@@ -2151,7 +2151,7 @@ let lt = class extends te {
         t(n, r);
       })
     ), this.disposeWithMe(this._commandService.onCommandExecuted((e) => {
-      if (e.id === xn.id) {
+      if (e.id === $n.id) {
         const n = e.params, { unitId: r } = n;
         Array.from(this._domLayerInfoMap.values()).filter((o) => o.unitId === r).map((o) => o.subUnitId).forEach((o) => {
           t(r, o);
@@ -2257,7 +2257,7 @@ let lt = class extends te {
       data: d,
       allowTransform: u
     };
-    return this._commandService.executeCommand(Xt.id, {
+    return this._commandService.executeCommand(zt.id, {
       unitId: r,
       drawings: [g]
     }), this._add$.next({ unitId: r, subUnitId: s, id: c }), {
@@ -2284,7 +2284,7 @@ let lt = class extends te {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   addFloatDomToRange(t, e, n, r) {
-    var C, S, y;
+    var C, _, y;
     const s = se(this._univerInstanceService, {
       unitId: e.unitId,
       subUnitId: e.subUnitId
@@ -2297,32 +2297,32 @@ let lt = class extends te {
     if (!u) return;
     const c = (C = this._renderManagerService.getRenderById(o)) == null ? void 0 : C.with(X).getWorksheetSkeleton(a);
     if (!c) return;
-    const { componentKey: l, data: g, allowTransform: h = !0 } = e, m = r != null ? r : He(), { position: p, position$: f } = this._createRangePositionObserver(t, u, c.skeleton);
-    if (this._getPosition(p, o) == null)
+    const { componentKey: l, data: g, allowTransform: h = !0 } = e, m = r != null ? r : He(), { position: f, position$: p } = this._createRangePositionObserver(t, u, c.skeleton);
+    if (this._getPosition(f, o) == null)
       return;
-    const _ = d.scene, { scaleX: I } = _.getAncestorScale(), R = Ut(p, n, I), v = {
+    const S = d.scene, { scaleX: I } = S.getAncestorScale(), D = Pt(f, n, I), v = {
       unitId: o,
       subUnitId: a,
       drawingId: m,
       drawingType: e.type || x.DRAWING_DOM,
       componentKey: l,
       transform: {
-        left: R.startX,
-        top: R.startY,
-        width: R.width,
-        height: R.height
+        left: D.startX,
+        top: D.startY,
+        width: D.width,
+        height: D.height
       },
       data: g,
       allowTransform: h
     };
     {
-      const { unitId: D, subUnitId: E, drawingId: T } = v, M = se(this._univerInstanceService, { unitId: D, subUnitId: E }), b = v, N = this._univerInstanceService.getUnit(D, k.UNIVER_SHEET);
+      const { unitId: R, subUnitId: E, drawingId: T } = v, M = se(this._univerInstanceService, { unitId: R, subUnitId: E }), b = v, N = this._univerInstanceService.getUnit(R, k.UNIVER_SHEET);
       if (!N)
         return;
       const F = N.getActiveSheet().getSheetId();
       if (!b || !M)
         return;
-      const ne = (S = this._renderManagerService.getRenderById(D)) == null ? void 0 : S.with(X);
+      const ne = (_ = this._renderManagerService.getRenderById(R)) == null ? void 0 : _.with(X);
       if (!ne)
         return;
       const z = ne.getWorksheetSkeleton(E);
@@ -2331,15 +2331,15 @@ let lt = class extends te {
       const { transform: V, drawingType: Y, data: Z } = b;
       if (Y !== x.DRAWING_DOM && Y !== x.DRAWING_CHART)
         return;
-      const K = this._getSceneAndTransformerByDrawingSearch(D);
+      const K = this._getSceneAndTransformerByDrawingSearch(R);
       if (K == null)
         return;
       const { scene: W, canvas: Oe } = K;
       if (V == null || F !== E)
         return;
-      const { left: ft, top: pt, width: wt, height: _t, angle: Jt, flipX: Zt, flipY: St, skewX: vt, skewY: Ue } = V, It = De({ unitId: D, subUnitId: E, drawingId: T }), ue = W.getObject(It);
-      if (ue != null) {
-        ue.transformByState({ left: ft, top: pt, width: wt, height: _t, angle: Jt, flipX: Zt, flipY: St, skewX: vt, skewY: Ue });
+      const { left: ft, top: pt, width: wt, height: _t, angle: Zt, flipX: qt, flipY: St, skewX: vt, skewY: Ue } = V, It = De({ unitId: R, subUnitId: E, drawingId: T }), le = W.getObject(It);
+      if (le != null) {
+        le.transformByState({ left: ft, top: pt, width: wt, height: _t, angle: Zt, flipX: qt, flipY: St, skewX: vt, skewY: Ue });
         return;
       }
       const re = {
@@ -2348,28 +2348,28 @@ let lt = class extends te {
         top: pt,
         width: wt,
         height: _t,
-        zIndex: this._drawingManagerService.getDrawingOrder(D, E).length - 1
+        zIndex: this._drawingManagerService.getDrawingOrder(R, E).length - 1
       }, Pe = Y === x.DRAWING_CHART;
       if (Pe) {
         const $ = Z ? Z.backgroundColor : "white";
         re.fill = $, re.rotateEnabled = !1, Z && Z.border && (re.stroke = Z.border), re.paintFirst = "stroke", re.strokeWidth = 1, re.borderEnabled = !1, re.radius = 8;
       }
-      const he = new $e(It, re);
-      Pe && he.setObjectType(Nn.CHART), W.addObject(he, qt), b.allowTransform !== !1 && W.attachTransformerTo(he);
-      const ge = new yt(), Ct = W.getMainViewport(), { rowHeaderWidth: Ae, columnHeaderHeight: Qe } = z.skeleton, Rt = {
+      const ue = new $e(It, re);
+      Pe && ue.setObjectType(An.CHART), W.addObject(ue, Qt), b.allowTransform !== !1 && W.attachTransformerTo(ue);
+      const he = new yt(), Ct = W.getMainViewport(), { rowHeaderWidth: Ae, columnHeaderHeight: Qe } = z.skeleton, Rt = {
         top: Qe,
         left: Ae,
         bottom: Ct.bottom,
         right: Ct.right
-      }, me = {
-        dispose: ge,
-        rect: he,
+      }, ge = {
+        dispose: he,
+        rect: ue,
         boundsOfViewArea: Rt,
         domAnchor: n,
-        unitId: D,
+        unitId: R,
         subUnitId: E
-      }, B = fe(he, K.renderUnit.scene, z.skeleton, M.worksheet, me), Ne = new je(B);
-      me.position$ = Ne;
+      }, B = me(ue, K.renderUnit.scene, z.skeleton, M.worksheet, ge), Ne = new je(B);
+      ge.position$ = Ne;
       let et = {
         position$: Ne,
         id: T,
@@ -2384,7 +2384,7 @@ let lt = class extends te {
           Oe.dispatchEvent(new WheelEvent($.type, $));
         },
         data: Z,
-        unitId: D
+        unitId: R
       };
       e.eventPassThrough && (et = {
         ...et,
@@ -2397,41 +2397,41 @@ let lt = class extends te {
         onPointerUp: ($) => {
           Oe.dispatchEvent(new PointerEvent($.type, $));
         }
-      }), this._canvasFloatDomService.addFloatDom(et), this.disposeWithMe(f.subscribe(($) => {
-        var On, Un, Pn, An;
-        const Tn = Ut({
+      }), this._canvasFloatDomService.addFloatDom(et), this.disposeWithMe(p.subscribe(($) => {
+        var Tn, On, Un, Pn;
+        const En = Pt({
           startX: $.startX,
           startY: $.startY,
           endX: $.endX,
           endY: $.endY,
-          width: (On = n.width) != null ? On : $.width,
-          height: (Un = n.height) != null ? Un : $.height,
+          width: (Tn = n.width) != null ? Tn : $.width,
+          height: (On = n.height) != null ? On : $.height,
           absolute: {
-            left: p.absolute.left,
-            top: p.absolute.top
+            left: f.absolute.left,
+            top: f.absolute.top
           }
-        }, n), Xr = De({ unitId: D, subUnitId: E, drawingId: T }), zr = new $e(Xr, {
-          left: Tn.startX,
-          top: Tn.startY,
-          width: (Pn = n.width) != null ? Pn : $.width,
-          height: (An = n.height) != null ? An : $.height,
-          zIndex: this._drawingManagerService.getDrawingOrder(D, E).length - 1
-        }), Kr = fe(zr, K.renderUnit.scene, z.skeleton, M.worksheet, me);
-        Ne.next(Kr);
+        }, n), zr = De({ unitId: R, subUnitId: E, drawingId: T }), Kr = new $e(zr, {
+          left: En.startX,
+          top: En.startY,
+          width: (Un = n.width) != null ? Un : $.width,
+          height: (Pn = n.height) != null ? Pn : $.height,
+          zIndex: this._drawingManagerService.getDrawingOrder(R, E).length - 1
+        }), Jr = me(Kr, K.renderUnit.scene, z.skeleton, M.worksheet, ge);
+        Ne.next(Jr);
       }));
-      const tt = (y = this._renderManagerService.getRenderById(D)) == null ? void 0 : y.with(X);
+      const tt = (y = this._renderManagerService.getRenderById(R)) == null ? void 0 : y.with(X);
       tt == null || tt.currentSkeleton$.subscribe(($) => {
         $ && z.sheetId !== $.sheetId && this._removeDom(m, !0);
       });
-      const Dt = he.onTransformChange$.subscribeEvent(() => {
-        const $ = fe(he, K.renderUnit.scene, z.skeleton, M.worksheet, me);
+      const Dt = ue.onTransformChange$.subscribeEvent(() => {
+        const $ = me(ue, K.renderUnit.scene, z.skeleton, M.worksheet, ge);
         Ne.next(
           $
         );
       });
-      ge.add(() => {
+      he.add(() => {
         this._canvasFloatDomService.removeFloatDom(T);
-      }), Dt && ge.add(Dt), this._domLayerInfoMap.set(T, me);
+      }), Dt && he.add(Dt), this._domLayerInfoMap.set(T, ge);
     }
     return {
       id: m,
@@ -2442,7 +2442,7 @@ let lt = class extends te {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   addFloatDomToColumnHeader(t, e, n, r) {
-    var R, v, C;
+    var D, v, C;
     const s = se(this._univerInstanceService, {
       unitId: e.unitId,
       subUnitId: e.subUnitId
@@ -2453,15 +2453,15 @@ let lt = class extends te {
     if (!this._getSceneAndTransformerByDrawingSearch(o)) return;
     const u = this._renderManagerService.getRenderById(o);
     if (!u) return;
-    const c = (R = this._renderManagerService.getRenderById(o)) == null ? void 0 : R.with(X).getWorksheetSkeleton(a);
+    const c = (D = this._renderManagerService.getRenderById(o)) == null ? void 0 : D.with(X).getWorksheetSkeleton(a);
     if (!c) return;
-    const { componentKey: l, data: g, allowTransform: h = !0 } = e, m = r != null ? r : He(), { position: p, position$: f } = this._createRangePositionObserver({
+    const { componentKey: l, data: g, allowTransform: h = !0 } = e, m = r != null ? r : He(), { position: f, position$: p } = this._createRangePositionObserver({
       startRow: 0,
       endRow: 0,
       startColumn: t,
       endColumn: t
-    }, u, c.skeleton), w = p;
-    if (w.startY = 0, this._getPosition(p, o) == null)
+    }, u, c.skeleton), w = f;
+    if (w.startY = 0, this._getPosition(f, o) == null)
       return;
     const I = {
       unitId: o,
@@ -2479,69 +2479,69 @@ let lt = class extends te {
       allowTransform: h
     };
     {
-      const { unitId: S, subUnitId: y, drawingId: D } = I, E = se(this._univerInstanceService, { unitId: S, subUnitId: y }), T = I, M = this._univerInstanceService.getUnit(S, k.UNIVER_SHEET);
+      const { unitId: _, subUnitId: y, drawingId: R } = I, E = se(this._univerInstanceService, { unitId: _, subUnitId: y }), T = I, M = this._univerInstanceService.getUnit(_, k.UNIVER_SHEET);
       if (!M)
         return;
       const b = M.getActiveSheet().getSheetId();
       if (!T || !E)
         return;
-      const N = (v = this._renderManagerService.getRenderById(S)) == null ? void 0 : v.with(X);
+      const N = (v = this._renderManagerService.getRenderById(_)) == null ? void 0 : v.with(X);
       if (!N)
         return;
       const F = N.getWorksheetSkeleton(y);
       if (!F)
         return;
-      const { transform: ne, data: z } = T, V = this._getSceneAndTransformerByDrawingSearch(S);
+      const { transform: ne, data: z } = T, V = this._getSceneAndTransformerByDrawingSearch(_);
       if (V == null)
         return;
       const { scene: Y, canvas: Z } = V;
       if (ne == null || b !== y)
         return;
-      const { left: K, top: W, width: Oe, height: ft, angle: pt, flipX: wt, flipY: _t, skewX: Jt, skewY: Zt } = ne, St = De({ unitId: S, subUnitId: y, drawingId: D }), vt = Y.getObject(St);
+      const { left: K, top: W, width: Oe, height: ft, angle: pt, flipX: wt, flipY: _t, skewX: Zt, skewY: qt } = ne, St = De({ unitId: _, subUnitId: y, drawingId: R }), vt = Y.getObject(St);
       if (vt != null) {
-        vt.transformByState({ left: K, top: W, width: Oe, height: ft, angle: pt, flipX: wt, flipY: _t, skewX: Jt, skewY: Zt });
+        vt.transformByState({ left: K, top: W, width: Oe, height: ft, angle: pt, flipX: wt, flipY: _t, skewX: Zt, skewY: qt });
         return;
       }
-      const Ue = Ut({
+      const Ue = Pt({
         startX: w.startX,
         startY: 0,
-        endX: p.endX,
-        endY: p.endY,
+        endX: f.endX,
+        endY: f.endY,
         width: n.width,
         height: n.height,
         absolute: {
-          left: p.absolute.left,
-          top: p.absolute.top
+          left: f.absolute.left,
+          top: f.absolute.top
         }
       }, n), It = {
         left: Ue.startX,
         top: Ue.startY,
         width: Ue.width,
         height: Ue.height,
-        zIndex: this._drawingManagerService.getDrawingOrder(S, y).length - 1
-      }, ue = new $e(St, It);
-      Y.addObject(ue, qt), T.allowTransform !== !1 && Y.attachTransformerTo(ue);
-      const re = new yt(), Pe = Y.getMainViewport(), he = {
+        zIndex: this._drawingManagerService.getDrawingOrder(_, y).length - 1
+      }, le = new $e(St, It);
+      Y.addObject(le, Qt), T.allowTransform !== !1 && Y.attachTransformerTo(le);
+      const re = new yt(), Pe = Y.getMainViewport(), ue = {
         top: 0,
         //viewMain.top,
         left: Pe.left,
         bottom: Pe.bottom,
         right: Pe.right
-      }, ge = {
+      }, he = {
         dispose: re,
-        rect: ue,
+        rect: le,
         // position$,
-        unitId: S,
+        unitId: _,
         subUnitId: y,
-        boundsOfViewArea: he,
+        boundsOfViewArea: ue,
         domAnchor: n,
         scrollDirectionResponse: "HORIZONTAL"
         /* HORIZONTAL */
-      }, Ct = fe(ue, V.renderUnit.scene, F.skeleton, E.worksheet, ge), Ae = new je(Ct);
-      ge.position$ = Ae;
+      }, Ct = me(le, V.renderUnit.scene, F.skeleton, E.worksheet, he), Ae = new je(Ct);
+      he.position$ = Ae;
       let Qe = {
         position$: Ae,
-        id: D,
+        id: R,
         componentKey: T.componentKey,
         onPointerDown: () => {
         },
@@ -2553,7 +2553,7 @@ let lt = class extends te {
           Z.dispatchEvent(new WheelEvent(B.type, B));
         },
         data: z,
-        unitId: S
+        unitId: _
       };
       e.eventPassThrough && (Qe = {
         ...Qe,
@@ -2567,14 +2567,14 @@ let lt = class extends te {
           Z.dispatchEvent(new PointerEvent(B.type, B));
         }
       }), this._canvasFloatDomService.addFloatDom(Qe);
-      const Rt = ue.onTransformChange$.subscribeEvent(() => {
-        const B = fe(ue, V.renderUnit.scene, F.skeleton, E.worksheet, ge);
+      const Rt = le.onTransformChange$.subscribeEvent(() => {
+        const B = me(le, V.renderUnit.scene, F.skeleton, E.worksheet, he);
         Ae.next(
           B
         );
       });
-      this.disposeWithMe(f.subscribe((B) => {
-        const Ne = Ut({
+      this.disposeWithMe(p.subscribe((B) => {
+        const Ne = Pt({
           startX: B.startX,
           startY: 0,
           endX: B.endX,
@@ -2582,24 +2582,24 @@ let lt = class extends te {
           width: n.width,
           height: n.height,
           absolute: {
-            left: p.absolute.left,
-            top: p.absolute.top
+            left: f.absolute.left,
+            top: f.absolute.top
           }
-        }, n), et = De({ unitId: S, subUnitId: y, drawingId: D }), tt = new $e(et, {
+        }, n), et = De({ unitId: _, subUnitId: y, drawingId: R }), tt = new $e(et, {
           left: Ne.startX,
           top: 0,
           width: n.width,
           height: n.height,
-          zIndex: this._drawingManagerService.getDrawingOrder(S, y).length - 1
-        }), Dt = fe(tt, V.renderUnit.scene, F.skeleton, E.worksheet, ge);
+          zIndex: this._drawingManagerService.getDrawingOrder(_, y).length - 1
+        }), Dt = me(tt, V.renderUnit.scene, F.skeleton, E.worksheet, he);
         Ae.next(Dt);
       }));
-      const me = (C = this._renderManagerService.getRenderById(S)) == null ? void 0 : C.with(X);
-      me == null || me.currentSkeleton$.subscribe((B) => {
+      const ge = (C = this._renderManagerService.getRenderById(_)) == null ? void 0 : C.with(X);
+      ge == null || ge.currentSkeleton$.subscribe((B) => {
         B && c.sheetId !== B.sheetId && this._removeDom(m, !0);
       }), re.add(() => {
-        this._canvasFloatDomService.removeFloatDom(D);
-      }), Rt && re.add(Rt), this._domLayerInfoMap.set(D, ge);
+        this._canvasFloatDomService.removeFloatDom(R);
+      }), Rt && re.add(Rt), this._domLayerInfoMap.set(R, he);
     }
     return {
       id: m,
@@ -2622,18 +2622,18 @@ let lt = class extends te {
   _createRangePositionObserver(t, e, n) {
     let { startRow: r, startColumn: s } = t;
     const o = st(r, s, n), a = new je(o), d = st(t.endRow, t.endColumn, n), u = new je(d), c = () => {
-      const f = st(r, s, n), w = st(t.endRow, t.endColumn, n);
-      a.next(f), u.next(w);
+      const p = st(r, s, n), w = st(t.endRow, t.endColumn, n);
+      a.next(p), u.next(w);
     }, l = new yt();
-    l.add(e.engine.clientRect$.subscribe(() => c())), l.add(this._commandService.onCommandExecuted((f) => {
-      if (f.id === gr.id && f.params.rowsAutoHeightInfo.findIndex((_) => _.row === r) > -1) {
+    l.add(e.engine.clientRect$.subscribe(() => c())), l.add(this._commandService.onCommandExecuted((p) => {
+      if (p.id === mr.id && p.params.rowsAutoHeightInfo.findIndex((S) => S.row === r) > -1) {
         c();
         return;
       }
-      (ji.indexOf(f.id) > -1 || f.id === di.id || f.id === xn.id) && c();
+      (ji.indexOf(p.id) > -1 || p.id === li.id || p.id === $n.id) && c();
     }));
-    const g = (f, w) => {
-      r = f, s = w, c();
+    const g = (p, w) => {
+      r = p, s = w, c();
     }, h = () => ({
       rotate: 0,
       width: d.right - o.left,
@@ -2647,26 +2647,26 @@ let lt = class extends te {
       endX: d.right,
       endY: d.bottom
     }), m = a.pipe(
-      we((f) => {
+      pe((p) => {
         const w = st(t.endRow, t.endColumn, n);
         return {
           rotate: 0,
-          width: w.right - f.left,
-          height: w.bottom - f.top,
+          width: w.right - p.left,
+          height: w.bottom - p.top,
           absolute: {
             left: !0,
             top: !0
           },
-          startX: f.left,
-          startY: f.top,
+          startX: p.left,
+          startY: p.top,
           endX: w.right,
           endY: w.bottom
         };
       })
-    ), p = h();
+    ), f = h();
     return {
       position$: m,
-      position: p,
+      position: f,
       updateRowCol: g,
       topLeftPos$: a,
       rightBottomPos$: u,
@@ -2676,7 +2676,7 @@ let lt = class extends te {
 };
 lt = ro([
   be(0, A(ee)),
-  be(1, le),
+  be(1, de),
   be(2, A(G)),
   be(3, ae),
   be(4, A(ls)),
@@ -2692,22 +2692,22 @@ function st(i, t, e) {
     bottom: r.endY
   };
 }
-function Ut(i, t, e) {
+function Pt(i, t, e) {
   var u, c;
   e = e != null ? e : 1;
   const n = i.endX - i.startX, r = i.endY - i.startY, s = (u = t == null ? void 0 : t.width) != null ? u : n, o = (c = t == null ? void 0 : t.height) != null ? c : r;
   let a = 0, d = 0;
   if (t) {
     if (t.horizonOffsetAlign === "right") {
-      const l = Pt(t.marginX, n * e);
+      const l = At(t.marginX, n * e);
       a = i.endX - l - s;
     } else
-      a = i.startX + Pt(t.marginX, n);
+      a = i.startX + At(t.marginX, n);
     if (t.verticalOffsetAlign === "bottom") {
-      const l = Pt(t.marginY, r * e);
+      const l = At(t.marginY, r * e);
       d = i.endY - l - o;
     } else
-      d = i.startY + Pt(t.marginY, r);
+      d = i.startY + At(t.marginY, r);
   }
   return {
     rotate: 0,
@@ -2723,7 +2723,7 @@ function Ut(i, t, e) {
     }
   };
 }
-function Pt(i, t) {
+function At(i, t) {
   if (i === void 0) return 0;
   if (typeof i == "number") return i;
   const e = Number.parseFloat(i);
@@ -2731,7 +2731,7 @@ function Pt(i, t) {
 }
 const so = (i) => {
   const { floatDomInfos: t, scene: e, skeleton: n, worksheet: r } = i, s = Fe(() => t.map((o) => {
-    const { width: a, height: d, angle: u, left: c, top: l } = o.transform, g = Vr(
+    const { width: a, height: d, angle: u, left: c, top: l } = o.transform, g = Gr(
       {
         left: c != null ? c : 0,
         right: (c != null ? c : 0) + (a != null ? a : 0),
@@ -2743,7 +2743,7 @@ const so = (i) => {
       r,
       void 0,
       !0
-    ), { scaleX: h, scaleY: m } = e.getAncestorScale(), p = {
+    ), { scaleX: h, scaleY: m } = e.getAncestorScale(), f = {
       startX: g.left,
       endX: g.right,
       startY: g.top,
@@ -2752,9 +2752,9 @@ const so = (i) => {
       width: a * h,
       height: d * m,
       absolute: g.absolute
-    }, f = {
-      position$: new je(p),
-      position: p,
+    }, p = {
+      position$: new je(f),
+      position: f,
       id: o.drawingId,
       componentKey: o.componentKey,
       onPointerMove: () => {
@@ -2768,7 +2768,7 @@ const so = (i) => {
       unitId: o.unitId,
       data: o.data
     };
-    return [o.drawingId, f];
+    return [o.drawingId, p];
   }), [t, e, n, r]);
   return /* @__PURE__ */ L("div", { style: { position: "absolute", top: 0, left: 0 }, children: s.map(([o, a]) => /* @__PURE__ */ L(us, { layer: a, id: o, position: a.position }, o)) });
 };
@@ -2777,7 +2777,7 @@ var oo = Object.getOwnPropertyDescriptor, ao = (i, t, e, n) => {
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, Me = (i, t) => (e, n) => t(e, n, i);
-let jt = class extends te {
+let Ft = class extends te {
   constructor(i, t, e, n, r, s, o) {
     super(), this._sheetPrintInterceptorService = i, this._drawingRenderService = t, this._drawingManagerService = e, this._renderManagerService = n, this._canvasFloatDomManagerService = r, this._componetManager = s, this._injector = o, this._initPrinting(), this._initPrintingDom();
   }
@@ -2812,8 +2812,8 @@ let jt = class extends te {
             const { scaleX: u, scaleY: c } = s.scene, l = i ? { ...i } : { startColumn: 0, endColumn: 0, endRow: 0, startRow: 0 }, g = d.order.map((h) => d.data[h]);
             return g.length ? (g.forEach((h) => {
               if (!h.groupId && h.transform && Ge.isDefine(h.transform.left) && Ge.isDefine(h.transform.top) && Ge.isDefine(h.transform.width) && Ge.isDefine(h.transform.height)) {
-                const m = o.skeleton.getCellIndexByOffset(h.transform.left, h.transform.top, u, c, { x: 0, y: 0 }), p = o.skeleton.getCellIndexByOffset(h.transform.left + h.transform.width, h.transform.top + h.transform.height, u, c, { x: 0, y: 0 });
-                m.column < l.startColumn && (l.startColumn = m.column), m.row < l.startRow && (l.startRow = m.row), l.endRow < p.row && (l.endRow = p.row), l.endColumn < p.column && (l.endColumn = p.column);
+                const m = o.skeleton.getCellIndexByOffset(h.transform.left, h.transform.top, u, c, { x: 0, y: 0 }), f = o.skeleton.getCellIndexByOffset(h.transform.left + h.transform.width, h.transform.top + h.transform.height, u, c, { x: 0, y: 0 });
+                m.column < l.startColumn && (l.startColumn = m.column), m.row < l.startRow && (l.startRow = m.row), l.endRow < f.row && (l.endRow = f.row), l.endColumn < f.column && (l.endColumn = f.column);
               }
             }), e(l)) : e(i);
           }
@@ -2858,22 +2858,21 @@ let jt = class extends te {
     );
   }
 };
-jt = ao([
-  Me(0, A(li)),
-  Me(1, A(Ar)),
+Ft = ao([
+  Me(0, A(ui)),
+  Me(1, A(Nr)),
   Me(2, ae),
   Me(3, ee),
   Me(4, A(lt)),
-  Me(5, A(Pr)),
+  Me(5, A(Ar)),
   Me(6, A(qe))
-], jt);
+], Ft);
 var co = Object.getOwnPropertyDescriptor, lo = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? co(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, Se = (i, t) => (e, n) => t(e, n, i);
 const uo = [
-  mr.id,
   fr.id,
   pr.id,
   wr.id,
@@ -2881,9 +2880,9 @@ const uo = [
   Sr.id,
   vr.id,
   Ir.id,
-  pn.id,
-  wn.id,
   Cr.id,
+  fn.id,
+  pn.id,
   Rr.id,
   Dr.id,
   br.id,
@@ -2891,18 +2890,19 @@ const uo = [
   yr.id,
   Er.id,
   Tr.id,
-  Or.id
+  Or.id,
+  Ur.id
 ], ho = [
   Fi.id,
   Li.id,
   Hi.id,
   Vi.id,
   Gi.id,
-  gr.id,
+  mr.id,
   Yi.id,
   Xi.id
 ];
-let Dn = class extends te {
+let Rn = class extends te {
   constructor(i, t, e, n, r, s, o, a, d) {
     super(), this._context = i, this._renderManagerService = t, this._commandService = e, this._selectionRenderService = n, this._skeletonManagerService = r, this._sheetInterceptorService = s, this._sheetDrawingService = o, this._drawingManagerService = a, this._univerInstanceService = d, this._sheetInterceptorListener(), this._commandListener(), this._sheetRefreshListener();
   }
@@ -2916,52 +2916,52 @@ let Dn = class extends te {
           if (i.params == null)
             return { redos: [], undos: [] };
           const t = i.id;
-          if (t === mr.id)
+          if (t === fr.id)
             return this._moveRowInterceptor(i.params, "insert");
-          if ([Er.id, Tr.id, Or.id].includes(t))
+          if ([Tr.id, Or.id, Ur.id].includes(t))
             return this._moveRangeInterceptor(i.params);
-          if (t === fr.id)
-            return this._moveColInterceptor(i.params, "insert");
           if (t === pr.id)
-            return this._moveRowInterceptor(i.params, "remove");
+            return this._moveColInterceptor(i.params, "insert");
           if (t === wr.id)
+            return this._moveRowInterceptor(i.params, "remove");
+          if (t === _r.id)
             return this._moveColInterceptor(i.params, "remove");
-          if (t === _r.id) {
+          if (t === Sr.id) {
             const { range: e } = i.params;
             return this._getRangeMoveUndo(
               e,
               0
               /* deleteLeft */
             );
-          } else if (t === Sr.id) {
+          } else if (t === vr.id) {
             const { range: e } = i.params;
             return this._getRangeMoveUndo(
               e,
               1
               /* deleteUp */
             );
-          } else if (t === vr.id) {
+          } else if (t === Ir.id) {
             const { range: e } = i.params;
             return this._getRangeMoveUndo(
               e,
               2
               /* insertDown */
             );
-          } else if (t === Ir.id) {
+          } else if (t === Cr.id) {
             const { range: e } = i.params;
             return this._getRangeMoveUndo(
               e,
               3
               /* insertRight */
             );
-          } else if (t === Dr.id || t === br.id) {
+          } else if (t === br.id || t === Mr.id) {
             const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e;
             return this._getDrawingUndoForRowVisible(n, r, s);
-          } else if (t === Mr.id || t === yr.id) {
+          } else if (t === yr.id || t === Er.id) {
             const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e;
             return this._getDrawingUndoForColVisible(n, r, s);
-          } else if (t === pn.id || t === wn.id || t === Cr.id || t === Rr.id) {
-            const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e, o = t === pn.id || t === wn.id;
+          } else if (t === fn.id || t === pn.id || t === Rr.id || t === Dr.id) {
+            const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e, o = t === fn.id || t === pn.id;
             return this._getDrawingUndoForRowAndColSize(n, r, s, o);
           }
           return { redos: [], undos: [] };
@@ -2993,38 +2993,38 @@ let Dn = class extends te {
     };
   }
   _getUpdateOrDeleteDrawings(i, t, e) {
-    const n = [], r = [], { sheetTransform: s, anchorType: o = O.Position, transform: a, unitId: d, subUnitId: u, drawingId: c } = e, { from: l, to: g } = s, { row: h, column: m } = l, { row: p, column: f } = g;
+    const n = [], r = [], { sheetTransform: s, anchorType: o = O.Position, transform: a, unitId: d, subUnitId: u, drawingId: c } = e, { from: l, to: g } = s, { row: h, column: m } = l, { row: f, column: p } = g;
     if (s == null || a == null)
       return {
         updateDrawings: n,
         deleteDrawings: r
       };
-    const { startRow: w, endRow: _, startColumn: I, endColumn: R } = i;
+    const { startRow: w, endRow: S, startColumn: I, endColumn: D } = i;
     let v = null, C = null;
-    if (t === 0 && h >= w && p <= _)
-      if (m >= I && f <= R)
+    if (t === 0 && h >= w && f <= S)
+      if (m >= I && p <= D)
         r.push({ unitId: d, subUnitId: u, drawingId: c });
       else {
-        const S = this._shrinkCol(s, a, I, R, o);
-        v = S == null ? void 0 : S.newSheetTransform, C = S == null ? void 0 : S.newTransform;
+        const _ = this._shrinkCol(s, a, I, D, o);
+        v = _ == null ? void 0 : _.newSheetTransform, C = _ == null ? void 0 : _.newTransform;
       }
-    else if (t === 1 && m >= I && f <= R)
-      if (h >= w && p <= _)
+    else if (t === 1 && m >= I && p <= D)
+      if (h >= w && f <= S)
         r.push({ unitId: d, subUnitId: u, drawingId: c });
       else {
-        const S = this._shrinkRow(s, a, w, _, o);
-        v = S == null ? void 0 : S.newSheetTransform, C = S == null ? void 0 : S.newTransform;
+        const _ = this._shrinkRow(s, a, w, S, o);
+        v = _ == null ? void 0 : _.newSheetTransform, C = _ == null ? void 0 : _.newTransform;
       }
     else if (t === 2) {
-      const S = this._expandRow(s, a, w, _, o);
-      v = S == null ? void 0 : S.newSheetTransform, C = S == null ? void 0 : S.newTransform;
+      const _ = this._expandRow(s, a, w, S, o);
+      v = _ == null ? void 0 : _.newSheetTransform, C = _ == null ? void 0 : _.newTransform;
     } else if (t === 3) {
-      const S = this._expandCol(s, a, I, R, o);
-      v = S == null ? void 0 : S.newSheetTransform, C = S == null ? void 0 : S.newTransform;
+      const _ = this._expandCol(s, a, I, D, o);
+      v = _ == null ? void 0 : _.newSheetTransform, C = _ == null ? void 0 : _.newTransform;
     }
     if (v != null && C != null) {
-      const S = J(v, this._selectionRenderService, this._skeletonManagerService);
-      n.push({ ...e, sheetTransform: v, transform: S });
+      const _ = J(v, this._selectionRenderService, this._skeletonManagerService);
+      n.push({ ...e, sheetTransform: v, transform: _ });
     }
     return { updateDrawings: n, deleteDrawings: r };
   }
@@ -3043,15 +3043,15 @@ let Dn = class extends te {
       if (m === O.None)
         this._remainDrawingSize(h, r, l);
       else {
-        const { from: p, to: f } = g, { row: w, column: _ } = p, { row: I, column: R } = f;
+        const { from: f, to: p } = g, { row: w, column: S } = f, { row: I, column: D } = p;
         for (let v = 0; v < e.length; v++) {
-          const C = e[v], { startRow: S, endRow: y, startColumn: D, endColumn: E } = C;
-          if (R < D)
+          const C = e[v], { startRow: _, endRow: y, startColumn: R, endColumn: E } = C;
+          if (D < R)
             continue;
           if (m === O.Position) {
             let b = null, N = null;
-            if (_ >= D && _ <= E) {
-              const F = this._skeletonManagerService.attachRangeWithCoord({ startColumn: _, endColumn: E, startRow: p.row, endRow: f.row });
+            if (S >= R && S <= E) {
+              const F = this._skeletonManagerService.attachRangeWithCoord({ startColumn: S, endColumn: E, startRow: f.row, endRow: p.row });
               if (F == null)
                 return;
               N = { ...h, left: F.startX };
@@ -3063,11 +3063,11 @@ let Dn = class extends te {
             this._remainDrawingSize(h, r, l);
             continue;
           }
-          if (_ >= D && R <= E)
+          if (S >= R && D <= E)
             continue;
           let T = null, M = null;
-          if (_ >= D && _ <= E) {
-            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: _, endColumn: E, startRow: p.row, endRow: f.row });
+          if (S >= R && S <= E) {
+            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: S, endColumn: E, startRow: f.row, endRow: p.row });
             if (b == null)
               return;
             M = {
@@ -3075,8 +3075,8 @@ let Dn = class extends te {
               left: (b == null ? void 0 : b.startX) || 0,
               width: ((h == null ? void 0 : h.width) || 0) - b.endX + b.startX
             };
-          } else if (R >= D && R <= E) {
-            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: D, endColumn: R, startRow: p.row, endRow: f.row });
+          } else if (D >= R && D <= E) {
+            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: R, endColumn: D, startRow: f.row, endRow: p.row });
             if (b == null)
               return;
             M = {
@@ -3084,7 +3084,7 @@ let Dn = class extends te {
               left: b.startX - ((h == null ? void 0 : h.width) || 0)
             };
           } else {
-            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: D, endColumn: E, startRow: p.row, endRow: f.row });
+            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: R, endColumn: E, startRow: f.row, endRow: p.row });
             if (b == null)
               return;
             if (M = {
@@ -3137,15 +3137,15 @@ let Dn = class extends te {
       if (m === O.None)
         this._remainDrawingSize(h, r, l);
       else {
-        const { from: p, to: f } = g, { row: w, column: _ } = p, { row: I, column: R } = f;
+        const { from: f, to: p } = g, { row: w, column: S } = f, { row: I, column: D } = p;
         for (let v = 0; v < e.length; v++) {
-          const C = e[v], { startRow: S, endRow: y, startColumn: D, endColumn: E } = C;
-          if (I < S)
+          const C = e[v], { startRow: _, endRow: y, startColumn: R, endColumn: E } = C;
+          if (I < _)
             continue;
           if (m === O.Position) {
             let b = null, N = null;
-            if (w >= S && w <= y) {
-              const F = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: f.column, startRow: w, endRow: y });
+            if (w >= _ && w <= y) {
+              const F = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: w, endRow: y });
               if (F == null)
                 return;
               N = { ...h, top: F.startY };
@@ -3157,11 +3157,11 @@ let Dn = class extends te {
             this._remainDrawingSize(h, r, l);
             continue;
           }
-          if (w >= S && I <= y)
+          if (w >= _ && I <= y)
             continue;
           let T = null, M = null;
-          if (w >= S && w <= y) {
-            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: f.column, startRow: w, endRow: y });
+          if (w >= _ && w <= y) {
+            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: w, endRow: y });
             if (b == null)
               return;
             M = {
@@ -3169,8 +3169,8 @@ let Dn = class extends te {
               top: (b == null ? void 0 : b.startY) || 0,
               height: ((h == null ? void 0 : h.height) || 0) - b.endY + b.startY
             };
-          } else if (I >= S && I <= y) {
-            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: f.column, startRow: S, endRow: I });
+          } else if (I >= _ && I <= y) {
+            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: _, endRow: I });
             if (b == null)
               return;
             M = {
@@ -3178,7 +3178,7 @@ let Dn = class extends te {
               top: b.startY - ((h == null ? void 0 : h.height) || 0)
             };
           } else {
-            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: f.column, startRow: S, endRow: y });
+            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: _, endRow: y });
             if (b == null)
               return;
             if (M = {
@@ -3217,20 +3217,20 @@ let Dn = class extends te {
       if (c === O.None)
         this._remainDrawingSize(u, s, a);
       else {
-        const { from: l, to: g } = d, { row: h, column: m } = l, { row: p, column: f } = g;
+        const { from: l, to: g } = d, { row: h, column: m } = l, { row: f, column: p } = g;
         for (let w = 0; w < e.length; w++) {
-          const _ = e[w], { startRow: I, endRow: R, startColumn: v, endColumn: C } = _;
-          if (p < I || f < v)
+          const S = e[w], { startRow: I, endRow: D, startColumn: v, endColumn: C } = S;
+          if (f < I || p < v)
             continue;
-          if (c === O.Position && (h <= I && p >= R || m <= v && f >= C)) {
+          if (c === O.Position && (h <= I && f >= D || m <= v && p >= C)) {
             this._remainDrawingSize(u, s, a);
             continue;
           }
-          const S = J({ ...d }, this._selectionRenderService, this._skeletonManagerService);
-          if (S != null) {
+          const _ = J({ ...d }, this._selectionRenderService, this._skeletonManagerService);
+          if (_ != null) {
             s.push({
               ...a,
-              transform: S
+              transform: _
             });
             break;
           }
@@ -3251,11 +3251,11 @@ let Dn = class extends te {
     return { unitId: e, subUnitId: n };
   }
   _moveRangeInterceptor(i) {
-    var I, R;
+    var I, D;
     const { toRange: t, fromRange: e } = i, n = se(this._univerInstanceService);
     if (!n)
       return { redos: [], undos: [] };
-    const { unitId: r, subUnitId: s } = n, o = (R = (I = this._renderManagerService.getRenderById(r)) == null ? void 0 : I.with(X)) == null ? void 0 : R.getCurrentSkeleton();
+    const { unitId: r, subUnitId: s } = n, o = (D = (I = this._renderManagerService.getRenderById(r)) == null ? void 0 : I.with(X)) == null ? void 0 : D.getCurrentSkeleton();
     if (!o)
       return { redos: [], undos: [] };
     const a = dr(o, e);
@@ -3266,35 +3266,35 @@ let Dn = class extends te {
       const C = g[v];
       if (C.anchorType !== O.Both)
         return;
-      const { transform: S } = C;
-      if (!S)
+      const { transform: _ } = C;
+      if (!_)
         return;
-      const { left: y = 0, top: D = 0, width: E = 0, height: T = 0 } = S, { drawingStartX: M, drawingEndX: b, drawingStartY: N, drawingEndY: F } = {
+      const { left: y = 0, top: R = 0, width: E = 0, height: T = 0 } = _, { drawingStartX: M, drawingEndX: b, drawingStartY: N, drawingEndY: F } = {
         drawingStartX: y,
         drawingEndX: y + E,
-        drawingStartY: D,
-        drawingEndY: D + T
+        drawingStartY: R,
+        drawingEndY: R + T
       };
       d <= M && b <= u && c <= N && F <= l && h.push(C);
     });
-    const m = [], p = [], f = t.startRow - e.startRow, w = t.startColumn - e.startColumn, _ = h.map((v) => {
-      const C = v.sheetTransform, S = {
-        to: { ...C.to, row: C.to.row + f, column: C.to.column + w },
-        from: { ...C.from, row: C.from.row + f, column: C.from.column + w }
-      }, y = J(S, this._selectionRenderService, this._skeletonManagerService);
+    const m = [], f = [], p = t.startRow - e.startRow, w = t.startColumn - e.startColumn, S = h.map((v) => {
+      const C = v.sheetTransform, _ = {
+        to: { ...C.to, row: C.to.row + p, column: C.to.column + w },
+        from: { ...C.from, row: C.from.row + p, column: C.from.column + w }
+      }, y = J(_, this._selectionRenderService, this._skeletonManagerService);
       return {
         unitId: r,
         subUnitId: s,
         drawingId: v.drawingId,
         transform: y,
-        sheetTransform: S
+        sheetTransform: _
       };
     });
-    if (_.length) {
-      const v = this._sheetDrawingService.getBatchUpdateOp(_), { undo: C, redo: S, objects: y } = v;
-      m.push({ id: P.id, params: { unitId: r, subUnitId: s, op: S, objects: y, type: U.UPDATE } }), p.push({ id: P.id, params: { unitId: r, subUnitId: s, op: C, objects: y, type: U.UPDATE } });
+    if (S.length) {
+      const v = this._sheetDrawingService.getBatchUpdateOp(S), { undo: C, redo: _, objects: y } = v;
+      m.push({ id: P.id, params: { unitId: r, subUnitId: s, op: _, objects: y, type: U.UPDATE } }), f.push({ id: P.id, params: { unitId: r, subUnitId: s, op: C, objects: y, type: U.UPDATE } });
     }
-    return { redos: m, undos: p };
+    return { redos: m, undos: f };
   }
   _moveRowInterceptor(i, t) {
     const e = this._getUnitIdAndSubUnitId(i, t);
@@ -3302,35 +3302,35 @@ let Dn = class extends te {
       return { redos: [], undos: [] };
     const { unitId: n, subUnitId: r } = e, { range: s } = i, o = s.startRow, a = s.endRow, d = [], u = [], c = this._sheetDrawingService.getDrawingData(n, r), l = [], g = [];
     if (Object.keys(c).forEach((h) => {
-      const m = c[h], { sheetTransform: p, transform: f, anchorType: w = O.Position } = m;
-      if (p == null || f == null)
+      const m = c[h], { sheetTransform: f, transform: p, anchorType: w = O.Position } = m;
+      if (f == null || p == null)
         return;
-      let _, I;
+      let S, I;
       if (t === "insert") {
-        const v = this._expandRow(p, f, o, a, w);
-        _ = v == null ? void 0 : v.newSheetTransform, I = v == null ? void 0 : v.newTransform;
+        const v = this._expandRow(f, p, o, a, w);
+        S = v == null ? void 0 : v.newSheetTransform, I = v == null ? void 0 : v.newTransform;
       } else {
-        const { from: v, to: C } = p, { row: S } = v, { row: y } = C;
-        if (w === O.Both && S >= o && y <= a)
+        const { from: v, to: C } = f, { row: _ } = v, { row: y } = C;
+        if (w === O.Both && _ >= o && y <= a)
           g.push({ unitId: n, subUnitId: r, drawingId: h });
         else {
-          const D = this._shrinkRow(p, f, o, a, w);
-          _ = D == null ? void 0 : D.newSheetTransform, I = D == null ? void 0 : D.newTransform;
+          const R = this._shrinkRow(f, p, o, a, w);
+          S = R == null ? void 0 : R.newSheetTransform, I = R == null ? void 0 : R.newTransform;
         }
       }
-      if (!_ || !I)
+      if (!S || !I)
         return;
-      const R = { unitId: n, subUnitId: r, drawingId: h, transform: I, sheetTransform: _ };
-      l.push(R);
+      const D = { unitId: n, subUnitId: r, drawingId: h, transform: I, sheetTransform: S };
+      l.push(D);
     }), l.length === 0 && g.length === 0)
       return { redos: [], undos: [] };
     if (l.length > 0) {
-      const h = this._sheetDrawingService.getBatchUpdateOp(l), { undo: m, redo: p, objects: f } = h;
-      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: f, type: U.UPDATE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: m, objects: f, type: U.UPDATE } });
+      const h = this._sheetDrawingService.getBatchUpdateOp(l), { undo: m, redo: f, objects: p } = h;
+      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: p, type: U.UPDATE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: m, objects: p, type: U.UPDATE } });
     }
     if (g.length > 0) {
-      const h = this._sheetDrawingService.getBatchRemoveOp(g), m = h.undo, p = h.redo, f = h.objects;
-      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: f, type: U.REMOVE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: m, objects: f, type: U.INSERT } });
+      const h = this._sheetDrawingService.getBatchRemoveOp(g), m = h.undo, f = h.redo, p = h.objects;
+      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: p, type: U.REMOVE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: m, objects: p, type: U.INSERT } });
     }
     return d.push({ id: H.id, params: [n] }), u.push({ id: H.id, params: [n] }), {
       redos: d,
@@ -3343,35 +3343,35 @@ let Dn = class extends te {
       return { redos: [], undos: [] };
     const { unitId: n, subUnitId: r } = e, { range: s } = i, o = s.startColumn, a = s.endColumn, d = [], u = [], c = this._sheetDrawingService.getDrawingData(n, r), l = [], g = [];
     if (Object.keys(c).forEach((h) => {
-      const m = c[h], { sheetTransform: p, transform: f, anchorType: w = O.Position } = m;
-      if (p == null || f == null)
+      const m = c[h], { sheetTransform: f, transform: p, anchorType: w = O.Position } = m;
+      if (f == null || p == null)
         return;
-      let _, I;
+      let S, I;
       if (t === "insert") {
-        const v = this._expandCol(p, f, o, a, w);
-        _ = v == null ? void 0 : v.newSheetTransform, I = v == null ? void 0 : v.newTransform;
+        const v = this._expandCol(f, p, o, a, w);
+        S = v == null ? void 0 : v.newSheetTransform, I = v == null ? void 0 : v.newTransform;
       } else {
-        const { from: v, to: C } = p, { column: S } = v, { column: y } = C;
-        if (w === O.Both && S >= o && y <= a)
+        const { from: v, to: C } = f, { column: _ } = v, { column: y } = C;
+        if (w === O.Both && _ >= o && y <= a)
           g.push({ unitId: n, subUnitId: r, drawingId: h });
         else {
-          const D = this._shrinkCol(p, f, o, a, w);
-          _ = D == null ? void 0 : D.newSheetTransform, I = D == null ? void 0 : D.newTransform;
+          const R = this._shrinkCol(f, p, o, a, w);
+          S = R == null ? void 0 : R.newSheetTransform, I = R == null ? void 0 : R.newTransform;
         }
       }
-      if (!_ || !I)
+      if (!S || !I)
         return;
-      const R = { unitId: n, subUnitId: r, drawingId: h, transform: I, sheetTransform: _ };
-      l.push(R);
+      const D = { unitId: n, subUnitId: r, drawingId: h, transform: I, sheetTransform: S };
+      l.push(D);
     }), l.length === 0 && g.length === 0)
       return { redos: [], undos: [] };
     if (l.length > 0) {
-      const h = this._sheetDrawingService.getBatchUpdateOp(l), { undo: m, redo: p, objects: f } = h;
-      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: f, type: U.UPDATE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: m, objects: f, type: U.UPDATE } });
+      const h = this._sheetDrawingService.getBatchUpdateOp(l), { undo: m, redo: f, objects: p } = h;
+      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: p, type: U.UPDATE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: m, objects: p, type: U.UPDATE } });
     }
     if (g.length > 0) {
-      const h = this._sheetDrawingService.getBatchRemoveOp(g), m = h.undo, p = h.redo, f = h.objects;
-      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: f, type: U.REMOVE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: m, objects: f, type: U.INSERT } });
+      const h = this._sheetDrawingService.getBatchRemoveOp(g), m = h.undo, f = h.redo, p = h.objects;
+      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: p, type: U.REMOVE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: m, objects: p, type: U.INSERT } });
     }
     return d.push({ id: H.id, params: [n] }), u.push({ id: H.id, params: [n] }), { redos: d, undos: u };
   }
@@ -3623,30 +3623,30 @@ let Dn = class extends te {
       const o = n[s], { sheetTransform: a, transform: d, anchorType: u = O.Position } = o;
       if (u === O.None)
         return !0;
-      const { from: c, to: l } = a, { row: g, column: h } = c, { row: m, column: p } = l;
-      for (let f = 0; f < e.length; f++) {
-        const w = e[f], { startRow: _, endRow: I, startColumn: R, endColumn: v } = w;
+      const { from: c, to: l } = a, { row: g, column: h } = c, { row: m, column: f } = l;
+      for (let p = 0; p < e.length; p++) {
+        const w = e[p], { startRow: S, endRow: I, startColumn: D, endColumn: v } = w;
         if (bi.intersects(
           {
-            startRow: _,
+            startRow: S,
             endRow: I,
-            startColumn: R,
+            startColumn: D,
             endColumn: v
           },
           {
             startRow: g,
             endRow: m,
             startColumn: h,
-            endColumn: p
+            endColumn: f
           }
         ) || g > I || h > v) {
-          const C = u === O.Position, S = J(a, this._selectionRenderService, this._skeletonManagerService);
+          const C = u === O.Position, _ = J(a, this._selectionRenderService, this._skeletonManagerService);
           r.push({
             ...o,
             transform: {
-              ...S,
-              width: C ? d == null ? void 0 : d.width : S == null ? void 0 : S.width,
-              height: C ? d == null ? void 0 : d.height : S == null ? void 0 : S.height
+              ..._,
+              width: C ? d == null ? void 0 : d.width : _ == null ? void 0 : _.width,
+              height: C ? d == null ? void 0 : d.height : _ == null ? void 0 : _.height
             }
           });
           break;
@@ -3655,41 +3655,41 @@ let Dn = class extends te {
     }), r.length !== 0 && (this._drawingManagerService.refreshTransform(r), this._commandService.syncExecuteCommand(H.id, [i]));
   }
 };
-Dn = lo([
+Rn = lo([
   Se(1, ee),
   Se(2, G),
   Se(3, Je),
   Se(4, A(X)),
-  Se(5, A(Ht)),
+  Se(5, A(Vt)),
   Se(6, oe),
   Se(7, ae),
-  Se(8, le)
-], Dn);
+  Se(8, de)
+], Rn);
 function go() {
-  const i = Ce(Te), t = Ce(Mn), e = Ce(En), [n, r] = Ee([ye.CELL_ADDRESS]), [s, o] = Ee(!1), [a, d] = Ee(null), u = Fe(() => e.getCellImagesInSelection(), [e]), c = Fe(() => e.getDataColumns(), [e]), l = Fe(() => e.getSelectionRowRange(), [e]), g = c.length > 0, h = Fe(() => c.map((C) => ({
+  const i = Ce(Te), t = Ce(bn), e = Ce(yn), [n, r] = Ee([ye.CELL_ADDRESS]), [s, o] = Ee(!1), [a, d] = Ee(null), u = Fe(() => e.getCellImagesInSelection(), [e]), c = Fe(() => e.getDataColumns(), [e]), l = Fe(() => e.getSelectionRowRange(), [e]), g = c.length > 0, h = Fe(() => c.map((C) => ({
     label: C.label,
     value: String(C.index)
-  })), [c]), [m, p] = Ee(
+  })), [c]), [m, f] = Ee(
     () => h.length > 0 ? h[0].value : "0"
-  ), f = Fe(() => {
+  ), p = Fe(() => {
     if (!n.includes(ye.COLUMN_VALUE) || !l)
       return [];
-    const S = Number(m);
+    const _ = Number(m);
     return [{
       startRow: l.startRow,
       endRow: l.endRow,
-      startColumn: S,
-      endColumn: S
+      startColumn: _,
+      endColumn: _
     }];
   }, [n, m, l]);
-  ui(f);
+  hi(p);
   const w = Et((C) => {
     C.length !== 0 && r(C);
-  }, []), _ = Et((C) => {
-    p(String(C));
+  }, []), S = Et((C) => {
+    f(String(C));
   }, []), I = Et(() => {
     t.close(ze);
-  }, [t]), R = Et(async () => {
+  }, [t]), D = Et(async () => {
     if (u.length !== 0) {
       o(!0), d(null);
       try {
@@ -3705,17 +3705,17 @@ function go() {
     }
   }, [e, u, n, m, t, i]), v = n.includes(ye.COLUMN_VALUE);
   return /* @__PURE__ */ Xe("div", { className: "univer-flex univer-flex-col", children: [
-    /* @__PURE__ */ L(en, { label: i.t("sheetImage.save.imageCount"), children: /* @__PURE__ */ L("div", { className: "univer-text-sm univer-text-gray-600", children: u.length }) }),
-    /* @__PURE__ */ L(en, { label: i.t("sheetImage.save.fileNameConfig"), children: /* @__PURE__ */ Xe(qi, { value: n, onChange: w, direction: "vertical", children: [
-      /* @__PURE__ */ L(Yn, { value: ye.CELL_ADDRESS, disabled: !g, children: i.t("sheetImage.save.useRowCol") }),
-      g && /* @__PURE__ */ L(Yn, { value: ye.COLUMN_VALUE, children: i.t("sheetImage.save.useColumnValue") })
+    /* @__PURE__ */ L(tn, { label: i.t("sheetImage.save.imageCount"), children: /* @__PURE__ */ L("div", { className: "univer-text-sm univer-text-gray-600", children: u.length }) }),
+    /* @__PURE__ */ L(tn, { label: i.t("sheetImage.save.fileNameConfig"), children: /* @__PURE__ */ Xe(qi, { value: n, onChange: w, direction: "vertical", children: [
+      /* @__PURE__ */ L(Gn, { value: ye.CELL_ADDRESS, disabled: !g, children: i.t("sheetImage.save.useRowCol") }),
+      g && /* @__PURE__ */ L(Gn, { value: ye.COLUMN_VALUE, children: i.t("sheetImage.save.useColumnValue") })
     ] }) }),
-    v && /* @__PURE__ */ L(en, { label: i.t("sheetImage.save.selectColumn"), children: /* @__PURE__ */ L(
+    v && /* @__PURE__ */ L(tn, { label: i.t("sheetImage.save.selectColumn"), children: /* @__PURE__ */ L(
       Qi,
       {
         value: m,
         options: h,
-        onChange: _
+        onChange: S
       }
     ) }),
     a && /* @__PURE__ */ L("div", { className: "univer-text-xs univer-text-red-500", children: a }),
@@ -3724,12 +3724,12 @@ function go() {
       {
         className: "univer-flex univer-justify-end univer-gap-2 univer-border-t univer-border-gray-200 univer-pt-3",
         children: [
-          /* @__PURE__ */ L(Xn, { onClick: I, disabled: s, children: i.t("sheetImage.save.cancel") }),
+          /* @__PURE__ */ L(Yn, { onClick: I, disabled: s, children: i.t("sheetImage.save.cancel") }),
           /* @__PURE__ */ L(
-            Xn,
+            Yn,
             {
               variant: "primary",
-              onClick: R,
+              onClick: D,
               disabled: s || u.length === 0,
               children: s ? i.t("sheetImage.save.saving") : i.t("sheetImage.save.confirm")
             }
@@ -3740,23 +3740,23 @@ function go() {
   ] });
 }
 const mo = (i) => {
-  var _;
+  var S;
   const t = Ce(G), e = Ce(Te), n = Ce(ae), r = Ce(ee), { drawings: s } = i, o = s[0];
   if (o == null)
     return;
   const { unitId: a } = o, d = r.getRenderById(a), u = d == null ? void 0 : d.scene;
   if (u == null)
     return;
-  const c = u.getTransformerByCreate(), [l, g] = Ee(!0), h = (_ = o.anchorType) != null ? _ : O.Position, [m, p] = Ee(h);
-  function f(I, R) {
+  const c = u.getTransformerByCreate(), [l, g] = Ee(!0), h = (S = o.anchorType) != null ? S : O.Position, [m, f] = Ee(h);
+  function p(I, D) {
     const v = [];
     return I.forEach((C) => {
-      const { oKey: S } = C, y = R.getDrawingOKey(S);
+      const { oKey: _ } = C, y = D.getDrawingOKey(_);
       if (y == null)
         return v.push(null), !0;
-      const { unitId: D, subUnitId: E, drawingId: T, drawingType: M, anchorType: b, sheetTransform: N } = y;
+      const { unitId: R, subUnitId: E, drawingId: T, drawingType: M, anchorType: b, sheetTransform: N } = y;
       v.push({
-        unitId: D,
+        unitId: R,
         subUnitId: E,
         drawingId: T,
         anchorType: b,
@@ -3765,37 +3765,37 @@ const mo = (i) => {
       });
     }), v;
   }
-  Nr(() => {
+  kr(() => {
     const I = c.clearControl$.subscribe((v) => {
       v === !0 && g(!1);
-    }), R = c.changeStart$.subscribe((v) => {
+    }), D = c.changeStart$.subscribe((v) => {
       var y;
-      const { objects: C } = v, S = f(C, n);
-      if (S.length === 0)
+      const { objects: C } = v, _ = p(C, n);
+      if (_.length === 0)
         g(!1);
-      else if (S.length >= 1) {
+      else if (_.length >= 1) {
         g(!0);
-        const D = ((y = S[0]) == null ? void 0 : y.anchorType) || O.Position;
-        p(D);
+        const R = ((y = _[0]) == null ? void 0 : y.anchorType) || O.Position;
+        f(R);
       }
     });
     return () => {
-      R.unsubscribe(), I.unsubscribe();
+      D.unsubscribe(), I.unsubscribe();
     };
   }, []);
   function w(I) {
-    p(I);
-    const R = n.getFocusDrawings();
-    if (R.length === 0)
+    f(I);
+    const D = n.getFocusDrawings();
+    if (D.length === 0)
       return;
-    const v = R.map((C) => ({
+    const v = D.map((C) => ({
       unitId: C.unitId,
       subUnitId: C.subUnitId,
       drawingId: C.drawingId,
       anchorType: I
     }));
-    t.executeCommand(zt.id, {
-      unitId: R[0].unitId,
+    t.executeCommand(Kt.id, {
+      unitId: D[0].unitId,
       drawings: v
     });
   }
@@ -3814,16 +3814,16 @@ const mo = (i) => {
           }
         ),
         /* @__PURE__ */ L("div", { children: /* @__PURE__ */ Xe(ts, { value: m, onChange: w, direction: "vertical", children: [
-          /* @__PURE__ */ L(tn, { value: O.Both, children: e.t("drawing-anchor.both") }),
-          /* @__PURE__ */ L(tn, { value: O.Position, children: e.t("drawing-anchor.position") }),
-          /* @__PURE__ */ L(tn, { value: O.None, children: e.t("drawing-anchor.none") })
+          /* @__PURE__ */ L(nn, { value: O.Both, children: e.t("drawing-anchor.both") }),
+          /* @__PURE__ */ L(nn, { value: O.Position, children: e.t("drawing-anchor.position") }),
+          /* @__PURE__ */ L(nn, { value: O.None, children: e.t("drawing-anchor.none") })
         ] }) })
       ]
     }
   );
 }, fo = () => {
   const i = Ce(ae), t = i.getFocusDrawings(), [e, n] = Ee(t);
-  return Nr(() => {
+  return kr(() => {
     const r = i.focus$.subscribe((s) => {
       n(s);
     });
@@ -3834,31 +3834,31 @@ const mo = (i) => {
     /* @__PURE__ */ L(Cs, { drawings: e }),
     /* @__PURE__ */ L(mo, { drawings: e })
   ] });
-}, Gr = "sheet.menu.image";
+}, Yr = "sheet.menu.image";
 function po(i) {
   return {
-    id: Gr,
-    type: Yt.SUBITEMS,
+    id: Yr,
+    type: Xt.SUBITEMS,
     icon: "AddImageIcon",
     tooltip: "sheetImage.title",
-    hidden$: Gt(i, k.UNIVER_SHEET),
-    disabled$: hi(i, { workbookTypes: [mn], worksheetTypes: [fn], rangeTypes: [Ki] })
+    hidden$: Yt(i, k.UNIVER_SHEET),
+    disabled$: gi(i, { workbookTypes: [gn], worksheetTypes: [mn], rangeTypes: [Ki] })
   };
 }
 function wo(i) {
   return {
-    id: Kt.id,
+    id: Jt.id,
     title: "sheetImage.upload.float",
-    type: Yt.BUTTON,
-    hidden$: Gt(i, k.UNIVER_SHEET)
+    type: Xt.BUTTON,
+    hidden$: Yt(i, k.UNIVER_SHEET)
   };
 }
 function _o(i) {
   return {
-    id: yn.id,
+    id: Mn.id,
     title: "sheetImage.upload.cell",
-    type: Yt.BUTTON,
-    hidden$: Gt(i, k.UNIVER_SHEET)
+    type: Xt.BUTTON,
+    hidden$: Yt(i, k.UNIVER_SHEET)
   };
 }
 function So(i) {
@@ -3880,12 +3880,12 @@ function vo(i, t) {
 function Io() {
   return "showDirectoryPicker" in window;
 }
-function ln(i) {
-  const t = i.get(le), e = i.get(ut), n = at([
-    Gt(i, k.UNIVER_SHEET),
+function dn(i) {
+  const t = i.get(de), e = i.get(ut), n = at([
+    Yt(i, k.UNIVER_SHEET),
     t.getCurrentTypeOfUnit$(k.UNIVER_SHEET).pipe(
-      pe((r) => r ? e.selectionMoveEnd$.pipe(
-        we(() => {
+      fe((r) => r ? e.selectionMoveEnd$.pipe(
+        pe(() => {
           if (!Io())
             return !0;
           const s = e.getCurrentSelections();
@@ -3896,14 +3896,14 @@ function ln(i) {
               return !1;
           return !0;
         })
-      ) : _n(!0))
+      ) : wn(!0))
     )
   ]).pipe(
-    we(([r, s]) => r || s)
+    pe(([r, s]) => r || s)
   );
   return {
     id: ct.id,
-    type: Yt.BUTTON,
+    type: Xt.BUTTON,
     icon: "DownloadImageIcon",
     title: "sheetImage.save.menuLabel",
     hidden$: n
@@ -3911,40 +3911,40 @@ function ln(i) {
 }
 const Co = {
   [gs.MEDIA]: {
-    [Gr]: {
+    [Yr]: {
       order: 0,
       menuItemFactory: po,
-      [Kt.id]: {
+      [Jt.id]: {
         order: 0,
         menuItemFactory: wo
       },
-      [yn.id]: {
+      [Mn.id]: {
         order: 1,
         menuItemFactory: _o
       }
     }
   },
-  [rn.MAIN_AREA]: {
-    [sn.OTHERS]: {
+  [sn.MAIN_AREA]: {
+    [on.OTHERS]: {
       [ct.id]: {
         order: 10,
-        menuItemFactory: ln
+        menuItemFactory: dn
       }
     }
   },
-  [rn.COL_HEADER]: {
-    [sn.OTHERS]: {
+  [sn.COL_HEADER]: {
+    [on.OTHERS]: {
       [ct.id]: {
         order: 10,
-        menuItemFactory: ln
+        menuItemFactory: dn
       }
     }
   },
-  [rn.ROW_HEADER]: {
-    [sn.OTHERS]: {
+  [sn.ROW_HEADER]: {
+    [on.OTHERS]: {
       [ct.id]: {
         order: 10,
-        menuItemFactory: ln
+        menuItemFactory: dn
       }
     }
   }
@@ -3993,7 +3993,7 @@ const Ro = {
     direction: Ie.RIGHT
   }
 }, yo = {
-  id: kr.id,
+  id: $r.id,
   description: "shortcut.drawing-delete",
   group: "4_drawing-view",
   // when focusing on any other input tag do not trigger this shortcut
@@ -4006,32 +4006,32 @@ var Eo = Object.getOwnPropertyDescriptor, To = (i, t, e, n) => {
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, Be = (i, t) => (e, n) => t(e, n, i);
-let Ft = class extends te {
+let Lt = class extends te {
   constructor(i, t, e, n, r, s) {
     super(), this._componentManager = i, this._menuManagerService = t, this._commandService = e, this._shortcutService = n, this._drawingManagerService = r, this._sheetsSelectionsService = s, this._init();
   }
   _initCustomComponents() {
     const i = this._componentManager;
-    this.disposeWithMe(i.register(Br, fo)), this.disposeWithMe(i.register(ze, go));
+    this.disposeWithMe(i.register(jr, fo)), this.disposeWithMe(i.register(ze, go));
   }
   _initMenus() {
     this._menuManagerService.mergeMenu(Co);
   }
   _initCommands() {
     [
-      Kt,
-      yn,
-      Xt,
-      ht,
+      Jt,
+      Mn,
       zt,
-      jr,
-      H,
+      ht,
+      Kt,
       Fr,
+      H,
+      Lr,
+      xr,
+      Br,
+      gt,
       $r,
       Wr,
-      gt,
-      kr,
-      xr,
       ct
     ].forEach((i) => this.disposeWithMe(this._commandService.registerCommand(i)));
   }
@@ -4051,21 +4051,21 @@ let Ft = class extends te {
     this._initCommands(), this._initCustomComponents(), this._initMenus(), this._initShortcuts();
   }
 };
-Ft = To([
-  Be(0, A(Pr)),
+Lt = To([
+  Be(0, A(Ar)),
   Be(1, ms),
   Be(2, G),
   Be(3, fs),
   Be(4, ae),
   Be(5, A(ut))
-], Ft);
+], Lt);
 var Oo = Object.defineProperty, Uo = Object.getOwnPropertyDescriptor, Po = (i, t, e) => t in i ? Oo(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e, Ao = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? Uo(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, un = (i, t) => (e, n) => t(e, n, i), Yr = (i, t, e) => Po(i, typeof t != "symbol" ? t + "" : t, e);
+}, ln = (i, t) => (e, n) => t(e, n, i), Xr = (i, t, e) => Po(i, typeof t != "symbol" ? t + "" : t, e);
 const No = "SHEET_IMAGE_UI_PLUGIN";
-let Lt = class extends Pi {
+let Ht = class extends Pi {
   constructor(i = sr, t, e, n) {
     super(), this._config = i, this._injector = t, this._renderManagerService = e, this._configService = n;
     const { menu: r, ...s } = Ai(
@@ -4078,80 +4078,80 @@ let Lt = class extends Pi {
   onStarting() {
     Ni(this._injector, [
       [lt],
+      [Lt],
+      [kt],
       [Ft],
-      [Nt],
       [jt],
       [Bt],
-      [Wt],
-      [kt],
       [$t],
       [xt],
-      [En, { useClass: In }]
-    ]), Qt(this._injector, [
+      [Wt],
+      [yn, { useClass: vn }]
+    ]), en(this._injector, [
       [lt]
     ]);
   }
   onReady() {
-    Qt(this._injector, [
-      [Wt],
-      [xt]
+    en(this._injector, [
+      [Bt],
+      [Wt]
     ]);
   }
   onRendered() {
-    this._registerRenderModules(), Qt(this._injector, [
-      [Bt],
+    this._registerRenderModules(), en(this._injector, [
       [jt],
       [Ft],
-      [kt],
-      [$t]
+      [Lt],
+      [$t],
+      [xt]
     ]);
   }
   onSteady() {
-    this._injector.get(Nt);
+    this._injector.get(kt);
   }
   _registerRenderModules() {
     [
       [dt],
-      [Dn],
       [Rn],
-      [Cn]
+      [Cn],
+      [In]
     ].forEach((i) => {
       this.disposeWithMe(this._renderManagerService.registerRenderModule(k.UNIVER_SHEET, i));
     });
   }
 };
-Yr(Lt, "type", k.UNIVER_SHEET);
-Yr(Lt, "pluginName", No);
-Lt = Ao([
+Xr(Ht, "type", k.UNIVER_SHEET);
+Xr(Ht, "pluginName", No);
+Ht = Ao([
   Oi(os, ws, Rs, ki),
-  un(1, A(qe)),
-  un(2, ee),
-  un(3, Ui)
-], Lt);
+  ln(1, A(qe)),
+  ln(2, ee),
+  ln(3, Ui)
+], Ht);
 export {
-  In as BatchSaveImagesService,
+  vn as BatchSaveImagesService,
   H as ClearSheetDrawingTransformerOperation,
-  kr as DeleteDrawingsCommand,
-  Fr as EditSheetDrawingOperation,
+  $r as DeleteDrawingsCommand,
+  Lr as EditSheetDrawingOperation,
   ye as FileNamePart,
-  $r as GroupSheetDrawingCommand,
-  En as IBatchSaveImagesService,
-  Kt as InsertFloatImageCommand,
-  Xt as InsertSheetDrawingCommand,
+  xr as GroupSheetDrawingCommand,
+  yn as IBatchSaveImagesService,
+  Jt as InsertFloatImageCommand,
+  zt as InsertSheetDrawingCommand,
   gt as MoveDrawingsCommand,
   ht as RemoveSheetDrawingCommand,
-  Gr as SHEETS_IMAGE_MENU_ID,
+  Yr as SHEETS_IMAGE_MENU_ID,
   io as SHEET_FLOAT_DOM_PREFIX,
   ct as SaveCellImagesCommand,
-  xr as SetDrawingArrangeCommand,
-  zt as SetSheetDrawingCommand,
+  Wr as SetDrawingArrangeCommand,
+  Kt as SetSheetDrawingCommand,
   lt as SheetCanvasFloatDomManagerService,
   mo as SheetDrawingAnchor,
   dt as SheetDrawingUpdateController,
-  jr as SidebarSheetDrawingOperation,
-  Wr as UngroupSheetDrawingCommand,
-  Lt as UniverSheetsDrawingUIPlugin,
-  fe as calcSheetFloatDomPosition,
+  Fr as SidebarSheetDrawingOperation,
+  Br as UngroupSheetDrawingCommand,
+  Ht as UniverSheetsDrawingUIPlugin,
+  me as calcSheetFloatDomPosition,
   J as drawingPositionToTransform,
   j as transformToDrawingPosition
 };