@univerjs/sheets-drawing-ui 0.7.0 → 0.8.0-beta.0

package/lib/index.js

@@ -1,21 +1,21 @@
 var Nr = Object.defineProperty;
 var kr = (i, t, e) => t in i ? Nr(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
 var ee = (i, t, e) => kr(i, typeof t != "symbol" ? t + "" : t, e);
-import { CommandType as Z, ICommandService as G, IUndoRedoService as Le, sequenceExecute as Ln, LocaleService as nt, IUniverInstanceService as Se, Inject as A, Injector as Ye, IContextService as Yn, IImageIoService as Wr, RxDisposable as jr, UniverInstanceType as x, FOCUSING_COMMON_DRAWINGS as xe, DrawingTypeEnum as j, Disposable as re, ArrangeTypeEnum as pt, createDocumentModelWithStyle as Ht, ObjectRelativeFromV as pn, ObjectRelativeFromH as wn, WrapTextType as _n, PositionedObjectLayoutType as vn, BooleanNumber as Sn, BuildTextUtils as zt, ImageSourceType as In, generateRandomId as bt, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as qe, DOCS_ZEN_EDITOR_UNIT_ID_KEY as Be, InterceptorEffectEnum as Br, ObjectMatrix as $r, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as xr, Tools as Re, IPermissionService as Fr, UserManagerService as Lr, LifecycleService as Yr, LifecycleStages as Gr, DisposableCollection as wt, fromEventSubject as Xr, PRINT_CHART_COMPONENT_KEY as Vr, Rectangle as Hr, Direction as ve, FOCUSING_FX_BAR_EDITOR as zr, EDITOR_ACTIVATED as Kr, FOCUSING_PANEL_EDITOR as Zr, DependentOn as Jr, IConfigService as qr, Plugin as Qr, merge as ei, registerDependencies as ti, touchDependencies as Ft } from "@univerjs/core";
+import { CommandType as Z, ICommandService as G, IUndoRedoService as Ye, sequenceExecute as Yn, LocaleService as nt, IUniverInstanceService as Se, Inject as A, Injector as Le, IContextService as Ln, IImageIoService as Wr, RxDisposable as jr, UniverInstanceType as x, FOCUSING_COMMON_DRAWINGS as xe, DrawingTypeEnum as j, Disposable as re, ArrangeTypeEnum as pt, createDocumentModelWithStyle as Ht, ObjectRelativeFromV as pn, ObjectRelativeFromH as wn, WrapTextType as _n, PositionedObjectLayoutType as vn, BooleanNumber as Sn, BuildTextUtils as zt, ImageSourceType as In, generateRandomId as bt, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as qe, DOCS_ZEN_EDITOR_UNIT_ID_KEY as Be, InterceptorEffectEnum as Br, ObjectMatrix as $r, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as xr, Tools as Re, IPermissionService as Fr, UserManagerService as Yr, LifecycleService as Lr, LifecycleStages as Gr, DisposableCollection as wt, fromEventSubject as Xr, PRINT_CHART_COMPONENT_KEY as Vr, Rectangle as Hr, Direction as ve, FOCUSING_FX_BAR_EDITOR as zr, EDITOR_ACTIVATED as Kr, FOCUSING_PANEL_EDITOR as Zr, DependentOn as Jr, IConfigService as qr, Plugin as Qr, merge as ei, registerDependencies as ti, touchDependencies as Ft } from "@univerjs/core";
 import { DocDrawingController as ni, UniverDocsDrawingPlugin as ri } from "@univerjs/docs-drawing";
-import { SetDrawingSelectedOperation as Nt, IDrawingManagerService as ie, IImageIoService as ii, DRAWING_IMAGE_ALLOW_IMAGE_LIST as Cn, DRAWING_IMAGE_COUNT_LIMIT as Dn, ImageUploadStatusType as Pe, DRAWING_IMAGE_ALLOW_SIZE as bn, getImageSize as Lt, DRAWING_IMAGE_WIDTH_LIMIT as Rn, DRAWING_IMAGE_HEIGHT_LIMIT as Mn, ImageSourceType as si, getDrawingShapeKeyByDrawingSearch as Ie, UniverDrawingPlugin as oi } from "@univerjs/drawing";
+import { SetDrawingSelectedOperation as Nt, IDrawingManagerService as ie, IImageIoService as ii, DRAWING_IMAGE_ALLOW_IMAGE_LIST as Cn, DRAWING_IMAGE_COUNT_LIMIT as Dn, ImageUploadStatusType as Pe, DRAWING_IMAGE_ALLOW_SIZE as bn, getImageSize as Yt, DRAWING_IMAGE_WIDTH_LIMIT as Rn, DRAWING_IMAGE_HEIGHT_LIMIT as Mn, ImageSourceType as si, getDrawingShapeKeyByDrawingSearch as Ie, UniverDrawingPlugin as oi } from "@univerjs/drawing";
 import { ImageCropperObject as ai, COMPONENT_IMAGE_POPUP_MENU as ci, OpenImageCropOperation as di, ImageResetSizeOperation as li, DrawingRenderService as Gn, DrawingCommonPanel as ui, UniverDrawingUIPlugin as hi } from "@univerjs/drawing-ui";
-import { IRenderManagerService as J, CURSOR_TYPE as gi, precisionTo as _t, transformObjectOutOfGroup as fi, getGroupState as mi, getCurrentTypeOfRenderer as on, RENDER_CLASS_TYPE as Ae, Rect as Ne, ObjectType as yn, DRAWING_OBJECT_LAYER_INDEX as Yt, SHEET_VIEWPORT_KEY as Xn } from "@univerjs/engine-render";
+import { IRenderManagerService as J, CURSOR_TYPE as gi, precisionTo as _t, transformObjectOutOfGroup as fi, getGroupState as mi, getCurrentTypeOfRenderer as on, RENDER_CLASS_TYPE as Ae, Rect as Ne, ObjectType as yn, DRAWING_OBJECT_LAYER_INDEX as Lt, SHEET_VIEWPORT_KEY as Xn } from "@univerjs/engine-render";
 import { ISheetDrawingService as se, DrawingApplyType as U, SetDrawingApplyMutation as P, SheetDrawingAnchorType as O, UniverSheetsDrawingPlugin as pi } from "@univerjs/sheets-drawing";
 import { MessageType as we, render as wi, unmount as _i, clsx as vi, RadioGroup as Si, Radio as Gt } from "@univerjs/design";
 import { SheetCanvasPopManagerService as Ii, HoverManagerService as Ci, SheetSkeletonManagerService as V, convertPositionSheetOverGridToAbsolute as Di, ISheetSelectionRenderService as Ge, attachRangeWithCoord as Vn, IEditorBridgeService as bi, IAutoFillService as Ri, EditingRenderController as Mi, SetCellEditVisibleOperation as En, PREDEFINED_HOOK_NAME as $e, COPY_TYPE as Ce, discreteRangeToRange as Tn, virtualizeDiscreteRanges as yi, ISheetClipboardService as Ei, SetZoomRatioOperation as On, SetScrollOperation as Ti, SheetPrintInterceptorService as Oi, getCurrentRangeDisable$ as Ui } from "@univerjs/sheets-ui";
-import { ISidebarService as Pi, IMessageService as Hn, ILocalFileService as Ai, IDialogService as Ni, IClipboardInterfaceService as ki, CanvasFloatDomService as Wi, PrintFloatDomSingle as ji, ComponentManager as zn, connectInjector as Bi, getMenuHiddenObservable as an, MenuItemType as cn, useDependency as Qe, RibbonStartGroup as $i, KeyCode as Fe, IMenuManagerService as xi, IShortcutService as Fi } from "@univerjs/ui";
-import { takeUntil as Un, throttleTime as Li, combineLatest as vt, switchMap as _e, EMPTY as me, tap as Pn, map as Me, distinctUntilChanged as An, Subject as Xt, filter as Yi, take as Gi, BehaviorSubject as je, of as Nn } from "rxjs";
+import { ISidebarService as Pi, IMessageService as Hn, ILocalFileService as Ai, IDialogService as Ni, IClipboardInterfaceService as ki, CanvasFloatDomService as Wi, PrintFloatDomSingle as ji, ComponentManager as zn, connectInjector as Bi, getMenuHiddenObservable as an, MenuItemType as cn, useDependency as Qe, RibbonInsertGroup as $i, KeyCode as Fe, IMenuManagerService as xi, IShortcutService as Fi } from "@univerjs/ui";
+import { takeUntil as Un, throttleTime as Yi, combineLatest as vt, switchMap as _e, EMPTY as me, tap as Pn, map as Me, distinctUntilChanged as An, Subject as Xt, filter as Li, take as Gi, BehaviorSubject as je, of as Nn } from "rxjs";
 import { SheetInterceptorService as kt, getSheetCommandTarget as oe, SheetsSelectionsService as dn, SetRangeValuesCommand as kn, INTERCEPTOR_POINT as Xi, InterceptCellContentPriority as Vi, WorkbookViewPermission as Wn, WorksheetViewPermission as jn, WorkbookEditablePermission as Kt, WorksheetEditPermission as Zt, SetFrozenMutation as Hi, SetWorksheetRowAutoHeightMutation as zi, COMMAND_LISTENER_SKELETON_CHANGE as Ki, InsertRowCommand as Kn, InsertColCommand as Zn, RemoveRowCommand as Jn, RemoveColCommand as qn, DeleteRangeMoveLeftCommand as Qn, DeleteRangeMoveUpCommand as er, InsertRangeMoveDownCommand as tr, InsertRangeMoveRightCommand as nr, DeltaRowHeightCommand as Jt, SetRowHeightCommand as qt, DeltaColumnWidthCommand as rr, SetColWidthCommand as ir, SetRowHiddenCommand as sr, SetSpecificRowsVisibleCommand as or, SetSpecificColsVisibleCommand as ar, SetColHiddenCommand as cr, MoveColsCommand as dr, MoveRowsCommand as lr, MoveRangeCommand as ur, SetRowVisibleMutation as Zi, SetRowHiddenMutation as Ji, SetColVisibleMutation as qi, SetColHiddenMutation as Qi, SetWorksheetRowHeightMutation as es, SetWorksheetColWidthMutation as ts, SetWorksheetActiveOperation as ns, RangeProtectionPermissionEditPoint as rs } from "@univerjs/sheets";
 import { docDrawingPositionToTransform as Bn, ReplaceSnapshotCommand as is, InnerPasteCommand as ss } from "@univerjs/docs-ui";
 import { jsx as ae, jsxs as Qt } from "react/jsx-runtime";
 import { useMemo as os, forwardRef as hr, useRef as as, createElement as gr, useState as en, useEffect as fr } from "react";
-const cs = "sheets-drawing-ui.config", $n = {}, L = {
+const cs = "sheets-drawing-ui.config", $n = {}, Y = {
   id: "sheet.operation.clear-drawing-transformer",
   type: Z.MUTATION,
   handler: (i, t) => {
@@ -30,27 +30,27 @@ const cs = "sheets-drawing-ui.config", $n = {}, L = {
   type: Z.COMMAND,
   handler: (i, t) => {
     var S, I, b;
-    const e = i.get(G), n = i.get(Le), r = i.get(kt), s = i.get(se);
+    const e = i.get(G), n = i.get(Ye), r = i.get(kt), s = i.get(se);
     if (!t) return !1;
     const { drawings: o } = t, a = [];
     o.forEach((v) => {
-      const { unitId: D } = v;
-      a.push(D);
+      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: rt.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 Ln([...(S = m.preRedos) != null ? S : [], p, ...m.redos], e) ? (n.pushUndoRedo({
+    const d = s.getBatchRemoveOp(o), { unitId: u, subUnitId: c, undo: l, redo: g, objects: h } = d, f = r.onCommandExecute({ id: rt.id, params: t }), p = { id: P.id, params: { unitId: u, subUnitId: c, op: g, objects: h, type: U.REMOVE } }, m = { id: P.id, params: { unitId: u, subUnitId: c, op: l, objects: h, type: U.INSERT } };
+    return Yn([...(S = f.preRedos) != null ? S : [], p, ...f.redos], e) ? (n.pushUndoRedo({
       unitID: u,
       undoMutations: [
-        ...(I = m.preUndos) != null ? I : [],
-        f,
-        ...m.undos,
-        { id: L.id, params: a }
+        ...(I = f.preUndos) != null ? I : [],
+        m,
+        ...f.undos,
+        { id: Y.id, params: a }
       ],
       redoMutations: [
-        ...(b = m.preRedos) != null ? b : [],
+        ...(b = f.preRedos) != null ? b : [],
         p,
-        ...m.redos,
-        { id: L.id, params: a }
+        ...f.redos,
+        { id: Y.id, params: a }
       ]
     }), !0) : !1;
   }
@@ -154,8 +154,8 @@ let Rt = class extends jr {
         const d = a.oKey, u = this._drawingManagerService.getDrawingOKey(d);
         if (!u)
           return;
-        const { unitId: c, subUnitId: l, drawingId: g, drawingType: h } = u, m = u.data;
-        if (m && m.disablePopup)
+        const { unitId: c, subUnitId: l, drawingId: g, drawingType: h } = u, f = u.data;
+        if (f && f.disablePopup)
           return;
         r == null || r.dispose();
         const p = this._canvasPopManagerService.getFeatureMenu(c, l, g, h);
@@ -216,14 +216,14 @@ let Rt = class extends jr {
   }
 };
 Rt = ls([
-  de(0, A(Ye)),
+  de(0, A(Le)),
   de(1, A(nt)),
   de(2, ie),
   de(3, A(Ii)),
   de(4, J),
   de(5, Se),
   de(6, Hn),
-  de(7, Yn),
+  de(7, Ln),
   de(8, Wr),
   de(9, G)
 ], Rt);
@@ -239,7 +239,7 @@ let tn = class extends re {
     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(Li(33)).subscribe((t) => {
+    this.disposeWithMe(this._hoverManagerService.currentRichTextNoDistinct$.pipe(Yi(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(gi.ZOOM_IN)) : this._isSetCursor && (this._isSetCursor = !1, this._context.scene.resetCursor());
@@ -272,9 +272,9 @@ function z(i, t, e) {
     { from: n, to: r },
     e
   );
-  let { left: g, top: h, width: m, height: p } = l;
-  const f = e.getCurrentSkeleton(), _ = f.rowHeaderWidth + f.columnTotalWidth, S = f.columnHeaderHeight + f.rowTotalHeight;
-  return g + m > _ && (g = _ - m), h + p > S && (h = S - p), {
+  let { left: g, top: h, width: f, height: p } = l;
+  const m = e.getCurrentSkeleton(), _ = m.rowHeaderWidth + m.columnTotalWidth, S = m.columnHeaderHeight + m.rowTotalHeight;
+  return g + f > _ && (g = _ - f), h + p > S && (h = S - p), {
     flipY: s,
     flipX: o,
     angle: a,
@@ -282,7 +282,7 @@ function z(i, t, e) {
     skewY: u,
     left: g,
     top: h,
-    width: m,
+    width: f,
     height: p
   };
 }
@@ -298,7 +298,7 @@ function $(i, t) {
   }, h = t.getCellWithCoordByOffset(e + r, n + s);
   if (h == null)
     return;
-  const m = {
+  const f = {
     column: h.actualColumn,
     columnOffset: _t(e + r - h.startX, 1),
     row: h.actualRow,
@@ -311,7 +311,7 @@ function $(i, t) {
     skewX: u,
     skewY: c,
     from: g,
-    to: m
+    to: f
   };
 }
 var gs = Object.getOwnPropertyDescriptor, fs = (i, t, e, n) => {
@@ -349,10 +349,10 @@ function ms(i) {
   const t = [];
   return i.forEach((e) => {
     const { parent: n, children: r } = e, { unitId: s, subUnitId: o, drawingId: a } = n, d = mi(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 g = l.transform || { left: 0, top: 0 }, { unitId: h, subUnitId: f, drawingId: p } = l;
       return {
         unitId: h,
-        subUnitId: m,
+        subUnitId: f,
         drawingId: p,
         transform: {
           ...g,
@@ -381,12 +381,12 @@ function ps(i) {
     if (d == null)
       return;
     const u = r.map((l) => {
-      const { transform: g } = l, { unitId: h, subUnitId: m, drawingId: p } = l, f = fi(g || {}, d, d.width || 0, d.height || 0);
+      const { transform: g } = l, { unitId: h, subUnitId: f, drawingId: p } = l, m = fi(g || {}, d, d.width || 0, d.height || 0);
       return {
         unitId: h,
-        subUnitId: m,
+        subUnitId: f,
         drawingId: p,
-        transform: f,
+        transform: m,
         groupId: void 0
       };
     }), c = {
@@ -409,11 +409,11 @@ const _r = {
   id: "sheet.command.group-sheet-image",
   type: Z.COMMAND,
   handler: (i, t) => {
-    const e = i.get(G), n = i.get(Le), r = i.get(se);
+    const e = i.get(G), n = i.get(Ye), r = i.get(se);
     if (!t) return !1;
     const s = [];
-    t.forEach(({ parent: h, children: m }) => {
-      s.push(h.unitId), m.forEach((p) => {
+    t.forEach(({ parent: h, children: f }) => {
+      s.push(h.unitId), f.forEach((p) => {
         s.push(p.unitId);
       });
     });
@@ -422,11 +422,11 @@ const _r = {
       unitID: a,
       undoMutations: [
         { id: P.id, params: { op: u, unitId: a, subUnitId: d, objects: ps(l), type: U.UNGROUP } },
-        { id: L.id, params: s }
+        { id: Y.id, params: s }
       ],
       redoMutations: [
         { id: P.id, params: { op: c, unitId: a, subUnitId: d, objects: l, type: U.GROUP } },
-        { id: L.id, params: s }
+        { id: Y.id, params: s }
       ]
     }), !0) : !1;
   }
@@ -435,22 +435,22 @@ const _r = {
   type: Z.COMMAND,
   handler: (i, t) => {
     var S, I, b;
-    const e = i.get(G), n = i.get(Le), r = i.get(se), s = i.get(kt);
+    const e = i.get(G), n = i.get(Ye), r = i.get(se), s = i.get(kt);
     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: Wt.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 Ln([...(S = m.preRedos) != null ? S : [], 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, f = s.onCommandExecute({ id: Wt.id, params: t }), p = { id: P.id, params: { op: g, unitId: u, subUnitId: c, objects: h, type: U.INSERT } }, m = { id: P.id, params: { op: l, unitId: u, subUnitId: c, objects: h, type: U.REMOVE } };
+    return Yn([...(S = f.preRedos) != null ? S : [], p, ...f.redos], e) ? (n.pushUndoRedo({
       unitID: u,
       undoMutations: [
-        ...(I = m.preUndos) != null ? I : [],
-        f,
-        ...m.undos,
-        { id: L.id, params: a }
+        ...(I = f.preUndos) != null ? I : [],
+        m,
+        ...f.undos,
+        { id: Y.id, params: a }
       ],
       redoMutations: [
-        ...(b = m.preRedos) != null ? b : [],
+        ...(b = f.preRedos) != null ? b : [],
         p,
-        ...m.redos,
-        { id: L.id, params: a }
+        ...f.redos,
+        { id: Y.id, params: a }
       ]
     }), !0) : !1;
   }
@@ -458,7 +458,7 @@ const _r = {
   id: "sheet.command.set-drawing-arrange",
   type: Z.COMMAND,
   handler: (i, t) => {
-    const e = i.get(G), n = i.get(Le);
+    const e = i.get(G), n = i.get(Ye);
     if (!t) return !1;
     const r = i.get(se), { unitId: s, subUnitId: o, drawingIds: a, arrangeType: d } = t, u = { unitId: s, subUnitId: o, drawingIds: a };
     let c;
@@ -479,18 +479,18 @@ const _r = {
   id: "sheet.command.set-sheet-image",
   type: Z.COMMAND,
   handler: (i, t) => {
-    const e = i.get(G), n = i.get(Le), r = i.get(se);
+    const e = i.get(G), n = i.get(Ye), r = i.get(se);
     if (!t) return !1;
     const { drawings: s } = t, o = r.getBatchUpdateOp(s), { unitId: a, subUnitId: d, undo: u, redo: c, objects: l } = o;
     return e.syncExecuteCommand(P.id, { unitId: a, subUnitId: d, op: c, objects: l, type: U.UPDATE }) ? (n.pushUndoRedo({
       unitID: a,
       undoMutations: [
         { id: P.id, params: { unitId: a, subUnitId: d, op: u, objects: l, type: U.UPDATE } },
-        { id: L.id, params: [a] }
+        { id: Y.id, params: [a] }
       ],
       redoMutations: [
         { id: P.id, params: { unitId: a, subUnitId: d, op: c, objects: l, type: U.UPDATE } },
-        { id: L.id, params: [a] }
+        { id: Y.id, params: [a] }
       ]
     }), !0) : !1;
   }
@@ -498,11 +498,11 @@ const _r = {
   id: "sheet.command.ungroup-sheet-image",
   type: Z.COMMAND,
   handler: (i, t) => {
-    const e = i.get(G), n = i.get(Le), r = i.get(se);
+    const e = i.get(G), n = i.get(Ye), r = i.get(se);
     if (!t) return !1;
     const s = [];
-    t.forEach(({ parent: h, children: m }) => {
-      s.push(h.unitId), m.forEach((p) => {
+    t.forEach(({ parent: h, children: f }) => {
+      s.push(h.unitId), f.forEach((p) => {
         s.push(p.unitId);
       });
     });
@@ -511,11 +511,11 @@ const _r = {
       unitID: a,
       undoMutations: [
         { id: P.id, params: { op: u, unitId: a, subUnitId: d, objects: ms(l), type: U.GROUP } },
-        { id: L.id, params: s }
+        { id: Y.id, params: s }
       ],
       redoMutations: [
         { id: P.id, params: { op: c, unitId: a, subUnitId: d, objects: l, type: U.UNGROUP } },
-        { id: L.id, params: s }
+        { id: Y.id, params: s }
       ]
     }), !0) : !1;
   }
@@ -537,7 +537,7 @@ function rn(i, t, e, n, r) {
   const c = (S = d.with(V).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, _ = !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, f = o / s, m = Math.ceil(Math.min(g, h * f)) / o, _ = !m || Number.isNaN(m) ? 1e-3 : m;
   return {
     width: e * _,
     height: n * _
@@ -588,15 +588,15 @@ let et = class extends re {
     }
     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 Lt(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 Yt(u || ""), { width: h, height: f } = this._context.scene;
     this._imageIoService.addImageSourceCache(d, a, g);
     let p = 1;
     if (c > Rn || l > Mn) {
       const S = Rn / c, I = Mn / l;
       p = Math.max(S, I);
     }
-    const f = this._getImagePosition(c * p, l * p, h, m);
-    if (f == null)
+    const m = this._getImagePosition(c * p, l * p, h, f);
+    if (m == null)
       return;
     const _ = {
       unitId: r,
@@ -605,8 +605,8 @@ let et = class extends re {
       drawingType: j.DRAWING_IMAGE,
       imageSourceType: a,
       source: d,
-      transform: z(f, this._selectionRenderService, this._skeletonManagerService),
-      sheetTransform: f
+      transform: z(m, this._selectionRenderService, this._skeletonManagerService),
+      sheetTransform: m
     };
     return this._commandService.executeCommand(Wt.id, {
       unitId: r,
@@ -615,48 +615,50 @@ let et = class extends re {
   }
   // eslint-disable-next-line max-lines-per-function
   async _insertCellImage(t, e) {
-    var _, S;
+    var I, b;
     let n;
     try {
       n = await this._imageIoService.saveImage(t);
-    } catch (I) {
-      const b = I.message;
-      b === Pe.ERROR_EXCEED_SIZE ? this._messageService.show({
+    } catch (v) {
+      const C = v.message;
+      C === Pe.ERROR_EXCEED_SIZE ? this._messageService.show({
         type: we.Error,
         content: this._localeService.t("update-status.exceedMaxSize", String(bn / (1024 * 1024)))
-      }) : b === Pe.ERROR_IMAGE_TYPE ? this._messageService.show({
+      }) : C === Pe.ERROR_IMAGE_TYPE ? this._messageService.show({
         type: we.Error,
         content: this._localeService.t("update-status.invalidImageType")
-      }) : b === Pe.ERROR_IMAGE && this._messageService.show({
+      }) : C === Pe.ERROR_IMAGE && this._messageService.show({
         type: we.Error,
         content: this._localeService.t("update-status.invalidImage")
       });
     }
     if (n == null)
       return !1;
-    const { imageId: r, imageSourceType: s, source: o, base64Cache: a } = n, { width: d, height: u, image: c } = await Lt(a || "");
+    const { imageId: r, imageSourceType: s, source: o, base64Cache: a } = n, { width: d, height: u, image: c } = await Yt(a || "");
     this._imageIoService.addImageSourceCache(o, s, c);
     const l = this._workbookSelections.getCurrentLastSelection();
     if (!l)
       return !1;
-    const g = Ht("", {}), h = rn(
+    let g = l.primary.actualRow, h = l.primary.actualColumn;
+    l.primary.isMerged && (g = l.primary.startRow, h = l.primary.startColumn);
+    const f = Ht("", {}), p = rn(
       this._injector,
       {
         unitId: this._context.unitId,
         subUnitId: this._context.unit.getActiveSheet().getSheetId(),
-        row: l.primary.actualRow,
-        col: l.primary.actualColumn
+        row: g,
+        col: h
       },
       d,
       u,
       0
     );
-    if (!h)
+    if (!p)
       return !1;
     const m = {
       size: {
-        width: h.width,
-        height: h.height
+        width: p.width,
+        height: p.height
       },
       positionH: {
         relativeFrom: wn.PAGE,
@@ -667,9 +669,9 @@ let et = class extends re {
         posOffset: 0
       },
       angle: 0
-    }, p = {
-      unitId: g.getUnitId(),
-      subUnitId: g.getUnitId(),
+    }, _ = {
+      unitId: f.getUnitId(),
+      subUnitId: f.getUnitId(),
       drawingId: r,
       drawingType: j.DRAWING_IMAGE,
       imageSourceType: s,
@@ -686,20 +688,20 @@ let et = class extends re {
       distL: 0,
       distR: 0,
       distT: 0
-    }, f = zt.drawing.add({
-      documentDataModel: g,
-      drawings: [p],
+    }, S = zt.drawing.add({
+      documentDataModel: f,
+      drawings: [_],
       selection: {
         collapsed: !0,
         startOffset: 0,
         endOffset: 0
       }
     });
-    return f ? (g.apply(f), this._commandService.syncExecuteCommand(kn.id, {
+    return S ? (f.apply(S), this._commandService.syncExecuteCommand(kn.id, {
       value: {
-        [(_ = e == null ? void 0 : e.row) != null ? _ : l.primary.actualRow]: {
-          [(S = e == null ? void 0 : e.col) != null ? S : l.primary.actualColumn]: {
-            p: g.getSnapshot(),
+        [(I = e == null ? void 0 : e.row) != null ? I : g]: {
+          [(b = e == null ? void 0 : e.col) != null ? b : h]: {
+            p: f.getSnapshot(),
             t: 1
           }
         }
@@ -711,7 +713,7 @@ let et = class extends re {
   // eslint-disable-next-line max-lines-per-function
   async insertCellImageByUrl(t, e) {
     var g, h;
-    const { width: n, height: r, image: s } = await Lt(t || "");
+    const { width: n, height: r, image: s } = await Yt(t || "");
     this._imageIoService.addImageSourceCache(t, In.URL, s);
     const o = this._workbookSelections.getCurrentLastSelection();
     if (!o)
@@ -806,24 +808,24 @@ let et = class extends re {
       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 m = this._selectionRenderService.getCellWithCoordByOffset(c, l);
+      if (m == null)
         return;
-      c = f.startX, l = f.startY, d = f.actualColumn, u = f.actualRow;
+      c = m.startX, l = m.startY, d = m.actualColumn, u = m.actualRow;
     }
     const h = {
       column: d,
       columnOffset: 0,
       row: u,
       rowOffset: 0
-    }, m = this._selectionRenderService.getCellWithCoordByOffset(c + t, l + e);
-    if (m == null)
+    }, f = this._selectionRenderService.getCellWithCoordByOffset(c + t, l + e);
+    if (f == null)
       return;
     const p = {
-      column: m.actualColumn,
-      columnOffset: c + t - m.startX,
-      row: m.actualRow,
-      rowOffset: l + e - m.startY
+      column: f.actualColumn,
+      columnOffset: c + t - f.startX,
+      row: f.actualRow,
+      rowOffset: l + e - f.startY
     };
     return {
       from: h,
@@ -891,11 +893,11 @@ et = _s([
   te(5, Ai),
   te(6, se),
   te(7, ie),
-  te(8, Yn),
+  te(8, Ln),
   te(9, Hn),
   te(10, A(nt)),
   te(11, A(dn)),
-  te(12, A(Ye))
+  te(12, A(Le))
 ], et);
 var Ss = Object.getOwnPropertyDescriptor, Is = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? Ss(t, e) : t, s = i.length - 1, o; s >= 0; s--)
@@ -952,7 +954,7 @@ let Mt = class extends re {
 Mt = Is([
   ke(0, G),
   ke(1, A(kt)),
-  ke(2, A(Ye)),
+  ke(2, A(Le)),
   ke(3, ie),
   ke(4, A(ni)),
   ke(5, A(bi))
@@ -981,7 +983,7 @@ let yt = class extends re {
 };
 yt = Ds([
   xn(0, A(Ri)),
-  xn(1, A(Ye))
+  xn(1, A(Le))
 ], yt);
 var bs = Object.getOwnPropertyDescriptor, Rs = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? bs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
@@ -1204,16 +1206,16 @@ let Tt = class extends re {
       return;
     const { startX: o, endX: a, startY: d, endY: u } = s, c = this._drawingService.getDrawingData(t, e), l = this._focusedDrawings.slice();
     if (Object.keys(c).forEach((h) => {
-      const m = c[h], { transform: p } = m;
-      if (m.anchorType !== O.Both || !p)
+      const f = c[h], { transform: p } = f;
+      if (f.anchorType !== O.Both || !p)
         return;
-      const { left: f = 0, top: _ = 0, width: S = 0, height: I = 0 } = p, { drawingStartX: b, drawingEndX: v, drawingStartY: D, drawingEndY: w } = {
-        drawingStartX: f,
-        drawingEndX: f + S,
+      const { left: m = 0, top: _ = 0, width: S = 0, height: I = 0 } = p, { drawingStartX: b, drawingEndX: v, drawingStartY: C, drawingEndY: w } = {
+        drawingStartX: m,
+        drawingEndX: m + S,
         drawingStartY: _,
         drawingEndY: _ + I
       };
-      o <= b && v <= a && d <= D && w <= u && l.push(m);
+      o <= b && v <= a && d <= C && w <= u && l.push(f);
     }), l.length)
       return {
         copyRange: n,
@@ -1234,17 +1236,17 @@ let Tt = class extends re {
       unitId: s,
       subUnitId: o,
       isCut: e === Ce.CUT,
-      getTransform: (m, p) => {
+      getTransform: (f, p) => {
         var S;
-        const f = u.attachRangeWithCoord({
+        const m = u.attachRangeWithCoord({
           startRow: h.startRow,
           endRow: h.endRow,
           startColumn: h.startColumn,
           endColumn: h.endColumn
         }), _ = {
-          ...m,
-          left: f == null ? void 0 : f.startX,
-          top: f == null ? void 0 : f.startY
+          ...f,
+          left: m == null ? void 0 : m.startX,
+          top: m == null ? void 0 : m.startY
         };
         return {
           transform: _,
@@ -1264,7 +1266,7 @@ let Tt = class extends re {
       const { transform: l, sheetTransform: g } = c;
       if (!l)
         return;
-      const h = s(l, g), m = {
+      const h = s(l, g), f = {
         ...c,
         unitId: n,
         subUnitId: r,
@@ -1273,14 +1275,14 @@ let Tt = class extends re {
         sheetTransform: h.sheetTransform
       };
       if (o) {
-        const { undo: p, redo: f, objects: _ } = u.getBatchUpdateOp([m]);
+        const { undo: p, redo: m, objects: _ } = u.getBatchUpdateOp([f]);
         a.push({
           id: P.id,
           params: {
             unitId: n,
             subUnitId: r,
             type: U.UPDATE,
-            op: f,
+            op: m,
             objects: _
           }
         }), d.push({
@@ -1294,8 +1296,8 @@ let Tt = class extends re {
           }
         });
       } else {
-        const { undo: p, redo: f, objects: _ } = u.getBatchAddOp([m]);
-        a.push({ id: P.id, params: { op: f, unitId: n, subUnitId: r, objects: _, type: U.INSERT } }), d.push({ id: P.id, params: { op: p, unitId: n, subUnitId: r, objects: _, type: U.REMOVE } });
+        const { undo: p, redo: m, objects: _ } = u.getBatchAddOp([f]);
+        a.push({ id: P.id, params: { op: m, unitId: n, subUnitId: r, objects: _, type: U.INSERT } }), d.push({ id: P.id, params: { op: p, unitId: n, subUnitId: r, objects: _, type: U.REMOVE } });
       }
     }), { redos: a, undos: d };
   }
@@ -1322,41 +1324,41 @@ let Tt = class extends re {
         pasteTo: { unitId: n, subUnitId: r, range: Tn(o) },
         pasteType: s
       }, d);
-    const { ranges: [l, g], mapFunc: h } = yi([a, o]), { row: m, col: p } = h(l.startRow, l.startColumn), { row: f, col: _ } = h(g.startRow, g.startColumn), S = u.attachRangeWithCoord({
-      startRow: m,
-      endRow: m,
+    const { ranges: [l, g], mapFunc: h } = yi([a, o]), { row: f, col: p } = h(l.startRow, l.startColumn), { row: m, col: _ } = h(g.startRow, g.startColumn), S = u.attachRangeWithCoord({
+      startRow: f,
+      endRow: f,
       startColumn: p,
       endColumn: p
     }), I = u.attachRangeWithCoord({
-      startRow: f,
-      endRow: f,
+      startRow: m,
+      endRow: m,
       startColumn: _,
       endColumn: _
     });
     if (!S || !I || !this._copyInfo)
       return { redos: [], undos: [] };
-    const b = I.startX - S.startX, v = I.startY - S.startY, D = f - m, w = _ - p;
+    const b = I.startX - S.startX, v = I.startY - S.startY, C = m - f, w = _ - p;
     return this._generateMutations(c, {
       unitId: n,
       subUnitId: r,
-      getTransform: (C, E) => {
+      getTransform: (D, E) => {
         var T, M;
         return {
           transform: {
-            ...C,
-            left: ((T = C == null ? void 0 : C.left) != null ? T : 0) + b,
-            top: ((M = C == null ? void 0 : C.top) != null ? M : 0) + v
+            ...D,
+            left: ((T = D == null ? void 0 : D.left) != null ? T : 0) + b,
+            top: ((M = D == null ? void 0 : D.top) != null ? M : 0) + v
           },
           sheetTransform: {
             ...E,
             to: {
               ...E.to,
-              row: E.to.row + D,
+              row: E.to.row + C,
               column: E.to.column + w
             },
             from: {
               ...E.from,
-              row: E.from.row + D,
+              row: E.from.row + C,
               column: E.from.column + w
             }
           }
@@ -1551,7 +1553,7 @@ Ot = As([
   Ze(1, J),
   Ze(2, Fr),
   Ze(3, Se),
-  Ze(4, A(Lr))
+  Ze(4, A(Yr))
 ], Ot);
 var Ns = Object.getOwnPropertyDescriptor, ks = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? Ns(t, e) : t, s = i.length - 1, o; s >= 0; s--)
@@ -1559,7 +1561,7 @@ var Ns = Object.getOwnPropertyDescriptor, ks = (i, t, e, n) => {
   return r;
 }, De = (i, t) => (e, n) => t(e, n, i);
 function Dr(i, t, e, n, r, s = !1) {
-  const { scaleX: o, scaleY: a } = t.getAncestorScale(), d = t.getViewport(Xn.VIEW_MAIN), u = n.getFreeze(), { startColumn: c, startRow: l, xSplit: g, ySplit: h } = u, m = {
+  const { scaleX: o, scaleY: a } = t.getAncestorScale(), d = t.getViewport(Xn.VIEW_MAIN), u = n.getFreeze(), { startColumn: c, startRow: l, xSplit: g, ySplit: h } = u, f = {
     left: !0,
     // left means the left of pic is in a viewMainLeft
     top: !0
@@ -1567,36 +1569,36 @@ function Dr(i, t, e, n, r, s = !1) {
   if (!d)
     return {
       ...i,
-      absolute: m
+      absolute: f
     };
-  const { left: p, right: f, top: _, bottom: S } = i;
-  let { top: I, left: b, viewportScrollX: v, viewportScrollY: D } = d;
-  const { boundsOfViewArea: w, scrollDirectionResponse: y } = r || {}, { rowHeaderWidth: C, columnHeaderHeight: E } = e, T = {
+  const { left: p, right: m, top: _, bottom: S } = i;
+  let { top: I, left: b, viewportScrollX: v, viewportScrollY: C } = d;
+  const { boundsOfViewArea: w, scrollDirectionResponse: y } = r || {}, { rowHeaderWidth: D, columnHeaderHeight: E } = e, T = {
     top: s ? 0 : E,
-    left: s ? 0 : C
+    left: s ? 0 : D
   };
-  w && (Re.isDefine(T.top) && (T.top = w.top), Re.isDefine(T.left) && (T.left = w.left)), y === "HORIZONTAL" && (D = 0), y === "VERTICAL" && (v = 0);
+  w && (Re.isDefine(T.top) && (T.top = w.top), Re.isDefine(T.left) && (T.left = w.left)), y === "HORIZONTAL" && (C = 0), y === "VERTICAL" && (v = 0);
   let M = 0, R = 0;
-  const N = e.rowStartY(l - h) + E, F = e.colStartX(c - g) + C, q = e.rowStartY(l) + E, H = e.colStartX(c) + C;
+  const N = e.rowStartY(l - h) + E, F = e.colStartX(c - g) + D, q = e.rowStartY(l) + E, H = e.colStartX(c) + D;
   if (g === 0)
-    m.left = !1, M = (p - v) * o, R = (f - v) * o;
+    f.left = !1, M = (p - v) * o, R = (m - v) * o;
   else {
-    const k = p - (F - C), ce = f - (F - C);
-    f < H ? (M = k * o, R = ce * o) : p <= H && f >= H ? (M = k * o, R = Math.max(b, (f - v) * o)) : p > H && (m.left = !1, M = Math.max((p - v) * o, b), R = Math.max((f - v) * o, b));
+    const k = p - (F - D), ce = m - (F - D);
+    m < H ? (M = k * o, R = ce * o) : p <= H && m >= H ? (M = k * o, R = Math.max(b, (m - v) * o)) : p > H && (f.left = !1, M = Math.max((p - v) * o, b), R = Math.max((m - v) * o, b));
   }
-  let X = 0, Y = 0;
+  let X = 0, L = 0;
   if (h === 0)
-    m.top = !1, X = (_ - D) * a, Y = (S - D) * a;
+    f.top = !1, X = (_ - C) * a, L = (S - C) * a;
   else {
     const k = _ - (N - E), ce = S - (N - E);
-    S < q ? (X = k * a, Y = ce * a) : _ <= q && S >= q ? (X = k * a, Y = Math.max(I, (S - D) * a)) : _ > q && (m.top = !1, X = Math.max((_ - D) * a, I), Y = Math.max((S - D) * a, I));
+    S < q ? (X = k * a, L = ce * a) : _ <= q && S >= q ? (X = k * a, L = Math.max(I, (S - C) * a)) : _ > q && (f.top = !1, X = Math.max((_ - C) * a, I), L = Math.max((S - C) * a, I));
   }
-  return M = Math.max(M, T.left), X = Math.max(X, T.top), R = Math.max(R, T.left), Y = Math.max(Y, T.top), {
+  return M = Math.max(M, T.left), X = Math.max(X, T.top), R = Math.max(R, T.left), L = Math.max(L, T.top), {
     left: M,
     right: R,
     top: X,
-    bottom: Y,
-    absolute: m
+    bottom: L,
+    absolute: f
   };
 }
 const fe = (i, t, e, n, r) => {
@@ -1633,7 +1635,7 @@ let tt = class extends re {
     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() {
-    this._lifecycleService.lifecycle$.pipe(Yi((t) => t === Gr.Rendered), Gi(1)).subscribe(() => {
+    this._lifecycleService.lifecycle$.pipe(Li((t) => t === Gr.Rendered), Gi(1)).subscribe(() => {
       this._scrollUpdateListener();
     });
   }
@@ -1671,17 +1673,17 @@ let tt = class extends re {
           const { transform: l, drawingType: g, data: h } = a;
           if (g !== j.DRAWING_DOM && g !== j.DRAWING_CHART)
             return;
-          const m = this._getSceneAndTransformerByDrawingSearch(n);
-          if (m == null)
+          const f = this._getSceneAndTransformerByDrawingSearch(n);
+          if (f == null)
             return;
-          const { scene: p, canvas: f } = m;
+          const { scene: p, canvas: m } = f;
           if (l == null)
             return !0;
           if (u !== r)
             return;
-          const { left: _, top: S, width: I, height: b, angle: v, flipX: D, flipY: w, skewX: y, skewY: C } = l, E = Ie({ unitId: n, subUnitId: r, drawingId: s }), T = p.getObject(E);
+          const { left: _, top: S, width: I, height: b, angle: v, flipX: C, flipY: w, skewX: y, skewY: D } = l, E = Ie({ unitId: n, subUnitId: r, drawingId: s }), T = p.getObject(E);
           if (T != null) {
-            T.transformByState({ left: _, top: S, width: I, height: b, angle: v, flipX: D, flipY: w, skewX: y, skewY: C });
+            T.transformByState({ left: _, top: S, width: I, height: b, angle: v, flipX: C, flipY: w, skewX: y, skewY: D });
             return;
           }
           const M = {
@@ -1696,8 +1698,8 @@ let tt = class extends re {
             M.fill = k, h && h.border && (M.stroke = h.border), M.paintFirst = "stroke", M.strokeWidth = 1, M.borderEnabled = !1, M.radius = 8;
           }
           const N = new Ne(E, M);
-          R && N.setObjectType(yn.CHART), p.addObject(N, Yt), a.allowTransform !== !1 && p.attachTransformerTo(N);
-          const F = new wt(), q = fe(N, m.renderUnit.scene, c.skeleton, o.worksheet), H = new je(q), X = {
+          R && N.setObjectType(yn.CHART), p.addObject(N, Lt), a.allowTransform !== !1 && p.attachTransformerTo(N);
+          const F = new wt(), q = fe(N, f.renderUnit.scene, c.skeleton, o.worksheet), H = new je(q), X = {
             dispose: F,
             rect: N,
             position$: H,
@@ -1710,29 +1712,29 @@ let tt = class extends re {
             id: s,
             componentKey: a.componentKey,
             onPointerDown: (k) => {
-              f.dispatchEvent(new PointerEvent(k.type, k));
+              m.dispatchEvent(new PointerEvent(k.type, k));
             },
             onPointerMove: (k) => {
-              f.dispatchEvent(new PointerEvent(k.type, k));
+              m.dispatchEvent(new PointerEvent(k.type, k));
             },
             onPointerUp: (k) => {
-              f.dispatchEvent(new PointerEvent(k.type, k));
+              m.dispatchEvent(new PointerEvent(k.type, k));
             },
             onWheel: (k) => {
-              f.dispatchEvent(new WheelEvent(k.type, k));
+              m.dispatchEvent(new WheelEvent(k.type, k));
             },
             data: h,
             unitId: n
           });
-          const Y = N.onTransformChange$.subscribeEvent(() => {
-            const k = fe(N, m.renderUnit.scene, c.skeleton, o.worksheet);
+          const L = N.onTransformChange$.subscribeEvent(() => {
+            const k = fe(N, f.renderUnit.scene, c.skeleton, o.worksheet);
             H.next(
               k
             );
           });
           F.add(() => {
             this._canvasFloatDomService.removeFloatDom(s);
-          }), Y && F.add(Y), this._domLayerInfoMap.set(s, X);
+          }), L && F.add(L), this._domLayerInfoMap.set(s, X);
         });
       })
     ), this.disposeWithMe(
@@ -1900,7 +1902,7 @@ let tt = class extends re {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   addFloatDomToRange(t, e, n, r) {
-    var D, w, y;
+    var C, w, y;
     const s = oe(this._univerInstanceService, {
       unitId: e.unitId,
       subUnitId: e.subUnitId
@@ -1911,15 +1913,15 @@ let tt = class extends re {
     if (!d) return;
     const u = this._renderManagerService.getRenderById(o);
     if (!u) return;
-    const c = (D = this._renderManagerService.getRenderById(o)) == null ? void 0 : D.with(V).getWorksheetSkeleton(a);
+    const c = (C = this._renderManagerService.getRenderById(o)) == null ? void 0 : C.with(V).getWorksheetSkeleton(a);
     if (!c) return;
-    const { componentKey: l, data: g, allowTransform: h = !0 } = e, m = r != null ? r : bt(), { position: p, position$: f } = this._createRangePositionObserver(t, u, c.skeleton);
+    const { componentKey: l, data: g, allowTransform: h = !0 } = e, f = r != null ? r : bt(), { position: p, position$: m } = this._createRangePositionObserver(t, u, c.skeleton);
     if (this._getPosition(p, o) == null)
       return;
     const S = d.scene, { scaleX: I } = S.getAncestorScale(), b = Ct(p, n, I), v = {
       unitId: o,
       subUnitId: a,
-      drawingId: m,
+      drawingId: f,
       drawingType: e.type || j.DRAWING_DOM,
       componentKey: l,
       transform: {
@@ -1932,28 +1934,28 @@ let tt = class extends re {
       allowTransform: h
     };
     {
-      const { unitId: C, subUnitId: E, drawingId: T } = v, M = oe(this._univerInstanceService, { unitId: C, subUnitId: E }), R = v, N = this._univerInstanceService.getUnit(C, x.UNIVER_SHEET);
+      const { unitId: D, subUnitId: E, drawingId: T } = v, M = oe(this._univerInstanceService, { unitId: D, subUnitId: E }), R = v, N = this._univerInstanceService.getUnit(D, x.UNIVER_SHEET);
       if (!N)
         return;
       const F = N.getActiveSheet().getSheetId();
       if (!R || !M)
         return;
-      const q = (w = this._renderManagerService.getRenderById(C)) == null ? void 0 : w.with(V);
+      const q = (w = this._renderManagerService.getRenderById(D)) == null ? void 0 : w.with(V);
       if (!q)
         return;
       const H = q.getWorksheetSkeleton(E);
       if (!H)
         return;
-      const { transform: X, drawingType: Y, data: K } = R;
-      if (Y !== j.DRAWING_DOM && Y !== j.DRAWING_CHART)
+      const { transform: X, drawingType: L, data: K } = R;
+      if (L !== j.DRAWING_DOM && L !== j.DRAWING_CHART)
         return;
-      const k = this._getSceneAndTransformerByDrawingSearch(C);
+      const k = this._getSceneAndTransformerByDrawingSearch(D);
       if (k == null)
         return;
       const { scene: ce, canvas: ye } = k;
       if (X == null || F !== E)
         return;
-      const { left: ot, top: at, width: ct, height: dt, angle: $t, flipX: xt, flipY: lt, skewX: ut, skewY: Ee } = X, ht = Ie({ unitId: C, subUnitId: E, drawingId: T }), le = ce.getObject(ht);
+      const { left: ot, top: at, width: ct, height: dt, angle: $t, flipX: xt, flipY: lt, skewX: ut, skewY: Ee } = X, ht = Ie({ unitId: D, subUnitId: E, drawingId: T }), le = ce.getObject(ht);
       if (le != null) {
         le.transformByState({ left: ot, top: at, width: ct, height: dt, angle: $t, flipX: xt, flipY: lt, skewX: ut, skewY: Ee });
         return;
@@ -1964,14 +1966,14 @@ let tt = class extends re {
         top: at,
         width: ct,
         height: dt,
-        zIndex: this._drawingManagerService.getDrawingOrder(C, E).length - 1
-      }, Te = Y === j.DRAWING_CHART;
+        zIndex: this._drawingManagerService.getDrawingOrder(D, E).length - 1
+      }, Te = L === j.DRAWING_CHART;
       if (Te) {
         const W = K ? K.backgroundColor : "white";
         Q.fill = W, Q.rotateEnabled = !1, K && K.border && (Q.stroke = K.border), Q.paintFirst = "stroke", Q.strokeWidth = 1, Q.borderEnabled = !1, Q.radius = 8;
       }
       const ue = new Ne(ht, Q);
-      Te && ue.setObjectType(yn.CHART), ce.addObject(ue, Yt), R.allowTransform !== !1 && ce.attachTransformerTo(ue);
+      Te && ue.setObjectType(yn.CHART), ce.addObject(ue, Lt), R.allowTransform !== !1 && ce.attachTransformerTo(ue);
       const he = new wt(), gt = ce.getMainViewport(), { rowHeaderWidth: Oe, columnHeaderHeight: Xe } = H.skeleton, ft = {
         top: Xe,
         left: Oe,
@@ -1982,7 +1984,7 @@ let tt = class extends re {
         rect: ue,
         boundsOfViewArea: ft,
         domAnchor: n,
-        unitId: C,
+        unitId: D,
         subUnitId: E
       }, B = fe(ue, k.renderUnit.scene, H.skeleton, M.worksheet, ge), Ue = new je(B);
       ge.position$ = Ue;
@@ -2000,7 +2002,7 @@ let tt = class extends re {
           ye.dispatchEvent(new WheelEvent(W.type, W));
         },
         data: K,
-        unitId: C
+        unitId: D
       };
       e.eventPassThrough && (Ve = {
         ...Ve,
@@ -2013,7 +2015,7 @@ let tt = class extends re {
         onPointerUp: (W) => {
           ye.dispatchEvent(new PointerEvent(W.type, W));
         }
-      }), this._canvasFloatDomService.addFloatDom(Ve), this.disposeWithMe(f.subscribe((W) => {
+      }), this._canvasFloatDomService.addFloatDom(Ve), this.disposeWithMe(m.subscribe((W) => {
         var hn, gn, fn, mn;
         const un = Ct({
           startX: W.startX,
@@ -2026,18 +2028,18 @@ let tt = class extends re {
             left: p.absolute.left,
             top: p.absolute.top
           }
-        }, n), Ur = Ie({ unitId: C, subUnitId: E, drawingId: T }), Pr = new Ne(Ur, {
+        }, n), Ur = Ie({ unitId: D, subUnitId: E, drawingId: T }), Pr = new Ne(Ur, {
           left: un.startX,
           top: un.startY,
           width: (fn = n.width) != null ? fn : W.width,
           height: (mn = n.height) != null ? mn : W.height,
-          zIndex: this._drawingManagerService.getDrawingOrder(C, E).length - 1
+          zIndex: this._drawingManagerService.getDrawingOrder(D, E).length - 1
         }), Ar = fe(Pr, k.renderUnit.scene, H.skeleton, M.worksheet, ge);
         Ue.next(Ar);
       }));
-      const He = (y = this._renderManagerService.getRenderById(C)) == null ? void 0 : y.with(V);
+      const He = (y = this._renderManagerService.getRenderById(D)) == null ? void 0 : y.with(V);
       He == null || He.currentSkeleton$.subscribe((W) => {
-        W && H.sheetId !== W.sheetId && this._removeDom(m, !0);
+        W && H.sheetId !== W.sheetId && this._removeDom(f, !0);
       });
       const mt = ue.onTransformChange$.subscribeEvent(() => {
         const W = fe(ue, k.renderUnit.scene, H.skeleton, M.worksheet, ge);
@@ -2050,15 +2052,15 @@ let tt = class extends re {
       }), mt && he.add(mt), this._domLayerInfoMap.set(T, ge);
     }
     return {
-      id: m,
+      id: f,
       dispose: () => {
-        this._removeDom(m, !0);
+        this._removeDom(f, !0);
       }
     };
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   addFloatDomToColumnHeader(t, e, n, r) {
-    var b, v, D;
+    var b, v, C;
     const s = oe(this._univerInstanceService, {
       unitId: e.unitId,
       subUnitId: e.subUnitId
@@ -2071,7 +2073,7 @@ let tt = class extends re {
     if (!u) return;
     const c = (b = this._renderManagerService.getRenderById(o)) == null ? void 0 : b.with(V).getWorksheetSkeleton(a);
     if (!c) return;
-    const { componentKey: l, data: g, allowTransform: h = !0 } = e, m = r != null ? r : bt(), { position: p, position$: f } = this._createRangePositionObserver({
+    const { componentKey: l, data: g, allowTransform: h = !0 } = e, f = r != null ? r : bt(), { position: p, position$: m } = this._createRangePositionObserver({
       startRow: 0,
       endRow: 0,
       startColumn: t,
@@ -2082,7 +2084,7 @@ let tt = class extends re {
     const I = {
       unitId: o,
       subUnitId: a,
-      drawingId: m,
+      drawingId: f,
       drawingType: e.type || j.DRAWING_DOM,
       componentKey: l,
       transform: {
@@ -2095,7 +2097,7 @@ let tt = class extends re {
       allowTransform: h
     };
     {
-      const { unitId: w, subUnitId: y, drawingId: C } = I, E = oe(this._univerInstanceService, { unitId: w, subUnitId: y }), T = I, M = this._univerInstanceService.getUnit(w, x.UNIVER_SHEET);
+      const { unitId: w, subUnitId: y, drawingId: D } = I, E = oe(this._univerInstanceService, { unitId: w, subUnitId: y }), T = I, M = this._univerInstanceService.getUnit(w, x.UNIVER_SHEET);
       if (!M)
         return;
       const R = M.getActiveSheet().getSheetId();
@@ -2110,10 +2112,10 @@ let tt = class extends re {
       const { transform: q, data: H } = T, X = this._getSceneAndTransformerByDrawingSearch(w);
       if (X == null)
         return;
-      const { scene: Y, canvas: K } = X;
+      const { scene: L, canvas: K } = X;
       if (q == null || R !== y)
         return;
-      const { left: k, top: ce, width: ye, height: ot, angle: at, flipX: ct, flipY: dt, skewX: $t, skewY: xt } = q, lt = Ie({ unitId: w, subUnitId: y, drawingId: C }), ut = Y.getObject(lt);
+      const { left: k, top: ce, width: ye, height: ot, angle: at, flipX: ct, flipY: dt, skewX: $t, skewY: xt } = q, lt = Ie({ unitId: w, subUnitId: y, drawingId: D }), ut = L.getObject(lt);
       if (ut != null) {
         ut.transformByState({ left: k, top: ce, width: ye, height: ot, angle: at, flipX: ct, flipY: dt, skewX: $t, skewY: xt });
         return;
@@ -2136,8 +2138,8 @@ let tt = class extends re {
         height: Ee.height,
         zIndex: this._drawingManagerService.getDrawingOrder(w, y).length - 1
       }, le = new Ne(lt, ht);
-      Y.addObject(le, Yt), T.allowTransform !== !1 && Y.attachTransformerTo(le);
-      const Q = new wt(), Te = Y.getMainViewport(), ue = {
+      L.addObject(le, Lt), T.allowTransform !== !1 && L.attachTransformerTo(le);
+      const Q = new wt(), Te = L.getMainViewport(), ue = {
         top: 0,
         //viewMain.top,
         left: Te.left,
@@ -2157,7 +2159,7 @@ let tt = class extends re {
       he.position$ = Oe;
       let Xe = {
         position$: Oe,
-        id: C,
+        id: D,
         componentKey: T.componentKey,
         onPointerDown: () => {
         },
@@ -2189,7 +2191,7 @@ let tt = class extends re {
           B
         );
       });
-      this.disposeWithMe(f.subscribe((B) => {
+      this.disposeWithMe(m.subscribe((B) => {
         const Ue = Ct({
           startX: B.startX,
           startY: 0,
@@ -2201,7 +2203,7 @@ let tt = class extends re {
             left: p.absolute.left,
             top: p.absolute.top
           }
-        }, n), Ve = Ie({ unitId: w, subUnitId: y, drawingId: C }), He = new Ne(Ve, {
+        }, n), Ve = Ie({ unitId: w, subUnitId: y, drawingId: D }), He = new Ne(Ve, {
           left: Ue.startX,
           top: 0,
           width: n.width,
@@ -2210,17 +2212,17 @@ let tt = class extends re {
         }), mt = fe(He, X.renderUnit.scene, F.skeleton, E.worksheet, he);
         Oe.next(mt);
       }));
-      const ge = (D = this._renderManagerService.getRenderById(w)) == null ? void 0 : D.with(V);
+      const ge = (C = this._renderManagerService.getRenderById(w)) == null ? void 0 : C.with(V);
       ge == null || ge.currentSkeleton$.subscribe((B) => {
-        B && c.sheetId !== B.sheetId && this._removeDom(m, !0);
+        B && c.sheetId !== B.sheetId && this._removeDom(f, !0);
       }), Q.add(() => {
-        this._canvasFloatDomService.removeFloatDom(C);
-      }), ft && Q.add(ft), this._domLayerInfoMap.set(C, he);
+        this._canvasFloatDomService.removeFloatDom(D);
+      }), ft && Q.add(ft), this._domLayerInfoMap.set(D, he);
     }
     return {
-      id: m,
+      id: f,
       dispose: () => {
-        this._removeDom(m, !0);
+        this._removeDom(f, !0);
       }
     };
   }
@@ -2238,18 +2240,18 @@ let tt = class extends re {
   _createRangePositionObserver(t, e, n) {
     let { startRow: r, startColumn: s } = t;
     const o = Je(r, s, n), a = new je(o), d = Je(t.endRow, t.endColumn, n), u = new je(d), c = () => {
-      const f = Je(r, s, n), _ = Je(t.endRow, t.endColumn, n);
-      a.next(f), u.next(_);
+      const m = Je(r, s, n), _ = Je(t.endRow, t.endColumn, n);
+      a.next(m), u.next(_);
     }, l = new wt();
-    l.add(e.engine.clientRect$.subscribe(() => c())), l.add(this._commandService.onCommandExecuted((f) => {
-      if (f.id === zi.id && f.params.rowsAutoHeightInfo.findIndex((S) => S.row === r) > -1) {
+    l.add(e.engine.clientRect$.subscribe(() => c())), l.add(this._commandService.onCommandExecuted((m) => {
+      if (m.id === zi.id && m.params.rowsAutoHeightInfo.findIndex((S) => S.row === r) > -1) {
         c();
         return;
       }
-      (Ki.indexOf(f.id) > -1 || f.id === Ti.id || f.id === On.id) && c();
+      (Ki.indexOf(m.id) > -1 || m.id === Ti.id || m.id === On.id) && c();
     }));
-    const g = (f, _) => {
-      r = f, s = _, c();
+    const g = (m, _) => {
+      r = m, s = _, c();
     }, h = () => ({
       rotate: 0,
       width: d.right - o.left,
@@ -2262,26 +2264,26 @@ let tt = class extends re {
       startY: o.top,
       endX: d.right,
       endY: d.bottom
-    }), m = a.pipe(
-      Me((f) => {
+    }), f = a.pipe(
+      Me((m) => {
         const _ = Je(t.endRow, t.endColumn, n);
         return {
           rotate: 0,
-          width: _.right - f.left,
-          height: _.bottom - f.top,
+          width: _.right - m.left,
+          height: _.bottom - m.top,
           absolute: {
             left: !0,
             top: !0
           },
-          startX: f.left,
-          startY: f.top,
+          startX: m.left,
+          startY: m.top,
           endX: _.right,
           endY: _.bottom
         };
       })
     ), p = h();
     return {
-      position$: m,
+      position$: f,
       position: p,
       updateRowCol: g,
       topLeftPos$: a,
@@ -2297,7 +2299,7 @@ tt = ks([
   De(3, ie),
   De(4, A(Wi)),
   De(5, se),
-  De(6, A(Yr))
+  De(6, A(Lr))
 ], tt);
 function Je(i, t, e) {
   const n = e.getCellWithCoordByIndex(i, t), r = n.isMergedMainCell ? n.mergeInfo : n;
@@ -2359,16 +2361,16 @@ const Ws = (i) => {
       r,
       void 0,
       !0
-    ), { scaleX: h, scaleY: m } = e.getAncestorScale(), p = {
+    ), { scaleX: h, scaleY: f } = e.getAncestorScale(), p = {
       startX: g.left,
       endX: g.right,
       startY: g.top,
       endY: g.bottom,
       rotate: u,
       width: a * h,
-      height: d * m,
+      height: d * f,
       absolute: g.absolute
-    }, f = {
+    }, m = {
       position$: new je(p),
       position: p,
       id: o.drawingId,
@@ -2384,7 +2386,7 @@ const Ws = (i) => {
       unitId: o.unitId,
       data: o.data
     };
-    return [o.drawingId, f];
+    return [o.drawingId, m];
   }), [t, e, n, r]);
   return /* @__PURE__ */ ae("div", { style: { position: "absolute", top: 0, left: 0 }, children: s.map(([o, a]) => /* @__PURE__ */ ae(ji, { layer: a, id: o, position: a.position }, o)) });
 };
@@ -2428,8 +2430,8 @@ let Ut = class extends re {
             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 && Re.isDefine(h.transform.left) && Re.isDefine(h.transform.top) && Re.isDefine(h.transform.width) && Re.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 f = 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 });
+                f.column < l.startColumn && (l.startColumn = f.column), f.row < l.startRow && (l.startRow = f.row), l.endRow < p.row && (l.endRow = p.row), l.endColumn < p.column && (l.endColumn = p.column);
               }
             }), e(l)) : e(i);
           }
@@ -2481,7 +2483,7 @@ Ut = Bs([
   be(3, J),
   be(4, A(tt)),
   be(5, A(zn)),
-  be(6, A(Ye))
+  be(6, A(Le))
 ], Ut);
 var $s = Object.getOwnPropertyDescriptor, xs = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? $s(t, e) : t, s = i.length - 1, o; s >= 0; s--)
@@ -2508,7 +2510,7 @@ const Fs = [
   dr.id,
   lr.id,
   ur.id
-], Ls = [
+], Ys = [
   Zi.id,
   Ji.id,
   qi.id,
@@ -2600,42 +2602,42 @@ let sn = class extends re {
       const c = this._sheetDrawingService.getBatchRemoveOp(u), l = c.undo, g = c.redo, h = c.objects;
       s.push({ id: P.id, params: { unitId: n, subUnitId: r, op: g, objects: h, type: U.REMOVE } }), o.push({ id: P.id, params: { unitId: n, subUnitId: r, op: l, objects: h, type: U.INSERT } });
     }
-    return s.push({ id: L.id, params: [n] }), o.push({ id: L.id, params: [n] }), {
+    return s.push({ id: Y.id, params: [n] }), o.push({ id: Y.id, params: [n] }), {
       redos: s,
       undos: o
     };
   }
   _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: f } = l, { row: p, column: m } = g;
     if (s == null || a == null)
       return {
         updateDrawings: n,
         deleteDrawings: r
       };
     const { startRow: _, endRow: S, startColumn: I, endColumn: b } = i;
-    let v = null, D = null;
+    let v = null, C = null;
     if (t === 0 && h >= _ && p <= S)
-      if (m >= I && f <= b)
+      if (f >= I && m <= b)
         r.push({ unitId: d, subUnitId: u, drawingId: c });
       else {
         const w = this._shrinkCol(s, a, I, b, o);
-        v = w == null ? void 0 : w.newSheetTransform, D = w == null ? void 0 : w.newTransform;
+        v = w == null ? void 0 : w.newSheetTransform, C = w == null ? void 0 : w.newTransform;
       }
-    else if (t === 1 && m >= I && f <= b)
+    else if (t === 1 && f >= I && m <= b)
       if (h >= _ && p <= S)
         r.push({ unitId: d, subUnitId: u, drawingId: c });
       else {
         const w = this._shrinkRow(s, a, _, S, o);
-        v = w == null ? void 0 : w.newSheetTransform, D = w == null ? void 0 : w.newTransform;
+        v = w == null ? void 0 : w.newSheetTransform, C = w == null ? void 0 : w.newTransform;
       }
     else if (t === 2) {
       const w = this._expandRow(s, a, _, S, o);
-      v = w == null ? void 0 : w.newSheetTransform, D = w == null ? void 0 : w.newTransform;
+      v = w == null ? void 0 : w.newSheetTransform, C = w == null ? void 0 : w.newTransform;
     } else if (t === 3) {
       const w = this._expandCol(s, a, I, b, o);
-      v = w == null ? void 0 : w.newSheetTransform, D = w == null ? void 0 : w.newTransform;
+      v = w == null ? void 0 : w.newSheetTransform, C = w == null ? void 0 : w.newTransform;
     }
-    if (v != null && D != null) {
+    if (v != null && C != null) {
       const w = z(v, this._selectionRenderService, this._skeletonManagerService);
       n.push({ ...e, sheetTransform: v, transform: w });
     }
@@ -2652,19 +2654,19 @@ let sn = class extends re {
   _getDrawingUndoForColVisible(i, t, e) {
     const n = this._drawingManagerService.getDrawingData(i, t), r = [], s = [];
     if (Object.keys(n).forEach((c) => {
-      const l = n[c], { sheetTransform: g, transform: h, anchorType: m = O.Position } = l;
-      if (m === O.None)
+      const l = n[c], { sheetTransform: g, transform: h, anchorType: f = O.Position } = l;
+      if (f === O.None)
         this._remainDrawingSize(h, r, l);
       else {
-        const { from: p, to: f } = g, { row: _, column: S } = p, { row: I, column: b } = f;
+        const { from: p, to: m } = g, { row: _, column: S } = p, { row: I, column: b } = m;
         for (let v = 0; v < e.length; v++) {
-          const D = e[v], { startRow: w, endRow: y, startColumn: C, endColumn: E } = D;
-          if (b < C)
+          const C = e[v], { startRow: w, endRow: y, startColumn: D, endColumn: E } = C;
+          if (b < D)
             continue;
-          if (m === O.Position) {
+          if (f === O.Position) {
             let R = null, N = null;
-            if (S >= C && S <= E) {
-              const F = this._skeletonManagerService.attachRangeWithCoord({ startColumn: S, endColumn: E, startRow: p.row, endRow: f.row });
+            if (S >= D && S <= E) {
+              const F = this._skeletonManagerService.attachRangeWithCoord({ startColumn: S, endColumn: E, startRow: p.row, endRow: m.row });
               if (F == null)
                 return;
               N = { ...h, left: F.startX };
@@ -2676,11 +2678,11 @@ let sn = class extends re {
             this._remainDrawingSize(h, r, l);
             continue;
           }
-          if (S >= C && b <= E)
+          if (S >= D && b <= E)
             continue;
           let T = null, M = null;
-          if (S >= C && S <= E) {
-            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: S, endColumn: E, startRow: p.row, endRow: f.row });
+          if (S >= D && S <= E) {
+            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: S, endColumn: E, startRow: p.row, endRow: m.row });
             if (R == null)
               return;
             M = {
@@ -2688,8 +2690,8 @@ let sn = class extends re {
               left: (R == null ? void 0 : R.startX) || 0,
               width: ((h == null ? void 0 : h.width) || 0) - R.endX + R.startX
             };
-          } else if (b >= C && b <= E) {
-            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: C, endColumn: b, startRow: p.row, endRow: f.row });
+          } else if (b >= D && b <= E) {
+            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: D, endColumn: b, startRow: p.row, endRow: m.row });
             if (R == null)
               return;
             M = {
@@ -2697,7 +2699,7 @@ let sn = class extends re {
               left: R.startX - ((h == null ? void 0 : h.width) || 0)
             };
           } else {
-            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: C, endColumn: E, startRow: p.row, endRow: f.row });
+            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: D, endColumn: E, startRow: p.row, endRow: m.row });
             if (R == null)
               return;
             if (M = {
@@ -2732,10 +2734,10 @@ let sn = class extends re {
   _createUndoAndRedoMutation(i, t, e) {
     const n = this._sheetDrawingService.getBatchUpdateOp(e), { undo: r, redo: s, objects: o } = n, a = [
       { id: P.id, params: { unitId: i, subUnitId: t, op: s, objects: o, type: U.UPDATE } },
-      { id: L.id, params: [i] }
+      { id: Y.id, params: [i] }
     ], d = [
       { id: P.id, params: { unitId: i, subUnitId: t, op: r, objects: o, type: U.UPDATE } },
-      { id: L.id, params: [i] }
+      { id: Y.id, params: [i] }
     ];
     return {
       redos: a,
@@ -2746,19 +2748,19 @@ let sn = class extends re {
   _getDrawingUndoForRowVisible(i, t, e) {
     const n = this._drawingManagerService.getDrawingData(i, t), r = [], s = [];
     if (Object.keys(n).forEach((c) => {
-      const l = n[c], { sheetTransform: g, transform: h, anchorType: m = O.Position } = l;
-      if (m === O.None)
+      const l = n[c], { sheetTransform: g, transform: h, anchorType: f = O.Position } = l;
+      if (f === O.None)
         this._remainDrawingSize(h, r, l);
       else {
-        const { from: p, to: f } = g, { row: _, column: S } = p, { row: I, column: b } = f;
+        const { from: p, to: m } = g, { row: _, column: S } = p, { row: I, column: b } = m;
         for (let v = 0; v < e.length; v++) {
-          const D = e[v], { startRow: w, endRow: y, startColumn: C, endColumn: E } = D;
+          const C = e[v], { startRow: w, endRow: y, startColumn: D, endColumn: E } = C;
           if (I < w)
             continue;
-          if (m === O.Position) {
+          if (f === O.Position) {
             let R = null, N = null;
             if (_ >= w && _ <= y) {
-              const F = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: f.column, startRow: _, endRow: y });
+              const F = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: m.column, startRow: _, endRow: y });
               if (F == null)
                 return;
               N = { ...h, top: F.startY };
@@ -2774,7 +2776,7 @@ let sn = class extends re {
             continue;
           let T = null, M = null;
           if (_ >= w && _ <= y) {
-            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: f.column, startRow: _, endRow: y });
+            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: m.column, startRow: _, endRow: y });
             if (R == null)
               return;
             M = {
@@ -2783,7 +2785,7 @@ let sn = class extends re {
               height: ((h == null ? void 0 : h.height) || 0) - R.endY + R.startY
             };
           } else if (I >= w && I <= y) {
-            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: f.column, startRow: w, endRow: I });
+            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: m.column, startRow: w, endRow: I });
             if (R == null)
               return;
             M = {
@@ -2791,7 +2793,7 @@ let sn = class extends re {
               top: R.startY - ((h == null ? void 0 : h.height) || 0)
             };
           } else {
-            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: f.column, startRow: w, endRow: y });
+            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: m.column, startRow: w, endRow: y });
             if (R == null)
               return;
             if (M = {
@@ -2830,12 +2832,12 @@ let sn = class extends re {
       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: f } = l, { row: p, column: m } = g;
         for (let _ = 0; _ < e.length; _++) {
-          const S = e[_], { startRow: I, endRow: b, startColumn: v, endColumn: D } = S;
-          if (p < I || f < v)
+          const S = e[_], { startRow: I, endRow: b, startColumn: v, endColumn: C } = S;
+          if (p < I || m < v)
             continue;
-          if (c === O.Position && (h <= I && p >= b || m <= v && f >= D)) {
+          if (c === O.Position && (h <= I && p >= b || f <= v && m >= C)) {
             this._remainDrawingSize(u, s, a);
             continue;
           }
@@ -2876,24 +2878,24 @@ let sn = class extends re {
       return { redos: [], undos: [] };
     const { startX: d, endX: u, startY: c, endY: l } = a, g = this._sheetDrawingService.getDrawingData(r, s), h = [];
     Object.keys(g).forEach((v) => {
-      const D = g[v];
-      if (D.anchorType !== O.Both)
+      const C = g[v];
+      if (C.anchorType !== O.Both)
         return;
-      const { transform: w } = D;
+      const { transform: w } = C;
       if (!w)
         return;
-      const { left: y = 0, top: C = 0, width: E = 0, height: T = 0 } = w, { drawingStartX: M, drawingEndX: R, drawingStartY: N, drawingEndY: F } = {
+      const { left: y = 0, top: D = 0, width: E = 0, height: T = 0 } = w, { drawingStartX: M, drawingEndX: R, drawingStartY: N, drawingEndY: F } = {
         drawingStartX: y,
         drawingEndX: y + E,
-        drawingStartY: C,
-        drawingEndY: C + T
+        drawingStartY: D,
+        drawingEndY: D + T
       };
-      d <= M && R <= u && c <= N && F <= l && h.push(D);
+      d <= M && R <= u && c <= N && F <= l && h.push(C);
     });
-    const m = [], p = [], f = t.startRow - e.startRow, _ = t.startColumn - e.startColumn, S = h.map((v) => {
-      const D = v.sheetTransform, w = {
-        to: { ...D.to, row: D.to.row + f, column: D.to.column + _ },
-        from: { ...D.from, row: D.from.row + f, column: D.from.column + _ }
+    const f = [], p = [], m = t.startRow - e.startRow, _ = t.startColumn - e.startColumn, S = h.map((v) => {
+      const C = v.sheetTransform, w = {
+        to: { ...C.to, row: C.to.row + m, column: C.to.column + _ },
+        from: { ...C.from, row: C.from.row + m, column: C.from.column + _ }
       }, y = z(w, this._selectionRenderService, this._skeletonManagerService);
       return {
         unitId: r,
@@ -2904,10 +2906,10 @@ let sn = class extends re {
       };
     });
     if (S.length) {
-      const v = this._sheetDrawingService.getBatchUpdateOp(S), { undo: D, redo: w, objects: y } = v;
-      m.push({ id: P.id, params: { unitId: r, subUnitId: s, op: w, objects: y, type: U.UPDATE } }), p.push({ id: P.id, params: { unitId: r, subUnitId: s, op: D, objects: y, type: U.UPDATE } });
+      const v = this._sheetDrawingService.getBatchUpdateOp(S), { undo: C, redo: w, objects: y } = v;
+      f.push({ id: P.id, params: { unitId: r, subUnitId: s, op: w, objects: y, type: U.UPDATE } }), p.push({ id: P.id, params: { unitId: r, subUnitId: s, op: C, objects: y, type: U.UPDATE } });
     }
-    return { redos: m, undos: p };
+    return { redos: f, undos: p };
   }
   _moveRowInterceptor(i, t) {
     const e = this._getUnitIdAndSubUnitId(i, t);
@@ -2915,20 +2917,20 @@ let sn = class extends re {
       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: _ = O.Position } = m;
-      if (p == null || f == null)
+      const f = c[h], { sheetTransform: p, transform: m, anchorType: _ = O.Position } = f;
+      if (p == null || m == null)
         return;
       let S, I;
       if (t === "insert") {
-        const v = this._expandRow(p, f, o, a, _);
+        const v = this._expandRow(p, m, o, a, _);
         S = v == null ? void 0 : v.newSheetTransform, I = v == null ? void 0 : v.newTransform;
       } else {
-        const { from: v, to: D } = p, { row: w } = v, { row: y } = D;
+        const { from: v, to: C } = p, { row: w } = v, { row: y } = C;
         if (_ === O.Both && w >= o && y <= a)
           g.push({ unitId: n, subUnitId: r, drawingId: h });
         else {
-          const C = this._shrinkRow(p, f, o, a, _);
-          S = C == null ? void 0 : C.newSheetTransform, I = C == null ? void 0 : C.newTransform;
+          const D = this._shrinkRow(p, m, o, a, _);
+          S = D == null ? void 0 : D.newSheetTransform, I = D == null ? void 0 : D.newTransform;
         }
       }
       if (!S || !I)
@@ -2938,14 +2940,14 @@ let sn = class extends re {
     }), 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: f, redo: p, objects: m } = h;
+      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: U.UPDATE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: m, 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), f = h.undo, p = h.redo, m = h.objects;
+      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: U.REMOVE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: m, type: U.INSERT } });
     }
-    return d.push({ id: L.id, params: [n] }), u.push({ id: L.id, params: [n] }), {
+    return d.push({ id: Y.id, params: [n] }), u.push({ id: Y.id, params: [n] }), {
       redos: d,
       undos: u
     };
@@ -2956,20 +2958,20 @@ let sn = class extends re {
       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: _ = O.Position } = m;
-      if (p == null || f == null)
+      const f = c[h], { sheetTransform: p, transform: m, anchorType: _ = O.Position } = f;
+      if (p == null || m == null)
         return;
       let S, I;
       if (t === "insert") {
-        const v = this._expandCol(p, f, o, a, _);
+        const v = this._expandCol(p, m, o, a, _);
         S = v == null ? void 0 : v.newSheetTransform, I = v == null ? void 0 : v.newTransform;
       } else {
-        const { from: v, to: D } = p, { column: w } = v, { column: y } = D;
+        const { from: v, to: C } = p, { column: w } = v, { column: y } = C;
         if (_ === O.Both && w >= o && y <= a)
           g.push({ unitId: n, subUnitId: r, drawingId: h });
         else {
-          const C = this._shrinkCol(p, f, o, a, _);
-          S = C == null ? void 0 : C.newSheetTransform, I = C == null ? void 0 : C.newTransform;
+          const D = this._shrinkCol(p, m, o, a, _);
+          S = D == null ? void 0 : D.newSheetTransform, I = D == null ? void 0 : D.newTransform;
         }
       }
       if (!S || !I)
@@ -2979,14 +2981,14 @@ let sn = class extends re {
     }), 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: f, redo: p, objects: m } = h;
+      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: U.UPDATE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: m, 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), f = h.undo, p = h.redo, m = h.objects;
+      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: U.REMOVE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: m, type: U.INSERT } });
     }
-    return d.push({ id: L.id, params: [n] }), u.push({ id: L.id, params: [n] }), { redos: d, undos: u };
+    return d.push({ id: Y.id, params: [n] }), u.push({ id: Y.id, params: [n] }), { redos: d, undos: u };
   }
   _expandCol(i, t, e, n, r = O.Position) {
     const s = n - e + 1, { from: o, to: a } = i, { column: d } = o, { column: u } = a;
@@ -3215,7 +3217,7 @@ let sn = class extends re {
   _sheetRefreshListener() {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((i) => {
-        Ls.includes(i.id) && requestIdleCallback(() => {
+        Ys.includes(i.id) && requestIdleCallback(() => {
           const t = i.params, { unitId: e, subUnitId: n, ranges: r } = t;
           this._refreshDrawingTransform(e, n, r);
         });
@@ -3228,9 +3230,9 @@ let sn = class extends re {
       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 _ = e[f], { startRow: S, endRow: I, startColumn: b, endColumn: v } = _;
+      const { from: c, to: l } = a, { row: g, column: h } = c, { row: f, column: p } = l;
+      for (let m = 0; m < e.length; m++) {
+        const _ = e[m], { startRow: S, endRow: I, startColumn: b, endColumn: v } = _;
         if (Hr.intersects(
           {
             startRow: S,
@@ -3240,24 +3242,24 @@ let sn = class extends re {
           },
           {
             startRow: g,
-            endRow: m,
+            endRow: f,
             startColumn: h,
             endColumn: p
           }
         ) || g > I || h > v) {
-          const D = u === O.Position, w = z(a, this._selectionRenderService, this._skeletonManagerService);
+          const C = u === O.Position, w = z(a, this._selectionRenderService, this._skeletonManagerService);
           r.push({
             ...o,
             transform: {
               ...w,
-              width: D ? d == null ? void 0 : d.width : w == null ? void 0 : w.width,
-              height: D ? d == null ? void 0 : d.height : w == null ? void 0 : w.height
+              width: C ? d == null ? void 0 : d.width : w == null ? void 0 : w.width,
+              height: C ? d == null ? void 0 : d.height : w == null ? void 0 : w.height
             }
           });
           break;
         }
       }
-    }), r.length !== 0 && (this._drawingManagerService.refreshTransform(r), this._commandService.syncExecuteCommand(L.id, [i]));
+    }), r.length !== 0 && (this._drawingManagerService.refreshTransform(r), this._commandService.syncExecuteCommand(Y.id, [i]));
   }
 };
 sn = xs([
@@ -3278,7 +3280,7 @@ var ne = function() {
     }
     return i;
   }, ne.apply(this, arguments);
-}, Ys = function(i, t) {
+}, Ls = function(i, t) {
   var e = {};
   for (var n in i) Object.prototype.hasOwnProperty.call(i, n) && t.indexOf(n) < 0 && (e[n] = i[n]);
   if (i != null && typeof Object.getOwnPropertySymbols == "function")
@@ -3286,7 +3288,7 @@ var ne = function() {
       t.indexOf(n[r]) < 0 && Object.prototype.propertyIsEnumerable.call(i, n[r]) && (e[n[r]] = i[n[r]]);
   return e;
 }, br = hr(function(i, t) {
-  var e = i.icon, n = i.id, r = i.className, s = i.extend, o = Ys(i, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(n, " ").concat(r || "").trim(), d = as("_".concat(Vs()));
+  var e = i.icon, n = i.id, r = i.className, s = i.extend, o = Ls(i, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(n, " ").concat(r || "").trim(), d = as("_".concat(Vs()));
   return Rr(e, "".concat(n), { defIds: e.defIds, idSuffix: d.current }, ne({ ref: t, className: a }, o), s);
 });
 function Rr(i, t, e, n, r) {
@@ -3356,8 +3358,8 @@ const yr = {
       const { transform: l } = c;
       if (l == null)
         return null;
-      const g = { ...l }, { left: h = 0, top: m = 0 } = l;
-      return s === ve.UP ? g.top = m - 1 : s === ve.DOWN ? g.top = m + 1 : s === ve.LEFT ? g.left = h - 1 : s === ve.RIGHT && (g.left = h + 1), {
+      const g = { ...l }, { left: h = 0, top: f = 0 } = l;
+      return s === ve.UP ? g.top = f - 1 : s === ve.DOWN ? g.top = f + 1 : s === ve.LEFT ? g.left = h - 1 : s === ve.RIGHT && (g.left = h + 1), {
         ...c,
         transform: g,
         sheetTransform: $(g, r)
@@ -3366,7 +3368,7 @@ const yr = {
     return e.syncExecuteCommand(jt.id, {
       unitId: a,
       drawings: d
-    }) ? (e.syncExecuteCommand(L.id, [a]), !0) : !1;
+    }) ? (e.syncExecuteCommand(Y.id, [a]), !0) : !1;
   }
 }, Er = "addition-and-subtraction-single", Tr = "sheet.menu.image";
 function zs(i) {
@@ -3403,16 +3405,16 @@ const Js = (i) => {
   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] = en(!0), h = (S = o.anchorType) != null ? S : O.Position, [m, p] = en(h);
-  function f(I, b) {
+  const c = u.getTransformerByCreate(), [l, g] = en(!0), h = (S = o.anchorType) != null ? S : O.Position, [f, p] = en(h);
+  function m(I, b) {
     const v = [];
-    return I.forEach((D) => {
-      const { oKey: w } = D, y = b.getDrawingOKey(w);
+    return I.forEach((C) => {
+      const { oKey: w } = C, y = b.getDrawingOKey(w);
       if (y == null)
         return v.push(null), !0;
-      const { unitId: C, subUnitId: E, drawingId: T, drawingType: M, anchorType: R, sheetTransform: N } = y;
+      const { unitId: D, subUnitId: E, drawingId: T, drawingType: M, anchorType: R, sheetTransform: N } = y;
       v.push({
-        unitId: C,
+        unitId: D,
         subUnitId: E,
         drawingId: T,
         anchorType: R,
@@ -3426,13 +3428,13 @@ const Js = (i) => {
       v === !0 && g(!1);
     }), b = c.changeStart$.subscribe((v) => {
       var y;
-      const { objects: D } = v, w = f(D, n);
+      const { objects: C } = v, w = m(C, n);
       if (w.length === 0)
         g(!1);
       else if (w.length >= 1) {
         g(!0);
-        const C = ((y = w[0]) == null ? void 0 : y.anchorType) || O.Position;
-        p(C);
+        const D = ((y = w[0]) == null ? void 0 : y.anchorType) || O.Position;
+        p(D);
       }
     });
     return () => {
@@ -3444,10 +3446,10 @@ const Js = (i) => {
     const b = n.getFocusDrawings();
     if (b.length === 0)
       return;
-    const v = b.map((D) => ({
-      unitId: D.unitId,
-      subUnitId: D.subUnitId,
-      drawingId: D.drawingId,
+    const v = b.map((C) => ({
+      unitId: C.unitId,
+      subUnitId: C.subUnitId,
+      drawingId: C.drawingId,
       anchorType: I
     }));
     t.executeCommand(jt.id, {
@@ -3465,11 +3467,11 @@ const Js = (i) => {
         /* @__PURE__ */ ae(
           "header",
           {
-            className: "univer-text-gray-600 dark:univer-text-gray-200",
+            className: "univer-text-gray-600 dark:!univer-text-gray-200",
             children: /* @__PURE__ */ ae("div", { children: e.t("drawing-anchor.title") })
           }
         ),
-        /* @__PURE__ */ ae("div", { children: /* @__PURE__ */ Qt(Si, { value: m, onChange: _, direction: "vertical", children: [
+        /* @__PURE__ */ ae("div", { children: /* @__PURE__ */ Qt(Si, { value: f, onChange: _, direction: "vertical", children: [
           /* @__PURE__ */ ae(Gt, { value: O.Both, children: e.t("drawing-anchor.both") }),
           /* @__PURE__ */ ae(Gt, { value: O.Position, children: e.t("drawing-anchor.position") }),
           /* @__PURE__ */ ae(Gt, { value: O.None, children: e.t("drawing-anchor.none") })
@@ -3491,9 +3493,9 @@ const Js = (i) => {
     /* @__PURE__ */ ae(Js, { drawings: e })
   ] });
 }, Qs = {
-  [$i.FORMULAS_INSERT]: {
+  [$i.MEDIA]: {
     [Tr]: {
-      order: 3,
+      order: 0,
       menuItemFactory: zs,
       [Bt.id]: {
         order: 0,
@@ -3582,7 +3584,7 @@ let Pt = class extends re {
       rt,
       jt,
       pr,
-      L,
+      Y,
       wr,
       _r,
       Sr,
@@ -3679,12 +3681,12 @@ Or(At, "type", x.UNIVER_SHEET);
 Or(At, "pluginName", ho);
 At = uo([
   Jr(oi, ri, hi, pi),
-  Vt(1, A(Ye)),
+  Vt(1, A(Le)),
   Vt(2, J),
   Vt(3, qr)
 ], At);
 export {
-  L as ClearSheetDrawingTransformerOperation,
+  Y as ClearSheetDrawingTransformerOperation,
   yr as DeleteDrawingsCommand,
   wr as EditSheetDrawingOperation,
   _r as GroupSheetDrawingCommand,