@univerjs/sheets-drawing-ui 0.15.0-insiders.20260106-79b11f9 → 0.15.0-insiders.20260107-3d1cfdf

package/lib/es/index.js

@@ -1,18 +1,18 @@
 var Jr = Object.defineProperty;
 var Zr = (i, t, e) => t in i ? Jr(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
-var re = (i, t, e) => Zr(i, typeof t != "symbol" ? t + "" : t, e);
-import { precisionTo as bt, IRenderManagerService as Q, transformObjectOutOfGroup as qr, getGroupState as Qr, getCurrentTypeOfRenderer as Dn, CURSOR_TYPE as ei, RENDER_CLASS_TYPE as ke, Rect as $e, ObjectType as An, DRAWING_OBJECT_LAYER_INDEX as qt, SHEET_VIEWPORT_KEY as cr } from "@univerjs/engine-render";
-import { convertPositionSheetOverGridToAbsolute as ti, SheetSkeletonManagerService as X, ISheetSelectionRenderService as Je, attachRangeWithCoord as dr, SheetCanvasPopManagerService as ni, HoverManagerService as ri, IEditorBridgeService as ii, IAutoFillService as si, EditingRenderController as oi, SetCellEditVisibleOperation as Nn, PREDEFINED_HOOK_NAME_PASTE as Le, COPY_TYPE as Re, discreteRangeToRange as kn, virtualizeDiscreteRanges as ai, ISheetClipboardService as ci, SetZoomRatioOperation as $n, SetScrollOperation as di, SheetPrintInterceptorService as li, useHighlightRange as ui, getCurrentRangeDisable$ as hi } from "@univerjs/sheets-ui";
-import { CommandType as q, ICommandService as G, IUndoRedoService as Ze, sequenceExecute as lr, DrawingTypeEnum as x, ArrangeTypeEnum as Mt, Inject as A, IContextService as ur, LocaleService as Te, Injector as qe, Disposable as ee, createDocumentModelWithStyle as un, ObjectRelativeFromV as xn, ObjectRelativeFromH as Wn, WrapTextType as Bn, PositionedObjectLayoutType as jn, BooleanNumber as Fn, BuildTextUtils as hn, ImageSourceType as Ce, generateRandomId as He, FOCUSING_COMMON_DRAWINGS as Ye, IUniverInstanceService as de, UniverInstanceType as k, Direction as ve, createIdentifier as gi, IImageIoService as hr, RxDisposable as mi, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as ot, DOCS_ZEN_EDITOR_UNIT_ID_KEY as Ve, InterceptorEffectEnum as fi, ObjectMatrix as pi, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as wi, IPermissionService as _i, UserManagerService as Si, LifecycleService as vi, LifecycleStages as Ii, DisposableCollection as yt, fromEventSubject as Ci, Tools as Ge, PRINT_CHART_COMPONENT_KEY as Ri, Rectangle as Di, FOCUSING_SHEET as bi, FOCUSING_FX_BAR_EDITOR as Mi, EDITOR_ACTIVATED as yi, FOCUSING_PANEL_EDITOR as Ei, DependentOn as Ti, IConfigService as Oi, Plugin as Ui, merge as Pi, registerDependencies as Ai, touchDependencies as Qt } from "@univerjs/core";
-import { ISheetDrawingService as oe, DrawingApplyType as U, SetDrawingApplyMutation as P, SheetDrawingAnchorType as O, UniverSheetsDrawingPlugin as Ni } from "@univerjs/sheets-drawing";
-import { SheetInterceptorService as Ht, SheetsSelectionsService as ut, SetRangeValuesCommand as Ln, getSheetCommandTarget as se, INTERCEPTOR_POINT as ki, InterceptCellContentPriority as $i, WorkbookViewPermission as Hn, WorksheetViewPermission as Vn, WorkbookEditablePermission as gn, WorksheetEditPermission as mn, SetFrozenMutation as xi, SetSelectionsOperation as Wi, SetWorksheetRowAutoHeightMutation as gr, COMMAND_LISTENER_SKELETON_CHANGE as Bi, InsertRowCommand as mr, InsertColCommand as fr, RemoveRowCommand as pr, RemoveColCommand as wr, DeleteRangeMoveLeftCommand as _r, DeleteRangeMoveUpCommand as Sr, InsertRangeMoveDownCommand as vr, InsertRangeMoveRightCommand as Ir, DeltaRowHeightCommand as fn, SetRowHeightCommand as pn, DeltaColumnWidthCommand as Cr, SetColWidthCommand as Rr, SetRowHiddenCommand as Dr, SetSpecificRowsVisibleCommand as br, SetSpecificColsVisibleCommand as Mr, SetColHiddenCommand as yr, MoveColsCommand as Er, MoveRowsCommand as Tr, MoveRangeCommand as Or, SetRowVisibleMutation as ji, SetRowHiddenMutation as Fi, SetColVisibleMutation as Li, SetColHiddenMutation as Hi, SetWorksheetRowHeightMutation as Vi, SetWorksheetRowIsAutoHeightMutation as Gi, SetWorksheetColWidthMutation as Yi, SetWorksheetActiveOperation as Xi, RangeProtectionPermissionEditPoint as zi } from "@univerjs/sheets";
-import { MessageType as Se, render as Ki, unmount as Ji, FormLayout as en, CheckboxGroup as Zi, Checkbox as Gn, Select as qi, Button as Yn, clsx as Qi, RadioGroup as es, Radio as tn } from "@univerjs/design";
-import { docDrawingPositionToTransform as Xn, ReplaceSnapshotCommand as ts, InnerPasteCommand as ns } from "@univerjs/docs-ui";
-import { IImageIoService as rs, IDrawingManagerService as ae, DRAWING_IMAGE_ALLOW_IMAGE_LIST as zn, DRAWING_IMAGE_COUNT_LIMIT as Kn, ImageUploadStatusType as xe, DRAWING_IMAGE_ALLOW_SIZE as Jn, getImageSize as nn, SetDrawingSelectedOperation as Vt, DRAWING_IMAGE_WIDTH_LIMIT as Zn, DRAWING_IMAGE_HEIGHT_LIMIT as qn, ImageSourceType as is, getDrawingShapeKeyByDrawingSearch as De, UniverDrawingPlugin as ss } from "@univerjs/drawing";
-import { ILocalFileService as os, IMessageService as Ur, IDialogService as bn, ISidebarService as as, IClipboardInterfaceService as cs, CanvasFloatDomService as ds, PrintFloatDomSingle as ls, ComponentManager as Pr, connectInjector as us, useDependency as Ie, getMenuHiddenObservable as Gt, MenuItemType as Yt, ContextMenuPosition as rn, ContextMenuGroup as sn, RibbonInsertGroup as hs, KeyCode as Ke, IMenuManagerService as gs, IShortcutService as ms } from "@univerjs/ui";
-import { DocDrawingController as fs, UniverDocsDrawingPlugin as ps } from "@univerjs/docs-drawing";
-import { ImageCropperObject as ws, COMPONENT_IMAGE_POPUP_MENU as _s, OpenImageCropOperation as Ss, ImageResetSizeOperation as vs, DrawingRenderService as Ar, DrawingCommonPanel as Is, UniverDrawingUIPlugin as Cs } from "@univerjs/drawing-ui";
-import { takeUntil as Qn, throttleTime as Rs, combineLatest as at, switchMap as fe, EMPTY as we, tap as er, map as pe, distinctUntilChanged as tr, Subject as on, filter as Ds, take as bs, BehaviorSubject as je, of as wn } from "rxjs";
+var Q = (i, t, e) => Zr(i, typeof t != "symbol" ? t + "" : t, e);
+import { precisionTo as bt, IRenderManagerService as ee, transformObjectOutOfGroup as qr, getGroupState as Qr, getCurrentTypeOfRenderer as bn, CURSOR_TYPE as ei, RENDER_CLASS_TYPE as ke, Rect as $e, ObjectType as Nn, DRAWING_OBJECT_LAYER_INDEX as qt, SHEET_VIEWPORT_KEY as cr } from "@univerjs/engine-render";
+import { convertPositionSheetOverGridToAbsolute as ti, SheetSkeletonManagerService as X, ISheetSelectionRenderService as Je, attachRangeWithCoord as dr, SheetCanvasPopManagerService as ni, HoverManagerService as ri, IEditorBridgeService as ii, IAutoFillService as si, EditingRenderController as oi, SetCellEditVisibleOperation as kn, PREDEFINED_HOOK_NAME_PASTE as Le, COPY_TYPE as Re, discreteRangeToRange as $n, virtualizeDiscreteRanges as ai, ISheetClipboardService as ci, SetZoomRatioOperation as xn, SetScrollOperation as di, SheetPrintInterceptorService as li, useHighlightRange as ui, getCurrentRangeDisable$ as hi } from "@univerjs/sheets-ui";
+import { CommandType as q, ICommandService as G, IUndoRedoService as Ze, sequenceExecute as lr, DrawingTypeEnum as x, ArrangeTypeEnum as Mt, Inject as A, IContextService as ur, LocaleService as Te, Injector as qe, Disposable as te, createDocumentModelWithStyle as hn, ObjectRelativeFromV as Wn, ObjectRelativeFromH as Bn, WrapTextType as jn, PositionedObjectLayoutType as Fn, BooleanNumber as Ln, BuildTextUtils as gn, ImageSourceType as de, generateRandomId as He, FOCUSING_COMMON_DRAWINGS as Ye, IUniverInstanceService as le, UniverInstanceType as k, Direction as Ie, createIdentifier as gi, IImageIoService as hr, toDisposable as mi, RxDisposable as fi, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as ot, DOCS_ZEN_EDITOR_UNIT_ID_KEY as Ve, InterceptorEffectEnum as pi, ObjectMatrix as wi, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as _i, IPermissionService as Si, UserManagerService as vi, LifecycleService as Ii, LifecycleStages as Ci, DisposableCollection as yt, fromEventSubject as Ri, Tools as Ge, PRINT_CHART_COMPONENT_KEY as Di, Rectangle as bi, FOCUSING_SHEET as Mi, FOCUSING_FX_BAR_EDITOR as yi, EDITOR_ACTIVATED as Ei, FOCUSING_PANEL_EDITOR as Ti, DependentOn as Oi, IConfigService as Ui, Plugin as Pi, merge as Ai, registerDependencies as Ni, touchDependencies as Qt } from "@univerjs/core";
+import { ISheetDrawingService as oe, DrawingApplyType as U, SetDrawingApplyMutation as P, SheetDrawingAnchorType as O, UniverSheetsDrawingPlugin as ki } from "@univerjs/sheets-drawing";
+import { SheetInterceptorService as Ht, SheetsSelectionsService as ut, SetRangeValuesCommand as Hn, getSheetCommandTarget as se, INTERCEPTOR_POINT as $i, InterceptCellContentPriority as xi, WorkbookViewPermission as Vn, WorksheetViewPermission as Gn, WorkbookEditablePermission as mn, WorksheetEditPermission as fn, SetFrozenMutation as Wi, SetSelectionsOperation as Bi, SetWorksheetRowAutoHeightMutation as gr, COMMAND_LISTENER_SKELETON_CHANGE as ji, InsertRowCommand as mr, InsertColCommand as fr, RemoveRowCommand as pr, RemoveColCommand as wr, DeleteRangeMoveLeftCommand as _r, DeleteRangeMoveUpCommand as Sr, InsertRangeMoveDownCommand as vr, InsertRangeMoveRightCommand as Ir, DeltaRowHeightCommand as pn, SetRowHeightCommand as wn, DeltaColumnWidthCommand as Cr, SetColWidthCommand as Rr, SetRowHiddenCommand as Dr, SetSpecificRowsVisibleCommand as br, SetSpecificColsVisibleCommand as Mr, SetColHiddenCommand as yr, MoveColsCommand as Er, MoveRowsCommand as Tr, MoveRangeCommand as Or, SetRowVisibleMutation as Fi, SetRowHiddenMutation as Li, SetColVisibleMutation as Hi, SetColHiddenMutation as Vi, SetWorksheetRowHeightMutation as Gi, SetWorksheetRowIsAutoHeightMutation as Yi, SetWorksheetColWidthMutation as Xi, SetWorksheetActiveOperation as zi, RangeProtectionPermissionEditPoint as Ki } from "@univerjs/sheets";
+import { MessageType as ve, render as Ji, unmount as Zi, FormLayout as en, CheckboxGroup as qi, Checkbox as Yn, Select as Qi, Button as Xn, clsx as es, RadioGroup as ts, Radio as tn } from "@univerjs/design";
+import { docDrawingPositionToTransform as zn, ReplaceSnapshotCommand as ns, InnerPasteCommand as rs } from "@univerjs/docs-ui";
+import { IImageIoService as is, IDrawingManagerService as ae, DRAWING_IMAGE_ALLOW_IMAGE_LIST as Kn, DRAWING_IMAGE_COUNT_LIMIT as Jn, ImageUploadStatusType as xe, DRAWING_IMAGE_ALLOW_SIZE as Zn, getImageSize as nn, SetDrawingSelectedOperation as Vt, DRAWING_IMAGE_WIDTH_LIMIT as qn, DRAWING_IMAGE_HEIGHT_LIMIT as Qn, ImageSourceType as ss, getDrawingShapeKeyByDrawingSearch as De, UniverDrawingPlugin as os } from "@univerjs/drawing";
+import { ILocalFileService as as, IMessageService as Ur, IDialogService as Mn, ISidebarService as cs, IClipboardInterfaceService as ds, CanvasFloatDomService as ls, PrintFloatDomSingle as us, ComponentManager as Pr, connectInjector as hs, useDependency as Ce, getMenuHiddenObservable as Gt, MenuItemType as Yt, ContextMenuPosition as rn, ContextMenuGroup as sn, RibbonInsertGroup as gs, KeyCode as Ke, IMenuManagerService as ms, IShortcutService as fs } from "@univerjs/ui";
+import { DocDrawingController as ps, UniverDocsDrawingPlugin as ws } from "@univerjs/docs-drawing";
+import { ImageCropperObject as _s, COMPONENT_IMAGE_POPUP_MENU as Ss, OpenImageCropOperation as vs, ImageResetSizeOperation as Is, DrawingRenderService as Ar, DrawingCommonPanel as Cs, UniverDrawingUIPlugin as Rs } from "@univerjs/drawing-ui";
+import { takeUntil as er, throttleTime as Ds, combineLatest as at, switchMap as pe, EMPTY as _e, tap as tr, map as we, distinctUntilChanged as nr, Subject as on, filter as bs, take as Ms, BehaviorSubject as je, of as _n } from "rxjs";
 import { jsx as L, jsxs as Xe } from "react/jsx-runtime";
 import { useMemo as Fe, useState as Ee, useCallback as Et, useEffect as Nr } from "react";
 function J(i, t, e) {
@@ -25,9 +25,9 @@ function J(i, t, e) {
     { from: n, to: r },
     e
   );
-  let { left: g, top: h, width: m, height: f } = l;
-  const p = e.getCurrentSkeleton(), w = p.rowHeaderWidth + p.columnTotalWidth, S = p.columnHeaderHeight + p.rowTotalHeight;
-  return g + m > w && (g = w - m), h + f > S && (h = S - f), {
+  let { left: g, top: h, width: m, height: p } = l;
+  const f = e.getCurrentSkeleton(), w = f.rowHeaderWidth + f.columnTotalWidth, _ = f.columnHeaderHeight + f.rowTotalHeight;
+  return g + m > w && (g = w - m), h + p > _ && (h = _ - p), {
     flipY: s,
     flipX: o,
     angle: a,
@@ -36,7 +36,7 @@ function J(i, t, e) {
     left: g,
     top: h,
     width: m,
-    height: f
+    height: p
   };
 }
 function j(i, t) {
@@ -71,7 +71,7 @@ const H = {
   id: "sheet.operation.clear-drawing-transformer",
   type: q.MUTATION,
   handler: (i, t) => {
-    const e = i.get(Q);
+    const e = i.get(ee);
     return t.forEach((n) => {
       var r, s;
       (s = (r = e.getRenderById(n)) == null ? void 0 : r.scene.getTransformer()) == null || s.debounceRefreshControls();
@@ -81,7 +81,7 @@ const H = {
   id: "sheet.command.remove-sheet-image",
   type: q.COMMAND,
   handler: (i, t) => {
-    var S, I, D;
+    var _, I, R;
     const e = i.get(G), n = i.get(Ze), r = i.get(Ht), s = i.get(oe);
     if (!t) return !1;
     const { drawings: o } = t, a = [];
@@ -89,18 +89,18 @@ const H = {
       const { unitId: C } = v;
       a.push(C);
     });
-    const d = s.getBatchRemoveOp(o), { unitId: u, subUnitId: c, undo: l, redo: g, objects: h } = d, m = r.onCommandExecute({ id: ht.id, params: t }), f = { id: P.id, params: { unitId: u, subUnitId: c, op: g, objects: h, type: U.REMOVE } }, p = { id: P.id, params: { unitId: u, subUnitId: c, op: l, objects: h, type: U.INSERT } };
-    return lr([...(S = m.preRedos) != null ? S : [], f, ...m.redos], e) ? (n.pushUndoRedo({
+    const d = s.getBatchRemoveOp(o), { unitId: u, subUnitId: c, undo: l, redo: g, objects: h } = d, m = r.onCommandExecute({ id: ht.id, params: t }), p = { id: P.id, params: { unitId: u, subUnitId: c, op: g, objects: h, type: U.REMOVE } }, f = { id: P.id, params: { unitId: u, subUnitId: c, op: l, objects: h, type: U.INSERT } };
+    return lr([...(_ = m.preRedos) != null ? _ : [], p, ...m.redos], e) ? (n.pushUndoRedo({
       unitID: u,
       undoMutations: [
         ...(I = m.preUndos) != null ? I : [],
-        p,
+        f,
         ...m.undos,
         { id: H.id, params: a }
       ],
       redoMutations: [
-        ...(D = m.preRedos) != null ? D : [],
-        f,
+        ...(R = m.preRedos) != null ? R : [],
+        p,
         ...m.redos,
         { id: H.id, params: a }
       ]
@@ -128,15 +128,15 @@ const H = {
     });
   }
 };
-function Ms(i) {
+function ys(i) {
   const t = [];
   return i.forEach((e) => {
     const { parent: n, children: r } = e, { unitId: s, subUnitId: o, drawingId: a } = n, d = Qr(0, 0, r.map((l) => l.transform || {})), u = r.map((l) => {
-      const g = l.transform || { left: 0, top: 0 }, { unitId: h, subUnitId: m, drawingId: f } = l;
+      const g = l.transform || { left: 0, top: 0 }, { unitId: h, subUnitId: m, drawingId: p } = l;
       return {
         unitId: h,
         subUnitId: m,
-        drawingId: f,
+        drawingId: p,
         transform: {
           ...g,
           left: g.left - d.left,
@@ -157,19 +157,19 @@ function Ms(i) {
     });
   }), t;
 }
-function ys(i) {
+function Es(i) {
   const t = [];
   return i.forEach((e) => {
     const { parent: n, children: r } = e, { unitId: s, subUnitId: o, drawingId: a, transform: d = { width: 0, height: 0 } } = n;
     if (d == null)
       return;
     const u = r.map((l) => {
-      const { transform: g } = l, { unitId: h, subUnitId: m, drawingId: f } = l, p = qr(g || {}, d, d.width || 0, d.height || 0);
+      const { transform: g } = l, { unitId: h, subUnitId: m, drawingId: p } = l, f = qr(g || {}, d, d.width || 0, d.height || 0);
       return {
         unitId: h,
         subUnitId: m,
-        drawingId: f,
-        transform: p,
+        drawingId: p,
+        transform: f,
         groupId: void 0
       };
     }), c = {
@@ -196,15 +196,15 @@ const $r = {
     if (!t) return !1;
     const s = [];
     t.forEach(({ parent: h, children: m }) => {
-      s.push(h.unitId), m.forEach((f) => {
-        s.push(f.unitId);
+      s.push(h.unitId), m.forEach((p) => {
+        s.push(p.unitId);
       });
     });
     const o = r.getGroupDrawingOp(t), { unitId: a, subUnitId: d, undo: u, redo: c, objects: l } = o;
     return e.syncExecuteCommand(P.id, { op: c, unitId: a, subUnitId: d, objects: l, type: U.GROUP }) ? (n.pushUndoRedo({
       unitID: a,
       undoMutations: [
-        { id: P.id, params: { op: u, unitId: a, subUnitId: d, objects: ys(l), type: U.UNGROUP } },
+        { id: P.id, params: { op: u, unitId: a, subUnitId: d, objects: Es(l), type: U.UNGROUP } },
         { id: H.id, params: s }
       ],
       redoMutations: [
@@ -217,21 +217,21 @@ const $r = {
   id: "sheet.command.insert-sheet-image",
   type: q.COMMAND,
   handler: (i, t) => {
-    var S, I, D;
+    var _, I, R;
     const e = i.get(G), n = i.get(Ze), r = i.get(oe), s = i.get(Ht);
     if (!t) return !1;
-    const o = t.drawings, a = o.map((v) => v.unitId), d = r.getBatchAddOp(o), { unitId: u, subUnitId: c, undo: l, redo: g, objects: h } = d, m = s.onCommandExecute({ id: Xt.id, params: t }), f = { id: P.id, params: { op: g, unitId: u, subUnitId: c, objects: h, type: U.INSERT } }, p = { id: P.id, params: { op: l, unitId: u, subUnitId: c, objects: h, type: U.REMOVE } };
-    return lr([...(S = m.preRedos) != null ? S : [], f, ...m.redos], e) ? (n.pushUndoRedo({
+    const o = t.drawings, a = o.map((v) => v.unitId), d = r.getBatchAddOp(o), { unitId: u, subUnitId: c, undo: l, redo: g, objects: h } = d, m = s.onCommandExecute({ id: Xt.id, params: t }), p = { id: P.id, params: { op: g, unitId: u, subUnitId: c, objects: h, type: U.INSERT } }, f = { id: P.id, params: { op: l, unitId: u, subUnitId: c, objects: h, type: U.REMOVE } };
+    return lr([...(_ = m.preRedos) != null ? _ : [], p, ...m.redos], e) ? (n.pushUndoRedo({
       unitID: u,
       undoMutations: [
         ...(I = m.preUndos) != null ? I : [],
-        p,
+        f,
         ...m.undos,
         { id: H.id, params: a }
       ],
       redoMutations: [
-        ...(D = m.preRedos) != null ? D : [],
-        f,
+        ...(R = m.preRedos) != null ? R : [],
+        p,
         ...m.redos,
         { id: H.id, params: a }
       ]
@@ -285,15 +285,15 @@ const $r = {
     if (!t) return !1;
     const s = [];
     t.forEach(({ parent: h, children: m }) => {
-      s.push(h.unitId), m.forEach((f) => {
-        s.push(f.unitId);
+      s.push(h.unitId), m.forEach((p) => {
+        s.push(p.unitId);
       });
     });
     const o = r.getUngroupDrawingOp(t), { unitId: a, subUnitId: d, undo: u, redo: c, objects: l } = o;
     return e.syncExecuteCommand(P.id, { op: c, unitId: a, subUnitId: d, objects: l, type: U.UNGROUP }) ? (n.pushUndoRedo({
       unitID: a,
       undoMutations: [
-        { id: P.id, params: { op: u, unitId: a, subUnitId: d, objects: Ms(l), type: U.GROUP } },
+        { id: P.id, params: { op: u, unitId: a, subUnitId: d, objects: ys(l), type: U.GROUP } },
         { id: H.id, params: s }
       ],
       redoMutations: [
@@ -303,49 +303,49 @@ const $r = {
     }), !0) : !1;
   }
 };
-var Es = Object.getOwnPropertyDescriptor, Ts = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Es(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+var Ts = Object.getOwnPropertyDescriptor, Os = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Ts(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, ie = (i, t) => (e, n) => t(e, n, i);
-function Os(i, t, e) {
+function Us(i, t, e) {
   const n = e * Math.PI / 180, r = Math.abs(i * Math.cos(n)) + Math.abs(t * Math.sin(n)), s = Math.abs(i * Math.sin(n)) + Math.abs(t * Math.cos(n));
   return { rotatedWidth: r, rotatedHeight: s };
 }
-function _n(i, t, e, n, r) {
-  var S;
-  const { rotatedHeight: s, rotatedWidth: o } = Os(e, n, r), d = i.get(Q).getRenderById(t.unitId);
+function Sn(i, t, e, n, r) {
+  var _;
+  const { rotatedHeight: s, rotatedWidth: o } = Us(e, n, r), d = i.get(ee).getRenderById(t.unitId);
   if (!d)
     return !1;
-  const c = (S = d.with(X).getSkeletonParam(t.subUnitId)) == null ? void 0 : S.skeleton;
+  const c = (_ = d.with(X).getSkeletonParam(t.subUnitId)) == null ? void 0 : _.skeleton;
   if (c == null)
     return !1;
-  const l = c.getCellByIndex(t.row, t.col), g = l.mergeInfo.endX - l.mergeInfo.startX - 2, h = l.mergeInfo.endY - l.mergeInfo.startY - 2, m = o / s, p = Math.ceil(Math.min(g, h * m)) / o, w = !p || Number.isNaN(p) ? 1e-3 : p;
+  const l = c.getCellByIndex(t.row, t.col), g = l.mergeInfo.endX - l.mergeInfo.startX - 2, h = l.mergeInfo.endY - l.mergeInfo.startY - 2, m = o / s, f = Math.ceil(Math.min(g, h * m)) / o, w = !f || Number.isNaN(f) ? 1e-3 : f;
   return {
     width: e * w,
     height: n * w
   };
 }
-let dt = class extends ee {
+let dt = class extends te {
   constructor(t, e, n, r, s, o, a, d, u, c, l, g, h) {
     super();
-    re(this, "_workbookSelections");
+    Q(this, "_workbookSelections");
     this._context = t, this._skeletonManagerService = e, this._commandService = n, this._selectionRenderService = r, this._imageIoService = s, this._fileOpenerService = o, this._sheetDrawingService = a, this._drawingManagerService = d, this._contextService = u, this._messageService = c, this._localeService = l, this._injector = h, this._workbookSelections = g.getWorkbookSelections(this._context.unitId), this._updateImageListener(), this._updateOrderListener(), this._groupDrawingListener(), this._focusDrawingListener();
   }
   async insertFloatImage() {
     const t = await this._fileOpenerService.openFile({
       multiple: !0,
-      accept: zn.map((n) => `.${n.replace("image/", "")}`).join(",")
+      accept: Kn.map((n) => `.${n.replace("image/", "")}`).join(",")
     }), e = t.length;
-    return e > Kn ? (this._messageService.show({
-      type: Se.Error,
-      content: this._localeService.t("update-status.exceedMaxCount", String(Kn))
+    return e > Jn ? (this._messageService.show({
+      type: ve.Error,
+      content: this._localeService.t("update-status.exceedMaxCount", String(Jn))
     }), !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: Kn.map((n) => `.${n.replace("image/", "")}`).join(",")
     }))[0];
     return e ? (await this._insertCellImage(e), !0) : !1;
   }
@@ -356,16 +356,16 @@ let dt = class extends ee {
     let e;
     try {
       e = await this._imageIoService.saveImage(t);
-    } catch (S) {
-      const I = S.message;
+    } catch (_) {
+      const I = _.message;
       I === xe.ERROR_EXCEED_SIZE ? this._messageService.show({
-        type: Se.Error,
-        content: this._localeService.t("update-status.exceedMaxSize", String(Jn / (1024 * 1024)))
+        type: ve.Error,
+        content: this._localeService.t("update-status.exceedMaxSize", String(Zn / (1024 * 1024)))
       }) : I === xe.ERROR_IMAGE_TYPE ? this._messageService.show({
-        type: Se.Error,
+        type: ve.Error,
         content: this._localeService.t("update-status.invalidImageType")
       }) : I === xe.ERROR_IMAGE && this._messageService.show({
-        type: Se.Error,
+        type: ve.Error,
         content: this._localeService.t("update-status.invalidImage")
       });
     }
@@ -373,13 +373,13 @@ let dt = class extends ee {
       return;
     const n = this._getUnitInfo(), { unitId: r, subUnitId: s } = n, { imageId: o, imageSourceType: a, source: d, base64Cache: u } = e, { width: c, height: l, image: g } = await nn(u || ""), { width: h, height: m } = this._context.scene;
     this._imageIoService.addImageSourceCache(d, a, g);
-    let f = 1;
-    if (c > Zn || l > qn) {
-      const S = Zn / c, I = qn / l;
-      f = Math.max(S, I);
+    let p = 1;
+    if (c > qn || l > Qn) {
+      const _ = qn / c, I = Qn / l;
+      p = Math.max(_, I);
     }
-    const p = this._getImagePosition(c * f, l * f, h, m);
-    if (p == null)
+    const f = this._getImagePosition(c * p, l * p, h, m);
+    if (f == null)
       return;
     const w = {
       unitId: r,
@@ -388,8 +388,8 @@ let dt = class extends ee {
       drawingType: x.DRAWING_IMAGE,
       imageSourceType: a,
       source: d,
-      transform: J(p, this._selectionRenderService, this._skeletonManagerService),
-      sheetTransform: p
+      transform: J(f, this._selectionRenderService, this._skeletonManagerService),
+      sheetTransform: f
     };
     return this._commandService.executeCommand(Xt.id, {
       unitId: r,
@@ -398,20 +398,20 @@ let dt = class extends ee {
   }
   // eslint-disable-next-line max-lines-per-function
   async _insertCellImage(t, e) {
-    var I, D;
+    var I, R;
     let n;
     try {
       n = await this._imageIoService.saveImage(t);
     } catch (v) {
       const C = v.message;
       C === xe.ERROR_EXCEED_SIZE ? this._messageService.show({
-        type: Se.Error,
-        content: this._localeService.t("update-status.exceedMaxSize", String(Jn / (1024 * 1024)))
+        type: ve.Error,
+        content: this._localeService.t("update-status.exceedMaxSize", String(Zn / (1024 * 1024)))
       }) : C === xe.ERROR_IMAGE_TYPE ? this._messageService.show({
-        type: Se.Error,
+        type: ve.Error,
         content: this._localeService.t("update-status.invalidImageType")
       }) : C === xe.ERROR_IMAGE && this._messageService.show({
-        type: Se.Error,
+        type: ve.Error,
         content: this._localeService.t("update-status.invalidImage")
       });
     }
@@ -424,7 +424,7 @@ let dt = class extends ee {
       return !1;
     let g = l.primary.actualRow, h = l.primary.actualColumn;
     l.primary.isMerged && (g = l.primary.startRow, h = l.primary.startColumn);
-    const m = un("", {}), f = _n(
+    const m = hn("", {}), p = Sn(
       this._injector,
       {
         unitId: this._context.unitId,
@@ -436,19 +436,19 @@ let dt = class extends ee {
       u,
       0
     );
-    if (!f)
+    if (!p)
       return !1;
-    const p = {
+    const f = {
       size: {
-        width: f.width,
-        height: f.height
+        width: p.width,
+        height: p.height
       },
       positionH: {
-        relativeFrom: Wn.PAGE,
+        relativeFrom: Bn.PAGE,
         posOffset: 0
       },
       positionV: {
-        relativeFrom: xn.PARAGRAPH,
+        relativeFrom: Wn.PARAGRAPH,
         posOffset: 0
       },
       angle: 0
@@ -459,19 +459,19 @@ let dt = class extends ee {
       drawingType: x.DRAWING_IMAGE,
       imageSourceType: s,
       source: o,
-      transform: Xn(p),
-      docTransform: p,
-      behindDoc: Fn.FALSE,
+      transform: zn(f),
+      docTransform: f,
+      behindDoc: Ln.FALSE,
       title: "",
       description: "",
-      layoutType: jn.INLINE,
+      layoutType: Fn.INLINE,
       // Insert inline drawing by default.
-      wrapText: Bn.BOTH_SIDES,
+      wrapText: jn.BOTH_SIDES,
       distB: 0,
       distL: 0,
       distR: 0,
       distT: 0
-    }, S = hn.drawing.add({
+    }, _ = gn.drawing.add({
       documentDataModel: m,
       drawings: [w],
       selection: {
@@ -480,10 +480,10 @@ let dt = class extends ee {
         endOffset: 0
       }
     });
-    return S ? (m.apply(S), this._commandService.syncExecuteCommand(Ln.id, {
+    return _ ? (m.apply(_), this._commandService.syncExecuteCommand(Hn.id, {
       value: {
         [(I = e == null ? void 0 : e.row) != null ? I : g]: {
-          [(D = e == null ? void 0 : e.col) != null ? D : h]: {
+          [(R = e == null ? void 0 : e.col) != null ? R : h]: {
             p: m.getSnapshot(),
             t: 1
           }
@@ -497,11 +497,11 @@ let dt = class extends ee {
   async insertCellImageByUrl(t, e) {
     var g, h;
     const { width: n, height: r, image: s } = await nn(t || "");
-    this._imageIoService.addImageSourceCache(t, Ce.URL, s);
+    this._imageIoService.addImageSourceCache(t, de.URL, s);
     const o = this._workbookSelections.getCurrentLastSelection();
     if (!o)
       return !1;
-    const a = un("", {}), d = _n(
+    const a = hn("", {}), d = Sn(
       this._injector,
       {
         unitId: this._context.unitId,
@@ -521,11 +521,11 @@ let dt = class extends ee {
         height: d.height
       },
       positionH: {
-        relativeFrom: Wn.PAGE,
+        relativeFrom: Bn.PAGE,
         posOffset: 0
       },
       positionV: {
-        relativeFrom: xn.PARAGRAPH,
+        relativeFrom: Wn.PARAGRAPH,
         posOffset: 0
       },
       angle: 0
@@ -534,21 +534,21 @@ let dt = class extends ee {
       subUnitId: a.getUnitId(),
       drawingId: He(),
       drawingType: x.DRAWING_IMAGE,
-      imageSourceType: Ce.URL,
+      imageSourceType: de.URL,
       source: t,
-      transform: Xn(u),
+      transform: zn(u),
       docTransform: u,
-      behindDoc: Fn.FALSE,
+      behindDoc: Ln.FALSE,
       title: "",
       description: "",
-      layoutType: jn.INLINE,
+      layoutType: Fn.INLINE,
       // Insert inline drawing by default.
-      wrapText: Bn.BOTH_SIDES,
+      wrapText: jn.BOTH_SIDES,
       distB: 0,
       distL: 0,
       distR: 0,
       distT: 0
-    }, l = hn.drawing.add({
+    }, l = gn.drawing.add({
       documentDataModel: a,
       drawings: [c],
       selection: {
@@ -557,7 +557,7 @@ let dt = class extends ee {
         endOffset: 0
       }
     });
-    return l ? (a.apply(l), this._commandService.syncExecuteCommand(Ln.id, {
+    return l ? (a.apply(l), this._commandService.syncExecuteCommand(Hn.id, {
       value: {
         [(g = e == null ? void 0 : e.row) != null ? g : o.primary.actualRow]: {
           [(h = e == null ? void 0 : e.col) != null ? h : o.primary.actualColumn]: {
@@ -591,10 +591,10 @@ let dt = class extends ee {
       return;
     let { startColumn: d, startRow: u, startX: c, startY: l } = a, g = !1;
     if (c + t > n && (c = n - t, c < 0 && (c = 0, t = n), g = !0), l + e > r && (l = r - e, l < 0 && (l = 0, e = r), g = !0), g) {
-      const p = this._selectionRenderService.getCellWithCoordByOffset(c, l);
-      if (p == null)
+      const f = this._selectionRenderService.getCellWithCoordByOffset(c, l);
+      if (f == null)
         return;
-      c = p.startX, l = p.startY, d = p.actualColumn, u = p.actualRow;
+      c = f.startX, l = f.startY, d = f.actualColumn, u = f.actualRow;
     }
     const h = {
       column: d,
@@ -604,7 +604,7 @@ let dt = class extends ee {
     }, m = this._selectionRenderService.getCellWithCoordByOffset(c + t, l + e);
     if (m == null)
       return;
-    const f = {
+    const p = {
       column: m.actualColumn,
       columnOffset: c + t - m.startX,
       row: m.actualRow,
@@ -612,7 +612,7 @@ let dt = class extends ee {
     };
     return {
       from: h,
-      to: f
+      to: p
     };
   }
   _updateOrderListener() {
@@ -668,12 +668,12 @@ let dt = class extends ee {
     );
   }
 };
-dt = Ts([
+dt = Os([
   ie(1, A(X)),
   ie(2, G),
   ie(3, Je),
-  ie(4, rs),
-  ie(5, os),
+  ie(4, is),
+  ie(5, as),
   ie(6, oe),
   ie(7, ae),
   ie(8, ur),
@@ -687,7 +687,7 @@ const Kt = {
   type: q.COMMAND,
   handler: async (i, t) => {
     var o, a;
-    const e = i.get(de), n = i.get(Q), r = (o = Dn(
+    const e = i.get(le), n = i.get(ee), r = (o = bn(
       k.UNIVER_SHEET,
       e,
       n
@@ -701,13 +701,13 @@ const Kt = {
     } else
       return (a = r.insertFloatImage()) != null ? a : !1;
   }
-}, Mn = {
+}, yn = {
   id: "sheet.command.insert-cell-image",
   type: q.COMMAND,
   handler: (i) => {
     var n, r;
-    const t = i.get(de), e = i.get(Q);
-    return (r = (n = Dn(
+    const t = i.get(le), e = i.get(ee);
+    return (r = (n = bn(
       k.UNIVER_SHEET,
       t,
       e
@@ -725,7 +725,7 @@ const Kt = {
       if (l == null)
         return null;
       const g = { ...l }, { left: h = 0, top: m = 0 } = l;
-      return s === ve.UP ? g.top = m - 1 : s === ve.DOWN ? g.top = m + 1 : s === ve.LEFT ? g.left = h - 1 : s === ve.RIGHT && (g.left = h + 1), {
+      return s === Ie.UP ? g.top = m - 1 : s === Ie.DOWN ? g.top = m + 1 : s === Ie.LEFT ? g.left = h - 1 : s === Ie.RIGHT && (g.left = h + 1), {
         ...c,
         transform: g,
         sheetTransform: j(g, r)
@@ -737,30 +737,30 @@ const Kt = {
     }) ? (e.syncExecuteCommand(H.id, [a]), !0) : !1;
   }
 };
-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--)
+var Ps = Object.getOwnPropertyDescriptor, As = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Ps(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, an = (i, t) => (e, n) => t(e, n, i), ye = /* @__PURE__ */ ((i) => (i.CELL_ADDRESS = "cellAddress", i.COLUMN_VALUE = "columnValue", i))(ye || {});
-const yn = gi("sheets-drawing-ui.batch-save-images.service");
-function Sn(i) {
+const En = gi("sheets-drawing-ui.batch-save-images.service");
+function vn(i) {
   let t = "", e = i;
   for (; e >= 0; )
     t = String.fromCharCode(e % 26 + 65) + t, e = Math.floor(e / 26) - 1;
   return t;
 }
 function At(i, t) {
-  return `${Sn(t)}${i + 1}`;
+  return `${vn(t)}${i + 1}`;
 }
-function As(i) {
+function Ns(i) {
   const t = At(i.startRow, i.startColumn), e = At(i.endRow, i.endColumn);
   return t === e ? t : `${t}:${e}`;
 }
-function nr(i) {
+function rr(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 rr(i) {
+function ir(i) {
   var n, r, s;
   if (!((r = (n = i.p) == null ? void 0 : n.drawingsOrder) != null && r.length) || !((s = i.p) != null && s.drawings))
     return null;
@@ -768,74 +768,81 @@ function rr(i) {
   return !e || !("source" in e) || !("imageSourceType" in e) ? null : e;
 }
 function cn(i, t) {
-  if (t === Ce.BASE64) {
+  if (t === de.BASE64) {
     const e = i.match(/^data:image\/(\w+);/);
     if (e)
       return e[1] === "jpeg" ? "jpg" : e[1];
   }
-  if (t === Ce.URL) {
+  if (t === de.URL) {
     const e = i.match(/\.(\w+)(?:\?|$)/);
     if (e)
       return e[1].toLowerCase();
   }
   return "png";
 }
-async function ir(i, t) {
-  if (t === Ce.BASE64)
+async function dn(i, t) {
+  if (t === de.BASE64)
     return (await fetch(i)).blob();
-  if (t === Ce.URL)
+  if (t === de.URL)
     return (await fetch(i)).blob();
   throw new Error("UUID image type requires additional handling");
 }
-let vn = class extends ee {
-  constructor(i, t, e) {
-    super(), this._univerInstanceService = i, this._selectionService = t, this._imageIoService = e;
+let In = class extends te {
+  constructor(t, e, n) {
+    super();
+    Q(this, "_urlImageDownloader", null);
+    this._univerInstanceService = t, this._selectionService = e, this._imageIoService = n;
+  }
+  registerURLImageDownloader(t) {
+    return this._urlImageDownloader = t, mi(() => {
+      this._urlImageDownloader === t && (this._urlImageDownloader = null);
+    });
   }
   getCellImagesInSelection() {
-    const i = this._univerInstanceService.getCurrentUnitForType(k.UNIVER_SHEET);
-    if (!i) return [];
-    const t = i.getActiveSheet();
+    const t = this._univerInstanceService.getCurrentUnitForType(k.UNIVER_SHEET);
     if (!t) return [];
-    const e = this._selectionService.getCurrentSelections();
-    if (!e || e.length === 0) return [];
-    const n = t.getCellMatrix(), r = [];
-    for (const s of e) {
-      const { startRow: o, endRow: a, startColumn: d, endColumn: u } = s.range;
-      for (let c = o; c <= a; c++)
-        for (let l = d; l <= u; l++) {
-          const g = n.getValue(c, l);
-          if (nr(g)) {
-            const h = rr(g);
-            h && r.push({
-              row: c,
-              col: l,
-              cellAddress: At(c, l),
-              source: h.source,
-              imageSourceType: h.imageSourceType,
-              imageId: h.drawingId
+    const e = t.getActiveSheet();
+    if (!e) return [];
+    const n = this._selectionService.getCurrentSelections();
+    if (!n || n.length === 0) return [];
+    const r = e.getCellMatrix(), s = [];
+    for (const o of n) {
+      const { startRow: a, endRow: d, startColumn: u, endColumn: c } = o.range;
+      for (let l = a; l <= d; l++)
+        for (let g = u; g <= c; g++) {
+          const h = r.getValue(l, g);
+          if (rr(h)) {
+            const m = ir(h);
+            m && s.push({
+              row: l,
+              col: g,
+              cellAddress: At(l, g),
+              source: m.source,
+              imageSourceType: m.imageSourceType,
+              imageId: m.drawingId
             });
           }
         }
     }
-    return r;
+    return s;
   }
-  getCellImagesFromRanges(i, t, e) {
-    const n = this._univerInstanceService.getUnit(i, k.UNIVER_SHEET);
-    if (!n) return [];
-    const r = n.getSheetBySheetId(t);
+  getCellImagesFromRanges(t, e, n) {
+    const r = this._univerInstanceService.getUnit(t, k.UNIVER_SHEET);
     if (!r) return [];
-    const s = r.getCellMatrix(), o = [];
-    for (const a of e) {
-      const { startRow: d, endRow: u, startColumn: c, endColumn: l } = a;
-      for (let g = d; g <= u; g++)
-        for (let h = c; h <= l; h++) {
-          const m = s.getValue(g, h);
-          if (nr(m)) {
-            const f = rr(m);
-            f && o.push({
-              row: g,
-              col: h,
-              cellAddress: At(g, h),
+    const s = r.getSheetBySheetId(e);
+    if (!s) return [];
+    const o = s.getCellMatrix(), a = [];
+    for (const d of n) {
+      const { startRow: u, endRow: c, startColumn: l, endColumn: g } = d;
+      for (let h = u; h <= c; h++)
+        for (let m = l; m <= g; m++) {
+          const p = o.getValue(h, m);
+          if (rr(p)) {
+            const f = ir(p);
+            f && a.push({
+              row: h,
+              col: m,
+              cellAddress: At(h, m),
               source: f.source,
               imageSourceType: f.imageSourceType,
               imageId: f.drawingId
@@ -843,194 +850,201 @@ let vn = class extends ee {
           }
         }
     }
-    return o;
+    return a;
   }
   getDataColumns() {
-    var l, g, h, m;
-    const i = this._univerInstanceService.getCurrentUnitForType(k.UNIVER_SHEET);
-    if (!i) return [];
-    const t = i.getActiveSheet();
+    var g, h, m, p;
+    const t = this._univerInstanceService.getCurrentUnitForType(k.UNIVER_SHEET);
     if (!t) return [];
-    const e = this._selectionService.getCurrentSelections();
-    if (!e || e.length === 0) return [];
-    const n = t.getCellMatrix(), r = n.getDataRange();
-    let s = 1 / 0, o = -1 / 0;
-    const a = /* @__PURE__ */ new Set();
-    for (const f of e) {
-      s = Math.min(s, f.range.startRow), o = Math.max(o, f.range.endRow);
-      for (let p = f.range.startColumn; p <= f.range.endColumn; p++)
-        a.add(p);
-    }
+    const e = t.getActiveSheet();
+    if (!e) return [];
+    const n = this._selectionService.getCurrentSelections();
+    if (!n || n.length === 0) return [];
+    const r = e.getCellMatrix(), s = r.getDataRange();
+    let o = 1 / 0, a = -1 / 0;
     const d = /* @__PURE__ */ new Set();
-    for (let f = r.startColumn; f <= r.endColumn; f++)
-      if (!a.has(f))
-        for (let p = s; p <= o; p++) {
-          const w = n.getValue(p, f);
-          if (w && (((l = w.v) == null ? void 0 : l.toString()) || ((m = (h = (g = w.p) == null ? void 0 : g.body) == null ? void 0 : h.dataStream) == null ? void 0 : m.trim()) || "")) {
-            d.add(f);
+    for (const f of n) {
+      o = Math.min(o, f.range.startRow), a = Math.max(a, f.range.endRow);
+      for (let w = f.range.startColumn; w <= f.range.endColumn; w++)
+        d.add(w);
+    }
+    const u = /* @__PURE__ */ new Set();
+    for (let f = s.startColumn; f <= s.endColumn; f++)
+      if (!d.has(f))
+        for (let w = o; w <= a; w++) {
+          const _ = r.getValue(w, f);
+          if (_ && (((g = _.v) == null ? void 0 : g.toString()) || ((p = (m = (h = _.p) == null ? void 0 : h.body) == null ? void 0 : m.dataStream) == null ? void 0 : p.trim()) || "")) {
+            u.add(f);
             break;
           }
         }
-    const u = [], c = Array.from(d).sort((f, p) => f - p);
-    for (const f of c)
-      u.push({
+    const c = [], l = Array.from(u).sort((f, w) => f - w);
+    for (const f of l)
+      c.push({
         index: f,
-        label: Sn(f)
+        label: vn(f)
       });
-    return u;
+    return c;
   }
-  getDataColumnsForRanges(i, t, e) {
-    var h, m, f, p;
-    const n = this._univerInstanceService.getUnit(i, k.UNIVER_SHEET);
-    if (!n) return [];
-    const r = n.getSheetBySheetId(t);
+  getDataColumnsForRanges(t, e, n) {
+    var m, p, f, w;
+    const r = this._univerInstanceService.getUnit(t, k.UNIVER_SHEET);
     if (!r) return [];
-    const s = r.getCellMatrix(), o = s.getDataRange();
-    let a = 1 / 0, d = -1 / 0;
-    const u = /* @__PURE__ */ new Set();
-    for (const w of e) {
-      a = Math.min(a, w.startRow), d = Math.max(d, w.endRow);
-      for (let S = w.startColumn; S <= w.endColumn; S++)
-        u.add(S);
-    }
+    const s = r.getSheetBySheetId(e);
+    if (!s) return [];
+    const o = s.getCellMatrix(), a = o.getDataRange();
+    let d = 1 / 0, u = -1 / 0;
     const c = /* @__PURE__ */ new Set();
-    for (let w = o.startColumn; w <= o.endColumn; w++)
-      if (!u.has(w))
-        for (let S = a; S <= d; S++) {
-          const I = s.getValue(S, w);
-          if (I && (((h = I.v) == null ? void 0 : h.toString()) || ((p = (f = (m = I.p) == null ? void 0 : m.body) == null ? void 0 : f.dataStream) == null ? void 0 : p.trim()) || "")) {
-            c.add(w);
+    for (const _ of n) {
+      d = Math.min(d, _.startRow), u = Math.max(u, _.endRow);
+      for (let I = _.startColumn; I <= _.endColumn; I++)
+        c.add(I);
+    }
+    const l = /* @__PURE__ */ new Set();
+    for (let _ = a.startColumn; _ <= a.endColumn; _++)
+      if (!c.has(_))
+        for (let I = d; I <= u; I++) {
+          const R = o.getValue(I, _);
+          if (R && (((m = R.v) == null ? void 0 : m.toString()) || ((w = (f = (p = R.p) == null ? void 0 : p.body) == null ? void 0 : f.dataStream) == null ? void 0 : w.trim()) || "")) {
+            l.add(_);
             break;
           }
         }
-    const l = [], g = Array.from(c).sort((w, S) => w - S);
-    for (const w of g)
-      l.push({
-        index: w,
-        label: Sn(w)
+    const g = [], h = Array.from(l).sort((_, I) => _ - I);
+    for (const _ of h)
+      g.push({
+        index: _,
+        label: vn(_)
       });
-    return l;
+    return g;
   }
   getSelectionRangeNotation() {
-    const i = this._selectionService.getCurrentSelections();
-    return !i || i.length === 0 ? "" : i.map((t) => As(t.range)).join(", ");
+    const t = this._selectionService.getCurrentSelections();
+    return !t || t.length === 0 ? "" : t.map((e) => Ns(e.range)).join(", ");
   }
   getSelectionRowRange() {
-    const i = this._selectionService.getCurrentSelections();
-    if (!i || i.length === 0) return null;
-    let t = 1 / 0, e = -1 / 0;
-    for (const n of i)
-      t = Math.min(t, n.range.startRow), e = Math.max(e, n.range.endRow);
-    return { startRow: t, endRow: e };
+    const t = this._selectionService.getCurrentSelections();
+    if (!t || t.length === 0) return null;
+    let e = 1 / 0, n = -1 / 0;
+    for (const r of t)
+      e = Math.min(e, r.range.startRow), n = Math.max(n, r.range.endRow);
+    return { startRow: e, endRow: n };
   }
   getSelectionColumnIndices() {
-    const i = this._selectionService.getCurrentSelections();
-    if (!i || i.length === 0) return /* @__PURE__ */ new Set();
-    const t = /* @__PURE__ */ new Set();
-    for (const e of i)
-      for (let n = e.range.startColumn; n <= e.range.endColumn; n++)
-        t.add(n);
-    return t;
-  }
-  generateFileName(i, t) {
-    var s, o, a, d;
-    const e = this._univerInstanceService.getCurrentUnitForType(k.UNIVER_SHEET), n = cn(i.source, i.imageSourceType), r = [];
-    for (const u of t.fileNameParts)
-      if (u === "cellAddress")
-        r.push(i.cellAddress);
-      else if (u === "columnValue" && t.columnIndex !== void 0) {
-        const c = e == null ? void 0 : e.getActiveSheet();
-        if (c) {
-          const g = c.getCellMatrix().getValue(i.row, t.columnIndex);
-          if (g) {
-            const h = ((s = g.v) == null ? void 0 : s.toString()) || ((d = (a = (o = g.p) == null ? void 0 : o.body) == null ? void 0 : a.dataStream) == null ? void 0 : d.trim()) || "";
-            if (h) {
-              const m = h.replace(/[<>:"/\\|?*]/g, "_").trim();
-              m && r.push(m);
+    const t = this._selectionService.getCurrentSelections();
+    if (!t || t.length === 0) return /* @__PURE__ */ new Set();
+    const e = /* @__PURE__ */ new Set();
+    for (const n of t)
+      for (let r = n.range.startColumn; r <= n.range.endColumn; r++)
+        e.add(r);
+    return e;
+  }
+  generateFileName(t, e) {
+    var o, a, d, u;
+    const n = this._univerInstanceService.getCurrentUnitForType(k.UNIVER_SHEET), r = cn(t.source, t.imageSourceType), s = [];
+    for (const c of e.fileNameParts)
+      if (c === "cellAddress")
+        s.push(t.cellAddress);
+      else if (c === "columnValue" && e.columnIndex !== void 0) {
+        const l = n == null ? void 0 : n.getActiveSheet();
+        if (l) {
+          const h = l.getCellMatrix().getValue(t.row, e.columnIndex);
+          if (h) {
+            const m = ((o = h.v) == null ? void 0 : o.toString()) || ((u = (d = (a = h.p) == null ? void 0 : a.body) == null ? void 0 : d.dataStream) == null ? void 0 : u.trim()) || "";
+            if (m) {
+              const p = m.replace(/[<>:"/\\|?*]/g, "_").trim();
+              p && s.push(p);
             }
           }
         }
       }
-    return r.length === 0 ? `${i.cellAddress}.${n}` : `${r.join("_")}.${n}`;
-  }
-  generateFileNameWithContext(i, t, e, n) {
-    var a, d, u, c;
-    const r = this._univerInstanceService.getUnit(e, k.UNIVER_SHEET), s = cn(i.source, i.imageSourceType), o = [];
-    for (const l of t.fileNameParts)
-      if (l === "cellAddress")
-        o.push(i.cellAddress);
-      else if (l === "columnValue" && t.columnIndex !== void 0) {
-        const g = r == null ? void 0 : r.getSheetBySheetId(n);
-        if (g) {
-          const m = g.getCellMatrix().getValue(i.row, t.columnIndex);
-          if (m) {
-            const f = ((a = m.v) == null ? void 0 : a.toString()) || ((c = (u = (d = m.p) == null ? void 0 : d.body) == null ? void 0 : u.dataStream) == null ? void 0 : c.trim()) || "";
+    return s.length === 0 ? `${t.cellAddress}.${r}` : `${s.join("_")}.${r}`;
+  }
+  generateFileNameWithContext(t, e, n, r) {
+    var d, u, c, l;
+    const s = this._univerInstanceService.getUnit(n, k.UNIVER_SHEET), o = cn(t.source, t.imageSourceType), a = [];
+    for (const g of e.fileNameParts)
+      if (g === "cellAddress")
+        a.push(t.cellAddress);
+      else if (g === "columnValue" && e.columnIndex !== void 0) {
+        const h = s == null ? void 0 : s.getSheetBySheetId(r);
+        if (h) {
+          const p = h.getCellMatrix().getValue(t.row, e.columnIndex);
+          if (p) {
+            const f = ((d = p.v) == null ? void 0 : d.toString()) || ((l = (c = (u = p.p) == null ? void 0 : u.body) == null ? void 0 : c.dataStream) == null ? void 0 : l.trim()) || "";
             if (f) {
-              const p = f.replace(/[<>:"/\\|?*]/g, "_").trim();
-              p && o.push(p);
+              const w = f.replace(/[<>:"/\\|?*]/g, "_").trim();
+              w && a.push(w);
             }
           }
         }
       }
-    return o.length === 0 ? `${i.cellAddress}.${s}` : `${o.join("_")}.${s}`;
+    return a.length === 0 ? `${t.cellAddress}.${o}` : `${a.join("_")}.${o}`;
   }
-  async saveImages(i, t) {
-    var r;
-    const e = await window.showDirectoryPicker({ mode: "readwrite" }), n = /* @__PURE__ */ new Map();
-    for (const s of i) {
-      let o = this.generateFileName(s, t);
-      const a = o.replace(/\.\w+$/, ""), d = ((r = o.match(/\.\w+$/)) == null ? void 0 : r[0]) || ".png", u = n.get(a) || 0;
-      u > 0 && (o = `${a}_${u}${d}`), n.set(a, u + 1);
+  async saveImages(t, e) {
+    var s;
+    const n = await window.showDirectoryPicker({ mode: "readwrite" }), r = /* @__PURE__ */ new Map();
+    for (const o of t) {
+      let a = this.generateFileName(o, e);
+      const d = a.replace(/\.\w+$/, ""), u = ((s = a.match(/\.\w+$/)) == null ? void 0 : s[0]) || ".png", c = r.get(d) || 0;
+      c > 0 && (a = `${d}_${c}${u}`), r.set(d, c + 1);
       try {
-        const c = await this._getImageBlob(s), g = await (await e.getFileHandle(o, { create: !0 })).createWritable();
-        await g.write(c), await g.close();
-      } catch (c) {
-        throw console.error(`Failed to save image ${o}:`, c), c;
+        const l = await this._getImageBlob(o), h = await (await n.getFileHandle(a, { create: !0 })).createWritable();
+        await h.write(l), await h.close();
+      } catch (l) {
+        throw console.error(`Failed to save image ${a}:`, l), l;
       }
     }
   }
-  async saveImagesWithContext(i, t, e, n) {
-    var o;
-    const r = await window.showDirectoryPicker({ mode: "readwrite" }), s = /* @__PURE__ */ new Map();
-    for (const a of i) {
-      let d = this.generateFileNameWithContext(a, t, e, n);
-      const u = d.replace(/\.\w+$/, ""), c = ((o = d.match(/\.\w+$/)) == null ? void 0 : o[0]) || ".png", l = s.get(u) || 0;
-      l > 0 && (d = `${u}_${l}${c}`), s.set(u, l + 1);
+  async saveImagesWithContext(t, e, n, r) {
+    var a;
+    const s = await window.showDirectoryPicker({ mode: "readwrite" }), o = /* @__PURE__ */ new Map();
+    for (const d of t) {
+      let u = this.generateFileNameWithContext(d, e, n, r);
+      const c = u.replace(/\.\w+$/, ""), l = ((a = u.match(/\.\w+$/)) == null ? void 0 : a[0]) || ".png", g = o.get(c) || 0;
+      g > 0 && (u = `${c}_${g}${l}`), o.set(c, g + 1);
       try {
-        const g = await this._getImageBlob(a), m = await (await r.getFileHandle(d, { create: !0 })).createWritable();
-        await m.write(g), await m.close();
-      } catch (g) {
-        throw console.error(`Failed to save image ${d}:`, g), g;
+        const h = await this._getImageBlob(d), p = await (await s.getFileHandle(u, { create: !0 })).createWritable();
+        await p.write(h), await p.close();
+      } catch (h) {
+        throw console.error(`Failed to save image ${u}:`, h), h;
       }
     }
   }
-  async downloadSingleImage(i) {
-    const t = cn(i.source, i.imageSourceType), e = `${i.cellAddress}.${t}`;
+  async downloadSingleImage(t) {
+    const e = cn(t.source, t.imageSourceType), n = `${t.cellAddress}.${e}`;
     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);
-    } catch (n) {
-      throw console.error(`Failed to download image ${e}:`, n), n;
+      const r = await this._getImageBlob(t), s = URL.createObjectURL(r), o = document.createElement("a");
+      o.href = s, o.download = n, document.body.appendChild(o), o.click(), document.body.removeChild(o), URL.revokeObjectURL(s);
+    } catch (r) {
+      throw console.error(`Failed to download image ${n}:`, r), r;
     }
   }
-  async _getImageBlob(i) {
-    if (i.imageSourceType === Ce.UUID) {
-      const t = await this._imageIoService.getImage(i.source);
-      return ir(t, Ce.URL);
+  async _getImageBlob(t) {
+    if (t.imageSourceType === de.UUID) {
+      const e = await this._imageIoService.getImage(t.source);
+      return dn(e, de.URL);
     }
-    return ir(i.source, i.imageSourceType);
+    if (t.imageSourceType === de.URL && this._urlImageDownloader)
+      try {
+        const e = await this._urlImageDownloader(t.source);
+        return dn(e, de.BASE64);
+      } catch (e) {
+        console.error(`Custom downloader failed for ${t.source}, falling back to default fetch:`, e);
+      }
+    return dn(t.source, t.imageSourceType);
   }
 };
-vn = Ps([
-  an(0, de),
+In = As([
+  an(0, le),
   an(1, A(ut)),
   an(2, hr)
-], vn);
+], In);
 const ze = "sheet.dialog.batch-save-images", ct = {
   id: "sheet.command.save-cell-images",
   type: q.COMMAND,
   handler: async (i) => {
-    const t = i.get(bn), e = i.get(yn), n = e.getCellImagesInSelection();
+    const t = i.get(Mn), e = i.get(En), n = e.getCellImagesInSelection();
     if (n.length === 1)
       try {
         return await e.downloadSingleImage(n[0]), !0;
@@ -1055,7 +1069,7 @@ const ze = "sheet.dialog.batch-save-images", ct = {
   id: "sidebar.operation.sheet-image",
   type: q.COMMAND,
   handler: async (i, t) => {
-    const e = i.get(as), n = i.get(Te), r = i.get(de), s = i.get(G);
+    const e = i.get(cs), n = i.get(Te), r = i.get(le), s = i.get(G);
     return se(r) ? (t.value === "open" ? e.open({
       header: { title: n.t("sheetImage.panel.title") },
       children: { label: Br },
@@ -1072,20 +1086,20 @@ const ze = "sheet.dialog.batch-save-images", ct = {
     const e = i.get(G);
     return t == null ? !1 : (e.syncExecuteCommand(Vt.id, [t]), e.executeCommand(jr.id, { value: "open" }), !0);
   }
-}, Ns = "sheets-drawing-ui.config", sr = {};
-var ks = Object.getOwnPropertyDescriptor, $s = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? ks(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+}, ks = "sheets-drawing-ui.config", sr = {};
+var $s = Object.getOwnPropertyDescriptor, xs = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? $s(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, ce = (i, t) => (e, n) => t(e, n, i);
-let Nt = class extends mi {
+let Nt = class extends fi {
   constructor(t, e, n, r, s, o, a, d, u, c) {
     super();
-    re(this, "_initImagePopupMenu", /* @__PURE__ */ new Set());
+    Q(this, "_initImagePopupMenu", /* @__PURE__ */ new Set());
     this._injector = t, this._localeService = e, this._drawingManagerService = n, this._canvasPopManagerService = r, this._renderManagerService = s, this._univerInstanceService = o, this._messageService = a, this._contextService = d, this._ioService = u, this._commandService = c, this._init();
   }
   _init() {
-    this._univerInstanceService.getCurrentTypeOfUnit$(k.UNIVER_SHEET).pipe(Qn(this.dispose$)).subscribe((t) => this._create(t)), this._univerInstanceService.getTypeOfUnitDisposed$(k.UNIVER_SHEET).pipe(Qn(this.dispose$)).subscribe((t) => this._dispose(t)), this._univerInstanceService.getAllUnitsForType(k.UNIVER_SHEET).forEach((t) => this._create(t)), this._setupLoadingStatus();
+    this._univerInstanceService.getCurrentTypeOfUnit$(k.UNIVER_SHEET).pipe(er(this.dispose$)).subscribe((t) => this._create(t)), this._univerInstanceService.getTypeOfUnitDisposed$(k.UNIVER_SHEET).pipe(er(this.dispose$)).subscribe((t) => this._dispose(t)), this._univerInstanceService.getAllUnitsForType(k.UNIVER_SHEET).forEach((t) => this._create(t)), this._setupLoadingStatus();
   }
   _setupLoadingStatus() {
     const t = "image-upload-loading";
@@ -1093,7 +1107,7 @@ let Nt = class extends mi {
     this.disposeWithMe(this._ioService.change$.subscribe((n) => {
       n > 0 && !e ? e = this._messageService.show({
         id: t,
-        type: Se.Loading,
+        type: ve.Loading,
         content: `${this._localeService.t("uploadLoading.loading")}: ${n}`,
         duration: 0
       }) : n === 0 && (e == null || e.dispose(), e = void 0);
@@ -1113,7 +1127,7 @@ let Nt = class extends mi {
   _hasCropObject(t) {
     const e = t.getAllObjectsByOrder();
     for (const n of e)
-      if (n instanceof ws)
+      if (n instanceof _s)
         return !0;
     return !1;
   }
@@ -1145,13 +1159,13 @@ let Nt = class extends mi {
         if (m && m.disablePopup)
           return;
         r == null || r.dispose();
-        const f = this._canvasPopManagerService.getFeatureMenu(c, l, g, h);
+        const p = this._canvasPopManagerService.getFeatureMenu(c, l, g, h);
         r = this.disposeWithMe(this._canvasPopManagerService.attachPopupToObject(a, {
-          componentKey: _s,
+          componentKey: Ss,
           direction: "horizontal",
           offset: [2, 0],
           extraProps: {
-            menuItems: f || this._getImageMenuItems(c, l, g, h)
+            menuItems: p || this._getImageMenuItems(c, l, g, h)
           }
         }));
       })
@@ -1188,45 +1202,45 @@ let Nt = class extends mi {
       {
         label: "image-popup.crop",
         index: 2,
-        commandId: Ss.id,
+        commandId: vs.id,
         commandParams: { unitId: t, subUnitId: e, drawingId: n },
         disable: r === x.DRAWING_DOM
       },
       {
         label: "image-popup.reset",
         index: 3,
-        commandId: vs.id,
+        commandId: Is.id,
         commandParams: [{ unitId: t, subUnitId: e, drawingId: n }],
         disable: r === x.DRAWING_DOM
       }
     ];
   }
 };
-Nt = $s([
+Nt = xs([
   ce(0, A(qe)),
   ce(1, A(Te)),
   ce(2, ae),
   ce(3, A(ni)),
-  ce(4, Q),
-  ce(5, de),
+  ce(4, ee),
+  ce(5, le),
   ce(6, Ur),
   ce(7, ur),
   ce(8, hr),
   ce(9, G)
 ], Nt);
-var xs = Object.getOwnPropertyDescriptor, Ws = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? xs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+var Ws = Object.getOwnPropertyDescriptor, Bs = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Ws(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, Tt = (i, t) => (e, n) => t(e, n, i);
-let In = class extends ee {
+let Cn = class extends te {
   constructor(t, e, n, r, s) {
     super();
-    re(this, "_isSetCursor", !1);
+    Q(this, "_isSetCursor", !1);
     this._context = t, this._hoverManagerService = e, this._selectionsService = n, this._drawingRenderService = r, this._sheetSkeletonManagerService = s, this._initHover(), this._initImageClick();
   }
   _initHover() {
-    this.disposeWithMe(this._hoverManagerService.currentRichTextNoDistinct$.pipe(Rs(33)).subscribe((t) => {
+    this.disposeWithMe(this._hoverManagerService.currentRichTextNoDistinct$.pipe(Ds(33)).subscribe((t) => {
       var n, r;
       let e = [];
       t !== null && (e = this._selectionsService.getWorkbookSelections(this._context.unitId).getCurrentSelections()), e.length > 0 && (t == null ? void 0 : t.unitId) === this._context.unitId && (t != null && t.drawing) && e.length === 1 && ((n = e[0].primary) == null ? void 0 : n.actualRow) === t.row && ((r = e[0].primary) == null ? void 0 : r.actualColumn) === t.col ? (this._isSetCursor = !0, this._context.scene.setCursor(ei.ZOOM_IN)) : this._isSetCursor && (this._isSetCursor = !1, this._context.scene.resetCursor());
@@ -1243,18 +1257,18 @@ let In = class extends ee {
     }));
   }
 };
-In = Ws([
+Cn = Bs([
   Tt(1, A(ri)),
   Tt(2, A(ut)),
   Tt(3, A(Ar)),
   Tt(4, A(X))
-], In);
-var Bs = Object.getOwnPropertyDescriptor, js = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Bs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+], Cn);
+var js = Object.getOwnPropertyDescriptor, Fs = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? js(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, Ot = (i, t) => (e, n) => t(e, n, i);
-let Cn = class extends ee {
+let Rn = class extends te {
   constructor(i, t, e, n, r) {
     super(), this._context = i, this._sheetDrawingService = t, this._drawingManagerService = e, this._sheetSelectionRenderService = n, this._sheetSkeletonManagerService = r, this._init();
   }
@@ -1274,21 +1288,21 @@ let Cn = class extends ee {
     this._drawingManagerService.registerDrawingData(this._context.unitId, this._sheetDrawingService.getDrawingDataForUnit(this._context.unitId)), this._drawingManagerService.initializeNotification(this._context.unitId);
   }
 };
-Cn = js([
+Rn = Fs([
   Ot(1, oe),
   Ot(2, ae),
   Ot(3, A(Je)),
   Ot(4, A(X))
-], Cn);
-var Fs = Object.getOwnPropertyDescriptor, Ls = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Fs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+], Rn);
+var Ls = Object.getOwnPropertyDescriptor, Hs = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Ls(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, We = (i, t) => (e, n) => t(e, n, i);
 function Lr(i, t, e) {
   var n, r, s, o;
   if (((r = (n = e == null ? void 0 : e.p) == null ? void 0 : n.body) == null ? void 0 : r.dataStream.length) === 3 && ((o = (s = e.p) == null ? void 0 : s.drawingsOrder) == null ? void 0 : o.length) === 1) {
-    const a = e.p.drawings[e.p.drawingsOrder[0]], d = _n(
+    const a = e.p.drawings[e.p.drawingsOrder[0]], d = Sn(
       i,
       {
         unitId: t.unitId,
@@ -1305,7 +1319,7 @@ function Lr(i, t, e) {
   }
   return !1;
 }
-let kt = class extends ee {
+let kt = class extends te {
   constructor(i, t, e, n, r, s) {
     super(), this._commandService = i, this._sheetInterceptorService = t, this._injector = e, this._drawingManagerService = n, this._docDrawingController = r, this._editorBridgeService = s, this._handleInitEditor(), this._initCellContentInterceptor();
   }
@@ -1313,16 +1327,16 @@ let kt = class extends ee {
     this.disposeWithMe(this._editorBridgeService.visible$.subscribe((i) => {
       i.visible ? i.visible && (this._drawingManagerService.removeDrawingDataForUnit(ot), this._docDrawingController.loadDrawingDataForUnit(ot), this._drawingManagerService.initializeNotification(ot)) : this._drawingManagerService.removeDrawingDataForUnit(ot);
     })), this.disposeWithMe(this._commandService.onCommandExecuted((i) => {
-      i.id === ts.id && i.params.unitId === Ve && (this._drawingManagerService.removeDrawingDataForUnit(Ve), this._docDrawingController.loadDrawingDataForUnit(Ve), this._drawingManagerService.initializeNotification(Ve));
+      i.id === ns.id && i.params.unitId === Ve && (this._drawingManagerService.removeDrawingDataForUnit(Ve), this._docDrawingController.loadDrawingDataForUnit(Ve), this._drawingManagerService.initializeNotification(Ve));
     }));
   }
   _initCellContentInterceptor() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        ki.CELL_CONTENT,
+        $i.CELL_CONTENT,
         {
-          effect: fi.Style,
-          priority: $i.CELL_IMAGE,
+          effect: pi.Style,
+          priority: xi.CELL_IMAGE,
           handler: (i, t, e) => {
             var n;
             return i != null && i.p && ((n = i.p.drawingsOrder) != null && n.length) && (i === t.rawData && (i = { ...t.rawData }), i.interceptorStyle || (i.interceptorStyle = {}), i.interceptorStyle.tr = { a: 0 }, Lr(this._injector, { unitId: t.unitId, subUnitId: t.subUnitId, row: t.row, col: t.col }, i)), e(i);
@@ -1332,20 +1346,20 @@ let kt = class extends ee {
     );
   }
 };
-kt = Ls([
+kt = Hs([
   We(0, G),
   We(1, A(Ht)),
   We(2, A(qe)),
   We(3, ae),
-  We(4, A(fs)),
+  We(4, A(ps)),
   We(5, A(ii))
 ], kt);
-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--)
+var Vs = Object.getOwnPropertyDescriptor, Gs = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Vs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, or = (i, t) => (e, n) => t(e, n, i);
-let $t = class extends ee {
+let $t = class extends te {
   constructor(i, t) {
     super(), this._autoFillService = i, this._injector = t, this._initAutoFillHooks();
   }
@@ -1354,7 +1368,7 @@ let $t = class extends ee {
       this._autoFillService.addHook({
         id: "sheet-cell-image-autofill",
         onBeforeSubmit: (i, t, e, n) => {
-          new pi(n).forValue((r, s, o) => {
+          new wi(n).forValue((r, s, o) => {
             Lr(this._injector, { unitId: i.unitId, subUnitId: i.subUnitId, row: r, col: s }, o);
           });
         }
@@ -1362,27 +1376,27 @@ let $t = class extends ee {
     );
   }
 };
-$t = Vs([
+$t = Gs([
   or(0, A(si)),
   or(1, A(qe))
 ], $t);
-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--)
+var Ys = Object.getOwnPropertyDescriptor, Xs = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Ys(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, nt = (i, t) => (e, n) => t(e, n, i);
-const Xs = [
+const zs = [
   ot,
-  wi,
+  _i,
   Ve
 ];
-let xt = class extends ee {
+let xt = class extends te {
   constructor(i, t, e, n, r) {
     super(), this._commandService = i, this._univerInstanceService = t, this._dialogService = e, this._renderManagerService = n, this._localeService = r, this._initDocImageCopyPasteHooks();
   }
   _setCellImage(i) {
     var r;
-    const t = un("", {}), e = (r = Dn(k.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.with(oi), n = hn.drawing.add({
+    const t = hn("", {}), e = (r = bn(k.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.with(oi), n = gn.drawing.add({
       documentDataModel: t,
       drawings: [i],
       selection: {
@@ -1397,20 +1411,20 @@ let xt = class extends ee {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((i) => {
         var t, e;
-        if (i.id === ns.id) {
+        if (i.id === rs.id) {
           const n = i.params, { doc: r } = n, s = this._univerInstanceService.getCurrentUnitOfType(k.UNIVER_DOC);
           if (s == null || !Object.keys((t = r.drawings) != null ? t : {}).length)
             return;
           const o = s.getUnitId();
-          if (Xs.includes(o)) {
+          if (zs.includes(o)) {
             if (o !== Ve) {
               const a = () => {
-                this._dialogService.close("sheet-cell-image-copy-paste"), this._commandService.syncExecuteCommand(Nn.id, {
+                this._dialogService.close("sheet-cell-image-copy-paste"), this._commandService.syncExecuteCommand(kn.id, {
                   visible: !1
                 });
               };
               ((e = s.getBody()) == null ? void 0 : e.dataStream) === `\r
-` ? (this._commandService.syncExecuteCommand(Nn.id, {
+` ? (this._commandService.syncExecuteCommand(kn.id, {
                 visible: !1
               }), this._setCellImage(Object.values(r.drawings)[0])) : this._dialogService.open({
                 id: "sheet-cell-image-copy-paste",
@@ -1438,32 +1452,32 @@ let xt = class extends ee {
     );
   }
 };
-xt = Ys([
+xt = Xs([
   nt(0, G),
-  nt(1, de),
-  nt(2, bn),
-  nt(3, Q),
+  nt(1, le),
+  nt(2, Mn),
+  nt(3, ee),
   nt(4, A(Te))
 ], xt);
-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 Ks = Object.getOwnPropertyDescriptor, Js = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Ks(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, rt = (i, t) => (e, n) => t(e, n, i);
 const Hr = "image/png";
-function Js(i) {
+function Zs(i) {
   const t = i.split(","), e = atob(t[1]), n = e.length, r = new Uint8Array(n);
   for (let s = 0; s < n; s++)
     r[s] = e.charCodeAt(s);
   return new Blob([r], { type: Hr });
 }
-function Zs(i) {
-  const t = new ClipboardItem({ [Hr]: Js(i) });
+function qs(i) {
+  const t = new ClipboardItem({ [Hr]: Zs(i) });
   navigator.clipboard.write([t]).catch((e) => {
     console.error("Could not copy image using clipboard API: ", e);
   });
 }
-function qs() {
+function Qs() {
   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;
@@ -1479,10 +1493,10 @@ const ar = [
   Le.SPECIAL_PASTE_FORMAT,
   Le.SPECIAL_PASTE_FORMULA
 ];
-let Wt = class extends ee {
+let Wt = class extends te {
   constructor(t, e, n, r, s) {
     super();
-    re(this, "_copyInfo");
+    Q(this, "_copyInfo");
     this._sheetClipboardService = t, this._renderManagerService = e, this._drawingService = n, this._clipboardInterfaceService = r, this._commandService = s, this._initCopyPaste();
   }
   get _focusedDrawings() {
@@ -1507,8 +1521,8 @@ let Wt = class extends ee {
             this._commandService.executeCommand(ht.id, d);
           }
           setTimeout(() => {
-            const d = qs();
-            o.drawingType === x.DRAWING_IMAGE && o.imageSourceType === is.BASE64 ? Zs(o.source) : this._clipboardInterfaceService.writeText(""), d();
+            const d = Qs();
+            o.drawingType === x.DRAWING_IMAGE && o.imageSourceType === ss.BASE64 ? qs(o.source) : this._clipboardInterfaceService.writeText(""), d();
           }, 200);
           const a = {
             unitId: o.unitId,
@@ -1561,16 +1575,16 @@ let Wt = class extends ee {
       const m = c[h];
       if (m.drawingType !== x.DRAWING_IMAGE)
         return;
-      const { transform: f } = m;
-      if (m.anchorType !== O.Both || !f)
+      const { transform: p } = m;
+      if (m.anchorType !== O.Both || !p)
         return;
-      const { left: p = 0, top: w = 0, width: S = 0, height: I = 0 } = f, { drawingStartX: D, drawingEndX: v, drawingStartY: C, drawingEndY: _ } = {
-        drawingStartX: p,
-        drawingEndX: p + S,
+      const { left: f = 0, top: w = 0, width: _ = 0, height: I = 0 } = p, { drawingStartX: R, drawingEndX: v, drawingStartY: C, drawingEndY: S } = {
+        drawingStartX: f,
+        drawingEndX: f + _,
         drawingStartY: w,
         drawingEndY: w + I
       };
-      o <= D && v <= a && d <= C && _ <= u && l.push(m);
+      o <= R && v <= a && d <= C && S <= u && l.push(m);
     }), l.length)
       return {
         copyRange: n,
@@ -1586,26 +1600,26 @@ let Wt = class extends ee {
     const { unitId: s, subUnitId: o, range: a } = r, d = this._renderManagerService.getRenderById(s), u = d == null ? void 0 : d.with(X), c = d == null ? void 0 : d.with(Je), l = this._copyInfo;
     if (!u || !c)
       return { redos: [], undos: [] };
-    const { drawings: g } = l, h = kn(a);
+    const { drawings: g } = l, h = $n(a);
     return this._generateMutations(g, {
       unitId: s,
       subUnitId: o,
       isCut: e === Re.CUT,
-      getTransform: (m, f) => {
-        var S;
-        const p = u.attachRangeWithCoord({
+      getTransform: (m, p) => {
+        var _;
+        const f = u.attachRangeWithCoord({
           startRow: h.startRow,
           endRow: h.endRow,
           startColumn: h.startColumn,
           endColumn: h.endColumn
         }), w = {
           ...m,
-          left: p == null ? void 0 : p.startX,
-          top: p == null ? void 0 : p.startY
+          left: f == null ? void 0 : f.startX,
+          top: f == null ? void 0 : f.startY
         };
         return {
           transform: w,
-          sheetTransform: (S = j(w, c)) != null ? S : f
+          sheetTransform: (_ = j(w, c)) != null ? _ : p
         };
       }
     });
@@ -1630,14 +1644,14 @@ let Wt = class extends ee {
         sheetTransform: h.sheetTransform
       };
       if (o) {
-        const { undo: f, redo: p, objects: w } = u.getBatchUpdateOp([m]);
+        const { undo: p, redo: f, objects: w } = u.getBatchUpdateOp([m]);
         a.push({
           id: P.id,
           params: {
             unitId: n,
             subUnitId: r,
             type: U.UPDATE,
-            op: p,
+            op: f,
             objects: w
           }
         }), d.push({
@@ -1646,13 +1660,13 @@ let Wt = class extends ee {
             unitId: n,
             subUnitId: r,
             type: U.UPDATE,
-            op: f,
+            op: p,
             objects: w
           }
         });
       } else {
-        const { undo: f, redo: p, objects: w } = u.getBatchAddOp([m]);
-        a.push({ id: P.id, params: { op: p, unitId: n, subUnitId: r, objects: w, type: U.INSERT } }), d.push({ id: P.id, params: { op: f, unitId: n, subUnitId: r, objects: w, type: U.REMOVE } });
+        const { undo: p, redo: f, objects: w } = u.getBatchAddOp([m]);
+        a.push({ id: P.id, params: { op: f, unitId: n, subUnitId: r, objects: w, type: U.INSERT } }), d.push({ id: P.id, params: { op: p, unitId: n, subUnitId: r, objects: w, type: U.REMOVE } });
       }
     }), { redos: a, undos: d };
   }
@@ -1676,45 +1690,45 @@ let Wt = class extends ee {
     const { drawings: c } = this._copyInfo;
     if (!a)
       return this._generateSingleDrawingPasteMutations({
-        pasteTo: { unitId: n, subUnitId: r, range: kn(o) },
+        pasteTo: { unitId: n, subUnitId: r, range: $n(o) },
         pasteType: s
       }, d);
-    const { ranges: [l, g], mapFunc: h } = ai([a, o]), { row: m, col: f } = h(l.startRow, l.startColumn), { row: p, col: w } = h(g.startRow, g.startColumn), S = u.attachRangeWithCoord({
+    const { ranges: [l, g], mapFunc: h } = ai([a, o]), { row: m, col: p } = h(l.startRow, l.startColumn), { row: f, col: w } = h(g.startRow, g.startColumn), _ = u.attachRangeWithCoord({
       startRow: m,
       endRow: m,
-      startColumn: f,
-      endColumn: f
+      startColumn: p,
+      endColumn: p
     }), I = u.attachRangeWithCoord({
-      startRow: p,
-      endRow: p,
+      startRow: f,
+      endRow: f,
       startColumn: w,
       endColumn: w
     });
-    if (!S || !I || !this._copyInfo)
+    if (!_ || !I || !this._copyInfo)
       return { redos: [], undos: [] };
-    const D = I.startX - S.startX, v = I.startY - S.startY, C = p - m, _ = w - f;
+    const R = I.startX - _.startX, v = I.startY - _.startY, C = f - m, S = w - p;
     return this._generateMutations(c, {
       unitId: n,
       subUnitId: r,
-      getTransform: (R, E) => {
+      getTransform: (D, E) => {
         var T, M;
         return {
           transform: {
-            ...R,
-            left: ((T = R == null ? void 0 : R.left) != null ? T : 0) + D,
-            top: ((M = R == null ? void 0 : R.top) != null ? M : 0) + v
+            ...D,
+            left: ((T = D == null ? void 0 : D.left) != null ? T : 0) + R,
+            top: ((M = D == null ? void 0 : D.top) != null ? M : 0) + v
           },
           sheetTransform: {
             ...E,
             to: {
               ...E.to,
               row: E.to.row + C,
-              column: E.to.column + _
+              column: E.to.column + S
             },
             from: {
               ...E.from,
               row: E.from.row + C,
-              column: E.from.column + _
+              column: E.from.column + S
             }
           }
         };
@@ -1723,19 +1737,19 @@ let Wt = class extends ee {
     });
   }
 };
-Wt = Ks([
+Wt = Js([
   rt(0, ci),
-  rt(1, Q),
+  rt(1, ee),
   rt(2, ae),
-  rt(3, cs),
+  rt(3, ds),
   rt(4, G)
 ], Wt);
-var Qs = Object.getOwnPropertyDescriptor, eo = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Qs(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;
 }, it = (i, t) => (e, n) => t(e, n, i);
-let Bt = class extends ee {
+let Bt = class extends te {
   constructor(i, t, e, n, r) {
     super(), this._drawingManagerService = i, this._renderManagerService = t, this._permissionService = e, this._univerInstanceService = n, this._userManagerService = r, this._initDrawingVisible(), this._initDrawingEditable(), this._initViewPermissionChange(), this._initEditPermissionChange();
   }
@@ -1743,19 +1757,19 @@ let Bt = class extends ee {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(k.UNIVER_SHEET), t = this._userManagerService.currentUser$, e = at([i, t]);
     this.disposeWithMe(
       e.pipe(
-        fe(([n, r]) => n ? n.activeSheet$.pipe(
-          er((s) => {
+        pe(([n, r]) => n ? n.activeSheet$.pipe(
+          tr((s) => {
             if (!s) {
               this._drawingManagerService.setDrawingVisible(!1);
               return;
             }
             const o = n.getUnitId(), a = s.getSheetId();
             this._permissionService.composePermission([
-              new Hn(o).id,
-              new Vn(o, a).id
+              new Vn(o).id,
+              new Gn(o, a).id
             ]).every((u) => u.value) ? this._drawingManagerService.setDrawingVisible(!0) : this._handleDrawingVisibilityFalse(n, s);
           })
-        ) : (this._drawingManagerService.setDrawingVisible(!1), we))
+        ) : (this._drawingManagerService.setDrawingVisible(!1), _e))
       ).subscribe()
     );
   }
@@ -1772,19 +1786,19 @@ let Bt = class extends ee {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(k.UNIVER_SHEET), t = this._userManagerService.currentUser$, e = at([i, t]);
     this.disposeWithMe(
       e.pipe(
-        fe(([n, r]) => n ? n.activeSheet$.pipe(
-          er((s) => {
+        pe(([n, r]) => n ? n.activeSheet$.pipe(
+          tr((s) => {
             if (!s) {
               this._drawingManagerService.setDrawingEditable(!1);
               return;
             }
             const o = n.getUnitId(), a = s.getSheetId();
             this._permissionService.composePermission([
-              new gn(o).id,
-              new mn(o, a).id
+              new mn(o).id,
+              new fn(o, a).id
             ]).every((u) => u.value) ? this._drawingManagerService.setDrawingEditable(!0) : this._handleDrawingEditableFalse(n, s);
           })
-        ) : (this._drawingManagerService.setDrawingEditable(!1), we))
+        ) : (this._drawingManagerService.setDrawingEditable(!1), _e))
       ).subscribe()
     );
   }
@@ -1801,22 +1815,22 @@ let Bt = class extends ee {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(k.UNIVER_SHEET), t = this._userManagerService.currentUser$;
     this.disposeWithMe(
       at([i, t]).pipe(
-        fe(([e, n]) => e ? e.activeSheet$.pipe(
-          fe((r) => {
+        pe(([e, n]) => e ? e.activeSheet$.pipe(
+          pe((r) => {
             if (!r)
-              return we;
+              return _e;
             const s = e.getUnitId(), o = r.getSheetId(), a = this._renderManagerService.getRenderById(s), d = a == null ? void 0 : a.scene;
             if (!d)
-              return we;
+              return _e;
             const u = d.getTransformerByCreate();
             return this._permissionService.composePermission$([
-              new Hn(s).id,
-              new Vn(s, o).id
+              new Vn(s).id,
+              new Gn(s, o).id
             ]).pipe(
-              pe((l) => l.every((g) => g.value)),
-              tr()
+              we((l) => l.every((g) => g.value)),
+              nr()
             ).pipe(
-              pe((l) => ({
+              we((l) => ({
                 permission: l,
                 scene: d,
                 transformer: u,
@@ -1825,7 +1839,7 @@ let Bt = class extends ee {
               }))
             );
           })
-        ) : we)
+        ) : _e)
       ).subscribe({
         next: ({ permission: e, scene: n, transformer: r, unitId: s, subUnitId: o }) => {
           this._drawingManagerService.setDrawingVisible(e);
@@ -1849,22 +1863,22 @@ let Bt = class extends ee {
     const i = this._univerInstanceService.getCurrentTypeOfUnit$(k.UNIVER_SHEET), t = this._userManagerService.currentUser$;
     this.disposeWithMe(
       at([i, t]).pipe(
-        fe(([e, n]) => e ? e.activeSheet$.pipe(
-          fe((r) => {
+        pe(([e, n]) => e ? e.activeSheet$.pipe(
+          pe((r) => {
             if (!r)
-              return we;
+              return _e;
             const s = e.getUnitId(), o = r.getSheetId(), a = this._renderManagerService.getRenderById(s), d = a == null ? void 0 : a.scene;
             if (!d)
-              return we;
+              return _e;
             const u = d.getTransformerByCreate();
             return this._permissionService.composePermission$([
-              new gn(s).id,
-              new mn(s, o).id
+              new mn(s).id,
+              new fn(s, o).id
             ]).pipe(
-              pe((l) => l.every((g) => g.value)),
-              tr()
+              we((l) => l.every((g) => g.value)),
+              nr()
             ).pipe(
-              pe((l) => ({
+              we((l) => ({
                 permission: l,
                 scene: d,
                 transformer: u,
@@ -1873,7 +1887,7 @@ let Bt = class extends ee {
               }))
             );
           })
-        ) : we)
+        ) : _e)
       ).subscribe({
         next: ({ permission: e, scene: n, transformer: r, unitId: s, subUnitId: o }) => {
           this._drawingManagerService.setDrawingEditable(e);
@@ -1903,19 +1917,19 @@ let Bt = class extends ee {
     );
   }
 };
-Bt = eo([
+Bt = to([
   it(0, ae),
-  it(1, Q),
-  it(2, _i),
-  it(3, de),
-  it(4, A(Si))
+  it(1, ee),
+  it(2, Si),
+  it(3, le),
+  it(4, A(vi))
 ], Bt);
-var to = Object.getOwnPropertyDescriptor, no = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? to(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+var no = Object.getOwnPropertyDescriptor, ro = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? no(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, be = (i, t) => (e, n) => t(e, n, i);
-const ro = "univer-sheet-float-dom-";
+const io = "univer-sheet-float-dom-";
 function Vr(i, t, e, n, r, s = !1) {
   const { scaleX: o, scaleY: a } = t.getAncestorScale(), d = t.getViewport(cr.VIEW_MAIN), u = n.getFreeze(), { startColumn: c, startRow: l, xSplit: g, ySplit: h } = u, m = {
     left: !0,
@@ -1927,27 +1941,27 @@ function Vr(i, t, e, n, r, s = !1) {
       ...i,
       absolute: m
     };
-  const { left: f, right: p, top: w, bottom: S } = i;
-  let { top: I, left: D, viewportScrollX: v, viewportScrollY: C } = d;
-  const { boundsOfViewArea: _, scrollDirectionResponse: y } = r || {}, { rowHeaderWidth: R, columnHeaderHeight: E } = e, T = {
+  const { left: p, right: f, top: w, bottom: _ } = i;
+  let { top: I, left: R, viewportScrollX: v, viewportScrollY: C } = d;
+  const { boundsOfViewArea: S, scrollDirectionResponse: y } = r || {}, { rowHeaderWidth: D, columnHeaderHeight: E } = e, T = {
     top: s ? 0 : E,
-    left: s ? 0 : R
+    left: s ? 0 : D
   };
-  _ && (Ge.isDefine(T.top) && (T.top = _.top), Ge.isDefine(T.left) && (T.left = _.left)), y === "HORIZONTAL" && (C = 0), y === "VERTICAL" && (v = 0);
+  S && (Ge.isDefine(T.top) && (T.top = S.top), Ge.isDefine(T.left) && (T.left = S.left)), y === "HORIZONTAL" && (C = 0), y === "VERTICAL" && (v = 0);
   let M = 0, b = 0;
-  const N = e.rowStartY(l - h) + E, F = e.colStartX(c - g) + R, te = e.rowStartY(l) + E, z = e.colStartX(c) + R;
+  const N = e.rowStartY(l - h) + E, F = e.colStartX(c - g) + D, ne = e.rowStartY(l) + E, z = e.colStartX(c) + D;
   if (g === 0)
-    m.left = !1, M = (f - v) * o, b = (p - v) * o;
+    m.left = !1, M = (p - v) * o, b = (f - v) * o;
   else {
-    const K = f - (F - R), W = p - (F - R);
-    p < z ? (M = K * o, b = W * o) : f <= z && p >= z ? (M = K * o, b = Math.max(D, (p - v) * o)) : f > z && (m.left = !1, M = Math.max((f - v) * o, D), b = Math.max((p - v) * o, D));
+    const K = p - (F - D), W = f - (F - D);
+    f < z ? (M = K * o, b = W * o) : p <= z && f >= z ? (M = K * o, b = Math.max(R, (f - v) * o)) : p > z && (m.left = !1, M = Math.max((p - v) * o, R), b = Math.max((f - v) * o, R));
   }
   let V = 0, Y = 0;
   if (h === 0)
-    m.top = !1, V = (w - C) * a, Y = (S - C) * a;
+    m.top = !1, V = (w - C) * a, Y = (_ - C) * a;
   else {
-    const K = w - (N - E), W = S - (N - E);
-    S < te ? (V = K * a, Y = W * a) : w <= te && S >= te ? (V = K * a, Y = Math.max(I, (S - C) * a)) : w > te && (m.top = !1, V = Math.max((w - C) * a, I), Y = Math.max((S - C) * a, I));
+    const K = w - (N - E), W = _ - (N - E);
+    _ < ne ? (V = K * a, Y = W * a) : w <= ne && _ >= ne ? (V = K * a, Y = Math.max(I, (_ - C) * a)) : w > ne && (m.top = !1, V = Math.max((w - C) * a, I), Y = Math.max((_ - C) * a, I));
   }
   return M = Math.max(M, T.left), V = Math.max(V, T.top), b = Math.max(b, T.left), Y = Math.max(Y, T.top), {
     left: M,
@@ -1957,7 +1971,7 @@ function Vr(i, t, e, n, r, s = !1) {
     absolute: m
   };
 }
-const me = (i, t, e, n, r) => {
+const fe = (i, t, e, n, r) => {
   const { left: s, top: o, width: a, height: d, angle: u } = i, c = {
     left: s,
     right: s + a,
@@ -1975,23 +1989,23 @@ const me = (i, t, e, n, r) => {
     absolute: l.absolute
   };
 };
-let lt = class extends ee {
+let lt = class extends te {
   constructor(t, e, n, r, s, o, a) {
     super();
     /**
      * for update dom container position when scrolling and zoom
      */
-    re(this, "_domLayerInfoMap", /* @__PURE__ */ new Map());
-    re(this, "_transformChange$", new on());
-    re(this, "transformChange$", this._transformChange$.asObservable());
-    re(this, "_add$", new on());
-    re(this, "add$", this._add$.asObservable());
-    re(this, "_remove$", new on());
-    re(this, "remove$", this._remove$.asObservable());
+    Q(this, "_domLayerInfoMap", /* @__PURE__ */ new Map());
+    Q(this, "_transformChange$", new on());
+    Q(this, "transformChange$", this._transformChange$.asObservable());
+    Q(this, "_add$", new on());
+    Q(this, "add$", this._add$.asObservable());
+    Q(this, "_remove$", new on());
+    Q(this, "remove$", this._remove$.asObservable());
     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(Ds((t) => t === Ii.Rendered), bs(1)).subscribe(() => {
+    this._lifecycleService.lifecycle$.pipe(bs((t) => t === Ci.Rendered), Ms(1)).subscribe(() => {
       this._scrollUpdateListener();
     });
   }
@@ -2032,21 +2046,21 @@ let lt = class extends ee {
           const m = this._getSceneAndTransformerByDrawingSearch(n);
           if (m == null)
             return;
-          const { scene: f, canvas: p } = m;
+          const { scene: p, canvas: f } = m;
           if (l == null)
             return !0;
           if (u !== r)
             return;
-          const { left: w, top: S, width: I, height: D, angle: v, flipX: C, flipY: _, skewX: y, skewY: R } = l, E = De({ unitId: n, subUnitId: r, drawingId: s }), T = f.getObject(E);
+          const { left: w, top: _, width: I, height: R, angle: v, flipX: C, flipY: S, skewX: y, skewY: D } = l, E = De({ unitId: n, subUnitId: r, drawingId: s }), T = p.getObject(E);
           if (T != null) {
-            T.transformByState({ left: w, top: S, width: I, height: D, angle: v, flipX: C, flipY: _, skewX: y, skewY: R });
+            T.transformByState({ left: w, top: _, width: I, height: R, angle: v, flipX: C, flipY: S, skewX: y, skewY: D });
             return;
           }
           const M = {
             left: w,
-            top: S,
+            top: _,
             width: I,
-            height: D,
+            height: R,
             zIndex: this._drawingManagerService.getDrawingOrder(n, r).length - 1
           }, b = g === x.DRAWING_CHART;
           if (M.rotateEnabled = !1, b) {
@@ -2054,8 +2068,8 @@ let lt = class extends ee {
             M.fill = W, h && h.border && (M.stroke = h.border), M.paintFirst = "stroke", M.strokeWidth = 1, M.borderEnabled = !1, M.radius = 8;
           }
           const N = new $e(E, M);
-          b && N.setObjectType(An.CHART), f.addObject(N, qt), a.allowTransform !== !1 && f.attachTransformerTo(N);
-          const F = new yt(), te = me(N, m.renderUnit.scene, c.skeleton, o.worksheet), z = new je(te), V = `${ro}${He(6)}`, Y = {
+          b && N.setObjectType(Nn.CHART), p.addObject(N, qt), a.allowTransform !== !1 && p.attachTransformerTo(N);
+          const F = new yt(), ne = fe(N, m.renderUnit.scene, c.skeleton, o.worksheet), z = new je(ne), V = `${io}${He(6)}`, Y = {
             dispose: F,
             rect: N,
             position$: z,
@@ -2070,22 +2084,22 @@ let lt = class extends ee {
             domId: V,
             componentKey: a.componentKey,
             onPointerDown: (W) => {
-              p.dispatchEvent(new PointerEvent(W.type, W));
+              f.dispatchEvent(new PointerEvent(W.type, W));
             },
             onPointerMove: (W) => {
-              p.dispatchEvent(new PointerEvent(W.type, W));
+              f.dispatchEvent(new PointerEvent(W.type, W));
             },
             onPointerUp: (W) => {
-              p.dispatchEvent(new PointerEvent(W.type, W));
+              f.dispatchEvent(new PointerEvent(W.type, W));
             },
             onWheel: (W) => {
-              p.dispatchEvent(new WheelEvent(W.type, W));
+              f.dispatchEvent(new WheelEvent(W.type, W));
             },
             data: h,
             unitId: n
           });
           const Z = N.onTransformChange$.subscribeEvent(() => {
-            const W = me(N, m.renderUnit.scene, c.skeleton, o.worksheet);
+            const W = fe(N, m.renderUnit.scene, c.skeleton, o.worksheet);
             z.next(
               W
             );
@@ -2115,21 +2129,21 @@ let lt = class extends ee {
       !r || !o || !a || s.forEach((u) => {
         const c = this._domLayerInfoMap.get(u);
         if (c) {
-          const l = me(c.rect, r.renderUnit.scene, a.skeleton, o.worksheet, c);
+          const l = fe(c.rect, r.renderUnit.scene, a.skeleton, o.worksheet, c);
           c.position$.next(l);
         }
       });
     };
     this.disposeWithMe(
       this._univerInstanceService.getCurrentTypeOfUnit$(k.UNIVER_SHEET).pipe(
-        fe((e) => e ? e.activeSheet$ : wn(null)),
-        pe((e) => {
+        pe((e) => e ? e.activeSheet$ : _n(null)),
+        we((e) => {
           if (!e) return null;
           const n = e.getUnitId(), r = this._renderManagerService.getRenderById(n);
           return r ? { render: r, unitId: n, subUnitId: e.getSheetId() } : null;
         }),
-        fe(
-          (e) => e ? Ci(e.render.scene.getViewport(cr.VIEW_MAIN).onScrollAfter$).pipe(pe(() => ({ unitId: e.unitId, subUnitId: e.subUnitId }))) : wn(null)
+        pe(
+          (e) => e ? Ri(e.render.scene.getViewport(cr.VIEW_MAIN).onScrollAfter$).pipe(we(() => ({ unitId: e.unitId, subUnitId: e.subUnitId }))) : _n(null)
         )
       ).subscribe((e) => {
         if (!e) return;
@@ -2137,15 +2151,15 @@ let lt = class extends ee {
         t(n, r);
       })
     ), this.disposeWithMe(this._commandService.onCommandExecuted((e) => {
-      if (e.id === $n.id) {
+      if (e.id === xn.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 === xi.id) {
+      } else if (e.id === Wi.id) {
         const { unitId: n, subUnitId: r } = e.params;
         t(n, r);
-      } else if (e.id === Wi.id) {
+      } else if (e.id === Bi.id) {
         const { unitId: n, subUnitId: r } = e.params;
         t(n, r);
       }
@@ -2270,7 +2284,7 @@ let lt = class extends ee {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   addFloatDomToRange(t, e, n, r) {
-    var C, _, y;
+    var C, S, y;
     const s = se(this._univerInstanceService, {
       unitId: e.unitId,
       subUnitId: e.subUnitId
@@ -2283,79 +2297,79 @@ let lt = class extends ee {
     if (!u) return;
     const c = (C = this._renderManagerService.getRenderById(o)) == null ? void 0 : C.with(X).getWorksheetSkeleton(a);
     if (!c) return;
-    const { componentKey: l, data: g, allowTransform: h = !0 } = e, m = r != null ? r : He(), { position: f, position$: p } = this._createRangePositionObserver(t, u, c.skeleton);
-    if (this._getPosition(f, o) == null)
+    const { componentKey: l, data: g, allowTransform: h = !0 } = e, m = r != null ? r : He(), { position: p, position$: f } = this._createRangePositionObserver(t, u, c.skeleton);
+    if (this._getPosition(p, o) == null)
       return;
-    const S = d.scene, { scaleX: I } = S.getAncestorScale(), D = Ut(f, n, I), v = {
+    const _ = d.scene, { scaleX: I } = _.getAncestorScale(), R = Ut(p, n, I), v = {
       unitId: o,
       subUnitId: a,
       drawingId: m,
       drawingType: e.type || x.DRAWING_DOM,
       componentKey: l,
       transform: {
-        left: D.startX,
-        top: D.startY,
-        width: D.width,
-        height: D.height
+        left: R.startX,
+        top: R.startY,
+        width: R.width,
+        height: R.height
       },
       data: g,
       allowTransform: h
     };
     {
-      const { unitId: R, subUnitId: E, drawingId: T } = v, M = se(this._univerInstanceService, { unitId: R, subUnitId: E }), b = v, N = this._univerInstanceService.getUnit(R, k.UNIVER_SHEET);
+      const { unitId: D, subUnitId: E, drawingId: T } = v, M = se(this._univerInstanceService, { unitId: D, subUnitId: E }), b = v, N = this._univerInstanceService.getUnit(D, k.UNIVER_SHEET);
       if (!N)
         return;
       const F = N.getActiveSheet().getSheetId();
       if (!b || !M)
         return;
-      const te = (_ = this._renderManagerService.getRenderById(R)) == null ? void 0 : _.with(X);
-      if (!te)
+      const ne = (S = this._renderManagerService.getRenderById(D)) == null ? void 0 : S.with(X);
+      if (!ne)
         return;
-      const z = te.getWorksheetSkeleton(E);
+      const z = ne.getWorksheetSkeleton(E);
       if (!z)
         return;
       const { transform: V, drawingType: Y, data: Z } = b;
       if (Y !== x.DRAWING_DOM && Y !== x.DRAWING_CHART)
         return;
-      const K = this._getSceneAndTransformerByDrawingSearch(R);
+      const K = this._getSceneAndTransformerByDrawingSearch(D);
       if (K == null)
         return;
       const { scene: W, canvas: Oe } = K;
       if (V == null || F !== E)
         return;
-      const { left: ft, top: pt, width: wt, height: _t, angle: Jt, flipX: Zt, flipY: St, skewX: vt, skewY: Ue } = V, It = De({ unitId: R, subUnitId: E, drawingId: T }), le = W.getObject(It);
-      if (le != null) {
-        le.transformByState({ left: ft, top: pt, width: wt, height: _t, angle: Jt, flipX: Zt, flipY: St, skewX: vt, skewY: Ue });
+      const { left: ft, top: pt, width: wt, height: _t, angle: Jt, flipX: Zt, flipY: St, skewX: vt, skewY: Ue } = V, It = De({ unitId: D, subUnitId: E, drawingId: T }), ue = W.getObject(It);
+      if (ue != null) {
+        ue.transformByState({ left: ft, top: pt, width: wt, height: _t, angle: Jt, flipX: Zt, flipY: St, skewX: vt, skewY: Ue });
         return;
       }
-      const ne = {
+      const re = {
         left: ft,
         // from floatDomParam.transform
         top: pt,
         width: wt,
         height: _t,
-        zIndex: this._drawingManagerService.getDrawingOrder(R, E).length - 1
+        zIndex: this._drawingManagerService.getDrawingOrder(D, E).length - 1
       }, Pe = Y === x.DRAWING_CHART;
       if (Pe) {
         const $ = Z ? Z.backgroundColor : "white";
-        ne.fill = $, ne.rotateEnabled = !1, Z && Z.border && (ne.stroke = Z.border), ne.paintFirst = "stroke", ne.strokeWidth = 1, ne.borderEnabled = !1, ne.radius = 8;
+        re.fill = $, re.rotateEnabled = !1, Z && Z.border && (re.stroke = Z.border), re.paintFirst = "stroke", re.strokeWidth = 1, re.borderEnabled = !1, re.radius = 8;
       }
-      const ue = new $e(It, ne);
-      Pe && ue.setObjectType(An.CHART), W.addObject(ue, qt), b.allowTransform !== !1 && W.attachTransformerTo(ue);
-      const he = new yt(), Ct = W.getMainViewport(), { rowHeaderWidth: Ae, columnHeaderHeight: Qe } = z.skeleton, Rt = {
+      const he = new $e(It, re);
+      Pe && he.setObjectType(Nn.CHART), W.addObject(he, qt), b.allowTransform !== !1 && W.attachTransformerTo(he);
+      const ge = new yt(), Ct = W.getMainViewport(), { rowHeaderWidth: Ae, columnHeaderHeight: Qe } = z.skeleton, Rt = {
         top: Qe,
         left: Ae,
         bottom: Ct.bottom,
         right: Ct.right
-      }, ge = {
-        dispose: he,
-        rect: ue,
+      }, me = {
+        dispose: ge,
+        rect: he,
         boundsOfViewArea: Rt,
         domAnchor: n,
-        unitId: R,
+        unitId: D,
         subUnitId: E
-      }, B = me(ue, K.renderUnit.scene, z.skeleton, M.worksheet, ge), Ne = new je(B);
-      ge.position$ = Ne;
+      }, B = fe(he, K.renderUnit.scene, z.skeleton, M.worksheet, me), Ne = new je(B);
+      me.position$ = Ne;
       let et = {
         position$: Ne,
         id: T,
@@ -2370,7 +2384,7 @@ let lt = class extends ee {
           Oe.dispatchEvent(new WheelEvent($.type, $));
         },
         data: Z,
-        unitId: R
+        unitId: D
       };
       e.eventPassThrough && (et = {
         ...et,
@@ -2383,41 +2397,41 @@ let lt = class extends ee {
         onPointerUp: ($) => {
           Oe.dispatchEvent(new PointerEvent($.type, $));
         }
-      }), this._canvasFloatDomService.addFloatDom(et), this.disposeWithMe(p.subscribe(($) => {
-        var Tn, On, Un, Pn;
-        const En = Ut({
+      }), this._canvasFloatDomService.addFloatDom(et), this.disposeWithMe(f.subscribe(($) => {
+        var On, Un, Pn, An;
+        const Tn = Ut({
           startX: $.startX,
           startY: $.startY,
           endX: $.endX,
           endY: $.endY,
-          width: (Tn = n.width) != null ? Tn : $.width,
-          height: (On = n.height) != null ? On : $.height,
+          width: (On = n.width) != null ? On : $.width,
+          height: (Un = n.height) != null ? Un : $.height,
           absolute: {
-            left: f.absolute.left,
-            top: f.absolute.top
+            left: p.absolute.left,
+            top: p.absolute.top
           }
-        }, n), Xr = De({ unitId: R, subUnitId: E, drawingId: T }), zr = new $e(Xr, {
-          left: En.startX,
-          top: En.startY,
-          width: (Un = n.width) != null ? Un : $.width,
-          height: (Pn = n.height) != null ? Pn : $.height,
-          zIndex: this._drawingManagerService.getDrawingOrder(R, E).length - 1
-        }), Kr = me(zr, K.renderUnit.scene, z.skeleton, M.worksheet, ge);
+        }, n), Xr = De({ unitId: D, subUnitId: E, drawingId: T }), zr = new $e(Xr, {
+          left: Tn.startX,
+          top: Tn.startY,
+          width: (Pn = n.width) != null ? Pn : $.width,
+          height: (An = n.height) != null ? An : $.height,
+          zIndex: this._drawingManagerService.getDrawingOrder(D, E).length - 1
+        }), Kr = fe(zr, K.renderUnit.scene, z.skeleton, M.worksheet, me);
         Ne.next(Kr);
       }));
-      const tt = (y = this._renderManagerService.getRenderById(R)) == null ? void 0 : y.with(X);
+      const tt = (y = this._renderManagerService.getRenderById(D)) == null ? void 0 : y.with(X);
       tt == null || tt.currentSkeleton$.subscribe(($) => {
         $ && z.sheetId !== $.sheetId && this._removeDom(m, !0);
       });
-      const Dt = ue.onTransformChange$.subscribeEvent(() => {
-        const $ = me(ue, K.renderUnit.scene, z.skeleton, M.worksheet, ge);
+      const Dt = he.onTransformChange$.subscribeEvent(() => {
+        const $ = fe(he, K.renderUnit.scene, z.skeleton, M.worksheet, me);
         Ne.next(
           $
         );
       });
-      he.add(() => {
+      ge.add(() => {
         this._canvasFloatDomService.removeFloatDom(T);
-      }), Dt && he.add(Dt), this._domLayerInfoMap.set(T, ge);
+      }), Dt && ge.add(Dt), this._domLayerInfoMap.set(T, me);
     }
     return {
       id: m,
@@ -2428,7 +2442,7 @@ let lt = class extends ee {
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   addFloatDomToColumnHeader(t, e, n, r) {
-    var D, v, C;
+    var R, v, C;
     const s = se(this._univerInstanceService, {
       unitId: e.unitId,
       subUnitId: e.subUnitId
@@ -2439,15 +2453,15 @@ let lt = class extends ee {
     if (!this._getSceneAndTransformerByDrawingSearch(o)) return;
     const u = this._renderManagerService.getRenderById(o);
     if (!u) return;
-    const c = (D = this._renderManagerService.getRenderById(o)) == null ? void 0 : D.with(X).getWorksheetSkeleton(a);
+    const c = (R = this._renderManagerService.getRenderById(o)) == null ? void 0 : R.with(X).getWorksheetSkeleton(a);
     if (!c) return;
-    const { componentKey: l, data: g, allowTransform: h = !0 } = e, m = r != null ? r : He(), { position: f, position$: p } = this._createRangePositionObserver({
+    const { componentKey: l, data: g, allowTransform: h = !0 } = e, m = r != null ? r : He(), { position: p, position$: f } = this._createRangePositionObserver({
       startRow: 0,
       endRow: 0,
       startColumn: t,
       endColumn: t
-    }, u, c.skeleton), w = f;
-    if (w.startY = 0, this._getPosition(f, o) == null)
+    }, u, c.skeleton), w = p;
+    if (w.startY = 0, this._getPosition(p, o) == null)
       return;
     const I = {
       unitId: o,
@@ -2465,25 +2479,25 @@ let lt = class extends ee {
       allowTransform: h
     };
     {
-      const { unitId: _, subUnitId: y, drawingId: R } = I, E = se(this._univerInstanceService, { unitId: _, subUnitId: y }), T = I, M = this._univerInstanceService.getUnit(_, k.UNIVER_SHEET);
+      const { unitId: S, subUnitId: y, drawingId: D } = I, E = se(this._univerInstanceService, { unitId: S, subUnitId: y }), T = I, M = this._univerInstanceService.getUnit(S, k.UNIVER_SHEET);
       if (!M)
         return;
       const b = M.getActiveSheet().getSheetId();
       if (!T || !E)
         return;
-      const N = (v = this._renderManagerService.getRenderById(_)) == null ? void 0 : v.with(X);
+      const N = (v = this._renderManagerService.getRenderById(S)) == null ? void 0 : v.with(X);
       if (!N)
         return;
       const F = N.getWorksheetSkeleton(y);
       if (!F)
         return;
-      const { transform: te, data: z } = T, V = this._getSceneAndTransformerByDrawingSearch(_);
+      const { transform: ne, data: z } = T, V = this._getSceneAndTransformerByDrawingSearch(S);
       if (V == null)
         return;
       const { scene: Y, canvas: Z } = V;
-      if (te == null || b !== y)
+      if (ne == null || b !== y)
         return;
-      const { left: K, top: W, width: Oe, height: ft, angle: pt, flipX: wt, flipY: _t, skewX: Jt, skewY: Zt } = te, St = De({ unitId: _, subUnitId: y, drawingId: R }), vt = Y.getObject(St);
+      const { left: K, top: W, width: Oe, height: ft, angle: pt, flipX: wt, flipY: _t, skewX: Jt, skewY: Zt } = ne, St = De({ unitId: S, subUnitId: y, drawingId: D }), vt = Y.getObject(St);
       if (vt != null) {
         vt.transformByState({ left: K, top: W, width: Oe, height: ft, angle: pt, flipX: wt, flipY: _t, skewX: Jt, skewY: Zt });
         return;
@@ -2491,43 +2505,43 @@ let lt = class extends ee {
       const Ue = Ut({
         startX: w.startX,
         startY: 0,
-        endX: f.endX,
-        endY: f.endY,
+        endX: p.endX,
+        endY: p.endY,
         width: n.width,
         height: n.height,
         absolute: {
-          left: f.absolute.left,
-          top: f.absolute.top
+          left: p.absolute.left,
+          top: p.absolute.top
         }
       }, n), It = {
         left: Ue.startX,
         top: Ue.startY,
         width: Ue.width,
         height: Ue.height,
-        zIndex: this._drawingManagerService.getDrawingOrder(_, y).length - 1
-      }, le = new $e(St, It);
-      Y.addObject(le, qt), T.allowTransform !== !1 && Y.attachTransformerTo(le);
-      const ne = new yt(), Pe = Y.getMainViewport(), ue = {
+        zIndex: this._drawingManagerService.getDrawingOrder(S, y).length - 1
+      }, ue = new $e(St, It);
+      Y.addObject(ue, qt), T.allowTransform !== !1 && Y.attachTransformerTo(ue);
+      const re = new yt(), Pe = Y.getMainViewport(), he = {
         top: 0,
         //viewMain.top,
         left: Pe.left,
         bottom: Pe.bottom,
         right: Pe.right
-      }, he = {
-        dispose: ne,
-        rect: le,
+      }, ge = {
+        dispose: re,
+        rect: ue,
         // position$,
-        unitId: _,
+        unitId: S,
         subUnitId: y,
-        boundsOfViewArea: ue,
+        boundsOfViewArea: he,
         domAnchor: n,
         scrollDirectionResponse: "HORIZONTAL"
         /* HORIZONTAL */
-      }, Ct = me(le, V.renderUnit.scene, F.skeleton, E.worksheet, he), Ae = new je(Ct);
-      he.position$ = Ae;
+      }, Ct = fe(ue, V.renderUnit.scene, F.skeleton, E.worksheet, ge), Ae = new je(Ct);
+      ge.position$ = Ae;
       let Qe = {
         position$: Ae,
-        id: R,
+        id: D,
         componentKey: T.componentKey,
         onPointerDown: () => {
         },
@@ -2539,7 +2553,7 @@ let lt = class extends ee {
           Z.dispatchEvent(new WheelEvent(B.type, B));
         },
         data: z,
-        unitId: _
+        unitId: S
       };
       e.eventPassThrough && (Qe = {
         ...Qe,
@@ -2553,13 +2567,13 @@ let lt = class extends ee {
           Z.dispatchEvent(new PointerEvent(B.type, B));
         }
       }), this._canvasFloatDomService.addFloatDom(Qe);
-      const Rt = le.onTransformChange$.subscribeEvent(() => {
-        const B = me(le, V.renderUnit.scene, F.skeleton, E.worksheet, he);
+      const Rt = ue.onTransformChange$.subscribeEvent(() => {
+        const B = fe(ue, V.renderUnit.scene, F.skeleton, E.worksheet, ge);
         Ae.next(
           B
         );
       });
-      this.disposeWithMe(p.subscribe((B) => {
+      this.disposeWithMe(f.subscribe((B) => {
         const Ne = Ut({
           startX: B.startX,
           startY: 0,
@@ -2568,24 +2582,24 @@ let lt = class extends ee {
           width: n.width,
           height: n.height,
           absolute: {
-            left: f.absolute.left,
-            top: f.absolute.top
+            left: p.absolute.left,
+            top: p.absolute.top
           }
-        }, n), et = De({ unitId: _, subUnitId: y, drawingId: R }), tt = new $e(et, {
+        }, n), et = De({ unitId: S, subUnitId: y, drawingId: D }), tt = new $e(et, {
           left: Ne.startX,
           top: 0,
           width: n.width,
           height: n.height,
-          zIndex: this._drawingManagerService.getDrawingOrder(_, y).length - 1
-        }), Dt = me(tt, V.renderUnit.scene, F.skeleton, E.worksheet, he);
+          zIndex: this._drawingManagerService.getDrawingOrder(S, y).length - 1
+        }), Dt = fe(tt, V.renderUnit.scene, F.skeleton, E.worksheet, ge);
         Ae.next(Dt);
       }));
-      const ge = (C = this._renderManagerService.getRenderById(_)) == null ? void 0 : C.with(X);
-      ge == null || ge.currentSkeleton$.subscribe((B) => {
+      const me = (C = this._renderManagerService.getRenderById(S)) == null ? void 0 : C.with(X);
+      me == null || me.currentSkeleton$.subscribe((B) => {
         B && c.sheetId !== B.sheetId && this._removeDom(m, !0);
-      }), ne.add(() => {
-        this._canvasFloatDomService.removeFloatDom(R);
-      }), Rt && ne.add(Rt), this._domLayerInfoMap.set(R, he);
+      }), re.add(() => {
+        this._canvasFloatDomService.removeFloatDom(D);
+      }), Rt && re.add(Rt), this._domLayerInfoMap.set(D, ge);
     }
     return {
       id: m,
@@ -2608,18 +2622,18 @@ let lt = class extends ee {
   _createRangePositionObserver(t, e, n) {
     let { startRow: r, startColumn: s } = t;
     const o = st(r, s, n), a = new je(o), d = st(t.endRow, t.endColumn, n), u = new je(d), c = () => {
-      const p = st(r, s, n), w = st(t.endRow, t.endColumn, n);
-      a.next(p), u.next(w);
+      const f = st(r, s, n), w = st(t.endRow, t.endColumn, n);
+      a.next(f), u.next(w);
     }, l = new yt();
-    l.add(e.engine.clientRect$.subscribe(() => c())), l.add(this._commandService.onCommandExecuted((p) => {
-      if (p.id === gr.id && p.params.rowsAutoHeightInfo.findIndex((S) => S.row === r) > -1) {
+    l.add(e.engine.clientRect$.subscribe(() => c())), l.add(this._commandService.onCommandExecuted((f) => {
+      if (f.id === gr.id && f.params.rowsAutoHeightInfo.findIndex((_) => _.row === r) > -1) {
         c();
         return;
       }
-      (Bi.indexOf(p.id) > -1 || p.id === di.id || p.id === $n.id) && c();
+      (ji.indexOf(f.id) > -1 || f.id === di.id || f.id === xn.id) && c();
     }));
-    const g = (p, w) => {
-      r = p, s = w, c();
+    const g = (f, w) => {
+      r = f, s = w, c();
     }, h = () => ({
       rotate: 0,
       width: d.right - o.left,
@@ -2633,26 +2647,26 @@ let lt = class extends ee {
       endX: d.right,
       endY: d.bottom
     }), m = a.pipe(
-      pe((p) => {
+      we((f) => {
         const w = st(t.endRow, t.endColumn, n);
         return {
           rotate: 0,
-          width: w.right - p.left,
-          height: w.bottom - p.top,
+          width: w.right - f.left,
+          height: w.bottom - f.top,
           absolute: {
             left: !0,
             top: !0
           },
-          startX: p.left,
-          startY: p.top,
+          startX: f.left,
+          startY: f.top,
           endX: w.right,
           endY: w.bottom
         };
       })
-    ), f = h();
+    ), p = h();
     return {
       position$: m,
-      position: f,
+      position: p,
       updateRowCol: g,
       topLeftPos$: a,
       rightBottomPos$: u,
@@ -2660,14 +2674,14 @@ let lt = class extends ee {
     };
   }
 };
-lt = no([
-  be(0, A(Q)),
-  be(1, de),
+lt = ro([
+  be(0, A(ee)),
+  be(1, le),
   be(2, A(G)),
   be(3, ae),
-  be(4, A(ds)),
+  be(4, A(ls)),
   be(5, oe),
-  be(6, A(vi))
+  be(6, A(Ii))
 ], lt);
 function st(i, t, e) {
   const n = e.getCellWithCoordByIndex(i, t), r = n.isMergedMainCell ? n.mergeInfo : n;
@@ -2715,7 +2729,7 @@ function Pt(i, t) {
   const e = Number.parseFloat(i);
   return t * e / 100;
 }
-const io = (i) => {
+const so = (i) => {
   const { floatDomInfos: t, scene: e, skeleton: n, worksheet: r } = i, s = Fe(() => t.map((o) => {
     const { width: a, height: d, angle: u, left: c, top: l } = o.transform, g = Vr(
       {
@@ -2729,7 +2743,7 @@ const io = (i) => {
       r,
       void 0,
       !0
-    ), { scaleX: h, scaleY: m } = e.getAncestorScale(), f = {
+    ), { scaleX: h, scaleY: m } = e.getAncestorScale(), p = {
       startX: g.left,
       endX: g.right,
       startY: g.top,
@@ -2738,9 +2752,9 @@ const io = (i) => {
       width: a * h,
       height: d * m,
       absolute: g.absolute
-    }, p = {
-      position$: new je(f),
-      position: f,
+    }, f = {
+      position$: new je(p),
+      position: p,
       id: o.drawingId,
       componentKey: o.componentKey,
       onPointerMove: () => {
@@ -2754,16 +2768,16 @@ const io = (i) => {
       unitId: o.unitId,
       data: o.data
     };
-    return [o.drawingId, p];
+    return [o.drawingId, f];
   }), [t, e, n, r]);
-  return /* @__PURE__ */ L("div", { style: { position: "absolute", top: 0, left: 0 }, children: s.map(([o, a]) => /* @__PURE__ */ L(ls, { layer: a, id: o, position: a.position }, o)) });
+  return /* @__PURE__ */ L("div", { style: { position: "absolute", top: 0, left: 0 }, children: s.map(([o, a]) => /* @__PURE__ */ L(us, { layer: a, id: o, position: a.position }, o)) });
 };
-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--)
+var oo = Object.getOwnPropertyDescriptor, ao = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? oo(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, Me = (i, t) => (e, n) => t(e, n, i);
-let jt = class extends ee {
+let jt = class extends te {
   constructor(i, t, e, n, r, s, o) {
     super(), this._sheetPrintInterceptorService = i, this._drawingRenderService = t, this._drawingManagerService = e, this._renderManagerService = n, this._canvasFloatDomManagerService = r, this._componetManager = s, this._injector = o, this._initPrinting(), this._initPrintingDom();
   }
@@ -2798,8 +2812,8 @@ let jt = class extends ee {
             const { scaleX: u, scaleY: c } = s.scene, l = i ? { ...i } : { startColumn: 0, endColumn: 0, endRow: 0, startRow: 0 }, g = d.order.map((h) => d.data[h]);
             return g.length ? (g.forEach((h) => {
               if (!h.groupId && h.transform && Ge.isDefine(h.transform.left) && Ge.isDefine(h.transform.top) && Ge.isDefine(h.transform.width) && Ge.isDefine(h.transform.height)) {
-                const m = o.skeleton.getCellIndexByOffset(h.transform.left, h.transform.top, u, c, { x: 0, y: 0 }), f = o.skeleton.getCellIndexByOffset(h.transform.left + h.transform.width, h.transform.top + h.transform.height, u, c, { x: 0, y: 0 });
-                m.column < l.startColumn && (l.startColumn = m.column), m.row < l.startRow && (l.startRow = m.row), l.endRow < f.row && (l.endRow = f.row), l.endColumn < f.column && (l.endColumn = f.column);
+                const m = o.skeleton.getCellIndexByOffset(h.transform.left, h.transform.top, u, c, { x: 0, y: 0 }), p = o.skeleton.getCellIndexByOffset(h.transform.left + h.transform.width, h.transform.top + h.transform.height, u, c, { x: 0, y: 0 });
+                m.column < l.startColumn && (l.startColumn = m.column), m.row < l.startRow && (l.startRow = m.row), l.endRow < p.row && (l.endRow = p.row), l.endColumn < p.column && (l.endColumn = p.column);
               }
             }), e(l)) : e(i);
           }
@@ -2820,7 +2834,7 @@ let jt = class extends ee {
                 if (c.drawingType === x.DRAWING_CHART)
                   return {
                     ...c,
-                    componentKey: this._componetManager.get(Ri)
+                    componentKey: this._componetManager.get(Di)
                   };
                 if (c.drawingType === x.DRAWING_DOM) {
                   const l = this._sheetPrintInterceptorService.getPrintComponent(c.componentKey);
@@ -2830,12 +2844,12 @@ let jt = class extends ee {
                   };
                 }
                 return null;
-              }).filter(Boolean), d = us(io, this._injector);
-              return Ki(
+              }).filter(Boolean), d = hs(so, this._injector);
+              return Ji(
                 /* @__PURE__ */ L(d, { floatDomInfos: a, scene: t.scene, skeleton: t.skeleton, worksheet: t.worksheet }),
                 t.root
               ), i == null || i.add(() => {
-                Ji(t.root);
+                Zi(t.root);
               }), e(i);
             }
           }
@@ -2844,21 +2858,21 @@ let jt = class extends ee {
     );
   }
 };
-jt = oo([
+jt = ao([
   Me(0, A(li)),
   Me(1, A(Ar)),
   Me(2, ae),
-  Me(3, Q),
+  Me(3, ee),
   Me(4, A(lt)),
   Me(5, A(Pr)),
   Me(6, A(qe))
 ], jt);
-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--)
+var co = Object.getOwnPropertyDescriptor, lo = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? co(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, _e = (i, t) => (e, n) => t(e, n, i);
-const lo = [
+}, Se = (i, t) => (e, n) => t(e, n, i);
+const uo = [
   mr.id,
   fr.id,
   pr.id,
@@ -2867,8 +2881,8 @@ const lo = [
   Sr.id,
   vr.id,
   Ir.id,
-  fn.id,
   pn.id,
+  wn.id,
   Cr.id,
   Rr.id,
   Dr.id,
@@ -2878,17 +2892,17 @@ const lo = [
   Er.id,
   Tr.id,
   Or.id
-], uo = [
-  ji.id,
+], ho = [
   Fi.id,
   Li.id,
   Hi.id,
   Vi.id,
-  gr.id,
   Gi.id,
-  Yi.id
+  gr.id,
+  Yi.id,
+  Xi.id
 ];
-let Rn = class extends ee {
+let Dn = class extends te {
   constructor(i, t, e, n, r, s, o, a, d) {
     super(), this._context = i, this._renderManagerService = t, this._commandService = e, this._selectionRenderService = n, this._skeletonManagerService = r, this._sheetInterceptorService = s, this._sheetDrawingService = o, this._drawingManagerService = a, this._univerInstanceService = d, this._sheetInterceptorListener(), this._commandListener(), this._sheetRefreshListener();
   }
@@ -2897,7 +2911,7 @@ let Rn = class extends ee {
       this._sheetInterceptorService.interceptAfterCommand({
         /* eslint-disable-next-line complexity */
         getMutations: (i) => {
-          if (!lo.includes(i.id))
+          if (!uo.includes(i.id))
             return { redos: [], undos: [] };
           if (i.params == null)
             return { redos: [], undos: [] };
@@ -2946,8 +2960,8 @@ let Rn = class extends ee {
           } else if (t === Mr.id || t === yr.id) {
             const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e;
             return this._getDrawingUndoForColVisible(n, r, s);
-          } else if (t === fn.id || t === pn.id || t === Cr.id || t === Rr.id) {
-            const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e, o = t === fn.id || t === pn.id;
+          } else if (t === pn.id || t === wn.id || t === Cr.id || t === Rr.id) {
+            const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e, o = t === pn.id || t === wn.id;
             return this._getDrawingUndoForRowAndColSize(n, r, s, o);
           }
           return { redos: [], undos: [] };
@@ -2979,38 +2993,38 @@ let Rn = class extends ee {
     };
   }
   _getUpdateOrDeleteDrawings(i, t, e) {
-    const n = [], r = [], { sheetTransform: s, anchorType: o = O.Position, transform: a, unitId: d, subUnitId: u, drawingId: c } = e, { from: l, to: g } = s, { row: h, column: m } = l, { row: f, column: p } = g;
+    const n = [], r = [], { sheetTransform: s, anchorType: o = O.Position, transform: a, unitId: d, subUnitId: u, drawingId: c } = e, { from: l, to: g } = s, { row: h, column: m } = l, { row: p, column: f } = g;
     if (s == null || a == null)
       return {
         updateDrawings: n,
         deleteDrawings: r
       };
-    const { startRow: w, endRow: S, startColumn: I, endColumn: D } = i;
+    const { startRow: w, endRow: _, startColumn: I, endColumn: R } = i;
     let v = null, C = null;
-    if (t === 0 && h >= w && f <= S)
-      if (m >= I && p <= D)
+    if (t === 0 && h >= w && p <= _)
+      if (m >= I && f <= R)
         r.push({ unitId: d, subUnitId: u, drawingId: c });
       else {
-        const _ = this._shrinkCol(s, a, I, D, o);
-        v = _ == null ? void 0 : _.newSheetTransform, C = _ == null ? void 0 : _.newTransform;
+        const S = this._shrinkCol(s, a, I, R, o);
+        v = S == null ? void 0 : S.newSheetTransform, C = S == null ? void 0 : S.newTransform;
       }
-    else if (t === 1 && m >= I && p <= D)
-      if (h >= w && f <= S)
+    else if (t === 1 && m >= I && f <= R)
+      if (h >= w && p <= _)
         r.push({ unitId: d, subUnitId: u, drawingId: c });
       else {
-        const _ = this._shrinkRow(s, a, w, S, o);
-        v = _ == null ? void 0 : _.newSheetTransform, C = _ == null ? void 0 : _.newTransform;
+        const S = this._shrinkRow(s, a, w, _, o);
+        v = S == null ? void 0 : S.newSheetTransform, C = S == null ? void 0 : S.newTransform;
       }
     else if (t === 2) {
-      const _ = this._expandRow(s, a, w, S, o);
-      v = _ == null ? void 0 : _.newSheetTransform, C = _ == null ? void 0 : _.newTransform;
+      const S = this._expandRow(s, a, w, _, o);
+      v = S == null ? void 0 : S.newSheetTransform, C = S == null ? void 0 : S.newTransform;
     } else if (t === 3) {
-      const _ = this._expandCol(s, a, I, D, o);
-      v = _ == null ? void 0 : _.newSheetTransform, C = _ == null ? void 0 : _.newTransform;
+      const S = this._expandCol(s, a, I, R, o);
+      v = S == null ? void 0 : S.newSheetTransform, C = S == null ? void 0 : S.newTransform;
     }
     if (v != null && C != null) {
-      const _ = J(v, this._selectionRenderService, this._skeletonManagerService);
-      n.push({ ...e, sheetTransform: v, transform: _ });
+      const S = J(v, this._selectionRenderService, this._skeletonManagerService);
+      n.push({ ...e, sheetTransform: v, transform: S });
     }
     return { updateDrawings: n, deleteDrawings: r };
   }
@@ -3029,15 +3043,15 @@ let Rn = class extends ee {
       if (m === O.None)
         this._remainDrawingSize(h, r, l);
       else {
-        const { from: f, to: p } = g, { row: w, column: S } = f, { row: I, column: D } = p;
+        const { from: p, to: f } = g, { row: w, column: _ } = p, { row: I, column: R } = f;
         for (let v = 0; v < e.length; v++) {
-          const C = e[v], { startRow: _, endRow: y, startColumn: R, endColumn: E } = C;
-          if (D < R)
+          const C = e[v], { startRow: S, endRow: y, startColumn: D, endColumn: E } = C;
+          if (R < D)
             continue;
           if (m === O.Position) {
             let b = null, N = null;
-            if (S >= R && S <= E) {
-              const F = this._skeletonManagerService.attachRangeWithCoord({ startColumn: S, endColumn: E, startRow: f.row, endRow: p.row });
+            if (_ >= D && _ <= E) {
+              const F = this._skeletonManagerService.attachRangeWithCoord({ startColumn: _, endColumn: E, startRow: p.row, endRow: f.row });
               if (F == null)
                 return;
               N = { ...h, left: F.startX };
@@ -3049,11 +3063,11 @@ let Rn = class extends ee {
             this._remainDrawingSize(h, r, l);
             continue;
           }
-          if (S >= R && D <= E)
+          if (_ >= D && R <= E)
             continue;
           let T = null, M = null;
-          if (S >= R && S <= E) {
-            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: S, endColumn: E, startRow: f.row, endRow: p.row });
+          if (_ >= D && _ <= E) {
+            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: _, endColumn: E, startRow: p.row, endRow: f.row });
             if (b == null)
               return;
             M = {
@@ -3061,8 +3075,8 @@ let Rn = class extends ee {
               left: (b == null ? void 0 : b.startX) || 0,
               width: ((h == null ? void 0 : h.width) || 0) - b.endX + b.startX
             };
-          } else if (D >= R && D <= E) {
-            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: R, endColumn: D, startRow: f.row, endRow: p.row });
+          } else if (R >= D && R <= E) {
+            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: D, endColumn: R, startRow: p.row, endRow: f.row });
             if (b == null)
               return;
             M = {
@@ -3070,7 +3084,7 @@ let Rn = class extends ee {
               left: b.startX - ((h == null ? void 0 : h.width) || 0)
             };
           } else {
-            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: R, endColumn: E, startRow: f.row, endRow: p.row });
+            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: D, endColumn: E, startRow: p.row, endRow: f.row });
             if (b == null)
               return;
             if (M = {
@@ -3123,15 +3137,15 @@ let Rn = class extends ee {
       if (m === O.None)
         this._remainDrawingSize(h, r, l);
       else {
-        const { from: f, to: p } = g, { row: w, column: S } = f, { row: I, column: D } = p;
+        const { from: p, to: f } = g, { row: w, column: _ } = p, { row: I, column: R } = f;
         for (let v = 0; v < e.length; v++) {
-          const C = e[v], { startRow: _, endRow: y, startColumn: R, endColumn: E } = C;
-          if (I < _)
+          const C = e[v], { startRow: S, endRow: y, startColumn: D, endColumn: E } = C;
+          if (I < S)
             continue;
           if (m === O.Position) {
             let b = null, N = null;
-            if (w >= _ && w <= y) {
-              const F = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: w, endRow: y });
+            if (w >= S && w <= y) {
+              const F = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: f.column, startRow: w, endRow: y });
               if (F == null)
                 return;
               N = { ...h, top: F.startY };
@@ -3143,11 +3157,11 @@ let Rn = class extends ee {
             this._remainDrawingSize(h, r, l);
             continue;
           }
-          if (w >= _ && I <= y)
+          if (w >= S && I <= y)
             continue;
           let T = null, M = null;
-          if (w >= _ && w <= y) {
-            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: w, endRow: y });
+          if (w >= S && w <= y) {
+            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: f.column, startRow: w, endRow: y });
             if (b == null)
               return;
             M = {
@@ -3155,8 +3169,8 @@ let Rn = class extends ee {
               top: (b == null ? void 0 : b.startY) || 0,
               height: ((h == null ? void 0 : h.height) || 0) - b.endY + b.startY
             };
-          } else if (I >= _ && I <= y) {
-            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: _, endRow: I });
+          } else if (I >= S && I <= y) {
+            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: f.column, startRow: S, endRow: I });
             if (b == null)
               return;
             M = {
@@ -3164,7 +3178,7 @@ let Rn = class extends ee {
               top: b.startY - ((h == null ? void 0 : h.height) || 0)
             };
           } else {
-            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: f.column, endColumn: p.column, startRow: _, endRow: y });
+            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: f.column, startRow: S, endRow: y });
             if (b == null)
               return;
             if (M = {
@@ -3203,20 +3217,20 @@ let Rn = class extends ee {
       if (c === O.None)
         this._remainDrawingSize(u, s, a);
       else {
-        const { from: l, to: g } = d, { row: h, column: m } = l, { row: f, column: p } = g;
+        const { from: l, to: g } = d, { row: h, column: m } = l, { row: p, column: f } = g;
         for (let w = 0; w < e.length; w++) {
-          const S = e[w], { startRow: I, endRow: D, startColumn: v, endColumn: C } = S;
-          if (f < I || p < v)
+          const _ = e[w], { startRow: I, endRow: R, startColumn: v, endColumn: C } = _;
+          if (p < I || f < v)
             continue;
-          if (c === O.Position && (h <= I && f >= D || m <= v && p >= C)) {
+          if (c === O.Position && (h <= I && p >= R || m <= v && f >= C)) {
             this._remainDrawingSize(u, s, a);
             continue;
           }
-          const _ = J({ ...d }, this._selectionRenderService, this._skeletonManagerService);
-          if (_ != null) {
+          const S = J({ ...d }, this._selectionRenderService, this._skeletonManagerService);
+          if (S != null) {
             s.push({
               ...a,
-              transform: _
+              transform: S
             });
             break;
           }
@@ -3237,11 +3251,11 @@ let Rn = class extends ee {
     return { unitId: e, subUnitId: n };
   }
   _moveRangeInterceptor(i) {
-    var I, D;
+    var I, R;
     const { toRange: t, fromRange: e } = i, n = se(this._univerInstanceService);
     if (!n)
       return { redos: [], undos: [] };
-    const { unitId: r, subUnitId: s } = n, o = (D = (I = this._renderManagerService.getRenderById(r)) == null ? void 0 : I.with(X)) == null ? void 0 : D.getCurrentSkeleton();
+    const { unitId: r, subUnitId: s } = n, o = (R = (I = this._renderManagerService.getRenderById(r)) == null ? void 0 : I.with(X)) == null ? void 0 : R.getCurrentSkeleton();
     if (!o)
       return { redos: [], undos: [] };
     const a = dr(o, e);
@@ -3252,35 +3266,35 @@ let Rn = class extends ee {
       const C = g[v];
       if (C.anchorType !== O.Both)
         return;
-      const { transform: _ } = C;
-      if (!_)
+      const { transform: S } = C;
+      if (!S)
         return;
-      const { left: y = 0, top: R = 0, width: E = 0, height: T = 0 } = _, { drawingStartX: M, drawingEndX: b, drawingStartY: N, drawingEndY: F } = {
+      const { left: y = 0, top: D = 0, width: E = 0, height: T = 0 } = S, { drawingStartX: M, drawingEndX: b, drawingStartY: N, drawingEndY: F } = {
         drawingStartX: y,
         drawingEndX: y + E,
-        drawingStartY: R,
-        drawingEndY: R + T
+        drawingStartY: D,
+        drawingEndY: D + T
       };
       d <= M && b <= u && c <= N && F <= l && h.push(C);
     });
-    const m = [], f = [], p = t.startRow - e.startRow, w = t.startColumn - e.startColumn, S = h.map((v) => {
-      const C = v.sheetTransform, _ = {
-        to: { ...C.to, row: C.to.row + p, column: C.to.column + w },
-        from: { ...C.from, row: C.from.row + p, column: C.from.column + w }
-      }, y = J(_, this._selectionRenderService, this._skeletonManagerService);
+    const m = [], p = [], f = t.startRow - e.startRow, w = t.startColumn - e.startColumn, _ = h.map((v) => {
+      const C = v.sheetTransform, S = {
+        to: { ...C.to, row: C.to.row + f, column: C.to.column + w },
+        from: { ...C.from, row: C.from.row + f, column: C.from.column + w }
+      }, y = J(S, this._selectionRenderService, this._skeletonManagerService);
       return {
         unitId: r,
         subUnitId: s,
         drawingId: v.drawingId,
         transform: y,
-        sheetTransform: _
+        sheetTransform: S
       };
     });
-    if (S.length) {
-      const v = this._sheetDrawingService.getBatchUpdateOp(S), { undo: C, redo: _, objects: y } = v;
-      m.push({ id: P.id, params: { unitId: r, subUnitId: s, op: _, objects: y, type: U.UPDATE } }), f.push({ id: P.id, params: { unitId: r, subUnitId: s, op: C, objects: y, type: U.UPDATE } });
+    if (_.length) {
+      const v = this._sheetDrawingService.getBatchUpdateOp(_), { undo: C, redo: S, objects: y } = v;
+      m.push({ id: P.id, params: { unitId: r, subUnitId: s, op: S, objects: y, type: U.UPDATE } }), p.push({ id: P.id, params: { unitId: r, subUnitId: s, op: C, objects: y, type: U.UPDATE } });
     }
-    return { redos: m, undos: f };
+    return { redos: m, undos: p };
   }
   _moveRowInterceptor(i, t) {
     const e = this._getUnitIdAndSubUnitId(i, t);
@@ -3288,35 +3302,35 @@ let Rn = class extends ee {
       return { redos: [], undos: [] };
     const { unitId: n, subUnitId: r } = e, { range: s } = i, o = s.startRow, a = s.endRow, d = [], u = [], c = this._sheetDrawingService.getDrawingData(n, r), l = [], g = [];
     if (Object.keys(c).forEach((h) => {
-      const m = c[h], { sheetTransform: f, transform: p, anchorType: w = O.Position } = m;
-      if (f == null || p == null)
+      const m = c[h], { sheetTransform: p, transform: f, anchorType: w = O.Position } = m;
+      if (p == null || f == null)
         return;
-      let S, I;
+      let _, I;
       if (t === "insert") {
-        const v = this._expandRow(f, p, o, a, w);
-        S = v == null ? void 0 : v.newSheetTransform, I = v == null ? void 0 : v.newTransform;
+        const v = this._expandRow(p, f, o, a, w);
+        _ = v == null ? void 0 : v.newSheetTransform, I = v == null ? void 0 : v.newTransform;
       } else {
-        const { from: v, to: C } = f, { row: _ } = v, { row: y } = C;
-        if (w === O.Both && _ >= o && y <= a)
+        const { from: v, to: C } = p, { row: S } = v, { row: y } = C;
+        if (w === O.Both && S >= o && y <= a)
           g.push({ unitId: n, subUnitId: r, drawingId: h });
         else {
-          const R = this._shrinkRow(f, p, o, a, w);
-          S = R == null ? void 0 : R.newSheetTransform, I = R == null ? void 0 : R.newTransform;
+          const D = this._shrinkRow(p, f, o, a, w);
+          _ = D == null ? void 0 : D.newSheetTransform, I = D == null ? void 0 : D.newTransform;
         }
       }
-      if (!S || !I)
+      if (!_ || !I)
         return;
-      const D = { unitId: n, subUnitId: r, drawingId: h, transform: I, sheetTransform: S };
-      l.push(D);
+      const R = { unitId: n, subUnitId: r, drawingId: h, transform: I, sheetTransform: _ };
+      l.push(R);
     }), 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;
-      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: p, type: U.UPDATE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: m, objects: p, type: U.UPDATE } });
+      const h = this._sheetDrawingService.getBatchUpdateOp(l), { undo: m, redo: p, objects: f } = h;
+      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: f, type: U.UPDATE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: m, objects: f, type: U.UPDATE } });
     }
     if (g.length > 0) {
-      const h = this._sheetDrawingService.getBatchRemoveOp(g), m = h.undo, f = h.redo, p = h.objects;
-      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: p, type: U.REMOVE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: m, objects: p, type: U.INSERT } });
+      const h = this._sheetDrawingService.getBatchRemoveOp(g), m = h.undo, p = h.redo, f = h.objects;
+      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: f, type: U.REMOVE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: m, objects: f, type: U.INSERT } });
     }
     return d.push({ id: H.id, params: [n] }), u.push({ id: H.id, params: [n] }), {
       redos: d,
@@ -3329,35 +3343,35 @@ let Rn = class extends ee {
       return { redos: [], undos: [] };
     const { unitId: n, subUnitId: r } = e, { range: s } = i, o = s.startColumn, a = s.endColumn, d = [], u = [], c = this._sheetDrawingService.getDrawingData(n, r), l = [], g = [];
     if (Object.keys(c).forEach((h) => {
-      const m = c[h], { sheetTransform: f, transform: p, anchorType: w = O.Position } = m;
-      if (f == null || p == null)
+      const m = c[h], { sheetTransform: p, transform: f, anchorType: w = O.Position } = m;
+      if (p == null || f == null)
         return;
-      let S, I;
+      let _, I;
       if (t === "insert") {
-        const v = this._expandCol(f, p, o, a, w);
-        S = v == null ? void 0 : v.newSheetTransform, I = v == null ? void 0 : v.newTransform;
+        const v = this._expandCol(p, f, o, a, w);
+        _ = v == null ? void 0 : v.newSheetTransform, I = v == null ? void 0 : v.newTransform;
       } else {
-        const { from: v, to: C } = f, { column: _ } = v, { column: y } = C;
-        if (w === O.Both && _ >= o && y <= a)
+        const { from: v, to: C } = p, { column: S } = v, { column: y } = C;
+        if (w === O.Both && S >= o && y <= a)
           g.push({ unitId: n, subUnitId: r, drawingId: h });
         else {
-          const R = this._shrinkCol(f, p, o, a, w);
-          S = R == null ? void 0 : R.newSheetTransform, I = R == null ? void 0 : R.newTransform;
+          const D = this._shrinkCol(p, f, o, a, w);
+          _ = D == null ? void 0 : D.newSheetTransform, I = D == null ? void 0 : D.newTransform;
         }
       }
-      if (!S || !I)
+      if (!_ || !I)
         return;
-      const D = { unitId: n, subUnitId: r, drawingId: h, transform: I, sheetTransform: S };
-      l.push(D);
+      const R = { unitId: n, subUnitId: r, drawingId: h, transform: I, sheetTransform: _ };
+      l.push(R);
     }), 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;
-      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: p, type: U.UPDATE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: m, objects: p, type: U.UPDATE } });
+      const h = this._sheetDrawingService.getBatchUpdateOp(l), { undo: m, redo: p, objects: f } = h;
+      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: f, type: U.UPDATE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: m, objects: f, type: U.UPDATE } });
     }
     if (g.length > 0) {
-      const h = this._sheetDrawingService.getBatchRemoveOp(g), m = h.undo, f = h.redo, p = h.objects;
-      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: p, type: U.REMOVE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: m, objects: p, type: U.INSERT } });
+      const h = this._sheetDrawingService.getBatchRemoveOp(g), m = h.undo, p = h.redo, f = h.objects;
+      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: f, type: U.REMOVE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: m, objects: f, type: U.INSERT } });
     }
     return d.push({ id: H.id, params: [n] }), u.push({ id: H.id, params: [n] }), { redos: d, undos: u };
   }
@@ -3537,7 +3551,7 @@ let Rn = class extends ee {
       // 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 === Xi.id) {
+        if (i.id === zi.id) {
           const { unitId: t, subUnitId: e } = i.params;
           this._updateDrawings(t, e);
         }
@@ -3588,7 +3602,7 @@ let Rn = class extends ee {
   _sheetRefreshListener() {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((i) => {
-        uo.includes(i.id) && requestIdleCallback(() => {
+        ho.includes(i.id) && requestIdleCallback(() => {
           const t = i.params, e = se(this._univerInstanceService, t);
           if (!e) return;
           const { unitId: n, subUnitId: r, worksheet: s } = e;
@@ -3609,30 +3623,30 @@ let Rn = class extends ee {
       const o = n[s], { sheetTransform: a, transform: d, anchorType: u = O.Position } = o;
       if (u === O.None)
         return !0;
-      const { from: c, to: l } = a, { row: g, column: h } = c, { row: m, column: f } = l;
-      for (let p = 0; p < e.length; p++) {
-        const w = e[p], { startRow: S, endRow: I, startColumn: D, endColumn: v } = w;
-        if (Di.intersects(
+      const { from: c, to: l } = a, { row: g, column: h } = c, { row: m, column: p } = l;
+      for (let f = 0; f < e.length; f++) {
+        const w = e[f], { startRow: _, endRow: I, startColumn: R, endColumn: v } = w;
+        if (bi.intersects(
           {
-            startRow: S,
+            startRow: _,
             endRow: I,
-            startColumn: D,
+            startColumn: R,
             endColumn: v
           },
           {
             startRow: g,
             endRow: m,
             startColumn: h,
-            endColumn: f
+            endColumn: p
           }
         ) || g > I || h > v) {
-          const C = u === O.Position, _ = J(a, this._selectionRenderService, this._skeletonManagerService);
+          const C = u === O.Position, S = J(a, this._selectionRenderService, this._skeletonManagerService);
           r.push({
             ...o,
             transform: {
-              ..._,
-              width: C ? d == null ? void 0 : d.width : _ == null ? void 0 : _.width,
-              height: C ? d == null ? void 0 : d.height : _ == null ? void 0 : _.height
+              ...S,
+              width: C ? d == null ? void 0 : d.width : S == null ? void 0 : S.width,
+              height: C ? d == null ? void 0 : d.height : S == null ? void 0 : S.height
             }
           });
           break;
@@ -3641,41 +3655,41 @@ let Rn = class extends ee {
     }), r.length !== 0 && (this._drawingManagerService.refreshTransform(r), this._commandService.syncExecuteCommand(H.id, [i]));
   }
 };
-Rn = co([
-  _e(1, Q),
-  _e(2, G),
-  _e(3, Je),
-  _e(4, A(X)),
-  _e(5, A(Ht)),
-  _e(6, oe),
-  _e(7, ae),
-  _e(8, de)
-], Rn);
-function ho() {
-  const i = Ie(Te), t = Ie(bn), e = Ie(yn), [n, r] = Ee([ye.CELL_ADDRESS]), [s, o] = Ee(!1), [a, d] = Ee(null), u = Fe(() => e.getCellImagesInSelection(), [e]), c = Fe(() => e.getDataColumns(), [e]), l = Fe(() => e.getSelectionRowRange(), [e]), g = c.length > 0, h = Fe(() => c.map((C) => ({
+Dn = lo([
+  Se(1, ee),
+  Se(2, G),
+  Se(3, Je),
+  Se(4, A(X)),
+  Se(5, A(Ht)),
+  Se(6, oe),
+  Se(7, ae),
+  Se(8, le)
+], Dn);
+function go() {
+  const i = Ce(Te), t = Ce(Mn), e = Ce(En), [n, r] = Ee([ye.CELL_ADDRESS]), [s, o] = Ee(!1), [a, d] = Ee(null), u = Fe(() => e.getCellImagesInSelection(), [e]), c = Fe(() => e.getDataColumns(), [e]), l = Fe(() => e.getSelectionRowRange(), [e]), g = c.length > 0, h = Fe(() => c.map((C) => ({
     label: C.label,
     value: String(C.index)
-  })), [c]), [m, f] = Ee(
+  })), [c]), [m, p] = Ee(
     () => h.length > 0 ? h[0].value : "0"
-  ), p = Fe(() => {
+  ), f = Fe(() => {
     if (!n.includes(ye.COLUMN_VALUE) || !l)
       return [];
-    const _ = Number(m);
+    const S = Number(m);
     return [{
       startRow: l.startRow,
       endRow: l.endRow,
-      startColumn: _,
-      endColumn: _
+      startColumn: S,
+      endColumn: S
     }];
   }, [n, m, l]);
-  ui(p);
+  ui(f);
   const w = Et((C) => {
     C.length !== 0 && r(C);
-  }, []), S = Et((C) => {
-    f(String(C));
+  }, []), _ = Et((C) => {
+    p(String(C));
   }, []), I = Et(() => {
     t.close(ze);
-  }, [t]), D = Et(async () => {
+  }, [t]), R = Et(async () => {
     if (u.length !== 0) {
       o(!0), d(null);
       try {
@@ -3692,16 +3706,16 @@ function ho() {
   }, [e, u, n, m, t, i]), v = n.includes(ye.COLUMN_VALUE);
   return /* @__PURE__ */ Xe("div", { className: "univer-flex univer-flex-col", children: [
     /* @__PURE__ */ L(en, { label: i.t("sheetImage.save.imageCount"), children: /* @__PURE__ */ L("div", { className: "univer-text-sm univer-text-gray-600", children: u.length }) }),
-    /* @__PURE__ */ L(en, { label: i.t("sheetImage.save.fileNameConfig"), children: /* @__PURE__ */ Xe(Zi, { value: n, onChange: w, direction: "vertical", children: [
-      /* @__PURE__ */ L(Gn, { value: ye.CELL_ADDRESS, disabled: !g, children: i.t("sheetImage.save.useRowCol") }),
-      g && /* @__PURE__ */ L(Gn, { value: ye.COLUMN_VALUE, children: i.t("sheetImage.save.useColumnValue") })
+    /* @__PURE__ */ L(en, { label: i.t("sheetImage.save.fileNameConfig"), children: /* @__PURE__ */ Xe(qi, { value: n, onChange: w, direction: "vertical", children: [
+      /* @__PURE__ */ L(Yn, { value: ye.CELL_ADDRESS, disabled: !g, children: i.t("sheetImage.save.useRowCol") }),
+      g && /* @__PURE__ */ L(Yn, { value: ye.COLUMN_VALUE, children: i.t("sheetImage.save.useColumnValue") })
     ] }) }),
     v && /* @__PURE__ */ L(en, { label: i.t("sheetImage.save.selectColumn"), children: /* @__PURE__ */ L(
-      qi,
+      Qi,
       {
         value: m,
         options: h,
-        onChange: S
+        onChange: _
       }
     ) }),
     a && /* @__PURE__ */ L("div", { className: "univer-text-xs univer-text-red-500", children: a }),
@@ -3710,12 +3724,12 @@ function ho() {
       {
         className: "univer-flex univer-justify-end univer-gap-2 univer-border-t univer-border-gray-200 univer-pt-3",
         children: [
-          /* @__PURE__ */ L(Yn, { onClick: I, disabled: s, children: i.t("sheetImage.save.cancel") }),
+          /* @__PURE__ */ L(Xn, { onClick: I, disabled: s, children: i.t("sheetImage.save.cancel") }),
           /* @__PURE__ */ L(
-            Yn,
+            Xn,
             {
               variant: "primary",
-              onClick: D,
+              onClick: R,
               disabled: s || u.length === 0,
               children: s ? i.t("sheetImage.save.saving") : i.t("sheetImage.save.confirm")
             }
@@ -3725,24 +3739,24 @@ function ho() {
     )
   ] });
 }
-const go = (i) => {
-  var S;
-  const t = Ie(G), e = Ie(Te), n = Ie(ae), r = Ie(Q), { drawings: s } = i, o = s[0];
+const mo = (i) => {
+  var _;
+  const t = Ce(G), e = Ce(Te), n = Ce(ae), r = Ce(ee), { drawings: s } = i, o = s[0];
   if (o == null)
     return;
   const { unitId: a } = o, d = r.getRenderById(a), u = d == null ? void 0 : d.scene;
   if (u == null)
     return;
-  const c = u.getTransformerByCreate(), [l, g] = Ee(!0), h = (S = o.anchorType) != null ? S : O.Position, [m, f] = Ee(h);
-  function p(I, D) {
+  const c = u.getTransformerByCreate(), [l, g] = Ee(!0), h = (_ = o.anchorType) != null ? _ : O.Position, [m, p] = Ee(h);
+  function f(I, R) {
     const v = [];
     return I.forEach((C) => {
-      const { oKey: _ } = C, y = D.getDrawingOKey(_);
+      const { oKey: S } = C, y = R.getDrawingOKey(S);
       if (y == null)
         return v.push(null), !0;
-      const { unitId: R, subUnitId: E, drawingId: T, drawingType: M, anchorType: b, sheetTransform: N } = y;
+      const { unitId: D, subUnitId: E, drawingId: T, drawingType: M, anchorType: b, sheetTransform: N } = y;
       v.push({
-        unitId: R,
+        unitId: D,
         subUnitId: E,
         drawingId: T,
         anchorType: b,
@@ -3754,41 +3768,41 @@ const go = (i) => {
   Nr(() => {
     const I = c.clearControl$.subscribe((v) => {
       v === !0 && g(!1);
-    }), D = c.changeStart$.subscribe((v) => {
+    }), R = c.changeStart$.subscribe((v) => {
       var y;
-      const { objects: C } = v, _ = p(C, n);
-      if (_.length === 0)
+      const { objects: C } = v, S = f(C, n);
+      if (S.length === 0)
         g(!1);
-      else if (_.length >= 1) {
+      else if (S.length >= 1) {
         g(!0);
-        const R = ((y = _[0]) == null ? void 0 : y.anchorType) || O.Position;
-        f(R);
+        const D = ((y = S[0]) == null ? void 0 : y.anchorType) || O.Position;
+        p(D);
       }
     });
     return () => {
-      D.unsubscribe(), I.unsubscribe();
+      R.unsubscribe(), I.unsubscribe();
     };
   }, []);
   function w(I) {
-    f(I);
-    const D = n.getFocusDrawings();
-    if (D.length === 0)
+    p(I);
+    const R = n.getFocusDrawings();
+    if (R.length === 0)
       return;
-    const v = D.map((C) => ({
+    const v = R.map((C) => ({
       unitId: C.unitId,
       subUnitId: C.subUnitId,
       drawingId: C.drawingId,
       anchorType: I
     }));
     t.executeCommand(zt.id, {
-      unitId: D[0].unitId,
+      unitId: R[0].unitId,
       drawings: v
     });
   }
   return /* @__PURE__ */ Xe(
     "div",
     {
-      className: Qi("univer-grid univer-gap-2 univer-py-2 univer-text-gray-400", {
+      className: es("univer-grid univer-gap-2 univer-py-2 univer-text-gray-400", {
         "univer-hidden": !l
       }),
       children: [
@@ -3799,7 +3813,7 @@ const go = (i) => {
             children: /* @__PURE__ */ L("div", { children: e.t("drawing-anchor.title") })
           }
         ),
-        /* @__PURE__ */ L("div", { children: /* @__PURE__ */ Xe(es, { value: m, onChange: w, direction: "vertical", children: [
+        /* @__PURE__ */ L("div", { children: /* @__PURE__ */ Xe(ts, { value: m, onChange: w, direction: "vertical", children: [
           /* @__PURE__ */ L(tn, { value: O.Both, children: e.t("drawing-anchor.both") }),
           /* @__PURE__ */ L(tn, { value: O.Position, children: e.t("drawing-anchor.position") }),
           /* @__PURE__ */ L(tn, { value: O.None, children: e.t("drawing-anchor.none") })
@@ -3807,8 +3821,8 @@ const go = (i) => {
       ]
     }
   );
-}, mo = () => {
-  const i = Ie(ae), t = i.getFocusDrawings(), [e, n] = Ee(t);
+}, fo = () => {
+  const i = Ce(ae), t = i.getFocusDrawings(), [e, n] = Ee(t);
   return Nr(() => {
     const r = i.focus$.subscribe((s) => {
       n(s);
@@ -3817,21 +3831,21 @@ const go = (i) => {
       r.unsubscribe();
     };
   }, []), !!(e != null && e.length) && /* @__PURE__ */ Xe("div", { className: "univer-text-sm", children: [
-    /* @__PURE__ */ L(Is, { drawings: e }),
-    /* @__PURE__ */ L(go, { drawings: e })
+    /* @__PURE__ */ L(Cs, { drawings: e }),
+    /* @__PURE__ */ L(mo, { drawings: e })
   ] });
 }, Gr = "sheet.menu.image";
-function fo(i) {
+function po(i) {
   return {
     id: Gr,
     type: Yt.SUBITEMS,
     icon: "AddImageIcon",
     tooltip: "sheetImage.title",
     hidden$: Gt(i, k.UNIVER_SHEET),
-    disabled$: hi(i, { workbookTypes: [gn], worksheetTypes: [mn], rangeTypes: [zi] })
+    disabled$: hi(i, { workbookTypes: [mn], worksheetTypes: [fn], rangeTypes: [Ki] })
   };
 }
-function po(i) {
+function wo(i) {
   return {
     id: Kt.id,
     title: "sheetImage.upload.float",
@@ -3839,53 +3853,53 @@ function po(i) {
     hidden$: Gt(i, k.UNIVER_SHEET)
   };
 }
-function wo(i) {
+function _o(i) {
   return {
-    id: Mn.id,
+    id: yn.id,
     title: "sheetImage.upload.cell",
     type: Yt.BUTTON,
     hidden$: Gt(i, k.UNIVER_SHEET)
   };
 }
-function _o(i) {
+function So(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 So(i, t) {
+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 d = r; d <= s; d++)
     for (let u = o; u <= a; u++) {
       const c = n.getValue(d, u);
-      if (_o(c))
+      if (So(c))
         return !0;
     }
   return !1;
 }
-function vo() {
+function Io() {
   return "showDirectoryPicker" in window;
 }
-function dn(i) {
-  const t = i.get(de), e = i.get(ut), n = at([
+function ln(i) {
+  const t = i.get(le), e = i.get(ut), n = at([
     Gt(i, k.UNIVER_SHEET),
     t.getCurrentTypeOfUnit$(k.UNIVER_SHEET).pipe(
-      fe((r) => r ? e.selectionMoveEnd$.pipe(
-        pe(() => {
-          if (!vo())
+      pe((r) => r ? e.selectionMoveEnd$.pipe(
+        we(() => {
+          if (!Io())
             return !0;
           const s = e.getCurrentSelections();
           if (!s || s.length === 0)
             return !0;
           for (const o of s)
-            if (So(r, o.range))
+            if (vo(r, o.range))
               return !1;
           return !0;
         })
-      ) : wn(!0))
+      ) : _n(!0))
     )
   ]).pipe(
-    pe(([r, s]) => r || s)
+    we(([r, s]) => r || s)
   );
   return {
     id: ct.id,
@@ -3895,18 +3909,18 @@ function dn(i) {
     hidden$: n
   };
 }
-const Io = {
-  [hs.MEDIA]: {
+const Co = {
+  [gs.MEDIA]: {
     [Gr]: {
       order: 0,
-      menuItemFactory: fo,
+      menuItemFactory: po,
       [Kt.id]: {
         order: 0,
-        menuItemFactory: po
+        menuItemFactory: wo
       },
-      [Mn.id]: {
+      [yn.id]: {
         order: 1,
-        menuItemFactory: wo
+        menuItemFactory: _o
       }
     }
   },
@@ -3914,7 +3928,7 @@ const Io = {
     [sn.OTHERS]: {
       [ct.id]: {
         order: 10,
-        menuItemFactory: dn
+        menuItemFactory: ln
       }
     }
   },
@@ -3922,7 +3936,7 @@ const Io = {
     [sn.OTHERS]: {
       [ct.id]: {
         order: 10,
-        menuItemFactory: dn
+        menuItemFactory: ln
       }
     }
   },
@@ -3930,15 +3944,15 @@ const Io = {
     [sn.OTHERS]: {
       [ct.id]: {
         order: 10,
-        menuItemFactory: dn
+        menuItemFactory: ln
       }
     }
   }
 };
 function mt(i) {
-  return i.getContextValue(bi) && !i.getContextValue(Mi) && !i.getContextValue(yi) && !i.getContextValue(Ei) && i.getContextValue(Ye);
+  return i.getContextValue(Mi) && !i.getContextValue(yi) && !i.getContextValue(Ei) && !i.getContextValue(Ti) && i.getContextValue(Ye);
 }
-const Co = {
+const Ro = {
   id: gt.id,
   description: "shortcut.drawing-move-down",
   group: "4_drawing-view",
@@ -3946,9 +3960,9 @@ const Co = {
   priority: 100,
   preconditions: mt,
   staticParameters: {
-    direction: ve.DOWN
+    direction: Ie.DOWN
   }
-}, Ro = {
+}, Do = {
   id: gt.id,
   description: "shortcut.drawing-move-up",
   group: "4_drawing-view",
@@ -3956,9 +3970,9 @@ const Co = {
   priority: 100,
   preconditions: mt,
   staticParameters: {
-    direction: ve.UP
+    direction: Ie.UP
   }
-}, Do = {
+}, bo = {
   id: gt.id,
   description: "shortcut.drawing-move-left",
   group: "4_drawing-view",
@@ -3966,9 +3980,9 @@ const Co = {
   priority: 100,
   preconditions: mt,
   staticParameters: {
-    direction: ve.LEFT
+    direction: Ie.LEFT
   }
-}, bo = {
+}, Mo = {
   id: gt.id,
   description: "shortcut.drawing-move-right",
   group: "4_drawing-view",
@@ -3976,9 +3990,9 @@ const Co = {
   priority: 100,
   preconditions: mt,
   staticParameters: {
-    direction: ve.RIGHT
+    direction: Ie.RIGHT
   }
-}, Mo = {
+}, yo = {
   id: kr.id,
   description: "shortcut.drawing-delete",
   group: "4_drawing-view",
@@ -3987,26 +4001,26 @@ const Co = {
   binding: Ke.DELETE,
   mac: Ke.BACKSPACE
 };
-var yo = Object.getOwnPropertyDescriptor, Eo = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? yo(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;
 }, Be = (i, t) => (e, n) => t(e, n, i);
-let Ft = class extends ee {
+let Ft = class extends te {
   constructor(i, t, e, n, r, s) {
     super(), this._componentManager = i, this._menuManagerService = t, this._commandService = e, this._shortcutService = n, this._drawingManagerService = r, this._sheetsSelectionsService = s, this._init();
   }
   _initCustomComponents() {
     const i = this._componentManager;
-    this.disposeWithMe(i.register(Br, mo)), this.disposeWithMe(i.register(ze, ho));
+    this.disposeWithMe(i.register(Br, fo)), this.disposeWithMe(i.register(ze, go));
   }
   _initMenus() {
-    this._menuManagerService.mergeMenu(Io);
+    this._menuManagerService.mergeMenu(Co);
   }
   _initCommands() {
     [
       Kt,
-      Mn,
+      yn,
       Xt,
       ht,
       zt,
@@ -4024,11 +4038,11 @@ let Ft = class extends ee {
   _initShortcuts() {
     [
       // sheet drawing shortcuts
-      Co,
       Ro,
       Do,
       bo,
-      Mo
+      Mo,
+      yo
     ].forEach((i) => {
       this.disposeWithMe(this._shortcutService.registerShortcut(i));
     });
@@ -4037,32 +4051,32 @@ let Ft = class extends ee {
     this._initCommands(), this._initCustomComponents(), this._initMenus(), this._initShortcuts();
   }
 };
-Ft = Eo([
+Ft = To([
   Be(0, A(Pr)),
-  Be(1, gs),
+  Be(1, ms),
   Be(2, G),
-  Be(3, ms),
+  Be(3, fs),
   Be(4, ae),
   Be(5, A(ut))
 ], Ft);
-var To = Object.defineProperty, Oo = Object.getOwnPropertyDescriptor, Uo = (i, t, e) => t in i ? To(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e, Po = (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 Oo = Object.defineProperty, Uo = Object.getOwnPropertyDescriptor, Po = (i, t, e) => t in i ? Oo(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e, Ao = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Uo(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, ln = (i, t) => (e, n) => t(e, n, i), Yr = (i, t, e) => Uo(i, typeof t != "symbol" ? t + "" : t, e);
-const Ao = "SHEET_IMAGE_UI_PLUGIN";
-let Lt = class extends Ui {
+}, un = (i, t) => (e, n) => t(e, n, i), Yr = (i, t, e) => Po(i, typeof t != "symbol" ? t + "" : t, e);
+const No = "SHEET_IMAGE_UI_PLUGIN";
+let Lt = class extends Pi {
   constructor(i = sr, t, e, n) {
     super(), this._config = i, this._injector = t, this._renderManagerService = e, this._configService = n;
-    const { menu: r, ...s } = Pi(
+    const { menu: r, ...s } = Ai(
       {},
       sr,
       this._config
     );
-    r && this._configService.setConfig("menu", r, { merge: !0 }), this._configService.setConfig(Ns, s);
+    r && this._configService.setConfig("menu", r, { merge: !0 }), this._configService.setConfig(ks, s);
   }
   onStarting() {
-    Ai(this._injector, [
+    Ni(this._injector, [
       [lt],
       [Ft],
       [Nt],
@@ -4072,7 +4086,7 @@ let Lt = class extends Ui {
       [kt],
       [$t],
       [xt],
-      [yn, { useClass: vn }]
+      [En, { useClass: In }]
     ]), Qt(this._injector, [
       [lt]
     ]);
@@ -4098,46 +4112,46 @@ let Lt = class extends Ui {
   _registerRenderModules() {
     [
       [dt],
+      [Dn],
       [Rn],
-      [Cn],
-      [In]
+      [Cn]
     ].forEach((i) => {
       this.disposeWithMe(this._renderManagerService.registerRenderModule(k.UNIVER_SHEET, i));
     });
   }
 };
 Yr(Lt, "type", k.UNIVER_SHEET);
-Yr(Lt, "pluginName", Ao);
-Lt = Po([
-  Ti(ss, ps, Cs, Ni),
-  ln(1, A(qe)),
-  ln(2, Q),
-  ln(3, Oi)
+Yr(Lt, "pluginName", No);
+Lt = Ao([
+  Oi(os, ws, Rs, ki),
+  un(1, A(qe)),
+  un(2, ee),
+  un(3, Ui)
 ], Lt);
 export {
-  vn as BatchSaveImagesService,
+  In as BatchSaveImagesService,
   H as ClearSheetDrawingTransformerOperation,
   kr as DeleteDrawingsCommand,
   Fr as EditSheetDrawingOperation,
   ye as FileNamePart,
   $r as GroupSheetDrawingCommand,
-  yn as IBatchSaveImagesService,
+  En as IBatchSaveImagesService,
   Kt as InsertFloatImageCommand,
   Xt as InsertSheetDrawingCommand,
   gt as MoveDrawingsCommand,
   ht as RemoveSheetDrawingCommand,
   Gr as SHEETS_IMAGE_MENU_ID,
-  ro as SHEET_FLOAT_DOM_PREFIX,
+  io as SHEET_FLOAT_DOM_PREFIX,
   ct as SaveCellImagesCommand,
   xr as SetDrawingArrangeCommand,
   zt as SetSheetDrawingCommand,
   lt as SheetCanvasFloatDomManagerService,
-  go as SheetDrawingAnchor,
+  mo as SheetDrawingAnchor,
   dt as SheetDrawingUpdateController,
   jr as SidebarSheetDrawingOperation,
   Wr as UngroupSheetDrawingCommand,
   Lt as UniverSheetsDrawingUIPlugin,
-  me as calcSheetFloatDomPosition,
+  fe as calcSheetFloatDomPosition,
   J as drawingPositionToTransform,
   j as transformToDrawingPosition
 };