npm - @univerjs/sheets-drawing-ui - Versions diffs - 0.16.1 → 0.17.0 - Mend

@univerjs/sheets-drawing-ui 0.16.1 → 0.17.0

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

Files changed (13) hide show

package/lib/cjs/index.js +2 -2
package/lib/es/index.js +1108 -1099
package/lib/index.js +1108 -1099
package/lib/types/controllers/sheet-drawing-update.controller.d.ts +1 -1
package/lib/types/index.d.ts +3 -3
package/lib/types/plugin.d.ts +3 -1
package/lib/umd/index.js +2 -2
package/package.json +14 -14
/package/lib/types/{controllers/config.schema.d.ts → config/config.d.ts} +0 -0
/package/lib/types/{controllers → menu}/drawing-popup-menu.controller.d.ts +0 -0
/package/lib/types/{views/menu → menu}/image.menu.d.ts +0 -0
/package/lib/types/{views/menu → menu}/save-images.menu.d.ts +0 -0
/package/lib/types/{controllers/menu.schema.d.ts → menu/schema.d.ts} +0 -0

package/lib/es/index.js CHANGED Viewed

@@ -1,33 +1,33 @@
-var qr = Object.defineProperty;
-var Qr = (i, t, e) => t in i ? qr(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
-var ae = (i, t, e) => Qr(i, typeof t != "symbol" ? t + "" : t, e);
-import { precisionTo as Et, IRenderManagerService as ee, transformObjectOutOfGroup as ei, getGroupState as ti, getCurrentTypeOfRenderer as yn, CURSOR_TYPE as ni, RENDER_CLASS_TYPE as He, Rect as Ge, ObjectType as kn, DRAWING_OBJECT_LAYER_INDEX as tn, SHEET_VIEWPORT_KEY as lr } from "@univerjs/engine-render";
-import { convertPositionSheetOverGridToAbsolute as ri, SheetSkeletonManagerService as Z, ISheetSelectionRenderService as Oe, attachRangeWithCoord as ur, SheetCanvasPopManagerService as ii, HoverManagerService as si, IEditorBridgeService as oi, EditingRenderController as ai, SetCellEditVisibleOperation as $n, PREDEFINED_HOOK_NAME_PASTE as Je, COPY_TYPE as Pe, virtualizeDiscreteRanges as ci, ISheetClipboardService as di, SetZoomRatioOperation as Bn, SetScrollOperation as li, SheetPrintInterceptorService as ui, useHighlightRange as hi, getCurrentRangeDisable$ as gi } from "@univerjs/sheets-ui";
-import { CommandType as te, ICommandService as K, IUndoRedoService as $e, sequenceExecute as zt, DrawingTypeEnum as $, ArrangeTypeEnum as Ot, Inject as N, IContextService as hr, LocaleService as Be, Injector as it, IURLImageService as gr, Disposable as re, createDocumentModelWithStyle as gn, ObjectRelativeFromV as Wn, ObjectRelativeFromH as jn, WrapTextType as Fn, PositionedObjectLayoutType as Ln, BooleanNumber as Hn, BuildTextUtils as mn, ImageSourceType as Ce, generateRandomId as Ze, FOCUSING_COMMON_DRAWINGS as et, IUniverInstanceService as he, UniverInstanceType as B, Direction as Te, createIdentifier as mi, IImageIoService as mr, RxDisposable as fi, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as ht, DOCS_ZEN_EDITOR_UNIT_ID_KEY as qe, InterceptorEffectEnum as pi, ObjectMatrix as wi, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Si, IPermissionService as _i, UserManagerService as vi, LifecycleService as Ii, LifecycleStages as Ci, DisposableCollection as Ut, fromEventSubject as Ri, Tools as Qe, PRINT_CHART_COMPONENT_KEY as Di, Rectangle as bi, FOCUSING_SHEET as Mi, FOCUSING_FX_BAR_EDITOR as yi, FOCUSING_PANEL_EDITOR as Ti, FOCUSING_SHAPE_TEXT_EDITOR as Ei, DependentOn as Oi, IConfigService as Ui, Plugin as Pi, merge as Ai, registerDependencies as Ni, touchDependencies as nn } from "@univerjs/core";
-import { ISheetDrawingService as ie, DrawingApplyType as P, SetDrawingApplyMutation as A, SheetDrawingAnchorType as U, UniverSheetsDrawingPlugin as xi } from "@univerjs/sheets-drawing";
-import { SheetInterceptorService as wt, SheetsSelectionsService as St, SetRangeValuesCommand as Gn, getSheetCommandTarget as ce, INTERCEPTOR_POINT as ki, InterceptCellContentPriority as $i, IAutoFillService as Bi, discreteRangeToRange as Vn, WorkbookViewPermission as Yn, WorksheetViewPermission as Xn, WorkbookEditablePermission as fn, WorksheetEditPermission as pn, SetFrozenMutation as Wi, SetSelectionsOperation as ji, SetWorksheetRowAutoHeightMutation as fr, COMMAND_LISTENER_SKELETON_CHANGE as Fi, InsertRowCommand as pr, InsertColCommand as wr, RemoveRowCommand as Sr, RemoveColCommand as _r, DeleteRangeMoveLeftCommand as vr, DeleteRangeMoveUpCommand as Ir, InsertRangeMoveDownCommand as Cr, InsertRangeMoveRightCommand as Rr, DeltaRowHeightCommand as wn, SetRowHeightCommand as Sn, DeltaColumnWidthCommand as Dr, SetColWidthCommand as br, SetRowHiddenCommand as Mr, SetSpecificRowsVisibleCommand as yr, SetSpecificColsVisibleCommand as Tr, SetColHiddenCommand as Er, MoveColsCommand as Or, MoveRowsCommand as Ur, MoveRangeCommand as Pr, SetRowVisibleMutation as Li, SetRowHiddenMutation as Hi, SetColVisibleMutation as Gi, SetColHiddenMutation as Vi, SetWorksheetRowHeightMutation as Yi, SetWorksheetRowIsAutoHeightMutation as Xi, SetWorksheetColWidthMutation as zi, SetWorksheetActiveOperation as Ki, RangeProtectionPermissionEditPoint as Ji } from "@univerjs/sheets";
-import { MessageType as Me, render as Zi, unmount as qi, FormLayout as rn, CheckboxGroup as Qi, Checkbox as zn, Select as es, Button as Kn, clsx as ts, RadioGroup as ns, Radio as sn } from "@univerjs/design";
-import { docDrawingPositionToTransform as Jn, ReplaceSnapshotCommand as rs, InnerPasteCommand as is } from "@univerjs/docs-ui";
-import { IImageIoService as ss, IDrawingManagerService as de, DRAWING_IMAGE_ALLOW_IMAGE_LIST as Zn, DRAWING_IMAGE_COUNT_LIMIT as qn, ImageUploadStatusType as Ve, DRAWING_IMAGE_ALLOW_SIZE as Qn, getImageSize as on, SetDrawingSelectedOperation as Kt, DRAWING_IMAGE_WIDTH_LIMIT as er, DRAWING_IMAGE_HEIGHT_LIMIT as tr, getDrawingShapeKeyByDrawingSearch as ye, ImageSourceType as os, UniverDrawingPlugin as as } from "@univerjs/drawing";
-import { ILocalFileService as cs, IMessageService as Ar, IDialogService as Tn, ISidebarService as ds, IClipboardInterfaceService as ls, CanvasFloatDomService as us, PrintFloatDomSingle as hs, ComponentManager as Nr, connectInjector as gs, useDependency as Ee, getMenuHiddenObservable as Jt, MenuItemType as Zt, ContextMenuPosition as an, ContextMenuGroup as cn, RibbonInsertGroup as ms, KeyCode as rt, IMenuManagerService as fs, IShortcutService as ps } from "@univerjs/ui";
-import { DocDrawingController as ws, UniverDocsDrawingPlugin as Ss } from "@univerjs/docs-drawing";
-import { ImageCropperObject as _s, COMPONENT_IMAGE_POPUP_MENU as vs, OpenImageCropOperation as Is, ImageResetSizeOperation as Cs, DrawingRenderService as xr, DrawingCommonPanel as Rs, UniverDrawingUIPlugin as Ds } from "@univerjs/drawing-ui";
-import { throttleTime as bs, combineLatest as gt, switchMap as ve, EMPTY as De, tap as nr, map as Ie, distinctUntilChanged as rr, Subject as dn, filter as Ms, take as ys, BehaviorSubject as ze, of as _n } from "rxjs";
+var Qr = Object.defineProperty;
+var ei = (i, t, e) => t in i ? Qr(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
+var ae = (i, t, e) => ei(i, typeof t != "symbol" ? t + "" : t, e);
+import { precisionTo as Ot, IRenderManagerService as ee, transformObjectOutOfGroup as ti, getGroupState as ni, getCurrentTypeOfRenderer as Tn, CURSOR_TYPE as ri, RENDER_CLASS_TYPE as He, Rect as Ve, ObjectType as Bn, DRAWING_OBJECT_LAYER_INDEX as nn, SHEET_VIEWPORT_KEY as ur } from "@univerjs/engine-render";
+import { convertPositionSheetOverGridToAbsolute as ii, SheetSkeletonManagerService as Z, ISheetSelectionRenderService as Oe, attachRangeWithCoord as hr, getCurrentRangeDisable$ as si, HoverManagerService as oi, IEditorBridgeService as ai, EditingRenderController as ci, SetCellEditVisibleOperation as $n, PREDEFINED_HOOK_NAME_PASTE as Je, COPY_TYPE as Pe, virtualizeDiscreteRanges as di, ISheetClipboardService as li, SetZoomRatioOperation as Wn, SetScrollOperation as ui, SheetPrintInterceptorService as hi, useHighlightRange as gi, SheetCanvasPopManagerService as fi } from "@univerjs/sheets-ui";
+import { CommandType as te, ICommandService as K, IUndoRedoService as Be, sequenceExecute as zt, DrawingTypeEnum as B, ArrangeTypeEnum as Ut, Inject as N, IContextService as gr, LocaleService as $e, Injector as st, IURLImageService as fr, Disposable as re, createDocumentModelWithStyle as fn, ObjectRelativeFromV as jn, ObjectRelativeFromH as Fn, WrapTextType as Ln, PositionedObjectLayoutType as Hn, BooleanNumber as Vn, BuildTextUtils as mn, ImageSourceType as Ce, generateRandomId as Ze, FOCUSING_COMMON_DRAWINGS as et, IUniverInstanceService as he, UniverInstanceType as $, Direction as Te, createIdentifier as mi, IImageIoService as mr, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as gt, DOCS_ZEN_EDITOR_UNIT_ID_KEY as qe, InterceptorEffectEnum as pi, ObjectMatrix as wi, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Si, IPermissionService as _i, UserManagerService as vi, LifecycleService as Ii, LifecycleStages as Ci, DisposableCollection as Pt, fromEventSubject as Ri, Tools as Qe, PRINT_CHART_COMPONENT_KEY as Di, Rectangle as bi, FOCUSING_SHEET as Mi, FOCUSING_FX_BAR_EDITOR as yi, FOCUSING_PANEL_EDITOR as Ti, FOCUSING_SHAPE_TEXT_EDITOR as Ei, RxDisposable as Oi, DependentOn as Ui, IConfigService as Pi, Plugin as Ai, merge as Ni, registerDependencies as xi, touchDependencies as rn } from "@univerjs/core";
+import { ISheetDrawingService as ie, DrawingApplyType as P, SetDrawingApplyMutation as A, SheetDrawingAnchorType as U, UniverSheetsDrawingPlugin as ki } from "@univerjs/sheets-drawing";
+import { SheetInterceptorService as St, SheetsSelectionsService as _t, SetRangeValuesCommand as Gn, getSheetCommandTarget as ce, RangeProtectionPermissionEditPoint as Bi, WorksheetEditPermission as pn, WorkbookEditablePermission as wn, INTERCEPTOR_POINT as $i, InterceptCellContentPriority as Wi, IAutoFillService as ji, discreteRangeToRange as Yn, WorkbookViewPermission as Xn, WorksheetViewPermission as zn, SetFrozenMutation as Fi, SetSelectionsOperation as Li, SetWorksheetRowAutoHeightMutation as pr, COMMAND_LISTENER_SKELETON_CHANGE as Hi, InsertRowCommand as wr, InsertColCommand as Sr, RemoveRowCommand as _r, RemoveColCommand as vr, DeleteRangeMoveLeftCommand as Ir, DeleteRangeMoveUpCommand as Cr, InsertRangeMoveDownCommand as Rr, InsertRangeMoveRightCommand as Dr, DeltaRowHeightCommand as Sn, SetRowHeightCommand as _n, DeltaColumnWidthCommand as br, SetColWidthCommand as Mr, SetRowHiddenCommand as yr, SetSpecificRowsVisibleCommand as Tr, SetSpecificColsVisibleCommand as Er, SetColHiddenCommand as Or, MoveColsCommand as Ur, MoveRowsCommand as Pr, MoveRangeCommand as Ar, SetRowVisibleMutation as Vi, SetRowHiddenMutation as Gi, SetColVisibleMutation as Yi, SetColHiddenMutation as Xi, SetWorksheetRowHeightMutation as zi, SetWorksheetRowIsAutoHeightMutation as Ki, SetWorksheetColWidthMutation as Ji, SetWorksheetActiveOperation as Zi } from "@univerjs/sheets";
+import { MessageType as Me, render as qi, unmount as Qi, FormLayout as sn, CheckboxGroup as es, Checkbox as Kn, Select as ts, Button as Jn, clsx as ns, RadioGroup as rs, Radio as on } from "@univerjs/design";
+import { docDrawingPositionToTransform as Zn, ReplaceSnapshotCommand as is, InnerPasteCommand as ss } from "@univerjs/docs-ui";
+import { IImageIoService as os, IDrawingManagerService as de, DRAWING_IMAGE_ALLOW_IMAGE_LIST as qn, DRAWING_IMAGE_COUNT_LIMIT as Qn, ImageUploadStatusType as Ge, DRAWING_IMAGE_ALLOW_SIZE as er, getImageSize as an, SetDrawingSelectedOperation as Kt, DRAWING_IMAGE_WIDTH_LIMIT as tr, DRAWING_IMAGE_HEIGHT_LIMIT as nr, ImageSourceType as as, getDrawingShapeKeyByDrawingSearch as ye, UniverDrawingPlugin as cs } from "@univerjs/drawing";
+import { ILocalFileService as ds, IMessageService as Nr, IDialogService as En, ISidebarService as ls, getMenuHiddenObservable as Jt, MenuItemType as Zt, IClipboardInterfaceService as us, CanvasFloatDomService as hs, PrintFloatDomSingle as gs, ComponentManager as xr, connectInjector as fs, ContextMenuPosition as cn, ContextMenuGroup as dn, RibbonInsertGroup as ms, useDependency as Ee, KeyCode as rt, IMenuManagerService as ps, IShortcutService as ws } from "@univerjs/ui";
+import { DocDrawingController as Ss, UniverDocsDrawingPlugin as _s } from "@univerjs/docs-drawing";
+import { DrawingRenderService as kr, DrawingCommonPanel as vs, ImageCropperObject as Is, COMPONENT_IMAGE_POPUP_MENU as Cs, OpenImageCropOperation as Rs, ImageResetSizeOperation as Ds, UniverDrawingUIPlugin as bs } from "@univerjs/drawing-ui";
+import { throttleTime as Ms, combineLatest as ft, switchMap as ve, EMPTY as De, tap as rr, map as Ie, distinctUntilChanged as ir, Subject as ln, filter as ys, take as Ts, BehaviorSubject as ze, of as vn } from "rxjs";
 import { jsx as X, jsxs as tt } from "react/jsx-runtime";
-import { useMemo as Ke, useState as ke, useCallback as Pt, useEffect as kr } from "react";
+import { useMemo as Ke, useState as ke, useCallback as At, useEffect as Br } from "react";
 function Q(i, t, e) {
   const { from: n, to: r, flipY: s = !1, flipX: o = !1, angle: a = 0, skewX: c = 0, skewY: u = 0 } = i, d = e.getCurrent();
   if (d == null)
     return;
-  const l = ri(
+  const l = ii(
     d.unitId,
     d.sheetId,
     { from: n, to: r },
     e
   );
-  let { left: g, top: h, width: m, height: f } = l;
+  let { left: g, top: h, width: f, height: m } = l;
   const p = e.getCurrentSkeleton(), S = p.rowHeaderWidth + p.columnTotalWidth, _ = p.columnHeaderHeight + p.rowTotalHeight;
-  return g + m > S && (g = S - m), h + f > _ && (h = _ - f), {
+  return g + f > S && (g = S - f), h + m > _ && (h = _ - m), {
     flipY: s,
     flipX: o,
     angle: a,
@@ -35,8 +35,8 @@ function Q(i, t, e) {
     skewY: u,
     left: g,
     top: h,
-    width: m,
-    height: f
+    width: f,
+    height: m
   };
 }
 function j(i, t) {
@@ -45,17 +45,17 @@ function j(i, t) {
     return;
   const g = {
     column: l.actualColumn,
-    columnOffset: Et(e - l.startX, 1),
+    columnOffset: Ot(e - l.startX, 1),
     row: l.actualRow,
-    rowOffset: Et(n - l.startY, 1)
+    rowOffset: Ot(n - l.startY, 1)
   }, h = t.getCellWithCoordByOffset(e + r, n + s);
   if (h == null)
     return;
-  const m = {
+  const f = {
     column: h.actualColumn,
-    columnOffset: Et(e + r - h.startX, 1),
+    columnOffset: Ot(e + r - h.startX, 1),
     row: h.actualRow,
-    rowOffset: Et(n + s - h.startY, 1)
+    rowOffset: Ot(n + s - h.startY, 1)
   };
   return {
     flipY: o,
@@ -64,7 +64,7 @@ function j(i, t) {
     skewX: u,
     skewY: d,
     from: g,
-    to: m
+    to: f
   };
 }
 function F(i, t) {
@@ -90,31 +90,31 @@ const L = {
       (s = (r = e.getRenderById(n)) == null ? void 0 : r.scene.getTransformer()) == null || s.debounceRefreshControls();
     }), !0;
   }
-}, _t = {
+}, vt = {
   id: "sheet.command.remove-sheet-image",
   type: te.COMMAND,
   handler: (i, t) => {
     var _, R, M;
-    const e = i.get(K), n = i.get($e), r = i.get(wt), s = i.get(ie);
+    const e = i.get(K), n = i.get(Be), r = i.get(St), s = i.get(ie);
     if (!t) return !1;
     const { drawings: o } = t, a = [];
     o.forEach((I) => {
       const { unitId: v } = I;
       a.push(v);
     });
-    const c = s.getBatchRemoveOp(o), { unitId: u, subUnitId: d, undo: l, redo: g, objects: h } = c, m = r.onCommandExecute({ id: _t.id, params: t }), f = { id: A.id, params: { unitId: u, subUnitId: d, op: g, objects: h, type: P.REMOVE } }, p = { id: A.id, params: { unitId: u, subUnitId: d, op: l, objects: h, type: P.INSERT } };
-    return zt([...(_ = m.preRedos) != null ? _ : [], f, ...m.redos], e) ? (n.pushUndoRedo({
+    const c = s.getBatchRemoveOp(o), { unitId: u, subUnitId: d, undo: l, redo: g, objects: h } = c, f = r.onCommandExecute({ id: vt.id, params: t }), m = { id: A.id, params: { unitId: u, subUnitId: d, op: g, objects: h, type: P.REMOVE } }, p = { id: A.id, params: { unitId: u, subUnitId: d, op: l, objects: h, type: P.INSERT } };
+    return zt([...(_ = f.preRedos) != null ? _ : [], m, ...f.redos], e) ? (n.pushUndoRedo({
       unitID: u,
       undoMutations: [
-        ...(R = m.preUndos) != null ? R : [],
+        ...(R = f.preUndos) != null ? R : [],
         p,
-        ...m.undos,
+        ...f.undos,
         { id: L.id, params: a }
       ],
       redoMutations: [
-        ...(M = m.preRedos) != null ? M : [],
-        f,
-        ...m.redos,
+        ...(M = f.preRedos) != null ? M : [],
+        m,
+        ...f.redos,
         { id: L.id, params: a }
       ]
     }), !0) : !1;
@@ -135,25 +135,25 @@ const L = {
         drawingType: d
       };
     });
-    return t.executeCommand(_t.id, {
+    return t.executeCommand(vt.id, {
       unitId: r,
       drawings: s
     });
   }
 };
-function Ts(i) {
+function Es(i) {
   const t = [];
   return i.forEach((e) => {
-    const { parent: n, children: r } = e, { unitId: s, subUnitId: o, drawingId: a } = n, c = ti(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;
+    const { parent: n, children: r } = e, { unitId: s, subUnitId: o, drawingId: a } = n, c = ni(0, 0, r.map((l) => l.transform || {})), u = r.map((l) => {
+      const g = l.transform || { left: 0, top: 0 }, { unitId: h, subUnitId: f, drawingId: m } = l;
       return {
         unitId: h,
-        subUnitId: m,
-        drawingId: f,
+        subUnitId: f,
+        drawingId: m,
         transform: {
           ...g,
-          left: g.left - c.left,
-          top: g.top - c.top
+          left: g.left,
+          top: g.top
         },
         groupId: a
       };
@@ -161,7 +161,8 @@ function Ts(i) {
       unitId: s,
       subUnitId: o,
       drawingId: a,
-      drawingType: $.DRAWING_GROUP,
+      drawingType: B.DRAWING_GROUP,
+      groupBaseBound: { ...n.groupBaseBound },
       transform: c
     };
     t.push({
@@ -170,18 +171,18 @@ function Ts(i) {
     });
   }), t;
 }
-function Es(i) {
+function Os(i) {
   const t = [];
   return i.forEach((e) => {
     const { parent: n, children: r } = e, { unitId: s, subUnitId: o, drawingId: a, transform: c = { width: 0, height: 0 } } = n;
     if (c == null)
       return;
     const u = r.map((l) => {
-      const { transform: g } = l, { unitId: h, subUnitId: m, drawingId: f } = l, p = ei(g || {}, c, c.width || 0, c.height || 0);
+      const { transform: g } = l, { unitId: h, subUnitId: f, drawingId: m } = l, p = ti(g || {}, c, c.width || 0, c.height || 0, n.groupBaseBound);
       return {
         unitId: h,
-        subUnitId: m,
-        drawingId: f,
+        subUnitId: f,
+        drawingId: m,
         transform: p,
         groupId: void 0
       };
@@ -189,7 +190,7 @@ function Es(i) {
       unitId: s,
       subUnitId: o,
       drawingId: a,
-      drawingType: $.DRAWING_GROUP,
+      drawingType: B.DRAWING_GROUP,
       transform: {
         left: 0,
         top: 0
@@ -201,23 +202,23 @@ function Es(i) {
     });
   }), t;
 }
-const Br = {
+const Wr = {
   id: "sheet.command.group-sheet-image",
   type: te.COMMAND,
   handler: (i, t) => {
-    const e = i.get(K), n = i.get($e), r = i.get(ie);
+    const e = i.get(K), n = i.get(Be), r = i.get(ie);
     if (!t) return !1;
     const s = [];
-    t.forEach(({ parent: h, children: m }) => {
-      s.push(h.unitId), m.forEach((f) => {
-        s.push(f.unitId);
+    t.forEach(({ parent: h, children: f }) => {
+      s.push(h.unitId), f.forEach((m) => {
+        s.push(m.unitId);
       });
     });
     const o = r.getGroupDrawingOp(t), { unitId: a, subUnitId: c, undo: u, redo: d, objects: l } = o;
     return e.syncExecuteCommand(A.id, { op: d, unitId: a, subUnitId: c, objects: l, type: P.GROUP }) ? (n.pushUndoRedo({
       unitID: a,
       undoMutations: [
-        { id: A.id, params: { op: u, unitId: a, subUnitId: c, objects: Es(l), type: P.UNGROUP } },
+        { id: A.id, params: { op: u, unitId: a, subUnitId: c, objects: Os(l), type: P.UNGROUP } },
         { id: L.id, params: s }
       ],
       redoMutations: [
@@ -231,34 +232,34 @@ const Br = {
   type: te.COMMAND,
   handler: (i, t) => {
     var _, R, M;
-    const e = i.get(K), n = i.get($e), r = i.get(ie), s = i.get(wt);
+    const e = i.get(K), n = i.get(Be), r = i.get(ie), s = i.get(St);
     if (!t) return !1;
-    const o = t.drawings, a = o.map((I) => I.unitId), c = r.getBatchAddOp(o), { unitId: u, subUnitId: d, undo: l, redo: g, objects: h } = c, m = s.onCommandExecute({ id: qt.id, params: t }), f = { id: A.id, params: { op: g, unitId: u, subUnitId: d, objects: h, type: P.INSERT } }, p = { id: A.id, params: { op: l, unitId: u, subUnitId: d, objects: h, type: P.REMOVE } };
-    return zt([...(_ = m.preRedos) != null ? _ : [], f, ...m.redos], e) ? (n.pushUndoRedo({
+    const o = t.drawings, a = o.map((I) => I.unitId), c = r.getBatchAddOp(o), { unitId: u, subUnitId: d, undo: l, redo: g, objects: h } = c, f = s.onCommandExecute({ id: qt.id, params: t }), m = { id: A.id, params: { op: g, unitId: u, subUnitId: d, objects: h, type: P.INSERT } }, p = { id: A.id, params: { op: l, unitId: u, subUnitId: d, objects: h, type: P.REMOVE } };
+    return zt([...(_ = f.preRedos) != null ? _ : [], m, ...f.redos], e) ? (n.pushUndoRedo({
       unitID: u,
       undoMutations: [
-        ...(R = m.preUndos) != null ? R : [],
+        ...(R = f.preUndos) != null ? R : [],
         p,
-        ...m.undos,
+        ...f.undos,
         { id: L.id, params: a }
       ],
       redoMutations: [
-        ...(M = m.preRedos) != null ? M : [],
-        f,
-        ...m.redos,
+        ...(M = f.preRedos) != null ? M : [],
+        m,
+        ...f.redos,
         { id: L.id, params: a }
       ]
     }), !0) : !1;
   }
-}, Wr = {
+}, jr = {
   id: "sheet.command.set-drawing-arrange",
   type: te.COMMAND,
   handler: (i, t) => {
-    const e = i.get(K), n = i.get($e);
+    const e = i.get(K), n = i.get(Be);
     if (!t) return !1;
     const r = i.get(ie), { unitId: s, subUnitId: o, drawingIds: a, arrangeType: c } = t, u = { unitId: s, subUnitId: o, drawingIds: a };
     let d;
-    if (c === Ot.forward ? d = r.getForwardDrawingsOp(u) : c === Ot.backward ? d = r.getBackwardDrawingOp(u) : c === Ot.front ? d = r.getFrontDrawingsOp(u) : c === Ot.back && (d = r.getBackDrawingsOp(u)), d == null)
+    if (c === Ut.forward ? d = r.getForwardDrawingsOp(u) : c === Ut.backward ? d = r.getBackwardDrawingOp(u) : c === Ut.front ? d = r.getFrontDrawingsOp(u) : c === Ut.back && (d = r.getBackDrawingsOp(u)), d == null)
       return !1;
     const { objects: l, redo: g, undo: h } = d;
     return e.syncExecuteCommand(A.id, { op: g, unitId: s, subUnitId: o, objects: l, type: P.ARRANGE }) ? (n.pushUndoRedo({
@@ -271,47 +272,47 @@ const Br = {
       ]
     }), !0) : !1;
   }
-}, vt = {
+}, It = {
   id: "sheet.command.set-sheet-image",
   type: te.COMMAND,
   handler: (i, t) => {
     var S, _;
-    const e = i.get(K), n = i.get($e), r = i.get(ie), s = i.get(wt);
+    const e = i.get(K), n = i.get(Be), r = i.get(ie), s = i.get(St);
     if (!t) return !1;
-    const { drawings: o } = t, a = r.getBatchUpdateOp(o), { unitId: c, subUnitId: u, undo: d, redo: l, objects: g } = a, h = s.onCommandExecute({ id: vt.id, params: t }), m = [
+    const { drawings: o } = t, a = r.getBatchUpdateOp(o), { unitId: c, subUnitId: u, undo: d, redo: l, objects: g } = a, h = s.onCommandExecute({ id: It.id, params: t }), f = [
       ...(S = h.preRedos) != null ? S : [],
       { id: A.id, params: { unitId: c, subUnitId: u, op: l, objects: g, type: P.UPDATE } },
       ...h.redos,
       { id: L.id, params: [c] }
-    ], f = [
+    ], m = [
       ...(_ = h.preUndos) != null ? _ : [],
       { id: A.id, params: { unitId: c, subUnitId: u, op: d, objects: g, type: P.UPDATE } },
       ...h.undos,
       { id: L.id, params: [c] }
     ];
-    return zt(m, e) ? (n.pushUndoRedo({
+    return zt(f, e) ? (n.pushUndoRedo({
       unitID: c,
-      undoMutations: f,
-      redoMutations: m
+      undoMutations: m,
+      redoMutations: f
     }), !0) : !1;
   }
-}, jr = {
+}, Fr = {
   id: "sheet.command.ungroup-sheet-image",
   type: te.COMMAND,
   handler: (i, t) => {
-    const e = i.get(K), n = i.get($e), r = i.get(ie);
+    const e = i.get(K), n = i.get(Be), r = i.get(ie);
     if (!t) return !1;
     const s = [];
-    t.forEach(({ parent: h, children: m }) => {
-      s.push(h.unitId), m.forEach((f) => {
-        s.push(f.unitId);
+    t.forEach(({ parent: h, children: f }) => {
+      s.push(h.unitId), f.forEach((m) => {
+        s.push(m.unitId);
       });
     });
     const o = r.getUngroupDrawingOp(t), { unitId: a, subUnitId: c, undo: u, redo: d, objects: l } = o;
     return e.syncExecuteCommand(A.id, { op: d, unitId: a, subUnitId: c, objects: l, type: P.UNGROUP }) ? (n.pushUndoRedo({
       unitID: a,
       undoMutations: [
-        { id: A.id, params: { op: u, unitId: a, subUnitId: c, objects: Ts(l), type: P.GROUP } },
+        { id: A.id, params: { op: u, unitId: a, subUnitId: c, objects: Es(l), type: P.GROUP } },
         { id: L.id, params: s }
       ],
       redoMutations: [
@@ -321,49 +322,49 @@ const Br = {
     }), !0) : !1;
   }
 };
-var Os = Object.getOwnPropertyDescriptor, Us = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Os(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+var Us = Object.getOwnPropertyDescriptor, Ps = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Us(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, ne = (i, t) => (e, n) => t(e, n, i);
-function Ps(i, t, e) {
+function As(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 vn(i, t, e, n, r) {
+function In(i, t, e, n, r) {
   var _;
-  const { rotatedHeight: s, rotatedWidth: o } = Ps(e, n, r), c = i.get(ee).getRenderById(t.unitId);
+  const { rotatedHeight: s, rotatedWidth: o } = As(e, n, r), c = i.get(ee).getRenderById(t.unitId);
   if (!c)
     return !1;
   const d = (_ = c.with(Z).getSkeletonParam(t.subUnitId)) == null ? void 0 : _.skeleton;
   if (d == null)
     return !1;
-  const l = d.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, S = !p || Number.isNaN(p) ? 1e-3 : p;
+  const l = d.getCellByIndex(t.row, t.col), g = l.mergeInfo.endX - l.mergeInfo.startX - 2, h = l.mergeInfo.endY - l.mergeInfo.startY - 2, f = o / s, p = Math.ceil(Math.min(g, h * f)) / o, S = !p || Number.isNaN(p) ? 1e-3 : p;
   return {
     width: e * S,
     height: n * S
   };
 }
-let ft = class extends re {
-  constructor(t, e, n, r, s, o, a, c, u, d, l, g, h, m) {
+let pt = class extends re {
+  constructor(t, e, n, r, s, o, a, c, u, d, l, g, h, f) {
     super();
     ae(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 = c, this._contextService = u, this._messageService = d, this._localeService = l, this._injector = h, this._urlImageService = m, this._workbookSelections = g.getWorkbookSelections(this._context.unitId), this._updateImageListener(), this._updateOrderListener(), this._groupDrawingListener(), this._focusDrawingListener();
+    this._context = t, this._skeletonManagerService = e, this._commandService = n, this._selectionRenderService = r, this._imageIoService = s, this._fileOpenerService = o, this._sheetDrawingService = a, this._drawingManagerService = c, this._contextService = u, this._messageService = d, this._localeService = l, this._injector = h, this._urlImageService = f, this._workbookSelections = g.getWorkbookSelections(this._context.unitId), this._updateDrawingListener(), this._updateOrderListener(), this._groupDrawingListener(), this._focusDrawingListener();
   }
   async insertFloatImage() {
     const t = await this._fileOpenerService.openFile({
       multiple: !0,
-      accept: Zn.map((n) => `.${n.replace("image/", "")}`).join(",")
+      accept: qn.map((n) => `.${n.replace("image/", "")}`).join(",")
     }), e = t.length;
-    return e > qn ? (this._messageService.show({
+    return e > Qn ? (this._messageService.show({
       type: Me.Error,
-      content: this._localeService.t("update-status.exceedMaxCount", String(qn))
+      content: this._localeService.t("update-status.exceedMaxCount", String(Qn))
     }), !1) : e === 0 ? !1 : (t.forEach(async (n) => await this.insertFloatImageByFile(n)), !0);
   }
   async insertCellImage() {
     const e = (await this._fileOpenerService.openFile({
       multiple: !1,
-      accept: Zn.map((n) => `.${n.replace("image/", "")}`).join(",")
+      accept: qn.map((n) => `.${n.replace("image/", "")}`).join(",")
     }))[0];
     return e ? (await this._insertCellImage(e), !0) : !1;
   }
@@ -377,34 +378,34 @@ let ft = class extends re {
       e = await this._imageIoService.saveImage(t);
     } catch (M) {
       const I = M.message;
-      I === Ve.ERROR_EXCEED_SIZE ? this._messageService.show({
+      I === Ge.ERROR_EXCEED_SIZE ? this._messageService.show({
         type: Me.Error,
-        content: this._localeService.t("update-status.exceedMaxSize", String(Qn / (1024 * 1024)))
-      }) : I === Ve.ERROR_IMAGE_TYPE ? this._messageService.show({
+        content: this._localeService.t("update-status.exceedMaxSize", String(er / (1024 * 1024)))
+      }) : I === Ge.ERROR_IMAGE_TYPE ? this._messageService.show({
         type: Me.Error,
         content: this._localeService.t("update-status.invalidImageType")
-      }) : I === Ve.ERROR_IMAGE && this._messageService.show({
+      }) : I === Ge.ERROR_IMAGE && this._messageService.show({
         type: Me.Error,
         content: this._localeService.t("update-status.invalidImage")
       });
     }
     if (e == null)
       return;
-    const n = this._getUnitInfo(), { unitId: r, subUnitId: s } = n, { imageId: o, imageSourceType: a, source: c, base64Cache: u } = e, { width: d, height: l, image: g } = await on(u || ""), { width: h, height: m } = this._context.scene;
+    const n = this._getUnitInfo(), { unitId: r, subUnitId: s } = n, { imageId: o, imageSourceType: a, source: c, base64Cache: u } = e, { width: d, height: l, image: g } = await an(u || ""), { width: h, height: f } = this._context.scene;
     this._imageIoService.addImageSourceCache(c, a, g);
-    let f = 1;
-    if (d > er || l > tr) {
-      const M = er / d, I = tr / l;
-      f = Math.max(M, I);
+    let m = 1;
+    if (d > tr || l > nr) {
+      const M = tr / d, I = nr / l;
+      m = Math.max(M, I);
     }
-    const p = this._getImagePosition(d * f, l * f, h, m);
+    const p = this._getImagePosition(d * m, l * m, h, f);
     if (p == null)
       return;
     const S = Q(p, this._selectionRenderService, this._skeletonManagerService), _ = {
       unitId: r,
       subUnitId: s,
       drawingId: o,
-      drawingType: $.DRAWING_IMAGE,
+      drawingType: B.DRAWING_IMAGE,
       imageSourceType: a,
       source: c,
       transform: S,
@@ -424,27 +425,27 @@ let ft = class extends re {
       n = await this._imageIoService.saveImage(t);
     } catch (I) {
       const v = I.message;
-      v === Ve.ERROR_EXCEED_SIZE ? this._messageService.show({
+      v === Ge.ERROR_EXCEED_SIZE ? this._messageService.show({
         type: Me.Error,
-        content: this._localeService.t("update-status.exceedMaxSize", String(Qn / (1024 * 1024)))
-      }) : v === Ve.ERROR_IMAGE_TYPE ? this._messageService.show({
+        content: this._localeService.t("update-status.exceedMaxSize", String(er / (1024 * 1024)))
+      }) : v === Ge.ERROR_IMAGE_TYPE ? this._messageService.show({
         type: Me.Error,
         content: this._localeService.t("update-status.invalidImageType")
-      }) : v === Ve.ERROR_IMAGE && this._messageService.show({
+      }) : v === Ge.ERROR_IMAGE && this._messageService.show({
         type: Me.Error,
         content: this._localeService.t("update-status.invalidImage")
       });
     }
     if (n == null)
       return !1;
-    const { imageId: r, imageSourceType: s, source: o, base64Cache: a } = n, { width: c, height: u, image: d } = await on(a || "");
+    const { imageId: r, imageSourceType: s, source: o, base64Cache: a } = n, { width: c, height: u, image: d } = await an(a || "");
     this._imageIoService.addImageSourceCache(o, s, d);
     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 = gn("", {}), f = vn(
+    const f = fn("", {}), m = In(
       this._injector,
       {
         unitId: this._context.unitId,
@@ -456,43 +457,43 @@ let ft = class extends re {
       u,
       0
     );
-    if (!f)
+    if (!m)
       return !1;
     const p = {
       size: {
-        width: f.width,
-        height: f.height
+        width: m.width,
+        height: m.height
       },
       positionH: {
-        relativeFrom: jn.PAGE,
+        relativeFrom: Fn.PAGE,
         posOffset: 0
       },
       positionV: {
-        relativeFrom: Wn.PARAGRAPH,
+        relativeFrom: jn.PARAGRAPH,
         posOffset: 0
       },
       angle: 0
     }, S = {
-      unitId: m.getUnitId(),
-      subUnitId: m.getUnitId(),
+      unitId: f.getUnitId(),
+      subUnitId: f.getUnitId(),
       drawingId: r,
-      drawingType: $.DRAWING_IMAGE,
+      drawingType: B.DRAWING_IMAGE,
       imageSourceType: s,
       source: o,
-      transform: Jn(p),
+      transform: Zn(p),
       docTransform: p,
-      behindDoc: Hn.FALSE,
+      behindDoc: Vn.FALSE,
       title: "",
       description: "",
-      layoutType: Ln.INLINE,
+      layoutType: Hn.INLINE,
       // Insert inline drawing by default.
-      wrapText: Fn.BOTH_SIDES,
+      wrapText: Ln.BOTH_SIDES,
       distB: 0,
       distL: 0,
       distR: 0,
       distT: 0
     }, _ = mn.drawing.add({
-      documentDataModel: m,
+      documentDataModel: f,
       drawings: [S],
       selection: {
         collapsed: !0,
@@ -500,11 +501,11 @@ let ft = class extends re {
         endOffset: 0
       }
     });
-    return _ ? (m.apply(_), this._commandService.syncExecuteCommand(Gn.id, {
+    return _ ? (f.apply(_), this._commandService.syncExecuteCommand(Gn.id, {
       value: {
         [(R = e == null ? void 0 : e.row) != null ? R : g]: {
           [(M = e == null ? void 0 : e.col) != null ? M : h]: {
-            p: m.getSnapshot(),
+            p: f.getSnapshot(),
             t: 1
           }
         }
@@ -515,19 +516,19 @@ let ft = class extends re {
   }
   // eslint-disable-next-line max-lines-per-function
   async insertCellImageByUrl(t, e) {
-    var h, m;
+    var h, f;
     let n = t;
     try {
       n = await this._urlImageService.getImage(t);
-    } catch (f) {
-      console.error(`Failed to get image from URLImageService: ${t}`, f);
+    } catch (m) {
+      console.error(`Failed to get image from URLImageService: ${t}`, m);
     }
-    const { width: r, height: s, image: o } = await on(n || "");
+    const { width: r, height: s, image: o } = await an(n || "");
     this._imageIoService.addImageSourceCache(t, Ce.URL, o);
     const a = this._workbookSelections.getCurrentLastSelection();
     if (!a)
       return !1;
-    const c = gn("", {}), u = vn(
+    const c = fn("", {}), u = In(
       this._injector,
       {
         unitId: this._context.unitId,
@@ -547,11 +548,11 @@ let ft = class extends re {
         height: u.height
       },
       positionH: {
-        relativeFrom: jn.PAGE,
+        relativeFrom: Fn.PAGE,
         posOffset: 0
       },
       positionV: {
-        relativeFrom: Wn.PARAGRAPH,
+        relativeFrom: jn.PARAGRAPH,
         posOffset: 0
       },
       angle: 0
@@ -559,17 +560,17 @@ let ft = class extends re {
       unitId: c.getUnitId(),
       subUnitId: c.getUnitId(),
       drawingId: Ze(),
-      drawingType: $.DRAWING_IMAGE,
+      drawingType: B.DRAWING_IMAGE,
       imageSourceType: Ce.URL,
       source: t,
-      transform: Jn(d),
+      transform: Zn(d),
       docTransform: d,
-      behindDoc: Hn.FALSE,
+      behindDoc: Vn.FALSE,
       title: "",
       description: "",
-      layoutType: Ln.INLINE,
+      layoutType: Hn.INLINE,
       // Insert inline drawing by default.
-      wrapText: Fn.BOTH_SIDES,
+      wrapText: Ln.BOTH_SIDES,
       distB: 0,
       distL: 0,
       distR: 0,
@@ -586,7 +587,7 @@ let ft = class extends re {
     return g ? (c.apply(g), this._commandService.syncExecuteCommand(Gn.id, {
       value: {
         [(h = e == null ? void 0 : e.row) != null ? h : a.primary.actualRow]: {
-          [(m = e == null ? void 0 : e.col) != null ? m : a.primary.actualColumn]: {
+          [(f = e == null ? void 0 : e.col) != null ? f : a.primary.actualColumn]: {
             p: c.getSnapshot(),
             t: 1
           }
@@ -612,7 +613,7 @@ let ft = class extends re {
       endColumn: 0
     };
     s && s.length > 0 && (o = s[s.length - 1].range);
-    const a = ur(this._skeletonManagerService.getCurrent().skeleton, o);
+    const a = hr(this._skeletonManagerService.getCurrent().skeleton, o);
     if (a == null)
       return;
     let { startColumn: c, startRow: u, startX: d, startY: l } = a, g = !1;
@@ -627,24 +628,24 @@ let ft = class extends re {
       columnOffset: 0,
       row: u,
       rowOffset: 0
-    }, m = this._selectionRenderService.getCellWithCoordByOffset(d + t, l + e);
-    if (m == null)
+    }, f = this._selectionRenderService.getCellWithCoordByOffset(d + t, l + e);
+    if (f == null)
       return;
-    const f = {
-      column: m.actualColumn,
-      columnOffset: d + t - m.startX,
-      row: m.actualRow,
-      rowOffset: l + e - m.startY
+    const m = {
+      column: f.actualColumn,
+      columnOffset: d + t - f.startX,
+      row: f.actualRow,
+      rowOffset: l + e - f.startY
     };
     return {
       from: h,
-      to: f
+      to: m
     };
   }
   _updateOrderListener() {
     this.disposeWithMe(this._drawingManagerService.featurePluginOrderUpdate$.subscribe((t) => {
       const { unitId: e, subUnitId: n, drawingIds: r, arrangeType: s } = t;
-      this._commandService.executeCommand(Wr.id, {
+      this._commandService.executeCommand(jr.id, {
         unitId: e,
         subUnitId: n,
         drawingIds: r,
@@ -652,7 +653,7 @@ let ft = class extends re {
       });
     }));
   }
-  _updateImageListener() {
+  _updateDrawingListener() {
     this.disposeWithMe(this._drawingManagerService.featurePluginUpdate$.subscribe((t) => {
       const e = [];
       t.length !== 0 && (t.forEach((n) => {
@@ -672,29 +673,30 @@ let ft = class extends re {
           axisAlignSheetTransform: { ...l }
         };
         e.push(g);
-      }), e.length > 0 && this._commandService.executeCommand(vt.id, {
+      }), e.length > 0 && this._commandService.executeCommand(It.id, {
         unitId: t[0].unitId,
         drawings: e
       }));
     }));
   }
-  _getSheetTransformByParam(t) {
-    const { unitId: e, subUnitId: n, drawingId: r, transform: s } = t;
-    if (s == null)
+  _getSheetTransformByParam(t, e) {
+    const { unitId: n, subUnitId: r, drawingId: s, transform: o } = t;
+    if (o == null)
       return null;
-    const o = this._sheetDrawingService.getDrawingByParam({ unitId: e, subUnitId: n, drawingId: r });
-    if (o == null || o.unitId !== this._context.unitId)
+    const a = this._sheetDrawingService.getDrawingByParam({ unitId: n, subUnitId: r, drawingId: s });
+    let c = a == null ? void 0 : a.transform;
+    if (e && (c = {}), !e && (a == null || a.unitId !== this._context.unitId))
       return null;
-    const a = j({ ...o.transform, ...s }, this._selectionRenderService), c = F({ ...o.transform, ...s }, this._selectionRenderService);
-    return a == null || c == null ? null : { sheetTransform: a, axisAlignSheetTransform: c };
+    const u = j({ ...c, ...o }, this._selectionRenderService), d = F({ ...c, ...o }, this._selectionRenderService);
+    return u == null || d == null ? null : { sheetTransform: u, axisAlignSheetTransform: d };
   }
   _groupDrawingListener() {
     this.disposeWithMe(this._drawingManagerService.featurePluginGroupUpdate$.subscribe((t) => {
       const e = [];
       for (const n of t) {
-        const r = this._getSheetTransformByParam(n.parent), s = [];
+        const r = this._getSheetTransformByParam(n.parent, !0), s = [];
         for (const a of n.children) {
-          const c = this._getSheetTransformByParam(a);
+          const c = this._getSheetTransformByParam(a, !1);
           c != null && s.push({
             ...a,
             sheetTransform: c.sheetTransform,
@@ -702,13 +704,13 @@ let ft = class extends re {
           });
         }
         const o = {
-          parent: { ...n.parent, sheetTransform: r },
+          parent: { ...n.parent, sheetTransform: r == null ? void 0 : r.sheetTransform, axisAlignSheetTransform: r == null ? void 0 : r.axisAlignSheetTransform },
           children: s
         };
         e.push(o);
       }
       if (e.length > 0) {
-        this._commandService.executeCommand(Br.id, e);
+        this._commandService.executeCommand(Wr.id, e);
         const { unitId: n, subUnitId: r, drawingId: s } = t[0].parent;
         this._commandService.syncExecuteCommand(Kt.id, [{ unitId: n, subUnitId: r, drawingId: s }]);
       }
@@ -717,10 +719,11 @@ let ft = class extends re {
       for (const n of t) {
         const { children: r } = n, s = [];
         for (const o of r) {
-          const a = this._getSheetTransformByParam(o);
+          const a = this._getSheetTransformByParam(o, !1);
           a != null && s.push({
             ...o,
-            sheetTransform: a
+            sheetTransform: a.sheetTransform,
+            axisAlignSheetTransform: a.axisAlignSheetTransform
           });
         }
         e.push({
@@ -728,7 +731,7 @@ let ft = class extends re {
           children: s
         });
       }
-      this._commandService.executeCommand(jr.id, e);
+      this._commandService.executeCommand(Fr.id, e);
     }));
   }
   _focusDrawingListener() {
@@ -739,31 +742,31 @@ let ft = class extends re {
     );
   }
 };
-ft = Us([
+pt = Ps([
   ne(1, N(Z)),
   ne(2, K),
   ne(3, Oe),
-  ne(4, ss),
-  ne(5, cs),
+  ne(4, os),
+  ne(5, ds),
   ne(6, ie),
   ne(7, de),
-  ne(8, hr),
-  ne(9, Ar),
-  ne(10, N(Be)),
-  ne(11, N(St)),
-  ne(12, N(it)),
-  ne(13, gr)
-], ft);
+  ne(8, gr),
+  ne(9, Nr),
+  ne(10, N($e)),
+  ne(11, N(_t)),
+  ne(12, N(st)),
+  ne(13, fr)
+], pt);
 const Qt = {
   id: "sheet.command.insert-float-image",
   type: te.COMMAND,
   handler: async (i, t) => {
     var o, a;
-    const e = i.get(he), n = i.get(ee), r = (o = yn(
-      B.UNIVER_SHEET,
+    const e = i.get(he), n = i.get(ee), r = (o = Tn(
+      $.UNIVER_SHEET,
       e,
       n
-    )) == null ? void 0 : o.with(ft);
+    )) == null ? void 0 : o.with(pt);
     if (!r)
       return !1;
     const s = t == null ? void 0 : t.files;
@@ -773,19 +776,19 @@ const Qt = {
     } else
       return (a = r.insertFloatImage()) != null ? a : !1;
   }
-}, En = {
+}, On = {
   id: "sheet.command.insert-cell-image",
   type: te.COMMAND,
   handler: (i) => {
     var n, r;
     const t = i.get(he), e = i.get(ee);
-    return (r = (n = yn(
-      B.UNIVER_SHEET,
+    return (r = (n = Tn(
+      $.UNIVER_SHEET,
       t,
       e
-    )) == null ? void 0 : n.with(ft).insertCellImage()) != null ? r : !1;
+    )) == null ? void 0 : n.with(pt).insertCellImage()) != null ? r : !1;
   }
-}, It = {
+}, Ct = {
   id: "sheet.command.move-drawing",
   type: te.COMMAND,
   handler: (i, t) => {
@@ -796,51 +799,51 @@ const Qt = {
       const { transform: l } = d;
       if (l == null)
         return null;
-      const g = { ...l }, { left: h = 0, top: m = 0 } = l;
-      return s === Te.UP ? g.top = m - 1 : s === Te.DOWN ? g.top = m + 1 : s === Te.LEFT ? g.left = h - 1 : s === Te.RIGHT && (g.left = h + 1), {
+      const g = { ...l }, { left: h = 0, top: f = 0 } = l;
+      return s === Te.UP ? g.top = f - 1 : s === Te.DOWN ? g.top = f + 1 : s === Te.LEFT ? g.left = h - 1 : s === Te.RIGHT && (g.left = h + 1), {
         ...d,
         transform: g,
         sheetTransform: j(g, r),
         axisAlignSheetTransform: F(g, r)
       };
     }).filter((d) => d != null);
-    return e.syncExecuteCommand(vt.id, {
+    return e.syncExecuteCommand(It.id, {
       unitId: a,
       drawings: c
     }) ? (e.syncExecuteCommand(L.id, [a]), !0) : !1;
   }
 };
-var As = Object.getOwnPropertyDescriptor, Ns = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? As(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+var Ns = Object.getOwnPropertyDescriptor, xs = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Ns(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, At = (i, t) => (e, n) => t(e, n, i), xe = /* @__PURE__ */ ((i) => (i.CELL_ADDRESS = "cellAddress", i.COLUMN_VALUE = "columnValue", i))(xe || {});
-const On = mi("sheets-drawing-ui.batch-save-images.service");
-function In(i) {
+}, Nt = (i, t) => (e, n) => t(e, n, i), xe = /* @__PURE__ */ ((i) => (i.CELL_ADDRESS = "cellAddress", i.COLUMN_VALUE = "columnValue", i))(xe || {});
+const Un = mi("sheets-drawing-ui.batch-save-images.service");
+function Cn(i) {
   let t = "", e = i;
   for (; e >= 0; )
     t = String.fromCharCode(e % 26 + 65) + t, e = Math.floor(e / 26) - 1;
   return t;
 }
-function Bt(i, t) {
-  return `${In(t)}${i + 1}`;
+function Wt(i, t) {
+  return `${Cn(t)}${i + 1}`;
 }
-function xs(i) {
-  const t = Bt(i.startRow, i.startColumn), e = Bt(i.endRow, i.endColumn);
+function ks(i) {
+  const t = Wt(i.startRow, i.startColumn), e = Wt(i.endRow, i.endColumn);
   return t === e ? t : `${t}:${e}`;
 }
-function ir(i) {
+function sr(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 sr(i) {
+function or(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;
   const t = i.p.drawingsOrder[0], e = i.p.drawings[t];
   return !e || !("source" in e) || !("imageSourceType" in e) ? null : e;
 }
-function ln(i, t) {
+function un(i, t) {
   if (t === Ce.BASE64) {
     const e = i.match(/^data:image\/(\w+);/);
     if (e)
@@ -853,14 +856,14 @@ function ln(i, t) {
   }
   return "png";
 }
-async function or(i, t) {
+async function ar(i, t) {
   if (t === Ce.BASE64)
     return (await fetch(i)).blob();
   if (t === Ce.URL)
     return (await fetch(i)).blob();
   throw new Error("UUID image type requires additional handling");
 }
-let Cn = class extends re {
+let Rn = class extends re {
   constructor(i, t, e, n) {
     super(), this._univerInstanceService = i, this._selectionService = t, this._imageIoService = e, this._urlImageService = n;
   }
@@ -871,7 +874,7 @@ let Cn = class extends re {
     return this._urlImageService.registerURLImageDownloader(i);
   }
   getCellImagesInSelection() {
-    const i = this._univerInstanceService.getCurrentUnitForType(B.UNIVER_SHEET);
+    const i = this._univerInstanceService.getCurrentUnitForType($.UNIVER_SHEET);
     if (!i) return [];
     const t = i.getActiveSheet();
     if (!t) return [];
@@ -883,12 +886,12 @@ let Cn = class extends re {
       for (let d = o; d <= a; d++)
         for (let l = c; l <= u; l++) {
           const g = n.getValue(d, l);
-          if (ir(g)) {
-            const h = sr(g);
+          if (sr(g)) {
+            const h = or(g);
             h && r.push({
               row: d,
               col: l,
-              cellAddress: Bt(d, l),
+              cellAddress: Wt(d, l),
               source: h.source,
               imageSourceType: h.imageSourceType,
               imageId: h.drawingId
@@ -899,7 +902,7 @@ let Cn = class extends re {
     return r;
   }
   getCellImagesFromRanges(i, t, e) {
-    const n = this._univerInstanceService.getUnit(i, B.UNIVER_SHEET);
+    const n = this._univerInstanceService.getUnit(i, $.UNIVER_SHEET);
     if (!n) return [];
     const r = n.getSheetBySheetId(t);
     if (!r) return [];
@@ -908,16 +911,16 @@ let Cn = class extends re {
       const { startRow: c, endRow: u, startColumn: d, endColumn: l } = a;
       for (let g = c; g <= u; g++)
         for (let h = d; h <= l; h++) {
-          const m = s.getValue(g, h);
-          if (ir(m)) {
-            const f = sr(m);
-            f && o.push({
+          const f = s.getValue(g, h);
+          if (sr(f)) {
+            const m = or(f);
+            m && o.push({
               row: g,
               col: h,
-              cellAddress: Bt(g, h),
-              source: f.source,
-              imageSourceType: f.imageSourceType,
-              imageId: f.drawingId
+              cellAddress: Wt(g, h),
+              source: m.source,
+              imageSourceType: m.imageSourceType,
+              imageId: m.drawingId
             });
           }
         }
@@ -925,8 +928,8 @@ let Cn = class extends re {
     return o;
   }
   getDataColumns() {
-    var l, g, h, m;
-    const i = this._univerInstanceService.getCurrentUnitForType(B.UNIVER_SHEET);
+    var l, g, h, f;
+    const i = this._univerInstanceService.getCurrentUnitForType($.UNIVER_SHEET);
     if (!i) return [];
     const t = i.getActiveSheet();
     if (!t) return [];
@@ -935,32 +938,32 @@ let Cn = class extends re {
     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++)
+    for (const m of e) {
+      s = Math.min(s, m.range.startRow), o = Math.max(o, m.range.endRow);
+      for (let p = m.range.startColumn; p <= m.range.endColumn; p++)
         a.add(p);
     }
     const c = /* @__PURE__ */ new Set();
-    for (let f = r.startColumn; f <= r.endColumn; f++)
-      if (!a.has(f))
+    for (let m = r.startColumn; m <= r.endColumn; m++)
+      if (!a.has(m))
         for (let p = s; p <= o; p++) {
-          const S = n.getValue(p, f);
-          if (S && (((l = S.v) == null ? void 0 : l.toString()) || ((m = (h = (g = S.p) == null ? void 0 : g.body) == null ? void 0 : h.dataStream) == null ? void 0 : m.trim()) || "")) {
-            c.add(f);
+          const S = n.getValue(p, m);
+          if (S && (((l = S.v) == null ? void 0 : l.toString()) || ((f = (h = (g = S.p) == null ? void 0 : g.body) == null ? void 0 : h.dataStream) == null ? void 0 : f.trim()) || "")) {
+            c.add(m);
             break;
           }
         }
-    const u = [], d = Array.from(c).sort((f, p) => f - p);
-    for (const f of d)
+    const u = [], d = Array.from(c).sort((m, p) => m - p);
+    for (const m of d)
       u.push({
-        index: f,
-        label: In(f)
+        index: m,
+        label: Cn(m)
       });
     return u;
   }
   getDataColumnsForRanges(i, t, e) {
-    var h, m, f, p;
-    const n = this._univerInstanceService.getUnit(i, B.UNIVER_SHEET);
+    var h, f, m, p;
+    const n = this._univerInstanceService.getUnit(i, $.UNIVER_SHEET);
     if (!n) return [];
     const r = n.getSheetBySheetId(t);
     if (!r) return [];
@@ -977,7 +980,7 @@ let Cn = class extends re {
       if (!u.has(S))
         for (let _ = a; _ <= c; _++) {
           const R = s.getValue(_, S);
-          if (R && (((h = R.v) == null ? void 0 : h.toString()) || ((p = (f = (m = R.p) == null ? void 0 : m.body) == null ? void 0 : f.dataStream) == null ? void 0 : p.trim()) || "")) {
+          if (R && (((h = R.v) == null ? void 0 : h.toString()) || ((p = (m = (f = R.p) == null ? void 0 : f.body) == null ? void 0 : m.dataStream) == null ? void 0 : p.trim()) || "")) {
             d.add(S);
             break;
           }
@@ -986,13 +989,13 @@ let Cn = class extends re {
     for (const S of g)
       l.push({
         index: S,
-        label: In(S)
+        label: Cn(S)
       });
     return l;
   }
   getSelectionRangeNotation() {
     const i = this._selectionService.getCurrentSelections();
-    return !i || i.length === 0 ? "" : i.map((t) => xs(t.range)).join(", ");
+    return !i || i.length === 0 ? "" : i.map((t) => ks(t.range)).join(", ");
   }
   getSelectionRowRange() {
     const i = this._selectionService.getCurrentSelections();
@@ -1013,7 +1016,7 @@ let Cn = class extends re {
   }
   generateFileName(i, t) {
     var s, o, a, c;
-    const e = this._univerInstanceService.getCurrentUnitForType(B.UNIVER_SHEET), n = ln(i.source, i.imageSourceType), r = [];
+    const e = this._univerInstanceService.getCurrentUnitForType($.UNIVER_SHEET), n = un(i.source, i.imageSourceType), r = [];
     for (const u of t.fileNameParts)
       if (u === "cellAddress")
         r.push(i.cellAddress);
@@ -1024,8 +1027,8 @@ let Cn = class extends re {
           if (g) {
             const h = ((s = g.v) == null ? void 0 : s.toString()) || ((c = (a = (o = g.p) == null ? void 0 : o.body) == null ? void 0 : a.dataStream) == null ? void 0 : c.trim()) || "";
             if (h) {
-              const m = h.replace(/[<>:"/\\|?*]/g, "_").trim();
-              m && r.push(m);
+              const f = h.replace(/[<>:"/\\|?*]/g, "_").trim();
+              f && r.push(f);
             }
           }
         }
@@ -1034,18 +1037,18 @@ let Cn = class extends re {
   }
   generateFileNameWithContext(i, t, e, n) {
     var a, c, u, d;
-    const r = this._univerInstanceService.getUnit(e, B.UNIVER_SHEET), s = ln(i.source, i.imageSourceType), o = [];
+    const r = this._univerInstanceService.getUnit(e, $.UNIVER_SHEET), s = un(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()) || ((d = (u = (c = m.p) == null ? void 0 : c.body) == null ? void 0 : u.dataStream) == null ? void 0 : d.trim()) || "";
-            if (f) {
-              const p = f.replace(/[<>:"/\\|?*]/g, "_").trim();
+          const f = g.getCellMatrix().getValue(i.row, t.columnIndex);
+          if (f) {
+            const m = ((a = f.v) == null ? void 0 : a.toString()) || ((d = (u = (c = f.p) == null ? void 0 : c.body) == null ? void 0 : u.dataStream) == null ? void 0 : d.trim()) || "";
+            if (m) {
+              const p = m.replace(/[<>:"/\\|?*]/g, "_").trim();
               p && o.push(p);
             }
           }
@@ -1076,15 +1079,15 @@ let Cn = class extends re {
       const u = c.replace(/\.\w+$/, ""), d = ((o = c.match(/\.\w+$/)) == null ? void 0 : o[0]) || ".png", l = s.get(u) || 0;
       l > 0 && (c = `${u}_${l}${d}`), s.set(u, l + 1);
       try {
-        const g = await this._getImageBlob(a), m = await (await r.getFileHandle(c, { create: !0 })).createWritable();
-        await m.write(g), await m.close();
+        const g = await this._getImageBlob(a), f = await (await r.getFileHandle(c, { create: !0 })).createWritable();
+        await f.write(g), await f.close();
       } catch (g) {
         throw console.error(`Failed to save image ${c}:`, g), g;
       }
     }
   }
   async downloadSingleImage(i) {
-    const t = ln(i.source, i.imageSourceType), e = `${i.cellAddress}.${t}`;
+    const t = un(i.source, i.imageSourceType), e = `${i.cellAddress}.${t}`;
     try {
       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);
@@ -1095,29 +1098,29 @@ let Cn = class extends re {
   async _getImageBlob(i) {
     if (i.imageSourceType === Ce.UUID) {
       const t = await this._imageIoService.getImage(i.source);
-      return or(t, Ce.URL);
+      return ar(t, Ce.URL);
     }
-    return i.imageSourceType === Ce.URL ? this._urlImageService.downloadImage(i.source) : or(i.source, i.imageSourceType);
+    return i.imageSourceType === Ce.URL ? this._urlImageService.downloadImage(i.source) : ar(i.source, i.imageSourceType);
   }
 };
-Cn = Ns([
-  At(0, he),
-  At(1, N(St)),
-  At(2, mr),
-  At(3, gr)
-], Cn);
+Rn = xs([
+  Nt(0, he),
+  Nt(1, N(_t)),
+  Nt(2, mr),
+  Nt(3, fr)
+], Rn);
 const nt = "sheet.dialog.batch-save-images", mt = {
   id: "sheet.command.save-cell-images",
   type: te.COMMAND,
   handler: async (i) => {
-    const t = i.get(Tn), e = i.get(On), n = e.getCellImagesInSelection();
+    const t = i.get(En), e = i.get(Un), n = e.getCellImagesInSelection();
     if (n.length === 1)
       try {
         return await e.downloadSingleImage(n[0]), !0;
       } catch (a) {
         return console.error("Failed to download image:", a), !1;
       }
-    const r = i.get(Be), s = e.getSelectionRangeNotation(), o = `${r.t("sheetImage.save.title")} (${s})`;
+    const r = i.get($e), s = e.getSelectionRangeNotation(), o = `${r.t("sheetImage.save.title")} (${s})`;
     return t.open({
       id: nt,
       draggable: !0,
@@ -1131,262 +1134,63 @@ const nt = "sheet.dialog.batch-save-images", mt = {
       onClose: () => t.close(nt)
     }), !0;
   }
-}, Fr = "COMPONENT_SHEET_DRAWING_PANEL", Lr = {
+}, Lr = "COMPONENT_SHEET_DRAWING_PANEL", Hr = {
   id: "sidebar.operation.sheet-image",
   type: te.COMMAND,
   handler: async (i, t) => {
-    const e = i.get(ds), n = i.get(Be), r = i.get(he), s = i.get(K);
+    const e = i.get(ls), n = i.get($e), r = i.get(he), s = i.get(K);
     return ce(r) ? (t.value === "open" ? e.open({
       header: { title: n.t("sheetImage.panel.title") },
-      children: { label: Fr },
+      children: { label: Lr },
       onClose: () => {
         s.syncExecuteCommand(Kt.id, []);
       },
       width: 360
     }) : e.close(), !0) : !1;
   }
-}, Hr = {
+}, Vr = {
   id: "sheet.operation.edit-sheet-image",
   type: te.OPERATION,
   handler: (i, t) => {
     const e = i.get(K);
-    return t == null ? !1 : (e.syncExecuteCommand(Kt.id, [t]), e.executeCommand(Lr.id, { value: "open" }), !0);
-  }
-}, ks = "sheets-drawing-ui.config", ar = {}, Rn = {
-  id: "sheet.command.toggle-flip-drawings",
-  type: te.COMMAND,
-  // eslint-disable-next-line max-lines-per-function, complexity
-  handler: (i, t) => {
-    const e = i.get(K), n = i.get($e), r = i.get(ie), s = i.get(ee);
-    if (!t) return !1;
-    const { drawings: o } = t, a = t.flipH, c = t.flipV, u = [], d = [];
-    for (const M of o) {
-      const { unitId: I, subUnitId: v, drawingId: C } = M;
-      u.push(I);
-      const D = r.getDrawingData(I, v), T = D == null ? void 0 : D[C];
-      if (!T)
-        continue;
-      const b = { ...T.transform };
-      a && (b.flipX = !b.flipX), c && (b.flipY = !b.flipY);
-      const E = s.getRenderById(I), w = E == null ? void 0 : E.with(Oe);
-      if (!w)
-        continue;
-      const y = j(b, w), O = F(b, w), x = {
-        unitId: I,
-        subUnitId: v,
-        drawingType: T.drawingType,
-        drawingId: C,
-        transform: b,
-        sheetTransform: y,
-        axisAlignSheetTransform: O
-      };
-      if (T.drawingType === $.DRAWING_IMAGE) {
-        const z = $s(i, I);
-        if (z) {
-          const G = ye({ unitId: I, subUnitId: v, drawingId: C }), V = z.getObject(G);
-          if (V) {
-            const J = V.srcRect;
-            if (J) {
-              let Y;
-              const { left: k = 0, top: se = 0, right: ge = 0, bottom: me = 0 } = J;
-              if (a) {
-                const le = k + (ge - k) / 2, Re = le - (ge - k) / 2, Ue = le + (ge - k) / 2;
-                Y = {
-                  left: Re,
-                  top: se,
-                  right: Ue,
-                  bottom: me
-                };
-              }
-              if (c) {
-                const le = se + (me - se) / 2, Re = le - (me - se) / 2, Ue = le + (me - se) / 2;
-                Y = {
-                  left: k,
-                  top: Re,
-                  right: ge,
-                  bottom: Ue
-                };
-              }
-              Y && (x.srcRect = Y);
-            }
-          }
-        }
-      }
-      d.push(x);
-    }
-    if (d.length === 0) return !1;
-    const l = r.getBatchUpdateOp(d), { unitId: g, subUnitId: h, undo: m, redo: f, objects: p } = l, S = { id: A.id, params: { unitId: g, subUnitId: h, op: f, objects: p, type: P.UPDATE } }, _ = { id: A.id, params: { unitId: g, subUnitId: h, op: m, objects: p, type: P.UPDATE } };
-    return zt([S], e) ? (n.pushUndoRedo({
-      unitID: g,
-      undoMutations: [_, { id: L.id, params: u }],
-      redoMutations: [S, { id: L.id, params: u }]
-    }), !0) : !1;
+    return t == null ? !1 : (e.syncExecuteCommand(Kt.id, [t]), e.executeCommand(Hr.id, { value: "open" }), !0);
   }
-};
-function $s(i, t) {
-  const n = i.get(ee).getRenderById(t);
-  return n ? n.scene : null;
+}, Gr = "sheet.menu.image";
+function Bs(i) {
+  return {
+    id: Gr,
+    type: Zt.SUBITEMS,
+    icon: "AddImageIcon",
+    tooltip: "sheetImage.title",
+    hidden$: Jt(i, $.UNIVER_SHEET),
+    disabled$: si(i, { workbookTypes: [wn], worksheetTypes: [pn], rangeTypes: [Bi] })
+  };
 }
-var Bs = Object.getOwnPropertyDescriptor, Ws = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Bs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (r = o(r) || r);
-  return r;
-}, ue = (i, t) => (e, n) => t(e, n, i);
-let Wt = class extends fi {
-  constructor(t, e, n, r, s, o, a, c, u, d) {
-    super();
-    ae(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 = c, this._ioService = u, this._commandService = d, this._init();
-  }
-  _init() {
-    this._univerInstanceService.getCurrentTypeOfUnit$(B.UNIVER_SHEET).subscribe((t) => this._create(t)), this._univerInstanceService.getTypeOfUnitDisposed$(B.UNIVER_SHEET).subscribe((t) => this._dispose(t)), this._univerInstanceService.getAllUnitsForType(B.UNIVER_SHEET).forEach((t) => this._create(t)), this._setupLoadingStatus();
-  }
-  _setupLoadingStatus() {
-    const t = "image-upload-loading";
-    let e;
-    this.disposeWithMe(this._ioService.change$.subscribe((n) => {
-      n > 0 && !e ? e = this._messageService.show({
-        id: t,
-        type: Me.Loading,
-        content: `${this._localeService.t("uploadLoading.loading")}: ${n}`,
-        duration: 0
-      }) : n === 0 && (e == null || e.dispose(), e = void 0);
-    }));
-  }
-  _dispose(t) {
-    super.dispose();
-    const e = t.getUnitId();
-    this._renderManagerService.removeRender(e), this._initImagePopupMenu.delete(e);
-  }
-  _create(t) {
-    if (!t)
-      return;
-    const e = t.getUnitId();
-    this._renderManagerService.has(e) && !this._initImagePopupMenu.has(e) && (this._popupMenuListener(e), this._initImagePopupMenu.add(e));
-  }
-  _hasCropObject(t) {
-    const e = t.getAllObjectsByOrder();
-    for (const n of e)
-      if (n instanceof _s)
-        return !0;
-    return !1;
-  }
-  _popupMenuListener(t) {
-    var s;
-    const e = (s = this._renderManagerService.getRenderById(t)) == null ? void 0 : s.scene;
-    if (!e)
-      return;
-    const n = e.getTransformerByCreate();
-    if (!n)
-      return;
-    let r;
-    this.disposeWithMe(
-      n.createControl$.subscribe(() => {
-        if (this._contextService.setContextValue(et, !0), this._hasCropObject(e))
-          return;
-        const o = n.getSelectedObjectMap();
-        if (o.size > 1) {
-          r == null || r.dispose();
-          return;
-        }
-        const a = o.values().next().value;
-        if (!a)
-          return;
-        const c = a.oKey, u = this._drawingManagerService.getDrawingOKey(c);
-        if (!u)
-          return;
-        const { unitId: d, subUnitId: l, drawingId: g, drawingType: h } = u, m = u.data;
-        if (m && m.disablePopup)
-          return;
-        r == null || r.dispose();
-        const f = this._canvasPopManagerService.getFeatureMenu(d, l, g, h);
-        r = this.disposeWithMe(this._canvasPopManagerService.attachPopupToObject(a, {
-          componentKey: vs,
-          direction: "horizontal",
-          offset: [2, 0],
-          extraProps: {
-            menuItems: f || this._getImageMenuItems(d, l, g, h)
-          }
-        }));
-      })
-    ), this.disposeWithMe(
-      n.clearControl$.subscribe(() => {
-        r == null || r.dispose(), this._contextService.setContextValue(et, !1), this._commandService.syncExecuteCommand(Kt.id, []);
-      })
-    ), this.disposeWithMe(
-      this._contextService.contextChanged$.subscribe((o) => {
-        o[et] === !1 && (r == null || r.dispose());
-      })
-    ), this.disposeWithMe(
-      n.changing$.subscribe(() => {
-        r == null || r.dispose();
-      })
-    );
-  }
-  _getImageMenuItems(t, e, n, r) {
-    return [
-      {
-        label: "image-popup.edit",
-        index: 0,
-        commandId: Hr.id,
-        commandParams: { unitId: t, subUnitId: e, drawingId: n },
-        disable: r === $.DRAWING_DOM
-      },
-      {
-        label: "image-popup.delete",
-        index: 1,
-        commandId: _t.id,
-        commandParams: { unitId: t, drawings: [{ unitId: t, subUnitId: e, drawingId: n }] },
-        disable: !1
-      },
-      {
-        label: "image-popup.crop",
-        index: 2,
-        commandId: Is.id,
-        commandParams: { unitId: t, subUnitId: e, drawingId: n },
-        disable: r === $.DRAWING_DOM
-      },
-      {
-        label: "image-popup.flipH",
-        index: 2,
-        commandId: Rn.id,
-        commandParams: { unitId: t, flipH: !0, drawings: [{ unitId: t, subUnitId: e, drawingId: n }] },
-        disable: r === $.DRAWING_DOM
-      },
-      {
-        label: "image-popup.flipV",
-        index: 2,
-        commandId: Rn.id,
-        commandParams: { unitId: t, flipV: !0, drawings: [{ unitId: t, subUnitId: e, drawingId: n }] },
-        disable: r === $.DRAWING_DOM
-      },
-      {
-        label: "image-popup.reset",
-        index: 3,
-        commandId: Cs.id,
-        commandParams: [{ unitId: t, subUnitId: e, drawingId: n }],
-        disable: r === $.DRAWING_DOM
-      }
-    ];
-  }
-};
-Wt = Ws([
-  ue(0, N(it)),
-  ue(1, N(Be)),
-  ue(2, de),
-  ue(3, N(ii)),
-  ue(4, ee),
-  ue(5, he),
-  ue(6, Ar),
-  ue(7, hr),
-  ue(8, mr),
-  ue(9, K)
-], Wt);
-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--)
+function $s(i) {
+  return {
+    id: Qt.id,
+    title: "sheetImage.upload.float",
+    type: Zt.BUTTON,
+    hidden$: Jt(i, $.UNIVER_SHEET)
+  };
+}
+function Ws(i) {
+  return {
+    id: On.id,
+    title: "sheetImage.upload.cell",
+    type: Zt.BUTTON,
+    hidden$: Jt(i, $.UNIVER_SHEET)
+  };
+}
+const js = "@univerjs/sheets-drawing-ui", Fs = "0.17.0", Yr = {
+  name: js,
+  version: Fs
+}, Ls = "sheets-drawing-ui.config", cr = {};
+var Hs = Object.getOwnPropertyDescriptor, Vs = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Hs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, Nt = (i, t) => (e, n) => t(e, n, i);
+}, xt = (i, t) => (e, n) => t(e, n, i);
 let Dn = class extends re {
   constructor(t, e, n, r, s) {
     super();
@@ -1394,10 +1198,10 @@ let Dn = 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(bs(33)).subscribe((t) => {
+    this.disposeWithMe(this._hoverManagerService.currentRichTextNoDistinct$.pipe(Ms(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(ni.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(ri.ZOOM_IN)) : this._isSetCursor && (this._isSetCursor = !1, this._context.scene.resetCursor());
     }));
   }
   _initImageClick() {
@@ -1411,17 +1215,17 @@ let Dn = class extends re {
     }));
   }
 };
-Dn = Fs([
-  Nt(1, N(si)),
-  Nt(2, N(St)),
-  Nt(3, N(xr)),
-  Nt(4, N(Z))
+Dn = Vs([
+  xt(1, N(oi)),
+  xt(2, N(_t)),
+  xt(3, N(kr)),
+  xt(4, N(Z))
 ], Dn);
-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--)
+var Gs = Object.getOwnPropertyDescriptor, Ys = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Gs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, xt = (i, t) => (e, n) => t(e, n, i);
+}, kt = (i, t) => (e, n) => t(e, n, i);
 let bn = class extends re {
   constructor(i, t, e, n, r) {
     super(), this._context = i, this._sheetDrawingService = t, this._drawingManagerService = e, this._sheetSelectionRenderService = n, this._sheetSkeletonManagerService = r, this._init();
@@ -1442,21 +1246,21 @@ let bn = class extends re {
     this._drawingManagerService.registerDrawingData(this._context.unitId, this._sheetDrawingService.getDrawingDataForUnit(this._context.unitId)), this._drawingManagerService.initializeNotification(this._context.unitId);
   }
 };
-bn = Hs([
-  xt(1, ie),
-  xt(2, de),
-  xt(3, N(Oe)),
-  xt(4, N(Z))
+bn = Ys([
+  kt(1, ie),
+  kt(2, de),
+  kt(3, N(Oe)),
+  kt(4, N(Z))
 ], bn);
-var Gs = Object.getOwnPropertyDescriptor, Vs = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Gs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+var Xs = Object.getOwnPropertyDescriptor, zs = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Xs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, Ye = (i, t) => (e, n) => t(e, n, i);
-function Gr(i, t, e) {
+function Xr(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]], c = vn(
+    const a = e.p.drawings[e.p.drawingsOrder[0]], c = In(
       i,
       {
         unitId: t.unitId,
@@ -1479,40 +1283,40 @@ let jt = class extends re {
   }
   _handleInitEditor() {
     this.disposeWithMe(this._editorBridgeService.visible$.subscribe((i) => {
-      i.visible ? i.visible && (this._drawingManagerService.removeDrawingDataForUnit(ht), this._docDrawingController.loadDrawingDataForUnit(ht), this._drawingManagerService.initializeNotification(ht)) : this._drawingManagerService.removeDrawingDataForUnit(ht);
+      i.visible ? i.visible && (this._drawingManagerService.removeDrawingDataForUnit(gt), this._docDrawingController.loadDrawingDataForUnit(gt), this._drawingManagerService.initializeNotification(gt)) : this._drawingManagerService.removeDrawingDataForUnit(gt);
     })), this.disposeWithMe(this._commandService.onCommandExecuted((i) => {
-      i.id === rs.id && i.params.unitId === qe && (this._drawingManagerService.removeDrawingDataForUnit(qe), this._docDrawingController.loadDrawingDataForUnit(qe), this._drawingManagerService.initializeNotification(qe));
+      i.id === is.id && i.params.unitId === qe && (this._drawingManagerService.removeDrawingDataForUnit(qe), this._docDrawingController.loadDrawingDataForUnit(qe), this._drawingManagerService.initializeNotification(qe));
     }));
   }
   _initCellContentInterceptor() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        ki.CELL_CONTENT,
+        $i.CELL_CONTENT,
         {
           effect: pi.Style,
-          priority: $i.CELL_IMAGE,
+          priority: Wi.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 }, Gr(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 }, Xr(this._injector, { unitId: t.unitId, subUnitId: t.subUnitId, row: t.row, col: t.col }, i)), e(i);
           }
         }
       )
     );
   }
 };
-jt = Vs([
+jt = zs([
   Ye(0, K),
-  Ye(1, N(wt)),
-  Ye(2, N(it)),
+  Ye(1, N(St)),
+  Ye(2, N(st)),
   Ye(3, de),
-  Ye(4, N(ws)),
-  Ye(5, N(oi))
+  Ye(4, N(Ss)),
+  Ye(5, N(ai))
 ], jt);
-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--)
+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;
-}, cr = (i, t) => (e, n) => t(e, n, i);
+}, dr = (i, t) => (e, n) => t(e, n, i);
 let Ft = class extends re {
   constructor(i, t) {
     super(), this._autoFillService = i, this._injector = t, this._initAutoFillHooks();
@@ -1523,24 +1327,24 @@ let Ft = class extends re {
         id: "sheet-cell-image-autofill",
         onBeforeSubmit: (i, t, e, n) => {
           new wi(n).forValue((r, s, o) => {
-            Gr(this._injector, { unitId: i.unitId, subUnitId: i.subUnitId, row: r, col: s }, o);
+            Xr(this._injector, { unitId: i.unitId, subUnitId: i.subUnitId, row: r, col: s }, o);
           });
         }
       })
     );
   }
 };
-Ft = Xs([
-  cr(0, N(Bi)),
-  cr(1, N(it))
+Ft = Js([
+  dr(0, N(ji)),
+  dr(1, N(st))
 ], Ft);
-var zs = Object.getOwnPropertyDescriptor, Ks = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? zs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+var Zs = Object.getOwnPropertyDescriptor, qs = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Zs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, ct = (i, t) => (e, n) => t(e, n, i);
-const Js = [
-  ht,
+}, dt = (i, t) => (e, n) => t(e, n, i);
+const Qs = [
+  gt,
   Si,
   qe
 ];
@@ -1550,7 +1354,7 @@ let Lt = class extends re {
   }
   _setCellImage(i) {
     var r;
-    const t = gn("", {}), e = (r = yn(B.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.with(ai), n = mn.drawing.add({
+    const t = fn("", {}), e = (r = Tn($.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.with(ci), n = mn.drawing.add({
       documentDataModel: t,
       drawings: [i],
       selection: {
@@ -1565,12 +1369,12 @@ let Lt = class extends re {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((i) => {
         var t, e;
-        if (i.id === is.id) {
-          const n = i.params, { doc: r } = n, s = this._univerInstanceService.getCurrentUnitOfType(B.UNIVER_DOC);
+        if (i.id === ss.id) {
+          const n = i.params, { doc: r } = n, s = this._univerInstanceService.getCurrentUnitOfType($.UNIVER_DOC);
           if (s == null || !Object.keys((t = r.drawings) != null ? t : {}).length)
             return;
           const o = s.getUnitId();
-          if (Js.includes(o)) {
+          if (Qs.includes(o)) {
             if (o !== qe) {
               const a = () => {
                 this._dialogService.close("sheet-cell-image-copy-paste"), this._commandService.syncExecuteCommand($n.id, {
@@ -1606,32 +1410,32 @@ let Lt = class extends re {
     );
   }
 };
-Lt = Ks([
-  ct(0, K),
-  ct(1, he),
-  ct(2, Tn),
-  ct(3, ee),
-  ct(4, N(Be))
+Lt = qs([
+  dt(0, K),
+  dt(1, he),
+  dt(2, En),
+  dt(3, ee),
+  dt(4, N($e))
 ], Lt);
-var Zs = Object.getOwnPropertyDescriptor, qs = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Zs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+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;
-}, dt = (i, t) => (e, n) => t(e, n, i);
-const Vr = "image/png";
-function Qs(i) {
+}, lt = (i, t) => (e, n) => t(e, n, i);
+const zr = "image/png";
+function no(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: Vr });
+  return new Blob([r], { type: zr });
 }
-function eo(i) {
-  const t = new ClipboardItem({ [Vr]: Qs(i) });
+function ro(i) {
+  const t = new ClipboardItem({ [zr]: no(i) });
   navigator.clipboard.write([t]).catch((e) => {
     console.error("Could not copy image using clipboard API: ", e);
   });
 }
-function to() {
+function io() {
   function i() {
     const n = document.createElement("input");
     return n.style.position = "absolute", n.style.height = "1px", n.style.width = "1px", n.style.opacity = "0", n;
@@ -1641,7 +1445,7 @@ function to() {
     e.blur(), document.body.removeChild(e), t instanceof HTMLElement && t.focus();
   };
 }
-const dr = [
+const lr = [
   Je.SPECIAL_PASTE_COL_WIDTH,
   Je.SPECIAL_PASTE_VALUE,
   Je.SPECIAL_PASTE_FORMAT,
@@ -1665,18 +1469,18 @@ let Ht = class extends re {
         const s = this._focusedDrawings;
         if (s.length > 0) {
           const [o] = s;
-          if (o.drawingType !== $.DRAWING_IMAGE)
+          if (o.drawingType !== B.DRAWING_IMAGE)
             return;
           if (r === Pe.CUT) {
             const c = {
               unitId: t,
               drawings: [o]
             };
-            this._commandService.executeCommand(_t.id, c);
+            this._commandService.executeCommand(vt.id, c);
           }
           setTimeout(() => {
-            const c = to();
-            o.drawingType === $.DRAWING_IMAGE && o.imageSourceType === os.BASE64 ? eo(o.source) : this._clipboardInterfaceService.writeText(""), c();
+            const c = io();
+            o.drawingType === B.DRAWING_IMAGE && o.imageSourceType === as.BASE64 ? ro(o.source) : this._clipboardInterfaceService.writeText(""), c();
           }, 200);
           const a = {
             unitId: o.unitId,
@@ -1726,19 +1530,19 @@ let Ht = class extends re {
       return;
     const { startX: o, endX: a, startY: c, endY: u } = s, d = this._drawingService.getDrawingData(t, e), l = this._focusedDrawings.slice();
     if (Object.keys(d).forEach((h) => {
-      const m = d[h];
-      if (m.drawingType !== $.DRAWING_IMAGE)
+      const f = d[h];
+      if (f.drawingType !== B.DRAWING_IMAGE)
         return;
-      const { transform: f } = m;
-      if (m.anchorType !== U.Both || !f)
+      const { transform: m } = f;
+      if (f.anchorType !== U.Both || !m)
         return;
-      const { left: p = 0, top: S = 0, width: _ = 0, height: R = 0 } = f, { drawingStartX: M, drawingEndX: I, drawingStartY: v, drawingEndY: C } = {
+      const { left: p = 0, top: S = 0, width: _ = 0, height: R = 0 } = m, { drawingStartX: M, drawingEndX: I, drawingStartY: v, drawingEndY: C } = {
         drawingStartX: p,
         drawingEndX: p + _,
         drawingStartY: S,
         drawingEndY: S + R
       };
-      o <= M && I <= a && c <= v && C <= u && l.push(m);
+      o <= M && I <= a && c <= v && C <= u && l.push(f);
     }), l.length)
       return {
         copyRange: n,
@@ -1749,17 +1553,17 @@ let Ht = class extends re {
   }
   _generateSingleDrawingPasteMutations(t, e) {
     const { pasteType: n, pasteTo: r } = t;
-    if (dr.includes(n))
+    if (lr.includes(n))
       return { redos: [], undos: [] };
     const { unitId: s, subUnitId: o, range: a } = r, c = this._renderManagerService.getRenderById(s), u = c == null ? void 0 : c.with(Z), d = c == null ? void 0 : c.with(Oe), l = this._copyInfo;
     if (!u || !d)
       return { redos: [], undos: [] };
-    const { drawings: g } = l, h = Vn(a);
+    const { drawings: g } = l, h = Yn(a);
     return this._generateMutations(g, {
       unitId: s,
       subUnitId: o,
       isCut: e === Pe.CUT,
-      getTransform: (m, f) => {
+      getTransform: (f, m) => {
         var _, R;
         const p = u.attachRangeWithCoord({
           startRow: h.startRow,
@@ -1767,14 +1571,14 @@ let Ht = class extends re {
           startColumn: h.startColumn,
           endColumn: h.endColumn
         }), S = {
-          ...m,
+          ...f,
           left: p == null ? void 0 : p.startX,
           top: p == null ? void 0 : p.startY
         };
         return {
           transform: S,
-          sheetTransform: (_ = j(S, d)) != null ? _ : f,
-          axisAlignSheetTransform: (R = F(S, d)) != null ? R : f
+          sheetTransform: (_ = j(S, d)) != null ? _ : m,
+          axisAlignSheetTransform: (R = F(S, d)) != null ? R : m
         };
       }
     });
@@ -1790,7 +1594,7 @@ let Ht = class extends re {
       const { transform: l, sheetTransform: g } = d;
       if (!l)
         return;
-      const h = s(l, g), m = {
+      const h = s(l, g), f = {
         ...d,
         unitId: n,
         subUnitId: r,
@@ -1800,7 +1604,7 @@ let Ht = class extends re {
         axisAlignSheetTransform: h.axisAlignSheetTransform
       };
       if (o) {
-        const { undo: f, redo: p, objects: S } = u.getBatchUpdateOp([m]);
+        const { undo: m, redo: p, objects: S } = u.getBatchUpdateOp([f]);
         a.push({
           id: A.id,
           params: {
@@ -1816,13 +1620,13 @@ let Ht = class extends re {
             unitId: n,
             subUnitId: r,
             type: P.UPDATE,
-            op: f,
+            op: m,
             objects: S
           }
         });
       } else {
-        const { undo: f, redo: p, objects: S } = u.getBatchAddOp([m]);
-        a.push({ id: A.id, params: { op: p, unitId: n, subUnitId: r, objects: S, type: P.INSERT } }), c.push({ id: A.id, params: { op: f, unitId: n, subUnitId: r, objects: S, type: P.REMOVE } });
+        const { undo: m, redo: p, objects: S } = u.getBatchAddOp([f]);
+        a.push({ id: A.id, params: { op: p, unitId: n, subUnitId: r, objects: S, type: P.INSERT } }), c.push({ id: A.id, params: { op: m, unitId: n, subUnitId: r, objects: S, type: P.REMOVE } });
       }
     }), { redos: a, undos: c };
   }
@@ -1838,7 +1642,7 @@ let Ht = class extends re {
       copyRange: a,
       copyType: c
     } = e;
-    if (dr.includes(s))
+    if (lr.includes(s))
       return { redos: [], undos: [] };
     const u = (D = this._renderManagerService.getRenderById(n)) == null ? void 0 : D.with(Z);
     if (!u || !this._copyInfo)
@@ -1846,14 +1650,14 @@ let Ht = class extends re {
     const { drawings: d } = this._copyInfo;
     if (!a)
       return this._generateSingleDrawingPasteMutations({
-        pasteTo: { unitId: n, subUnitId: r, range: Vn(o) },
+        pasteTo: { unitId: n, subUnitId: r, range: Yn(o) },
         pasteType: s
       }, c);
-    const { ranges: [l, g], mapFunc: h } = ci([a, o]), { row: m, col: f } = h(l.startRow, l.startColumn), { row: p, col: S } = h(g.startRow, g.startColumn), _ = u.attachRangeWithCoord({
-      startRow: m,
-      endRow: m,
-      startColumn: f,
-      endColumn: f
+    const { ranges: [l, g], mapFunc: h } = di([a, o]), { row: f, col: m } = h(l.startRow, l.startColumn), { row: p, col: S } = h(g.startRow, g.startColumn), _ = u.attachRangeWithCoord({
+      startRow: f,
+      endRow: f,
+      startColumn: m,
+      endColumn: m
     }), R = u.attachRangeWithCoord({
       startRow: p,
       endRow: p,
@@ -1862,7 +1666,7 @@ let Ht = class extends re {
     });
     if (!_ || !R || !this._copyInfo)
       return { redos: [], undos: [] };
-    const M = R.startX - _.startX, I = R.startY - _.startY, v = p - m, C = S - f;
+    const M = R.startX - _.startX, I = R.startY - _.startY, v = p - f, C = S - m;
     return this._generateMutations(d, {
       unitId: n,
       subUnitId: r,
@@ -1923,36 +1727,36 @@ let Ht = class extends re {
     });
   }
 };
-Ht = qs([
-  dt(0, di),
-  dt(1, ee),
-  dt(2, de),
-  dt(3, ls),
-  dt(4, K)
+Ht = to([
+  lt(0, li),
+  lt(1, ee),
+  lt(2, de),
+  lt(3, us),
+  lt(4, K)
 ], Ht);
-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--)
+var so = Object.getOwnPropertyDescriptor, oo = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? so(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, lt = (i, t) => (e, n) => t(e, n, i);
-let Gt = class extends re {
+}, ut = (i, t) => (e, n) => t(e, n, i);
+let Vt = class extends re {
   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();
   }
   _initDrawingVisible() {
-    const i = this._univerInstanceService.getCurrentTypeOfUnit$(B.UNIVER_SHEET), t = this._userManagerService.currentUser$, e = gt([i, t]);
+    const i = this._univerInstanceService.getCurrentTypeOfUnit$($.UNIVER_SHEET), t = this._userManagerService.currentUser$, e = ft([i, t]);
     this.disposeWithMe(
       e.pipe(
         ve(([n, r]) => n ? n.activeSheet$.pipe(
-          nr((s) => {
+          rr((s) => {
             if (!s) {
               this._drawingManagerService.setDrawingVisible(!1);
               return;
             }
             const o = n.getUnitId(), a = s.getSheetId();
             this._permissionService.composePermission([
-              new Yn(o).id,
-              new Xn(o, a).id
+              new Xn(o).id,
+              new zn(o, a).id
             ]).every((u) => u.value) ? this._drawingManagerService.setDrawingVisible(!0) : this._handleDrawingVisibilityFalse(n, s);
           })
         ) : (this._drawingManagerService.setDrawingVisible(!1), De))
@@ -1969,18 +1773,18 @@ let Gt = class extends re {
     });
   }
   _initDrawingEditable() {
-    const i = this._univerInstanceService.getCurrentTypeOfUnit$(B.UNIVER_SHEET), t = this._userManagerService.currentUser$, e = gt([i, t]);
+    const i = this._univerInstanceService.getCurrentTypeOfUnit$($.UNIVER_SHEET), t = this._userManagerService.currentUser$, e = ft([i, t]);
     this.disposeWithMe(
       e.pipe(
         ve(([n, r]) => n ? n.activeSheet$.pipe(
-          nr((s) => {
+          rr((s) => {
             if (!s) {
               this._drawingManagerService.setDrawingEditable(!1);
               return;
             }
             const o = n.getUnitId(), a = s.getSheetId();
             this._permissionService.composePermission([
-              new fn(o).id,
+              new wn(o).id,
               new pn(o, a).id
             ]).every((u) => u.value) ? this._drawingManagerService.setDrawingEditable(!0) : this._handleDrawingEditableFalse(n, s);
           })
@@ -1998,9 +1802,9 @@ let Gt = class extends re {
     });
   }
   _initViewPermissionChange() {
-    const i = this._univerInstanceService.getCurrentTypeOfUnit$(B.UNIVER_SHEET), t = this._userManagerService.currentUser$;
+    const i = this._univerInstanceService.getCurrentTypeOfUnit$($.UNIVER_SHEET), t = this._userManagerService.currentUser$;
     this.disposeWithMe(
-      gt([i, t]).pipe(
+      ft([i, t]).pipe(
         ve(([e, n]) => e ? e.activeSheet$.pipe(
           ve((r) => {
             if (!r)
@@ -2010,11 +1814,11 @@ let Gt = class extends re {
               return De;
             const u = c.getTransformerByCreate();
             return this._permissionService.composePermission$([
-              new Yn(s).id,
-              new Xn(s, o).id
+              new Xn(s).id,
+              new zn(s, o).id
             ]).pipe(
               Ie((l) => l.every((g) => g.value)),
-              rr()
+              ir()
             ).pipe(
               Ie((l) => ({
                 permission: l,
@@ -2036,7 +1840,7 @@ let Gt = class extends re {
         },
         complete: () => {
           this._drawingManagerService.setDrawingVisible(!0);
-          const e = this._univerInstanceService.getCurrentUnitForType(B.UNIVER_SHEET), n = e == null ? void 0 : e.getActiveSheet(), r = e == null ? void 0 : e.getUnitId(), s = n == null ? void 0 : n.getSheetId();
+          const e = this._univerInstanceService.getCurrentUnitForType($.UNIVER_SHEET), n = e == null ? void 0 : e.getActiveSheet(), r = e == null ? void 0 : e.getUnitId(), s = n == null ? void 0 : n.getSheetId();
           if (!r || !s)
             return;
           const o = this._drawingManagerService.getDrawingData(r, s), a = Object.values(o);
@@ -2046,9 +1850,9 @@ let Gt = class extends re {
     );
   }
   _initEditPermissionChange() {
-    const i = this._univerInstanceService.getCurrentTypeOfUnit$(B.UNIVER_SHEET), t = this._userManagerService.currentUser$;
+    const i = this._univerInstanceService.getCurrentTypeOfUnit$($.UNIVER_SHEET), t = this._userManagerService.currentUser$;
     this.disposeWithMe(
-      gt([i, t]).pipe(
+      ft([i, t]).pipe(
         ve(([e, n]) => e ? e.activeSheet$.pipe(
           ve((r) => {
             if (!r)
@@ -2058,11 +1862,11 @@ let Gt = class extends re {
               return De;
             const u = c.getTransformerByCreate();
             return this._permissionService.composePermission$([
-              new fn(s).id,
+              new wn(s).id,
               new pn(s, o).id
             ]).pipe(
               Ie((l) => l.every((g) => g.value)),
-              rr()
+              ir()
             ).pipe(
               Ie((l) => ({
                 permission: l,
@@ -2085,7 +1889,7 @@ let Gt = class extends re {
           }), r.clearSelectedObjects());
         },
         complete: () => {
-          const e = this._univerInstanceService.getCurrentUnitForType(B.UNIVER_SHEET);
+          const e = this._univerInstanceService.getCurrentUnitForType($.UNIVER_SHEET);
           if (!e)
             return;
           const n = e.getUnitId(), r = e.getActiveSheet();
@@ -2103,21 +1907,21 @@ let Gt = class extends re {
     );
   }
 };
-Gt = ro([
-  lt(0, de),
-  lt(1, ee),
-  lt(2, _i),
-  lt(3, he),
-  lt(4, N(vi))
-], Gt);
-var io = Object.getOwnPropertyDescriptor, so = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? io(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+Vt = oo([
+  ut(0, de),
+  ut(1, ee),
+  ut(2, _i),
+  ut(3, he),
+  ut(4, N(vi))
+], Vt);
+var ao = Object.getOwnPropertyDescriptor, co = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? ao(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, Ae = (i, t) => (e, n) => t(e, n, i);
-const oo = "univer-sheet-float-dom-";
-function Yr(i, t, e, n, r, s = !1) {
-  const { scaleX: o, scaleY: a } = t.getAncestorScale(), c = t.getViewport(lr.VIEW_MAIN), u = n.getFreeze(), { startColumn: d, startRow: l, xSplit: g, ySplit: h } = u, m = {
+const lo = "univer-sheet-float-dom-";
+function Kr(i, t, e, n, r, s = !1) {
+  const { scaleX: o, scaleY: a } = t.getAncestorScale(), c = t.getViewport(ur.VIEW_MAIN), u = n.getFreeze(), { startColumn: d, startRow: l, xSplit: g, ySplit: h } = u, f = {
     left: !0,
     // left means the left of pic is in a viewMainLeft
     top: !0
@@ -2125,9 +1929,9 @@ function Yr(i, t, e, n, r, s = !1) {
   if (!c)
     return {
       ...i,
-      absolute: m
+      absolute: f
     };
-  const { left: f, right: p, top: S, bottom: _ } = i;
+  const { left: m, right: p, top: S, bottom: _ } = i;
   let { top: R, left: M, viewportScrollX: I, viewportScrollY: v } = c;
   const { boundsOfViewArea: C, scrollDirectionResponse: D } = r || {}, { rowHeaderWidth: T, columnHeaderHeight: b } = e, E = {
     top: s ? 0 : b,
@@ -2137,24 +1941,24 @@ function Yr(i, t, e, n, r, s = !1) {
   let w = 0, y = 0;
   const O = e.rowStartY(l - h) + b, x = e.colStartX(d - g) + T, q = e.rowStartY(l) + b, z = e.colStartX(d) + T;
   if (g === 0)
-    m.left = !1, w = (f - I) * o, y = (p - I) * o;
+    f.left = !1, w = (m - I) * o, y = (p - I) * o;
   else {
-    const Y = f - (x - T), k = p - (x - T);
-    p < z ? (w = Y * o, y = k * o) : f <= z && p >= z ? (w = Y * o, y = Math.max(M, (p - I) * o)) : f > z && (m.left = !1, w = Math.max((f - I) * o, M), y = Math.max((p - I) * o, M));
+    const Y = m - (x - T), k = p - (x - T);
+    p < z ? (w = Y * o, y = k * o) : m <= z && p >= z ? (w = Y * o, y = Math.max(M, (p - I) * o)) : m > z && (f.left = !1, w = Math.max((m - I) * o, M), y = Math.max((p - I) * o, M));
   }
-  let G = 0, V = 0;
+  let V = 0, G = 0;
   if (h === 0)
-    m.top = !1, G = (S - v) * a, V = (_ - v) * a;
+    f.top = !1, V = (S - v) * a, G = (_ - v) * a;
   else {
     const Y = S - (O - b), k = _ - (O - b);
-    _ < q ? (G = Y * a, V = k * a) : S <= q && _ >= q ? (G = Y * a, V = Math.max(R, (_ - v) * a)) : S > q && (m.top = !1, G = Math.max((S - v) * a, R), V = Math.max((_ - v) * a, R));
+    _ < q ? (V = Y * a, G = k * a) : S <= q && _ >= q ? (V = Y * a, G = Math.max(R, (_ - v) * a)) : S > q && (f.top = !1, V = Math.max((S - v) * a, R), G = Math.max((_ - v) * a, R));
   }
-  return w = Math.max(w, E.left), G = Math.max(G, E.top), y = Math.max(y, E.left), V = Math.max(V, E.top), {
+  return w = Math.max(w, E.left), V = Math.max(V, E.top), y = Math.max(y, E.left), G = Math.max(G, E.top), {
     left: w,
     right: y,
-    top: G,
-    bottom: V,
-    absolute: m
+    top: V,
+    bottom: G,
+    absolute: f
   };
 }
 const _e = (i, t, e, n, r) => {
@@ -2163,7 +1967,7 @@ const _e = (i, t, e, n, r) => {
     right: s + a,
     top: o,
     bottom: o + c
-  }, l = Yr(d, t, e, n, r), { scaleX: g, scaleY: h } = t.getAncestorScale();
+  }, l = Kr(d, t, e, n, r), { scaleX: g, scaleY: h } = t.getAncestorScale();
   return {
     startX: l.left,
     endX: l.right,
@@ -2175,23 +1979,23 @@ const _e = (i, t, e, n, r) => {
     absolute: l.absolute
   };
 };
-let pt = class extends re {
+let wt = class extends re {
   constructor(t, e, n, r, s, o, a) {
     super();
     /**
      * for update dom container position when scrolling and zoom
      */
     ae(this, "_domLayerInfoMap", /* @__PURE__ */ new Map());
-    ae(this, "_transformChange$", new dn());
+    ae(this, "_transformChange$", new ln());
     ae(this, "transformChange$", this._transformChange$.asObservable());
-    ae(this, "_add$", new dn());
+    ae(this, "_add$", new ln());
     ae(this, "add$", this._add$.asObservable());
-    ae(this, "_remove$", new dn());
+    ae(this, "_remove$", new ln());
     ae(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() {
-    this._lifecycleService.lifecycle$.pipe(Ms((t) => t === Ci.Rendered), ys(1)).subscribe(() => {
+    this._lifecycleService.lifecycle$.pipe(ys((t) => t === Ci.Rendered), Ts(1)).subscribe(() => {
       this._scrollUpdateListener();
     });
   }
@@ -2217,7 +2021,7 @@ let pt = class extends re {
       this._drawingManagerService.add$.subscribe((t) => {
         t.forEach((e) => {
           var Y;
-          const { unitId: n, subUnitId: r, drawingId: s } = e, o = ce(this._univerInstanceService, { unitId: n, subUnitId: r }), a = this._drawingManagerService.getDrawingByParam(e), c = this._univerInstanceService.getUnit(n, B.UNIVER_SHEET);
+          const { unitId: n, subUnitId: r, drawingId: s } = e, o = ce(this._univerInstanceService, { unitId: n, subUnitId: r }), a = this._drawingManagerService.getDrawingByParam(e), c = this._univerInstanceService.getUnit(n, $.UNIVER_SHEET);
           if (!c)
             return;
           const u = c.getActiveSheet().getSheetId();
@@ -2227,17 +2031,17 @@ let pt = class extends re {
           if (!d)
             return;
           const { transform: l, drawingType: g, data: h } = a;
-          if (g !== $.DRAWING_DOM && g !== $.DRAWING_CHART)
+          if (g !== B.DRAWING_DOM && g !== B.DRAWING_CHART)
             return;
-          const m = this._getSceneAndTransformerByDrawingSearch(n);
-          if (m == null)
+          const f = this._getSceneAndTransformerByDrawingSearch(n);
+          if (f == null)
             return;
-          const { scene: f, canvas: p } = m;
+          const { scene: m, canvas: p } = f;
           if (l == null)
             return !0;
           if (u !== r)
             return;
-          const { left: S, top: _, width: R, height: M, angle: I, flipX: v, flipY: C, skewX: D, skewY: T } = l, b = ye({ unitId: n, subUnitId: r, drawingId: s }), E = f.getObject(b);
+          const { left: S, top: _, width: R, height: M, angle: I, flipX: v, flipY: C, skewX: D, skewY: T } = l, b = ye({ unitId: n, subUnitId: r, drawingId: s }), E = m.getObject(b);
           if (E != null) {
             E.transformByState({ left: S, top: _, width: R, height: M, angle: I, flipX: v, flipY: C, skewX: D, skewY: T });
             return;
@@ -2248,26 +2052,26 @@ let pt = class extends re {
             width: R,
             height: M,
             zIndex: this._drawingManagerService.getDrawingOrder(n, r).length - 1
-          }, y = g === $.DRAWING_CHART;
+          }, y = g === B.DRAWING_CHART;
           if (w.rotateEnabled = !1, y) {
             const k = h ? h.backgroundColor : "white";
             w.fill = k, h && h.border && (w.stroke = h.border), w.paintFirst = "stroke", w.strokeWidth = 1, w.borderEnabled = !1, w.radius = 8;
           }
-          const O = new Ge(b, w);
-          y && O.setObjectType(kn.CHART), f.addObject(O, tn), a.allowTransform !== !1 && f.attachTransformerTo(O);
-          const x = new Ut(), q = _e(O, m.renderUnit.scene, d.skeleton, o.worksheet), z = new ze(q), G = `${oo}${Ze(6)}`, V = {
+          const O = new Ve(b, w);
+          y && O.setObjectType(Bn.CHART), m.addObject(O, nn), a.allowTransform !== !1 && m.attachTransformerTo(O);
+          const x = new Pt(), q = _e(O, f.renderUnit.scene, d.skeleton, o.worksheet), z = new ze(q), V = `${lo}${Ze(6)}`, G = {
             dispose: x,
             rect: O,
             position$: z,
             unitId: n,
             subUnitId: r,
             id: s,
-            domId: G
+            domId: V
           };
           this._canvasFloatDomService.addFloatDom({
             position$: z,
             id: s,
-            domId: G,
+            domId: V,
             componentKey: a.componentKey,
             onPointerDown: (k) => {
               p.dispatchEvent(new PointerEvent(k.type, k));
@@ -2285,14 +2089,14 @@ let pt = class extends re {
             unitId: n
           });
           const J = O.onTransformChange$.subscribeEvent(() => {
-            const k = _e(O, m.renderUnit.scene, d.skeleton, o.worksheet);
+            const k = _e(O, f.renderUnit.scene, d.skeleton, o.worksheet);
             z.next(
               k
             );
           });
           x.add(() => {
             this._canvasFloatDomService.removeFloatDom(s);
-          }), J && x.add(J), this._domLayerInfoMap.set(s, V);
+          }), J && x.add(J), this._domLayerInfoMap.set(s, G);
         });
       })
     ), this.disposeWithMe(
@@ -2321,15 +2125,15 @@ let pt = class extends re {
       });
     };
     this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(B.UNIVER_SHEET).pipe(
-        ve((e) => e ? e.activeSheet$ : _n(null)),
+      this._univerInstanceService.getCurrentTypeOfUnit$($.UNIVER_SHEET).pipe(
+        ve((e) => e ? e.activeSheet$ : vn(null)),
         Ie((e) => {
           if (!e) return null;
           const n = e.getUnitId(), r = this._renderManagerService.getRenderById(n);
           return r ? { render: r, unitId: n, subUnitId: e.getSheetId() } : null;
         }),
         ve(
-          (e) => e ? Ri(e.render.scene.getViewport(lr.VIEW_MAIN).onScrollAfter$).pipe(Ie(() => ({ unitId: e.unitId, subUnitId: e.subUnitId }))) : _n(null)
+          (e) => e ? Ri(e.render.scene.getViewport(ur.VIEW_MAIN).onScrollAfter$).pipe(Ie(() => ({ unitId: e.unitId, subUnitId: e.subUnitId }))) : vn(null)
         )
       ).subscribe((e) => {
         if (!e) return;
@@ -2337,15 +2141,15 @@ let pt = class extends re {
         t(n, r);
       })
     ), this.disposeWithMe(this._commandService.onCommandExecuted((e) => {
-      if (e.id === Bn.id) {
+      if (e.id === Wn.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);
         });
-      } else if (e.id === Wi.id) {
+      } else if (e.id === Fi.id) {
         const { unitId: n, subUnitId: r } = e.params;
         t(n, r);
-      } else if (e.id === ji.id) {
+      } else if (e.id === Li.id) {
         const { unitId: n, subUnitId: r } = e.params;
         t(n, r);
       }
@@ -2355,7 +2159,7 @@ let pt = class extends re {
     const s = this._domLayerInfoMap.get(n), o = this._getSceneAndTransformerByDrawingSearch(t);
     if (s && o) {
       const { scene: a } = o, c = ye({ unitId: t, subUnitId: e, drawingId: n }), u = a.getObject(c);
-      u && u instanceof Ge && u.setProps(r);
+      u && u instanceof Ve && u.setProps(r);
     }
   }
   _getPosition(t, e) {
@@ -2390,7 +2194,7 @@ let pt = class extends re {
       this._drawingManagerService.update$.subscribe((t) => {
         t.forEach((e) => {
           const n = this._drawingManagerService.getDrawingByParam(e);
-          if (!n || n.drawingType !== $.DRAWING_DOM && n.drawingType !== $.DRAWING_CHART)
+          if (!n || n.drawingType !== B.DRAWING_DOM && n.drawingType !== B.DRAWING_CHART)
             return;
           const r = {
             ...n.transform
@@ -2399,7 +2203,7 @@ let pt = class extends re {
             ...n
           });
           const s = this._getSceneAndTransformerByDrawingSearch(e.unitId);
-          if (s && n.drawingType !== $.DRAWING_CHART) {
+          if (s && n.drawingType !== B.DRAWING_CHART) {
             const { scene: o } = s, a = this._domLayerInfoMap.get(e.drawingId);
             a != null && a.rect && (n.allowTransform === !1 ? o.detachTransformerFrom(a.rect) : o.attachTransformerTo(a.rect));
           }
@@ -2431,7 +2235,7 @@ let pt = class extends re {
       unitId: r,
       subUnitId: s,
       drawingId: d,
-      drawingType: t.type || $.DRAWING_DOM,
+      drawingType: t.type || B.DRAWING_DOM,
       componentKey: a,
       sheetTransform: l,
       transform: {
@@ -2484,14 +2288,14 @@ let pt = class extends re {
     if (!u) return;
     const d = (v = this._renderManagerService.getRenderById(o)) == null ? void 0 : v.with(Z).getWorksheetSkeleton(a);
     if (!d) return;
-    const { componentKey: l, data: g, allowTransform: h = !0 } = e, m = r != null ? r : Ze(), { position: f, position$: p } = this._createRangePositionObserver(t, u, d.skeleton);
-    if (this._getPosition(f, o) == null)
+    const { componentKey: l, data: g, allowTransform: h = !0 } = e, f = r != null ? r : Ze(), { position: m, position$: p } = this._createRangePositionObserver(t, u, d.skeleton);
+    if (this._getPosition(m, o) == null)
       return;
-    const _ = c.scene, { scaleX: R } = _.getAncestorScale(), M = kt(f, n, R), I = {
+    const _ = c.scene, { scaleX: R } = _.getAncestorScale(), M = Bt(m, n, R), I = {
       unitId: o,
       subUnitId: a,
-      drawingId: m,
-      drawingType: e.type || $.DRAWING_DOM,
+      drawingId: f,
+      drawingType: e.type || B.DRAWING_DOM,
       componentKey: l,
       transform: {
         left: M.startX,
@@ -2503,7 +2307,7 @@ let pt = class extends re {
       allowTransform: h
     };
     {
-      const { unitId: T, subUnitId: b, drawingId: E } = I, w = ce(this._univerInstanceService, { unitId: T, subUnitId: b }), y = I, O = this._univerInstanceService.getUnit(T, B.UNIVER_SHEET);
+      const { unitId: T, subUnitId: b, drawingId: E } = I, w = ce(this._univerInstanceService, { unitId: T, subUnitId: b }), y = I, O = this._univerInstanceService.getUnit(T, $.UNIVER_SHEET);
       if (!O)
         return;
       const x = O.getActiveSheet().getSheetId();
@@ -2515,49 +2319,49 @@ let pt = class extends re {
       const z = q.getWorksheetSkeleton(b);
       if (!z)
         return;
-      const { transform: G, drawingType: V, data: J } = y;
-      if (V !== $.DRAWING_DOM && V !== $.DRAWING_CHART)
+      const { transform: V, drawingType: G, data: J } = y;
+      if (G !== B.DRAWING_DOM && G !== B.DRAWING_CHART)
         return;
       const Y = this._getSceneAndTransformerByDrawingSearch(T);
       if (Y == null)
         return;
       const { scene: k, canvas: se } = Y;
-      if (G == null || x !== b)
+      if (V == null || x !== b)
         return;
-      const { left: ge, top: me, width: le, height: Re, angle: Ue, flipX: en, flipY: Rt, skewX: Dt, skewY: We } = G, bt = ye({ unitId: T, subUnitId: b, drawingId: E }), fe = k.getObject(bt);
-      if (fe != null) {
-        fe.transformByState({ left: ge, top: me, width: le, height: Re, angle: Ue, flipX: en, flipY: Rt, skewX: Dt, skewY: We });
+      const { left: ge, top: fe, width: le, height: Re, angle: Ue, flipX: tn, flipY: Dt, skewX: bt, skewY: We } = V, Mt = ye({ unitId: T, subUnitId: b, drawingId: E }), me = k.getObject(Mt);
+      if (me != null) {
+        me.transformByState({ left: ge, top: fe, width: le, height: Re, angle: Ue, flipX: tn, flipY: Dt, skewX: bt, skewY: We });
         return;
       }
       const oe = {
         left: ge,
         // from floatDomParam.transform
-        top: me,
+        top: fe,
         width: le,
         height: Re,
         zIndex: this._drawingManagerService.getDrawingOrder(T, b).length - 1
-      }, je = V === $.DRAWING_CHART;
+      }, je = G === B.DRAWING_CHART;
       if (je) {
         const W = J ? J.backgroundColor : "white";
         oe.fill = W, oe.rotateEnabled = !1, J && J.border && (oe.stroke = J.border), oe.paintFirst = "stroke", oe.strokeWidth = 1, oe.borderEnabled = !1, oe.radius = 8;
       }
-      const pe = new Ge(bt, oe);
-      je && pe.setObjectType(kn.CHART), k.addObject(pe, tn), y.allowTransform !== !1 && k.attachTransformerTo(pe);
-      const we = new Ut(), Mt = k.getMainViewport(), { rowHeaderWidth: Fe, columnHeaderHeight: st } = z.skeleton, yt = {
-        top: st,
+      const pe = new Ve(Mt, oe);
+      je && pe.setObjectType(Bn.CHART), k.addObject(pe, nn), y.allowTransform !== !1 && k.attachTransformerTo(pe);
+      const we = new Pt(), yt = k.getMainViewport(), { rowHeaderWidth: Fe, columnHeaderHeight: ot } = z.skeleton, Tt = {
+        top: ot,
         left: Fe,
-        bottom: Mt.bottom,
-        right: Mt.right
+        bottom: yt.bottom,
+        right: yt.right
       }, Se = {
         dispose: we,
         rect: pe,
-        boundsOfViewArea: yt,
+        boundsOfViewArea: Tt,
         domAnchor: n,
         unitId: T,
         subUnitId: b
       }, H = _e(pe, Y.renderUnit.scene, z.skeleton, w.worksheet, Se), Le = new ze(H);
       Se.position$ = Le;
-      let ot = {
+      let at = {
         position$: Le,
         id: E,
         componentKey: y.componentKey,
@@ -2573,8 +2377,8 @@ let pt = class extends re {
         data: J,
         unitId: T
       };
-      e.eventPassThrough && (ot = {
-        ...ot,
+      e.eventPassThrough && (at = {
+        ...at,
         onPointerDown: (W) => {
           se.dispatchEvent(new PointerEvent(W.type, W));
         },
@@ -2584,33 +2388,33 @@ let pt = class extends re {
         onPointerUp: (W) => {
           se.dispatchEvent(new PointerEvent(W.type, W));
         }
-      }), this._canvasFloatDomService.addFloatDom(ot), this.disposeWithMe(p.subscribe((W) => {
-        var Pn, An, Nn, xn;
-        const Un = kt({
+      }), this._canvasFloatDomService.addFloatDom(at), this.disposeWithMe(p.subscribe((W) => {
+        var An, Nn, xn, kn;
+        const Pn = Bt({
           startX: W.startX,
           startY: W.startY,
           endX: W.endX,
           endY: W.endY,
-          width: (Pn = n.width) != null ? Pn : W.width,
-          height: (An = n.height) != null ? An : W.height,
+          width: (An = n.width) != null ? An : W.width,
+          height: (Nn = n.height) != null ? Nn : W.height,
           absolute: {
-            left: f.absolute.left,
-            top: f.absolute.top
+            left: m.absolute.left,
+            top: m.absolute.top
           }
-        }, n), Kr = ye({ unitId: T, subUnitId: b, drawingId: E }), Jr = new Ge(Kr, {
-          left: Un.startX,
-          top: Un.startY,
-          width: (Nn = n.width) != null ? Nn : W.width,
-          height: (xn = n.height) != null ? xn : W.height,
+        }, n), Jr = ye({ unitId: T, subUnitId: b, drawingId: E }), Zr = new Ve(Jr, {
+          left: Pn.startX,
+          top: Pn.startY,
+          width: (xn = n.width) != null ? xn : W.width,
+          height: (kn = n.height) != null ? kn : W.height,
           zIndex: this._drawingManagerService.getDrawingOrder(T, b).length - 1
-        }), Zr = _e(Jr, Y.renderUnit.scene, z.skeleton, w.worksheet, Se);
-        Le.next(Zr);
+        }), qr = _e(Zr, Y.renderUnit.scene, z.skeleton, w.worksheet, Se);
+        Le.next(qr);
       }));
-      const at = (D = this._renderManagerService.getRenderById(T)) == null ? void 0 : D.with(Z);
-      at == null || at.currentSkeleton$.subscribe((W) => {
-        W && z.sheetId !== W.sheetId && this._removeDom(m, !0);
+      const ct = (D = this._renderManagerService.getRenderById(T)) == null ? void 0 : D.with(Z);
+      ct == null || ct.currentSkeleton$.subscribe((W) => {
+        W && z.sheetId !== W.sheetId && this._removeDom(f, !0);
       });
-      const Tt = pe.onTransformChange$.subscribeEvent(() => {
+      const Et = pe.onTransformChange$.subscribeEvent(() => {
         const W = _e(pe, Y.renderUnit.scene, z.skeleton, w.worksheet, Se);
         Le.next(
           W
@@ -2618,12 +2422,12 @@ let pt = class extends re {
       });
       we.add(() => {
         this._canvasFloatDomService.removeFloatDom(E);
-      }), Tt && we.add(Tt), this._domLayerInfoMap.set(E, Se);
+      }), Et && we.add(Et), this._domLayerInfoMap.set(E, Se);
     }
     return {
-      id: m,
+      id: f,
       dispose: () => {
-        this._removeDom(m, !0);
+        this._removeDom(f, !0);
       }
     };
   }
@@ -2642,19 +2446,19 @@ let pt = class extends re {
     if (!u) return;
     const d = (M = this._renderManagerService.getRenderById(o)) == null ? void 0 : M.with(Z).getWorksheetSkeleton(a);
     if (!d) return;
-    const { componentKey: l, data: g, allowTransform: h = !0 } = e, m = r != null ? r : Ze(), { position: f, position$: p } = this._createRangePositionObserver({
+    const { componentKey: l, data: g, allowTransform: h = !0 } = e, f = r != null ? r : Ze(), { position: m, position$: p } = this._createRangePositionObserver({
       startRow: 0,
       endRow: 0,
       startColumn: t,
       endColumn: t
-    }, u, d.skeleton), S = f;
-    if (S.startY = 0, this._getPosition(f, o) == null)
+    }, u, d.skeleton), S = m;
+    if (S.startY = 0, this._getPosition(m, o) == null)
       return;
     const R = {
       unitId: o,
       subUnitId: a,
-      drawingId: m,
-      drawingType: e.type || $.DRAWING_DOM,
+      drawingId: f,
+      drawingType: e.type || B.DRAWING_DOM,
       componentKey: l,
       transform: {
         left: S.startX,
@@ -2666,7 +2470,7 @@ let pt = class extends re {
       allowTransform: h
     };
     {
-      const { unitId: C, subUnitId: D, drawingId: T } = R, b = ce(this._univerInstanceService, { unitId: C, subUnitId: D }), E = R, w = this._univerInstanceService.getUnit(C, B.UNIVER_SHEET);
+      const { unitId: C, subUnitId: D, drawingId: T } = R, b = ce(this._univerInstanceService, { unitId: C, subUnitId: D }), E = R, w = this._univerInstanceService.getUnit(C, $.UNIVER_SHEET);
       if (!w)
         return;
       const y = w.getActiveSheet().getSheetId();
@@ -2678,37 +2482,37 @@ let pt = class extends re {
       const x = O.getWorksheetSkeleton(D);
       if (!x)
         return;
-      const { transform: q, data: z } = E, G = this._getSceneAndTransformerByDrawingSearch(C);
-      if (G == null)
+      const { transform: q, data: z } = E, V = this._getSceneAndTransformerByDrawingSearch(C);
+      if (V == null)
         return;
-      const { scene: V, canvas: J } = G;
+      const { scene: G, canvas: J } = V;
       if (q == null || y !== D)
         return;
-      const { left: Y, top: k, width: se, height: ge, angle: me, flipX: le, flipY: Re, skewX: Ue, skewY: en } = q, Rt = ye({ unitId: C, subUnitId: D, drawingId: T }), Dt = V.getObject(Rt);
-      if (Dt != null) {
-        Dt.transformByState({ left: Y, top: k, width: se, height: ge, angle: me, flipX: le, flipY: Re, skewX: Ue, skewY: en });
+      const { left: Y, top: k, width: se, height: ge, angle: fe, flipX: le, flipY: Re, skewX: Ue, skewY: tn } = q, Dt = ye({ unitId: C, subUnitId: D, drawingId: T }), bt = G.getObject(Dt);
+      if (bt != null) {
+        bt.transformByState({ left: Y, top: k, width: se, height: ge, angle: fe, flipX: le, flipY: Re, skewX: Ue, skewY: tn });
         return;
       }
-      const We = kt({
+      const We = Bt({
         startX: S.startX,
         startY: 0,
-        endX: f.endX,
-        endY: f.endY,
+        endX: m.endX,
+        endY: m.endY,
         width: n.width,
         height: n.height,
         absolute: {
-          left: f.absolute.left,
-          top: f.absolute.top
+          left: m.absolute.left,
+          top: m.absolute.top
         }
-      }, n), bt = {
+      }, n), Mt = {
         left: We.startX,
         top: We.startY,
         width: We.width,
         height: We.height,
         zIndex: this._drawingManagerService.getDrawingOrder(C, D).length - 1
-      }, fe = new Ge(Rt, bt);
-      V.addObject(fe, tn), E.allowTransform !== !1 && V.attachTransformerTo(fe);
-      const oe = new Ut(), je = V.getMainViewport(), pe = {
+      }, me = new Ve(Dt, Mt);
+      G.addObject(me, nn), E.allowTransform !== !1 && G.attachTransformerTo(me);
+      const oe = new Pt(), je = G.getMainViewport(), pe = {
         top: 0,
         //viewMain.top,
         left: je.left,
@@ -2716,7 +2520,7 @@ let pt = class extends re {
         right: je.right
       }, we = {
         dispose: oe,
-        rect: fe,
+        rect: me,
         // position$,
         unitId: C,
         subUnitId: D,
@@ -2724,9 +2528,9 @@ let pt = class extends re {
         domAnchor: n,
         scrollDirectionResponse: "HORIZONTAL"
         /* HORIZONTAL */
-      }, Mt = _e(fe, G.renderUnit.scene, x.skeleton, b.worksheet, we), Fe = new ze(Mt);
+      }, yt = _e(me, V.renderUnit.scene, x.skeleton, b.worksheet, we), Fe = new ze(yt);
       we.position$ = Fe;
-      let st = {
+      let ot = {
         position$: Fe,
         id: T,
         componentKey: E.componentKey,
@@ -2742,8 +2546,8 @@ let pt = class extends re {
         data: z,
         unitId: C
       };
-      e.eventPassThrough && (st = {
-        ...st,
+      e.eventPassThrough && (ot = {
+        ...ot,
         onPointerDown: (H) => {
           J.dispatchEvent(new PointerEvent(H.type, H));
         },
@@ -2753,15 +2557,15 @@ let pt = class extends re {
         onPointerUp: (H) => {
           J.dispatchEvent(new PointerEvent(H.type, H));
         }
-      }), this._canvasFloatDomService.addFloatDom(st);
-      const yt = fe.onTransformChange$.subscribeEvent(() => {
-        const H = _e(fe, G.renderUnit.scene, x.skeleton, b.worksheet, we);
+      }), this._canvasFloatDomService.addFloatDom(ot);
+      const Tt = me.onTransformChange$.subscribeEvent(() => {
+        const H = _e(me, V.renderUnit.scene, x.skeleton, b.worksheet, we);
         Fe.next(
           H
         );
       });
       this.disposeWithMe(p.subscribe((H) => {
-        const Le = kt({
+        const Le = Bt({
           startX: H.startX,
           startY: 0,
           endX: H.endX,
@@ -2769,29 +2573,29 @@ let pt = class extends re {
           width: n.width,
           height: n.height,
           absolute: {
-            left: f.absolute.left,
-            top: f.absolute.top
+            left: m.absolute.left,
+            top: m.absolute.top
           }
-        }, n), ot = ye({ unitId: C, subUnitId: D, drawingId: T }), at = new Ge(ot, {
+        }, n), at = ye({ unitId: C, subUnitId: D, drawingId: T }), ct = new Ve(at, {
           left: Le.startX,
           top: 0,
           width: n.width,
           height: n.height,
           zIndex: this._drawingManagerService.getDrawingOrder(C, D).length - 1
-        }), Tt = _e(at, G.renderUnit.scene, x.skeleton, b.worksheet, we);
-        Fe.next(Tt);
+        }), Et = _e(ct, V.renderUnit.scene, x.skeleton, b.worksheet, we);
+        Fe.next(Et);
       }));
       const Se = (v = this._renderManagerService.getRenderById(C)) == null ? void 0 : v.with(Z);
       Se == null || Se.currentSkeleton$.subscribe((H) => {
-        H && d.sheetId !== H.sheetId && this._removeDom(m, !0);
+        H && d.sheetId !== H.sheetId && this._removeDom(f, !0);
       }), oe.add(() => {
         this._canvasFloatDomService.removeFloatDom(T);
-      }), yt && oe.add(yt), this._domLayerInfoMap.set(T, we);
+      }), Tt && oe.add(Tt), this._domLayerInfoMap.set(T, we);
     }
     return {
-      id: m,
+      id: f,
       dispose: () => {
-        this._removeDom(m, !0);
+        this._removeDom(f, !0);
       }
     };
   }
@@ -2808,16 +2612,16 @@ let pt = class extends re {
   // eslint-disable-next-line max-lines-per-function
   _createRangePositionObserver(t, e, n) {
     let { startRow: r, startColumn: s } = t;
-    const o = ut(r, s, n), a = new ze(o), c = ut(t.endRow, t.endColumn, n), u = new ze(c), d = () => {
-      const p = ut(r, s, n), S = ut(t.endRow, t.endColumn, n);
+    const o = ht(r, s, n), a = new ze(o), c = ht(t.endRow, t.endColumn, n), u = new ze(c), d = () => {
+      const p = ht(r, s, n), S = ht(t.endRow, t.endColumn, n);
       a.next(p), u.next(S);
-    }, l = new Ut();
+    }, l = new Pt();
     l.add(e.engine.clientRect$.subscribe(() => d())), l.add(this._commandService.onCommandExecuted((p) => {
-      if (p.id === fr.id && p.params.rowsAutoHeightInfo.findIndex((_) => _.row === r) > -1) {
+      if (p.id === pr.id && p.params.rowsAutoHeightInfo.findIndex((_) => _.row === r) > -1) {
         d();
         return;
       }
-      (Fi.indexOf(p.id) > -1 || p.id === li.id || p.id === Bn.id) && d();
+      (Hi.indexOf(p.id) > -1 || p.id === ui.id || p.id === Wn.id) && d();
     }));
     const g = (p, S) => {
       r = p, s = S, d();
@@ -2833,9 +2637,9 @@ let pt = class extends re {
       startY: o.top,
       endX: c.right,
       endY: c.bottom
-    }), m = a.pipe(
+    }), f = a.pipe(
       Ie((p) => {
-        const S = ut(t.endRow, t.endColumn, n);
+        const S = ht(t.endRow, t.endColumn, n);
         return {
           rotate: 0,
           width: S.right - p.left,
@@ -2850,10 +2654,10 @@ let pt = class extends re {
           endY: S.bottom
         };
       })
-    ), f = h();
+    ), m = h();
     return {
-      position$: m,
-      position: f,
+      position$: f,
+      position: m,
       updateRowCol: g,
       topLeftPos$: a,
       rightBottomPos$: u,
@@ -2861,16 +2665,16 @@ let pt = class extends re {
     };
   }
 };
-pt = so([
+wt = co([
   Ae(0, N(ee)),
   Ae(1, he),
   Ae(2, N(K)),
   Ae(3, de),
-  Ae(4, N(us)),
+  Ae(4, N(hs)),
   Ae(5, ie),
   Ae(6, N(Ii))
-], pt);
-function ut(i, t, e) {
+], wt);
+function ht(i, t, e) {
   const n = e.getCellWithCoordByIndex(i, t), r = n.isMergedMainCell ? n.mergeInfo : n;
   return {
     left: r.startX,
@@ -2879,7 +2683,7 @@ function ut(i, t, e) {
     bottom: r.endY
   };
 }
-function kt(i, t, e) {
+function Bt(i, t, e) {
   var u, d;
   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 = (d = t == null ? void 0 : t.height) != null ? d : r;
@@ -2916,9 +2720,9 @@ function $t(i, t) {
   const e = Number.parseFloat(i);
   return t * e / 100;
 }
-const ao = (i) => {
+const uo = (i) => {
   const { floatDomInfos: t, scene: e, skeleton: n, worksheet: r } = i, s = Ke(() => t.map((o) => {
-    const { width: a, height: c, angle: u, left: d, top: l } = o.transform, g = Yr(
+    const { width: a, height: c, angle: u, left: d, top: l } = o.transform, g = Kr(
       {
         left: d != null ? d : 0,
         right: (d != null ? d : 0) + (a != null ? a : 0),
@@ -2930,18 +2734,18 @@ const ao = (i) => {
       r,
       void 0,
       !0
-    ), { scaleX: h, scaleY: m } = e.getAncestorScale(), f = {
+    ), { scaleX: h, scaleY: f } = e.getAncestorScale(), m = {
       startX: g.left,
       endX: g.right,
       startY: g.top,
       endY: g.bottom,
       rotate: u,
       width: a * h,
-      height: c * m,
+      height: c * f,
       absolute: g.absolute
     }, p = {
-      position$: new ze(f),
-      position: f,
+      position$: new ze(m),
+      position: m,
       id: o.drawingId,
       componentKey: o.componentKey,
       onPointerMove: () => {
@@ -2957,14 +2761,14 @@ const ao = (i) => {
     };
     return [o.drawingId, p];
   }), [t, e, n, r]);
-  return /* @__PURE__ */ X("div", { style: { position: "absolute", top: 0, left: 0 }, children: s.map(([o, a]) => /* @__PURE__ */ X(hs, { layer: a, id: o, position: a.position }, o)) });
+  return /* @__PURE__ */ X("div", { style: { position: "absolute", top: 0, left: 0 }, children: s.map(([o, a]) => /* @__PURE__ */ X(gs, { layer: a, id: o, position: a.position }, o)) });
 };
-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--)
+var ho = Object.getOwnPropertyDescriptor, go = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? ho(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, Ne = (i, t) => (e, n) => t(e, n, i);
-let Vt = class extends re {
+let Gt = class extends re {
   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();
   }
@@ -2977,7 +2781,7 @@ let Vt = class extends re {
             const { unitId: n, scene: r, subUnitId: s } = t, o = this._drawingManagerService.getDrawingDataForUnit(n), a = o == null ? void 0 : o[s];
             return a && a.order.forEach((c) => {
               const u = a.data[c];
-              u.drawingType !== $.DRAWING_CHART && u.drawingType !== $.DRAWING_DOM && this._drawingRenderService.renderDrawing(u, r);
+              u.drawingType !== B.DRAWING_CHART && u.drawingType !== B.DRAWING_DOM && this._drawingRenderService.renderDrawing(u, r);
             }), e();
           }
         }
@@ -2999,8 +2803,8 @@ let Vt = class extends re {
             const { scaleX: u, scaleY: d } = s.scene, l = i ? { ...i } : { startColumn: 0, endColumn: 0, endRow: 0, startRow: 0 }, g = c.order.map((h) => c.data[h]);
             return g.length ? (g.forEach((h) => {
               if (!h.groupId && h.transform && Qe.isDefine(h.transform.left) && Qe.isDefine(h.transform.top) && Qe.isDefine(h.transform.width) && Qe.isDefine(h.transform.height)) {
-                const m = o.skeleton.getCellIndexByOffset(h.transform.left, h.transform.top, u, d, { x: 0, y: 0 }), f = o.skeleton.getCellIndexByOffset(h.transform.left + h.transform.width, h.transform.top + h.transform.height, u, d, { 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);
+                const f = o.skeleton.getCellIndexByOffset(h.transform.left, h.transform.top, u, d, { x: 0, y: 0 }), m = o.skeleton.getCellIndexByOffset(h.transform.left + h.transform.width, h.transform.top + h.transform.height, u, d, { x: 0, y: 0 });
+                f.column < l.startColumn && (l.startColumn = f.column), f.row < l.startRow && (l.startRow = f.row), l.endRow < m.row && (l.endRow = m.row), l.endColumn < m.column && (l.endColumn = m.column);
               }
             }), e(l)) : e(i);
           }
@@ -3018,12 +2822,12 @@ let Vt = class extends re {
             if (o) {
               const a = o.order.map((u) => {
                 const d = o.data[u];
-                if (d.drawingType === $.DRAWING_CHART)
+                if (d.drawingType === B.DRAWING_CHART)
                   return {
                     ...d,
                     componentKey: this._componetManager.get(Di)
                   };
-                if (d.drawingType === $.DRAWING_DOM) {
+                if (d.drawingType === B.DRAWING_DOM) {
                   const l = this._sheetPrintInterceptorService.getPrintComponent(d.componentKey);
                   return {
                     ...d,
@@ -3031,12 +2835,12 @@ let Vt = class extends re {
                   };
                 }
                 return null;
-              }).filter(Boolean), c = gs(ao, this._injector);
-              return Zi(
+              }).filter(Boolean), c = fs(uo, this._injector);
+              return qi(
                 /* @__PURE__ */ X(c, { floatDomInfos: a, scene: t.scene, skeleton: t.skeleton, worksheet: t.worksheet }),
                 t.root
               ), i == null || i.add(() => {
-                qi(t.root);
+                Qi(t.root);
               }), e(i);
             }
           }
@@ -3045,22 +2849,21 @@ let Vt = class extends re {
     );
   }
 };
-Vt = lo([
-  Ne(0, N(ui)),
-  Ne(1, N(xr)),
+Gt = go([
+  Ne(0, N(hi)),
+  Ne(1, N(kr)),
   Ne(2, de),
   Ne(3, ee),
-  Ne(4, N(pt)),
-  Ne(5, N(Nr)),
-  Ne(6, N(it))
-], Vt);
-var uo = Object.getOwnPropertyDescriptor, ho = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? uo(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+  Ne(4, N(wt)),
+  Ne(5, N(xr)),
+  Ne(6, N(st))
+], Gt);
+var fo = Object.getOwnPropertyDescriptor, mo = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? fo(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 go = [
-  pr.id,
+const po = [
   wr.id,
   Sr.id,
   _r.id,
@@ -3068,9 +2871,9 @@ const go = [
   Ir.id,
   Cr.id,
   Rr.id,
-  wn.id,
-  Sn.id,
   Dr.id,
+  Sn.id,
+  _n.id,
   br.id,
   Mr.id,
   yr.id,
@@ -3078,16 +2881,17 @@ const go = [
   Er.id,
   Or.id,
   Ur.id,
-  Pr.id
-], mo = [
-  Li.id,
-  Hi.id,
-  Gi.id,
+  Pr.id,
+  Ar.id
+], wo = [
   Vi.id,
+  Gi.id,
   Yi.id,
-  fr.id,
   Xi.id,
-  zi.id
+  zi.id,
+  pr.id,
+  Ki.id,
+  Ji.id
 ];
 let Mn = class extends re {
   constructor(i, t, e, n, r, s, o, a, c) {
@@ -3098,57 +2902,57 @@ let Mn = class extends re {
       this._sheetInterceptorService.interceptAfterCommand({
         /* eslint-disable-next-line complexity */
         getMutations: (i) => {
-          if (!go.includes(i.id))
+          if (!po.includes(i.id))
             return { redos: [], undos: [] };
           if (i.params == null)
             return { redos: [], undos: [] };
           const t = i.id;
-          if (t === pr.id)
+          if (t === wr.id)
             return this._moveRowInterceptor(i.params, "insert");
-          if ([Or.id, Ur.id, Pr.id].includes(t))
+          if ([Ur.id, Pr.id, Ar.id].includes(t))
             return this._moveRangeInterceptor(i.params);
-          if (t === wr.id)
-            return this._moveColInterceptor(i.params, "insert");
           if (t === Sr.id)
-            return this._moveRowInterceptor(i.params, "remove");
+            return this._moveColInterceptor(i.params, "insert");
           if (t === _r.id)
+            return this._moveRowInterceptor(i.params, "remove");
+          if (t === vr.id)
             return this._moveColInterceptor(i.params, "remove");
-          if (t === vr.id) {
+          if (t === Ir.id) {
             const { range: e } = i.params;
             return this._getRangeMoveUndo(
               e,
               0
               /* deleteLeft */
             );
-          } else if (t === Ir.id) {
+          } else if (t === Cr.id) {
             const { range: e } = i.params;
             return this._getRangeMoveUndo(
               e,
               1
               /* deleteUp */
             );
-          } else if (t === Cr.id) {
+          } else if (t === Rr.id) {
             const { range: e } = i.params;
             return this._getRangeMoveUndo(
               e,
               2
               /* insertDown */
             );
-          } else if (t === Rr.id) {
+          } else if (t === Dr.id) {
             const { range: e } = i.params;
             return this._getRangeMoveUndo(
               e,
               3
               /* insertRight */
             );
-          } else if (t === Mr.id || t === yr.id) {
+          } else if (t === yr.id || t === Tr.id) {
             const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e;
             return this._getDrawingUndoForRowVisible(n, r, s);
-          } else if (t === Tr.id || t === Er.id) {
+          } else if (t === Er.id || t === Or.id) {
             const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e;
             return this._getDrawingUndoForColVisible(n, r, s);
-          } else if (t === wn.id || t === Sn.id || t === Dr.id || t === br.id) {
-            const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e, o = t === wn.id || t === Sn.id;
+          } else if (t === Sn.id || t === _n.id || t === br.id || t === Mr.id) {
+            const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e, o = t === Sn.id || t === _n.id;
             return this._getDrawingUndoForRowAndColSize(n, r, s, o);
           }
           return { redos: [], undos: [] };
@@ -3181,7 +2985,7 @@ let Mn = class extends re {
   }
   _getUpdateOrDeleteDrawings(i, t, e) {
     var D, T, b, E;
-    const n = [], r = [], { sheetTransform: s, anchorType: o = U.Position, transform: a, unitId: c, subUnitId: u, drawingId: d } = e, { from: l, to: g } = s, { row: h, column: m } = l, { row: f, column: p } = g;
+    const n = [], r = [], { sheetTransform: s, anchorType: o = U.Position, transform: a, unitId: c, subUnitId: u, drawingId: d } = e, { from: l, to: g } = s, { row: h, column: f } = l, { row: m, column: p } = g;
     if (s == null || a == null)
       return {
         updateDrawings: n,
@@ -3189,15 +2993,15 @@ let Mn = class extends re {
       };
     const { startRow: S, endRow: _, startColumn: R, endColumn: M } = i;
     let I = null, v = null, C;
-    if (t === 0 && h >= S && f <= _)
-      if (m >= R && p <= M)
+    if (t === 0 && h >= S && m <= _)
+      if (f >= R && p <= M)
         r.push({ unitId: c, subUnitId: u, drawingId: d });
       else {
         const w = this._shrinkCol(s, a, R, M, o);
         I = w == null ? void 0 : w.newSheetTransform, v = w == null ? void 0 : w.newTransform, C = (D = w == null ? void 0 : w.axisAlignSheetTransform) != null ? D : void 0;
       }
-    else if (t === 1 && m >= R && p <= M)
-      if (h >= S && f <= _)
+    else if (t === 1 && f >= R && p <= M)
+      if (h >= S && m <= _)
         r.push({ unitId: c, subUnitId: u, drawingId: d });
       else {
         const w = this._shrinkRow(s, a, S, _, o);
@@ -3231,19 +3035,19 @@ let Mn = class extends re {
   _getDrawingUndoForColVisible(i, t, e) {
     const n = this._drawingManagerService.getDrawingData(i, t), r = [], s = [];
     if (Object.keys(n).forEach((d) => {
-      const l = n[d], { sheetTransform: g, transform: h, anchorType: m = U.Position } = l;
-      if (m === U.None)
+      const l = n[d], { sheetTransform: g, transform: h, anchorType: f = U.Position } = l;
+      if (f === U.None)
         this._remainDrawingSize(h, r, l);
       else {
-        const { from: f, to: p } = g, { row: S, column: _ } = f, { row: R, column: M } = p;
+        const { from: m, to: p } = g, { row: S, column: _ } = m, { row: R, column: M } = p;
         for (let I = 0; I < e.length; I++) {
           const v = e[I], { startRow: C, endRow: D, startColumn: T, endColumn: b } = v;
           if (M < T)
             continue;
-          if (m === U.Position) {
+          if (f === U.Position) {
             let y = null, O = null;
             if (_ >= T && _ <= b) {
-              const x = this._skeletonManagerService.attachRangeWithCoord({ startColumn: _, endColumn: b, startRow: f.row, endRow: p.row });
+              const x = this._skeletonManagerService.attachRangeWithCoord({ startColumn: _, endColumn: b, startRow: m.row, endRow: p.row });
               if (x == null)
                 return;
               O = { ...h, left: x.startX };
@@ -3263,7 +3067,7 @@ let Mn = class extends re {
             continue;
           let E = null, w = null;
           if (_ >= T && _ <= b) {
-            const y = this._skeletonManagerService.attachRangeWithCoord({ startColumn: _, endColumn: b, startRow: f.row, endRow: p.row });
+            const y = this._skeletonManagerService.attachRangeWithCoord({ startColumn: _, endColumn: b, startRow: m.row, endRow: p.row });
             if (y == null)
               return;
             w = {
@@ -3272,7 +3076,7 @@ let Mn = class extends re {
               width: ((h == null ? void 0 : h.width) || 0) - y.endX + y.startX
             };
           } else if (M >= T && M <= b) {
-            const y = this._skeletonManagerService.attachRangeWithCoord({ startColumn: T, endColumn: M, startRow: f.row, endRow: p.row });
+            const y = this._skeletonManagerService.attachRangeWithCoord({ startColumn: T, endColumn: M, startRow: m.row, endRow: p.row });
             if (y == null)
               return;
             w = {
@@ -3280,7 +3084,7 @@ let Mn = class extends re {
               left: y.startX - ((h == null ? void 0 : h.width) || 0)
             };
           } else {
-            const y = this._skeletonManagerService.attachRangeWithCoord({ startColumn: T, endColumn: b, startRow: f.row, endRow: p.row });
+            const y = this._skeletonManagerService.attachRangeWithCoord({ startColumn: T, endColumn: b, startRow: m.row, endRow: p.row });
             if (y == null)
               return;
             if (w = {
@@ -3331,19 +3135,19 @@ let Mn = class extends re {
   _getDrawingUndoForRowVisible(i, t, e) {
     const n = this._drawingManagerService.getDrawingData(i, t), r = [], s = [];
     if (Object.keys(n).forEach((d) => {
-      const l = n[d], { sheetTransform: g, transform: h, anchorType: m = U.Position } = l;
-      if (m === U.None)
+      const l = n[d], { sheetTransform: g, transform: h, anchorType: f = U.Position } = l;
+      if (f === U.None)
         this._remainDrawingSize(h, r, l);
       else {
-        const { from: f, to: p } = g, { row: S, column: _ } = f, { row: R, column: M } = p;
+        const { from: m, to: p } = g, { row: S, column: _ } = m, { row: R, column: M } = p;
         for (let I = 0; I < e.length; I++) {
           const v = e[I], { startRow: C, endRow: D, startColumn: T, endColumn: b } = v;
           if (R < C)
             continue;
-          if (m === U.Position) {
+          if (f === U.Position) {
             let y = null, O = null;
             if (S >= C && S <= D) {
-              const x = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: S, endRow: D });
+              const x = this._skeletonManagerService.attachRangeWithCoord({ startColumn: m.column, endColumn: p.column, startRow: S, endRow: D });
               if (x == null)
                 return;
               O = { ...h, top: x.startY };
@@ -3363,7 +3167,7 @@ let Mn = class extends re {
             continue;
           let E = null, w = null;
           if (S >= C && S <= D) {
-            const y = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: S, endRow: D });
+            const y = this._skeletonManagerService.attachRangeWithCoord({ startColumn: m.column, endColumn: p.column, startRow: S, endRow: D });
             if (y == null)
               return;
             w = {
@@ -3372,7 +3176,7 @@ let Mn = class extends re {
               height: ((h == null ? void 0 : h.height) || 0) - y.endY + y.startY
             };
           } else if (R >= C && R <= D) {
-            const y = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: C, endRow: R });
+            const y = this._skeletonManagerService.attachRangeWithCoord({ startColumn: m.column, endColumn: p.column, startRow: C, endRow: R });
             if (y == null)
               return;
             w = {
@@ -3380,7 +3184,7 @@ let Mn = class extends re {
               top: y.startY - ((h == null ? void 0 : h.height) || 0)
             };
           } else {
-            const y = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: C, endRow: D });
+            const y = this._skeletonManagerService.attachRangeWithCoord({ startColumn: m.column, endColumn: p.column, startRow: C, endRow: D });
             if (y == null)
               return;
             if (w = {
@@ -3421,12 +3225,12 @@ let Mn = class extends re {
       if (d === U.None)
         this._remainDrawingSize(u, s, a);
       else {
-        const { from: l, to: g } = c, { row: h, column: m } = l, { row: f, column: p } = g;
+        const { from: l, to: g } = c, { row: h, column: f } = l, { row: m, column: p } = g;
         for (let S = 0; S < e.length; S++) {
           const _ = e[S], { startRow: R, endRow: M, startColumn: I, endColumn: v } = _;
-          if (f < R || p < I)
+          if (m < R || p < I)
             continue;
-          if (d === U.Position && (h <= R && f >= M || m <= I && p >= v)) {
+          if (d === U.Position && (h <= R && m >= M || f <= I && p >= v)) {
             this._remainDrawingSize(u, s, a);
             continue;
           }
@@ -3462,7 +3266,7 @@ let Mn = class extends re {
     const { unitId: r, subUnitId: s } = n, o = (M = (R = this._renderManagerService.getRenderById(r)) == null ? void 0 : R.with(Z)) == null ? void 0 : M.getCurrentSkeleton();
     if (!o)
       return { redos: [], undos: [] };
-    const a = ur(o, e);
+    const a = hr(o, e);
     if (!a)
       return { redos: [], undos: [] };
     const { startX: c, endX: u, startY: d, endY: l } = a, g = this._sheetDrawingService.getDrawingData(r, s), h = [];
@@ -3481,7 +3285,7 @@ let Mn = class extends re {
       };
       c <= w && y <= u && d <= O && x <= l && h.push(v);
     });
-    const m = [], f = [], p = t.startRow - e.startRow, S = t.startColumn - e.startColumn, _ = h.map((I) => {
+    const f = [], m = [], p = t.startRow - e.startRow, S = t.startColumn - e.startColumn, _ = h.map((I) => {
       const v = I.sheetTransform, C = {
         to: { ...v.to, row: v.to.row + p, column: v.to.column + S },
         from: { ...v.from, row: v.from.row + p, column: v.from.column + S }
@@ -3496,9 +3300,9 @@ let Mn = class extends re {
     });
     if (_.length) {
       const I = this._sheetDrawingService.getBatchUpdateOp(_), { undo: v, redo: C, objects: D } = I;
-      m.push({ id: A.id, params: { unitId: r, subUnitId: s, op: C, objects: D, type: P.UPDATE } }), f.push({ id: A.id, params: { unitId: r, subUnitId: s, op: v, objects: D, type: P.UPDATE } });
+      f.push({ id: A.id, params: { unitId: r, subUnitId: s, op: C, objects: D, type: P.UPDATE } }), m.push({ id: A.id, params: { unitId: r, subUnitId: s, op: v, objects: D, type: P.UPDATE } });
     }
-    return { redos: m, undos: f };
+    return { redos: f, undos: m };
   }
   _moveRowInterceptor(i, t) {
     const e = this._getUnitIdAndSubUnitId(i, t);
@@ -3507,19 +3311,19 @@ let Mn = class extends re {
     const { unitId: n, subUnitId: r } = e, { range: s } = i, o = s.startRow, a = s.endRow, c = [], u = [], d = this._sheetDrawingService.getDrawingData(n, r), l = [], g = [];
     if (Object.keys(d).forEach((h) => {
       var v, C;
-      const m = d[h], { sheetTransform: f, transform: p, anchorType: S = U.Position } = m;
-      if (f == null || p == null)
+      const f = d[h], { sheetTransform: m, transform: p, anchorType: S = U.Position } = f;
+      if (m == null || p == null)
         return;
       let _, R, M;
       if (t === "insert") {
-        const D = this._expandRow(f, p, o, a, S);
+        const D = this._expandRow(m, p, o, a, S);
         _ = D == null ? void 0 : D.newSheetTransform, R = D == null ? void 0 : D.newTransform, M = (v = D == null ? void 0 : D.axisAlignSheetTransform) != null ? v : void 0;
       } else {
-        const { from: D, to: T } = f, { row: b } = D, { row: E } = T;
+        const { from: D, to: T } = m, { row: b } = D, { row: E } = T;
         if (S === U.Both && b >= o && E <= a)
           g.push({ unitId: n, subUnitId: r, drawingId: h });
         else {
-          const w = this._shrinkRow(f, p, o, a, S);
+          const w = this._shrinkRow(m, p, o, a, S);
           _ = w == null ? void 0 : w.newSheetTransform, R = w == null ? void 0 : w.newTransform, M = (C = w == null ? void 0 : w.axisAlignSheetTransform) != null ? C : void 0;
         }
       }
@@ -3530,12 +3334,12 @@ let Mn = 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: f, objects: p } = h;
-      c.push({ id: A.id, params: { unitId: n, subUnitId: r, op: f, objects: p, type: P.UPDATE } }), u.push({ id: A.id, params: { unitId: n, subUnitId: r, op: m, objects: p, type: P.UPDATE } });
+      const h = this._sheetDrawingService.getBatchUpdateOp(l), { undo: f, redo: m, objects: p } = h;
+      c.push({ id: A.id, params: { unitId: n, subUnitId: r, op: m, objects: p, type: P.UPDATE } }), u.push({ id: A.id, params: { unitId: n, subUnitId: r, op: f, objects: p, type: P.UPDATE } });
     }
     if (g.length > 0) {
-      const h = this._sheetDrawingService.getBatchRemoveOp(g), m = h.undo, f = h.redo, p = h.objects;
-      c.push({ id: A.id, params: { unitId: n, subUnitId: r, op: f, objects: p, type: P.REMOVE } }), u.push({ id: A.id, params: { unitId: n, subUnitId: r, op: m, objects: p, type: P.INSERT } });
+      const h = this._sheetDrawingService.getBatchRemoveOp(g), f = h.undo, m = h.redo, p = h.objects;
+      c.push({ id: A.id, params: { unitId: n, subUnitId: r, op: m, objects: p, type: P.REMOVE } }), u.push({ id: A.id, params: { unitId: n, subUnitId: r, op: f, objects: p, type: P.INSERT } });
     }
     return c.push({ id: L.id, params: [n] }), u.push({ id: L.id, params: [n] }), {
       redos: c,
@@ -3549,19 +3353,19 @@ let Mn = class extends re {
     const { unitId: n, subUnitId: r } = e, { range: s } = i, o = s.startColumn, a = s.endColumn, c = [], u = [], d = this._sheetDrawingService.getDrawingData(n, r), l = [], g = [];
     if (Object.keys(d).forEach((h) => {
       var v, C;
-      const m = d[h], { sheetTransform: f, transform: p, anchorType: S = U.Position } = m;
-      if (f == null || p == null)
+      const f = d[h], { sheetTransform: m, transform: p, anchorType: S = U.Position } = f;
+      if (m == null || p == null)
         return;
       let _, R, M;
       if (t === "insert") {
-        const D = this._expandCol(f, p, o, a, S);
+        const D = this._expandCol(m, p, o, a, S);
         _ = D == null ? void 0 : D.newSheetTransform, R = D == null ? void 0 : D.newTransform, M = (v = D == null ? void 0 : D.axisAlignSheetTransform) != null ? v : void 0;
       } else {
-        const { from: D, to: T } = f, { column: b } = D, { column: E } = T;
+        const { from: D, to: T } = m, { column: b } = D, { column: E } = T;
         if (S === U.Both && b >= o && E <= a)
           g.push({ unitId: n, subUnitId: r, drawingId: h });
         else {
-          const w = this._shrinkCol(f, p, o, a, S);
+          const w = this._shrinkCol(m, p, o, a, S);
           _ = w == null ? void 0 : w.newSheetTransform, R = w == null ? void 0 : w.newTransform, M = (C = w == null ? void 0 : w.axisAlignSheetTransform) != null ? C : void 0;
         }
       }
@@ -3572,12 +3376,12 @@ let Mn = 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: f, objects: p } = h;
-      c.push({ id: A.id, params: { unitId: n, subUnitId: r, op: f, objects: p, type: P.UPDATE } }), u.push({ id: A.id, params: { unitId: n, subUnitId: r, op: m, objects: p, type: P.UPDATE } });
+      const h = this._sheetDrawingService.getBatchUpdateOp(l), { undo: f, redo: m, objects: p } = h;
+      c.push({ id: A.id, params: { unitId: n, subUnitId: r, op: m, objects: p, type: P.UPDATE } }), u.push({ id: A.id, params: { unitId: n, subUnitId: r, op: f, objects: p, type: P.UPDATE } });
     }
     if (g.length > 0) {
-      const h = this._sheetDrawingService.getBatchRemoveOp(g), m = h.undo, f = h.redo, p = h.objects;
-      c.push({ id: A.id, params: { unitId: n, subUnitId: r, op: f, objects: p, type: P.REMOVE } }), u.push({ id: A.id, params: { unitId: n, subUnitId: r, op: m, objects: p, type: P.INSERT } });
+      const h = this._sheetDrawingService.getBatchRemoveOp(g), f = h.undo, m = h.redo, p = h.objects;
+      c.push({ id: A.id, params: { unitId: n, subUnitId: r, op: m, objects: p, type: P.REMOVE } }), u.push({ id: A.id, params: { unitId: n, subUnitId: r, op: f, objects: p, type: P.INSERT } });
     }
     return c.push({ id: L.id, params: [n] }), u.push({ id: L.id, params: [n] }), { redos: c, undos: u };
   }
@@ -3769,7 +3573,7 @@ let Mn = class extends re {
       // but the skeleton changes like other render modules. These two signals are not equivalent.
       // As a temp solution, I subscribed to activate$ here.
       this._commandService.onCommandExecuted((i) => {
-        if (i.id === Ki.id) {
+        if (i.id === Zi.id) {
           const { unitId: t, subUnitId: e } = i.params;
           this._updateDrawings(t, e);
         }
@@ -3809,7 +3613,7 @@ let Mn = class extends re {
           c != null && Object.keys(c).forEach((u) => {
             if (s === i && a === t) {
               const d = c[u];
-              d.transform = Q(d.sheetTransform, this._selectionRenderService, this._skeletonManagerService), n.push(c[u]);
+              d.sheetTransform && (d.transform = Q(d.sheetTransform, this._selectionRenderService, this._skeletonManagerService)), n.push(c[u]);
             } else
               r.push(c[u]);
           });
@@ -3820,7 +3624,7 @@ let Mn = class extends re {
   _sheetRefreshListener() {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((i) => {
-        mo.includes(i.id) && requestIdleCallback(() => {
+        wo.includes(i.id) && requestIdleCallback(() => {
           const t = i.params, e = ce(this._univerInstanceService, t);
           if (!e) return;
           const { unitId: n, subUnitId: r, worksheet: s } = e;
@@ -3841,7 +3645,7 @@ let Mn = class extends re {
       const o = n[s], { sheetTransform: a, transform: c, anchorType: u = U.Position } = o;
       if (u === U.None)
         return !0;
-      const { from: d, to: l } = a, { row: g, column: h } = d, { row: m, column: f } = l;
+      const { from: d, to: l } = a, { row: g, column: h } = d, { row: f, column: m } = l;
       for (let p = 0; p < e.length; p++) {
         const S = e[p], { startRow: _, endRow: R, startColumn: M, endColumn: I } = S;
         if (bi.intersects(
@@ -3853,9 +3657,9 @@ let Mn = class extends re {
           },
           {
             startRow: g,
-            endRow: m,
+            endRow: f,
             startColumn: h,
-            endColumn: f
+            endColumn: m
           }
         ) || g > R || h > I) {
           const v = u === U.Position, C = Q(a, this._selectionRenderService, this._skeletonManagerService);
@@ -3873,47 +3677,210 @@ let Mn = class extends re {
     }), r.length !== 0 && (this._sheetDrawingService.refreshTransform(r), this._drawingManagerService.refreshTransform(r), this._commandService.syncExecuteCommand(L.id, [i]));
   }
 };
-Mn = ho([
+Mn = mo([
   be(1, ee),
   be(2, K),
   be(3, Oe),
   be(4, N(Z)),
-  be(5, N(wt)),
+  be(5, N(St)),
   be(6, ie),
   be(7, de),
   be(8, he)
 ], Mn);
-function fo() {
-  const i = Ee(Be), t = Ee(Tn), e = Ee(On), [n, r] = ke([xe.CELL_ADDRESS]), [s, o] = ke(!1), [a, c] = ke(null), u = Ke(() => e.getCellImagesInSelection(), [e]), d = Ke(() => e.getDataColumns(), [e]), l = Ke(() => e.getSelectionRowRange(), [e]), g = d.length > 0, h = Ke(() => d.map((v) => ({
+const yn = {
+  id: "sheet.command.toggle-flip-drawings",
+  type: te.COMMAND,
+  // eslint-disable-next-line max-lines-per-function, complexity
+  handler: (i, t) => {
+    const e = i.get(K), n = i.get(Be), r = i.get(ie), s = i.get(ee);
+    if (!t) return !1;
+    const { drawings: o } = t, a = t.flipH, c = t.flipV, u = [], d = [];
+    for (const M of o) {
+      const { unitId: I, subUnitId: v, drawingId: C } = M;
+      u.push(I);
+      const D = r.getDrawingData(I, v), T = D == null ? void 0 : D[C];
+      if (!T)
+        continue;
+      const b = { ...T.transform };
+      a && (b.flipX = !b.flipX), c && (b.flipY = !b.flipY);
+      const E = s.getRenderById(I), w = E == null ? void 0 : E.with(Oe);
+      if (!w)
+        continue;
+      const y = j(b, w), O = F(b, w), x = {
+        unitId: I,
+        subUnitId: v,
+        drawingType: T.drawingType,
+        drawingId: C,
+        transform: b,
+        sheetTransform: y,
+        axisAlignSheetTransform: O
+      };
+      if (T.drawingType === B.DRAWING_IMAGE) {
+        const z = So(i, I);
+        if (z) {
+          const V = ye({ unitId: I, subUnitId: v, drawingId: C }), G = z.getObject(V);
+          if (G) {
+            const J = G.srcRect;
+            if (J) {
+              let Y;
+              const { left: k = 0, top: se = 0, right: ge = 0, bottom: fe = 0 } = J;
+              if (a) {
+                const le = k + (ge - k) / 2, Re = le - (ge - k) / 2, Ue = le + (ge - k) / 2;
+                Y = {
+                  left: Re,
+                  top: se,
+                  right: Ue,
+                  bottom: fe
+                };
+              }
+              if (c) {
+                const le = se + (fe - se) / 2, Re = le - (fe - se) / 2, Ue = le + (fe - se) / 2;
+                Y = {
+                  left: k,
+                  top: Re,
+                  right: ge,
+                  bottom: Ue
+                };
+              }
+              Y && (x.srcRect = Y);
+            }
+          }
+        }
+      }
+      d.push(x);
+    }
+    if (d.length === 0) return !1;
+    const l = r.getBatchUpdateOp(d), { unitId: g, subUnitId: h, undo: f, redo: m, objects: p } = l, S = { id: A.id, params: { unitId: g, subUnitId: h, op: m, objects: p, type: P.UPDATE } }, _ = { id: A.id, params: { unitId: g, subUnitId: h, op: f, objects: p, type: P.UPDATE } };
+    return zt([S], e) ? (n.pushUndoRedo({
+      unitID: g,
+      undoMutations: [_, { id: L.id, params: u }],
+      redoMutations: [S, { id: L.id, params: u }]
+    }), !0) : !1;
+  }
+};
+function So(i, t) {
+  const n = i.get(ee).getRenderById(t);
+  return n ? n.scene : null;
+}
+function _o(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 vo(i, t) {
+  const e = i.getActiveSheet();
+  if (!e) return !1;
+  const n = e.getCellMatrix(), { startRow: r, endRow: s, startColumn: o, endColumn: a } = t;
+  for (let c = r; c <= s; c++)
+    for (let u = o; u <= a; u++) {
+      const d = n.getValue(c, u);
+      if (_o(d))
+        return !0;
+    }
+  return !1;
+}
+function Io() {
+  return "showDirectoryPicker" in window;
+}
+function hn(i) {
+  const t = i.get(he), e = i.get(_t), n = ft([
+    Jt(i, $.UNIVER_SHEET),
+    t.getCurrentTypeOfUnit$($.UNIVER_SHEET).pipe(
+      ve((r) => r ? e.selectionMoveEnd$.pipe(
+        Ie(() => {
+          if (!Io())
+            return !0;
+          const s = e.getCurrentSelections();
+          if (!s || s.length === 0)
+            return !0;
+          for (const o of s)
+            if (vo(r, o.range))
+              return !1;
+          return !0;
+        })
+      ) : vn(!0))
+    )
+  ]).pipe(
+    Ie(([r, s]) => r || s)
+  );
+  return {
+    id: mt.id,
+    type: Zt.BUTTON,
+    icon: "DownloadImageIcon",
+    title: "sheetImage.save.menuLabel",
+    hidden$: n
+  };
+}
+const Co = {
+  [ms.MEDIA]: {
+    [Gr]: {
+      order: 0,
+      menuItemFactory: Bs,
+      [Qt.id]: {
+        order: 0,
+        menuItemFactory: $s
+      },
+      [On.id]: {
+        order: 1,
+        menuItemFactory: Ws
+      }
+    }
+  },
+  [cn.MAIN_AREA]: {
+    [dn.OTHERS]: {
+      [mt.id]: {
+        order: 10,
+        menuItemFactory: hn
+      }
+    }
+  },
+  [cn.COL_HEADER]: {
+    [dn.OTHERS]: {
+      [mt.id]: {
+        order: 10,
+        menuItemFactory: hn
+      }
+    }
+  },
+  [cn.ROW_HEADER]: {
+    [dn.OTHERS]: {
+      [mt.id]: {
+        order: 10,
+        menuItemFactory: hn
+      }
+    }
+  }
+};
+function Ro() {
+  const i = Ee($e), t = Ee(En), e = Ee(Un), [n, r] = ke([xe.CELL_ADDRESS]), [s, o] = ke(!1), [a, c] = ke(null), u = Ke(() => e.getCellImagesInSelection(), [e]), d = Ke(() => e.getDataColumns(), [e]), l = Ke(() => e.getSelectionRowRange(), [e]), g = d.length > 0, h = Ke(() => d.map((v) => ({
     label: v.label,
     value: String(v.index)
-  })), [d]), [m, f] = ke(
+  })), [d]), [f, m] = ke(
     () => h.length > 0 ? h[0].value : "0"
   ), p = Ke(() => {
     if (!n.includes(xe.COLUMN_VALUE) || !l)
       return [];
-    const C = Number(m);
+    const C = Number(f);
     return [{
       startRow: l.startRow,
       endRow: l.endRow,
       startColumn: C,
       endColumn: C
     }];
-  }, [n, m, l]);
-  hi(p);
-  const S = Pt((v) => {
+  }, [n, f, l]);
+  gi(p);
+  const S = At((v) => {
     v.length !== 0 && r(v);
-  }, []), _ = Pt((v) => {
-    f(String(v));
-  }, []), R = Pt(() => {
+  }, []), _ = At((v) => {
+    m(String(v));
+  }, []), R = At(() => {
     t.close(nt);
-  }, [t]), M = Pt(async () => {
+  }, [t]), M = At(async () => {
     if (u.length !== 0) {
       o(!0), c(null);
       try {
         await e.saveImages(u, {
           fileNameParts: n,
-          columnIndex: n.includes(xe.COLUMN_VALUE) ? Number(m) : void 0
+          columnIndex: n.includes(xe.COLUMN_VALUE) ? Number(f) : void 0
         }), t.close(nt);
       } catch (v) {
         console.error("Failed to save images:", v), c(i.t("sheetImage.save.error"));
@@ -3921,17 +3888,17 @@ function fo() {
         o(!1);
       }
     }
-  }, [e, u, n, m, t, i]), I = n.includes(xe.COLUMN_VALUE);
+  }, [e, u, n, f, t, i]), I = n.includes(xe.COLUMN_VALUE);
   return /* @__PURE__ */ tt("div", { className: "univer-flex univer-flex-col", children: [
-    /* @__PURE__ */ X(rn, { label: i.t("sheetImage.save.imageCount"), children: /* @__PURE__ */ X("div", { className: "univer-text-sm univer-text-gray-600", children: u.length }) }),
-    /* @__PURE__ */ X(rn, { label: i.t("sheetImage.save.fileNameConfig"), children: /* @__PURE__ */ tt(Qi, { value: n, onChange: S, direction: "vertical", children: [
-      /* @__PURE__ */ X(zn, { value: xe.CELL_ADDRESS, disabled: !g, children: i.t("sheetImage.save.useRowCol") }),
-      g && /* @__PURE__ */ X(zn, { value: xe.COLUMN_VALUE, children: i.t("sheetImage.save.useColumnValue") })
+    /* @__PURE__ */ X(sn, { label: i.t("sheetImage.save.imageCount"), children: /* @__PURE__ */ X("div", { className: "univer-text-sm univer-text-gray-600", children: u.length }) }),
+    /* @__PURE__ */ X(sn, { label: i.t("sheetImage.save.fileNameConfig"), children: /* @__PURE__ */ tt(es, { value: n, onChange: S, direction: "vertical", children: [
+      /* @__PURE__ */ X(Kn, { value: xe.CELL_ADDRESS, disabled: !g, children: i.t("sheetImage.save.useRowCol") }),
+      g && /* @__PURE__ */ X(Kn, { value: xe.COLUMN_VALUE, children: i.t("sheetImage.save.useColumnValue") })
     ] }) }),
-    I && /* @__PURE__ */ X(rn, { label: i.t("sheetImage.save.selectColumn"), children: /* @__PURE__ */ X(
-      es,
+    I && /* @__PURE__ */ X(sn, { label: i.t("sheetImage.save.selectColumn"), children: /* @__PURE__ */ X(
+      ts,
       {
-        value: m,
+        value: f,
         options: h,
         onChange: _
       }
@@ -3942,9 +3909,9 @@ function fo() {
       {
         className: "univer-flex univer-justify-end univer-gap-2 univer-border-t univer-border-gray-200 univer-pt-3",
         children: [
-          /* @__PURE__ */ X(Kn, { onClick: R, disabled: s, children: i.t("sheetImage.save.cancel") }),
+          /* @__PURE__ */ X(Jn, { onClick: R, disabled: s, children: i.t("sheetImage.save.cancel") }),
           /* @__PURE__ */ X(
-            Kn,
+            Jn,
             {
               variant: "primary",
               onClick: M,
@@ -3957,15 +3924,15 @@ function fo() {
     )
   ] });
 }
-const po = (i) => {
+const Do = (i) => {
   var _;
-  const t = Ee(K), e = Ee(Be), n = Ee(de), r = Ee(ee), { drawings: s } = i, o = s[0];
+  const t = Ee(K), e = Ee($e), n = Ee(de), r = Ee(ee), { drawings: s } = i, o = s[0];
   if (o == null)
     return;
   const { unitId: a } = o, c = r.getRenderById(a), u = c == null ? void 0 : c.scene;
   if (u == null)
     return;
-  const d = u.getTransformerByCreate(), [l, g] = ke(!0), h = (_ = o.anchorType) != null ? _ : U.Position, [m, f] = ke(h);
+  const d = u.getTransformerByCreate(), [l, g] = ke(!0), h = (_ = o.anchorType) != null ? _ : U.Position, [f, m] = ke(h);
   function p(R, M) {
     const I = [];
     return R.forEach((v) => {
@@ -3984,7 +3951,7 @@ const po = (i) => {
       });
     }), I;
   }
-  kr(() => {
+  Br(() => {
     const R = d.clearControl$.subscribe((I) => {
       I === !0 && g(!1);
     }), M = d.changeStart$.subscribe((I) => {
@@ -3995,7 +3962,7 @@ const po = (i) => {
       else if (C.length >= 1) {
         g(!0);
         const T = ((D = C[0]) == null ? void 0 : D.anchorType) || U.Position;
-        f(T);
+        m(T);
       }
     });
     return () => {
@@ -4003,7 +3970,7 @@ const po = (i) => {
     };
   }, []);
   function S(R) {
-    f(R);
+    m(R);
     const M = n.getFocusDrawings();
     if (M.length === 0)
       return;
@@ -4013,7 +3980,7 @@ const po = (i) => {
       drawingId: v.drawingId,
       anchorType: R
     }));
-    t.executeCommand(vt.id, {
+    t.executeCommand(It.id, {
       unitId: M[0].unitId,
       drawings: I
     });
@@ -4021,7 +3988,7 @@ const po = (i) => {
   return /* @__PURE__ */ tt(
     "div",
     {
-      className: ts("univer-grid univer-gap-2 univer-py-2 univer-text-gray-400", {
+      className: ns("univer-grid univer-gap-2 univer-py-2 univer-text-gray-400", {
         "univer-hidden": !l
       }),
       children: [
@@ -4032,17 +3999,17 @@ const po = (i) => {
             children: /* @__PURE__ */ X("div", { children: e.t("drawing-anchor.title") })
           }
         ),
-        /* @__PURE__ */ X("div", { children: /* @__PURE__ */ tt(ns, { value: m, onChange: S, direction: "vertical", children: [
-          /* @__PURE__ */ X(sn, { value: U.Both, children: e.t("drawing-anchor.both") }),
-          /* @__PURE__ */ X(sn, { value: U.Position, children: e.t("drawing-anchor.position") }),
-          /* @__PURE__ */ X(sn, { value: U.None, children: e.t("drawing-anchor.none") })
+        /* @__PURE__ */ X("div", { children: /* @__PURE__ */ tt(rs, { value: f, onChange: S, direction: "vertical", children: [
+          /* @__PURE__ */ X(on, { value: U.Both, children: e.t("drawing-anchor.both") }),
+          /* @__PURE__ */ X(on, { value: U.Position, children: e.t("drawing-anchor.position") }),
+          /* @__PURE__ */ X(on, { value: U.None, children: e.t("drawing-anchor.none") })
         ] }) })
       ]
     }
   );
-}, wo = () => {
+}, bo = () => {
   const i = Ee(de), t = i.getFocusDrawings(), [e, n] = ke(t);
-  return kr(() => {
+  return Br(() => {
     const r = i.focus$.subscribe((s) => {
       n(s);
     });
@@ -4050,179 +4017,65 @@ const po = (i) => {
       r.unsubscribe();
     };
   }, []), !!(e != null && e.length) && /* @__PURE__ */ tt("div", { className: "univer-text-sm", children: [
-    /* @__PURE__ */ X(Rs, { drawings: e }),
-    /* @__PURE__ */ X(po, { drawings: e })
+    /* @__PURE__ */ X(vs, { drawings: e }),
+    /* @__PURE__ */ X(Do, { drawings: e })
   ] });
-}, Xr = "sheet.menu.image";
-function So(i) {
-  return {
-    id: Xr,
-    type: Zt.SUBITEMS,
-    icon: "AddImageIcon",
-    tooltip: "sheetImage.title",
-    hidden$: Jt(i, B.UNIVER_SHEET),
-    disabled$: gi(i, { workbookTypes: [fn], worksheetTypes: [pn], rangeTypes: [Ji] })
-  };
-}
-function _o(i) {
-  return {
-    id: Qt.id,
-    title: "sheetImage.upload.float",
-    type: Zt.BUTTON,
-    hidden$: Jt(i, B.UNIVER_SHEET)
-  };
-}
-function vo(i) {
-  return {
-    id: En.id,
-    title: "sheetImage.upload.cell",
-    type: Zt.BUTTON,
-    hidden$: Jt(i, B.UNIVER_SHEET)
-  };
-}
-function Io(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 Co(i, t) {
-  const e = i.getActiveSheet();
-  if (!e) return !1;
-  const n = e.getCellMatrix(), { startRow: r, endRow: s, startColumn: o, endColumn: a } = t;
-  for (let c = r; c <= s; c++)
-    for (let u = o; u <= a; u++) {
-      const d = n.getValue(c, u);
-      if (Io(d))
-        return !0;
-    }
-  return !1;
-}
-function Ro() {
-  return "showDirectoryPicker" in window;
-}
-function un(i) {
-  const t = i.get(he), e = i.get(St), n = gt([
-    Jt(i, B.UNIVER_SHEET),
-    t.getCurrentTypeOfUnit$(B.UNIVER_SHEET).pipe(
-      ve((r) => r ? e.selectionMoveEnd$.pipe(
-        Ie(() => {
-          if (!Ro())
-            return !0;
-          const s = e.getCurrentSelections();
-          if (!s || s.length === 0)
-            return !0;
-          for (const o of s)
-            if (Co(r, o.range))
-              return !1;
-          return !0;
-        })
-      ) : _n(!0))
-    )
-  ]).pipe(
-    Ie(([r, s]) => r || s)
-  );
-  return {
-    id: mt.id,
-    type: Zt.BUTTON,
-    icon: "DownloadImageIcon",
-    title: "sheetImage.save.menuLabel",
-    hidden$: n
-  };
-}
-const Do = {
-  [ms.MEDIA]: {
-    [Xr]: {
-      order: 0,
-      menuItemFactory: So,
-      [Qt.id]: {
-        order: 0,
-        menuItemFactory: _o
-      },
-      [En.id]: {
-        order: 1,
-        menuItemFactory: vo
-      }
-    }
-  },
-  [an.MAIN_AREA]: {
-    [cn.OTHERS]: {
-      [mt.id]: {
-        order: 10,
-        menuItemFactory: un
-      }
-    }
-  },
-  [an.COL_HEADER]: {
-    [cn.OTHERS]: {
-      [mt.id]: {
-        order: 10,
-        menuItemFactory: un
-      }
-    }
-  },
-  [an.ROW_HEADER]: {
-    [cn.OTHERS]: {
-      [mt.id]: {
-        order: 10,
-        menuItemFactory: un
-      }
-    }
-  }
 };
-function Ct(i) {
+function Rt(i) {
   return i.getContextValue(Mi) && !i.getContextValue(yi) && !i.getContextValue(Ti) && i.getContextValue(et) && !i.getContextValue(Ei);
 }
-const bo = {
-  id: It.id,
+const Mo = {
+  id: Ct.id,
   description: "shortcut.drawing-move-down",
   group: "4_drawing-view",
   binding: rt.ARROW_DOWN,
   priority: 100,
-  preconditions: Ct,
+  preconditions: Rt,
   staticParameters: {
     direction: Te.DOWN
   }
-}, Mo = {
-  id: It.id,
+}, yo = {
+  id: Ct.id,
   description: "shortcut.drawing-move-up",
   group: "4_drawing-view",
   binding: rt.ARROW_UP,
   priority: 100,
-  preconditions: Ct,
+  preconditions: Rt,
   staticParameters: {
     direction: Te.UP
   }
-}, yo = {
-  id: It.id,
+}, To = {
+  id: Ct.id,
   description: "shortcut.drawing-move-left",
   group: "4_drawing-view",
   binding: rt.ARROW_LEFT,
   priority: 100,
-  preconditions: Ct,
+  preconditions: Rt,
   staticParameters: {
     direction: Te.LEFT
   }
-}, To = {
-  id: It.id,
+}, Eo = {
+  id: Ct.id,
   description: "shortcut.drawing-move-right",
   group: "4_drawing-view",
   binding: rt.ARROW_RIGHT,
   priority: 100,
-  preconditions: Ct,
+  preconditions: Rt,
   staticParameters: {
     direction: Te.RIGHT
   }
-}, Eo = {
+}, Oo = {
   id: $r.id,
   description: "shortcut.drawing-delete",
   group: "4_drawing-view",
   priority: 100,
   // when focusing on any other input tag do not trigger this shortcut
-  preconditions: Ct,
+  preconditions: Rt,
   binding: rt.DELETE,
   mac: rt.BACKSPACE
 };
-var Oo = Object.getOwnPropertyDescriptor, Uo = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Oo(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+var Uo = Object.getOwnPropertyDescriptor, Po = (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;
 }, Xe = (i, t) => (e, n) => t(e, n, i);
@@ -4232,38 +4085,38 @@ let Yt = class extends re {
   }
   _initCustomComponents() {
     const i = this._componentManager;
-    this.disposeWithMe(i.register(Fr, wo)), this.disposeWithMe(i.register(nt, fo));
+    this.disposeWithMe(i.register(Lr, bo)), this.disposeWithMe(i.register(nt, Ro));
   }
   _initMenus() {
-    this._menuManagerService.mergeMenu(Do);
+    this._menuManagerService.mergeMenu(Co);
   }
   _initCommands() {
     [
       Qt,
-      En,
+      On,
       qt,
-      _t,
       vt,
-      Lr,
-      L,
-      Hr,
-      Br,
-      jr,
       It,
-      $r,
+      Hr,
+      L,
+      Vr,
       Wr,
+      Fr,
+      Ct,
+      $r,
+      jr,
       mt,
-      Rn
+      yn
     ].forEach((i) => this.disposeWithMe(this._commandService.registerCommand(i)));
   }
   _initShortcuts() {
     [
       // sheet drawing shortcuts
-      bo,
       Mo,
       yo,
       To,
-      Eo
+      Eo,
+      Oo
     ].forEach((i) => {
       this.disposeWithMe(this._shortcutService.registerShortcut(i));
     });
@@ -4272,106 +4125,262 @@ let Yt = class extends re {
     this._initCommands(), this._initCustomComponents(), this._initMenus(), this._initShortcuts();
   }
 };
-Yt = Uo([
-  Xe(0, N(Nr)),
-  Xe(1, fs),
+Yt = Po([
+  Xe(0, N(xr)),
+  Xe(1, ps),
   Xe(2, K),
-  Xe(3, ps),
+  Xe(3, ws),
   Xe(4, de),
-  Xe(5, N(St))
+  Xe(5, N(_t))
 ], Yt);
-var Po = Object.defineProperty, Ao = Object.getOwnPropertyDescriptor, No = (i, t, e) => t in i ? Po(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e, xo = (i, t, e, n) => {
+var Ao = Object.getOwnPropertyDescriptor, No = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? Ao(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, hn = (i, t) => (e, n) => t(e, n, i), zr = (i, t, e) => No(i, typeof t != "symbol" ? t + "" : t, e);
-const ko = "SHEET_IMAGE_UI_PLUGIN";
-let Xt = class extends Pi {
-  constructor(i = ar, t, e, n) {
+}, ue = (i, t) => (e, n) => t(e, n, i);
+let Xt = class extends Oi {
+  constructor(t, e, n, r, s, o, a, c, u, d) {
+    super();
+    ae(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 = c, this._ioService = u, this._commandService = d, this._init();
+  }
+  _init() {
+    this._univerInstanceService.getCurrentTypeOfUnit$($.UNIVER_SHEET).subscribe((t) => this._create(t)), this._univerInstanceService.getTypeOfUnitDisposed$($.UNIVER_SHEET).subscribe((t) => this._dispose(t)), this._univerInstanceService.getAllUnitsForType($.UNIVER_SHEET).forEach((t) => this._create(t)), this._setupLoadingStatus();
+  }
+  _setupLoadingStatus() {
+    const t = "image-upload-loading";
+    let e;
+    this.disposeWithMe(this._ioService.change$.subscribe((n) => {
+      n > 0 && !e ? e = this._messageService.show({
+        id: t,
+        type: Me.Loading,
+        content: `${this._localeService.t("uploadLoading.loading")}: ${n}`,
+        duration: 0
+      }) : n === 0 && (e == null || e.dispose(), e = void 0);
+    }));
+  }
+  _dispose(t) {
+    super.dispose();
+    const e = t.getUnitId();
+    this._renderManagerService.removeRender(e), this._initImagePopupMenu.delete(e);
+  }
+  _create(t) {
+    if (!t)
+      return;
+    const e = t.getUnitId();
+    this._renderManagerService.has(e) && !this._initImagePopupMenu.has(e) && (this._popupMenuListener(e), this._initImagePopupMenu.add(e));
+  }
+  _hasCropObject(t) {
+    const e = t.getAllObjectsByOrder();
+    for (const n of e)
+      if (n instanceof Is)
+        return !0;
+    return !1;
+  }
+  _popupMenuListener(t) {
+    var s;
+    const e = (s = this._renderManagerService.getRenderById(t)) == null ? void 0 : s.scene;
+    if (!e)
+      return;
+    const n = e.getTransformerByCreate();
+    if (!n)
+      return;
+    let r;
+    this.disposeWithMe(
+      n.createControl$.subscribe(() => {
+        if (this._contextService.setContextValue(et, !0), this._hasCropObject(e))
+          return;
+        const o = n.getSelectedObjectMap();
+        if (o.size > 1) {
+          r == null || r.dispose();
+          return;
+        }
+        const a = o.values().next().value;
+        if (!a)
+          return;
+        const c = a.oKey, u = this._drawingManagerService.getDrawingOKey(c);
+        if (!u)
+          return;
+        const { unitId: d, subUnitId: l, drawingId: g, drawingType: h } = u, f = u.data;
+        if (f && f.disablePopup)
+          return;
+        r == null || r.dispose();
+        const m = this._canvasPopManagerService.getFeatureMenu(d, l, g, h);
+        r = this.disposeWithMe(this._canvasPopManagerService.attachPopupToObject(a, {
+          componentKey: Cs,
+          direction: "horizontal",
+          offset: [2, 0],
+          extraProps: {
+            menuItems: m || this._getImageMenuItems(d, l, g, h)
+          }
+        }));
+      })
+    ), this.disposeWithMe(
+      n.clearControl$.subscribe(() => {
+        r == null || r.dispose(), this._contextService.setContextValue(et, !1), this._commandService.syncExecuteCommand(Kt.id, []);
+      })
+    ), this.disposeWithMe(
+      this._contextService.contextChanged$.subscribe((o) => {
+        o[et] === !1 && (r == null || r.dispose());
+      })
+    ), this.disposeWithMe(
+      n.changing$.subscribe(() => {
+        r == null || r.dispose();
+      })
+    );
+  }
+  _getImageMenuItems(t, e, n, r) {
+    return [
+      {
+        label: "image-popup.edit",
+        index: 0,
+        commandId: Vr.id,
+        commandParams: { unitId: t, subUnitId: e, drawingId: n },
+        disable: r === B.DRAWING_DOM
+      },
+      {
+        label: "image-popup.delete",
+        index: 1,
+        commandId: vt.id,
+        commandParams: { unitId: t, drawings: [{ unitId: t, subUnitId: e, drawingId: n }] },
+        disable: !1
+      },
+      {
+        label: "image-popup.crop",
+        index: 2,
+        commandId: Rs.id,
+        commandParams: { unitId: t, subUnitId: e, drawingId: n },
+        disable: r === B.DRAWING_DOM
+      },
+      {
+        label: "image-popup.flipH",
+        index: 2,
+        commandId: yn.id,
+        commandParams: { unitId: t, flipH: !0, drawings: [{ unitId: t, subUnitId: e, drawingId: n }] },
+        disable: r === B.DRAWING_DOM
+      },
+      {
+        label: "image-popup.flipV",
+        index: 2,
+        commandId: yn.id,
+        commandParams: { unitId: t, flipV: !0, drawings: [{ unitId: t, subUnitId: e, drawingId: n }] },
+        disable: r === B.DRAWING_DOM
+      },
+      {
+        label: "image-popup.reset",
+        index: 3,
+        commandId: Ds.id,
+        commandParams: [{ unitId: t, subUnitId: e, drawingId: n }],
+        disable: r === B.DRAWING_DOM
+      }
+    ];
+  }
+};
+Xt = No([
+  ue(0, N(st)),
+  ue(1, N($e)),
+  ue(2, de),
+  ue(3, N(fi)),
+  ue(4, ee),
+  ue(5, he),
+  ue(6, Nr),
+  ue(7, gr),
+  ue(8, mr),
+  ue(9, K)
+], Xt);
+var xo = Object.defineProperty, ko = Object.getOwnPropertyDescriptor, Bo = (i, t, e) => t in i ? xo(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e, $o = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? ko(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (r = o(r) || r);
+  return r;
+}, gn = (i, t) => (e, n) => t(e, n, i), en = (i, t, e) => Bo(i, typeof t != "symbol" ? t + "" : t, e);
+let it = class extends Ai {
+  constructor(i = cr, t, e, n) {
     super(), this._config = i, this._injector = t, this._renderManagerService = e, this._configService = n;
-    const { menu: r, ...s } = Ai(
+    const { menu: r, ...s } = Ni(
       {},
-      ar,
+      cr,
       this._config
     );
-    r && this._configService.setConfig("menu", r, { merge: !0 }), this._configService.setConfig(ks, s);
+    r && this._configService.setConfig("menu", r, { merge: !0 }), this._configService.setConfig(Ls, s);
   }
   onStarting() {
-    Ni(this._injector, [
-      [pt],
+    xi(this._injector, [
+      [wt],
       [Yt],
-      [Wt],
-      [Vt],
+      [Xt],
       [Gt],
+      [Vt],
       [Ht],
       [jt],
       [Ft],
       [Lt],
-      [On, { useClass: Cn }]
-    ]), nn(this._injector, [
-      [pt]
+      [Un, { useClass: Rn }]
+    ]), rn(this._injector, [
+      [wt]
     ]);
   }
   onReady() {
-    nn(this._injector, [
+    rn(this._injector, [
       [Ht],
       [Lt]
     ]);
   }
   onRendered() {
-    this._registerRenderModules(), nn(this._injector, [
-      [Gt],
+    this._registerRenderModules(), rn(this._injector, [
       [Vt],
+      [Gt],
       [Yt],
       [jt],
       [Ft]
     ]);
   }
   onSteady() {
-    this._injector.get(Wt);
+    this._injector.get(Xt);
   }
   _registerRenderModules() {
     [
-      [ft],
+      [pt],
       [Mn],
       [bn],
       [Dn]
     ].forEach((i) => {
-      this.disposeWithMe(this._renderManagerService.registerRenderModule(B.UNIVER_SHEET, i));
+      this.disposeWithMe(this._renderManagerService.registerRenderModule($.UNIVER_SHEET, i));
     });
   }
 };
-zr(Xt, "type", B.UNIVER_SHEET);
-zr(Xt, "pluginName", ko);
-Xt = xo([
-  Oi(as, Ss, Ds, xi),
-  hn(1, N(it)),
-  hn(2, ee),
-  hn(3, Ui)
-], Xt);
+en(it, "type", $.UNIVER_SHEET);
+en(it, "pluginName", "SHEET_IMAGE_UI_PLUGIN");
+en(it, "packageName", Yr.name);
+en(it, "version", Yr.version);
+it = $o([
+  Ui(cs, _s, bs, ki),
+  gn(1, N(st)),
+  gn(2, ee),
+  gn(3, Pi)
+], it);
 export {
-  Cn as BatchSaveImagesService,
+  Rn as BatchSaveImagesService,
   L as ClearSheetDrawingTransformerOperation,
   $r as DeleteDrawingsCommand,
-  Hr as EditSheetDrawingOperation,
+  Vr as EditSheetDrawingOperation,
   xe as FileNamePart,
-  Br as GroupSheetDrawingCommand,
-  On as IBatchSaveImagesService,
+  Wr as GroupSheetDrawingCommand,
+  Un as IBatchSaveImagesService,
   Qt as InsertFloatImageCommand,
   qt as InsertSheetDrawingCommand,
-  It as MoveDrawingsCommand,
-  _t as RemoveSheetDrawingCommand,
-  Xr as SHEETS_IMAGE_MENU_ID,
-  oo as SHEET_FLOAT_DOM_PREFIX,
+  Ct as MoveDrawingsCommand,
+  vt as RemoveSheetDrawingCommand,
+  Gr as SHEETS_IMAGE_MENU_ID,
+  lo as SHEET_FLOAT_DOM_PREFIX,
   mt as SaveCellImagesCommand,
-  Wr as SetDrawingArrangeCommand,
-  vt as SetSheetDrawingCommand,
-  pt as SheetCanvasFloatDomManagerService,
-  po as SheetDrawingAnchor,
-  ft as SheetDrawingUpdateController,
-  Lr as SidebarSheetDrawingOperation,
-  jr as UngroupSheetDrawingCommand,
-  Xt as UniverSheetsDrawingUIPlugin,
+  jr as SetDrawingArrangeCommand,
+  It as SetSheetDrawingCommand,
+  wt as SheetCanvasFloatDomManagerService,
+  Do as SheetDrawingAnchor,
+  pt as SheetDrawingUpdateController,
+  Hr as SidebarSheetDrawingOperation,
+  Fr as UngroupSheetDrawingCommand,
+  it as UniverSheetsDrawingUIPlugin,
   _e as calcSheetFloatDomPosition,
   Q as drawingPositionToTransform,
   F as transformToAxisAlignPosition,