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

package/lib/es/index.js

@@ -1,21 +1,21 @@
-var jr = Object.defineProperty;
-var $r = (i, t, e) => t in i ? jr(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
-var te = (i, t, e) => $r(i, typeof t != "symbol" ? t + "" : t, e);
-import { CommandType as J, ICommandService as G, IUndoRedoService as Ge, sequenceExecute as Vn, LocaleService as rt, IUniverInstanceService as Se, Inject as A, Injector as Xe, IContextService as Hn, RxDisposable as xr, UniverInstanceType as L, toDisposable as Lr, FOCUSING_COMMON_DRAWINGS as Fe, DrawingTypeEnum as W, Disposable as ie, ArrangeTypeEnum as wt, createDocumentModelWithStyle as Jt, ObjectRelativeFromV as Sn, ObjectRelativeFromH as In, WrapTextType as Cn, PositionedObjectLayoutType as Dn, BooleanNumber as bn, BuildTextUtils as qt, ImageSourceType as Rn, generateRandomId as Mt, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as et, DOCS_ZEN_EDITOR_UNIT_ID_KEY as xe, InterceptorEffectEnum as Fr, ObjectMatrix as Yr, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Gr, Tools as ye, IPermissionService as Xr, UserManagerService as Vr, LifecycleService as Hr, LifecycleStages as zr, DisposableCollection as _t, fromEventSubject as Kr, PRINT_CHART_COMPONENT_KEY as Zr, Rectangle as Jr, Direction as ve, FOCUSING_FX_BAR_EDITOR as qr, EDITOR_ACTIVATED as Qr, FOCUSING_PANEL_EDITOR as ei, DependentOn as ti, IConfigService as ni, Plugin as ri, merge as ii, registerDependencies as si, touchDependencies as Xt } from "@univerjs/core";
-import { DocDrawingController as oi, UniverDocsDrawingPlugin as ai } from "@univerjs/docs-drawing";
-import { SetDrawingSelectedOperation as jt, IImageIoService as zn, IDrawingManagerService as se, DRAWING_IMAGE_ALLOW_IMAGE_LIST as yn, DRAWING_IMAGE_COUNT_LIMIT as Mn, ImageUploadStatusType as Ne, DRAWING_IMAGE_ALLOW_SIZE as En, getImageSize as Vt, DRAWING_IMAGE_WIDTH_LIMIT as Tn, DRAWING_IMAGE_HEIGHT_LIMIT as On, ImageSourceType as ci, getDrawingShapeKeyByDrawingSearch as Ie, UniverDrawingPlugin as di } from "@univerjs/drawing";
-import { ImageCropperObject as li, COMPONENT_IMAGE_POPUP_MENU as ui, OpenImageCropOperation as hi, ImageResetSizeOperation as gi, DrawingRenderService as Kn, DrawingCommonPanel as mi, UniverDrawingUIPlugin as fi } from "@univerjs/drawing-ui";
-import { IRenderManagerService as q, CURSOR_TYPE as pi, precisionTo as vt, transformObjectOutOfGroup as wi, getGroupState as _i, getCurrentTypeOfRenderer as dn, RENDER_CLASS_TYPE as ke, Rect as Be, ObjectType as Pn, DRAWING_OBJECT_LAYER_INDEX as Ht, SHEET_VIEWPORT_KEY as Zn } from "@univerjs/engine-render";
-import { ISheetDrawingService as oe, DrawingApplyType as P, SetDrawingApplyMutation as U, SheetDrawingAnchorType as O, UniverSheetsDrawingPlugin as vi } from "@univerjs/sheets-drawing";
-import { SheetCanvasPopManagerService as Si, HoverManagerService as Ii, SheetSkeletonManagerService as V, convertPositionSheetOverGridToAbsolute as Ci, ISheetSelectionRenderService as Ve, attachRangeWithCoord as Jn, IEditorBridgeService as Di, IAutoFillService as bi, EditingRenderController as Ri, SetCellEditVisibleOperation as Un, PREDEFINED_HOOK_NAME as Le, COPY_TYPE as Ce, discreteRangeToRange as An, virtualizeDiscreteRanges as yi, ISheetClipboardService as Mi, SetZoomRatioOperation as Nn, SetScrollOperation as Ei, SheetPrintInterceptorService as Ti, getCurrentRangeDisable$ as Oi } from "@univerjs/sheets-ui";
-import { ISidebarService as Pi, useDependency as Me, IUIPartsService as Ui, BuiltInUIPart as Ai, connectInjector as qn, ILocalFileService as Ni, IMessageService as ki, IDialogService as Bi, IClipboardInterfaceService as Wi, CanvasFloatDomService as ji, PrintFloatDomSingle as $i, ComponentManager as Qn, getMenuHiddenObservable as ln, MenuItemType as un, RibbonStartGroup as xi, KeyCode as Ye, IMenuManagerService as Li, IShortcutService as Fi } from "@univerjs/ui";
-import { takeUntil as kn, throttleTime as Yi, combineLatest as St, switchMap as _e, EMPTY as me, tap as Bn, map as Ee, distinctUntilChanged as Wn, Subject as zt, filter as Gi, take as Xi, BehaviorSubject as $e, of as jn } from "rxjs";
-import { SheetInterceptorService as $t, getSheetCommandTarget as ae, SheetsSelectionsService as hn, SetRangeValuesCommand as $n, INTERCEPTOR_POINT as Vi, InterceptCellContentPriority as Hi, WorkbookViewPermission as xn, WorksheetViewPermission as Ln, WorkbookEditablePermission as Qt, WorksheetEditPermission as en, SetFrozenMutation as zi, SetWorksheetRowAutoHeightMutation as Ki, COMMAND_LISTENER_SKELETON_CHANGE as Zi, InsertRowCommand as er, InsertColCommand as tr, RemoveRowCommand as nr, RemoveColCommand as rr, DeleteRangeMoveLeftCommand as ir, DeleteRangeMoveUpCommand as sr, InsertRangeMoveDownCommand as or, InsertRangeMoveRightCommand as ar, DeltaRowHeightCommand as tn, SetRowHeightCommand as nn, DeltaColumnWidthCommand as cr, SetColWidthCommand as dr, SetRowHiddenCommand as lr, SetSpecificRowsVisibleCommand as ur, SetSpecificColsVisibleCommand as hr, SetColHiddenCommand as gr, MoveColsCommand as mr, MoveRowsCommand as fr, MoveRangeCommand as pr, SetRowVisibleMutation as Ji, SetRowHiddenMutation as qi, SetColVisibleMutation as Qi, SetColHiddenMutation as es, SetWorksheetRowHeightMutation as ts, SetWorksheetColWidthMutation as ns, SetWorksheetActiveOperation as rs, RangeProtectionPermissionEditPoint as is } from "@univerjs/sheets";
-import { jsx as K, jsxs as Et } from "react/jsx-runtime";
-import ss, { useEffect as gn, useMemo as os, forwardRef as wr, useRef as as, createElement as _r, useState as rn } from "react";
-import { docDrawingPositionToTransform as Fn, ReplaceSnapshotCommand as cs, InnerPasteCommand as ds } from "@univerjs/docs-ui";
-import { MessageType as De, render as ls, unmount as us, clsx as It, RadioGroup as hs, Radio as Kt } from "@univerjs/design";
-const gs = "sheets-drawing-ui.config", Yn = {}, F = {
+var Nr = Object.defineProperty;
+var kr = (i, t, e) => t in i ? Nr(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
+var te = (i, t, e) => kr(i, typeof t != "symbol" ? t + "" : t, e);
+import { CommandType as J, ICommandService as G, IUndoRedoService as Le, sequenceExecute as Ln, LocaleService as nt, IUniverInstanceService as Se, Inject as A, Injector as Ye, IContextService as Yn, IImageIoService as Wr, RxDisposable as jr, UniverInstanceType as F, FOCUSING_COMMON_DRAWINGS as xe, DrawingTypeEnum as j, Disposable as ie, ArrangeTypeEnum as pt, createDocumentModelWithStyle as Ht, ObjectRelativeFromV as pn, ObjectRelativeFromH as wn, WrapTextType as _n, PositionedObjectLayoutType as vn, BooleanNumber as Sn, BuildTextUtils as zt, ImageSourceType as In, generateRandomId as bt, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as qe, DOCS_ZEN_EDITOR_UNIT_ID_KEY as Be, InterceptorEffectEnum as Br, ObjectMatrix as $r, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as xr, Tools as Re, IPermissionService as Fr, UserManagerService as Lr, LifecycleService as Yr, LifecycleStages as Gr, DisposableCollection as wt, fromEventSubject as Xr, PRINT_CHART_COMPONENT_KEY as Vr, Rectangle as Hr, Direction as ve, FOCUSING_FX_BAR_EDITOR as zr, EDITOR_ACTIVATED as Kr, FOCUSING_PANEL_EDITOR as Zr, DependentOn as Jr, IConfigService as qr, Plugin as Qr, merge as ei, registerDependencies as ti, touchDependencies as Ft } from "@univerjs/core";
+import { DocDrawingController as ni, UniverDocsDrawingPlugin as ri } from "@univerjs/docs-drawing";
+import { SetDrawingSelectedOperation as Nt, IDrawingManagerService as se, IImageIoService as ii, DRAWING_IMAGE_ALLOW_IMAGE_LIST as Cn, DRAWING_IMAGE_COUNT_LIMIT as Dn, ImageUploadStatusType as Pe, DRAWING_IMAGE_ALLOW_SIZE as bn, getImageSize as Lt, DRAWING_IMAGE_WIDTH_LIMIT as Rn, DRAWING_IMAGE_HEIGHT_LIMIT as Mn, ImageSourceType as si, getDrawingShapeKeyByDrawingSearch as Ie, UniverDrawingPlugin as oi } from "@univerjs/drawing";
+import { ImageCropperObject as ai, COMPONENT_IMAGE_POPUP_MENU as ci, OpenImageCropOperation as di, ImageResetSizeOperation as li, DrawingRenderService as Gn, DrawingCommonPanel as ui, UniverDrawingUIPlugin as hi } from "@univerjs/drawing-ui";
+import { IRenderManagerService as q, CURSOR_TYPE as gi, precisionTo as _t, transformObjectOutOfGroup as fi, getGroupState as mi, getCurrentTypeOfRenderer as on, RENDER_CLASS_TYPE as Ae, Rect as Ne, ObjectType as yn, DRAWING_OBJECT_LAYER_INDEX as Yt, SHEET_VIEWPORT_KEY as Xn } from "@univerjs/engine-render";
+import { ISheetDrawingService as oe, DrawingApplyType as U, SetDrawingApplyMutation as P, SheetDrawingAnchorType as O, UniverSheetsDrawingPlugin as pi } from "@univerjs/sheets-drawing";
+import { MessageType as we, render as wi, unmount as _i, RadioGroup as vi, Radio as Gt } from "@univerjs/design";
+import { SheetCanvasPopManagerService as Si, HoverManagerService as Ii, SheetSkeletonManagerService as V, convertPositionSheetOverGridToAbsolute as Ci, ISheetSelectionRenderService as Ge, attachRangeWithCoord as Vn, IEditorBridgeService as Di, IAutoFillService as bi, EditingRenderController as Ri, SetCellEditVisibleOperation as En, PREDEFINED_HOOK_NAME as $e, COPY_TYPE as Ce, discreteRangeToRange as Tn, virtualizeDiscreteRanges as Mi, ISheetClipboardService as yi, SetZoomRatioOperation as On, SetScrollOperation as Ei, SheetPrintInterceptorService as Ti, getCurrentRangeDisable$ as Oi } from "@univerjs/sheets-ui";
+import { ISidebarService as Ui, IMessageService as Hn, ILocalFileService as Pi, IDialogService as Ai, IClipboardInterfaceService as Ni, CanvasFloatDomService as ki, PrintFloatDomSingle as Wi, ComponentManager as zn, connectInjector as ji, getMenuHiddenObservable as an, MenuItemType as cn, useDependency as Qe, RibbonStartGroup as Bi, KeyCode as Fe, IMenuManagerService as $i, IShortcutService as xi } from "@univerjs/ui";
+import { takeUntil as Un, throttleTime as Fi, combineLatest as vt, switchMap as _e, EMPTY as me, tap as Pn, map as Me, distinctUntilChanged as An, Subject as Xt, filter as Li, take as Yi, BehaviorSubject as je, of as Nn } from "rxjs";
+import { SheetInterceptorService as kt, getSheetCommandTarget as ae, SheetsSelectionsService as dn, SetRangeValuesCommand as kn, INTERCEPTOR_POINT as Gi, InterceptCellContentPriority as Xi, WorkbookViewPermission as Wn, WorksheetViewPermission as jn, WorkbookEditablePermission as Kt, WorksheetEditPermission as Zt, SetFrozenMutation as Vi, SetWorksheetRowAutoHeightMutation as Hi, COMMAND_LISTENER_SKELETON_CHANGE as zi, InsertRowCommand as Kn, InsertColCommand as Zn, RemoveRowCommand as Jn, RemoveColCommand as qn, DeleteRangeMoveLeftCommand as Qn, DeleteRangeMoveUpCommand as er, InsertRangeMoveDownCommand as tr, InsertRangeMoveRightCommand as nr, DeltaRowHeightCommand as Jt, SetRowHeightCommand as qt, DeltaColumnWidthCommand as rr, SetColWidthCommand as ir, SetRowHiddenCommand as sr, SetSpecificRowsVisibleCommand as or, SetSpecificColsVisibleCommand as ar, SetColHiddenCommand as cr, MoveColsCommand as dr, MoveRowsCommand as lr, MoveRangeCommand as ur, SetRowVisibleMutation as Ki, SetRowHiddenMutation as Zi, SetColVisibleMutation as Ji, SetColHiddenMutation as qi, SetWorksheetRowHeightMutation as Qi, SetWorksheetColWidthMutation as es, SetWorksheetActiveOperation as ts, RangeProtectionPermissionEditPoint as ns } from "@univerjs/sheets";
+import { docDrawingPositionToTransform as Bn, ReplaceSnapshotCommand as rs, InnerPasteCommand as is } from "@univerjs/docs-ui";
+import { jsx as Z, jsxs as Qt } from "react/jsx-runtime";
+import { useMemo as ss, forwardRef as hr, useRef as os, createElement as gr, useState as en, useEffect as fr } from "react";
+const as = "sheets-drawing-ui.config", $n = {}, L = {
   id: "sheet.operation.clear-drawing-transformer",
   type: J.MUTATION,
   handler: (i, t) => {
@@ -25,48 +25,48 @@ const gs = "sheets-drawing-ui.config", Yn = {}, F = {
       (s = (r = e.getRenderById(n)) == null ? void 0 : r.scene.getTransformer()) == null || s.debounceRefreshControls();
     }), !0;
   }
-}, it = {
+}, rt = {
   id: "sheet.command.remove-sheet-image",
   type: J.COMMAND,
   handler: (i, t) => {
     var S, C, b;
-    const e = i.get(G), n = i.get(Ge), r = i.get($t), s = i.get(oe);
+    const e = i.get(G), n = i.get(Le), r = i.get(kt), s = i.get(oe);
     if (!t) return !1;
     const { drawings: o } = t, a = [];
     o.forEach((v) => {
       const { unitId: D } = v;
       a.push(D);
     });
-    const c = s.getBatchRemoveOp(o), { unitId: u, subUnitId: d, undo: l, redo: g, objects: h } = c, f = r.onCommandExecute({ id: it.id, params: t }), p = { id: U.id, params: { unitId: u, subUnitId: d, op: g, objects: h, type: P.REMOVE } }, m = { id: U.id, params: { unitId: u, subUnitId: d, op: l, objects: h, type: P.INSERT } };
-    return Vn([...(S = f.preRedos) != null ? S : [], p, ...f.redos], e) ? (n.pushUndoRedo({
+    const d = s.getBatchRemoveOp(o), { unitId: u, subUnitId: c, undo: l, redo: g, objects: h } = d, m = r.onCommandExecute({ id: rt.id, params: t }), p = { id: P.id, params: { unitId: u, subUnitId: c, op: g, objects: h, type: U.REMOVE } }, f = { id: P.id, params: { unitId: u, subUnitId: c, op: l, objects: h, type: U.INSERT } };
+    return Ln([...(S = m.preRedos) != null ? S : [], p, ...m.redos], e) ? (n.pushUndoRedo({
       unitID: u,
       undoMutations: [
-        ...(C = f.preUndos) != null ? C : [],
-        m,
-        ...f.undos,
-        { id: F.id, params: a }
+        ...(C = m.preUndos) != null ? C : [],
+        f,
+        ...m.undos,
+        { id: L.id, params: a }
       ],
       redoMutations: [
-        ...(b = f.preRedos) != null ? b : [],
+        ...(b = m.preRedos) != null ? b : [],
         p,
-        ...f.redos,
-        { id: F.id, params: a }
+        ...m.redos,
+        { id: L.id, params: a }
       ]
     }), !0) : !1;
   }
-}, vr = "COMPONENT_SHEET_DRAWING_PANEL", Sr = {
+}, mr = "COMPONENT_SHEET_DRAWING_PANEL", pr = {
   id: "sidebar.operation.sheet-image",
   type: J.COMMAND,
   handler: async (i, t) => {
-    const e = i.get(Pi), n = i.get(rt), r = i.get(Se), s = i.get(G);
+    const e = i.get(Ui), n = i.get(nt), r = i.get(Se), s = i.get(G);
     if (!ae(r)) return !1;
     switch (t.value) {
       case "open":
         e.open({
           header: { title: n.t("sheetImage.panel.title") },
-          children: { label: vr },
+          children: { label: mr },
           onClose: () => {
-            s.syncExecuteCommand(jt.id, []);
+            s.syncExecuteCommand(Nt.id, []);
           },
           width: 360
         });
@@ -78,47 +78,42 @@ const gs = "sheets-drawing-ui.config", Yn = {}, F = {
     }
     return !0;
   }
-}, Ir = {
+}, wr = {
   id: "sheet.operation.edit-sheet-image",
   type: J.OPERATION,
   handler: (i, t) => {
     const e = i.get(G);
-    return t == null ? !1 : (e.syncExecuteCommand(jt.id, [t]), e.executeCommand(Sr.id, { value: "open" }), !0);
-  }
-}, ms = "univer-upload-loading", fs = "univer-upload-loading-body", ps = "univer-upload-loading-body-animation", ws = "univer-upload-loading-body-text", Ct = {
-  uploadLoading: ms,
-  uploadLoadingBody: fs,
-  uploadLoadingBodyAnimation: ps,
-  uploadLoadingBodyText: ws
-}, _s = () => {
-  const i = Me(zn), t = Me(rt), [e, n] = ss.useState(0);
-  return gn(() => {
-    const r = i.change$.subscribe((s) => {
-      n(s);
-    });
-    return () => {
-      r.unsubscribe();
-    };
-  }, [i]), /* @__PURE__ */ K("div", { style: { display: e > 0 ? "block" : "none" }, className: Ct.uploadLoading, children: /* @__PURE__ */ Et("div", { className: Ct.uploadLoadingBody, children: [
-    /* @__PURE__ */ K("div", { className: Ct.uploadLoadingBodyAnimation }),
-    /* @__PURE__ */ K("div", { className: Ct.uploadLoadingBodyText, children: `${t.t("uploadLoading.loading")}: ${e}` })
-  ] }) });
+    return t == null ? !1 : (e.syncExecuteCommand(Nt.id, [t]), e.executeCommand(pr.id, { value: "open" }), !0);
+  }
 };
-var vs = Object.getOwnPropertyDescriptor, Ss = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? vs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+var cs = Object.getOwnPropertyDescriptor, ds = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? cs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, fe = (i, t) => (e, n) => t(e, n, i);
-let Tt = class extends xr {
-  constructor(t, e, n, r, s, o, a, c) {
+}, de = (i, t) => (e, n) => t(e, n, i);
+let Rt = class extends jr {
+  constructor(t, e, n, r, s, o, a, d, u, c) {
     super();
     te(this, "_initImagePopupMenu", /* @__PURE__ */ new Set());
-    this._injector = t, this._drawingManagerService = e, this._canvasPopManagerService = n, this._renderManagerService = r, this._univerInstanceService = s, this._contextService = o, this._uiPartsService = a, this._commandService = c, this._init();
+    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$(L.UNIVER_SHEET).pipe(kn(this.dispose$)).subscribe((t) => this._create(t)), this._univerInstanceService.getTypeOfUnitDisposed$(L.UNIVER_SHEET).pipe(kn(this.dispose$)).subscribe((t) => this._dispose(t)), this._univerInstanceService.getAllUnitsForType(L.UNIVER_SHEET).forEach((t) => this._create(t)), this._uiPartsService.registerComponent(Ai.CONTENT, () => qn(_s, this._injector));
+    this._univerInstanceService.getCurrentTypeOfUnit$(F.UNIVER_SHEET).pipe(Un(this.dispose$)).subscribe((t) => this._create(t)), this._univerInstanceService.getTypeOfUnitDisposed$(F.UNIVER_SHEET).pipe(Un(this.dispose$)).subscribe((t) => this._dispose(t)), this._univerInstanceService.getAllUnitsForType(F.UNIVER_SHEET).forEach((t) => this._create(t)), this._setupLoadingStatus();
+  }
+  _setupLoadingStatus() {
+    const t = "image-upload-loading";
+    let e;
+    this.disposeWithMe(this._ioService.change$.subscribe((n) => {
+      n > 0 && !e ? e = this._messageService.show({
+        id: t,
+        type: we.Loading,
+        content: `${this._localeService.t("uploadLoading.loading")}: ${n}`,
+        duration: 0
+      }) : n === 0 && (e == null || e.dispose(), e = void 0);
+    }));
   }
   _dispose(t) {
+    super.dispose();
     const e = t.getUnitId();
     this._renderManagerService.removeRender(e);
   }
@@ -131,7 +126,7 @@ let Tt = class extends xr {
   _hasCropObject(t) {
     const e = t.getAllObjectsByOrder();
     for (const n of e)
-      if (n instanceof li)
+      if (n instanceof ai)
         return !0;
     return !1;
   }
@@ -145,43 +140,41 @@ let Tt = class extends xr {
       return;
     let r;
     this.disposeWithMe(
-      Lr(
-        n.createControl$.subscribe(() => {
-          if (this._contextService.setContextValue(Fe, !0), this._hasCropObject(e))
-            return;
-          const o = n.getSelectedObjectMap();
-          if (o.size > 1) {
-            r == null || r.dispose();
-            return;
-          }
-          const a = o.values().next().value;
-          if (!a)
-            return;
-          const c = a.oKey, u = this._drawingManagerService.getDrawingOKey(c);
-          if (!u)
-            return;
-          const { unitId: d, subUnitId: l, drawingId: g, drawingType: h } = u, f = u.data;
-          if (f && f.disablePopup)
-            return;
+      n.createControl$.subscribe(() => {
+        if (this._contextService.setContextValue(xe, !0), this._hasCropObject(e))
+          return;
+        const o = n.getSelectedObjectMap();
+        if (o.size > 1) {
           r == null || r.dispose();
-          const p = this._canvasPopManagerService.getFeatureMenu(d, l, g, h);
-          r = this.disposeWithMe(this._canvasPopManagerService.attachPopupToObject(a, {
-            componentKey: ui,
-            direction: "horizontal",
-            offset: [2, 0],
-            extraProps: {
-              menuItems: p || this._getImageMenuItems(d, l, g, h)
-            }
-          }));
-        })
-      )
+          return;
+        }
+        const a = o.values().next().value;
+        if (!a)
+          return;
+        const d = a.oKey, u = this._drawingManagerService.getDrawingOKey(d);
+        if (!u)
+          return;
+        const { unitId: c, subUnitId: l, drawingId: g, drawingType: h } = u, m = u.data;
+        if (m && m.disablePopup)
+          return;
+        r == null || r.dispose();
+        const p = this._canvasPopManagerService.getFeatureMenu(c, l, g, h);
+        r = this.disposeWithMe(this._canvasPopManagerService.attachPopupToObject(a, {
+          componentKey: ci,
+          direction: "horizontal",
+          offset: [2, 0],
+          extraProps: {
+            menuItems: p || this._getImageMenuItems(c, l, g, h)
+          }
+        }));
+      })
     ), this.disposeWithMe(
       n.clearControl$.subscribe(() => {
-        r == null || r.dispose(), this._contextService.setContextValue(Fe, !1), this._commandService.syncExecuteCommand(jt.id, []);
+        r == null || r.dispose(), this._contextService.setContextValue(xe, !1), this._commandService.syncExecuteCommand(Nt.id, []);
       })
     ), this.disposeWithMe(
       this._contextService.contextChanged$.subscribe((o) => {
-        o[Fe] === !1 && (r == null || r.dispose());
+        o[xe] === !1 && (r == null || r.dispose());
       })
     ), this.disposeWithMe(
       n.changing$.subscribe(() => {
@@ -194,60 +187,62 @@ let Tt = class extends xr {
       {
         label: "image-popup.edit",
         index: 0,
-        commandId: Ir.id,
+        commandId: wr.id,
         commandParams: { unitId: t, subUnitId: e, drawingId: n },
-        disable: r === W.DRAWING_DOM
+        disable: r === j.DRAWING_DOM
       },
       {
         label: "image-popup.delete",
         index: 1,
-        commandId: it.id,
+        commandId: rt.id,
         commandParams: { unitId: t, drawings: [{ unitId: t, subUnitId: e, drawingId: n }] },
         disable: !1
       },
       {
         label: "image-popup.crop",
         index: 2,
-        commandId: hi.id,
+        commandId: di.id,
         commandParams: { unitId: t, subUnitId: e, drawingId: n },
-        disable: r === W.DRAWING_DOM
+        disable: r === j.DRAWING_DOM
       },
       {
         label: "image-popup.reset",
         index: 3,
-        commandId: gi.id,
+        commandId: li.id,
         commandParams: [{ unitId: t, subUnitId: e, drawingId: n }],
-        disable: r === W.DRAWING_DOM
+        disable: r === j.DRAWING_DOM
       }
     ];
   }
 };
-Tt = Ss([
-  fe(0, A(Xe)),
-  fe(1, se),
-  fe(2, A(Si)),
-  fe(3, q),
-  fe(4, Se),
-  fe(5, Hn),
-  fe(6, A(Ui)),
-  fe(7, G)
-], Tt);
-var Is = Object.getOwnPropertyDescriptor, Cs = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Is(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+Rt = ds([
+  de(0, A(Ye)),
+  de(1, A(nt)),
+  de(2, se),
+  de(3, A(Si)),
+  de(4, q),
+  de(5, Se),
+  de(6, Hn),
+  de(7, Yn),
+  de(8, Wr),
+  de(9, G)
+], Rt);
+var ls = Object.getOwnPropertyDescriptor, us = (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;
-}, Dt = (i, t) => (e, n) => t(e, n, i);
-let sn = class extends ie {
+}, St = (i, t) => (e, n) => t(e, n, i);
+let tn = class extends ie {
   constructor(t, e, n, r, s) {
     super();
     te(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(Yi(33)).subscribe((t) => {
+    this.disposeWithMe(this._hoverManagerService.currentRichTextNoDistinct$.pipe(Fi(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(pi.ZOOM_IN)) : this._isSetCursor && (this._isSetCursor = !1, this._context.scene.resetCursor());
+      t !== null && (e = this._selectionsService.getWorkbookSelections(this._context.unitId).getCurrentSelections()), e.length > 0 && (t == null ? void 0 : t.unitId) === this._context.unitId && (t != null && t.drawing) && e.length === 1 && ((n = e[0].primary) == null ? void 0 : n.actualRow) === t.row && ((r = e[0].primary) == null ? void 0 : r.actualColumn) === t.col ? (this._isSetCursor = !0, this._context.scene.setCursor(gi.ZOOM_IN)) : this._isSetCursor && (this._isSetCursor = !1, this._context.scene.resetCursor());
     }));
   }
   _initImageClick() {
@@ -261,70 +256,70 @@ let sn = class extends ie {
     }));
   }
 };
-sn = Cs([
-  Dt(1, A(Ii)),
-  Dt(2, A(hn)),
-  Dt(3, A(Kn)),
-  Dt(4, A(V))
-], sn);
+tn = us([
+  St(1, A(Ii)),
+  St(2, A(dn)),
+  St(3, A(Gn)),
+  St(4, A(V))
+], tn);
 function z(i, t, e) {
-  const { from: n, to: r, flipY: s = !1, flipX: o = !1, angle: a = 0, skewX: c = 0, skewY: u = 0 } = i, d = e.getCurrent();
-  if (d == null)
+  const { from: n, to: r, flipY: s = !1, flipX: o = !1, angle: a = 0, skewX: d = 0, skewY: u = 0 } = i, c = e.getCurrent();
+  if (c == null)
     return;
   const l = Ci(
-    d.unitId,
-    d.sheetId,
+    c.unitId,
+    c.sheetId,
     { from: n, to: r },
     e
   );
-  let { left: g, top: h, width: f, height: p } = l;
-  const m = e.getCurrentSkeleton(), _ = m.rowHeaderWidth + m.columnTotalWidth, S = m.columnHeaderHeight + m.rowTotalHeight;
-  return g + f > _ && (g = _ - f), h + p > S && (h = S - p), {
+  let { left: g, top: h, width: m, height: p } = l;
+  const f = e.getCurrentSkeleton(), _ = f.rowHeaderWidth + f.columnTotalWidth, S = f.columnHeaderHeight + f.rowTotalHeight;
+  return g + m > _ && (g = _ - m), h + p > S && (h = S - p), {
     flipY: s,
     flipX: o,
     angle: a,
-    skewX: c,
+    skewX: d,
     skewY: u,
     left: g,
     top: h,
-    width: f,
+    width: m,
     height: p
   };
 }
 function x(i, t) {
-  const { left: e = 0, top: n = 0, width: r = 0, height: s = 0, flipY: o = !1, flipX: a = !1, angle: c = 0, skewX: u = 0, skewY: d = 0 } = i, l = t.getCellWithCoordByOffset(e, n);
+  const { left: e = 0, top: n = 0, width: r = 0, height: s = 0, flipY: o = !1, flipX: a = !1, angle: d = 0, skewX: u = 0, skewY: c = 0 } = i, l = t.getCellWithCoordByOffset(e, n);
   if (l == null)
     return;
   const g = {
     column: l.actualColumn,
-    columnOffset: vt(e - l.startX, 1),
+    columnOffset: _t(e - l.startX, 1),
     row: l.actualRow,
-    rowOffset: vt(n - l.startY, 1)
+    rowOffset: _t(n - l.startY, 1)
   }, h = t.getCellWithCoordByOffset(e + r, n + s);
   if (h == null)
     return;
-  const f = {
+  const m = {
     column: h.actualColumn,
-    columnOffset: vt(e + r - h.startX, 1),
+    columnOffset: _t(e + r - h.startX, 1),
     row: h.actualRow,
-    rowOffset: vt(n + s - h.startY, 1)
+    rowOffset: _t(n + s - h.startY, 1)
   };
   return {
     flipY: o,
     flipX: a,
-    angle: c,
+    angle: d,
     skewX: u,
-    skewY: d,
+    skewY: c,
     from: g,
-    to: f
+    to: m
   };
 }
-var Ds = Object.getOwnPropertyDescriptor, bs = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Ds(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+var hs = Object.getOwnPropertyDescriptor, gs = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? hs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, bt = (i, t) => (e, n) => t(e, n, i);
-let on = class extends ie {
+}, It = (i, t) => (e, n) => t(e, n, i);
+let nn = class extends ie {
   constructor(i, t, e, n, r) {
     super(), this._context = i, this._sheetDrawingService = t, this._drawingManagerService = e, this._sheetSelectionRenderService = n, this._sheetSkeletonManagerService = r, this._init();
   }
@@ -344,230 +339,230 @@ let on = class extends ie {
     this._drawingManagerService.registerDrawingData(this._context.unitId, this._sheetDrawingService.getDrawingDataForUnit(this._context.unitId)), this._drawingManagerService.initializeNotification(this._context.unitId);
   }
 };
-on = bs([
-  bt(1, oe),
-  bt(2, se),
-  bt(3, A(Ve)),
-  bt(4, A(V))
-], on);
-function Rs(i) {
+nn = gs([
+  It(1, oe),
+  It(2, se),
+  It(3, A(Ge)),
+  It(4, A(V))
+], nn);
+function fs(i) {
   const t = [];
   return i.forEach((e) => {
-    const { parent: n, children: r } = e, { unitId: s, subUnitId: o, drawingId: a } = n, c = _i(0, 0, r.map((l) => l.transform || {})), u = r.map((l) => {
-      const g = l.transform || { left: 0, top: 0 }, { unitId: h, subUnitId: f, drawingId: p } = l;
+    const { parent: n, children: r } = e, { unitId: s, subUnitId: o, drawingId: a } = n, d = mi(0, 0, r.map((l) => l.transform || {})), u = r.map((l) => {
+      const g = l.transform || { left: 0, top: 0 }, { unitId: h, subUnitId: m, drawingId: p } = l;
       return {
         unitId: h,
-        subUnitId: f,
+        subUnitId: m,
         drawingId: p,
         transform: {
           ...g,
-          left: g.left - c.left,
-          top: g.top - c.top
+          left: g.left - d.left,
+          top: g.top - d.top
         },
         groupId: a
       };
-    }), d = {
+    }), c = {
       unitId: s,
       subUnitId: o,
       drawingId: a,
-      drawingType: W.DRAWING_GROUP,
-      transform: c
+      drawingType: j.DRAWING_GROUP,
+      transform: d
     };
     t.push({
-      parent: d,
+      parent: c,
       children: u
     });
   }), t;
 }
-function ys(i) {
+function ms(i) {
   const t = [];
   return i.forEach((e) => {
-    const { parent: n, children: r } = e, { unitId: s, subUnitId: o, drawingId: a, transform: c = { width: 0, height: 0 } } = n;
-    if (c == null)
+    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: f, drawingId: p } = l, m = wi(g || {}, c, c.width || 0, c.height || 0);
+      const { transform: g } = l, { unitId: h, subUnitId: m, drawingId: p } = l, f = fi(g || {}, d, d.width || 0, d.height || 0);
       return {
         unitId: h,
-        subUnitId: f,
+        subUnitId: m,
         drawingId: p,
-        transform: m,
+        transform: f,
         groupId: void 0
       };
-    }), d = {
+    }), c = {
       unitId: s,
       subUnitId: o,
       drawingId: a,
-      drawingType: W.DRAWING_GROUP,
+      drawingType: j.DRAWING_GROUP,
       transform: {
         left: 0,
         top: 0
       }
     };
     t.push({
-      parent: d,
+      parent: c,
       children: u
     });
   }), t;
 }
-const Cr = {
+const _r = {
   id: "sheet.command.group-sheet-image",
   type: J.COMMAND,
   handler: (i, t) => {
-    const e = i.get(G), n = i.get(Ge), r = i.get(oe);
+    const e = i.get(G), n = i.get(Le), r = i.get(oe);
     if (!t) return !1;
     const s = [];
-    t.forEach(({ parent: h, children: f }) => {
-      s.push(h.unitId), f.forEach((p) => {
+    t.forEach(({ parent: h, children: m }) => {
+      s.push(h.unitId), m.forEach((p) => {
         s.push(p.unitId);
       });
     });
-    const o = r.getGroupDrawingOp(t), { unitId: a, subUnitId: c, undo: u, redo: d, objects: l } = o;
-    return e.syncExecuteCommand(U.id, { op: d, unitId: a, subUnitId: c, objects: l, type: P.GROUP }) ? (n.pushUndoRedo({
+    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: U.id, params: { op: u, unitId: a, subUnitId: c, objects: ys(l), type: P.UNGROUP } },
-        { id: F.id, params: s }
+        { id: P.id, params: { op: u, unitId: a, subUnitId: d, objects: ms(l), type: U.UNGROUP } },
+        { id: L.id, params: s }
       ],
       redoMutations: [
-        { id: U.id, params: { op: d, unitId: a, subUnitId: c, objects: l, type: P.GROUP } },
-        { id: F.id, params: s }
+        { id: P.id, params: { op: c, unitId: a, subUnitId: d, objects: l, type: U.GROUP } },
+        { id: L.id, params: s }
       ]
     }), !0) : !1;
   }
-}, xt = {
+}, Wt = {
   id: "sheet.command.insert-sheet-image",
   type: J.COMMAND,
   handler: (i, t) => {
     var S, C, b;
-    const e = i.get(G), n = i.get(Ge), r = i.get(oe), s = i.get($t);
+    const e = i.get(G), n = i.get(Le), r = i.get(oe), s = i.get(kt);
     if (!t) return !1;
-    const o = t.drawings, a = o.map((v) => v.unitId), c = r.getBatchAddOp(o), { unitId: u, subUnitId: d, undo: l, redo: g, objects: h } = c, f = s.onCommandExecute({ id: xt.id, params: t }), p = { id: U.id, params: { op: g, unitId: u, subUnitId: d, objects: h, type: P.INSERT } }, m = { id: U.id, params: { op: l, unitId: u, subUnitId: d, objects: h, type: P.REMOVE } };
-    return Vn([...(S = f.preRedos) != null ? S : [], p, ...f.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: Wt.id, params: t }), p = { id: P.id, params: { op: g, unitId: u, subUnitId: c, objects: h, type: U.INSERT } }, f = { id: P.id, params: { op: l, unitId: u, subUnitId: c, objects: h, type: U.REMOVE } };
+    return Ln([...(S = m.preRedos) != null ? S : [], p, ...m.redos], e) ? (n.pushUndoRedo({
       unitID: u,
       undoMutations: [
-        ...(C = f.preUndos) != null ? C : [],
-        m,
-        ...f.undos,
-        { id: F.id, params: a }
+        ...(C = m.preUndos) != null ? C : [],
+        f,
+        ...m.undos,
+        { id: L.id, params: a }
       ],
       redoMutations: [
-        ...(b = f.preRedos) != null ? b : [],
+        ...(b = m.preRedos) != null ? b : [],
         p,
-        ...f.redos,
-        { id: F.id, params: a }
+        ...m.redos,
+        { id: L.id, params: a }
       ]
     }), !0) : !1;
   }
-}, Dr = {
+}, vr = {
   id: "sheet.command.set-drawing-arrange",
   type: J.COMMAND,
   handler: (i, t) => {
-    const e = i.get(G), n = i.get(Ge);
+    const e = i.get(G), n = i.get(Le);
     if (!t) return !1;
-    const r = i.get(oe), { unitId: s, subUnitId: o, drawingIds: a, arrangeType: c } = t, u = { unitId: s, subUnitId: o, drawingIds: a };
-    let d;
-    if (c === wt.forward ? d = r.getForwardDrawingsOp(u) : c === wt.backward ? d = r.getBackwardDrawingOp(u) : c === wt.front ? d = r.getFrontDrawingsOp(u) : c === wt.back && (d = r.getBackDrawingsOp(u)), d == null)
+    const r = i.get(oe), { unitId: s, subUnitId: o, drawingIds: a, arrangeType: d } = t, u = { unitId: s, subUnitId: o, drawingIds: a };
+    let c;
+    if (d === pt.forward ? c = r.getForwardDrawingsOp(u) : d === pt.backward ? c = r.getBackwardDrawingOp(u) : d === pt.front ? c = r.getFrontDrawingsOp(u) : d === pt.back && (c = r.getBackDrawingsOp(u)), c == null)
       return !1;
-    const { objects: l, redo: g, undo: h } = d;
-    return e.syncExecuteCommand(U.id, { op: g, unitId: s, subUnitId: o, objects: l, type: P.ARRANGE }) ? (n.pushUndoRedo({
+    const { objects: l, redo: g, undo: h } = c;
+    return e.syncExecuteCommand(P.id, { op: g, unitId: s, subUnitId: o, objects: l, type: U.ARRANGE }) ? (n.pushUndoRedo({
       unitID: s,
       undoMutations: [
-        { id: U.id, params: { op: h, unitId: s, subUnitId: o, objects: l, type: P.ARRANGE } }
+        { id: P.id, params: { op: h, unitId: s, subUnitId: o, objects: l, type: U.ARRANGE } }
       ],
       redoMutations: [
-        { id: U.id, params: { op: g, unitId: s, subUnitId: o, objects: l, type: P.ARRANGE } }
+        { id: P.id, params: { op: g, unitId: s, subUnitId: o, objects: l, type: U.ARRANGE } }
       ]
     }), !0) : !1;
   }
-}, Lt = {
+}, jt = {
   id: "sheet.command.set-sheet-image",
   type: J.COMMAND,
   handler: (i, t) => {
-    const e = i.get(G), n = i.get(Ge), r = i.get(oe);
+    const e = i.get(G), n = i.get(Le), r = i.get(oe);
     if (!t) return !1;
-    const { drawings: s } = t, o = r.getBatchUpdateOp(s), { unitId: a, subUnitId: c, undo: u, redo: d, objects: l } = o;
-    return e.syncExecuteCommand(U.id, { unitId: a, subUnitId: c, op: d, objects: l, type: P.UPDATE }) ? (n.pushUndoRedo({
+    const { drawings: s } = t, o = r.getBatchUpdateOp(s), { unitId: a, subUnitId: d, undo: u, redo: c, objects: l } = o;
+    return e.syncExecuteCommand(P.id, { unitId: a, subUnitId: d, op: c, objects: l, type: U.UPDATE }) ? (n.pushUndoRedo({
       unitID: a,
       undoMutations: [
-        { id: U.id, params: { unitId: a, subUnitId: c, op: u, objects: l, type: P.UPDATE } },
-        { id: F.id, params: [a] }
+        { id: P.id, params: { unitId: a, subUnitId: d, op: u, objects: l, type: U.UPDATE } },
+        { id: L.id, params: [a] }
       ],
       redoMutations: [
-        { id: U.id, params: { unitId: a, subUnitId: c, op: d, objects: l, type: P.UPDATE } },
-        { id: F.id, params: [a] }
+        { id: P.id, params: { unitId: a, subUnitId: d, op: c, objects: l, type: U.UPDATE } },
+        { id: L.id, params: [a] }
       ]
     }), !0) : !1;
   }
-}, br = {
+}, Sr = {
   id: "sheet.command.ungroup-sheet-image",
   type: J.COMMAND,
   handler: (i, t) => {
-    const e = i.get(G), n = i.get(Ge), r = i.get(oe);
+    const e = i.get(G), n = i.get(Le), r = i.get(oe);
     if (!t) return !1;
     const s = [];
-    t.forEach(({ parent: h, children: f }) => {
-      s.push(h.unitId), f.forEach((p) => {
+    t.forEach(({ parent: h, children: m }) => {
+      s.push(h.unitId), m.forEach((p) => {
         s.push(p.unitId);
       });
     });
-    const o = r.getUngroupDrawingOp(t), { unitId: a, subUnitId: c, undo: u, redo: d, objects: l } = o;
-    return e.syncExecuteCommand(U.id, { op: d, unitId: a, subUnitId: c, objects: l, type: P.UNGROUP }) ? (n.pushUndoRedo({
+    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: U.id, params: { op: u, unitId: a, subUnitId: c, objects: Rs(l), type: P.GROUP } },
-        { id: F.id, params: s }
+        { id: P.id, params: { op: u, unitId: a, subUnitId: d, objects: fs(l), type: U.GROUP } },
+        { id: L.id, params: s }
       ],
       redoMutations: [
-        { id: U.id, params: { op: d, unitId: a, subUnitId: c, objects: l, type: P.UNGROUP } },
-        { id: F.id, params: s }
+        { id: P.id, params: { op: c, unitId: a, subUnitId: d, objects: l, type: U.UNGROUP } },
+        { id: L.id, params: s }
       ]
     }), !0) : !1;
   }
 };
-var Ms = Object.getOwnPropertyDescriptor, Es = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Ms(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+var ps = Object.getOwnPropertyDescriptor, ws = (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;
 }, ne = (i, t) => (e, n) => t(e, n, i);
-function Ts(i, t, e) {
+function _s(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 an(i, t, e, n, r) {
+function rn(i, t, e, n, r) {
   var S;
-  const { rotatedHeight: s, rotatedWidth: o } = Ts(e, n, r), c = i.get(q).getRenderById(t.unitId);
-  if (!c)
+  const { rotatedHeight: s, rotatedWidth: o } = _s(e, n, r), d = i.get(q).getRenderById(t.unitId);
+  if (!d)
     return !1;
-  const d = (S = c.with(V).getSkeletonParam(t.subUnitId)) == null ? void 0 : S.skeleton;
-  if (d == null)
+  const c = (S = d.with(V).getSkeletonParam(t.subUnitId)) == null ? void 0 : S.skeleton;
+  if (c == null)
     return !1;
-  const l = d.getCellByIndex(t.row, t.col), g = l.mergeInfo.endX - l.mergeInfo.startX - 2, h = l.mergeInfo.endY - l.mergeInfo.startY - 2, f = o / s, m = Math.ceil(Math.min(g, h * f)) / o, _ = !m || Number.isNaN(m) ? 1e-3 : m;
+  const l = c.getCellByIndex(t.row, t.col), g = l.mergeInfo.endX - l.mergeInfo.startX - 2, h = l.mergeInfo.endY - l.mergeInfo.startY - 2, m = o / s, f = Math.ceil(Math.min(g, h * m)) / o, _ = !f || Number.isNaN(f) ? 1e-3 : f;
   return {
     width: e * _,
     height: n * _
   };
 }
-let tt = class extends ie {
-  constructor(t, e, n, r, s, o, a, c, u, d, l, g, h) {
+let et = class extends ie {
+  constructor(t, e, n, r, s, o, a, d, u, c, l, g, h) {
     super();
     te(this, "_workbookSelections");
-    this._context = t, this._skeletonManagerService = e, this._commandService = n, this._selectionRenderService = r, this._imageIoService = s, this._fileOpenerService = o, this._sheetDrawingService = a, this._drawingManagerService = c, this._contextService = u, this._messageService = d, this._localeService = l, this._injector = h, this._workbookSelections = g.getWorkbookSelections(this._context.unitId), this._updateImageListener(), this._updateOrderListener(), this._groupDrawingListener(), this._focusDrawingListener();
+    this._context = t, this._skeletonManagerService = e, this._commandService = n, this._selectionRenderService = r, this._imageIoService = s, this._fileOpenerService = o, this._sheetDrawingService = a, this._drawingManagerService = 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: yn.map((n) => `.${n.replace("image/", "")}`).join(",")
+      accept: Cn.map((n) => `.${n.replace("image/", "")}`).join(",")
     }), e = t.length;
-    return e > Mn ? (this._messageService.show({
-      type: De.Error,
-      content: this._localeService.t("update-status.exceedMaxCount", String(Mn))
+    return e > Dn ? (this._messageService.show({
+      type: we.Error,
+      content: this._localeService.t("update-status.exceedMaxCount", String(Dn))
     }), !1) : e === 0 ? !1 : (t.forEach(async (n) => await this.insertFloatImageByFile(n)), !0);
   }
   async insertCellImage() {
     const e = (await this._fileOpenerService.openFile({
       multiple: !1,
-      accept: yn.map((n) => `.${n.replace("image/", "")}`).join(",")
+      accept: Cn.map((n) => `.${n.replace("image/", "")}`).join(",")
     }))[0];
     return e ? (await this._insertCellImage(e), !0) : !1;
   }
@@ -580,40 +575,40 @@ let tt = class extends ie {
       e = await this._imageIoService.saveImage(t);
     } catch (S) {
       const C = S.message;
-      C === Ne.ERROR_EXCEED_SIZE ? this._messageService.show({
-        type: De.Error,
-        content: this._localeService.t("update-status.exceedMaxSize", String(En / (1024 * 1024)))
-      }) : C === Ne.ERROR_IMAGE_TYPE ? this._messageService.show({
-        type: De.Error,
+      C === Pe.ERROR_EXCEED_SIZE ? this._messageService.show({
+        type: we.Error,
+        content: this._localeService.t("update-status.exceedMaxSize", String(bn / (1024 * 1024)))
+      }) : C === Pe.ERROR_IMAGE_TYPE ? this._messageService.show({
+        type: we.Error,
         content: this._localeService.t("update-status.invalidImageType")
-      }) : C === Ne.ERROR_IMAGE && this._messageService.show({
-        type: De.Error,
+      }) : C === Pe.ERROR_IMAGE && this._messageService.show({
+        type: we.Error,
         content: this._localeService.t("update-status.invalidImage")
       });
     }
     if (e == null)
       return;
-    const n = this._getUnitInfo(), { unitId: r, subUnitId: s } = n, { imageId: o, imageSourceType: a, source: c, base64Cache: u } = e, { width: d, height: l, image: g } = await Vt(u || ""), { width: h, height: f } = this._context.scene;
-    this._imageIoService.addImageSourceCache(c, a, g);
+    const n = this._getUnitInfo(), { unitId: r, subUnitId: s } = n, { imageId: o, imageSourceType: a, source: d, base64Cache: u } = e, { width: c, height: l, image: g } = await Lt(u || ""), { width: h, height: m } = this._context.scene;
+    this._imageIoService.addImageSourceCache(d, a, g);
     let p = 1;
-    if (d > Tn || l > On) {
-      const S = Tn / d, C = On / l;
+    if (c > Rn || l > Mn) {
+      const S = Rn / c, C = Mn / l;
       p = Math.max(S, C);
     }
-    const m = this._getImagePosition(d * p, l * p, h, f);
-    if (m == null)
+    const f = this._getImagePosition(c * p, l * p, h, m);
+    if (f == null)
       return;
     const _ = {
       unitId: r,
       subUnitId: s,
       drawingId: o,
-      drawingType: W.DRAWING_IMAGE,
+      drawingType: j.DRAWING_IMAGE,
       imageSourceType: a,
-      source: c,
-      transform: z(m, this._selectionRenderService, this._skeletonManagerService),
-      sheetTransform: m
+      source: d,
+      transform: z(f, this._selectionRenderService, this._skeletonManagerService),
+      sheetTransform: f
     };
-    return this._commandService.executeCommand(xt.id, {
+    return this._commandService.executeCommand(Wt.id, {
       unitId: r,
       drawings: [_]
     });
@@ -626,25 +621,25 @@ let tt = class extends ie {
       n = await this._imageIoService.saveImage(t);
     } catch (C) {
       const b = C.message;
-      b === Ne.ERROR_EXCEED_SIZE ? this._messageService.show({
-        type: De.Error,
-        content: this._localeService.t("update-status.exceedMaxSize", String(En / (1024 * 1024)))
-      }) : b === Ne.ERROR_IMAGE_TYPE ? this._messageService.show({
-        type: De.Error,
+      b === Pe.ERROR_EXCEED_SIZE ? this._messageService.show({
+        type: we.Error,
+        content: this._localeService.t("update-status.exceedMaxSize", String(bn / (1024 * 1024)))
+      }) : b === Pe.ERROR_IMAGE_TYPE ? this._messageService.show({
+        type: we.Error,
         content: this._localeService.t("update-status.invalidImageType")
-      }) : b === Ne.ERROR_IMAGE && this._messageService.show({
-        type: De.Error,
+      }) : b === Pe.ERROR_IMAGE && this._messageService.show({
+        type: we.Error,
         content: this._localeService.t("update-status.invalidImage")
       });
     }
     if (n == null)
       return !1;
-    const { imageId: r, imageSourceType: s, source: o, base64Cache: a } = n, { width: c, height: u, image: d } = await Vt(a || "");
-    this._imageIoService.addImageSourceCache(o, s, d);
+    const { imageId: r, imageSourceType: s, source: o, base64Cache: a } = n, { width: d, height: u, image: c } = await Lt(a || "");
+    this._imageIoService.addImageSourceCache(o, s, c);
     const l = this._workbookSelections.getCurrentLastSelection();
     if (!l)
       return !1;
-    const g = Jt("", {}), h = an(
+    const g = Ht("", {}), h = rn(
       this._injector,
       {
         unitId: this._context.unitId,
@@ -652,23 +647,23 @@ let tt = class extends ie {
         row: l.primary.actualRow,
         col: l.primary.actualColumn
       },
-      c,
+      d,
       u,
       0
     );
     if (!h)
       return !1;
-    const f = {
+    const m = {
       size: {
         width: h.width,
         height: h.height
       },
       positionH: {
-        relativeFrom: In.PAGE,
+        relativeFrom: wn.PAGE,
         posOffset: 0
       },
       positionV: {
-        relativeFrom: Sn.PARAGRAPH,
+        relativeFrom: pn.PARAGRAPH,
         posOffset: 0
       },
       angle: 0
@@ -676,22 +671,22 @@ let tt = class extends ie {
       unitId: g.getUnitId(),
       subUnitId: g.getUnitId(),
       drawingId: r,
-      drawingType: W.DRAWING_IMAGE,
+      drawingType: j.DRAWING_IMAGE,
       imageSourceType: s,
       source: o,
-      transform: Fn(f),
-      docTransform: f,
-      behindDoc: bn.FALSE,
+      transform: Bn(m),
+      docTransform: m,
+      behindDoc: Sn.FALSE,
       title: "",
       description: "",
-      layoutType: Dn.INLINE,
+      layoutType: vn.INLINE,
       // Insert inline drawing by default.
-      wrapText: Cn.BOTH_SIDES,
+      wrapText: _n.BOTH_SIDES,
       distB: 0,
       distL: 0,
       distR: 0,
       distT: 0
-    }, m = qt.drawing.add({
+    }, f = zt.drawing.add({
       documentDataModel: g,
       drawings: [p],
       selection: {
@@ -700,7 +695,7 @@ let tt = class extends ie {
         endOffset: 0
       }
     });
-    return m ? (g.apply(m), this._commandService.syncExecuteCommand($n.id, {
+    return f ? (g.apply(f), this._commandService.syncExecuteCommand(kn.id, {
       value: {
         [(_ = e == null ? void 0 : e.row) != null ? _ : l.primary.actualRow]: {
           [(S = e == null ? void 0 : e.col) != null ? S : l.primary.actualColumn]: {
@@ -716,12 +711,12 @@ let tt = class extends ie {
   // eslint-disable-next-line max-lines-per-function
   async insertCellImageByUrl(t, e) {
     var g, h;
-    const { width: n, height: r, image: s } = await Vt(t || "");
-    this._imageIoService.addImageSourceCache(t, Rn.URL, s);
+    const { width: n, height: r, image: s } = await Lt(t || "");
+    this._imageIoService.addImageSourceCache(t, In.URL, s);
     const o = this._workbookSelections.getCurrentLastSelection();
     if (!o)
       return !1;
-    const a = Jt("", {}), c = an(
+    const a = Ht("", {}), d = rn(
       this._injector,
       {
         unitId: this._context.unitId,
@@ -733,51 +728,51 @@ let tt = class extends ie {
       r,
       0
     );
-    if (!c)
+    if (!d)
       return !1;
     const u = {
       size: {
-        width: c.width,
-        height: c.height
+        width: d.width,
+        height: d.height
       },
       positionH: {
-        relativeFrom: In.PAGE,
+        relativeFrom: wn.PAGE,
         posOffset: 0
       },
       positionV: {
-        relativeFrom: Sn.PARAGRAPH,
+        relativeFrom: pn.PARAGRAPH,
         posOffset: 0
       },
       angle: 0
-    }, d = {
+    }, c = {
       unitId: a.getUnitId(),
       subUnitId: a.getUnitId(),
-      drawingId: Mt(),
-      drawingType: W.DRAWING_IMAGE,
-      imageSourceType: Rn.URL,
+      drawingId: bt(),
+      drawingType: j.DRAWING_IMAGE,
+      imageSourceType: In.URL,
       source: t,
-      transform: Fn(u),
+      transform: Bn(u),
       docTransform: u,
-      behindDoc: bn.FALSE,
+      behindDoc: Sn.FALSE,
       title: "",
       description: "",
-      layoutType: Dn.INLINE,
+      layoutType: vn.INLINE,
       // Insert inline drawing by default.
-      wrapText: Cn.BOTH_SIDES,
+      wrapText: _n.BOTH_SIDES,
       distB: 0,
       distL: 0,
       distR: 0,
       distT: 0
-    }, l = qt.drawing.add({
+    }, l = zt.drawing.add({
       documentDataModel: a,
-      drawings: [d],
+      drawings: [c],
       selection: {
         collapsed: !0,
         startOffset: 0,
         endOffset: 0
       }
     });
-    return l ? (a.apply(l), this._commandService.syncExecuteCommand($n.id, {
+    return l ? (a.apply(l), this._commandService.syncExecuteCommand(kn.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]: {
@@ -806,29 +801,29 @@ let tt = class extends ie {
       endColumn: 0
     };
     s && s.length > 0 && (o = s[s.length - 1].range);
-    const a = Jn(this._skeletonManagerService.getCurrent().skeleton, o);
+    const a = Vn(this._skeletonManagerService.getCurrent().skeleton, o);
     if (a == null)
       return;
-    let { startColumn: c, startRow: u, startX: d, startY: l } = a, g = !1;
-    if (d + t > n && (d = n - t, d < 0 && (d = 0, t = n), g = !0), l + e > r && (l = r - e, l < 0 && (l = 0, e = r), g = !0), g) {
-      const m = this._selectionRenderService.getCellWithCoordByOffset(d, l);
-      if (m == null)
+    let { startColumn: d, startRow: u, startX: c, startY: l } = a, g = !1;
+    if (c + t > n && (c = n - t, c < 0 && (c = 0, t = n), g = !0), l + e > r && (l = r - e, l < 0 && (l = 0, e = r), g = !0), g) {
+      const f = this._selectionRenderService.getCellWithCoordByOffset(c, l);
+      if (f == null)
         return;
-      d = m.startX, l = m.startY, c = m.actualColumn, u = m.actualRow;
+      c = f.startX, l = f.startY, d = f.actualColumn, u = f.actualRow;
     }
     const h = {
-      column: c,
+      column: d,
       columnOffset: 0,
       row: u,
       rowOffset: 0
-    }, f = this._selectionRenderService.getCellWithCoordByOffset(d + t, l + e);
-    if (f == null)
+    }, m = this._selectionRenderService.getCellWithCoordByOffset(c + t, l + e);
+    if (m == null)
       return;
     const p = {
-      column: f.actualColumn,
-      columnOffset: d + t - f.startX,
-      row: f.actualRow,
-      rowOffset: l + e - f.startY
+      column: m.actualColumn,
+      columnOffset: c + t - m.startX,
+      row: m.actualRow,
+      rowOffset: l + e - m.startY
     };
     return {
       from: h,
@@ -838,7 +833,7 @@ let tt = class extends ie {
   _updateOrderListener() {
     this.disposeWithMe(this._drawingManagerService.featurePluginOrderUpdate$.subscribe((t) => {
       const { unitId: e, subUnitId: n, drawingIds: r, arrangeType: s } = t;
-      this._commandService.executeCommand(Dr.id, {
+      this._commandService.executeCommand(vr.id, {
         unitId: e,
         subUnitId: n,
         drawingIds: r,
@@ -850,22 +845,22 @@ let tt = class extends ie {
     this.disposeWithMe(this._drawingManagerService.featurePluginUpdate$.subscribe((t) => {
       const e = [];
       t.length !== 0 && (t.forEach((n) => {
-        const { unitId: r, subUnitId: s, drawingId: o, drawingType: a, transform: c } = n;
-        if (c == null)
+        const { unitId: r, subUnitId: s, drawingId: o, drawingType: a, transform: d } = n;
+        if (d == null)
           return;
         const u = this._sheetDrawingService.getDrawingByParam({ unitId: r, subUnitId: s, drawingId: o });
         if (u == null || u.unitId !== this._context.unitId)
           return;
-        const d = x({ ...u.transform, ...c }, this._selectionRenderService);
-        if (d == null)
+        const c = x({ ...u.transform, ...d }, this._selectionRenderService);
+        if (c == null)
           return;
         const l = {
           ...n,
-          transform: { ...u.transform, ...c, ...z(d, this._selectionRenderService, this._skeletonManagerService) },
-          sheetTransform: { ...d }
+          transform: { ...u.transform, ...d, ...z(c, this._selectionRenderService, this._skeletonManagerService) },
+          sheetTransform: { ...c }
         };
         e.push(l);
-      }), e.length > 0 && this._commandService.executeCommand(Lt.id, {
+      }), e.length > 0 && this._commandService.executeCommand(jt.id, {
         unitId: t[0].unitId,
         drawings: e
       }));
@@ -873,44 +868,44 @@ let tt = class extends ie {
   }
   _groupDrawingListener() {
     this.disposeWithMe(this._drawingManagerService.featurePluginGroupUpdate$.subscribe((t) => {
-      this._commandService.executeCommand(Cr.id, t);
+      this._commandService.executeCommand(_r.id, t);
       const { unitId: e, subUnitId: n, drawingId: r } = t[0].parent;
-      this._commandService.syncExecuteCommand(jt.id, [{ unitId: e, subUnitId: n, drawingId: r }]);
+      this._commandService.syncExecuteCommand(Nt.id, [{ unitId: e, subUnitId: n, drawingId: r }]);
     })), this.disposeWithMe(this._drawingManagerService.featurePluginUngroupUpdate$.subscribe((t) => {
-      this._commandService.executeCommand(br.id, t);
+      this._commandService.executeCommand(Sr.id, t);
     }));
   }
   _focusDrawingListener() {
     this.disposeWithMe(
       this._drawingManagerService.focus$.subscribe((t) => {
-        t == null || t.length === 0 ? (this._contextService.setContextValue(Fe, !1), this._sheetDrawingService.focusDrawing([])) : (this._contextService.setContextValue(Fe, !0), this._sheetDrawingService.focusDrawing(t));
+        t == null || t.length === 0 ? (this._contextService.setContextValue(xe, !1), this._sheetDrawingService.focusDrawing([])) : (this._contextService.setContextValue(xe, !0), this._sheetDrawingService.focusDrawing(t));
       })
     );
   }
 };
-tt = Es([
+et = ws([
   ne(1, A(V)),
   ne(2, G),
-  ne(3, Ve),
-  ne(4, zn),
-  ne(5, Ni),
+  ne(3, Ge),
+  ne(4, ii),
+  ne(5, Pi),
   ne(6, oe),
   ne(7, se),
-  ne(8, Hn),
-  ne(9, ki),
-  ne(10, A(rt)),
-  ne(11, A(hn)),
-  ne(12, A(Xe))
-], tt);
-var Os = Object.getOwnPropertyDescriptor, Ps = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Os(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+  ne(8, Yn),
+  ne(9, Hn),
+  ne(10, A(nt)),
+  ne(11, A(dn)),
+  ne(12, A(Ye))
+], et);
+var vs = Object.getOwnPropertyDescriptor, Ss = (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;
-}, We = (i, t) => (e, n) => t(e, n, i);
-function Rr(i, t, e) {
+}, ke = (i, t) => (e, n) => t(e, n, i);
+function Ir(i, t, e) {
   var n, r, s, o;
   if (((r = (n = e == null ? void 0 : e.p) == null ? void 0 : n.body) == null ? void 0 : r.dataStream.length) === 3 && ((o = (s = e.p) == null ? void 0 : s.drawingsOrder) == null ? void 0 : o.length) === 1) {
-    const a = e.p.drawings[e.p.drawingsOrder[0]], c = an(
+    const a = e.p.drawings[e.p.drawingsOrder[0]], d = rn(
       i,
       {
         unitId: t.unitId,
@@ -922,52 +917,52 @@ function Rr(i, t, e) {
       a.docTransform.size.height,
       a.docTransform.angle
     );
-    if (c)
-      return a.transform.width = c.width, a.transform.height = c.height, a.docTransform.size.width = c.width, a.docTransform.size.height = c.height, a.transform.left = 0, a.transform.top = 0, a.docTransform.positionH.posOffset = 0, a.docTransform.positionV.posOffset = 0, e.p.documentStyle.pageSize.width = 1 / 0, e.p.documentStyle.pageSize.height = 1 / 0, !0;
+    if (d)
+      return a.transform.width = d.width, a.transform.height = d.height, a.docTransform.size.width = d.width, a.docTransform.size.height = d.height, a.transform.left = 0, a.transform.top = 0, a.docTransform.positionH.posOffset = 0, a.docTransform.positionV.posOffset = 0, e.p.documentStyle.pageSize.width = 1 / 0, e.p.documentStyle.pageSize.height = 1 / 0, !0;
   }
   return !1;
 }
-let Ot = class extends ie {
+let Mt = class extends ie {
   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();
   }
   _handleInitEditor() {
     this.disposeWithMe(this._editorBridgeService.visible$.subscribe((i) => {
-      i.visible ? i.visible && (this._drawingManagerService.removeDrawingDataForUnit(et), this._docDrawingController.loadDrawingDataForUnit(et), this._drawingManagerService.initializeNotification(et)) : this._drawingManagerService.removeDrawingDataForUnit(et);
+      i.visible ? i.visible && (this._drawingManagerService.removeDrawingDataForUnit(qe), this._docDrawingController.loadDrawingDataForUnit(qe), this._drawingManagerService.initializeNotification(qe)) : this._drawingManagerService.removeDrawingDataForUnit(qe);
     })), this.disposeWithMe(this._commandService.onCommandExecuted((i) => {
-      i.id === cs.id && i.params.unitId === xe && (this._drawingManagerService.removeDrawingDataForUnit(xe), this._docDrawingController.loadDrawingDataForUnit(xe), this._drawingManagerService.initializeNotification(xe));
+      i.id === rs.id && i.params.unitId === Be && (this._drawingManagerService.removeDrawingDataForUnit(Be), this._docDrawingController.loadDrawingDataForUnit(Be), this._drawingManagerService.initializeNotification(Be));
     }));
   }
   _initCellContentInterceptor() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        Vi.CELL_CONTENT,
+        Gi.CELL_CONTENT,
         {
-          effect: Fr.Style,
-          priority: Hi.CELL_IMAGE,
+          effect: Br.Style,
+          priority: Xi.CELL_IMAGE,
           handler: (i, t, e) => {
             var n;
-            return i != null && i.p && ((n = i.p.drawingsOrder) != null && n.length) && (i.interceptorStyle || (i.interceptorStyle = {}), i.interceptorStyle.tr = { a: 0 }, Rr(this._injector, { unitId: t.unitId, subUnitId: t.subUnitId, row: t.row, col: t.col }, i)), e(i);
+            return i != null && i.p && ((n = i.p.drawingsOrder) != null && n.length) && (i.interceptorStyle || (i.interceptorStyle = {}), i.interceptorStyle.tr = { a: 0 }, Ir(this._injector, { unitId: t.unitId, subUnitId: t.subUnitId, row: t.row, col: t.col }, i)), e(i);
           }
         }
       )
     );
   }
 };
-Ot = Ps([
-  We(0, G),
-  We(1, A($t)),
-  We(2, A(Xe)),
-  We(3, se),
-  We(4, A(oi)),
-  We(5, A(Di))
-], Ot);
-var Us = Object.getOwnPropertyDescriptor, As = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Us(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+Mt = Ss([
+  ke(0, G),
+  ke(1, A(kt)),
+  ke(2, A(Ye)),
+  ke(3, se),
+  ke(4, A(ni)),
+  ke(5, A(Di))
+], Mt);
+var Is = Object.getOwnPropertyDescriptor, Cs = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Is(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, Gn = (i, t) => (e, n) => t(e, n, i);
-let Pt = class extends ie {
+}, xn = (i, t) => (e, n) => t(e, n, i);
+let yt = class extends ie {
   constructor(i, t) {
     super(), this._autoFillService = i, this._injector = t, this._initAutoFillHooks();
   }
@@ -976,35 +971,35 @@ let Pt = class extends ie {
       this._autoFillService.addHook({
         id: "sheet-cell-image-autofill",
         onBeforeSubmit: (i, t, e, n) => {
-          new Yr(n).forValue((r, s, o) => {
-            Rr(this._injector, { unitId: i.unitId, subUnitId: i.subUnitId, row: r, col: s }, o);
+          new $r(n).forValue((r, s, o) => {
+            Ir(this._injector, { unitId: i.unitId, subUnitId: i.subUnitId, row: r, col: s }, o);
           });
         }
       })
     );
   }
 };
-Pt = As([
-  Gn(0, A(bi)),
-  Gn(1, A(Xe))
-], Pt);
-var Ns = Object.getOwnPropertyDescriptor, ks = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Ns(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+yt = Cs([
+  xn(0, A(bi)),
+  xn(1, A(Ye))
+], yt);
+var Ds = Object.getOwnPropertyDescriptor, bs = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Ds(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, Ze = (i, t) => (e, n) => t(e, n, i);
-const Bs = [
-  et,
-  Gr,
-  xe
+}, ze = (i, t) => (e, n) => t(e, n, i);
+const Rs = [
+  qe,
+  xr,
+  Be
 ];
-let Ut = class extends ie {
+let Et = class extends ie {
   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 = Jt("", {}), e = (r = dn(L.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.with(Ri), n = qt.drawing.add({
+    const t = Ht("", {}), e = (r = on(F.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.with(Ri), n = zt.drawing.add({
       documentDataModel: t,
       drawings: [i],
       selection: {
@@ -1019,20 +1014,20 @@ let Ut = class extends ie {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((i) => {
         var t, e;
-        if (i.id === ds.id) {
-          const n = i.params, { doc: r } = n, s = this._univerInstanceService.getCurrentUnitOfType(L.UNIVER_DOC);
+        if (i.id === is.id) {
+          const n = i.params, { doc: r } = n, s = this._univerInstanceService.getCurrentUnitOfType(F.UNIVER_DOC);
           if (s == null || !Object.keys((t = r.drawings) != null ? t : {}).length)
             return;
           const o = s.getUnitId();
-          if (Bs.includes(o)) {
-            if (o !== xe) {
+          if (Rs.includes(o)) {
+            if (o !== Be) {
               const a = () => {
-                this._dialogService.close("sheet-cell-image-copy-paste"), this._commandService.syncExecuteCommand(Un.id, {
+                this._dialogService.close("sheet-cell-image-copy-paste"), this._commandService.syncExecuteCommand(En.id, {
                   visible: !1
                 });
               };
               ((e = s.getBody()) == null ? void 0 : e.dataStream) === `\r
-` ? (this._commandService.syncExecuteCommand(Un.id, {
+` ? (this._commandService.syncExecuteCommand(En.id, {
                 visible: !1
               }), this._setCellImage(Object.values(r.drawings)[0])) : this._dialogService.open({
                 id: "sheet-cell-image-copy-paste",
@@ -1060,64 +1055,64 @@ let Ut = class extends ie {
     );
   }
 };
-Ut = ks([
-  Ze(0, G),
-  Ze(1, Se),
-  Ze(2, Bi),
-  Ze(3, q),
-  Ze(4, A(rt))
-], Ut);
-const Ft = {
+Et = bs([
+  ze(0, G),
+  ze(1, Se),
+  ze(2, Ai),
+  ze(3, q),
+  ze(4, A(nt))
+], Et);
+const Bt = {
   id: "sheet.command.insert-float-image",
   type: J.COMMAND,
   handler: async (i, t) => {
     var o, a;
-    const e = i.get(Se), n = i.get(q), r = (o = dn(
-      L.UNIVER_SHEET,
+    const e = i.get(Se), n = i.get(q), r = (o = on(
+      F.UNIVER_SHEET,
       e,
       n
-    )) == null ? void 0 : o.with(tt);
+    )) == null ? void 0 : o.with(et);
     if (!r)
       return !1;
     const s = t == null ? void 0 : t.files;
     if (s) {
-      const c = s.map((u) => r.insertFloatImageByFile(u));
-      return (await Promise.all(c)).every((u) => u);
+      const d = s.map((u) => r.insertFloatImageByFile(u));
+      return (await Promise.all(d)).every((u) => u);
     } else
       return (a = r.insertFloatImage()) != null ? a : !1;
   }
-}, mn = {
+}, ln = {
   id: "sheet.command.insert-cell-image",
   type: J.COMMAND,
   handler: (i) => {
     var n, r;
     const t = i.get(Se), e = i.get(q);
-    return (r = (n = dn(
-      L.UNIVER_SHEET,
+    return (r = (n = on(
+      F.UNIVER_SHEET,
       t,
       e
-    )) == null ? void 0 : n.with(tt).insertCellImage()) != null ? r : !1;
+    )) == null ? void 0 : n.with(et).insertCellImage()) != null ? r : !1;
   }
 };
-var Ws = Object.getOwnPropertyDescriptor, js = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Ws(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+var Ms = Object.getOwnPropertyDescriptor, ys = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Ms(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, Je = (i, t) => (e, n) => t(e, n, i);
-const yr = "image/png";
-function $s(i) {
+}, Ke = (i, t) => (e, n) => t(e, n, i);
+const Cr = "image/png";
+function Es(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: yr });
+  return new Blob([r], { type: Cr });
 }
-function xs(i) {
-  const t = new ClipboardItem({ [yr]: $s(i) });
+function Ts(i) {
+  const t = new ClipboardItem({ [Cr]: Es(i) });
   navigator.clipboard.write([t]).catch((e) => {
     console.error("Could not copy image using clipboard API: ", e);
   });
 }
-function Ls() {
+function Os() {
   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;
@@ -1127,13 +1122,13 @@ function Ls() {
     e.blur(), document.body.removeChild(e), t instanceof HTMLElement && t.focus();
   };
 }
-const Xn = [
-  Le.SPECIAL_PASTE_COL_WIDTH,
-  Le.SPECIAL_PASTE_VALUE,
-  Le.SPECIAL_PASTE_FORMAT,
-  Le.SPECIAL_PASTE_FORMULA
+const Fn = [
+  $e.SPECIAL_PASTE_COL_WIDTH,
+  $e.SPECIAL_PASTE_VALUE,
+  $e.SPECIAL_PASTE_FORMAT,
+  $e.SPECIAL_PASTE_FORMULA
 ];
-let At = class extends ie {
+let Tt = class extends ie {
   constructor(t, e, n, r, s) {
     super();
     te(this, "_copyInfo");
@@ -1151,15 +1146,15 @@ let At = class extends ie {
         if (s.length > 0) {
           const [o] = s;
           if (r === Ce.CUT) {
-            const c = {
+            const d = {
               unitId: t,
               drawings: [o]
             };
-            this._commandService.executeCommand(it.id, c);
+            this._commandService.executeCommand(rt.id, d);
           }
           setTimeout(() => {
-            const c = Ls();
-            o.drawingType === W.DRAWING_IMAGE && o.imageSourceType === ci.BASE64 ? xs(o.source) : this._clipboardInterfaceService.writeText(""), c();
+            const d = Os();
+            o.drawingType === j.DRAWING_IMAGE && o.imageSourceType === si.BASE64 ? Ts(o.source) : this._clipboardInterfaceService.writeText(""), d();
           }, 200);
           const a = {
             unitId: o.unitId,
@@ -1175,14 +1170,14 @@ let At = class extends ie {
       onPasteCells: (t, e, n, r) => {
         if (!this._copyInfo)
           return { redos: [], undos: [] };
-        const { copyType: s = Ce.COPY, pasteType: o } = r, { range: a } = t || {}, { range: c, unitId: u, subUnitId: d } = e;
-        return this._copyInfo.copyRange ? this._generateRangeDrawingsPasteMutations({ pasteType: o, unitId: u, subUnitId: d, pasteRange: c }, { copyRange: a, copyType: s }) : this._generateSingleDrawingPasteMutations({ pasteTo: e, pasteType: o }, Ce.COPY);
+        const { copyType: s = Ce.COPY, pasteType: o } = r, { range: a } = t || {}, { range: d, unitId: u, subUnitId: c } = e;
+        return this._copyInfo.copyRange ? this._generateRangeDrawingsPasteMutations({ pasteType: o, unitId: u, subUnitId: c, pasteRange: d }, { copyRange: a, copyType: s }) : this._generateSingleDrawingPasteMutations({ pasteTo: e, pasteType: o }, Ce.COPY);
       },
       onPastePlainText: (t, e) => ({ undos: [], redos: [] }),
-      onPasteUnrecognized: (t) => this._copyInfo ? this._generateSingleDrawingPasteMutations({ pasteTo: t, pasteType: Le.DEFAULT_PASTE }, Ce.COPY) : { undos: [], redos: [] },
+      onPasteUnrecognized: (t) => this._copyInfo ? this._generateSingleDrawingPasteMutations({ pasteTo: t, pasteType: $e.DEFAULT_PASTE }, Ce.COPY) : { undos: [], redos: [] },
       onPasteFiles: (t, e) => {
         if (this._copyInfo)
-          return this._generateSingleDrawingPasteMutations({ pasteTo: t, pasteType: Le.DEFAULT_PASTE }, Ce.COPY);
+          return this._generateSingleDrawingPasteMutations({ pasteTo: t, pasteType: $e.DEFAULT_PASTE }, Ce.COPY);
         {
           const n = e.filter((r) => r.type.includes("image"));
           if (n.length)
@@ -1190,7 +1185,7 @@ let At = class extends ie {
               undos: [],
               redos: [
                 {
-                  id: Ft.id,
+                  id: Bt.id,
                   params: { files: n }
                 }
               ]
@@ -1207,18 +1202,18 @@ let At = class extends ie {
     const s = r.attachRangeWithCoord(n);
     if (!s)
       return;
-    const { startX: o, endX: a, startY: c, endY: u } = s, d = this._drawingService.getDrawingData(t, e), l = this._focusedDrawings.slice();
-    if (Object.keys(d).forEach((h) => {
-      const f = d[h], { transform: p } = f;
-      if (f.anchorType !== O.Both || !p)
+    const { startX: o, endX: a, startY: d, endY: u } = s, c = this._drawingService.getDrawingData(t, e), l = this._focusedDrawings.slice();
+    if (Object.keys(c).forEach((h) => {
+      const m = c[h], { transform: p } = m;
+      if (m.anchorType !== O.Both || !p)
         return;
-      const { left: m = 0, top: _ = 0, width: S = 0, height: C = 0 } = p, { drawingStartX: b, drawingEndX: v, drawingStartY: D, drawingEndY: w } = {
-        drawingStartX: m,
-        drawingEndX: m + S,
+      const { left: f = 0, top: _ = 0, width: S = 0, height: C = 0 } = p, { drawingStartX: b, drawingEndX: v, drawingStartY: D, drawingEndY: w } = {
+        drawingStartX: f,
+        drawingEndX: f + S,
         drawingStartY: _,
         drawingEndY: _ + C
       };
-      o <= b && v <= a && c <= D && w <= u && l.push(f);
+      o <= b && v <= a && d <= D && w <= u && l.push(m);
     }), l.length)
       return {
         copyRange: n,
@@ -1229,31 +1224,31 @@ let At = class extends ie {
   }
   _generateSingleDrawingPasteMutations(t, e) {
     const { pasteType: n, pasteTo: r } = t;
-    if (Xn.includes(n))
+    if (Fn.includes(n))
       return { redos: [], undos: [] };
-    const { unitId: s, subUnitId: o, range: a } = r, c = this._renderManagerService.getRenderById(s), u = c == null ? void 0 : c.with(V), d = c == null ? void 0 : c.with(Ve), l = this._copyInfo;
-    if (!u || !d)
+    const { unitId: s, subUnitId: o, range: a } = r, d = this._renderManagerService.getRenderById(s), u = d == null ? void 0 : d.with(V), c = d == null ? void 0 : d.with(Ge), l = this._copyInfo;
+    if (!u || !c)
       return { redos: [], undos: [] };
-    const { drawings: g } = l, h = An(a);
+    const { drawings: g } = l, h = Tn(a);
     return this._generateMutations(g, {
       unitId: s,
       subUnitId: o,
       isCut: e === Ce.CUT,
-      getTransform: (f, p) => {
+      getTransform: (m, p) => {
         var S;
-        const m = u.attachRangeWithCoord({
+        const f = u.attachRangeWithCoord({
           startRow: h.startRow,
           endRow: h.endRow,
           startColumn: h.startColumn,
           endColumn: h.endColumn
         }), _ = {
-          ...f,
-          left: m == null ? void 0 : m.startX,
-          top: m == null ? void 0 : m.startY
+          ...m,
+          left: f == null ? void 0 : f.startX,
+          top: f == null ? void 0 : f.startY
         };
         return {
           transform: _,
-          sheetTransform: (S = x(_, d)) != null ? S : p
+          sheetTransform: (S = x(_, c)) != null ? S : p
         };
       }
     });
@@ -1264,49 +1259,49 @@ let At = class extends ie {
       subUnitId: r,
       getTransform: s,
       isCut: o
-    } = e, a = [], c = [], { _drawingService: u } = this;
-    return t.forEach((d) => {
-      const { transform: l, sheetTransform: g } = d;
+    } = e, a = [], d = [], { _drawingService: u } = this;
+    return t.forEach((c) => {
+      const { transform: l, sheetTransform: g } = c;
       if (!l)
         return;
-      const h = s(l, g), f = {
-        ...d,
+      const h = s(l, g), m = {
+        ...c,
         unitId: n,
         subUnitId: r,
-        drawingId: o ? d.drawingId : ye.generateRandomId(),
+        drawingId: o ? c.drawingId : Re.generateRandomId(),
         transform: h.transform,
         sheetTransform: h.sheetTransform
       };
       if (o) {
-        const { undo: p, redo: m, objects: _ } = u.getBatchUpdateOp([f]);
+        const { undo: p, redo: f, objects: _ } = u.getBatchUpdateOp([m]);
         a.push({
-          id: U.id,
+          id: P.id,
           params: {
             unitId: n,
             subUnitId: r,
-            type: P.UPDATE,
-            op: m,
+            type: U.UPDATE,
+            op: f,
             objects: _
           }
-        }), c.push({
-          id: U.id,
+        }), d.push({
+          id: P.id,
           params: {
             unitId: n,
             subUnitId: r,
-            type: P.UPDATE,
+            type: U.UPDATE,
             op: p,
             objects: _
           }
         });
       } else {
-        const { undo: p, redo: m, objects: _ } = u.getBatchAddOp([f]);
-        a.push({ id: U.id, params: { op: m, unitId: n, subUnitId: r, objects: _, type: P.INSERT } }), c.push({ id: U.id, params: { op: p, unitId: n, subUnitId: r, objects: _, type: P.REMOVE } });
+        const { undo: p, redo: f, objects: _ } = u.getBatchAddOp([m]);
+        a.push({ id: P.id, params: { op: f, unitId: n, subUnitId: r, objects: _, type: U.INSERT } }), d.push({ id: P.id, params: { op: p, unitId: n, subUnitId: r, objects: _, type: U.REMOVE } });
       }
-    }), { redos: a, undos: c };
+    }), { redos: a, undos: d };
   }
   // eslint-disable-next-line max-lines-per-function
   _generateRangeDrawingsPasteMutations(t, e) {
-    var M;
+    var y;
     const {
       unitId: n,
       subUnitId: r,
@@ -1314,43 +1309,43 @@ let At = class extends ie {
       pasteRange: o
     } = t, {
       copyRange: a,
-      copyType: c
+      copyType: d
     } = e;
-    if (Xn.includes(s))
+    if (Fn.includes(s))
       return { redos: [], undos: [] };
-    const u = (M = this._renderManagerService.getRenderById(n)) == null ? void 0 : M.with(V);
+    const u = (y = this._renderManagerService.getRenderById(n)) == null ? void 0 : y.with(V);
     if (!u || !this._copyInfo)
       return { redos: [], undos: [] };
-    const { drawings: d } = this._copyInfo;
+    const { drawings: c } = this._copyInfo;
     if (!a)
       return this._generateSingleDrawingPasteMutations({
-        pasteTo: { unitId: n, subUnitId: r, range: An(o) },
+        pasteTo: { unitId: n, subUnitId: r, range: Tn(o) },
         pasteType: s
-      }, c);
-    const { ranges: [l, g], mapFunc: h } = yi([a, o]), { row: f, col: p } = h(l.startRow, l.startColumn), { row: m, col: _ } = h(g.startRow, g.startColumn), S = u.attachRangeWithCoord({
-      startRow: f,
-      endRow: f,
+      }, d);
+    const { ranges: [l, g], mapFunc: h } = Mi([a, o]), { row: m, col: p } = h(l.startRow, l.startColumn), { row: f, col: _ } = h(g.startRow, g.startColumn), S = u.attachRangeWithCoord({
+      startRow: m,
+      endRow: m,
       startColumn: p,
       endColumn: p
     }), C = u.attachRangeWithCoord({
-      startRow: m,
-      endRow: m,
+      startRow: f,
+      endRow: f,
       startColumn: _,
       endColumn: _
     });
     if (!S || !C || !this._copyInfo)
       return { redos: [], undos: [] };
-    const b = C.startX - S.startX, v = C.startY - S.startY, D = m - f, w = _ - p;
-    return this._generateMutations(d, {
+    const b = C.startX - S.startX, v = C.startY - S.startY, D = f - m, w = _ - p;
+    return this._generateMutations(c, {
       unitId: n,
       subUnitId: r,
       getTransform: (I, E) => {
-        var T, y;
+        var T, M;
         return {
           transform: {
             ...I,
             left: ((T = I == null ? void 0 : I.left) != null ? T : 0) + b,
-            top: ((y = I == null ? void 0 : I.top) != null ? y : 0) + v
+            top: ((M = I == null ? void 0 : I.top) != null ? M : 0) + v
           },
           sheetTransform: {
             ...E,
@@ -1367,40 +1362,40 @@ let At = class extends ie {
           }
         };
       },
-      isCut: c === Ce.CUT
+      isCut: d === Ce.CUT
     });
   }
 };
-At = js([
-  Je(0, Mi),
-  Je(1, q),
-  Je(2, se),
-  Je(3, Wi),
-  Je(4, G)
-], At);
-var Fs = Object.getOwnPropertyDescriptor, Ys = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Fs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+Tt = ys([
+  Ke(0, yi),
+  Ke(1, q),
+  Ke(2, se),
+  Ke(3, Ni),
+  Ke(4, G)
+], Tt);
+var Us = Object.getOwnPropertyDescriptor, Ps = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Us(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, qe = (i, t) => (e, n) => t(e, n, i);
-let Nt = class extends ie {
+}, Ze = (i, t) => (e, n) => t(e, n, i);
+let Ot = class extends ie {
   constructor(i, t, e, n, r) {
     super(), this._drawingManagerService = i, this._renderManagerService = t, this._permissionService = e, this._univerInstanceService = n, this._userManagerService = r, this._initDrawingVisible(), this._initDrawingEditable(), this._initViewPermissionChange(), this._initEditPermissionChange();
   }
   _initDrawingVisible() {
-    const i = this._univerInstanceService.getCurrentTypeOfUnit$(L.UNIVER_SHEET), t = this._userManagerService.currentUser$, e = St([i, t]);
+    const i = this._univerInstanceService.getCurrentTypeOfUnit$(F.UNIVER_SHEET), t = this._userManagerService.currentUser$, e = vt([i, t]);
     this.disposeWithMe(
       e.pipe(
         _e(([n, r]) => n ? n.activeSheet$.pipe(
-          Bn((s) => {
+          Pn((s) => {
             if (!s) {
               this._drawingManagerService.setDrawingVisible(!1);
               return;
             }
             const o = n.getUnitId(), a = s.getSheetId();
             this._permissionService.composePermission([
-              new xn(o).id,
-              new Ln(o, a).id
+              new Wn(o).id,
+              new jn(o, a).id
             ]).every((u) => u.value) ? this._drawingManagerService.setDrawingVisible(!0) : this._handleDrawingVisibilityFalse(n, s);
           })
         ) : (this._drawingManagerService.setDrawingVisible(!1), me))
@@ -1413,23 +1408,23 @@ let Nt = class extends ie {
     if (!a)
       return;
     a.getAllObjectsByOrder().forEach((u) => {
-      u.classType === ke.IMAGE && s.some((d) => u.oKey.includes(d.drawingId)) && a.removeObject(u);
+      u.classType === Ae.IMAGE && s.some((c) => u.oKey.includes(c.drawingId)) && a.removeObject(u);
     });
   }
   _initDrawingEditable() {
-    const i = this._univerInstanceService.getCurrentTypeOfUnit$(L.UNIVER_SHEET), t = this._userManagerService.currentUser$, e = St([i, t]);
+    const i = this._univerInstanceService.getCurrentTypeOfUnit$(F.UNIVER_SHEET), t = this._userManagerService.currentUser$, e = vt([i, t]);
     this.disposeWithMe(
       e.pipe(
         _e(([n, r]) => n ? n.activeSheet$.pipe(
-          Bn((s) => {
+          Pn((s) => {
             if (!s) {
               this._drawingManagerService.setDrawingEditable(!1);
               return;
             }
             const o = n.getUnitId(), a = s.getSheetId();
             this._permissionService.composePermission([
-              new Qt(o).id,
-              new en(o, a).id
+              new Kt(o).id,
+              new Zt(o, a).id
             ]).every((u) => u.value) ? this._drawingManagerService.setDrawingEditable(!0) : this._handleDrawingEditableFalse(n, s);
           })
         ) : (this._drawingManagerService.setDrawingEditable(!1), me))
@@ -1442,31 +1437,31 @@ let Nt = class extends ie {
     if (!a)
       return;
     a.getAllObjectsByOrder().forEach((u) => {
-      u.classType === ke.IMAGE && s.some((d) => u.oKey.includes(d.drawingId)) && a.detachTransformerFrom(u);
+      u.classType === Ae.IMAGE && s.some((c) => u.oKey.includes(c.drawingId)) && a.detachTransformerFrom(u);
     });
   }
   _initViewPermissionChange() {
-    const i = this._univerInstanceService.getCurrentTypeOfUnit$(L.UNIVER_SHEET), t = this._userManagerService.currentUser$;
+    const i = this._univerInstanceService.getCurrentTypeOfUnit$(F.UNIVER_SHEET), t = this._userManagerService.currentUser$;
     this.disposeWithMe(
-      St([i, t]).pipe(
+      vt([i, t]).pipe(
         _e(([e, n]) => e ? e.activeSheet$.pipe(
           _e((r) => {
             if (!r)
               return me;
-            const s = e.getUnitId(), o = r.getSheetId(), a = this._renderManagerService.getRenderById(s), c = a == null ? void 0 : a.scene;
-            if (!c)
+            const s = e.getUnitId(), o = r.getSheetId(), a = this._renderManagerService.getRenderById(s), d = a == null ? void 0 : a.scene;
+            if (!d)
               return me;
-            const u = c.getTransformerByCreate();
+            const u = d.getTransformerByCreate();
             return this._permissionService.composePermission$([
-              new xn(s).id,
-              new Ln(s, o).id
+              new Wn(s).id,
+              new jn(s, o).id
             ]).pipe(
-              Ee((l) => l.every((g) => g.value)),
-              Wn()
+              Me((l) => l.every((g) => g.value)),
+              An()
             ).pipe(
-              Ee((l) => ({
+              Me((l) => ({
                 permission: l,
-                scene: c,
+                scene: d,
                 transformer: u,
                 unitId: s,
                 subUnitId: o
@@ -1477,14 +1472,14 @@ let Nt = class extends ie {
       ).subscribe({
         next: ({ permission: e, scene: n, transformer: r, unitId: s, subUnitId: o }) => {
           this._drawingManagerService.setDrawingVisible(e);
-          const a = n.getAllObjectsByOrder(), c = this._drawingManagerService.getDrawingData(s, o), u = Object.values(c);
-          e ? this._drawingManagerService.addNotification(u) : (a.forEach((d) => {
-            d.classType === ke.IMAGE && u.some((l) => d.oKey.includes(l.drawingId)) && n.removeObject(d);
+          const a = n.getAllObjectsByOrder(), d = this._drawingManagerService.getDrawingData(s, o), u = Object.values(d);
+          e ? this._drawingManagerService.addNotification(u) : (a.forEach((c) => {
+            c.classType === Ae.IMAGE && u.some((l) => c.oKey.includes(l.drawingId)) && n.removeObject(c);
           }), r.clearSelectedObjects());
         },
         complete: () => {
           this._drawingManagerService.setDrawingVisible(!0);
-          const e = this._univerInstanceService.getCurrentUnitForType(L.UNIVER_SHEET), n = e == null ? void 0 : e.getActiveSheet(), r = e == null ? void 0 : e.getUnitId(), s = n == null ? void 0 : n.getSheetId();
+          const e = this._univerInstanceService.getCurrentUnitForType(F.UNIVER_SHEET), n = e == null ? void 0 : e.getActiveSheet(), r = e == null ? void 0 : e.getUnitId(), s = n == null ? void 0 : n.getSheetId();
           if (!r || !s)
             return;
           const o = this._drawingManagerService.getDrawingData(r, s), a = Object.values(o);
@@ -1494,27 +1489,27 @@ let Nt = class extends ie {
     );
   }
   _initEditPermissionChange() {
-    const i = this._univerInstanceService.getCurrentTypeOfUnit$(L.UNIVER_SHEET), t = this._userManagerService.currentUser$;
+    const i = this._univerInstanceService.getCurrentTypeOfUnit$(F.UNIVER_SHEET), t = this._userManagerService.currentUser$;
     this.disposeWithMe(
-      St([i, t]).pipe(
+      vt([i, t]).pipe(
         _e(([e, n]) => e ? e.activeSheet$.pipe(
           _e((r) => {
             if (!r)
               return me;
-            const s = e.getUnitId(), o = r.getSheetId(), a = this._renderManagerService.getRenderById(s), c = a == null ? void 0 : a.scene;
-            if (!c)
+            const s = e.getUnitId(), o = r.getSheetId(), a = this._renderManagerService.getRenderById(s), d = a == null ? void 0 : a.scene;
+            if (!d)
               return me;
-            const u = c.getTransformerByCreate();
+            const u = d.getTransformerByCreate();
             return this._permissionService.composePermission$([
-              new Qt(s).id,
-              new en(s, o).id
+              new Kt(s).id,
+              new Zt(s, o).id
             ]).pipe(
-              Ee((l) => l.every((g) => g.value)),
-              Wn()
+              Me((l) => l.every((g) => g.value)),
+              An()
             ).pipe(
-              Ee((l) => ({
+              Me((l) => ({
                 permission: l,
-                scene: c,
+                scene: d,
                 transformer: u,
                 unitId: s,
                 subUnitId: o
@@ -1525,15 +1520,15 @@ let Nt = class extends ie {
       ).subscribe({
         next: ({ permission: e, scene: n, transformer: r, unitId: s, subUnitId: o }) => {
           this._drawingManagerService.setDrawingEditable(e);
-          const a = n.getAllObjectsByOrder(), c = this._drawingManagerService.getDrawingData(s, o), u = Object.values(c);
-          e ? (a.forEach((d) => {
-            d.classType === ke.IMAGE && u.some((l) => d.oKey.includes(l.drawingId)) && n.attachTransformerTo(d);
-          }), this._drawingManagerService.addNotification(u)) : (a.forEach((d) => {
-            d.classType === ke.IMAGE && u.some((l) => d.oKey.includes(l.drawingId)) && n.detachTransformerFrom(d);
+          const a = n.getAllObjectsByOrder(), d = this._drawingManagerService.getDrawingData(s, o), u = Object.values(d);
+          e ? (a.forEach((c) => {
+            c.classType === Ae.IMAGE && u.some((l) => c.oKey.includes(l.drawingId)) && n.attachTransformerTo(c);
+          }), this._drawingManagerService.addNotification(u)) : (a.forEach((c) => {
+            c.classType === Ae.IMAGE && u.some((l) => c.oKey.includes(l.drawingId)) && n.detachTransformerFrom(c);
           }), r.clearSelectedObjects());
         },
         complete: () => {
-          const e = this._univerInstanceService.getCurrentUnitForType(L.UNIVER_SHEET);
+          const e = this._univerInstanceService.getCurrentUnitForType(F.UNIVER_SHEET);
           if (!e)
             return;
           const n = e.getUnitId(), r = e.getActiveSheet();
@@ -1542,75 +1537,75 @@ let Nt = class extends ie {
           const s = r.getSheetId(), o = this._renderManagerService.getRenderById(n), a = o == null ? void 0 : o.scene;
           if (!a)
             return;
-          const c = this._drawingManagerService.getDrawingData(n, s), u = Object.values(c);
+          const d = this._drawingManagerService.getDrawingData(n, s), u = Object.values(d);
           this._drawingManagerService.setDrawingEditable(!0), a.getAllObjectsByOrder().forEach((l) => {
-            l.classType === ke.IMAGE && u.some((g) => l.oKey.includes(g.drawingId)) && a.detachTransformerFrom(l);
+            l.classType === Ae.IMAGE && u.some((g) => l.oKey.includes(g.drawingId)) && a.detachTransformerFrom(l);
           });
         }
       })
     );
   }
 };
-Nt = Ys([
-  qe(0, se),
-  qe(1, q),
-  qe(2, Xr),
-  qe(3, Se),
-  qe(4, A(Vr))
-], Nt);
-var Gs = Object.getOwnPropertyDescriptor, Xs = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Gs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+Ot = Ps([
+  Ze(0, se),
+  Ze(1, q),
+  Ze(2, Fr),
+  Ze(3, Se),
+  Ze(4, A(Lr))
+], Ot);
+var As = Object.getOwnPropertyDescriptor, Ns = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? As(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, be = (i, t) => (e, n) => t(e, n, i);
-function Mr(i, t, e, n, r, s = !1) {
-  const { scaleX: o, scaleY: a } = t.getAncestorScale(), c = t.getViewport(Zn.VIEW_MAIN), u = n.getFreeze(), { startColumn: d, startRow: l, xSplit: g, ySplit: h } = u, f = {
+}, De = (i, t) => (e, n) => t(e, n, i);
+function Dr(i, t, e, n, r, s = !1) {
+  const { scaleX: o, scaleY: a } = t.getAncestorScale(), d = t.getViewport(Xn.VIEW_MAIN), u = n.getFreeze(), { startColumn: c, startRow: l, xSplit: g, ySplit: h } = u, m = {
     left: !0,
     // left means the left of pic is in a viewMainLeft
     top: !0
   };
-  if (!c)
+  if (!d)
     return {
       ...i,
-      absolute: f
+      absolute: m
     };
-  const { left: p, right: m, top: _, bottom: S } = i;
-  let { top: C, left: b, viewportScrollX: v, viewportScrollY: D } = c;
-  const { boundsOfViewArea: w, scrollDirectionResponse: M } = r || {}, { rowHeaderWidth: I, columnHeaderHeight: E } = e, T = {
+  const { left: p, right: f, top: _, bottom: S } = i;
+  let { top: C, left: b, viewportScrollX: v, viewportScrollY: D } = d;
+  const { boundsOfViewArea: w, scrollDirectionResponse: y } = r || {}, { rowHeaderWidth: I, columnHeaderHeight: E } = e, T = {
     top: s ? 0 : E,
     left: s ? 0 : I
   };
-  w && (ye.isDefine(T.top) && (T.top = w.top), ye.isDefine(T.left) && (T.left = w.left)), M === "HORIZONTAL" && (D = 0), M === "VERTICAL" && (v = 0);
-  let y = 0, R = 0;
-  const N = e.rowStartY(l - h) + E, j = e.colStartX(d - g) + I, Q = e.rowStartY(l) + E, H = e.colStartX(d) + I;
+  w && (Re.isDefine(T.top) && (T.top = w.top), Re.isDefine(T.left) && (T.left = w.left)), y === "HORIZONTAL" && (D = 0), y === "VERTICAL" && (v = 0);
+  let M = 0, R = 0;
+  const N = e.rowStartY(l - h) + E, B = e.colStartX(c - g) + I, Q = e.rowStartY(l) + E, H = e.colStartX(c) + I;
   if (g === 0)
-    f.left = !1, y = (p - v) * o, R = (m - v) * o;
+    m.left = !1, M = (p - v) * o, R = (f - v) * o;
   else {
-    const k = p - (j - I), ce = m - (j - I);
-    m < H ? (y = k * o, R = ce * o) : p <= H && m >= H ? (y = k * o, R = Math.max(b, (m - v) * o)) : p > H && (f.left = !1, y = Math.max((p - v) * o, b), R = Math.max((m - v) * o, b));
+    const k = p - (B - I), ce = f - (B - I);
+    f < H ? (M = k * o, R = ce * o) : p <= H && f >= H ? (M = k * o, R = Math.max(b, (f - v) * o)) : p > H && (m.left = !1, M = Math.max((p - v) * o, b), R = Math.max((f - v) * o, b));
   }
   let X = 0, Y = 0;
   if (h === 0)
-    f.top = !1, X = (_ - D) * a, Y = (S - D) * a;
+    m.top = !1, X = (_ - D) * a, Y = (S - D) * a;
   else {
     const k = _ - (N - E), ce = S - (N - E);
-    S < Q ? (X = k * a, Y = ce * a) : _ <= Q && S >= Q ? (X = k * a, Y = Math.max(C, (S - D) * a)) : _ > Q && (f.top = !1, X = Math.max((_ - D) * a, C), Y = Math.max((S - D) * a, C));
+    S < Q ? (X = k * a, Y = ce * a) : _ <= Q && S >= Q ? (X = k * a, Y = Math.max(C, (S - D) * a)) : _ > Q && (m.top = !1, X = Math.max((_ - D) * a, C), Y = Math.max((S - D) * a, C));
   }
-  return y = Math.max(y, T.left), X = Math.max(X, T.top), R = Math.max(R, T.left), Y = Math.max(Y, T.top), {
-    left: y,
+  return M = Math.max(M, T.left), X = Math.max(X, T.top), R = Math.max(R, T.left), Y = Math.max(Y, T.top), {
+    left: M,
     right: R,
     top: X,
     bottom: Y,
-    absolute: f
+    absolute: m
   };
 }
-const ge = (i, t, e, n, r) => {
-  const { left: s, top: o, width: a, height: c, angle: u } = i, d = {
+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,
     top: o,
-    bottom: o + c
-  }, l = Mr(d, t, e, n, r), { scaleX: g, scaleY: h } = t.getAncestorScale();
+    bottom: o + d
+  }, l = Dr(c, t, e, n, r), { scaleX: g, scaleY: h } = t.getAncestorScale();
   return {
     startX: l.left,
     endX: l.right,
@@ -1618,27 +1613,27 @@ const ge = (i, t, e, n, r) => {
     endY: l.bottom,
     rotate: u,
     width: a * g,
-    height: c * h,
+    height: d * h,
     absolute: l.absolute
   };
 };
-let nt = class extends ie {
+let tt = class extends ie {
   constructor(t, e, n, r, s, o, a) {
     super();
     /**
      * for update dom container position when scrolling and zoom
      */
     te(this, "_domLayerInfoMap", /* @__PURE__ */ new Map());
-    te(this, "_transformChange$", new zt());
+    te(this, "_transformChange$", new Xt());
     te(this, "transformChange$", this._transformChange$.asObservable());
-    te(this, "_add$", new zt());
+    te(this, "_add$", new Xt());
     te(this, "add$", this._add$.asObservable());
-    te(this, "_remove$", new zt());
+    te(this, "_remove$", new Xt());
     te(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(Gi((t) => t === zr.Rendered), Xi(1)).subscribe(() => {
+    this._lifecycleService.lifecycle$.pipe(Li((t) => t === Gr.Rendered), Yi(1)).subscribe(() => {
       this._scrollUpdateListener();
     });
   }
@@ -1663,47 +1658,47 @@ let nt = class extends ie {
       // eslint-disable-next-line max-lines-per-function
       this._drawingManagerService.add$.subscribe((t) => {
         t.forEach((e) => {
-          var Z;
-          const { unitId: n, subUnitId: r, drawingId: s } = e, o = ae(this._univerInstanceService, { unitId: n, subUnitId: r }), a = this._drawingManagerService.getDrawingByParam(e), c = this._univerInstanceService.getUnit(n, L.UNIVER_SHEET);
-          if (!c)
+          var K;
+          const { unitId: n, subUnitId: r, drawingId: s } = e, o = ae(this._univerInstanceService, { unitId: n, subUnitId: r }), a = this._drawingManagerService.getDrawingByParam(e), d = this._univerInstanceService.getUnit(n, F.UNIVER_SHEET);
+          if (!d)
             return;
-          const u = c.getActiveSheet().getSheetId();
+          const u = d.getActiveSheet().getSheetId();
           if (!a || !o)
             return;
-          const d = (Z = this._renderManagerService.getRenderById(n)) == null ? void 0 : Z.with(V).getSkeletonParam(r);
-          if (!d)
+          const c = (K = this._renderManagerService.getRenderById(n)) == null ? void 0 : K.with(V).getSkeletonParam(r);
+          if (!c)
             return;
           const { transform: l, drawingType: g, data: h } = a;
-          if (g !== W.DRAWING_DOM && g !== W.DRAWING_CHART)
+          if (g !== j.DRAWING_DOM && g !== j.DRAWING_CHART)
             return;
-          const f = this._getSceneAndTransformerByDrawingSearch(n);
-          if (f == null)
+          const m = this._getSceneAndTransformerByDrawingSearch(n);
+          if (m == null)
             return;
-          const { scene: p, canvas: m } = f;
+          const { scene: p, canvas: f } = m;
           if (l == null)
             return !0;
           if (u !== r)
             return;
-          const { left: _, top: S, width: C, height: b, angle: v, flipX: D, flipY: w, skewX: M, skewY: I } = l, E = Ie({ unitId: n, subUnitId: r, drawingId: s }), T = p.getObject(E);
+          const { left: _, top: S, width: C, height: b, angle: v, flipX: D, flipY: w, skewX: y, skewY: I } = l, E = Ie({ unitId: n, subUnitId: r, drawingId: s }), T = p.getObject(E);
           if (T != null) {
-            T.transformByState({ left: _, top: S, width: C, height: b, angle: v, flipX: D, flipY: w, skewX: M, skewY: I });
+            T.transformByState({ left: _, top: S, width: C, height: b, angle: v, flipX: D, flipY: w, skewX: y, skewY: I });
             return;
           }
-          const y = {
+          const M = {
             left: _,
             top: S,
             width: C,
             height: b,
             zIndex: this._drawingManagerService.getDrawingOrder(n, r).length - 1
-          }, R = g === W.DRAWING_CHART;
-          if (y.rotateEnabled = !1, R) {
+          }, R = g === j.DRAWING_CHART;
+          if (M.rotateEnabled = !1, R) {
             const k = h ? h.backgroundColor : "white";
-            y.fill = k, h && h.border && (y.stroke = h.border), y.paintFirst = "stroke", y.strokeWidth = 1, y.borderEnabled = !1, y.radius = 8;
+            M.fill = k, h && h.border && (M.stroke = h.border), M.paintFirst = "stroke", M.strokeWidth = 1, M.borderEnabled = !1, M.radius = 8;
           }
-          const N = new Be(E, y);
-          R && N.setObjectType(Pn.CHART), p.addObject(N, Ht), a.allowTransform !== !1 && p.attachTransformerTo(N);
-          const j = new _t(), Q = ge(N, f.renderUnit.scene, d.skeleton, o.worksheet), H = new $e(Q), X = {
-            dispose: j,
+          const N = new Ne(E, M);
+          R && N.setObjectType(yn.CHART), p.addObject(N, Yt), a.allowTransform !== !1 && p.attachTransformerTo(N);
+          const B = new wt(), Q = fe(N, m.renderUnit.scene, c.skeleton, o.worksheet), H = new je(Q), X = {
+            dispose: B,
             rect: N,
             position$: H,
             unitId: n,
@@ -1715,29 +1710,29 @@ let nt = class extends ie {
             id: s,
             componentKey: a.componentKey,
             onPointerDown: (k) => {
-              m.dispatchEvent(new PointerEvent(k.type, k));
+              f.dispatchEvent(new PointerEvent(k.type, k));
             },
             onPointerMove: (k) => {
-              m.dispatchEvent(new PointerEvent(k.type, k));
+              f.dispatchEvent(new PointerEvent(k.type, k));
             },
             onPointerUp: (k) => {
-              m.dispatchEvent(new PointerEvent(k.type, k));
+              f.dispatchEvent(new PointerEvent(k.type, k));
             },
             onWheel: (k) => {
-              m.dispatchEvent(new WheelEvent(k.type, k));
+              f.dispatchEvent(new WheelEvent(k.type, k));
             },
             data: h,
             unitId: n
           });
           const Y = N.onTransformChange$.subscribeEvent(() => {
-            const k = ge(N, f.renderUnit.scene, d.skeleton, o.worksheet);
+            const k = fe(N, m.renderUnit.scene, c.skeleton, o.worksheet);
             H.next(
               k
             );
           });
-          j.add(() => {
+          B.add(() => {
             this._canvasFloatDomService.removeFloatDom(s);
-          }), Y && j.add(Y), this._domLayerInfoMap.set(s, X);
+          }), Y && B.add(Y), this._domLayerInfoMap.set(s, X);
         });
       })
     ), this.disposeWithMe(
@@ -1746,34 +1741,34 @@ let nt = class extends ie {
           const { unitId: n, subUnitId: r, drawingId: s } = e, o = Ie({ unitId: n, subUnitId: r, drawingId: s }), a = this._getSceneAndTransformerByDrawingSearch(n);
           if (a == null)
             return;
-          const { transformer: c, scene: u } = a, d = u.getObject(o);
-          d != null && d.oKey && c.clearControlByIds([d == null ? void 0 : d.oKey]);
+          const { transformer: d, scene: u } = a, c = u.getObject(o);
+          c != null && c.oKey && d.clearControlByIds([c == null ? void 0 : c.oKey]);
         });
       })
     );
   }
   _scrollUpdateListener() {
     const t = (e, n) => {
-      var c;
-      const r = this._getSceneAndTransformerByDrawingSearch(e), s = Array.from(this._domLayerInfoMap.keys()).map((u) => ({ id: u, ...this._domLayerInfoMap.get(u) })).filter((u) => u.subUnitId === n && u.unitId === e).map((u) => u.id), o = ae(this._univerInstanceService, { unitId: e, subUnitId: n }), a = (c = this._renderManagerService.getRenderById(e)) == null ? void 0 : c.with(V).getSkeletonParam(n);
+      var d;
+      const r = this._getSceneAndTransformerByDrawingSearch(e), s = Array.from(this._domLayerInfoMap.keys()).map((u) => ({ id: u, ...this._domLayerInfoMap.get(u) })).filter((u) => u.subUnitId === n && u.unitId === e).map((u) => u.id), o = ae(this._univerInstanceService, { unitId: e, subUnitId: n }), a = (d = this._renderManagerService.getRenderById(e)) == null ? void 0 : d.with(V).getSkeletonParam(n);
       !r || !o || !a || s.forEach((u) => {
-        const d = this._domLayerInfoMap.get(u);
-        if (d) {
-          const l = ge(d.rect, r.renderUnit.scene, a.skeleton, o.worksheet, d);
-          d.position$.next(l);
+        const c = this._domLayerInfoMap.get(u);
+        if (c) {
+          const l = fe(c.rect, r.renderUnit.scene, a.skeleton, o.worksheet, c);
+          c.position$.next(l);
         }
       });
     };
     this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(L.UNIVER_SHEET).pipe(
-        _e((e) => e ? e.activeSheet$ : jn(null)),
-        Ee((e) => {
+      this._univerInstanceService.getCurrentTypeOfUnit$(F.UNIVER_SHEET).pipe(
+        _e((e) => e ? e.activeSheet$ : Nn(null)),
+        Me((e) => {
           if (!e) return null;
           const n = e.getUnitId(), r = this._renderManagerService.getRenderById(n);
           return r ? { render: r, unitId: n, subUnitId: e.getSheetId() } : null;
         }),
         _e(
-          (e) => e ? Kr(e.render.scene.getViewport(Zn.VIEW_MAIN).onScrollAfter$).pipe(Ee(() => ({ unitId: e.unitId, subUnitId: e.subUnitId }))) : jn(null)
+          (e) => e ? Xr(e.render.scene.getViewport(Xn.VIEW_MAIN).onScrollAfter$).pipe(Me(() => ({ unitId: e.unitId, subUnitId: e.subUnitId }))) : Nn(null)
         )
       ).subscribe((e) => {
         if (!e) return;
@@ -1781,12 +1776,12 @@ let nt = class extends ie {
         t(n, r);
       })
     ), this.disposeWithMe(this._commandService.onCommandExecuted((e) => {
-      if (e.id === Nn.id) {
+      if (e.id === On.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 === zi.id) {
+      } else if (e.id === Vi.id) {
         const { unitId: n, subUnitId: r } = e.params;
         t(n, r);
       }
@@ -1794,25 +1789,25 @@ let nt = class extends ie {
   }
   _getPosition(t, e) {
     var g;
-    const { startX: n, endX: r, startY: s, endY: o } = t, a = (g = this._renderManagerService.getRenderById(e)) == null ? void 0 : g.with(Ve);
+    const { startX: n, endX: r, startY: s, endY: o } = t, a = (g = this._renderManagerService.getRenderById(e)) == null ? void 0 : g.with(Ge);
     if (a == null)
       return;
-    const c = a.getCellWithCoordByOffset(n, s);
-    if (c == null)
-      return;
-    const u = {
-      column: c.actualColumn,
-      columnOffset: n - c.startX,
-      row: c.actualRow,
-      rowOffset: s - c.startY
-    }, d = a.getCellWithCoordByOffset(r, o);
+    const d = a.getCellWithCoordByOffset(n, s);
     if (d == null)
       return;
-    const l = {
+    const u = {
       column: d.actualColumn,
-      columnOffset: r - d.startX,
+      columnOffset: n - d.startX,
       row: d.actualRow,
-      rowOffset: o - d.startY
+      rowOffset: s - d.startY
+    }, c = a.getCellWithCoordByOffset(r, o);
+    if (c == null)
+      return;
+    const l = {
+      column: c.actualColumn,
+      columnOffset: r - c.startX,
+      row: c.actualRow,
+      rowOffset: o - c.startY
     };
     return {
       from: u,
@@ -1824,7 +1819,7 @@ let nt = class extends ie {
       this._drawingManagerService.update$.subscribe((t) => {
         t.forEach((e) => {
           const n = this._drawingManagerService.getDrawingByParam(e);
-          if (!n || n.drawingType !== W.DRAWING_DOM && n.drawingType !== W.DRAWING_CHART)
+          if (!n || n.drawingType !== j.DRAWING_DOM && n.drawingType !== j.DRAWING_CHART)
             return;
           const r = {
             ...n.transform
@@ -1846,8 +1841,8 @@ let nt = class extends ie {
   updateFloatDomProps(t, e, n, r) {
     const s = this._domLayerInfoMap.get(n), o = this._getSceneAndTransformerByDrawingSearch(t);
     if (s && o) {
-      const { scene: a } = o, c = Ie({ unitId: t, subUnitId: e, drawingId: n }), u = a.getObject(c);
-      u && u instanceof Be && u.setProps(r);
+      const { scene: a } = o, d = Ie({ unitId: t, subUnitId: e, drawingId: n }), u = a.getObject(d);
+      u && u instanceof Ne && u.setProps(r);
     }
   }
   // CreateFloatDomCommand --> floatDomService.addFloatDomToPosition
@@ -1858,14 +1853,14 @@ let nt = class extends ie {
     });
     if (!n)
       throw new Error("cannot find current target!");
-    const { unitId: r, subUnitId: s } = n, { initPosition: o, componentKey: a, data: c, allowTransform: u = !0 } = t, d = e != null ? e : Mt(), l = this._getPosition(o, r);
+    const { unitId: r, subUnitId: s } = n, { initPosition: o, componentKey: a, data: d, allowTransform: u = !0 } = t, c = e != null ? e : bt(), l = this._getPosition(o, r);
     if (l == null)
       return;
     const g = {
       unitId: r,
       subUnitId: s,
-      drawingId: d,
-      drawingType: t.type || W.DRAWING_DOM,
+      drawingId: c,
+      drawingType: t.type || j.DRAWING_DOM,
       componentKey: a,
       sheetTransform: l,
       transform: {
@@ -1874,16 +1869,16 @@ let nt = class extends ie {
         width: o.endX - o.startX,
         height: o.endY - o.startY
       },
-      data: c,
+      data: d,
       allowTransform: u
     };
-    return this._commandService.executeCommand(xt.id, {
+    return this._commandService.executeCommand(Wt.id, {
       unitId: r,
       drawings: [g]
-    }), this._add$.next({ unitId: r, subUnitId: s, id: d }), {
-      id: d,
+    }), this._add$.next({ unitId: r, subUnitId: s, id: c }), {
+      id: c,
       dispose: () => {
-        this._removeDom(d, !0);
+        this._removeDom(c, !0);
       }
     };
   }
@@ -1898,33 +1893,33 @@ let nt = class extends ie {
       const a = this._drawingManagerService.getDrawingByParam({ unitId: r, subUnitId: s, drawingId: t });
       if (!a)
         return;
-      const c = this._sheetDrawingService.getBatchRemoveOp([a]), { redo: u, objects: d } = c;
-      this._commandService.syncExecuteCommand(U.id, { unitId: r, subUnitId: s, op: u, objects: d, type: P.REMOVE });
+      const d = this._sheetDrawingService.getBatchRemoveOp([a]), { redo: u, objects: c } = d;
+      this._commandService.syncExecuteCommand(P.id, { unitId: r, subUnitId: s, op: u, objects: c, type: U.REMOVE });
     }
   }
   // eslint-disable-next-line max-lines-per-function, complexity
   addFloatDomToRange(t, e, n, r) {
-    var D, w, M;
+    var D, w, y;
     const s = ae(this._univerInstanceService, {
       unitId: e.unitId,
       subUnitId: e.subUnitId
     });
     if (!s)
       throw new Error("cannot find current target!");
-    const { unitId: o, subUnitId: a } = s, c = this._getSceneAndTransformerByDrawingSearch(o);
-    if (!c) return;
+    const { unitId: o, subUnitId: a } = s, d = this._getSceneAndTransformerByDrawingSearch(o);
+    if (!d) return;
     const u = this._renderManagerService.getRenderById(o);
     if (!u) return;
-    const d = (D = this._renderManagerService.getRenderById(o)) == null ? void 0 : D.with(V).getWorksheetSkeleton(a);
-    if (!d) return;
-    const { componentKey: l, data: g, allowTransform: h = !0 } = e, f = r != null ? r : Mt(), { position: p, position$: m } = this._createRangePositionObserver(t, u, d.skeleton);
+    const c = (D = this._renderManagerService.getRenderById(o)) == null ? void 0 : D.with(V).getWorksheetSkeleton(a);
+    if (!c) return;
+    const { componentKey: l, data: g, allowTransform: h = !0 } = e, m = r != null ? r : bt(), { position: p, position$: f } = this._createRangePositionObserver(t, u, c.skeleton);
     if (this._getPosition(p, o) == null)
       return;
-    const S = c.scene, { scaleX: C } = S.getAncestorScale(), b = Rt(p, n, C), v = {
+    const S = d.scene, { scaleX: C } = S.getAncestorScale(), b = Ct(p, n, C), v = {
       unitId: o,
       subUnitId: a,
-      drawingId: f,
-      drawingType: e.type || W.DRAWING_DOM,
+      drawingId: m,
+      drawingType: e.type || j.DRAWING_DOM,
       componentKey: l,
       transform: {
         left: b.startX,
@@ -1936,11 +1931,11 @@ let nt = class extends ie {
       allowTransform: h
     };
     {
-      const { unitId: I, subUnitId: E, drawingId: T } = v, y = ae(this._univerInstanceService, { unitId: I, subUnitId: E }), R = v, N = this._univerInstanceService.getUnit(I, L.UNIVER_SHEET);
+      const { unitId: I, subUnitId: E, drawingId: T } = v, M = ae(this._univerInstanceService, { unitId: I, subUnitId: E }), R = v, N = this._univerInstanceService.getUnit(I, F.UNIVER_SHEET);
       if (!N)
         return;
-      const j = N.getActiveSheet().getSheetId();
-      if (!R || !y)
+      const B = N.getActiveSheet().getSheetId();
+      if (!R || !M)
         return;
       const Q = (w = this._renderManagerService.getRenderById(I)) == null ? void 0 : w.with(V);
       if (!Q)
@@ -1948,50 +1943,50 @@ let nt = class extends ie {
       const H = Q.getWorksheetSkeleton(E);
       if (!H)
         return;
-      const { transform: X, drawingType: Y, data: Z } = R;
-      if (Y !== W.DRAWING_DOM && Y !== W.DRAWING_CHART)
+      const { transform: X, drawingType: Y, data: K } = R;
+      if (Y !== j.DRAWING_DOM && Y !== j.DRAWING_CHART)
         return;
       const k = this._getSceneAndTransformerByDrawingSearch(I);
       if (k == null)
         return;
-      const { scene: ce, canvas: Te } = k;
-      if (X == null || j !== E)
+      const { scene: ce, canvas: ye } = k;
+      if (X == null || B !== E)
         return;
-      const { left: at, top: ct, width: dt, height: lt, angle: Yt, flipX: Gt, flipY: ut, skewX: ht, skewY: Oe } = X, gt = Ie({ unitId: I, subUnitId: E, drawingId: T }), de = ce.getObject(gt);
-      if (de != null) {
-        de.transformByState({ left: at, top: ct, width: dt, height: lt, angle: Yt, flipX: Gt, flipY: ut, skewX: ht, skewY: Oe });
+      const { left: ot, top: at, width: ct, height: dt, angle: $t, flipX: xt, flipY: lt, skewX: ut, skewY: Ee } = X, ht = Ie({ unitId: I, subUnitId: E, drawingId: T }), le = ce.getObject(ht);
+      if (le != null) {
+        le.transformByState({ left: ot, top: at, width: ct, height: dt, angle: $t, flipX: xt, flipY: lt, skewX: ut, skewY: Ee });
         return;
       }
       const ee = {
-        left: at,
+        left: ot,
         // from floatDomParam.transform
-        top: ct,
-        width: dt,
-        height: lt,
+        top: at,
+        width: ct,
+        height: dt,
         zIndex: this._drawingManagerService.getDrawingOrder(I, E).length - 1
-      }, Pe = Y === W.DRAWING_CHART;
-      if (Pe) {
-        const B = Z ? Z.backgroundColor : "white";
-        ee.fill = B, ee.rotateEnabled = !1, Z && Z.border && (ee.stroke = Z.border), ee.paintFirst = "stroke", ee.strokeWidth = 1, ee.borderEnabled = !1, ee.radius = 8;
+      }, Te = Y === j.DRAWING_CHART;
+      if (Te) {
+        const W = K ? K.backgroundColor : "white";
+        ee.fill = W, ee.rotateEnabled = !1, K && K.border && (ee.stroke = K.border), ee.paintFirst = "stroke", ee.strokeWidth = 1, ee.borderEnabled = !1, ee.radius = 8;
       }
-      const le = new Be(gt, ee);
-      Pe && le.setObjectType(Pn.CHART), ce.addObject(le, Ht), R.allowTransform !== !1 && ce.attachTransformerTo(le);
-      const ue = new _t(), mt = ce.getMainViewport(), { rowHeaderWidth: Ue, columnHeaderHeight: He } = H.skeleton, ft = {
-        top: He,
-        left: Ue,
-        bottom: mt.bottom,
-        right: mt.right
-      }, he = {
-        dispose: ue,
-        rect: le,
+      const ue = new Ne(ht, ee);
+      Te && ue.setObjectType(yn.CHART), ce.addObject(ue, Yt), R.allowTransform !== !1 && ce.attachTransformerTo(ue);
+      const he = new wt(), gt = ce.getMainViewport(), { rowHeaderWidth: Oe, columnHeaderHeight: Xe } = H.skeleton, ft = {
+        top: Xe,
+        left: Oe,
+        bottom: gt.bottom,
+        right: gt.right
+      }, ge = {
+        dispose: he,
+        rect: ue,
         boundsOfViewArea: ft,
         domAnchor: n,
         unitId: I,
         subUnitId: E
-      }, $ = ge(le, k.renderUnit.scene, H.skeleton, y.worksheet, he), Ae = new $e($);
-      he.position$ = Ae;
-      let ze = {
-        position$: Ae,
+      }, $ = fe(ue, k.renderUnit.scene, H.skeleton, M.worksheet, ge), Ue = new je($);
+      ge.position$ = Ue;
+      let Ve = {
+        position$: Ue,
         id: T,
         componentKey: R.componentKey,
         onPointerDown: () => {
@@ -2000,63 +1995,63 @@ let nt = class extends ie {
         },
         onPointerUp: () => {
         },
-        onWheel: (B) => {
-          Te.dispatchEvent(new WheelEvent(B.type, B));
+        onWheel: (W) => {
+          ye.dispatchEvent(new WheelEvent(W.type, W));
         },
-        data: Z,
+        data: K,
         unitId: I
       };
-      e.eventPassThrough && (ze = {
-        ...ze,
-        onPointerDown: (B) => {
-          Te.dispatchEvent(new PointerEvent(B.type, B));
+      e.eventPassThrough && (Ve = {
+        ...Ve,
+        onPointerDown: (W) => {
+          ye.dispatchEvent(new PointerEvent(W.type, W));
         },
-        onPointerMove: (B) => {
-          Te.dispatchEvent(new PointerEvent(B.type, B));
+        onPointerMove: (W) => {
+          ye.dispatchEvent(new PointerEvent(W.type, W));
         },
-        onPointerUp: (B) => {
-          Te.dispatchEvent(new PointerEvent(B.type, B));
+        onPointerUp: (W) => {
+          ye.dispatchEvent(new PointerEvent(W.type, W));
         }
-      }), this._canvasFloatDomService.addFloatDom(ze), this.disposeWithMe(m.subscribe((B) => {
-        var pn, wn, _n, vn;
-        const fn = Rt({
-          startX: B.startX,
-          startY: B.startY,
-          endX: B.endX,
-          endY: B.endY,
-          width: (pn = n.width) != null ? pn : B.width,
-          height: (wn = n.height) != null ? wn : B.height,
+      }), this._canvasFloatDomService.addFloatDom(Ve), this.disposeWithMe(f.subscribe((W) => {
+        var hn, gn, fn, mn;
+        const un = Ct({
+          startX: W.startX,
+          startY: W.startY,
+          endX: W.endX,
+          endY: W.endY,
+          width: (hn = n.width) != null ? hn : W.width,
+          height: (gn = n.height) != null ? gn : W.height,
           absolute: {
             left: p.absolute.left,
             top: p.absolute.top
           }
-        }, n), kr = Ie({ unitId: I, subUnitId: E, drawingId: T }), Br = new Be(kr, {
-          left: fn.startX,
-          top: fn.startY,
-          width: (_n = n.width) != null ? _n : B.width,
-          height: (vn = n.height) != null ? vn : B.height,
+        }, n), Ur = Ie({ unitId: I, subUnitId: E, drawingId: T }), Pr = new Ne(Ur, {
+          left: un.startX,
+          top: un.startY,
+          width: (fn = n.width) != null ? fn : W.width,
+          height: (mn = n.height) != null ? mn : W.height,
           zIndex: this._drawingManagerService.getDrawingOrder(I, E).length - 1
-        }), Wr = ge(Br, k.renderUnit.scene, H.skeleton, y.worksheet, he);
-        Ae.next(Wr);
+        }), Ar = fe(Pr, k.renderUnit.scene, H.skeleton, M.worksheet, ge);
+        Ue.next(Ar);
       }));
-      const Ke = (M = this._renderManagerService.getRenderById(I)) == null ? void 0 : M.with(V);
-      Ke == null || Ke.currentSkeleton$.subscribe((B) => {
-        B && H.sheetId !== B.sheetId && this._removeDom(f, !0);
+      const He = (y = this._renderManagerService.getRenderById(I)) == null ? void 0 : y.with(V);
+      He == null || He.currentSkeleton$.subscribe((W) => {
+        W && H.sheetId !== W.sheetId && this._removeDom(m, !0);
       });
-      const pt = le.onTransformChange$.subscribeEvent(() => {
-        const B = ge(le, k.renderUnit.scene, H.skeleton, y.worksheet, he);
-        Ae.next(
-          B
+      const mt = ue.onTransformChange$.subscribeEvent(() => {
+        const W = fe(ue, k.renderUnit.scene, H.skeleton, M.worksheet, ge);
+        Ue.next(
+          W
         );
       });
-      ue.add(() => {
+      he.add(() => {
         this._canvasFloatDomService.removeFloatDom(T);
-      }), pt && ue.add(pt), this._domLayerInfoMap.set(T, he);
+      }), mt && he.add(mt), this._domLayerInfoMap.set(T, ge);
     }
     return {
-      id: f,
+      id: m,
       dispose: () => {
-        this._removeDom(f, !0);
+        this._removeDom(m, !0);
       }
     };
   }
@@ -2073,21 +2068,21 @@ let nt = class extends ie {
     if (!this._getSceneAndTransformerByDrawingSearch(o)) return;
     const u = this._renderManagerService.getRenderById(o);
     if (!u) return;
-    const d = (b = this._renderManagerService.getRenderById(o)) == null ? void 0 : b.with(V).getWorksheetSkeleton(a);
-    if (!d) return;
-    const { componentKey: l, data: g, allowTransform: h = !0 } = e, f = r != null ? r : Mt(), { position: p, position$: m } = this._createRangePositionObserver({
+    const c = (b = this._renderManagerService.getRenderById(o)) == null ? void 0 : b.with(V).getWorksheetSkeleton(a);
+    if (!c) return;
+    const { componentKey: l, data: g, allowTransform: h = !0 } = e, m = r != null ? r : bt(), { position: p, position$: f } = this._createRangePositionObserver({
       startRow: 0,
       endRow: 0,
       startColumn: t,
       endColumn: t
-    }, u, d.skeleton), _ = p;
+    }, u, c.skeleton), _ = p;
     if (_.startY = 0, this._getPosition(p, o) == null)
       return;
     const C = {
       unitId: o,
       subUnitId: a,
-      drawingId: f,
-      drawingType: e.type || W.DRAWING_DOM,
+      drawingId: m,
+      drawingType: e.type || j.DRAWING_DOM,
       componentKey: l,
       transform: {
         left: _.startX,
@@ -2099,30 +2094,30 @@ let nt = class extends ie {
       allowTransform: h
     };
     {
-      const { unitId: w, subUnitId: M, drawingId: I } = C, E = ae(this._univerInstanceService, { unitId: w, subUnitId: M }), T = C, y = this._univerInstanceService.getUnit(w, L.UNIVER_SHEET);
-      if (!y)
+      const { unitId: w, subUnitId: y, drawingId: I } = C, E = ae(this._univerInstanceService, { unitId: w, subUnitId: y }), T = C, M = this._univerInstanceService.getUnit(w, F.UNIVER_SHEET);
+      if (!M)
         return;
-      const R = y.getActiveSheet().getSheetId();
+      const R = M.getActiveSheet().getSheetId();
       if (!T || !E)
         return;
       const N = (v = this._renderManagerService.getRenderById(w)) == null ? void 0 : v.with(V);
       if (!N)
         return;
-      const j = N.getWorksheetSkeleton(M);
-      if (!j)
+      const B = N.getWorksheetSkeleton(y);
+      if (!B)
         return;
       const { transform: Q, data: H } = T, X = this._getSceneAndTransformerByDrawingSearch(w);
       if (X == null)
         return;
-      const { scene: Y, canvas: Z } = X;
-      if (Q == null || R !== M)
+      const { scene: Y, canvas: K } = X;
+      if (Q == null || R !== y)
         return;
-      const { left: k, top: ce, width: Te, height: at, angle: ct, flipX: dt, flipY: lt, skewX: Yt, skewY: Gt } = Q, ut = Ie({ unitId: w, subUnitId: M, drawingId: I }), ht = Y.getObject(ut);
-      if (ht != null) {
-        ht.transformByState({ left: k, top: ce, width: Te, height: at, angle: ct, flipX: dt, flipY: lt, skewX: Yt, skewY: Gt });
+      const { left: k, top: ce, width: ye, height: ot, angle: at, flipX: ct, flipY: dt, skewX: $t, skewY: xt } = Q, lt = Ie({ unitId: w, subUnitId: y, drawingId: I }), ut = Y.getObject(lt);
+      if (ut != null) {
+        ut.transformByState({ left: k, top: ce, width: ye, height: ot, angle: at, flipX: ct, flipY: dt, skewX: $t, skewY: xt });
         return;
       }
-      const Oe = Rt({
+      const Ee = Ct({
         startX: _.startX,
         startY: 0,
         endX: p.endX,
@@ -2133,34 +2128,34 @@ let nt = class extends ie {
           left: p.absolute.left,
           top: p.absolute.top
         }
-      }, n), gt = {
-        left: Oe.startX,
-        top: Oe.startY,
-        width: Oe.width,
-        height: Oe.height,
-        zIndex: this._drawingManagerService.getDrawingOrder(w, M).length - 1
-      }, de = new Be(ut, gt);
-      Y.addObject(de, Ht), T.allowTransform !== !1 && Y.attachTransformerTo(de);
-      const ee = new _t(), Pe = Y.getMainViewport(), le = {
+      }, n), ht = {
+        left: Ee.startX,
+        top: Ee.startY,
+        width: Ee.width,
+        height: Ee.height,
+        zIndex: this._drawingManagerService.getDrawingOrder(w, y).length - 1
+      }, le = new Ne(lt, ht);
+      Y.addObject(le, Yt), T.allowTransform !== !1 && Y.attachTransformerTo(le);
+      const ee = new wt(), Te = Y.getMainViewport(), ue = {
         top: 0,
         //viewMain.top,
-        left: Pe.left,
-        bottom: Pe.bottom,
-        right: Pe.right
-      }, ue = {
+        left: Te.left,
+        bottom: Te.bottom,
+        right: Te.right
+      }, he = {
         dispose: ee,
-        rect: de,
+        rect: le,
         // position$,
         unitId: w,
-        subUnitId: M,
-        boundsOfViewArea: le,
+        subUnitId: y,
+        boundsOfViewArea: ue,
         domAnchor: n,
         scrollDirectionResponse: "HORIZONTAL"
         /* HORIZONTAL */
-      }, mt = ge(de, X.renderUnit.scene, j.skeleton, E.worksheet, ue), Ue = new $e(mt);
-      ue.position$ = Ue;
-      let He = {
-        position$: Ue,
+      }, gt = fe(le, X.renderUnit.scene, B.skeleton, E.worksheet, he), Oe = new je(gt);
+      he.position$ = Oe;
+      let Xe = {
+        position$: Oe,
         id: I,
         componentKey: T.componentKey,
         onPointerDown: () => {
@@ -2170,31 +2165,31 @@ let nt = class extends ie {
         onPointerUp: () => {
         },
         onWheel: ($) => {
-          Z.dispatchEvent(new WheelEvent($.type, $));
+          K.dispatchEvent(new WheelEvent($.type, $));
         },
         data: H,
         unitId: w
       };
-      e.eventPassThrough && (He = {
-        ...He,
+      e.eventPassThrough && (Xe = {
+        ...Xe,
         onPointerDown: ($) => {
-          Z.dispatchEvent(new PointerEvent($.type, $));
+          K.dispatchEvent(new PointerEvent($.type, $));
         },
         onPointerMove: ($) => {
-          Z.dispatchEvent(new PointerEvent($.type, $));
+          K.dispatchEvent(new PointerEvent($.type, $));
         },
         onPointerUp: ($) => {
-          Z.dispatchEvent(new PointerEvent($.type, $));
+          K.dispatchEvent(new PointerEvent($.type, $));
         }
-      }), this._canvasFloatDomService.addFloatDom(He);
-      const ft = de.onTransformChange$.subscribeEvent(() => {
-        const $ = ge(de, X.renderUnit.scene, j.skeleton, E.worksheet, ue);
-        Ue.next(
+      }), this._canvasFloatDomService.addFloatDom(Xe);
+      const ft = le.onTransformChange$.subscribeEvent(() => {
+        const $ = fe(le, X.renderUnit.scene, B.skeleton, E.worksheet, he);
+        Oe.next(
           $
         );
       });
-      this.disposeWithMe(m.subscribe(($) => {
-        const Ae = Rt({
+      this.disposeWithMe(f.subscribe(($) => {
+        const Ue = Ct({
           startX: $.startX,
           startY: 0,
           endX: $.endX,
@@ -2205,26 +2200,26 @@ let nt = class extends ie {
             left: p.absolute.left,
             top: p.absolute.top
           }
-        }, n), ze = Ie({ unitId: w, subUnitId: M, drawingId: I }), Ke = new Be(ze, {
-          left: Ae.startX,
+        }, n), Ve = Ie({ unitId: w, subUnitId: y, drawingId: I }), He = new Ne(Ve, {
+          left: Ue.startX,
           top: 0,
           width: n.width,
           height: n.height,
-          zIndex: this._drawingManagerService.getDrawingOrder(w, M).length - 1
-        }), pt = ge(Ke, X.renderUnit.scene, j.skeleton, E.worksheet, ue);
-        Ue.next(pt);
+          zIndex: this._drawingManagerService.getDrawingOrder(w, y).length - 1
+        }), mt = fe(He, X.renderUnit.scene, B.skeleton, E.worksheet, he);
+        Oe.next(mt);
       }));
-      const he = (D = this._renderManagerService.getRenderById(w)) == null ? void 0 : D.with(V);
-      he == null || he.currentSkeleton$.subscribe(($) => {
-        $ && d.sheetId !== $.sheetId && this._removeDom(f, !0);
+      const ge = (D = this._renderManagerService.getRenderById(w)) == null ? void 0 : D.with(V);
+      ge == null || ge.currentSkeleton$.subscribe(($) => {
+        $ && c.sheetId !== $.sheetId && this._removeDom(m, !0);
       }), ee.add(() => {
         this._canvasFloatDomService.removeFloatDom(I);
-      }), ft && ee.add(ft), this._domLayerInfoMap.set(I, ue);
+      }), ft && ee.add(ft), this._domLayerInfoMap.set(I, he);
     }
     return {
-      id: f,
+      id: m,
       dispose: () => {
-        this._removeDom(f, !0);
+        this._removeDom(m, !0);
       }
     };
   }
@@ -2241,51 +2236,51 @@ let nt = class extends ie {
   // eslint-disable-next-line max-lines-per-function
   _createRangePositionObserver(t, e, n) {
     let { startRow: r, startColumn: s } = t;
-    const o = Qe(r, s, n), a = new $e(o), c = Qe(t.endRow, t.endColumn, n), u = new $e(c), d = () => {
-      const m = Qe(r, s, n), _ = Qe(t.endRow, t.endColumn, n);
-      a.next(m), u.next(_);
-    }, l = new _t();
-    l.add(e.engine.clientRect$.subscribe(() => d())), l.add(this._commandService.onCommandExecuted((m) => {
-      if (m.id === Ki.id && m.params.rowsAutoHeightInfo.findIndex((S) => S.row === r) > -1) {
-        d();
+    const o = Je(r, s, n), a = new je(o), d = Je(t.endRow, t.endColumn, n), u = new je(d), c = () => {
+      const f = Je(r, s, n), _ = Je(t.endRow, t.endColumn, n);
+      a.next(f), u.next(_);
+    }, l = new wt();
+    l.add(e.engine.clientRect$.subscribe(() => c())), l.add(this._commandService.onCommandExecuted((f) => {
+      if (f.id === Hi.id && f.params.rowsAutoHeightInfo.findIndex((S) => S.row === r) > -1) {
+        c();
         return;
       }
-      (Zi.indexOf(m.id) > -1 || m.id === Ei.id || m.id === Nn.id) && d();
+      (zi.indexOf(f.id) > -1 || f.id === Ei.id || f.id === On.id) && c();
     }));
-    const g = (m, _) => {
-      r = m, s = _, d();
+    const g = (f, _) => {
+      r = f, s = _, c();
     }, h = () => ({
       rotate: 0,
-      width: c.right - o.left,
-      height: c.bottom - o.top,
+      width: d.right - o.left,
+      height: d.bottom - o.top,
       absolute: {
         left: !0,
         top: !0
       },
       startX: o.left,
       startY: o.top,
-      endX: c.right,
-      endY: c.bottom
-    }), f = a.pipe(
-      Ee((m) => {
-        const _ = Qe(t.endRow, t.endColumn, n);
+      endX: d.right,
+      endY: d.bottom
+    }), m = a.pipe(
+      Me((f) => {
+        const _ = Je(t.endRow, t.endColumn, n);
         return {
           rotate: 0,
-          width: _.right - m.left,
-          height: _.bottom - m.top,
+          width: _.right - f.left,
+          height: _.bottom - f.top,
           absolute: {
             left: !0,
             top: !0
           },
-          startX: m.left,
-          startY: m.top,
+          startX: f.left,
+          startY: f.top,
           endX: _.right,
           endY: _.bottom
         };
       })
     ), p = h();
     return {
-      position$: f,
+      position$: m,
       position: p,
       updateRowCol: g,
       topLeftPos$: a,
@@ -2294,16 +2289,16 @@ let nt = class extends ie {
     };
   }
 };
-nt = Xs([
-  be(0, A(q)),
-  be(1, Se),
-  be(2, A(G)),
-  be(3, se),
-  be(4, A(ji)),
-  be(5, oe),
-  be(6, A(Hr))
-], nt);
-function Qe(i, t, e) {
+tt = Ns([
+  De(0, A(q)),
+  De(1, Se),
+  De(2, A(G)),
+  De(3, se),
+  De(4, A(ki)),
+  De(5, oe),
+  De(6, A(Yr))
+], tt);
+function Je(i, t, e) {
   const n = e.getCellWithCoordByIndex(i, t), r = n.isMergedMainCell ? n.mergeInfo : n;
   return {
     left: r.startX,
@@ -2312,27 +2307,27 @@ function Qe(i, t, e) {
     bottom: r.endY
   };
 }
-function Rt(i, t, e) {
-  var u, d;
+function Ct(i, t, e) {
+  var u, c;
   e = e != null ? e : 1;
-  const n = i.endX - i.startX, r = i.endY - i.startY, s = (u = t == null ? void 0 : t.width) != null ? u : n, o = (d = t == null ? void 0 : t.height) != null ? d : r;
-  let a = 0, c = 0;
+  const n = i.endX - i.startX, r = i.endY - i.startY, s = (u = t == null ? void 0 : t.width) != null ? u : n, o = (c = t == null ? void 0 : t.height) != null ? c : r;
+  let a = 0, d = 0;
   if (t) {
     if (t.horizonOffsetAlign === "right") {
-      const l = yt(t.marginX, n * e);
+      const l = Dt(t.marginX, n * e);
       a = i.endX - l - s;
     } else
-      a = i.startX + yt(t.marginX, n);
+      a = i.startX + Dt(t.marginX, n);
     if (t.verticalOffsetAlign === "bottom") {
-      const l = yt(t.marginY, r * e);
-      c = i.endY - l - o;
+      const l = Dt(t.marginY, r * e);
+      d = i.endY - l - o;
     } else
-      c = i.startY + yt(t.marginY, r);
+      d = i.startY + Dt(t.marginY, r);
   }
   return {
     rotate: 0,
     startX: a,
-    startY: c,
+    startY: d,
     endX: i.endX,
     endY: i.endY,
     width: s,
@@ -2343,37 +2338,37 @@ function Rt(i, t, e) {
     }
   };
 }
-function yt(i, t) {
+function Dt(i, t) {
   if (i === void 0) return 0;
   if (typeof i == "number") return i;
   const e = Number.parseFloat(i);
   return t * e / 100;
 }
-const Vs = (i) => {
-  const { floatDomInfos: t, scene: e, skeleton: n, worksheet: r } = i, s = os(() => t.map((o) => {
-    const { width: a, height: c, angle: u, left: d, top: l } = o.transform, g = Mr(
+const ks = (i) => {
+  const { floatDomInfos: t, scene: e, skeleton: n, worksheet: r } = i, s = ss(() => t.map((o) => {
+    const { width: a, height: d, angle: u, left: c, top: l } = o.transform, g = Dr(
       {
-        left: d != null ? d : 0,
-        right: (d != null ? d : 0) + (a != null ? a : 0),
+        left: c != null ? c : 0,
+        right: (c != null ? c : 0) + (a != null ? a : 0),
         top: l != null ? l : 0,
-        bottom: (l != null ? l : 0) + (c != null ? c : 0)
+        bottom: (l != null ? l : 0) + (d != null ? d : 0)
       },
       e,
       n,
       r,
       void 0,
       !0
-    ), { scaleX: h, scaleY: f } = e.getAncestorScale(), p = {
+    ), { scaleX: h, scaleY: m } = e.getAncestorScale(), p = {
       startX: g.left,
       endX: g.right,
       startY: g.top,
       endY: g.bottom,
       rotate: u,
       width: a * h,
-      height: c * f,
+      height: d * m,
       absolute: g.absolute
-    }, m = {
-      position$: new $e(p),
+    }, f = {
+      position$: new je(p),
       position: p,
       id: o.drawingId,
       componentKey: o.componentKey,
@@ -2388,16 +2383,16 @@ const Vs = (i) => {
       unitId: o.unitId,
       data: o.data
     };
-    return [o.drawingId, m];
+    return [o.drawingId, f];
   }), [t, e, n, r]);
-  return /* @__PURE__ */ K("div", { style: { position: "absolute", top: 0, left: 0 }, children: s.map(([o, a]) => /* @__PURE__ */ K($i, { layer: a, id: o, position: a.position }, o)) });
+  return /* @__PURE__ */ Z("div", { style: { position: "absolute", top: 0, left: 0 }, children: s.map(([o, a]) => /* @__PURE__ */ Z(Wi, { layer: a, id: o, position: a.position }, o)) });
 };
-var Hs = Object.getOwnPropertyDescriptor, zs = (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 Ws = Object.getOwnPropertyDescriptor, js = (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;
-}, Re = (i, t) => (e, n) => t(e, n, i);
-let kt = class extends ie {
+}, be = (i, t) => (e, n) => t(e, n, i);
+let Ut = class extends ie {
   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();
   }
@@ -2408,9 +2403,9 @@ let kt = class extends ie {
         {
           handler: (i, t, e) => {
             const { unitId: n, scene: r, subUnitId: s } = t, o = this._drawingManagerService.getDrawingDataForUnit(n), a = o == null ? void 0 : o[s];
-            return a && a.order.forEach((c) => {
-              const u = a.data[c];
-              u.drawingType !== W.DRAWING_CHART && u.drawingType !== W.DRAWING_DOM && this._drawingRenderService.renderDrawing(u, r);
+            return a && a.order.forEach((d) => {
+              const u = a.data[d];
+              u.drawingType !== j.DRAWING_CHART && u.drawingType !== j.DRAWING_DOM && this._drawingRenderService.renderDrawing(u, r);
             }), e();
           }
         }
@@ -2426,14 +2421,14 @@ let kt = class extends ie {
             const o = s.with(V).getSkeletonParam(r);
             if (!o)
               return e(i);
-            const a = this._drawingManagerService.getDrawingDataForUnit(n), c = a == null ? void 0 : a[t.subUnitId];
-            if (!c)
+            const a = this._drawingManagerService.getDrawingDataForUnit(n), d = a == null ? void 0 : a[t.subUnitId];
+            if (!d)
               return e(i);
-            const { scaleX: u, scaleY: d } = s.scene, l = i ? { ...i } : { startColumn: 0, endColumn: 0, endRow: 0, startRow: 0 }, g = c.order.map((h) => c.data[h]);
+            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 && ye.isDefine(h.transform.left) && ye.isDefine(h.transform.top) && ye.isDefine(h.transform.width) && ye.isDefine(h.transform.height)) {
-                const f = o.skeleton.getCellIndexByOffset(h.transform.left, h.transform.top, u, d, { x: 0, y: 0 }), p = o.skeleton.getCellIndexByOffset(h.transform.left + h.transform.width, h.transform.top + h.transform.height, u, d, { x: 0, y: 0 });
-                f.column < l.startColumn && (l.startColumn = f.column), f.row < l.startRow && (l.startRow = f.row), l.endRow < p.row && (l.endRow = p.row), l.endColumn < p.column && (l.endColumn = p.column);
+              if (!h.groupId && h.transform && Re.isDefine(h.transform.left) && Re.isDefine(h.transform.top) && Re.isDefine(h.transform.width) && Re.isDefine(h.transform.height)) {
+                const m = o.skeleton.getCellIndexByOffset(h.transform.left, h.transform.top, u, c, { x: 0, y: 0 }), p = o.skeleton.getCellIndexByOffset(h.transform.left + h.transform.width, h.transform.top + h.transform.height, u, c, { x: 0, y: 0 });
+                m.column < l.startColumn && (l.startColumn = m.column), m.row < l.startRow && (l.startRow = m.row), l.endRow < p.row && (l.endRow = p.row), l.endColumn < p.column && (l.endColumn = p.column);
               }
             }), e(l)) : e(i);
           }
@@ -2450,26 +2445,26 @@ let kt = class extends ie {
             const { unitId: n, subUnitId: r } = t, s = this._drawingManagerService.getDrawingDataForUnit(n), o = s == null ? void 0 : s[r];
             if (o) {
               const a = o.order.map((u) => {
-                const d = o.data[u];
-                if (d.drawingType === W.DRAWING_CHART)
+                const c = o.data[u];
+                if (c.drawingType === j.DRAWING_CHART)
                   return {
-                    ...d,
-                    componentKey: this._componetManager.get(Zr)
+                    ...c,
+                    componentKey: this._componetManager.get(Vr)
                   };
-                if (d.drawingType === W.DRAWING_DOM) {
-                  const l = this._sheetPrintInterceptorService.getPrintComponent(d.componentKey);
+                if (c.drawingType === j.DRAWING_DOM) {
+                  const l = this._sheetPrintInterceptorService.getPrintComponent(c.componentKey);
                   return {
-                    ...d,
-                    componentKey: this._componetManager.get(l || d.componentKey)
+                    ...c,
+                    componentKey: this._componetManager.get(l || c.componentKey)
                   };
                 }
                 return null;
-              }).filter(Boolean), c = qn(Vs, this._injector);
-              return ls(
-                /* @__PURE__ */ K(c, { floatDomInfos: a, scene: t.scene, skeleton: t.skeleton, worksheet: t.worksheet }),
+              }).filter(Boolean), d = ji(ks, this._injector);
+              return wi(
+                /* @__PURE__ */ Z(d, { floatDomInfos: a, scene: t.scene, skeleton: t.skeleton, worksheet: t.worksheet }),
                 t.root
               ), i == null || i.add(() => {
-                us(t.root);
+                _i(t.root);
               }), e(i);
             }
           }
@@ -2478,107 +2473,107 @@ let kt = class extends ie {
     );
   }
 };
-kt = zs([
-  Re(0, A(Ti)),
-  Re(1, A(Kn)),
-  Re(2, se),
-  Re(3, q),
-  Re(4, A(nt)),
-  Re(5, A(Qn)),
-  Re(6, A(Xe))
-], kt);
-var Ks = Object.getOwnPropertyDescriptor, Zs = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Ks(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+Ut = js([
+  be(0, A(Ti)),
+  be(1, A(Gn)),
+  be(2, se),
+  be(3, q),
+  be(4, A(tt)),
+  be(5, A(zn)),
+  be(6, A(Ye))
+], Ut);
+var Bs = Object.getOwnPropertyDescriptor, $s = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Bs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, pe = (i, t) => (e, n) => t(e, n, i);
-const Js = [
+const xs = [
+  Kn.id,
+  Zn.id,
+  Jn.id,
+  qn.id,
+  Qn.id,
   er.id,
   tr.id,
   nr.id,
+  Jt.id,
+  qt.id,
   rr.id,
   ir.id,
   sr.id,
   or.id,
   ar.id,
-  tn.id,
-  nn.id,
   cr.id,
   dr.id,
   lr.id,
-  ur.id,
-  hr.id,
-  gr.id,
-  mr.id,
-  fr.id,
-  pr.id
-], qs = [
+  ur.id
+], Fs = [
+  Ki.id,
+  Zi.id,
   Ji.id,
   qi.id,
   Qi.id,
-  es.id,
-  ts.id,
-  ns.id
+  es.id
 ];
-let cn = class extends ie {
-  constructor(i, t, e, n, r, s, o, a, c) {
-    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 = c, this._sheetInterceptorListener(), this._commandListener(), this._sheetRefreshListener();
+let sn = class extends ie {
+  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();
   }
   _sheetInterceptorListener() {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
         getMutations: (i) => {
-          if (!Js.includes(i.id))
+          if (!xs.includes(i.id))
             return { redos: [], undos: [] };
           if (i.params == null)
             return { redos: [], undos: [] };
           const t = i.id;
-          if (t === er.id)
+          if (t === Kn.id)
             return this._moveRowInterceptor(i.params, "insert");
-          if ([mr.id, fr.id, pr.id].includes(t))
+          if ([dr.id, lr.id, ur.id].includes(t))
             return this._moveRangeInterceptor(i.params);
-          if (t === tr.id)
+          if (t === Zn.id)
             return this._moveColInterceptor(i.params, "insert");
-          if (t === nr.id)
+          if (t === Jn.id)
             return this._moveRowInterceptor(i.params, "remove");
-          if (t === rr.id)
+          if (t === qn.id)
             return this._moveColInterceptor(i.params, "remove");
-          if (t === ir.id) {
+          if (t === Qn.id) {
             const { range: e } = i.params;
             return this._getRangeMoveUndo(
               e,
               0
               /* deleteLeft */
             );
-          } else if (t === sr.id) {
+          } else if (t === er.id) {
             const { range: e } = i.params;
             return this._getRangeMoveUndo(
               e,
               1
               /* deleteUp */
             );
-          } else if (t === or.id) {
+          } else if (t === tr.id) {
             const { range: e } = i.params;
             return this._getRangeMoveUndo(
               e,
               2
               /* insertDown */
             );
-          } else if (t === ar.id) {
+          } else if (t === nr.id) {
             const { range: e } = i.params;
             return this._getRangeMoveUndo(
               e,
               3
               /* insertRight */
             );
-          } else if (t === lr.id || t === ur.id) {
+          } else if (t === sr.id || t === or.id) {
             const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e;
             return this._getDrawingUndoForRowVisible(n, r, s);
-          } else if (t === hr.id || t === gr.id) {
+          } else if (t === ar.id || t === cr.id) {
             const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e;
             return this._getDrawingUndoForColVisible(n, r, s);
-          } else if (t === tn.id || t === nn.id || t === cr.id || t === dr.id) {
-            const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e, o = t === tn.id || t === nn.id;
+          } else if (t === Jt.id || t === qt.id || t === rr.id || t === ir.id) {
+            const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e, o = t === Jt.id || t === qt.id;
             return this._getDrawingUndoForRowAndColSize(n, r, s, o);
           }
           return { redos: [], undos: [] };
@@ -2590,27 +2585,27 @@ let cn = class extends ie {
     const e = ae(this._univerInstanceService);
     if (e == null)
       return { redos: [], undos: [] };
-    const n = e.unitId, r = e.subUnitId, s = [], o = [], a = this._sheetDrawingService.getDrawingData(n, r), c = [], u = [];
-    if (Object.keys(a).forEach((d) => {
-      const l = a[d], { updateDrawings: g, deleteDrawings: h } = this._getUpdateOrDeleteDrawings(i, t, l);
-      c.push(...g), u.push(...h);
-    }), c.length === 0 && u.length === 0)
+    const n = e.unitId, r = e.subUnitId, s = [], o = [], a = this._sheetDrawingService.getDrawingData(n, r), d = [], u = [];
+    if (Object.keys(a).forEach((c) => {
+      const l = a[c], { updateDrawings: g, deleteDrawings: h } = this._getUpdateOrDeleteDrawings(i, t, l);
+      d.push(...g), u.push(...h);
+    }), d.length === 0 && u.length === 0)
       return { redos: [], undos: [] };
-    if (c.length > 0) {
-      const d = this._sheetDrawingService.getBatchUpdateOp(c), { undo: l, redo: g, objects: h } = d;
-      s.push({ id: U.id, params: { unitId: n, subUnitId: r, op: g, objects: h, type: P.UPDATE } }), o.push({ id: U.id, params: { unitId: n, subUnitId: r, op: l, objects: h, type: P.UPDATE } });
+    if (d.length > 0) {
+      const c = this._sheetDrawingService.getBatchUpdateOp(d), { undo: l, redo: g, objects: h } = c;
+      s.push({ id: P.id, params: { unitId: n, subUnitId: r, op: g, objects: h, type: U.UPDATE } }), o.push({ id: P.id, params: { unitId: n, subUnitId: r, op: l, objects: h, type: U.UPDATE } });
     }
     if (u.length > 0) {
-      const d = this._sheetDrawingService.getBatchRemoveOp(u), l = d.undo, g = d.redo, h = d.objects;
-      s.push({ id: U.id, params: { unitId: n, subUnitId: r, op: g, objects: h, type: P.REMOVE } }), o.push({ id: U.id, params: { unitId: n, subUnitId: r, op: l, objects: h, type: P.INSERT } });
+      const c = this._sheetDrawingService.getBatchRemoveOp(u), l = c.undo, g = c.redo, h = c.objects;
+      s.push({ id: P.id, params: { unitId: n, subUnitId: r, op: g, objects: h, type: U.REMOVE } }), o.push({ id: P.id, params: { unitId: n, subUnitId: r, op: l, objects: h, type: U.INSERT } });
     }
-    return s.push({ id: F.id, params: [n] }), o.push({ id: F.id, params: [n] }), {
+    return s.push({ id: L.id, params: [n] }), o.push({ id: L.id, params: [n] }), {
       redos: s,
       undos: o
     };
   }
   _getUpdateOrDeleteDrawings(i, t, e) {
-    const n = [], r = [], { sheetTransform: s, anchorType: o = O.Position, transform: a, unitId: c, subUnitId: u, drawingId: d } = e, { from: l, to: g } = s, { row: h, column: f } = l, { row: p, column: m } = 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,
@@ -2619,15 +2614,15 @@ let cn = class extends ie {
     const { startRow: _, endRow: S, startColumn: C, endColumn: b } = i;
     let v = null, D = null;
     if (t === 0 && h >= _ && p <= S)
-      if (f >= C && m <= b)
-        r.push({ unitId: c, subUnitId: u, drawingId: d });
+      if (m >= C && f <= b)
+        r.push({ unitId: d, subUnitId: u, drawingId: c });
       else {
         const w = this._shrinkCol(s, a, C, b, o);
         v = w == null ? void 0 : w.newSheetTransform, D = w == null ? void 0 : w.newTransform;
       }
-    else if (t === 1 && f >= C && m <= b)
+    else if (t === 1 && m >= C && f <= b)
       if (h >= _ && p <= S)
-        r.push({ unitId: c, subUnitId: u, drawingId: d });
+        r.push({ unitId: d, subUnitId: u, drawingId: c });
       else {
         const w = this._shrinkRow(s, a, _, S, o);
         v = w == null ? void 0 : w.newSheetTransform, D = w == null ? void 0 : w.newTransform;
@@ -2655,23 +2650,23 @@ let cn = class extends ie {
   // eslint-disable-next-line max-lines-per-function
   _getDrawingUndoForColVisible(i, t, e) {
     const n = this._drawingManagerService.getDrawingData(i, t), r = [], s = [];
-    if (Object.keys(n).forEach((d) => {
-      const l = n[d], { sheetTransform: g, transform: h, anchorType: f = O.Position } = l;
-      if (f === O.None)
+    if (Object.keys(n).forEach((c) => {
+      const l = n[c], { sheetTransform: g, transform: h, anchorType: m = O.Position } = l;
+      if (m === O.None)
         this._remainDrawingSize(h, r, l);
       else {
-        const { from: p, to: m } = g, { row: _, column: S } = p, { row: C, column: b } = m;
+        const { from: p, to: f } = g, { row: _, column: S } = p, { row: C, column: b } = f;
         for (let v = 0; v < e.length; v++) {
-          const D = e[v], { startRow: w, endRow: M, startColumn: I, endColumn: E } = D;
+          const D = e[v], { startRow: w, endRow: y, startColumn: I, endColumn: E } = D;
           if (b < I)
             continue;
-          if (f === O.Position) {
+          if (m === O.Position) {
             let R = null, N = null;
             if (S >= I && S <= E) {
-              const j = this._skeletonManagerService.attachRangeWithCoord({ startColumn: S, endColumn: E, startRow: p.row, endRow: m.row });
-              if (j == null)
+              const B = this._skeletonManagerService.attachRangeWithCoord({ startColumn: S, endColumn: E, startRow: p.row, endRow: f.row });
+              if (B == null)
                 return;
-              N = { ...h, left: j.startX };
+              N = { ...h, left: B.startX };
             }
             if (N != null && (R = x(N, this._selectionRenderService), R != null && N != null)) {
               r.push({ ...l, sheetTransform: R, transform: N });
@@ -2682,38 +2677,38 @@ let cn = class extends ie {
           }
           if (S >= I && b <= E)
             continue;
-          let T = null, y = null;
+          let T = null, M = null;
           if (S >= I && S <= E) {
-            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: S, endColumn: E, startRow: p.row, endRow: m.row });
+            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: S, endColumn: E, startRow: p.row, endRow: f.row });
             if (R == null)
               return;
-            y = {
+            M = {
               ...h,
               left: (R == null ? void 0 : R.startX) || 0,
               width: ((h == null ? void 0 : h.width) || 0) - R.endX + R.startX
             };
           } else if (b >= I && b <= E) {
-            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: I, endColumn: b, startRow: p.row, endRow: m.row });
+            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: I, endColumn: b, startRow: p.row, endRow: f.row });
             if (R == null)
               return;
-            y = {
+            M = {
               ...h,
               left: R.startX - ((h == null ? void 0 : h.width) || 0)
             };
           } else {
-            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: I, endColumn: E, startRow: p.row, endRow: m.row });
+            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: I, endColumn: E, startRow: p.row, endRow: f.row });
             if (R == null)
               return;
-            if (y = {
+            if (M = {
               ...h,
               width: ((h == null ? void 0 : h.width) || 0) - R.endX + R.startX
-            }, T = x(y, this._selectionRenderService), T != null && y != null) {
-              s.push({ ...l, sheetTransform: T, transform: y });
+            }, T = x(M, this._selectionRenderService), T != null && M != null) {
+              s.push({ ...l, sheetTransform: T, transform: M });
               break;
             }
           }
-          if (y != null && (T = x(y, this._selectionRenderService)), y != null && T != null) {
-            r.push({ ...l, sheetTransform: T, transform: y });
+          if (M != null && (T = x(M, this._selectionRenderService)), M != null && T != null) {
+            r.push({ ...l, sheetTransform: T, transform: M });
             break;
           } else
             this._remainDrawingSize(h, r, l);
@@ -2721,51 +2716,51 @@ let cn = class extends ie {
       }
     }), r.length === 0 && s.length === 0)
       return { redos: [], undos: [] };
-    const { redos: o, undos: a } = this._createUndoAndRedoMutation(i, t, r), c = [], u = [];
+    const { redos: o, undos: a } = this._createUndoAndRedoMutation(i, t, r), d = [], u = [];
     if (s.length > 0) {
-      const { redos: d, undos: l } = this._createUndoAndRedoMutation(i, t, s);
-      c.push(...d), u.push(...l);
+      const { redos: c, undos: l } = this._createUndoAndRedoMutation(i, t, s);
+      d.push(...c), u.push(...l);
     }
     return {
       redos: o,
       undos: a,
-      preRedos: c,
+      preRedos: d,
       preUndos: u
     };
   }
   _createUndoAndRedoMutation(i, t, e) {
     const n = this._sheetDrawingService.getBatchUpdateOp(e), { undo: r, redo: s, objects: o } = n, a = [
-      { id: U.id, params: { unitId: i, subUnitId: t, op: s, objects: o, type: P.UPDATE } },
-      { id: F.id, params: [i] }
-    ], c = [
-      { id: U.id, params: { unitId: i, subUnitId: t, op: r, objects: o, type: P.UPDATE } },
-      { id: F.id, params: [i] }
+      { id: P.id, params: { unitId: i, subUnitId: t, op: s, objects: o, type: U.UPDATE } },
+      { id: L.id, params: [i] }
+    ], d = [
+      { id: P.id, params: { unitId: i, subUnitId: t, op: r, objects: o, type: U.UPDATE } },
+      { id: L.id, params: [i] }
     ];
     return {
       redos: a,
-      undos: c
+      undos: d
     };
   }
   // eslint-disable-next-line max-lines-per-function
   _getDrawingUndoForRowVisible(i, t, e) {
     const n = this._drawingManagerService.getDrawingData(i, t), r = [], s = [];
-    if (Object.keys(n).forEach((d) => {
-      const l = n[d], { sheetTransform: g, transform: h, anchorType: f = O.Position } = l;
-      if (f === O.None)
+    if (Object.keys(n).forEach((c) => {
+      const l = n[c], { sheetTransform: g, transform: h, anchorType: m = O.Position } = l;
+      if (m === O.None)
         this._remainDrawingSize(h, r, l);
       else {
-        const { from: p, to: m } = g, { row: _, column: S } = p, { row: C, column: b } = m;
+        const { from: p, to: f } = g, { row: _, column: S } = p, { row: C, column: b } = f;
         for (let v = 0; v < e.length; v++) {
-          const D = e[v], { startRow: w, endRow: M, startColumn: I, endColumn: E } = D;
+          const D = e[v], { startRow: w, endRow: y, startColumn: I, endColumn: E } = D;
           if (C < w)
             continue;
-          if (f === O.Position) {
+          if (m === O.Position) {
             let R = null, N = null;
-            if (_ >= w && _ <= M) {
-              const j = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: m.column, startRow: _, endRow: M });
-              if (j == null)
+            if (_ >= w && _ <= y) {
+              const B = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: f.column, startRow: _, endRow: y });
+              if (B == null)
                 return;
-              N = { ...h, top: j.startY };
+              N = { ...h, top: B.startY };
             }
             if (N != null && (R = x(N, this._selectionRenderService), R != null && N != null)) {
               r.push({ ...l, sheetTransform: R, transform: N });
@@ -2774,40 +2769,40 @@ let cn = class extends ie {
             this._remainDrawingSize(h, r, l);
             continue;
           }
-          if (_ >= w && C <= M)
+          if (_ >= w && C <= y)
             continue;
-          let T = null, y = null;
-          if (_ >= w && _ <= M) {
-            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: m.column, startRow: _, endRow: M });
+          let T = null, M = null;
+          if (_ >= w && _ <= y) {
+            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: f.column, startRow: _, endRow: y });
             if (R == null)
               return;
-            y = {
+            M = {
               ...h,
               top: (R == null ? void 0 : R.startY) || 0,
               height: ((h == null ? void 0 : h.height) || 0) - R.endY + R.startY
             };
-          } else if (C >= w && C <= M) {
-            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: m.column, startRow: w, endRow: C });
+          } else if (C >= w && C <= y) {
+            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: f.column, startRow: w, endRow: C });
             if (R == null)
               return;
-            y = {
+            M = {
               ...h,
               top: R.startY - ((h == null ? void 0 : h.height) || 0)
             };
           } else {
-            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: m.column, startRow: w, endRow: M });
+            const R = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: f.column, startRow: w, endRow: y });
             if (R == null)
               return;
-            if (y = {
+            if (M = {
               ...h,
               height: ((h == null ? void 0 : h.height) || 0) - R.endY + R.startY
-            }, T = x(y, this._selectionRenderService), T != null && y != null) {
-              s.push({ ...l, sheetTransform: T, transform: y });
+            }, T = x(M, this._selectionRenderService), T != null && M != null) {
+              s.push({ ...l, sheetTransform: T, transform: M });
               break;
             }
           }
-          if (y != null && (T = x(y, this._selectionRenderService)), y != null && T != null) {
-            r.push({ ...l, sheetTransform: T, transform: y });
+          if (M != null && (T = x(M, this._selectionRenderService)), M != null && T != null) {
+            r.push({ ...l, sheetTransform: T, transform: M });
             break;
           } else
             this._remainDrawingSize(h, r, l);
@@ -2815,35 +2810,35 @@ let cn = class extends ie {
       }
     }), r.length === 0 && s.length === 0)
       return { redos: [], undos: [] };
-    const { redos: o, undos: a } = this._createUndoAndRedoMutation(i, t, r), c = [], u = [];
+    const { redos: o, undos: a } = this._createUndoAndRedoMutation(i, t, r), d = [], u = [];
     if (s.length > 0) {
-      const { redos: d, undos: l } = this._createUndoAndRedoMutation(i, t, s);
-      c.push(...d), u.push(...l);
+      const { redos: c, undos: l } = this._createUndoAndRedoMutation(i, t, s);
+      d.push(...c), u.push(...l);
     }
     return {
       redos: o,
       undos: a,
-      preRedos: c,
+      preRedos: d,
       preUndos: u
     };
   }
   _getDrawingUndoForRowAndColSize(i, t, e, n) {
     const r = this._drawingManagerService.getDrawingData(i, t), s = [];
     return Object.keys(r).forEach((o) => {
-      const a = r[o], { sheetTransform: c, transform: u, anchorType: d = O.Position } = a;
-      if (d === O.None)
+      const a = r[o], { sheetTransform: d, transform: u, anchorType: c = O.Position } = a;
+      if (c === O.None)
         this._remainDrawingSize(u, s, a);
       else {
-        const { from: l, to: g } = c, { row: h, column: f } = l, { row: p, column: m } = g;
+        const { from: l, to: g } = d, { row: h, column: m } = l, { row: p, column: f } = g;
         for (let _ = 0; _ < e.length; _++) {
           const S = e[_], { startRow: C, endRow: b, startColumn: v, endColumn: D } = S;
-          if (p < C || m < v)
+          if (p < C || f < v)
             continue;
-          if (d === O.Position && (h <= C && p >= b || f <= v && m >= D)) {
+          if (c === O.Position && (h <= C && p >= b || m <= v && f >= D)) {
             this._remainDrawingSize(u, s, a);
             continue;
           }
-          const w = z({ ...c }, this._selectionRenderService, this._skeletonManagerService);
+          const w = z({ ...d }, this._selectionRenderService, this._skeletonManagerService);
           if (w != null) {
             s.push({
               ...a,
@@ -2875,10 +2870,10 @@ let cn = class extends ie {
     const { unitId: r, subUnitId: s } = n, o = (b = (C = this._renderManagerService.getRenderById(r)) == null ? void 0 : C.with(V)) == null ? void 0 : b.getCurrentSkeleton();
     if (!o)
       return { redos: [], undos: [] };
-    const a = Jn(o, e);
+    const a = Vn(o, e);
     if (!a)
       return { redos: [], undos: [] };
-    const { startX: c, endX: u, startY: d, endY: l } = a, g = this._sheetDrawingService.getDrawingData(r, s), h = [];
+    const { startX: d, endX: u, startY: c, endY: l } = a, g = this._sheetDrawingService.getDrawingData(r, s), h = [];
     Object.keys(g).forEach((v) => {
       const D = g[v];
       if (D.anchorType !== O.Both)
@@ -2886,52 +2881,52 @@ let cn = class extends ie {
       const { transform: w } = D;
       if (!w)
         return;
-      const { left: M = 0, top: I = 0, width: E = 0, height: T = 0 } = w, { drawingStartX: y, drawingEndX: R, drawingStartY: N, drawingEndY: j } = {
-        drawingStartX: M,
-        drawingEndX: M + E,
+      const { left: y = 0, top: I = 0, width: E = 0, height: T = 0 } = w, { drawingStartX: M, drawingEndX: R, drawingStartY: N, drawingEndY: B } = {
+        drawingStartX: y,
+        drawingEndX: y + E,
         drawingStartY: I,
         drawingEndY: I + T
       };
-      c <= y && R <= u && d <= N && j <= l && h.push(D);
+      d <= M && R <= u && c <= N && B <= l && h.push(D);
     });
-    const f = [], p = [], m = t.startRow - e.startRow, _ = t.startColumn - e.startColumn, S = h.map((v) => {
+    const m = [], p = [], f = t.startRow - e.startRow, _ = t.startColumn - e.startColumn, S = h.map((v) => {
       const D = v.sheetTransform, w = {
-        to: { ...D.to, row: D.to.row + m, column: D.to.column + _ },
-        from: { ...D.from, row: D.from.row + m, column: D.from.column + _ }
-      }, M = z(w, this._selectionRenderService, this._skeletonManagerService);
+        to: { ...D.to, row: D.to.row + f, column: D.to.column + _ },
+        from: { ...D.from, row: D.from.row + f, column: D.from.column + _ }
+      }, y = z(w, this._selectionRenderService, this._skeletonManagerService);
       return {
         unitId: r,
         subUnitId: s,
         drawingId: v.drawingId,
-        transform: M,
+        transform: y,
         sheetTransform: w
       };
     });
     if (S.length) {
-      const v = this._sheetDrawingService.getBatchUpdateOp(S), { undo: D, redo: w, objects: M } = v;
-      f.push({ id: U.id, params: { unitId: r, subUnitId: s, op: w, objects: M, type: P.UPDATE } }), p.push({ id: U.id, params: { unitId: r, subUnitId: s, op: D, objects: M, type: P.UPDATE } });
+      const v = this._sheetDrawingService.getBatchUpdateOp(S), { undo: D, redo: w, objects: y } = v;
+      m.push({ id: P.id, params: { unitId: r, subUnitId: s, op: w, objects: y, type: U.UPDATE } }), p.push({ id: P.id, params: { unitId: r, subUnitId: s, op: D, objects: y, type: U.UPDATE } });
     }
-    return { redos: f, undos: p };
+    return { redos: m, undos: p };
   }
   _moveRowInterceptor(i, t) {
     const e = this._getUnitIdAndSubUnitId(i, t);
     if (e == null)
       return { redos: [], undos: [] };
-    const { unitId: n, subUnitId: r } = e, { range: s } = i, o = s.startRow, a = s.endRow, c = [], u = [], d = this._sheetDrawingService.getDrawingData(n, r), l = [], g = [];
-    if (Object.keys(d).forEach((h) => {
-      const f = d[h], { sheetTransform: p, transform: m, anchorType: _ = O.Position } = f;
-      if (p == null || m == null)
+    const { unitId: n, subUnitId: r } = e, { range: s } = i, o = s.startRow, a = s.endRow, d = [], u = [], c = this._sheetDrawingService.getDrawingData(n, r), l = [], g = [];
+    if (Object.keys(c).forEach((h) => {
+      const m = c[h], { sheetTransform: p, transform: f, anchorType: _ = O.Position } = m;
+      if (p == null || f == null)
         return;
       let S, C;
       if (t === "insert") {
-        const v = this._expandRow(p, m, o, a, _);
+        const v = this._expandRow(p, f, o, a, _);
         S = v == null ? void 0 : v.newSheetTransform, C = v == null ? void 0 : v.newTransform;
       } else {
-        const { from: v, to: D } = p, { row: w } = v, { row: M } = D;
-        if (_ === O.Both && w >= o && M <= a)
+        const { from: v, to: D } = p, { row: w } = v, { row: y } = D;
+        if (_ === O.Both && w >= o && y <= a)
           g.push({ unitId: n, subUnitId: r, drawingId: h });
         else {
-          const I = this._shrinkRow(p, m, o, a, _);
+          const I = this._shrinkRow(p, f, o, a, _);
           S = I == null ? void 0 : I.newSheetTransform, C = I == null ? void 0 : I.newTransform;
         }
       }
@@ -2942,15 +2937,15 @@ let cn = class extends ie {
     }), l.length === 0 && g.length === 0)
       return { redos: [], undos: [] };
     if (l.length > 0) {
-      const h = this._sheetDrawingService.getBatchUpdateOp(l), { undo: f, redo: p, objects: m } = h;
-      c.push({ id: U.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: P.UPDATE } }), u.push({ id: U.id, params: { unitId: n, subUnitId: r, op: f, objects: m, type: P.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), f = h.undo, p = h.redo, m = h.objects;
-      c.push({ id: U.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: P.REMOVE } }), u.push({ id: U.id, params: { unitId: n, subUnitId: r, op: f, objects: m, type: P.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 c.push({ id: F.id, params: [n] }), u.push({ id: F.id, params: [n] }), {
-      redos: c,
+    return d.push({ id: L.id, params: [n] }), u.push({ id: L.id, params: [n] }), {
+      redos: d,
       undos: u
     };
   }
@@ -2958,21 +2953,21 @@ let cn = class extends ie {
     const e = this._getUnitIdAndSubUnitId(i, t);
     if (e == null)
       return { redos: [], undos: [] };
-    const { unitId: n, subUnitId: r } = e, { range: s } = i, o = s.startColumn, a = s.endColumn, c = [], u = [], d = this._sheetDrawingService.getDrawingData(n, r), l = [], g = [];
-    if (Object.keys(d).forEach((h) => {
-      const f = d[h], { sheetTransform: p, transform: m, anchorType: _ = O.Position } = f;
-      if (p == null || m == null)
+    const { unitId: n, subUnitId: r } = e, { range: s } = i, o = s.startColumn, a = s.endColumn, d = [], u = [], c = this._sheetDrawingService.getDrawingData(n, r), l = [], g = [];
+    if (Object.keys(c).forEach((h) => {
+      const m = c[h], { sheetTransform: p, transform: f, anchorType: _ = O.Position } = m;
+      if (p == null || f == null)
         return;
       let S, C;
       if (t === "insert") {
-        const v = this._expandCol(p, m, o, a, _);
+        const v = this._expandCol(p, f, o, a, _);
         S = v == null ? void 0 : v.newSheetTransform, C = v == null ? void 0 : v.newTransform;
       } else {
-        const { from: v, to: D } = p, { column: w } = v, { column: M } = D;
-        if (_ === O.Both && w >= o && M <= a)
+        const { from: v, to: D } = p, { column: w } = v, { column: y } = D;
+        if (_ === O.Both && w >= o && y <= a)
           g.push({ unitId: n, subUnitId: r, drawingId: h });
         else {
-          const I = this._shrinkCol(p, m, o, a, _);
+          const I = this._shrinkCol(p, f, o, a, _);
           S = I == null ? void 0 : I.newSheetTransform, C = I == null ? void 0 : I.newTransform;
         }
       }
@@ -2983,81 +2978,81 @@ let cn = class extends ie {
     }), l.length === 0 && g.length === 0)
       return { redos: [], undos: [] };
     if (l.length > 0) {
-      const h = this._sheetDrawingService.getBatchUpdateOp(l), { undo: f, redo: p, objects: m } = h;
-      c.push({ id: U.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: P.UPDATE } }), u.push({ id: U.id, params: { unitId: n, subUnitId: r, op: f, objects: m, type: P.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), f = h.undo, p = h.redo, m = h.objects;
-      c.push({ id: U.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: P.REMOVE } }), u.push({ id: U.id, params: { unitId: n, subUnitId: r, op: f, objects: m, type: P.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 c.push({ id: F.id, params: [n] }), u.push({ id: F.id, params: [n] }), { redos: c, undos: u };
+    return d.push({ id: L.id, params: [n] }), u.push({ id: L.id, params: [n] }), { redos: d, undos: u };
   }
   _expandCol(i, t, e, n, r = O.Position) {
-    const s = n - e + 1, { from: o, to: a } = i, { column: c } = o, { column: u } = a;
+    const s = n - e + 1, { from: o, to: a } = i, { column: d } = o, { column: u } = a;
     if (r === O.None)
       return {
         newSheetTransform: x({ ...t }, this._selectionRenderService),
         newTransform: t
       };
-    let d = null, l = null;
-    if (c >= e) {
+    let c = null, l = null;
+    if (d >= e) {
       const g = this._skeletonManagerService.attachRangeWithCoord({ startColumn: e, endColumn: n, startRow: o.row, endRow: a.row });
       if (g == null)
         return;
-      l = { ...t, left: (t.left || 0) + g.endX - g.startX }, d = x(l, this._selectionRenderService);
+      l = { ...t, left: (t.left || 0) + g.endX - g.startX }, c = x(l, this._selectionRenderService);
     } else if (u >= n)
       if (r === O.Both)
-        d = {
+        c = {
           from: { ...o },
           to: { ...a, column: u + s }
-        }, l = z(d, this._selectionRenderService, this._skeletonManagerService);
+        }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
       else
         return {
           newSheetTransform: x({ ...t }, this._selectionRenderService),
           newTransform: t
         };
-    return d != null && l != null ? {
-      newSheetTransform: d,
+    return c != null && l != null ? {
+      newSheetTransform: c,
       newTransform: l
     } : null;
   }
   _shrinkCol(i, t, e, n, r = O.Position) {
-    const s = n - e + 1, { from: o, to: a } = i, { column: c } = o, { column: u } = a;
+    const s = n - e + 1, { from: o, to: a } = i, { column: d } = o, { column: u } = a;
     if (r === O.None)
       return {
         newSheetTransform: x({ ...t }, this._selectionRenderService),
         newTransform: t
       };
-    let d = null, l = null;
-    if (c > n)
-      d = {
-        from: { ...o, column: c - s },
+    let c = null, l = null;
+    if (d > n)
+      c = {
+        from: { ...o, column: d - s },
         to: { ...a, column: u - s }
-      }, l = z(d, this._selectionRenderService, this._skeletonManagerService);
+      }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
     else {
-      if (c >= e && u <= n)
+      if (d >= e && u <= n)
         return null;
-      if (c < e && u > n)
+      if (d < e && u > n)
         if (r === O.Both)
-          d = {
+          c = {
             from: { ...o },
             to: { ...a, column: u - s }
-          }, l = z(d, this._selectionRenderService, this._skeletonManagerService);
+          }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
         else
           return {
             newSheetTransform: x({ ...t }, this._selectionRenderService),
             newTransform: t
           };
-      else if (c >= e && c <= n) {
-        if (c === e)
+      else if (d >= e && d <= n) {
+        if (d === e)
           l = { ...t, left: (t.left || 0) - i.from.columnOffset };
         else {
-          const g = this._skeletonManagerService.attachRangeWithCoord({ startColumn: e, endColumn: c - 1, startRow: o.row, endRow: a.row });
+          const g = this._skeletonManagerService.attachRangeWithCoord({ startColumn: e, endColumn: d - 1, startRow: o.row, endRow: a.row });
           if (g == null)
             return;
           l = { ...t, left: (t.left || 0) - g.endX + g.startX - i.from.columnOffset };
         }
-        d = x(l, this._selectionRenderService);
+        c = x(l, this._selectionRenderService);
       } else if (u >= e && u <= n && r === O.Both) {
         const g = this._skeletonManagerService.attachRangeWithCoord({
           startColumn: e - 1,
@@ -3067,98 +3062,98 @@ let cn = class extends ie {
         });
         if (g == null)
           return;
-        d = {
+        c = {
           from: { ...o },
           to: { ...a, column: e - 1, columnOffset: g.endX - g.startX }
-        }, l = z(d, this._selectionRenderService, this._skeletonManagerService);
+        }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
       }
     }
-    return d != null && l != null ? {
-      newSheetTransform: d,
+    return c != null && l != null ? {
+      newSheetTransform: c,
       newTransform: l
     } : null;
   }
   _expandRow(i, t, e, n, r = O.Position) {
-    const s = n - e + 1, { from: o, to: a } = i, { row: c } = o, { row: u } = a;
+    const s = n - e + 1, { from: o, to: a } = i, { row: d } = o, { row: u } = a;
     if (r === O.None)
       return {
         newSheetTransform: x({ ...t }, this._selectionRenderService),
         newTransform: t
       };
-    let d = null, l = null;
-    if (c >= e) {
+    let c = null, l = null;
+    if (d >= e) {
       const g = this._skeletonManagerService.attachRangeWithCoord({ startRow: e, endRow: n, startColumn: o.column, endColumn: a.column });
       if (g == null)
         return;
-      l = { ...t, top: (t.top || 0) + g.endY - g.startY }, d = x(l, this._selectionRenderService);
+      l = { ...t, top: (t.top || 0) + g.endY - g.startY }, c = x(l, this._selectionRenderService);
     } else if (u >= n)
       if (r === O.Both)
-        d = {
+        c = {
           from: { ...o },
           to: {
             ...a,
             row: u + s
           }
-        }, l = z(d, this._selectionRenderService, this._skeletonManagerService);
+        }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
       else
         return {
           newSheetTransform: x({ ...t }, this._selectionRenderService),
           newTransform: t
         };
-    return d != null && l != null ? {
-      newSheetTransform: d,
+    return c != null && l != null ? {
+      newSheetTransform: c,
       newTransform: l
     } : null;
   }
   _shrinkRow(i, t, e, n, r = O.Position) {
-    const s = n - e + 1, { from: o, to: a } = i, { row: c } = o, { row: u } = a;
+    const s = n - e + 1, { from: o, to: a } = i, { row: d } = o, { row: u } = a;
     if (r === O.None)
       return {
         newSheetTransform: x({ ...t }, this._selectionRenderService),
         newTransform: t
       };
-    let d = null, l = null;
-    if (c > n)
-      d = {
-        from: { ...o, row: c - s },
+    let c = null, l = null;
+    if (d > n)
+      c = {
+        from: { ...o, row: d - s },
         to: { ...a, row: u - s }
-      }, l = z(d, this._selectionRenderService, this._skeletonManagerService);
+      }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
     else {
-      if (c >= e && u <= n)
+      if (d >= e && u <= n)
         return null;
-      if (c < e && u > n)
+      if (d < e && u > n)
         if (r === O.Both)
-          d = {
+          c = {
             from: { ...o },
             to: { ...a, row: u - s }
-          }, l = z(d, this._selectionRenderService, this._skeletonManagerService);
+          }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
         else
           return {
             newSheetTransform: x({ ...t }, this._selectionRenderService),
             newTransform: t
           };
-      else if (c >= e && c <= n) {
-        if (c === e)
+      else if (d >= e && d <= n) {
+        if (d === e)
           l = { ...t, top: (t.top || 0) - i.from.rowOffset };
         else {
-          const g = this._skeletonManagerService.attachRangeWithCoord({ startRow: e, endRow: c - 1, startColumn: o.column, endColumn: a.column });
+          const g = this._skeletonManagerService.attachRangeWithCoord({ startRow: e, endRow: d - 1, startColumn: o.column, endColumn: a.column });
           if (g == null)
             return;
           l = { ...t, top: (t.top || 0) - g.endY + g.startY - i.from.rowOffset };
         }
-        d = x(l, this._selectionRenderService);
+        c = x(l, this._selectionRenderService);
       } else if (u >= e && u <= n && r === O.Both) {
         const g = this._skeletonManagerService.attachRangeWithCoord({ startColumn: o.column, endColumn: o.column, startRow: e - 1, endRow: e - 1 });
         if (g == null)
           return;
-        d = {
+        c = {
           from: { ...o },
           to: { ...a, row: e - 1, rowOffset: g.endY - g.startY }
-        }, l = z(d, this._selectionRenderService, this._skeletonManagerService);
+        }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
       }
     }
-    return d != null && l != null ? {
-      newSheetTransform: d,
+    return c != null && l != null ? {
+      newSheetTransform: c,
       newTransform: l
     } : null;
   }
@@ -3168,7 +3163,7 @@ let cn = class extends ie {
       // 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 === rs.id) {
+        if (i.id === ts.id) {
           const { unitId: t, subUnitId: e } = i.params;
           this._updateDrawings(t, e);
         }
@@ -3204,13 +3199,13 @@ let cn = class extends ie {
       Object.keys(e).forEach((s) => {
         const o = e[s];
         o != null && Object.keys(o).forEach((a) => {
-          const c = o[a].data;
-          c != null && Object.keys(c).forEach((u) => {
+          const d = o[a].data;
+          d != null && Object.keys(d).forEach((u) => {
             if (s === i && a === t) {
-              const d = c[u];
-              d.transform = z(d.sheetTransform, this._selectionRenderService, this._skeletonManagerService), n.push(c[u]);
+              const c = d[u];
+              c.transform = z(c.sheetTransform, this._selectionRenderService, this._skeletonManagerService), n.push(d[u]);
             } else
-              r.push(c[u]);
+              r.push(d[u]);
           });
         });
       }), this._drawingManagerService.removeNotification(r), this._drawingManagerService.addNotification(n);
@@ -3219,7 +3214,7 @@ let cn = class extends ie {
   _sheetRefreshListener() {
     this.disposeWithMe(
       this._commandService.onCommandExecuted((i) => {
-        qs.includes(i.id) && requestIdleCallback(() => {
+        Fs.includes(i.id) && requestIdleCallback(() => {
           const t = i.params, { unitId: e, subUnitId: n, ranges: r } = t;
           this._refreshDrawingTransform(e, n, r);
         });
@@ -3229,13 +3224,13 @@ let cn = class extends ie {
   _refreshDrawingTransform(i, t, e) {
     const n = this._drawingManagerService.getDrawingData(i, t), r = [];
     Object.keys(n).forEach((s) => {
-      const o = n[s], { sheetTransform: a, transform: c, anchorType: u = O.Position } = o;
+      const o = n[s], { sheetTransform: a, transform: d, anchorType: u = O.Position } = o;
       if (u === O.None)
         return !0;
-      const { from: d, to: l } = a, { row: g, column: h } = d, { row: f, column: p } = l;
-      for (let m = 0; m < e.length; m++) {
-        const _ = e[m], { startRow: S, endRow: C, startColumn: b, endColumn: v } = _;
-        if (Jr.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 _ = e[f], { startRow: S, endRow: C, startColumn: b, endColumn: v } = _;
+        if (Hr.intersects(
           {
             startRow: S,
             endRow: C,
@@ -3244,7 +3239,7 @@ let cn = class extends ie {
           },
           {
             startRow: g,
-            endRow: f,
+            endRow: m,
             startColumn: h,
             endColumn: p
           }
@@ -3254,26 +3249,26 @@ let cn = class extends ie {
             ...o,
             transform: {
               ...w,
-              width: D ? c == null ? void 0 : c.width : w == null ? void 0 : w.width,
-              height: D ? c == null ? void 0 : c.height : w == null ? void 0 : w.height
+              width: D ? d == null ? void 0 : d.width : w == null ? void 0 : w.width,
+              height: D ? d == null ? void 0 : d.height : w == null ? void 0 : w.height
             }
           });
           break;
         }
       }
-    }), r.length !== 0 && (this._drawingManagerService.refreshTransform(r), this._commandService.syncExecuteCommand(F.id, [i]));
+    }), r.length !== 0 && (this._drawingManagerService.refreshTransform(r), this._commandService.syncExecuteCommand(L.id, [i]));
   }
 };
-cn = Zs([
+sn = $s([
   pe(1, q),
   pe(2, G),
-  pe(3, Ve),
+  pe(3, Ge),
   pe(4, A(V)),
-  pe(5, A($t)),
+  pe(5, A(kt)),
   pe(6, oe),
   pe(7, se),
   pe(8, Se)
-], cn);
+], sn);
 var re = function() {
   return re = Object.assign || function(i) {
     for (var t, e = 1, n = arguments.length; e < n; e++) {
@@ -3282,23 +3277,23 @@ var re = function() {
     }
     return i;
   }, re.apply(this, arguments);
-}, Qs = function(i, t) {
+}, Ls = function(i, t) {
   var e = {};
   for (var n in i) Object.prototype.hasOwnProperty.call(i, n) && t.indexOf(n) < 0 && (e[n] = i[n]);
   if (i != null && typeof Object.getOwnPropertySymbols == "function")
     for (var r = 0, n = Object.getOwnPropertySymbols(i); r < n.length; r++)
       t.indexOf(n[r]) < 0 && Object.prototype.propertyIsEnumerable.call(i, n[r]) && (e[n[r]] = i[n[r]]);
   return e;
-}, Er = wr(function(i, t) {
-  var e = i.icon, n = i.id, r = i.className, s = i.extend, o = Qs(i, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(n, " ").concat(r || "").trim(), c = as("_".concat(no()));
-  return Tr(e, "".concat(n), { defIds: e.defIds, idSuffix: c.current }, re({ ref: t, className: a }, o), s);
+}, br = hr(function(i, t) {
+  var e = i.icon, n = i.id, r = i.className, s = i.extend, o = Ls(i, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(n, " ").concat(r || "").trim(), d = os("_".concat(Xs()));
+  return Rr(e, "".concat(n), { defIds: e.defIds, idSuffix: d.current }, re({ ref: t, className: a }, o), s);
 });
-function Tr(i, t, e, n, r) {
-  return _r(i.tag, re(re({ key: t }, eo(i, e, r)), n), (to(i, e).children || []).map(function(s, o) {
-    return Tr(s, "".concat(t, "-").concat(i.tag, "-").concat(o), e, void 0, r);
+function Rr(i, t, e, n, r) {
+  return gr(i.tag, re(re({ key: t }, Ys(i, e, r)), n), (Gs(i, e).children || []).map(function(s, o) {
+    return Rr(s, "".concat(t, "-").concat(i.tag, "-").concat(o), e, void 0, r);
   }));
 }
-function eo(i, t, e) {
+function Ys(i, t, e) {
   var n = re({}, i.attrs);
   e != null && e.colorChannel1 && n.fill === "colorChannel1" && (n.fill = e.colorChannel1), i.tag === "mask" && n.id && (n.id = n.id + t.idSuffix), Object.entries(n).forEach(function(s) {
     var o = s[0], a = s[1];
@@ -3310,25 +3305,25 @@ function eo(i, t, e) {
     typeof a == "string" && (n[o] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
   })), n;
 }
-function to(i, t) {
+function Gs(i, t) {
   var e, n = t.defIds;
   return !n || n.length === 0 ? i : i.tag === "defs" && (!((e = i.children) === null || e === void 0) && e.length) ? re(re({}, i), { children: i.children.map(function(r) {
     return typeof r.attrs.id == "string" && n && n.indexOf(r.attrs.id) > -1 ? re(re({}, r), { attrs: re(re({}, r.attrs), { id: r.attrs.id + t.idSuffix }) }) : r;
   }) }) : i;
 }
-function no() {
+function Xs() {
   return Math.random().toString(36).substring(2, 8);
 }
-Er.displayName = "UniverIcon";
-var ro = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M2.2498 3.65005C2.2498 2.87685 2.87661 2.25005 3.64981 2.25005H7.9998C8.33118 2.25005 8.5998 1.98142 8.5998 1.65005C8.5998 1.31868 8.33118 1.05005 7.9998 1.05005H3.64981C2.21387 1.05005 1.0498 2.21411 1.0498 3.65005V12.35C1.0498 13.786 2.21386 14.95 3.6498 14.95H12.3498C13.7857 14.95 14.9498 13.786 14.9498 12.3501V8.00005C14.9498 7.66868 14.6812 7.40005 14.3498 7.40005C14.0184 7.40005 13.7498 7.66868 13.7498 8.00005V9.23974L12.2385 8.1063C11.7252 7.72129 11.0068 7.7723 10.5531 8.22605L9.00869 9.77041L6.73916 7.8251C6.24387 7.40055 5.5095 7.41278 5.02864 7.85359L2.2498 10.4009V3.65005ZM2.2498 12.0287V12.35C2.2498 13.1232 2.87661 13.75 3.6498 13.75H12.3498C13.123 13.75 13.7498 13.1232 13.7498 12.3501V10.7397L11.5186 9.06631C11.4829 9.03956 11.433 9.04314 11.4016 9.07458L9.92249 10.5537L11.1015 11.5642C11.3531 11.7799 11.3822 12.1587 11.1666 12.4103C10.9509 12.6619 10.5721 12.691 10.3205 12.4753L5.9582 8.7362C5.92384 8.70674 5.87288 8.70758 5.83952 8.73816L2.2498 12.0287Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M11.8097 1.14783C12.1411 1.14783 12.4097 1.41646 12.4097 1.74783V3.297H14.1541C14.4855 3.297 14.7541 3.56563 14.7541 3.897C14.7541 4.22837 14.4855 4.497 14.1541 4.497H12.4097V6.24167C12.4097 6.57304 12.1411 6.84167 11.8097 6.84167C11.4783 6.84167 11.2097 6.57304 11.2097 6.24167V4.497H9.6603C9.32893 4.497 9.0603 4.22837 9.0603 3.897C9.0603 3.56563 9.32893 3.297 9.6603 3.297H11.2097V1.74783C11.2097 1.41646 11.4783 1.14783 11.8097 1.14783Z" } }] }, Or = wr(function(i, t) {
-  return _r(Er, Object.assign({}, i, {
+br.displayName = "UniverIcon";
+var Vs = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M2.2498 3.65005C2.2498 2.87685 2.87661 2.25005 3.64981 2.25005H7.9998C8.33118 2.25005 8.5998 1.98142 8.5998 1.65005C8.5998 1.31868 8.33118 1.05005 7.9998 1.05005H3.64981C2.21387 1.05005 1.0498 2.21411 1.0498 3.65005V12.35C1.0498 13.786 2.21386 14.95 3.6498 14.95H12.3498C13.7857 14.95 14.9498 13.786 14.9498 12.3501V8.00005C14.9498 7.66868 14.6812 7.40005 14.3498 7.40005C14.0184 7.40005 13.7498 7.66868 13.7498 8.00005V9.23974L12.2385 8.1063C11.7252 7.72129 11.0068 7.7723 10.5531 8.22605L9.00869 9.77041L6.73916 7.8251C6.24387 7.40055 5.5095 7.41278 5.02864 7.85359L2.2498 10.4009V3.65005ZM2.2498 12.0287V12.35C2.2498 13.1232 2.87661 13.75 3.6498 13.75H12.3498C13.123 13.75 13.7498 13.1232 13.7498 12.3501V10.7397L11.5186 9.06631C11.4829 9.03956 11.433 9.04314 11.4016 9.07458L9.92249 10.5537L11.1015 11.5642C11.3531 11.7799 11.3822 12.1587 11.1666 12.4103C10.9509 12.6619 10.5721 12.691 10.3205 12.4753L5.9582 8.7362C5.92384 8.70674 5.87288 8.70758 5.83952 8.73816L2.2498 12.0287Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M11.8097 1.14783C12.1411 1.14783 12.4097 1.41646 12.4097 1.74783V3.297H14.1541C14.4855 3.297 14.7541 3.56563 14.7541 3.897C14.7541 4.22837 14.4855 4.497 14.1541 4.497H12.4097V6.24167C12.4097 6.57304 12.1411 6.84167 11.8097 6.84167C11.4783 6.84167 11.2097 6.57304 11.2097 6.24167V4.497H9.6603C9.32893 4.497 9.0603 4.22837 9.0603 3.897C9.0603 3.56563 9.32893 3.297 9.6603 3.297H11.2097V1.74783C11.2097 1.41646 11.4783 1.14783 11.8097 1.14783Z" } }] }, Mr = hr(function(i, t) {
+  return gr(br, Object.assign({}, i, {
     id: "add-image-single",
     ref: t,
-    icon: ro
+    icon: Vs
   }));
 });
-Or.displayName = "AddImageSingle";
-const Pr = {
+Mr.displayName = "AddImageSingle";
+const yr = {
   id: "sheet.command.delete-drawing",
   type: J.COMMAND,
   handler: (i) => {
@@ -3336,113 +3331,106 @@ const Pr = {
     if (n.length === 0)
       return !1;
     const r = n[0].unitId, s = n.map((o) => {
-      const { unitId: a, subUnitId: c, drawingId: u, drawingType: d } = o;
+      const { unitId: a, subUnitId: d, drawingId: u, drawingType: c } = o;
       return {
         unitId: a,
-        subUnitId: c,
+        subUnitId: d,
         drawingId: u,
-        drawingType: d
+        drawingType: c
       };
     });
-    return t.executeCommand(it.id, {
+    return t.executeCommand(rt.id, {
       unitId: r,
       drawings: s
     });
   }
-}, st = {
+}, it = {
   id: "sheet.command.move-drawing",
   type: J.COMMAND,
   handler: (i, t) => {
-    const e = i.get(G), n = i.get(oe), r = i.get(Ve), { direction: s } = t, o = n.getFocusDrawings();
+    const e = i.get(G), n = i.get(oe), r = i.get(Ge), { direction: s } = t, o = n.getFocusDrawings();
     if (o.length === 0)
       return !1;
-    const a = o[0].unitId, c = o.map((d) => {
-      const { transform: l } = d;
+    const a = o[0].unitId, d = o.map((c) => {
+      const { transform: l } = c;
       if (l == null)
         return null;
-      const g = { ...l }, { left: h = 0, top: f = 0 } = l;
-      return s === ve.UP ? g.top = f - 1 : s === ve.DOWN ? g.top = f + 1 : s === ve.LEFT ? g.left = h - 1 : s === ve.RIGHT && (g.left = h + 1), {
-        ...d,
+      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), {
+        ...c,
         transform: g,
         sheetTransform: x(g, r)
       };
-    }).filter((d) => d != null);
-    return e.syncExecuteCommand(Lt.id, {
+    }).filter((c) => c != null);
+    return e.syncExecuteCommand(jt.id, {
       unitId: a,
-      drawings: c
-    }) ? (e.syncExecuteCommand(F.id, [a]), !0) : !1;
+      drawings: d
+    }) ? (e.syncExecuteCommand(L.id, [a]), !0) : !1;
   }
-}, Ur = "addition-and-subtraction-single", Ar = "sheet.menu.image";
-function io(i) {
+}, Er = "addition-and-subtraction-single", Tr = "sheet.menu.image";
+function Hs(i) {
   return {
-    id: Ar,
-    type: un.SUBITEMS,
-    icon: Ur,
+    id: Tr,
+    type: cn.SUBITEMS,
+    icon: Er,
     tooltip: "sheetImage.title",
-    hidden$: ln(i, L.UNIVER_SHEET),
-    disabled$: Oi(i, { workbookTypes: [Qt], worksheetTypes: [en], rangeTypes: [is] })
+    hidden$: an(i, F.UNIVER_SHEET),
+    disabled$: Oi(i, { workbookTypes: [Kt], worksheetTypes: [Zt], rangeTypes: [ns] })
   };
 }
-function so(i) {
+function zs(i) {
   return {
-    id: Ft.id,
+    id: Bt.id,
     title: "sheetImage.upload.float",
-    type: un.BUTTON,
-    hidden$: ln(i, L.UNIVER_SHEET)
+    type: cn.BUTTON,
+    hidden$: an(i, F.UNIVER_SHEET)
   };
 }
-function oo(i) {
+function Ks(i) {
   return {
-    id: mn.id,
+    id: ln.id,
     title: "sheetImage.upload.cell",
-    type: un.BUTTON,
-    hidden$: ln(i, L.UNIVER_SHEET)
+    type: cn.BUTTON,
+    hidden$: an(i, F.UNIVER_SHEET)
   };
 }
-const ao = "univer-image-common-panel", co = "univer-image-common-panel-grid", lo = "univer-image-common-panel-border", uo = "univer-image-common-panel-title", ho = "univer-image-common-panel-row", go = "univer-image-common-panel-column", we = {
-  imageCommonPanel: ao,
-  imageCommonPanelGrid: co,
-  imageCommonPanelBorder: lo,
-  imageCommonPanelTitle: uo,
-  imageCommonPanelRow: ho,
-  imageCommonPanelColumn: go
-}, mo = (i) => {
+const Zs = (i) => {
   var C;
-  const t = Me(G), e = Me(rt), n = Me(se), r = Me(q), { drawings: s } = i, o = s[0];
+  const t = Qe(G), e = Qe(nt), n = Qe(se), r = Qe(q), { drawings: s } = i, o = s[0];
   if (o == null)
     return;
-  const { unitId: a } = o, c = r.getRenderById(a), u = c == null ? void 0 : c.scene;
+  const { unitId: a } = o, d = r.getRenderById(a), u = d == null ? void 0 : d.scene;
   if (u == null)
     return;
-  const d = u.getTransformerByCreate(), [l, g] = rn(!0), h = (C = o.anchorType) != null ? C : O.Position, [f, p] = rn(h);
-  function m(b, v) {
+  const c = u.getTransformerByCreate(), [l, g] = en(!0), h = (C = o.anchorType) != null ? C : O.Position, [m, p] = en(h);
+  function f(b, v) {
     const D = [];
     return b.forEach((w) => {
-      const { oKey: M } = w, I = v.getDrawingOKey(M);
+      const { oKey: y } = w, I = v.getDrawingOKey(y);
       if (I == null)
         return D.push(null), !0;
-      const { unitId: E, subUnitId: T, drawingId: y, drawingType: R, anchorType: N, sheetTransform: j } = I;
+      const { unitId: E, subUnitId: T, drawingId: M, drawingType: R, anchorType: N, sheetTransform: B } = I;
       D.push({
         unitId: E,
         subUnitId: T,
-        drawingId: y,
+        drawingId: M,
         anchorType: N,
-        sheetTransform: j,
+        sheetTransform: B,
         drawingType: R
       });
     }), D;
   }
-  gn(() => {
-    const b = d.clearControl$.subscribe((D) => {
+  fr(() => {
+    const b = c.clearControl$.subscribe((D) => {
       D === !0 && g(!1);
-    }), v = d.changeStart$.subscribe((D) => {
+    }), v = c.changeStart$.subscribe((D) => {
       var I;
-      const { objects: w } = D, M = m(w, n);
-      if (M.length === 0)
+      const { objects: w } = D, y = f(w, n);
+      if (y.length === 0)
         g(!1);
-      else if (M.length >= 1) {
+      else if (y.length >= 1) {
         g(!0);
-        const E = ((I = M[0]) == null ? void 0 : I.anchorType) || O.Position;
+        const E = ((I = y[0]) == null ? void 0 : I.anchorType) || O.Position;
         p(E);
       }
     });
@@ -3461,142 +3449,167 @@ const ao = "univer-image-common-panel", co = "univer-image-common-panel-grid", l
       drawingId: w.drawingId,
       anchorType: b
     }));
-    t.executeCommand(Lt.id, {
+    t.executeCommand(jt.id, {
       unitId: v[0].unitId,
       drawings: D
     });
   }
-  const S = (b) => b ? "block" : "none";
-  return /* @__PURE__ */ Et("div", { className: It(we.imageCommonPanelGrid, we.imageCommonPanelBorder), style: { display: S(l) }, children: [
-    /* @__PURE__ */ K("div", { className: we.imageCommonPanelRow, children: /* @__PURE__ */ K("div", { className: It(we.imageCommonPanelColumn, we.imageCommonPanelTitle), children: /* @__PURE__ */ K("div", { children: e.t("drawing-anchor.title") }) }) }),
-    /* @__PURE__ */ K("div", { className: It(we.imageCommonPanelRow), children: /* @__PURE__ */ K("div", { className: It(we.imageCommonPanelColumn), children: /* @__PURE__ */ Et(hs, { value: f, onChange: _, direction: "vertical", children: [
-      /* @__PURE__ */ K(Kt, { value: O.Both, children: e.t("drawing-anchor.both") }),
-      /* @__PURE__ */ K(Kt, { value: O.Position, children: e.t("drawing-anchor.position") }),
-      /* @__PURE__ */ K(Kt, { value: O.None, children: e.t("drawing-anchor.none") })
-    ] }) }) })
-  ] });
-}, fo = () => {
-  const i = Me(se), t = i.getFocusDrawings(), [e, n] = rn(t);
-  return gn(() => {
+  return /* @__PURE__ */ Qt(
+    "div",
+    {
+      className: `
+              univer-relative univer-mt-5 univer-w-full univer-border-b-0 univer-border-l-0 univer-border-r-0
+              univer-border-t univer-border-solid univer-border-gray-200
+            `,
+      style: { display: ((b) => b ? "block" : "none")(l) },
+      children: [
+        /* @__PURE__ */ Z(
+          "div",
+          {
+            className: `
+                  univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
+                `,
+            children: /* @__PURE__ */ Z("div", { className: "univer-w-full univer-text-left univer-text-gray-400", children: /* @__PURE__ */ Z("div", { children: e.t("drawing-anchor.title") }) })
+          }
+        ),
+        /* @__PURE__ */ Z(
+          "div",
+          {
+            className: `
+                  univer-relative univer-mt-2.5 univer-flex univer-h-full univer-items-start univer-justify-start
+                `,
+            children: /* @__PURE__ */ Z("div", { className: "univer-flex univer-items-center univer-gap-1", children: /* @__PURE__ */ Qt(vi, { value: m, onChange: _, direction: "vertical", children: [
+              /* @__PURE__ */ Z(Gt, { value: O.Both, children: e.t("drawing-anchor.both") }),
+              /* @__PURE__ */ Z(Gt, { value: O.Position, children: e.t("drawing-anchor.position") }),
+              /* @__PURE__ */ Z(Gt, { value: O.None, children: e.t("drawing-anchor.none") })
+            ] }) })
+          }
+        )
+      ]
+    }
+  );
+}, Js = () => {
+  const i = Qe(se), t = i.getFocusDrawings(), [e, n] = en(t);
+  return fr(() => {
     const r = i.focus$.subscribe((s) => {
       n(s);
     });
     return () => {
       r.unsubscribe();
     };
-  }, []), !!(e != null && e.length) && /* @__PURE__ */ Et("div", { className: we.imageCommonPanel, children: [
-    /* @__PURE__ */ K(mi, { drawings: e }),
-    /* @__PURE__ */ K(mo, { drawings: e })
+  }, []), !!(e != null && e.length) && /* @__PURE__ */ Qt("div", { className: "univer-p-2 univer-text-center univer-text-sm", children: [
+    /* @__PURE__ */ Z(ui, { drawings: e }),
+    /* @__PURE__ */ Z(Zs, { drawings: e })
   ] });
-}, po = {
-  [xi.FORMULAS_INSERT]: {
-    [Ar]: {
+}, qs = {
+  [Bi.FORMULAS_INSERT]: {
+    [Tr]: {
       order: 3,
-      menuItemFactory: io,
-      [Ft.id]: {
+      menuItemFactory: Hs,
+      [Bt.id]: {
         order: 0,
-        menuItemFactory: so
+        menuItemFactory: zs
       },
-      [mn.id]: {
+      [ln.id]: {
         order: 1,
-        menuItemFactory: oo
+        menuItemFactory: Ks
       }
     }
   }
 };
-function ot(i) {
-  return !i.getContextValue(qr) && !i.getContextValue(Qr) && !i.getContextValue(ei) && i.getContextValue(Fe);
+function st(i) {
+  return !i.getContextValue(zr) && !i.getContextValue(Kr) && !i.getContextValue(Zr) && i.getContextValue(xe);
 }
-const wo = {
-  id: st.id,
+const Qs = {
+  id: it.id,
   description: "shortcut.drawing-move-down",
   group: "4_drawing-view",
-  binding: Ye.ARROW_DOWN,
+  binding: Fe.ARROW_DOWN,
   priority: 100,
-  preconditions: ot,
+  preconditions: st,
   staticParameters: {
     direction: ve.DOWN
   }
-}, _o = {
-  id: st.id,
+}, eo = {
+  id: it.id,
   description: "shortcut.drawing-move-up",
   group: "4_drawing-view",
-  binding: Ye.ARROW_UP,
+  binding: Fe.ARROW_UP,
   priority: 100,
-  preconditions: ot,
+  preconditions: st,
   staticParameters: {
     direction: ve.UP
   }
-}, vo = {
-  id: st.id,
+}, to = {
+  id: it.id,
   description: "shortcut.drawing-move-left",
   group: "4_drawing-view",
-  binding: Ye.ARROW_LEFT,
+  binding: Fe.ARROW_LEFT,
   priority: 100,
-  preconditions: ot,
+  preconditions: st,
   staticParameters: {
     direction: ve.LEFT
   }
-}, So = {
-  id: st.id,
+}, no = {
+  id: it.id,
   description: "shortcut.drawing-move-right",
   group: "4_drawing-view",
-  binding: Ye.ARROW_RIGHT,
+  binding: Fe.ARROW_RIGHT,
   priority: 100,
-  preconditions: ot,
+  preconditions: st,
   staticParameters: {
     direction: ve.RIGHT
   }
-}, Io = {
-  id: Pr.id,
+}, ro = {
+  id: yr.id,
   description: "shortcut.drawing-delete",
   group: "4_drawing-view",
   // when focusing on any other input tag do not trigger this shortcut
-  preconditions: ot,
-  binding: Ye.DELETE,
-  mac: Ye.BACKSPACE
+  preconditions: st,
+  binding: Fe.DELETE,
+  mac: Fe.BACKSPACE
 };
-var Co = Object.getOwnPropertyDescriptor, Do = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Co(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+var io = Object.getOwnPropertyDescriptor, so = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? io(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, je = (i, t) => (e, n) => t(e, n, i);
-let Bt = class extends ie {
+}, We = (i, t) => (e, n) => t(e, n, i);
+let Pt = class extends ie {
   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(Ur, Or)), this.disposeWithMe(i.register(vr, fo));
+    this.disposeWithMe(i.register(Er, Mr)), this.disposeWithMe(i.register(mr, Js));
   }
   _initMenus() {
-    this._menuManagerService.mergeMenu(po);
+    this._menuManagerService.mergeMenu(qs);
   }
   _initCommands() {
     [
-      Ft,
-      mn,
-      xt,
-      it,
-      Lt,
+      Bt,
+      ln,
+      Wt,
+      rt,
+      jt,
+      pr,
+      L,
+      wr,
+      _r,
       Sr,
-      F,
-      Ir,
-      Cr,
-      br,
-      st,
-      Pr,
-      Dr
+      it,
+      yr,
+      vr
     ].forEach((i) => this.disposeWithMe(this._commandService.registerCommand(i)));
   }
   _initShortcuts() {
     [
       // sheet drawing shortcuts
-      wo,
-      _o,
-      vo,
-      So,
-      Io
+      Qs,
+      eo,
+      to,
+      no,
+      ro
     ].forEach((i) => {
       this.disposeWithMe(this._shortcutService.registerShortcut(i));
     });
@@ -3605,97 +3618,97 @@ let Bt = class extends ie {
     this._initCommands(), this._initCustomComponents(), this._initMenus(), this._initShortcuts();
   }
 };
-Bt = Do([
-  je(0, A(Qn)),
-  je(1, Li),
-  je(2, G),
-  je(3, Fi),
-  je(4, se),
-  je(5, A(hn))
-], Bt);
-var bo = Object.defineProperty, Ro = Object.getOwnPropertyDescriptor, yo = (i, t, e) => t in i ? bo(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e, Mo = (i, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? Ro(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+Pt = so([
+  We(0, A(zn)),
+  We(1, $i),
+  We(2, G),
+  We(3, xi),
+  We(4, se),
+  We(5, A(dn))
+], Pt);
+var oo = Object.defineProperty, ao = Object.getOwnPropertyDescriptor, co = (i, t, e) => t in i ? oo(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e, lo = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? ao(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, Zt = (i, t) => (e, n) => t(e, n, i), Nr = (i, t, e) => yo(i, typeof t != "symbol" ? t + "" : t, e);
-const Eo = "SHEET_IMAGE_UI_PLUGIN";
-let Wt = class extends ri {
-  constructor(i = Yn, t, e, n) {
+}, Vt = (i, t) => (e, n) => t(e, n, i), Or = (i, t, e) => co(i, typeof t != "symbol" ? t + "" : t, e);
+const uo = "SHEET_IMAGE_UI_PLUGIN";
+let At = class extends Qr {
+  constructor(i = $n, t, e, n) {
     super(), this._config = i, this._injector = t, this._renderManagerService = e, this._configService = n;
-    const { menu: r, ...s } = ii(
+    const { menu: r, ...s } = ei(
       {},
-      Yn,
+      $n,
       this._config
     );
-    r && this._configService.setConfig("menu", r, { merge: !0 }), this._configService.setConfig(gs, s);
+    r && this._configService.setConfig("menu", r, { merge: !0 }), this._configService.setConfig(as, s);
   }
   onStarting() {
-    si(this._injector, [
-      [nt],
-      [Bt],
-      [Tt],
-      [kt],
-      [Nt],
-      [At],
-      [Ot],
+    ti(this._injector, [
+      [tt],
       [Pt],
-      [Ut]
-    ]), Xt(this._injector, [
-      [nt]
+      [Rt],
+      [Ut],
+      [Ot],
+      [Tt],
+      [Mt],
+      [yt],
+      [Et]
+    ]), Ft(this._injector, [
+      [tt]
     ]);
   }
   onReady() {
-    Xt(this._injector, [
-      [At],
-      [Ut]
+    Ft(this._injector, [
+      [Tt],
+      [Et]
     ]);
   }
   onRendered() {
-    this._registerRenderModules(), Xt(this._injector, [
-      [Nt],
-      [kt],
-      [Bt],
+    this._registerRenderModules(), Ft(this._injector, [
       [Ot],
-      [Pt]
+      [Ut],
+      [Pt],
+      [Mt],
+      [yt]
     ]);
   }
   onSteady() {
-    this._injector.get(Tt);
+    this._injector.get(Rt);
   }
   _registerRenderModules() {
     [
-      [tt],
-      [cn],
-      [on],
-      [sn]
+      [et],
+      [sn],
+      [nn],
+      [tn]
     ].forEach((i) => {
-      this.disposeWithMe(this._renderManagerService.registerRenderModule(L.UNIVER_SHEET, i));
+      this.disposeWithMe(this._renderManagerService.registerRenderModule(F.UNIVER_SHEET, i));
     });
   }
 };
-Nr(Wt, "type", L.UNIVER_SHEET);
-Nr(Wt, "pluginName", Eo);
-Wt = Mo([
-  ti(di, ai, fi, vi),
-  Zt(1, A(Xe)),
-  Zt(2, q),
-  Zt(3, ni)
-], Wt);
+Or(At, "type", F.UNIVER_SHEET);
+Or(At, "pluginName", uo);
+At = lo([
+  Jr(oi, ri, hi, pi),
+  Vt(1, A(Ye)),
+  Vt(2, q),
+  Vt(3, qr)
+], At);
 export {
-  F as ClearSheetDrawingTransformerOperation,
-  Pr as DeleteDrawingsCommand,
-  Ir as EditSheetDrawingOperation,
-  Cr as GroupSheetDrawingCommand,
-  Ft as InsertFloatImageCommand,
-  xt as InsertSheetDrawingCommand,
-  st as MoveDrawingsCommand,
-  it as RemoveSheetDrawingCommand,
-  Ar as SHEETS_IMAGE_MENU_ID,
-  Dr as SetDrawingArrangeCommand,
-  Lt as SetSheetDrawingCommand,
-  nt as SheetCanvasFloatDomManagerService,
-  tt as SheetDrawingUpdateController,
-  Sr as SidebarSheetDrawingOperation,
-  br as UngroupSheetDrawingCommand,
-  Wt as UniverSheetsDrawingUIPlugin
+  L as ClearSheetDrawingTransformerOperation,
+  yr as DeleteDrawingsCommand,
+  wr as EditSheetDrawingOperation,
+  _r as GroupSheetDrawingCommand,
+  Bt as InsertFloatImageCommand,
+  Wt as InsertSheetDrawingCommand,
+  it as MoveDrawingsCommand,
+  rt as RemoveSheetDrawingCommand,
+  Tr as SHEETS_IMAGE_MENU_ID,
+  vr as SetDrawingArrangeCommand,
+  jt as SetSheetDrawingCommand,
+  tt as SheetCanvasFloatDomManagerService,
+  et as SheetDrawingUpdateController,
+  pr as SidebarSheetDrawingOperation,
+  Sr as UngroupSheetDrawingCommand,
+  At as UniverSheetsDrawingUIPlugin
 };