npm - @univerjs/sheets-drawing-ui - Versions diffs - 0.9.1-nightly.202507081607 → 0.9.1-nightly.202507101607 - Mend

@univerjs/sheets-drawing-ui 0.9.1-nightly.202507081607 → 0.9.1-nightly.202507101607

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

Files changed (13) hide show

package/lib/cjs/facade.js +1 -1
package/lib/cjs/index.js +2 -2
package/lib/es/facade.js +558 -297
package/lib/es/index.js +647 -645
package/lib/facade.js +558 -297
package/lib/index.js +647 -645
package/lib/types/facade/f-event.d.ts +169 -1
package/lib/types/facade/f-worksheet.d.ts +151 -9
package/lib/types/index.d.ts +2 -1
package/lib/types/services/canvas-float-dom-manager.service.d.ts +0 -1
package/lib/umd/facade.js +1 -1
package/lib/umd/index.js +2 -2
package/package.json +12 -12

package/lib/es/index.js CHANGED Viewed

@@ -1,25 +1,77 @@
 var yr = Object.defineProperty;
 var Er = (i, t, e) => t in i ? yr(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
 var ee = (i, t, e) => Er(i, typeof t != "symbol" ? t + "" : t, e);
-import { CommandType as J, ICommandService as G, IUndoRedoService as xe, sequenceExecute as xn, DrawingTypeEnum as B, ArrangeTypeEnum as mt, Inject as A, IContextService as Yn, LocaleService as tt, Injector as Ye, Disposable as ne, createDocumentModelWithStyle as Vt, ObjectRelativeFromV as mn, ObjectRelativeFromH as pn, WrapTextType as wn, PositionedObjectLayoutType as _n, BooleanNumber as Sn, BuildTextUtils as Ht, ImageSourceType as vn, generateRandomId as Dt, FOCUSING_COMMON_DRAWINGS as $e, IUniverInstanceService as Se, UniverInstanceType as F, Direction as _e, IImageIoService as Tr, RxDisposable as Or, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as Ze, DOCS_ZEN_EDITOR_UNIT_ID_KEY as Be, InterceptorEffectEnum as Ur, ObjectMatrix as Pr, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Ar, Tools as Re, IPermissionService as Nr, UserManagerService as kr, LifecycleService as Wr, LifecycleStages as Br, DisposableCollection as pt, fromEventSubject as jr, PRINT_CHART_COMPONENT_KEY as $r, Rectangle as Fr, FOCUSING_FX_BAR_EDITOR as xr, EDITOR_ACTIVATED as Yr, FOCUSING_PANEL_EDITOR as Xr, DependentOn as Gr, IConfigService as Lr, Plugin as Vr, merge as Hr, registerDependencies as zr, touchDependencies as Ft } from "@univerjs/core";
-import { ISheetDrawingService as re, DrawingApplyType as U, SetDrawingApplyMutation as P, SheetDrawingAnchorType as O, UniverSheetsDrawingPlugin as Kr } from "@univerjs/sheets-drawing";
-import { SheetInterceptorService as At, SheetsSelectionsService as sn, SetRangeValuesCommand as In, getSheetCommandTarget as se, INTERCEPTOR_POINT as Jr, InterceptCellContentPriority as Zr, WorkbookViewPermission as Cn, WorksheetViewPermission as Dn, WorkbookEditablePermission as zt, WorksheetEditPermission as Kt, SetFrozenMutation as qr, SetWorksheetRowAutoHeightMutation as Qr, COMMAND_LISTENER_SKELETON_CHANGE as ei, InsertRowCommand as Xn, InsertColCommand as Gn, RemoveRowCommand as Ln, RemoveColCommand as Vn, DeleteRangeMoveLeftCommand as Hn, DeleteRangeMoveUpCommand as zn, InsertRangeMoveDownCommand as Kn, InsertRangeMoveRightCommand as Jn, DeltaRowHeightCommand as Jt, SetRowHeightCommand as Zt, DeltaColumnWidthCommand as Zn, SetColWidthCommand as qn, SetRowHiddenCommand as Qn, SetSpecificRowsVisibleCommand as er, SetSpecificColsVisibleCommand as tr, SetColHiddenCommand as nr, MoveColsCommand as rr, MoveRowsCommand as ir, MoveRangeCommand as sr, SetRowVisibleMutation as ti, SetRowHiddenMutation as ni, SetColVisibleMutation as ri, SetColHiddenMutation as ii, SetWorksheetRowHeightMutation as si, SetWorksheetColWidthMutation as oi, SetWorksheetActiveOperation as ai, RangeProtectionPermissionEditPoint as ci } from "@univerjs/sheets";
-import { IRenderManagerService as Z, transformObjectOutOfGroup as di, getGroupState as li, precisionTo as wt, getCurrentTypeOfRenderer as on, CURSOR_TYPE as ui, RENDER_CLASS_TYPE as Ue, Rect as Pe, ObjectType as Rn, DRAWING_OBJECT_LAYER_INDEX as xt, SHEET_VIEWPORT_KEY as or } from "@univerjs/engine-render";
-import { MessageType as pe, render as hi, unmount as gi, clsx as fi, RadioGroup as mi, Radio as Yt } from "@univerjs/design";
-import { docDrawingPositionToTransform as bn, ReplaceSnapshotCommand as pi, InnerPasteCommand as wi } from "@univerjs/docs-ui";
-import { IImageIoService as _i, IDrawingManagerService as ie, DRAWING_IMAGE_ALLOW_IMAGE_LIST as Mn, DRAWING_IMAGE_COUNT_LIMIT as yn, ImageUploadStatusType as Ae, DRAWING_IMAGE_ALLOW_SIZE as En, getImageSize as Xt, SetDrawingSelectedOperation as Nt, DRAWING_IMAGE_WIDTH_LIMIT as Tn, DRAWING_IMAGE_HEIGHT_LIMIT as On, ImageSourceType as Si, getDrawingShapeKeyByDrawingSearch as ve, UniverDrawingPlugin as vi } from "@univerjs/drawing";
-import { convertPositionSheetOverGridToAbsolute as Ii, SheetSkeletonManagerService as V, ISheetSelectionRenderService as Xe, attachRangeWithCoord as ar, SheetCanvasPopManagerService as Ci, HoverManagerService as Di, IEditorBridgeService as Ri, IAutoFillService as bi, EditingRenderController as Mi, SetCellEditVisibleOperation as Un, PREDEFINED_HOOK_NAME as je, COPY_TYPE as Ie, discreteRangeToRange as Pn, virtualizeDiscreteRanges as yi, ISheetClipboardService as Ei, SetZoomRatioOperation as An, SetScrollOperation as Ti, SheetPrintInterceptorService as Oi, getCurrentRangeDisable$ as Ui } from "@univerjs/sheets-ui";
-import { ILocalFileService as Pi, IMessageService as cr, ISidebarService as Ai, IDialogService as Ni, IClipboardInterfaceService as ki, CanvasFloatDomService as Wi, PrintFloatDomSingle as Bi, ComponentManager as dr, connectInjector as ji, useDependency as qe, getMenuHiddenObservable as an, MenuItemType as cn, RibbonInsertGroup as $i, KeyCode as Fe, IMenuManagerService as Fi, IShortcutService as xi } from "@univerjs/ui";
+import { precisionTo as mt, IRenderManagerService as J, transformObjectOutOfGroup as Tr, getGroupState as Or, getCurrentTypeOfRenderer as sn, CURSOR_TYPE as Ur, RENDER_CLASS_TYPE as Oe, Rect as Ve, ObjectType as mn, DRAWING_OBJECT_LAYER_INDEX as Ft, SHEET_VIEWPORT_KEY as xn } from "@univerjs/engine-render";
+import { convertPositionSheetOverGridToAbsolute as Pr, SheetSkeletonManagerService as V, ISheetSelectionRenderService as Fe, attachRangeWithCoord as Yn, SheetCanvasPopManagerService as Ar, HoverManagerService as Nr, IEditorBridgeService as kr, IAutoFillService as Wr, EditingRenderController as Br, SetCellEditVisibleOperation as pn, PREDEFINED_HOOK_NAME as We, COPY_TYPE as ve, discreteRangeToRange as wn, virtualizeDiscreteRanges as jr, ISheetClipboardService as $r, SetZoomRatioOperation as _n, SetScrollOperation as Fr, SheetPrintInterceptorService as xr, getCurrentRangeDisable$ as Yr } from "@univerjs/sheets-ui";
+import { CommandType as Z, ICommandService as G, IUndoRedoService as xe, sequenceExecute as Xn, DrawingTypeEnum as B, ArrangeTypeEnum as pt, Inject as A, IContextService as Gn, LocaleService as tt, Injector as Ye, Disposable as ne, createDocumentModelWithStyle as Vt, ObjectRelativeFromV as Sn, ObjectRelativeFromH as vn, WrapTextType as In, PositionedObjectLayoutType as Cn, BooleanNumber as Dn, BuildTextUtils as Ht, ImageSourceType as Rn, generateRandomId as Dt, FOCUSING_COMMON_DRAWINGS as je, IUniverInstanceService as Se, UniverInstanceType as F, Direction as _e, IImageIoService as Xr, RxDisposable as Gr, DOCS_NORMAL_EDITOR_UNIT_ID_KEY as Ze, DOCS_ZEN_EDITOR_UNIT_ID_KEY as Be, InterceptorEffectEnum as Lr, ObjectMatrix as Vr, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Hr, Tools as De, IPermissionService as zr, UserManagerService as Kr, LifecycleService as Jr, LifecycleStages as Zr, DisposableCollection as wt, fromEventSubject as qr, PRINT_CHART_COMPONENT_KEY as Qr, Rectangle as ei, FOCUSING_FX_BAR_EDITOR as ti, EDITOR_ACTIVATED as ni, FOCUSING_PANEL_EDITOR as ri, DependentOn as ii, IConfigService as si, Plugin as oi, merge as ai, registerDependencies as ci, touchDependencies as xt } from "@univerjs/core";
+import { ISheetDrawingService as re, DrawingApplyType as U, SetDrawingApplyMutation as P, SheetDrawingAnchorType as O, UniverSheetsDrawingPlugin as di } from "@univerjs/sheets-drawing";
+import { SheetInterceptorService as At, SheetsSelectionsService as on, SetRangeValuesCommand as bn, getSheetCommandTarget as se, INTERCEPTOR_POINT as li, InterceptCellContentPriority as ui, WorkbookViewPermission as Mn, WorksheetViewPermission as yn, WorkbookEditablePermission as zt, WorksheetEditPermission as Kt, SetFrozenMutation as hi, SetWorksheetRowAutoHeightMutation as gi, COMMAND_LISTENER_SKELETON_CHANGE as fi, InsertRowCommand as Ln, InsertColCommand as Vn, RemoveRowCommand as Hn, RemoveColCommand as zn, DeleteRangeMoveLeftCommand as Kn, DeleteRangeMoveUpCommand as Jn, InsertRangeMoveDownCommand as Zn, InsertRangeMoveRightCommand as qn, DeltaRowHeightCommand as Jt, SetRowHeightCommand as Zt, DeltaColumnWidthCommand as Qn, SetColWidthCommand as er, SetRowHiddenCommand as tr, SetSpecificRowsVisibleCommand as nr, SetSpecificColsVisibleCommand as rr, SetColHiddenCommand as ir, MoveColsCommand as sr, MoveRowsCommand as or, MoveRangeCommand as ar, SetRowVisibleMutation as mi, SetRowHiddenMutation as pi, SetColVisibleMutation as wi, SetColHiddenMutation as _i, SetWorksheetRowHeightMutation as Si, SetWorksheetColWidthMutation as vi, SetWorksheetActiveOperation as Ii, RangeProtectionPermissionEditPoint as Ci } from "@univerjs/sheets";
+import { MessageType as pe, render as Di, unmount as Ri, clsx as bi, RadioGroup as Mi, Radio as Yt } from "@univerjs/design";
+import { docDrawingPositionToTransform as En, ReplaceSnapshotCommand as yi, InnerPasteCommand as Ei } from "@univerjs/docs-ui";
+import { IImageIoService as Ti, IDrawingManagerService as ie, DRAWING_IMAGE_ALLOW_IMAGE_LIST as Tn, DRAWING_IMAGE_COUNT_LIMIT as On, ImageUploadStatusType as Ue, DRAWING_IMAGE_ALLOW_SIZE as Un, getImageSize as Xt, SetDrawingSelectedOperation as Nt, DRAWING_IMAGE_WIDTH_LIMIT as Pn, DRAWING_IMAGE_HEIGHT_LIMIT as An, ImageSourceType as Oi, getDrawingShapeKeyByDrawingSearch as Pe, UniverDrawingPlugin as Ui } from "@univerjs/drawing";
+import { ILocalFileService as Pi, IMessageService as cr, ISidebarService as Ai, IDialogService as Ni, IClipboardInterfaceService as ki, CanvasFloatDomService as Wi, PrintFloatDomSingle as Bi, ComponentManager as dr, connectInjector as ji, useDependency as qe, getMenuHiddenObservable as an, MenuItemType as cn, RibbonInsertGroup as $i, KeyCode as $e, IMenuManagerService as Fi, IShortcutService as xi } from "@univerjs/ui";
 import { DocDrawingController as Yi, UniverDocsDrawingPlugin as Xi } from "@univerjs/docs-drawing";
 import { ImageCropperObject as Gi, COMPONENT_IMAGE_POPUP_MENU as Li, OpenImageCropOperation as Vi, ImageResetSizeOperation as Hi, DrawingRenderService as lr, DrawingCommonPanel as zi, UniverDrawingUIPlugin as Ki } from "@univerjs/drawing-ui";
-import { takeUntil as Nn, throttleTime as Ji, combineLatest as _t, switchMap as we, EMPTY as fe, tap as kn, map as be, distinctUntilChanged as Wn, Subject as Gt, filter as Zi, take as qi, BehaviorSubject as We, of as Bn } from "rxjs";
+import { takeUntil as Nn, throttleTime as Ji, combineLatest as _t, switchMap as we, EMPTY as fe, tap as kn, map as Re, distinctUntilChanged as Wn, Subject as Gt, filter as Zi, take as qi, BehaviorSubject as ke, of as Bn } from "rxjs";
 import { jsx as oe, jsxs as qt } from "react/jsx-runtime";
 import { useMemo as Qi, useState as Qt, useEffect as ur } from "react";
+function z(i, t, e) {
+  const { from: n, to: r, flipY: s = !1, flipX: o = !1, angle: a = 0, skewX: l = 0, skewY: u = 0 } = i, c = e.getCurrent();
+  if (c == null)
+    return;
+  const d = Pr(
+    c.unitId,
+    c.sheetId,
+    { from: n, to: r },
+    e
+  );
+  let { left: g, top: h, width: f, height: p } = d;
+  const m = e.getCurrentSkeleton(), _ = m.rowHeaderWidth + m.columnTotalWidth, v = m.columnHeaderHeight + m.rowTotalHeight;
+  return g + f > _ && (g = _ - f), h + p > v && (h = v - p), {
+    flipY: s,
+    flipX: o,
+    angle: a,
+    skewX: l,
+    skewY: u,
+    left: g,
+    top: h,
+    width: f,
+    height: p
+  };
+}
+function $(i, t) {
+  const { left: e = 0, top: n = 0, width: r = 0, height: s = 0, flipY: o = !1, flipX: a = !1, angle: l = 0, skewX: u = 0, skewY: c = 0 } = i, d = t.getCellWithCoordByOffset(e, n);
+  if (d == null)
+    return;
+  const g = {
+    column: d.actualColumn,
+    columnOffset: mt(e - d.startX, 1),
+    row: d.actualRow,
+    rowOffset: mt(n - d.startY, 1)
+  }, h = t.getCellWithCoordByOffset(e + r, n + s);
+  if (h == null)
+    return;
+  const f = {
+    column: h.actualColumn,
+    columnOffset: mt(e + r - h.startX, 1),
+    row: h.actualRow,
+    rowOffset: mt(n + s - h.startY, 1)
+  };
+  return {
+    flipY: o,
+    flipX: a,
+    angle: l,
+    skewX: u,
+    skewY: c,
+    from: g,
+    to: f
+  };
+}
 const Y = {
   id: "sheet.operation.clear-drawing-transformer",
-  type: J.MUTATION,
+  type: Z.MUTATION,
   handler: (i, t) => {
-    const e = i.get(Z);
+    const e = i.get(J);
     return t.forEach((n) => {
       var r, s;
       (s = (r = e.getRenderById(n)) == null ? void 0 : r.scene.getTransformer()) == null || s.debounceRefreshControls();
@@ -27,7 +79,7 @@ const Y = {
   }
 }, nt = {
   id: "sheet.command.remove-sheet-image",
-  type: J.COMMAND,
+  type: Z.COMMAND,
   handler: (i, t) => {
     var v, I, R;
     const e = i.get(G), n = i.get(xe), r = i.get(At), s = i.get(re);
@@ -37,8 +89,8 @@ const Y = {
       const { unitId: C } = S;
       a.push(C);
     });
-    const d = s.getBatchRemoveOp(o), { unitId: u, subUnitId: c, undo: l, redo: g, objects: h } = d, f = r.onCommandExecute({ id: nt.id, params: t }), p = { id: P.id, params: { unitId: u, subUnitId: c, op: g, objects: h, type: U.REMOVE } }, m = { id: P.id, params: { unitId: u, subUnitId: c, op: l, objects: h, type: U.INSERT } };
-    return xn([...(v = f.preRedos) != null ? v : [], p, ...f.redos], e) ? (n.pushUndoRedo({
+    const l = s.getBatchRemoveOp(o), { unitId: u, subUnitId: c, undo: d, redo: g, objects: h } = l, f = r.onCommandExecute({ id: nt.id, params: t }), p = { id: P.id, params: { unitId: u, subUnitId: c, op: g, objects: h, type: U.REMOVE } }, m = { id: P.id, params: { unitId: u, subUnitId: c, op: d, objects: h, type: U.INSERT } };
+    return Xn([...(v = f.preRedos) != null ? v : [], p, ...f.redos], e) ? (n.pushUndoRedo({
       unitID: u,
       undoMutations: [
         ...(I = f.preUndos) != null ? I : [],
@@ -56,16 +108,16 @@ const Y = {
   }
 }, hr = {
   id: "sheet.command.delete-drawing",
-  type: J.COMMAND,
+  type: Z.COMMAND,
   handler: (i) => {
     const t = i.get(G), n = i.get(re).getFocusDrawings();
     if (n.length === 0)
       return !1;
     const r = n[0].unitId, s = n.map((o) => {
-      const { unitId: a, subUnitId: d, drawingId: u, drawingType: c } = o;
+      const { unitId: a, subUnitId: l, drawingId: u, drawingType: c } = o;
       return {
         unitId: a,
-        subUnitId: d,
+        subUnitId: l,
         drawingId: u,
         drawingType: c
       };
@@ -79,16 +131,16 @@ const Y = {
 function es(i) {
   const t = [];
   return i.forEach((e) => {
-    const { parent: n, children: r } = e, { unitId: s, subUnitId: o, drawingId: a } = n, d = li(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, l = Or(0, 0, r.map((d) => d.transform || {})), u = r.map((d) => {
+      const g = d.transform || { left: 0, top: 0 }, { unitId: h, subUnitId: f, drawingId: p } = d;
       return {
         unitId: h,
         subUnitId: f,
         drawingId: p,
         transform: {
           ...g,
-          left: g.left - d.left,
-          top: g.top - d.top
+          left: g.left - l.left,
+          top: g.top - l.top
         },
         groupId: a
       };
@@ -97,7 +149,7 @@ function es(i) {
       subUnitId: o,
       drawingId: a,
       drawingType: B.DRAWING_GROUP,
-      transform: d
+      transform: l
     };
     t.push({
       parent: c,
@@ -108,11 +160,11 @@ function es(i) {
 function ts(i) {
   const t = [];
   return i.forEach((e) => {
-    const { parent: n, children: r } = e, { unitId: s, subUnitId: o, drawingId: a, transform: d = { width: 0, height: 0 } } = n;
-    if (d == null)
+    const { parent: n, children: r } = e, { unitId: s, subUnitId: o, drawingId: a, transform: l = { width: 0, height: 0 } } = n;
+    if (l == null)
       return;
-    const u = r.map((l) => {
-      const { transform: g } = l, { unitId: h, subUnitId: f, drawingId: p } = l, m = di(g || {}, d, d.width || 0, d.height || 0);
+    const u = r.map((d) => {
+      const { transform: g } = d, { unitId: h, subUnitId: f, drawingId: p } = d, m = Tr(g || {}, l, l.width || 0, l.height || 0);
       return {
         unitId: h,
         subUnitId: f,
@@ -138,7 +190,7 @@ function ts(i) {
 }
 const gr = {
   id: "sheet.command.group-sheet-image",
-  type: J.COMMAND,
+  type: Z.COMMAND,
   handler: (i, t) => {
     const e = i.get(G), n = i.get(xe), r = i.get(re);
     if (!t) return !1;
@@ -148,81 +200,28 @@ const gr = {
         s.push(p.unitId);
       });
     });
-    const o = r.getGroupDrawingOp(t), { unitId: a, subUnitId: d, undo: u, redo: c, objects: l } = o;
-    return e.syncExecuteCommand(P.id, { op: c, unitId: a, subUnitId: d, objects: l, type: U.GROUP }) ? (n.pushUndoRedo({
+    const o = r.getGroupDrawingOp(t), { unitId: a, subUnitId: l, undo: u, redo: c, objects: d } = o;
+    return e.syncExecuteCommand(P.id, { op: c, unitId: a, subUnitId: l, objects: d, type: U.GROUP }) ? (n.pushUndoRedo({
       unitID: a,
       undoMutations: [
-        { id: P.id, params: { op: u, unitId: a, subUnitId: d, objects: ts(l), type: U.UNGROUP } },
+        { id: P.id, params: { op: u, unitId: a, subUnitId: l, objects: ts(d), type: U.UNGROUP } },
         { id: Y.id, params: s }
       ],
       redoMutations: [
-        { id: P.id, params: { op: c, unitId: a, subUnitId: d, objects: l, type: U.GROUP } },
+        { id: P.id, params: { op: c, unitId: a, subUnitId: l, objects: d, type: U.GROUP } },
         { id: Y.id, params: s }
       ]
     }), !0) : !1;
   }
-};
-function z(i, t, e) {
-  const { from: n, to: r, flipY: s = !1, flipX: o = !1, angle: a = 0, skewX: d = 0, skewY: u = 0 } = i, c = e.getCurrent();
-  if (c == null)
-    return;
-  const l = Ii(
-    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, v = m.columnHeaderHeight + m.rowTotalHeight;
-  return g + f > _ && (g = _ - f), h + p > v && (h = v - p), {
-    flipY: s,
-    flipX: o,
-    angle: a,
-    skewX: d,
-    skewY: u,
-    left: g,
-    top: h,
-    width: f,
-    height: p
-  };
-}
-function $(i, t) {
-  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: wt(e - l.startX, 1),
-    row: l.actualRow,
-    rowOffset: wt(n - l.startY, 1)
-  }, h = t.getCellWithCoordByOffset(e + r, n + s);
-  if (h == null)
-    return;
-  const f = {
-    column: h.actualColumn,
-    columnOffset: wt(e + r - h.startX, 1),
-    row: h.actualRow,
-    rowOffset: wt(n + s - h.startY, 1)
-  };
-  return {
-    flipY: o,
-    flipX: a,
-    angle: d,
-    skewX: u,
-    skewY: c,
-    from: g,
-    to: f
-  };
-}
-const kt = {
+}, kt = {
   id: "sheet.command.insert-sheet-image",
-  type: J.COMMAND,
+  type: Z.COMMAND,
   handler: (i, t) => {
     var v, I, R;
     const e = i.get(G), n = i.get(xe), r = i.get(re), s = i.get(At);
     if (!t) return !1;
-    const o = t.drawings, a = o.map((S) => S.unitId), d = r.getBatchAddOp(o), { unitId: u, subUnitId: c, undo: l, redo: g, objects: h } = d, f = s.onCommandExecute({ id: kt.id, params: t }), p = { id: P.id, params: { op: g, unitId: u, subUnitId: c, objects: h, type: U.INSERT } }, m = { id: P.id, params: { op: l, unitId: u, subUnitId: c, objects: h, type: U.REMOVE } };
-    return xn([...(v = f.preRedos) != null ? v : [], p, ...f.redos], e) ? (n.pushUndoRedo({
+    const o = t.drawings, a = o.map((S) => S.unitId), l = r.getBatchAddOp(o), { unitId: u, subUnitId: c, undo: d, redo: g, objects: h } = l, f = s.onCommandExecute({ id: kt.id, params: t }), p = { id: P.id, params: { op: g, unitId: u, subUnitId: c, objects: h, type: U.INSERT } }, m = { id: P.id, params: { op: d, unitId: u, subUnitId: c, objects: h, type: U.REMOVE } };
+    return Xn([...(v = f.preRedos) != null ? v : [], p, ...f.redos], e) ? (n.pushUndoRedo({
       unitID: u,
       undoMutations: [
         ...(I = f.preUndos) != null ? I : [],
@@ -240,47 +239,47 @@ const kt = {
   }
 }, fr = {
   id: "sheet.command.set-drawing-arrange",
-  type: J.COMMAND,
+  type: Z.COMMAND,
   handler: (i, t) => {
     const e = i.get(G), n = i.get(xe);
     if (!t) return !1;
-    const r = i.get(re), { unitId: s, subUnitId: o, drawingIds: a, arrangeType: d } = t, u = { unitId: s, subUnitId: o, drawingIds: a };
+    const r = i.get(re), { unitId: s, subUnitId: o, drawingIds: a, arrangeType: l } = t, u = { unitId: s, subUnitId: o, drawingIds: a };
     let c;
-    if (d === mt.forward ? c = r.getForwardDrawingsOp(u) : d === mt.backward ? c = r.getBackwardDrawingOp(u) : d === mt.front ? c = r.getFrontDrawingsOp(u) : d === mt.back && (c = r.getBackDrawingsOp(u)), c == null)
+    if (l === pt.forward ? c = r.getForwardDrawingsOp(u) : l === pt.backward ? c = r.getBackwardDrawingOp(u) : l === pt.front ? c = r.getFrontDrawingsOp(u) : l === pt.back && (c = r.getBackDrawingsOp(u)), c == null)
       return !1;
-    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({
+    const { objects: d, redo: g, undo: h } = c;
+    return e.syncExecuteCommand(P.id, { op: g, unitId: s, subUnitId: o, objects: d, type: U.ARRANGE }) ? (n.pushUndoRedo({
       unitID: s,
       undoMutations: [
-        { id: P.id, params: { op: h, unitId: s, subUnitId: o, objects: l, type: U.ARRANGE } }
+        { id: P.id, params: { op: h, unitId: s, subUnitId: o, objects: d, type: U.ARRANGE } }
       ],
       redoMutations: [
-        { id: P.id, params: { op: g, unitId: s, subUnitId: o, objects: l, type: U.ARRANGE } }
+        { id: P.id, params: { op: g, unitId: s, subUnitId: o, objects: d, type: U.ARRANGE } }
       ]
     }), !0) : !1;
   }
 }, Wt = {
   id: "sheet.command.set-sheet-image",
-  type: J.COMMAND,
+  type: Z.COMMAND,
   handler: (i, t) => {
     const e = i.get(G), n = i.get(xe), r = i.get(re);
     if (!t) return !1;
-    const { drawings: s } = t, o = r.getBatchUpdateOp(s), { unitId: a, subUnitId: d, undo: u, redo: c, objects: l } = o;
-    return e.syncExecuteCommand(P.id, { unitId: a, subUnitId: d, op: c, objects: l, type: U.UPDATE }) ? (n.pushUndoRedo({
+    const { drawings: s } = t, o = r.getBatchUpdateOp(s), { unitId: a, subUnitId: l, undo: u, redo: c, objects: d } = o;
+    return e.syncExecuteCommand(P.id, { unitId: a, subUnitId: l, op: c, objects: d, type: U.UPDATE }) ? (n.pushUndoRedo({
       unitID: a,
       undoMutations: [
-        { id: P.id, params: { unitId: a, subUnitId: d, op: u, objects: l, type: U.UPDATE } },
+        { id: P.id, params: { unitId: a, subUnitId: l, op: u, objects: d, type: U.UPDATE } },
         { id: Y.id, params: [a] }
       ],
       redoMutations: [
-        { id: P.id, params: { unitId: a, subUnitId: d, op: c, objects: l, type: U.UPDATE } },
+        { id: P.id, params: { unitId: a, subUnitId: l, op: c, objects: d, type: U.UPDATE } },
         { id: Y.id, params: [a] }
       ]
     }), !0) : !1;
   }
 }, mr = {
   id: "sheet.command.ungroup-sheet-image",
-  type: J.COMMAND,
+  type: Z.COMMAND,
   handler: (i, t) => {
     const e = i.get(G), n = i.get(xe), r = i.get(re);
     if (!t) return !1;
@@ -290,15 +289,15 @@ const kt = {
         s.push(p.unitId);
       });
     });
-    const o = r.getUngroupDrawingOp(t), { unitId: a, subUnitId: d, undo: u, redo: c, objects: l } = o;
-    return e.syncExecuteCommand(P.id, { op: c, unitId: a, subUnitId: d, objects: l, type: U.UNGROUP }) ? (n.pushUndoRedo({
+    const o = r.getUngroupDrawingOp(t), { unitId: a, subUnitId: l, undo: u, redo: c, objects: d } = o;
+    return e.syncExecuteCommand(P.id, { op: c, unitId: a, subUnitId: l, objects: d, type: U.UNGROUP }) ? (n.pushUndoRedo({
       unitID: a,
       undoMutations: [
-        { id: P.id, params: { op: u, unitId: a, subUnitId: d, objects: es(l), type: U.GROUP } },
+        { id: P.id, params: { op: u, unitId: a, subUnitId: l, objects: es(d), type: U.GROUP } },
         { id: Y.id, params: s }
       ],
       redoMutations: [
-        { id: P.id, params: { op: c, unitId: a, subUnitId: d, objects: l, type: U.UNGROUP } },
+        { id: P.id, params: { op: c, unitId: a, subUnitId: l, objects: d, type: U.UNGROUP } },
         { id: Y.id, params: s }
       ]
     }), !0) : !1;
@@ -315,38 +314,38 @@ function is(i, t, e) {
 }
 function en(i, t, e, n, r) {
   var v;
-  const { rotatedHeight: s, rotatedWidth: o } = is(e, n, r), d = i.get(Z).getRenderById(t.unitId);
-  if (!d)
+  const { rotatedHeight: s, rotatedWidth: o } = is(e, n, r), l = i.get(J).getRenderById(t.unitId);
+  if (!l)
     return !1;
-  const c = (v = d.with(V).getSkeletonParam(t.subUnitId)) == null ? void 0 : v.skeleton;
+  const c = (v = l.with(V).getSkeletonParam(t.subUnitId)) == null ? void 0 : v.skeleton;
   if (c == null)
     return !1;
-  const l = c.getCellByIndex(t.row, t.col), g = l.mergeInfo.endX - l.mergeInfo.startX - 2, h = l.mergeInfo.endY - l.mergeInfo.startY - 2, f = o / s, m = Math.ceil(Math.min(g, h * f)) / o, _ = !m || Number.isNaN(m) ? 1e-3 : m;
+  const d = c.getCellByIndex(t.row, t.col), g = d.mergeInfo.endX - d.mergeInfo.startX - 2, h = d.mergeInfo.endY - d.mergeInfo.startY - 2, f = o / s, m = Math.ceil(Math.min(g, h * f)) / o, _ = !m || Number.isNaN(m) ? 1e-3 : m;
   return {
     width: e * _,
     height: n * _
   };
 }
 let Qe = class extends ne {
-  constructor(t, e, n, r, s, o, a, d, u, c, l, g, h) {
+  constructor(t, e, n, r, s, o, a, l, u, c, d, g, h) {
     super();
     ee(this, "_workbookSelections");
-    this._context = t, this._skeletonManagerService = e, this._commandService = n, this._selectionRenderService = r, this._imageIoService = s, this._fileOpenerService = o, this._sheetDrawingService = a, this._drawingManagerService = d, this._contextService = u, this._messageService = c, this._localeService = l, this._injector = h, this._workbookSelections = g.getWorkbookSelections(this._context.unitId), this._updateImageListener(), this._updateOrderListener(), this._groupDrawingListener(), this._focusDrawingListener();
+    this._context = t, this._skeletonManagerService = e, this._commandService = n, this._selectionRenderService = r, this._imageIoService = s, this._fileOpenerService = o, this._sheetDrawingService = a, this._drawingManagerService = l, this._contextService = u, this._messageService = c, this._localeService = d, 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: Mn.map((n) => `.${n.replace("image/", "")}`).join(",")
+      accept: Tn.map((n) => `.${n.replace("image/", "")}`).join(",")
     }), e = t.length;
-    return e > yn ? (this._messageService.show({
+    return e > On ? (this._messageService.show({
       type: pe.Error,
-      content: this._localeService.t("update-status.exceedMaxCount", String(yn))
+      content: this._localeService.t("update-status.exceedMaxCount", String(On))
     }), !1) : e === 0 ? !1 : (t.forEach(async (n) => await this.insertFloatImageByFile(n)), !0);
   }
   async insertCellImage() {
     const e = (await this._fileOpenerService.openFile({
       multiple: !1,
-      accept: Mn.map((n) => `.${n.replace("image/", "")}`).join(",")
+      accept: Tn.map((n) => `.${n.replace("image/", "")}`).join(",")
     }))[0];
     return e ? (await this._insertCellImage(e), !0) : !1;
   }
@@ -359,27 +358,27 @@ let Qe = class extends ne {
       e = await this._imageIoService.saveImage(t);
     } catch (v) {
       const I = v.message;
-      I === Ae.ERROR_EXCEED_SIZE ? this._messageService.show({
+      I === Ue.ERROR_EXCEED_SIZE ? this._messageService.show({
         type: pe.Error,
-        content: this._localeService.t("update-status.exceedMaxSize", String(En / (1024 * 1024)))
-      }) : I === Ae.ERROR_IMAGE_TYPE ? this._messageService.show({
+        content: this._localeService.t("update-status.exceedMaxSize", String(Un / (1024 * 1024)))
+      }) : I === Ue.ERROR_IMAGE_TYPE ? this._messageService.show({
         type: pe.Error,
         content: this._localeService.t("update-status.invalidImageType")
-      }) : I === Ae.ERROR_IMAGE && this._messageService.show({
+      }) : I === Ue.ERROR_IMAGE && this._messageService.show({
         type: pe.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: d, base64Cache: u } = e, { width: c, height: l, image: g } = await Xt(u || ""), { width: h, height: f } = this._context.scene;
-    this._imageIoService.addImageSourceCache(d, a, g);
+    const n = this._getUnitInfo(), { unitId: r, subUnitId: s } = n, { imageId: o, imageSourceType: a, source: l, base64Cache: u } = e, { width: c, height: d, image: g } = await Xt(u || ""), { width: h, height: f } = this._context.scene;
+    this._imageIoService.addImageSourceCache(l, a, g);
     let p = 1;
-    if (c > Tn || l > On) {
-      const v = Tn / c, I = On / l;
+    if (c > Pn || d > An) {
+      const v = Pn / c, I = An / d;
       p = Math.max(v, I);
     }
-    const m = this._getImagePosition(c * p, l * p, h, f);
+    const m = this._getImagePosition(c * p, d * p, h, f);
     if (m == null)
       return;
     const _ = {
@@ -388,7 +387,7 @@ let Qe = class extends ne {
       drawingId: o,
       drawingType: B.DRAWING_IMAGE,
       imageSourceType: a,
-      source: d,
+      source: l,
       transform: z(m, this._selectionRenderService, this._skeletonManagerService),
       sheetTransform: m
     };
@@ -405,26 +404,26 @@ let Qe = class extends ne {
       n = await this._imageIoService.saveImage(t);
     } catch (S) {
       const C = S.message;
-      C === Ae.ERROR_EXCEED_SIZE ? this._messageService.show({
+      C === Ue.ERROR_EXCEED_SIZE ? this._messageService.show({
         type: pe.Error,
-        content: this._localeService.t("update-status.exceedMaxSize", String(En / (1024 * 1024)))
-      }) : C === Ae.ERROR_IMAGE_TYPE ? this._messageService.show({
+        content: this._localeService.t("update-status.exceedMaxSize", String(Un / (1024 * 1024)))
+      }) : C === Ue.ERROR_IMAGE_TYPE ? this._messageService.show({
         type: pe.Error,
         content: this._localeService.t("update-status.invalidImageType")
-      }) : C === Ae.ERROR_IMAGE && this._messageService.show({
+      }) : C === Ue.ERROR_IMAGE && this._messageService.show({
         type: pe.Error,
         content: this._localeService.t("update-status.invalidImage")
       });
     }
     if (n == null)
       return !1;
-    const { imageId: r, imageSourceType: s, source: o, base64Cache: a } = n, { width: d, height: u, image: c } = await Xt(a || "");
+    const { imageId: r, imageSourceType: s, source: o, base64Cache: a } = n, { width: l, height: u, image: c } = await Xt(a || "");
     this._imageIoService.addImageSourceCache(o, s, c);
-    const l = this._workbookSelections.getCurrentLastSelection();
-    if (!l)
+    const d = this._workbookSelections.getCurrentLastSelection();
+    if (!d)
       return !1;
-    let g = l.primary.actualRow, h = l.primary.actualColumn;
-    l.primary.isMerged && (g = l.primary.startRow, h = l.primary.startColumn);
+    let g = d.primary.actualRow, h = d.primary.actualColumn;
+    d.primary.isMerged && (g = d.primary.startRow, h = d.primary.startColumn);
     const f = Vt("", {}), p = en(
       this._injector,
       {
@@ -433,7 +432,7 @@ let Qe = class extends ne {
         row: g,
         col: h
       },
-      d,
+      l,
       u,
       0
     );
@@ -445,11 +444,11 @@ let Qe = class extends ne {
         height: p.height
       },
       positionH: {
-        relativeFrom: pn.PAGE,
+        relativeFrom: vn.PAGE,
         posOffset: 0
       },
       positionV: {
-        relativeFrom: mn.PARAGRAPH,
+        relativeFrom: Sn.PARAGRAPH,
         posOffset: 0
       },
       angle: 0
@@ -460,14 +459,14 @@ let Qe = class extends ne {
       drawingType: B.DRAWING_IMAGE,
       imageSourceType: s,
       source: o,
-      transform: bn(m),
+      transform: En(m),
       docTransform: m,
-      behindDoc: Sn.FALSE,
+      behindDoc: Dn.FALSE,
       title: "",
       description: "",
-      layoutType: _n.INLINE,
+      layoutType: Cn.INLINE,
       // Insert inline drawing by default.
-      wrapText: wn.BOTH_SIDES,
+      wrapText: In.BOTH_SIDES,
       distB: 0,
       distL: 0,
       distR: 0,
@@ -481,7 +480,7 @@ let Qe = class extends ne {
         endOffset: 0
       }
     });
-    return v ? (f.apply(v), this._commandService.syncExecuteCommand(In.id, {
+    return v ? (f.apply(v), this._commandService.syncExecuteCommand(bn.id, {
       value: {
         [(I = e == null ? void 0 : e.row) != null ? I : g]: {
           [(R = e == null ? void 0 : e.col) != null ? R : h]: {
@@ -498,11 +497,11 @@ let Qe = class extends ne {
   async insertCellImageByUrl(t, e) {
     var g, h;
     const { width: n, height: r, image: s } = await Xt(t || "");
-    this._imageIoService.addImageSourceCache(t, vn.URL, s);
+    this._imageIoService.addImageSourceCache(t, Rn.URL, s);
     const o = this._workbookSelections.getCurrentLastSelection();
     if (!o)
       return !1;
-    const a = Vt("", {}), d = en(
+    const a = Vt("", {}), l = en(
       this._injector,
       {
         unitId: this._context.unitId,
@@ -514,19 +513,19 @@ let Qe = class extends ne {
       r,
       0
     );
-    if (!d)
+    if (!l)
       return !1;
     const u = {
       size: {
-        width: d.width,
-        height: d.height
+        width: l.width,
+        height: l.height
       },
       positionH: {
-        relativeFrom: pn.PAGE,
+        relativeFrom: vn.PAGE,
         posOffset: 0
       },
       positionV: {
-        relativeFrom: mn.PARAGRAPH,
+        relativeFrom: Sn.PARAGRAPH,
         posOffset: 0
       },
       angle: 0
@@ -535,21 +534,21 @@ let Qe = class extends ne {
       subUnitId: a.getUnitId(),
       drawingId: Dt(),
       drawingType: B.DRAWING_IMAGE,
-      imageSourceType: vn.URL,
+      imageSourceType: Rn.URL,
       source: t,
-      transform: bn(u),
+      transform: En(u),
       docTransform: u,
-      behindDoc: Sn.FALSE,
+      behindDoc: Dn.FALSE,
       title: "",
       description: "",
-      layoutType: _n.INLINE,
+      layoutType: Cn.INLINE,
       // Insert inline drawing by default.
-      wrapText: wn.BOTH_SIDES,
+      wrapText: In.BOTH_SIDES,
       distB: 0,
       distL: 0,
       distR: 0,
       distT: 0
-    }, l = Ht.drawing.add({
+    }, d = Ht.drawing.add({
       documentDataModel: a,
       drawings: [c],
       selection: {
@@ -558,7 +557,7 @@ let Qe = class extends ne {
         endOffset: 0
       }
     });
-    return l ? (a.apply(l), this._commandService.syncExecuteCommand(In.id, {
+    return d ? (a.apply(d), this._commandService.syncExecuteCommand(bn.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]: {
@@ -587,29 +586,29 @@ let Qe = class extends ne {
       endColumn: 0
     };
     s && s.length > 0 && (o = s[s.length - 1].range);
-    const a = ar(this._skeletonManagerService.getCurrent().skeleton, o);
+    const a = Yn(this._skeletonManagerService.getCurrent().skeleton, o);
     if (a == null)
       return;
-    let { startColumn: d, startRow: u, startX: c, startY: l } = a, g = !1;
-    if (c + t > n && (c = n - t, c < 0 && (c = 0, t = n), g = !0), l + e > r && (l = r - e, l < 0 && (l = 0, e = r), g = !0), g) {
-      const m = this._selectionRenderService.getCellWithCoordByOffset(c, l);
+    let { startColumn: l, startRow: u, startX: c, startY: d } = a, g = !1;
+    if (c + t > n && (c = n - t, c < 0 && (c = 0, t = n), g = !0), d + e > r && (d = r - e, d < 0 && (d = 0, e = r), g = !0), g) {
+      const m = this._selectionRenderService.getCellWithCoordByOffset(c, d);
       if (m == null)
         return;
-      c = m.startX, l = m.startY, d = m.actualColumn, u = m.actualRow;
+      c = m.startX, d = m.startY, l = m.actualColumn, u = m.actualRow;
     }
     const h = {
-      column: d,
+      column: l,
       columnOffset: 0,
       row: u,
       rowOffset: 0
-    }, f = this._selectionRenderService.getCellWithCoordByOffset(c + t, l + e);
+    }, f = this._selectionRenderService.getCellWithCoordByOffset(c + t, d + e);
     if (f == null)
       return;
     const p = {
       column: f.actualColumn,
       columnOffset: c + t - f.startX,
       row: f.actualRow,
-      rowOffset: l + e - f.startY
+      rowOffset: d + e - f.startY
     };
     return {
       from: h,
@@ -631,21 +630,21 @@ let Qe = class extends ne {
     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: d } = n;
-        if (d == null)
+        const { unitId: r, subUnitId: s, drawingId: o, drawingType: a, transform: l } = n;
+        if (l == null)
           return;
         const u = this._sheetDrawingService.getDrawingByParam({ unitId: r, subUnitId: s, drawingId: o });
         if (u == null || u.unitId !== this._context.unitId)
           return;
-        const c = $({ ...u.transform, ...d }, this._selectionRenderService);
+        const c = $({ ...u.transform, ...l }, this._selectionRenderService);
         if (c == null)
           return;
-        const l = {
+        const d = {
           ...n,
-          transform: { ...u.transform, ...d, ...z(c, this._selectionRenderService, this._skeletonManagerService) },
+          transform: { ...u.transform, ...l, ...z(c, this._selectionRenderService, this._skeletonManagerService) },
           sheetTransform: { ...c }
         };
-        e.push(l);
+        e.push(d);
       }), e.length > 0 && this._commandService.executeCommand(Wt.id, {
         unitId: t[0].unitId,
         drawings: e
@@ -664,7 +663,7 @@ let Qe = class extends ne {
   _focusDrawingListener() {
     this.disposeWithMe(
       this._drawingManagerService.focus$.subscribe((t) => {
-        t == null || t.length === 0 ? (this._contextService.setContextValue($e, !1), this._sheetDrawingService.focusDrawing([])) : (this._contextService.setContextValue($e, !0), this._sheetDrawingService.focusDrawing(t));
+        t == null || t.length === 0 ? (this._contextService.setContextValue(je, !1), this._sheetDrawingService.focusDrawing([])) : (this._contextService.setContextValue(je, !0), this._sheetDrawingService.focusDrawing(t));
       })
     );
   }
@@ -672,23 +671,23 @@ let Qe = class extends ne {
 Qe = rs([
   te(1, A(V)),
   te(2, G),
-  te(3, Xe),
-  te(4, _i),
+  te(3, Fe),
+  te(4, Ti),
   te(5, Pi),
   te(6, re),
   te(7, ie),
-  te(8, Yn),
+  te(8, Gn),
   te(9, cr),
   te(10, A(tt)),
-  te(11, A(sn)),
+  te(11, A(on)),
   te(12, A(Ye))
 ], Qe);
 const Bt = {
   id: "sheet.command.insert-float-image",
-  type: J.COMMAND,
+  type: Z.COMMAND,
   handler: async (i, t) => {
     var o, a;
-    const e = i.get(Se), n = i.get(Z), r = (o = on(
+    const e = i.get(Se), n = i.get(J), r = (o = sn(
       F.UNIVER_SHEET,
       e,
       n
@@ -697,18 +696,18 @@ const Bt = {
       return !1;
     const s = t == null ? void 0 : t.files;
     if (s) {
-      const d = s.map((u) => r.insertFloatImageByFile(u));
-      return (await Promise.all(d)).every((u) => u);
+      const l = s.map((u) => r.insertFloatImageByFile(u));
+      return (await Promise.all(l)).every((u) => u);
     } else
       return (a = r.insertFloatImage()) != null ? a : !1;
   }
 }, dn = {
   id: "sheet.command.insert-cell-image",
-  type: J.COMMAND,
+  type: Z.COMMAND,
   handler: (i) => {
     var n, r;
-    const t = i.get(Se), e = i.get(Z);
-    return (r = (n = on(
+    const t = i.get(Se), e = i.get(J);
+    return (r = (n = sn(
       F.UNIVER_SHEET,
       t,
       e
@@ -716,16 +715,16 @@ const Bt = {
   }
 }, rt = {
   id: "sheet.command.move-drawing",
-  type: J.COMMAND,
+  type: Z.COMMAND,
   handler: (i, t) => {
-    const e = i.get(G), n = i.get(re), r = i.get(Xe), { direction: s } = t, o = n.getFocusDrawings();
+    const e = i.get(G), n = i.get(re), r = i.get(Fe), { direction: s } = t, o = n.getFocusDrawings();
     if (o.length === 0)
       return !1;
-    const a = o[0].unitId, d = o.map((c) => {
-      const { transform: l } = c;
-      if (l == null)
+    const a = o[0].unitId, l = o.map((c) => {
+      const { transform: d } = c;
+      if (d == null)
         return null;
-      const g = { ...l }, { left: h = 0, top: f = 0 } = l;
+      const g = { ...d }, { left: h = 0, top: f = 0 } = d;
       return s === _e.UP ? g.top = f - 1 : s === _e.DOWN ? g.top = f + 1 : s === _e.LEFT ? g.left = h - 1 : s === _e.RIGHT && (g.left = h + 1), {
         ...c,
         transform: g,
@@ -734,12 +733,12 @@ const Bt = {
     }).filter((c) => c != null);
     return e.syncExecuteCommand(Wt.id, {
       unitId: a,
-      drawings: d
+      drawings: l
     }) ? (e.syncExecuteCommand(Y.id, [a]), !0) : !1;
   }
 }, pr = "COMPONENT_SHEET_DRAWING_PANEL", wr = {
   id: "sidebar.operation.sheet-image",
-  type: J.COMMAND,
+  type: Z.COMMAND,
   handler: async (i, t) => {
     const e = i.get(Ai), n = i.get(tt), r = i.get(Se), s = i.get(G);
     if (!se(r)) return !1;
@@ -763,7 +762,7 @@ const Bt = {
   }
 }, _r = {
   id: "sheet.operation.edit-sheet-image",
-  type: J.OPERATION,
+  type: Z.OPERATION,
   handler: (i, t) => {
     const e = i.get(G);
     return t == null ? !1 : (e.syncExecuteCommand(Nt.id, [t]), e.executeCommand(wr.id, { value: "open" }), !0);
@@ -774,11 +773,11 @@ var os = Object.getOwnPropertyDescriptor, as = (i, t, e, n) => {
     (o = i[s]) && (r = o(r) || r);
   return r;
 }, ce = (i, t) => (e, n) => t(e, n, i);
-let Rt = class extends Or {
-  constructor(t, e, n, r, s, o, a, d, u, c) {
+let Rt = class extends Gr {
+  constructor(t, e, n, r, s, o, a, l, u, c) {
     super();
     ee(this, "_initImagePopupMenu", /* @__PURE__ */ new Set());
-    this._injector = t, this._localeService = e, this._drawingManagerService = n, this._canvasPopManagerService = r, this._renderManagerService = s, this._univerInstanceService = o, this._messageService = a, this._contextService = d, this._ioService = u, this._commandService = c, this._init();
+    this._injector = t, this._localeService = e, this._drawingManagerService = n, this._canvasPopManagerService = r, this._renderManagerService = s, this._univerInstanceService = o, this._messageService = a, this._contextService = l, this._ioService = u, this._commandService = c, this._init();
   }
   _init() {
     this._univerInstanceService.getCurrentTypeOfUnit$(F.UNIVER_SHEET).pipe(Nn(this.dispose$)).subscribe((t) => this._create(t)), this._univerInstanceService.getTypeOfUnitDisposed$(F.UNIVER_SHEET).pipe(Nn(this.dispose$)).subscribe((t) => this._dispose(t)), this._univerInstanceService.getAllUnitsForType(F.UNIVER_SHEET).forEach((t) => this._create(t)), this._setupLoadingStatus();
@@ -824,7 +823,7 @@ let Rt = class extends Or {
     let r;
     this.disposeWithMe(
       n.createControl$.subscribe(() => {
-        if (this._contextService.setContextValue($e, !0), this._hasCropObject(e))
+        if (this._contextService.setContextValue(je, !0), this._hasCropObject(e))
           return;
         const o = n.getSelectedObjectMap();
         if (o.size > 1) {
@@ -834,30 +833,30 @@ let Rt = class extends Or {
         const a = o.values().next().value;
         if (!a)
           return;
-        const d = a.oKey, u = this._drawingManagerService.getDrawingOKey(d);
+        const l = a.oKey, u = this._drawingManagerService.getDrawingOKey(l);
         if (!u)
           return;
-        const { unitId: c, subUnitId: l, drawingId: g, drawingType: h } = u, f = u.data;
+        const { unitId: c, subUnitId: d, drawingId: g, drawingType: h } = u, f = u.data;
         if (f && f.disablePopup)
           return;
         r == null || r.dispose();
-        const p = this._canvasPopManagerService.getFeatureMenu(c, l, g, h);
+        const p = this._canvasPopManagerService.getFeatureMenu(c, d, g, h);
         r = this.disposeWithMe(this._canvasPopManagerService.attachPopupToObject(a, {
           componentKey: Li,
           direction: "horizontal",
           offset: [2, 0],
           extraProps: {
-            menuItems: p || this._getImageMenuItems(c, l, g, h)
+            menuItems: p || this._getImageMenuItems(c, d, g, h)
           }
         }));
       })
     ), this.disposeWithMe(
       n.clearControl$.subscribe(() => {
-        r == null || r.dispose(), this._contextService.setContextValue($e, !1), this._commandService.syncExecuteCommand(Nt.id, []);
+        r == null || r.dispose(), this._contextService.setContextValue(je, !1), this._commandService.syncExecuteCommand(Nt.id, []);
       })
     ), this.disposeWithMe(
       this._contextService.contextChanged$.subscribe((o) => {
-        o[$e] === !1 && (r == null || r.dispose());
+        o[je] === !1 && (r == null || r.dispose());
       })
     ), this.disposeWithMe(
       n.changing$.subscribe(() => {
@@ -902,12 +901,12 @@ Rt = as([
   ce(0, A(Ye)),
   ce(1, A(tt)),
   ce(2, ie),
-  ce(3, A(Ci)),
-  ce(4, Z),
+  ce(3, A(Ar)),
+  ce(4, J),
   ce(5, Se),
   ce(6, cr),
-  ce(7, Yn),
-  ce(8, Tr),
+  ce(7, Gn),
+  ce(8, Xr),
   ce(9, G)
 ], Rt);
 var cs = Object.getOwnPropertyDescriptor, ds = (i, t, e, n) => {
@@ -925,7 +924,7 @@ let tn = class extends ne {
     this.disposeWithMe(this._hoverManagerService.currentRichTextNoDistinct$.pipe(Ji(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(ui.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(Ur.ZOOM_IN)) : this._isSetCursor && (this._isSetCursor = !1, this._context.scene.resetCursor());
     }));
   }
   _initImageClick() {
@@ -940,8 +939,8 @@ let tn = class extends ne {
   }
 };
 tn = ds([
-  St(1, A(Di)),
-  St(2, A(sn)),
+  St(1, A(Nr)),
+  St(2, A(on)),
   St(3, A(lr)),
   St(4, A(V))
 ], tn);
@@ -973,18 +972,18 @@ let nn = class extends ne {
 nn = us([
   vt(1, re),
   vt(2, ie),
-  vt(3, A(Xe)),
+  vt(3, A(Fe)),
   vt(4, A(V))
 ], nn);
 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;
-}, Ne = (i, t) => (e, n) => t(e, n, i);
+}, Ae = (i, t) => (e, n) => t(e, n, i);
 function Sr(i, t, e) {
   var n, r, s, o;
   if (((r = (n = e == null ? void 0 : e.p) == null ? void 0 : n.body) == null ? void 0 : r.dataStream.length) === 3 && ((o = (s = e.p) == null ? void 0 : s.drawingsOrder) == null ? void 0 : o.length) === 1) {
-    const a = e.p.drawings[e.p.drawingsOrder[0]], d = en(
+    const a = e.p.drawings[e.p.drawingsOrder[0]], l = en(
       i,
       {
         unitId: t.unitId,
@@ -996,8 +995,8 @@ function Sr(i, t, e) {
       a.docTransform.size.height,
       a.docTransform.angle
     );
-    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;
+    if (l)
+      return a.transform.width = l.width, a.transform.height = l.height, a.docTransform.size.width = l.width, a.docTransform.size.height = l.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;
 }
@@ -1009,16 +1008,16 @@ let bt = class extends ne {
     this.disposeWithMe(this._editorBridgeService.visible$.subscribe((i) => {
       i.visible ? i.visible && (this._drawingManagerService.removeDrawingDataForUnit(Ze), this._docDrawingController.loadDrawingDataForUnit(Ze), this._drawingManagerService.initializeNotification(Ze)) : this._drawingManagerService.removeDrawingDataForUnit(Ze);
     })), this.disposeWithMe(this._commandService.onCommandExecuted((i) => {
-      i.id === pi.id && i.params.unitId === Be && (this._drawingManagerService.removeDrawingDataForUnit(Be), this._docDrawingController.loadDrawingDataForUnit(Be), this._drawingManagerService.initializeNotification(Be));
+      i.id === yi.id && i.params.unitId === Be && (this._drawingManagerService.removeDrawingDataForUnit(Be), this._docDrawingController.loadDrawingDataForUnit(Be), this._drawingManagerService.initializeNotification(Be));
     }));
   }
   _initCellContentInterceptor() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        Jr.CELL_CONTENT,
+        li.CELL_CONTENT,
         {
-          effect: Ur.Style,
-          priority: Zr.CELL_IMAGE,
+          effect: Lr.Style,
+          priority: ui.CELL_IMAGE,
           handler: (i, t, e) => {
             var n;
             return i != null && i.p && ((n = i.p.drawingsOrder) != null && n.length) && (i === t.rawData && (i = { ...t.rawData }), i.interceptorStyle || (i.interceptorStyle = {}), i.interceptorStyle.tr = { a: 0 }, Sr(this._injector, { unitId: t.unitId, subUnitId: t.subUnitId, row: t.row, col: t.col }, i)), e(i);
@@ -1029,12 +1028,12 @@ let bt = class extends ne {
   }
 };
 bt = gs([
-  Ne(0, G),
-  Ne(1, A(At)),
-  Ne(2, A(Ye)),
-  Ne(3, ie),
-  Ne(4, A(Yi)),
-  Ne(5, A(Ri))
+  Ae(0, G),
+  Ae(1, A(At)),
+  Ae(2, A(Ye)),
+  Ae(3, ie),
+  Ae(4, A(Yi)),
+  Ae(5, A(kr))
 ], bt);
 var fs = Object.getOwnPropertyDescriptor, ms = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? fs(t, e) : t, s = i.length - 1, o; s >= 0; s--)
@@ -1050,7 +1049,7 @@ let Mt = class extends ne {
       this._autoFillService.addHook({
         id: "sheet-cell-image-autofill",
         onBeforeSubmit: (i, t, e, n) => {
-          new Pr(n).forValue((r, s, o) => {
+          new Vr(n).forValue((r, s, o) => {
             Sr(this._injector, { unitId: i.unitId, subUnitId: i.subUnitId, row: r, col: s }, o);
           });
         }
@@ -1059,7 +1058,7 @@ let Mt = class extends ne {
   }
 };
 Mt = ms([
-  $n(0, A(bi)),
+  $n(0, A(Wr)),
   $n(1, A(Ye))
 ], Mt);
 var ps = Object.getOwnPropertyDescriptor, ws = (i, t, e, n) => {
@@ -1069,7 +1068,7 @@ var ps = Object.getOwnPropertyDescriptor, ws = (i, t, e, n) => {
 }, He = (i, t) => (e, n) => t(e, n, i);
 const _s = [
   Ze,
-  Ar,
+  Hr,
   Be
 ];
 let yt = class extends ne {
@@ -1078,7 +1077,7 @@ let yt = class extends ne {
   }
   _setCellImage(i) {
     var r;
-    const t = Vt("", {}), e = (r = on(F.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.with(Mi), n = Ht.drawing.add({
+    const t = Vt("", {}), e = (r = sn(F.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService)) == null ? void 0 : r.with(Br), n = Ht.drawing.add({
       documentDataModel: t,
       drawings: [i],
       selection: {
@@ -1093,7 +1092,7 @@ let yt = class extends ne {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((i) => {
         var t, e;
-        if (i.id === wi.id) {
+        if (i.id === Ei.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;
@@ -1101,12 +1100,12 @@ let yt = class extends ne {
           if (_s.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(pn.id, {
                   visible: !1
                 });
               };
               ((e = s.getBody()) == null ? void 0 : e.dataStream) === `\r
-` ? (this._commandService.syncExecuteCommand(Un.id, {
+` ? (this._commandService.syncExecuteCommand(pn.id, {
                 visible: !1
               }), this._setCellImage(Object.values(r.drawings)[0])) : this._dialogService.open({
                 id: "sheet-cell-image-copy-paste",
@@ -1138,7 +1137,7 @@ yt = ws([
   He(0, G),
   He(1, Se),
   He(2, Ni),
-  He(3, Z),
+  He(3, J),
   He(4, A(tt))
 ], yt);
 var Ss = Object.getOwnPropertyDescriptor, vs = (i, t, e, n) => {
@@ -1170,10 +1169,10 @@ function Ds() {
   };
 }
 const Fn = [
-  je.SPECIAL_PASTE_COL_WIDTH,
-  je.SPECIAL_PASTE_VALUE,
-  je.SPECIAL_PASTE_FORMAT,
-  je.SPECIAL_PASTE_FORMULA
+  We.SPECIAL_PASTE_COL_WIDTH,
+  We.SPECIAL_PASTE_VALUE,
+  We.SPECIAL_PASTE_FORMAT,
+  We.SPECIAL_PASTE_FORMULA
 ];
 let Et = class extends ne {
   constructor(t, e, n, r, s) {
@@ -1192,16 +1191,16 @@ let Et = class extends ne {
         const s = this._focusedDrawings;
         if (s.length > 0) {
           const [o] = s;
-          if (r === Ie.CUT) {
-            const d = {
+          if (r === ve.CUT) {
+            const l = {
               unitId: t,
               drawings: [o]
             };
-            this._commandService.executeCommand(nt.id, d);
+            this._commandService.executeCommand(nt.id, l);
           }
           setTimeout(() => {
-            const d = Ds();
-            o.drawingType === B.DRAWING_IMAGE && o.imageSourceType === Si.BASE64 ? Cs(o.source) : this._clipboardInterfaceService.writeText(""), d();
+            const l = Ds();
+            o.drawingType === B.DRAWING_IMAGE && o.imageSourceType === Oi.BASE64 ? Cs(o.source) : this._clipboardInterfaceService.writeText(""), l();
           }, 200);
           const a = {
             unitId: o.unitId,
@@ -1217,14 +1216,14 @@ let Et = class extends ne {
       onPasteCells: (t, e, n, r) => {
         if (!this._copyInfo)
           return { redos: [], undos: [] };
-        const { copyType: s = Ie.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 }, Ie.COPY);
+        const { copyType: s = ve.COPY, pasteType: o } = r, { range: a } = t || {}, { range: l, unitId: u, subUnitId: c } = e;
+        return this._copyInfo.copyRange ? this._generateRangeDrawingsPasteMutations({ pasteType: o, unitId: u, subUnitId: c, pasteRange: l }, { copyRange: a, copyType: s }) : this._generateSingleDrawingPasteMutations({ pasteTo: e, pasteType: o }, ve.COPY);
       },
       onPastePlainText: (t, e) => ({ undos: [], redos: [] }),
-      onPasteUnrecognized: (t) => this._copyInfo ? this._generateSingleDrawingPasteMutations({ pasteTo: t, pasteType: je.DEFAULT_PASTE }, Ie.COPY) : { undos: [], redos: [] },
+      onPasteUnrecognized: (t) => this._copyInfo ? this._generateSingleDrawingPasteMutations({ pasteTo: t, pasteType: We.DEFAULT_PASTE }, ve.COPY) : { undos: [], redos: [] },
       onPasteFiles: (t, e) => {
         if (this._copyInfo)
-          return this._generateSingleDrawingPasteMutations({ pasteTo: t, pasteType: je.DEFAULT_PASTE }, Ie.COPY);
+          return this._generateSingleDrawingPasteMutations({ pasteTo: t, pasteType: We.DEFAULT_PASTE }, ve.COPY);
         {
           const n = e.filter((r) => r.type.includes("image"));
           if (n.length)
@@ -1249,7 +1248,7 @@ let Et = class extends ne {
     const s = r.attachRangeWithCoord(n);
     if (!s)
       return;
-    const { startX: o, endX: a, startY: d, endY: u } = s, c = this._drawingService.getDrawingData(t, e), l = this._focusedDrawings.slice();
+    const { startX: o, endX: a, startY: l, endY: u } = s, c = this._drawingService.getDrawingData(t, e), d = this._focusedDrawings.slice();
     if (Object.keys(c).forEach((h) => {
       const f = c[h], { transform: p } = f;
       if (f.anchorType !== O.Both || !p)
@@ -1260,11 +1259,11 @@ let Et = class extends ne {
         drawingStartY: _,
         drawingEndY: _ + I
       };
-      o <= R && S <= a && d <= C && w <= u && l.push(f);
-    }), l.length)
+      o <= R && S <= a && l <= C && w <= u && d.push(f);
+    }), d.length)
       return {
         copyRange: n,
-        drawings: l,
+        drawings: d,
         unitId: t,
         subUnitId: e
       };
@@ -1273,14 +1272,14 @@ let Et = class extends ne {
     const { pasteType: n, pasteTo: r } = t;
     if (Fn.includes(n))
       return { redos: [], undos: [] };
-    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(Xe), l = this._copyInfo;
+    const { unitId: s, subUnitId: o, range: a } = r, l = this._renderManagerService.getRenderById(s), u = l == null ? void 0 : l.with(V), c = l == null ? void 0 : l.with(Fe), d = this._copyInfo;
     if (!u || !c)
       return { redos: [], undos: [] };
-    const { drawings: g } = l, h = Pn(a);
+    const { drawings: g } = d, h = wn(a);
     return this._generateMutations(g, {
       unitId: s,
       subUnitId: o,
-      isCut: e === Ie.CUT,
+      isCut: e === ve.CUT,
       getTransform: (f, p) => {
         var v;
         const m = u.attachRangeWithCoord({
@@ -1306,16 +1305,16 @@ let Et = class extends ne {
       subUnitId: r,
       getTransform: s,
       isCut: o
-    } = e, a = [], d = [], { _drawingService: u } = this;
+    } = e, a = [], l = [], { _drawingService: u } = this;
     return t.forEach((c) => {
-      const { transform: l, sheetTransform: g } = c;
-      if (!l)
+      const { transform: d, sheetTransform: g } = c;
+      if (!d)
         return;
-      const h = s(l, g), f = {
+      const h = s(d, g), f = {
         ...c,
         unitId: n,
         subUnitId: r,
-        drawingId: o ? c.drawingId : Re.generateRandomId(),
+        drawingId: o ? c.drawingId : De.generateRandomId(),
         transform: h.transform,
         sheetTransform: h.sheetTransform
       };
@@ -1330,7 +1329,7 @@ let Et = class extends ne {
             op: m,
             objects: _
           }
-        }), d.push({
+        }), l.push({
           id: P.id,
           params: {
             unitId: n,
@@ -1342,9 +1341,9 @@ let Et = class extends ne {
         });
       } else {
         const { undo: p, redo: m, objects: _ } = u.getBatchAddOp([f]);
-        a.push({ id: P.id, params: { op: m, unitId: n, subUnitId: r, objects: _, type: U.INSERT } }), d.push({ id: P.id, params: { op: p, unitId: n, subUnitId: r, objects: _, type: U.REMOVE } });
+        a.push({ id: P.id, params: { op: m, unitId: n, subUnitId: r, objects: _, type: U.INSERT } }), l.push({ id: P.id, params: { op: p, unitId: n, subUnitId: r, objects: _, type: U.REMOVE } });
       }
-    }), { redos: a, undos: d };
+    }), { redos: a, undos: l };
   }
   // eslint-disable-next-line max-lines-per-function
   _generateRangeDrawingsPasteMutations(t, e) {
@@ -1356,7 +1355,7 @@ let Et = class extends ne {
       pasteRange: o
     } = t, {
       copyRange: a,
-      copyType: d
+      copyType: l
     } = e;
     if (Fn.includes(s))
       return { redos: [], undos: [] };
@@ -1366,10 +1365,10 @@ let Et = class extends ne {
     const { drawings: c } = this._copyInfo;
     if (!a)
       return this._generateSingleDrawingPasteMutations({
-        pasteTo: { unitId: n, subUnitId: r, range: Pn(o) },
+        pasteTo: { unitId: n, subUnitId: r, range: wn(o) },
         pasteType: s
-      }, d);
-    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), v = u.attachRangeWithCoord({
+      }, l);
+    const { ranges: [d, g], mapFunc: h } = jr([a, o]), { row: f, col: p } = h(d.startRow, d.startColumn), { row: m, col: _ } = h(g.startRow, g.startColumn), v = u.attachRangeWithCoord({
       startRow: f,
       endRow: f,
       startColumn: p,
@@ -1409,13 +1408,13 @@ let Et = class extends ne {
           }
         };
       },
-      isCut: d === Ie.CUT
+      isCut: l === ve.CUT
     });
   }
 };
 Et = vs([
-  ze(0, Ei),
-  ze(1, Z),
+  ze(0, $r),
+  ze(1, J),
   ze(2, ie),
   ze(3, ki),
   ze(4, G)
@@ -1441,8 +1440,8 @@ let Tt = class extends ne {
             }
             const o = n.getUnitId(), a = s.getSheetId();
             this._permissionService.composePermission([
-              new Cn(o).id,
-              new Dn(o, a).id
+              new Mn(o).id,
+              new yn(o, a).id
             ]).every((u) => u.value) ? this._drawingManagerService.setDrawingVisible(!0) : this._handleDrawingVisibilityFalse(n, s);
           })
         ) : (this._drawingManagerService.setDrawingVisible(!1), fe))
@@ -1455,7 +1454,7 @@ let Tt = class extends ne {
     if (!a)
       return;
     a.getAllObjectsByOrder().forEach((u) => {
-      u.classType === Ue.IMAGE && s.some((c) => u.oKey.includes(c.drawingId)) && a.removeObject(u);
+      u.classType === Oe.IMAGE && s.some((c) => u.oKey.includes(c.drawingId)) && a.removeObject(u);
     });
   }
   _initDrawingEditable() {
@@ -1484,7 +1483,7 @@ let Tt = class extends ne {
     if (!a)
       return;
     a.getAllObjectsByOrder().forEach((u) => {
-      u.classType === Ue.IMAGE && s.some((c) => u.oKey.includes(c.drawingId)) && a.detachTransformerFrom(u);
+      u.classType === Oe.IMAGE && s.some((c) => u.oKey.includes(c.drawingId)) && a.detachTransformerFrom(u);
     });
   }
   _initViewPermissionChange() {
@@ -1495,20 +1494,20 @@ let Tt = class extends ne {
           we((r) => {
             if (!r)
               return fe;
-            const s = e.getUnitId(), o = r.getSheetId(), a = this._renderManagerService.getRenderById(s), d = a == null ? void 0 : a.scene;
-            if (!d)
+            const s = e.getUnitId(), o = r.getSheetId(), a = this._renderManagerService.getRenderById(s), l = a == null ? void 0 : a.scene;
+            if (!l)
               return fe;
-            const u = d.getTransformerByCreate();
+            const u = l.getTransformerByCreate();
             return this._permissionService.composePermission$([
-              new Cn(s).id,
-              new Dn(s, o).id
+              new Mn(s).id,
+              new yn(s, o).id
             ]).pipe(
-              be((l) => l.every((g) => g.value)),
+              Re((d) => d.every((g) => g.value)),
               Wn()
             ).pipe(
-              be((l) => ({
-                permission: l,
-                scene: d,
+              Re((d) => ({
+                permission: d,
+                scene: l,
                 transformer: u,
                 unitId: s,
                 subUnitId: o
@@ -1519,9 +1518,9 @@ let Tt = class extends ne {
       ).subscribe({
         next: ({ permission: e, scene: n, transformer: r, unitId: s, subUnitId: o }) => {
           this._drawingManagerService.setDrawingVisible(e);
-          const a = n.getAllObjectsByOrder(), d = this._drawingManagerService.getDrawingData(s, o), u = Object.values(d);
+          const a = n.getAllObjectsByOrder(), l = this._drawingManagerService.getDrawingData(s, o), u = Object.values(l);
           e ? this._drawingManagerService.addNotification(u) : (a.forEach((c) => {
-            c.classType === Ue.IMAGE && u.some((l) => c.oKey.includes(l.drawingId)) && n.removeObject(c);
+            c.classType === Oe.IMAGE && u.some((d) => c.oKey.includes(d.drawingId)) && n.removeObject(c);
           }), r.clearSelectedObjects());
         },
         complete: () => {
@@ -1543,20 +1542,20 @@ let Tt = class extends ne {
           we((r) => {
             if (!r)
               return fe;
-            const s = e.getUnitId(), o = r.getSheetId(), a = this._renderManagerService.getRenderById(s), d = a == null ? void 0 : a.scene;
-            if (!d)
+            const s = e.getUnitId(), o = r.getSheetId(), a = this._renderManagerService.getRenderById(s), l = a == null ? void 0 : a.scene;
+            if (!l)
               return fe;
-            const u = d.getTransformerByCreate();
+            const u = l.getTransformerByCreate();
             return this._permissionService.composePermission$([
               new zt(s).id,
               new Kt(s, o).id
             ]).pipe(
-              be((l) => l.every((g) => g.value)),
+              Re((d) => d.every((g) => g.value)),
               Wn()
             ).pipe(
-              be((l) => ({
-                permission: l,
-                scene: d,
+              Re((d) => ({
+                permission: d,
+                scene: l,
                 transformer: u,
                 unitId: s,
                 subUnitId: o
@@ -1567,11 +1566,11 @@ let Tt = class extends ne {
       ).subscribe({
         next: ({ permission: e, scene: n, transformer: r, unitId: s, subUnitId: o }) => {
           this._drawingManagerService.setDrawingEditable(e);
-          const a = n.getAllObjectsByOrder(), d = this._drawingManagerService.getDrawingData(s, o), u = Object.values(d);
+          const a = n.getAllObjectsByOrder(), l = this._drawingManagerService.getDrawingData(s, o), u = Object.values(l);
           e ? (a.forEach((c) => {
-            c.classType === Ue.IMAGE && u.some((l) => c.oKey.includes(l.drawingId)) && n.attachTransformerTo(c);
+            c.classType === Oe.IMAGE && u.some((d) => c.oKey.includes(d.drawingId)) && n.attachTransformerTo(c);
           }), this._drawingManagerService.addNotification(u)) : (a.forEach((c) => {
-            c.classType === Ue.IMAGE && u.some((l) => c.oKey.includes(l.drawingId)) && n.detachTransformerFrom(c);
+            c.classType === Oe.IMAGE && u.some((d) => c.oKey.includes(d.drawingId)) && n.detachTransformerFrom(c);
           }), r.clearSelectedObjects());
         },
         complete: () => {
@@ -1584,9 +1583,9 @@ let Tt = class extends ne {
           const s = r.getSheetId(), o = this._renderManagerService.getRenderById(n), a = o == null ? void 0 : o.scene;
           if (!a)
             return;
-          const d = this._drawingManagerService.getDrawingData(n, s), u = Object.values(d);
-          this._drawingManagerService.setDrawingEditable(!0), a.getAllObjectsByOrder().forEach((l) => {
-            l.classType === Ue.IMAGE && u.some((g) => l.oKey.includes(g.drawingId)) && a.detachTransformerFrom(l);
+          const l = this._drawingManagerService.getDrawingData(n, s), u = Object.values(l);
+          this._drawingManagerService.setDrawingEditable(!0), a.getAllObjectsByOrder().forEach((d) => {
+            d.classType === Oe.IMAGE && u.some((g) => d.oKey.includes(g.drawingId)) && a.detachTransformerFrom(d);
           });
         }
       })
@@ -1595,36 +1594,36 @@ let Tt = class extends ne {
 };
 Tt = bs([
   Ke(0, ie),
-  Ke(1, Z),
-  Ke(2, Nr),
+  Ke(1, J),
+  Ke(2, zr),
   Ke(3, Se),
-  Ke(4, A(kr))
+  Ke(4, A(Kr))
 ], Tt);
 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;
-}, Ce = (i, t) => (e, n) => t(e, n, i);
+}, Ie = (i, t) => (e, n) => t(e, n, i);
 function Ir(i, t, e, n, r, s = !1) {
-  const { scaleX: o, scaleY: a } = t.getAncestorScale(), d = t.getViewport(or.VIEW_MAIN), u = n.getFreeze(), { startColumn: c, startRow: l, xSplit: g, ySplit: h } = u, f = {
+  const { scaleX: o, scaleY: a } = t.getAncestorScale(), l = t.getViewport(xn.VIEW_MAIN), u = n.getFreeze(), { startColumn: c, startRow: d, xSplit: g, ySplit: h } = u, f = {
     left: !0,
     // left means the left of pic is in a viewMainLeft
     top: !0
   };
-  if (!d)
+  if (!l)
     return {
       ...i,
       absolute: f
     };
   const { left: p, right: m, top: _, bottom: v } = i;
-  let { top: I, left: R, viewportScrollX: S, viewportScrollY: C } = d;
+  let { top: I, left: R, viewportScrollX: S, viewportScrollY: C } = l;
   const { boundsOfViewArea: w, scrollDirectionResponse: y } = r || {}, { rowHeaderWidth: D, columnHeaderHeight: E } = e, T = {
     top: s ? 0 : E,
     left: s ? 0 : D
   };
-  w && (Re.isDefine(T.top) && (T.top = w.top), Re.isDefine(T.left) && (T.left = w.left)), y === "HORIZONTAL" && (C = 0), y === "VERTICAL" && (S = 0);
+  w && (De.isDefine(T.top) && (T.top = w.top), De.isDefine(T.left) && (T.left = w.left)), y === "HORIZONTAL" && (C = 0), y === "VERTICAL" && (S = 0);
   let M = 0, b = 0;
-  const N = e.rowStartY(l - h) + E, x = e.colStartX(c - g) + D, q = e.rowStartY(l) + E, H = e.colStartX(c) + D;
+  const N = e.rowStartY(d - h) + E, x = e.colStartX(c - g) + D, q = e.rowStartY(d) + E, H = e.colStartX(c) + D;
   if (g === 0)
     f.left = !1, M = (p - S) * o, b = (m - S) * o;
   else {
@@ -1647,21 +1646,21 @@ function Ir(i, t, e, n, r, s = !1) {
   };
 }
 const ge = (i, t, e, n, r) => {
-  const { left: s, top: o, width: a, height: d, angle: u } = i, c = {
+  const { left: s, top: o, width: a, height: l, angle: u } = i, c = {
     left: s,
     right: s + a,
     top: o,
-    bottom: o + d
-  }, l = Ir(c, t, e, n, r), { scaleX: g, scaleY: h } = t.getAncestorScale();
+    bottom: o + l
+  }, d = Ir(c, t, e, n, r), { scaleX: g, scaleY: h } = t.getAncestorScale();
   return {
-    startX: l.left,
-    endX: l.right,
-    startY: l.top,
-    endY: l.bottom,
+    startX: d.left,
+    endX: d.right,
+    startY: d.top,
+    endY: d.bottom,
     rotate: u,
     width: a * g,
-    height: d * h,
-    absolute: l.absolute
+    height: l * h,
+    absolute: d.absolute
   };
 };
 let et = class extends ne {
@@ -1680,7 +1679,7 @@ let et = class extends ne {
     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(Zi((t) => t === Br.Rendered), qi(1)).subscribe(() => {
+    this._lifecycleService.lifecycle$.pipe(Zi((t) => t === Zr.Rendered), qi(1)).subscribe(() => {
       this._scrollUpdateListener();
     });
   }
@@ -1706,27 +1705,27 @@ let et = class extends ne {
       this._drawingManagerService.add$.subscribe((t) => {
         t.forEach((e) => {
           var K;
-          const { unitId: n, subUnitId: r, drawingId: s } = e, o = se(this._univerInstanceService, { unitId: n, subUnitId: r }), a = this._drawingManagerService.getDrawingByParam(e), d = this._univerInstanceService.getUnit(n, F.UNIVER_SHEET);
-          if (!d)
+          const { unitId: n, subUnitId: r, drawingId: s } = e, o = se(this._univerInstanceService, { unitId: n, subUnitId: r }), a = this._drawingManagerService.getDrawingByParam(e), l = this._univerInstanceService.getUnit(n, F.UNIVER_SHEET);
+          if (!l)
             return;
-          const u = d.getActiveSheet().getSheetId();
+          const u = l.getActiveSheet().getSheetId();
           if (!a || !o)
             return;
           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;
+          const { transform: d, drawingType: g, data: h } = a;
           if (g !== B.DRAWING_DOM && g !== B.DRAWING_CHART)
             return;
           const f = this._getSceneAndTransformerByDrawingSearch(n);
           if (f == null)
             return;
           const { scene: p, canvas: m } = f;
-          if (l == null)
+          if (d == null)
             return !0;
           if (u !== r)
             return;
-          const { left: _, top: v, width: I, height: R, angle: S, flipX: C, flipY: w, skewX: y, skewY: D } = l, E = ve({ unitId: n, subUnitId: r, drawingId: s }), T = p.getObject(E);
+          const { left: _, top: v, width: I, height: R, angle: S, flipX: C, flipY: w, skewX: y, skewY: D } = d, E = Pe({ unitId: n, subUnitId: r, drawingId: s }), T = p.getObject(E);
           if (T != null) {
             T.transformByState({ left: _, top: v, width: I, height: R, angle: S, flipX: C, flipY: w, skewX: y, skewY: D });
             return;
@@ -1742,9 +1741,9 @@ let et = class extends ne {
             const k = h ? h.backgroundColor : "white";
             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 Pe(E, M);
-          b && N.setObjectType(Rn.CHART), p.addObject(N, xt), a.allowTransform !== !1 && p.attachTransformerTo(N);
-          const x = new pt(), q = ge(N, f.renderUnit.scene, c.skeleton, o.worksheet), H = new We(q), L = {
+          const N = new Ve(E, M);
+          b && N.setObjectType(mn.CHART), p.addObject(N, Ft), a.allowTransform !== !1 && p.attachTransformerTo(N);
+          const x = new wt(), q = ge(N, f.renderUnit.scene, c.skeleton, o.worksheet), H = new ke(q), L = {
             dispose: x,
             rect: N,
             position$: H,
@@ -1785,38 +1784,38 @@ let et = class extends ne {
     ), this.disposeWithMe(
       this._drawingManagerService.remove$.subscribe((t) => {
         t.forEach((e) => {
-          var l;
-          const { unitId: n, subUnitId: r, drawingId: s } = e, o = ve({ unitId: n, subUnitId: r, drawingId: s }), a = this._getSceneAndTransformerByDrawingSearch(n);
+          var d;
+          const { unitId: n, subUnitId: r, drawingId: s } = e, o = Pe({ unitId: n, subUnitId: r, drawingId: s }), a = this._getSceneAndTransformerByDrawingSearch(n);
           if (a == null)
             return;
-          const { transformer: d, scene: u } = a, c = u.getObject(o);
-          c != null && c.oKey && (d.clearControlByIds([c == null ? void 0 : c.oKey]), (l = u.getTransformer()) == null || l.clearSelectedObjects());
+          const { transformer: l, scene: u } = a, c = u.getObject(o);
+          c != null && c.oKey && (l.clearControlByIds([c == null ? void 0 : c.oKey]), (d = u.getTransformer()) == null || d.clearSelectedObjects());
         });
       })
     );
   }
   _scrollUpdateListener() {
     const t = (e, 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 = se(this._univerInstanceService, { unitId: e, subUnitId: n }), a = (d = this._renderManagerService.getRenderById(e)) == null ? void 0 : d.with(V).getSkeletonParam(n);
+      var l;
+      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 = se(this._univerInstanceService, { unitId: e, subUnitId: n }), a = (l = this._renderManagerService.getRenderById(e)) == null ? void 0 : l.with(V).getSkeletonParam(n);
       !r || !o || !a || s.forEach((u) => {
         const c = this._domLayerInfoMap.get(u);
         if (c) {
-          const l = ge(c.rect, r.renderUnit.scene, a.skeleton, o.worksheet, c);
-          c.position$.next(l);
+          const d = ge(c.rect, r.renderUnit.scene, a.skeleton, o.worksheet, c);
+          c.position$.next(d);
         }
       });
     };
     this.disposeWithMe(
       this._univerInstanceService.getCurrentTypeOfUnit$(F.UNIVER_SHEET).pipe(
         we((e) => e ? e.activeSheet$ : Bn(null)),
-        be((e) => {
+        Re((e) => {
           if (!e) return null;
           const n = e.getUnitId(), r = this._renderManagerService.getRenderById(n);
           return r ? { render: r, unitId: n, subUnitId: e.getSheetId() } : null;
         }),
         we(
-          (e) => e ? jr(e.render.scene.getViewport(or.VIEW_MAIN).onScrollAfter$).pipe(be(() => ({ unitId: e.unitId, subUnitId: e.subUnitId }))) : Bn(null)
+          (e) => e ? qr(e.render.scene.getViewport(xn.VIEW_MAIN).onScrollAfter$).pipe(Re(() => ({ unitId: e.unitId, subUnitId: e.subUnitId }))) : Bn(null)
         )
       ).subscribe((e) => {
         if (!e) return;
@@ -1824,12 +1823,12 @@ let et = class extends ne {
         t(n, r);
       })
     ), this.disposeWithMe(this._commandService.onCommandExecuted((e) => {
-      if (e.id === An.id) {
+      if (e.id === _n.id) {
         const n = e.params, { unitId: r } = n;
         Array.from(this._domLayerInfoMap.values()).filter((o) => o.unitId === r).map((o) => o.subUnitId).forEach((o) => {
           t(r, o);
         });
-      } else if (e.id === qr.id) {
+      } else if (e.id === hi.id) {
         const { unitId: n, subUnitId: r } = e.params;
         t(n, r);
       }
@@ -1837,21 +1836,21 @@ let et = class extends ne {
   }
   _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(Xe);
+    const { startX: n, endX: r, startY: s, endY: o } = t, a = (g = this._renderManagerService.getRenderById(e)) == null ? void 0 : g.with(Fe);
     if (a == null)
       return;
-    const d = a.getCellWithCoordByOffset(n, s);
-    if (d == null)
+    const l = a.getCellWithCoordByOffset(n, s);
+    if (l == null)
       return;
     const u = {
-      column: d.actualColumn,
-      columnOffset: n - d.startX,
-      row: d.actualRow,
-      rowOffset: s - d.startY
+      column: l.actualColumn,
+      columnOffset: n - l.startX,
+      row: l.actualRow,
+      rowOffset: s - l.startY
     }, c = a.getCellWithCoordByOffset(r, o);
     if (c == null)
       return;
-    const l = {
+    const d = {
       column: c.actualColumn,
       columnOffset: r - c.startX,
       row: c.actualRow,
@@ -1859,7 +1858,7 @@ let et = class extends ne {
     };
     return {
       from: u,
-      to: l
+      to: d
     };
   }
   _featureUpdateListener() {
@@ -1872,7 +1871,14 @@ let et = class extends ne {
           const r = {
             ...n.transform
           };
-          this._transformChange$.next({ id: e.drawingId, value: r });
+          this._transformChange$.next({ id: e.drawingId, value: r }), this._canvasFloatDomService.updateFloatDom(e.drawingId, {
+            ...n
+          });
+          const s = this._getSceneAndTransformerByDrawingSearch(e.unitId);
+          if (s) {
+            const { scene: o } = s, a = this._domLayerInfoMap.get(e.drawingId);
+            a != null && a.rect && (n.allowTransform === !1 ? o.detachTransformerFrom(a.rect) : o.attachTransformerTo(a.rect));
+          }
         });
       })
     );
@@ -1886,13 +1892,6 @@ let et = class extends ne {
       })
     );
   }
-  updateFloatDomProps(t, e, n, r) {
-    const s = this._domLayerInfoMap.get(n), o = this._getSceneAndTransformerByDrawingSearch(t);
-    if (s && o) {
-      const { scene: a } = o, d = ve({ unitId: t, subUnitId: e, drawingId: n }), u = a.getObject(d);
-      u && u instanceof Pe && u.setProps(r);
-    }
-  }
   // CreateFloatDomCommand --> floatDomService.addFloatDomToPosition
   addFloatDomToPosition(t, e) {
     const n = se(this._univerInstanceService, {
@@ -1901,8 +1900,8 @@ let et = class extends ne {
     });
     if (!n)
       throw new Error("cannot find current target!");
-    const { unitId: r, subUnitId: s } = n, { initPosition: o, componentKey: a, data: d, allowTransform: u = !0 } = t, c = e != null ? e : Dt(), l = this._getPosition(o, r);
-    if (l == null)
+    const { unitId: r, subUnitId: s } = n, { initPosition: o, componentKey: a, data: l, allowTransform: u = !0 } = t, c = e != null ? e : Dt(), d = this._getPosition(o, r);
+    if (d == null)
       return;
     const g = {
       unitId: r,
@@ -1910,14 +1909,14 @@ let et = class extends ne {
       drawingId: c,
       drawingType: t.type || B.DRAWING_DOM,
       componentKey: a,
-      sheetTransform: l,
+      sheetTransform: d,
       transform: {
         left: o.startX,
         top: o.startY,
         width: o.endX - o.startX,
         height: o.endY - o.startY
       },
-      data: d,
+      data: l,
       allowTransform: u
     };
     return this._commandService.executeCommand(kt.id, {
@@ -1941,7 +1940,7 @@ let et = class extends ne {
       const a = this._drawingManagerService.getDrawingByParam({ unitId: r, subUnitId: s, drawingId: t });
       if (!a)
         return;
-      const d = this._sheetDrawingService.getBatchRemoveOp([a]), { redo: u, objects: c } = d;
+      const l = this._sheetDrawingService.getBatchRemoveOp([a]), { redo: u, objects: c } = l;
       this._commandService.syncExecuteCommand(P.id, { unitId: r, subUnitId: s, op: u, objects: c, type: U.REMOVE });
     }
   }
@@ -1954,21 +1953,21 @@ let et = class extends ne {
     });
     if (!s)
       throw new Error("cannot find current target!");
-    const { unitId: o, subUnitId: a } = s, d = this._getSceneAndTransformerByDrawingSearch(o);
-    if (!d) return;
+    const { unitId: o, subUnitId: a } = s, l = this._getSceneAndTransformerByDrawingSearch(o);
+    if (!l) return;
     const u = this._renderManagerService.getRenderById(o);
     if (!u) return;
     const c = (C = this._renderManagerService.getRenderById(o)) == null ? void 0 : C.with(V).getWorksheetSkeleton(a);
     if (!c) return;
-    const { componentKey: l, data: g, allowTransform: h = !0 } = e, f = r != null ? r : Dt(), { position: p, position$: m } = this._createRangePositionObserver(t, u, c.skeleton);
+    const { componentKey: d, data: g, allowTransform: h = !0 } = e, f = r != null ? r : Dt(), { position: p, position$: m } = this._createRangePositionObserver(t, u, c.skeleton);
     if (this._getPosition(p, o) == null)
       return;
-    const v = d.scene, { scaleX: I } = v.getAncestorScale(), R = It(p, n, I), S = {
+    const v = l.scene, { scaleX: I } = v.getAncestorScale(), R = It(p, n, I), S = {
       unitId: o,
       subUnitId: a,
       drawingId: f,
       drawingType: e.type || B.DRAWING_DOM,
-      componentKey: l,
+      componentKey: d,
       transform: {
         left: R.startX,
         top: R.startY,
@@ -1997,12 +1996,12 @@ let et = class extends ne {
       const k = this._getSceneAndTransformerByDrawingSearch(D);
       if (k == null)
         return;
-      const { scene: ae, canvas: Me } = k;
+      const { scene: ae, canvas: be } = k;
       if (L == null || x !== E)
         return;
-      const { left: st, top: ot, width: at, height: ct, angle: jt, flipX: $t, flipY: dt, skewX: lt, skewY: ye } = L, ut = ve({ unitId: D, subUnitId: E, drawingId: T }), de = ae.getObject(ut);
+      const { left: st, top: ot, width: at, height: ct, angle: jt, flipX: $t, flipY: dt, skewX: lt, skewY: Me } = L, ut = Pe({ unitId: D, subUnitId: E, drawingId: T }), de = ae.getObject(ut);
       if (de != null) {
-        de.transformByState({ left: st, top: ot, width: at, height: ct, angle: jt, flipX: $t, flipY: dt, skewX: lt, skewY: ye });
+        de.transformByState({ left: st, top: ot, width: at, height: ct, angle: jt, flipX: $t, flipY: dt, skewX: lt, skewY: Me });
         return;
       }
       const Q = {
@@ -2012,16 +2011,16 @@ let et = class extends ne {
         width: at,
         height: ct,
         zIndex: this._drawingManagerService.getDrawingOrder(D, E).length - 1
-      }, Ee = X === B.DRAWING_CHART;
-      if (Ee) {
+      }, ye = X === B.DRAWING_CHART;
+      if (ye) {
         const W = K ? K.backgroundColor : "white";
         Q.fill = W, Q.rotateEnabled = !1, K && K.border && (Q.stroke = K.border), Q.paintFirst = "stroke", Q.strokeWidth = 1, Q.borderEnabled = !1, Q.radius = 8;
       }
-      const le = new Pe(ut, Q);
-      Ee && le.setObjectType(Rn.CHART), ae.addObject(le, xt), b.allowTransform !== !1 && ae.attachTransformerTo(le);
-      const ue = new pt(), ht = ae.getMainViewport(), { rowHeaderWidth: Te, columnHeaderHeight: Ge } = H.skeleton, gt = {
-        top: Ge,
-        left: Te,
+      const le = new Ve(ut, Q);
+      ye && le.setObjectType(mn.CHART), ae.addObject(le, Ft), b.allowTransform !== !1 && ae.attachTransformerTo(le);
+      const ue = new wt(), ht = ae.getMainViewport(), { rowHeaderWidth: Ee, columnHeaderHeight: Xe } = H.skeleton, gt = {
+        top: Xe,
+        left: Ee,
         bottom: ht.bottom,
         right: ht.right
       }, he = {
@@ -2031,10 +2030,10 @@ let et = class extends ne {
         domAnchor: n,
         unitId: D,
         subUnitId: E
-      }, j = ge(le, k.renderUnit.scene, H.skeleton, M.worksheet, he), Oe = new We(j);
-      he.position$ = Oe;
-      let Le = {
-        position$: Oe,
+      }, j = ge(le, k.renderUnit.scene, H.skeleton, M.worksheet, he), Te = new ke(j);
+      he.position$ = Te;
+      let Ge = {
+        position$: Te,
         id: T,
         componentKey: b.componentKey,
         onPointerDown: () => {
@@ -2044,23 +2043,23 @@ let et = class extends ne {
         onPointerUp: () => {
         },
         onWheel: (W) => {
-          Me.dispatchEvent(new WheelEvent(W.type, W));
+          be.dispatchEvent(new WheelEvent(W.type, W));
         },
         data: K,
         unitId: D
       };
-      e.eventPassThrough && (Le = {
-        ...Le,
+      e.eventPassThrough && (Ge = {
+        ...Ge,
         onPointerDown: (W) => {
-          Me.dispatchEvent(new PointerEvent(W.type, W));
+          be.dispatchEvent(new PointerEvent(W.type, W));
         },
         onPointerMove: (W) => {
-          Me.dispatchEvent(new PointerEvent(W.type, W));
+          be.dispatchEvent(new PointerEvent(W.type, W));
         },
         onPointerUp: (W) => {
-          Me.dispatchEvent(new PointerEvent(W.type, W));
+          be.dispatchEvent(new PointerEvent(W.type, W));
         }
-      }), this._canvasFloatDomService.addFloatDom(Le), this.disposeWithMe(m.subscribe((W) => {
+      }), this._canvasFloatDomService.addFloatDom(Ge), this.disposeWithMe(m.subscribe((W) => {
         var un, hn, gn, fn;
         const ln = It({
           startX: W.startX,
@@ -2073,22 +2072,22 @@ let et = class extends ne {
             left: p.absolute.left,
             top: p.absolute.top
           }
-        }, n), Rr = ve({ unitId: D, subUnitId: E, drawingId: T }), br = new Pe(Rr, {
+        }, n), Rr = Pe({ unitId: D, subUnitId: E, drawingId: T }), br = new Ve(Rr, {
           left: ln.startX,
           top: ln.startY,
           width: (gn = n.width) != null ? gn : W.width,
           height: (fn = n.height) != null ? fn : W.height,
           zIndex: this._drawingManagerService.getDrawingOrder(D, E).length - 1
         }), Mr = ge(br, k.renderUnit.scene, H.skeleton, M.worksheet, he);
-        Oe.next(Mr);
+        Te.next(Mr);
       }));
-      const Ve = (y = this._renderManagerService.getRenderById(D)) == null ? void 0 : y.with(V);
-      Ve == null || Ve.currentSkeleton$.subscribe((W) => {
+      const Le = (y = this._renderManagerService.getRenderById(D)) == null ? void 0 : y.with(V);
+      Le == null || Le.currentSkeleton$.subscribe((W) => {
         W && H.sheetId !== W.sheetId && this._removeDom(f, !0);
       });
       const ft = le.onTransformChange$.subscribeEvent(() => {
         const W = ge(le, k.renderUnit.scene, H.skeleton, M.worksheet, he);
-        Oe.next(
+        Te.next(
           W
         );
       });
@@ -2118,7 +2117,7 @@ let et = class extends ne {
     if (!u) return;
     const c = (R = this._renderManagerService.getRenderById(o)) == null ? void 0 : R.with(V).getWorksheetSkeleton(a);
     if (!c) return;
-    const { componentKey: l, data: g, allowTransform: h = !0 } = e, f = r != null ? r : Dt(), { position: p, position$: m } = this._createRangePositionObserver({
+    const { componentKey: d, data: g, allowTransform: h = !0 } = e, f = r != null ? r : Dt(), { position: p, position$: m } = this._createRangePositionObserver({
       startRow: 0,
       endRow: 0,
       startColumn: t,
@@ -2131,7 +2130,7 @@ let et = class extends ne {
       subUnitId: a,
       drawingId: f,
       drawingType: e.type || B.DRAWING_DOM,
-      componentKey: l,
+      componentKey: d,
       transform: {
         left: _.startX,
         top: _.startY,
@@ -2160,12 +2159,12 @@ let et = class extends ne {
       const { scene: X, canvas: K } = L;
       if (q == null || b !== y)
         return;
-      const { left: k, top: ae, width: Me, height: st, angle: ot, flipX: at, flipY: ct, skewX: jt, skewY: $t } = q, dt = ve({ unitId: w, subUnitId: y, drawingId: D }), lt = X.getObject(dt);
+      const { left: k, top: ae, width: be, height: st, angle: ot, flipX: at, flipY: ct, skewX: jt, skewY: $t } = q, dt = Pe({ unitId: w, subUnitId: y, drawingId: D }), lt = X.getObject(dt);
       if (lt != null) {
-        lt.transformByState({ left: k, top: ae, width: Me, height: st, angle: ot, flipX: at, flipY: ct, skewX: jt, skewY: $t });
+        lt.transformByState({ left: k, top: ae, width: be, height: st, angle: ot, flipX: at, flipY: ct, skewX: jt, skewY: $t });
         return;
       }
-      const ye = It({
+      const Me = It({
         startX: _.startX,
         startY: 0,
         endX: p.endX,
@@ -2177,19 +2176,19 @@ let et = class extends ne {
           top: p.absolute.top
         }
       }, n), ut = {
-        left: ye.startX,
-        top: ye.startY,
-        width: ye.width,
-        height: ye.height,
+        left: Me.startX,
+        top: Me.startY,
+        width: Me.width,
+        height: Me.height,
         zIndex: this._drawingManagerService.getDrawingOrder(w, y).length - 1
-      }, de = new Pe(dt, ut);
-      X.addObject(de, xt), T.allowTransform !== !1 && X.attachTransformerTo(de);
-      const Q = new pt(), Ee = X.getMainViewport(), le = {
+      }, de = new Ve(dt, ut);
+      X.addObject(de, Ft), T.allowTransform !== !1 && X.attachTransformerTo(de);
+      const Q = new wt(), ye = X.getMainViewport(), le = {
         top: 0,
         //viewMain.top,
-        left: Ee.left,
-        bottom: Ee.bottom,
-        right: Ee.right
+        left: ye.left,
+        bottom: ye.bottom,
+        right: ye.right
       }, ue = {
         dispose: Q,
         rect: de,
@@ -2200,10 +2199,10 @@ let et = class extends ne {
         domAnchor: n,
         scrollDirectionResponse: "HORIZONTAL"
         /* HORIZONTAL */
-      }, ht = ge(de, L.renderUnit.scene, x.skeleton, E.worksheet, ue), Te = new We(ht);
-      ue.position$ = Te;
-      let Ge = {
-        position$: Te,
+      }, ht = ge(de, L.renderUnit.scene, x.skeleton, E.worksheet, ue), Ee = new ke(ht);
+      ue.position$ = Ee;
+      let Xe = {
+        position$: Ee,
         id: D,
         componentKey: T.componentKey,
         onPointerDown: () => {
@@ -2218,8 +2217,8 @@ let et = class extends ne {
         data: H,
         unitId: w
       };
-      e.eventPassThrough && (Ge = {
-        ...Ge,
+      e.eventPassThrough && (Xe = {
+        ...Xe,
         onPointerDown: (j) => {
           K.dispatchEvent(new PointerEvent(j.type, j));
         },
@@ -2229,15 +2228,15 @@ let et = class extends ne {
         onPointerUp: (j) => {
           K.dispatchEvent(new PointerEvent(j.type, j));
         }
-      }), this._canvasFloatDomService.addFloatDom(Ge);
+      }), this._canvasFloatDomService.addFloatDom(Xe);
       const gt = de.onTransformChange$.subscribeEvent(() => {
         const j = ge(de, L.renderUnit.scene, x.skeleton, E.worksheet, ue);
-        Te.next(
+        Ee.next(
           j
         );
       });
       this.disposeWithMe(m.subscribe((j) => {
-        const Oe = It({
+        const Te = It({
           startX: j.startX,
           startY: 0,
           endX: j.endX,
@@ -2248,14 +2247,14 @@ let et = class extends ne {
             left: p.absolute.left,
             top: p.absolute.top
           }
-        }, n), Le = ve({ unitId: w, subUnitId: y, drawingId: D }), Ve = new Pe(Le, {
-          left: Oe.startX,
+        }, n), Ge = Pe({ unitId: w, subUnitId: y, drawingId: D }), Le = new Ve(Ge, {
+          left: Te.startX,
           top: 0,
           width: n.width,
           height: n.height,
           zIndex: this._drawingManagerService.getDrawingOrder(w, y).length - 1
-        }), ft = ge(Ve, L.renderUnit.scene, x.skeleton, E.worksheet, ue);
-        Te.next(ft);
+        }), ft = ge(Le, L.renderUnit.scene, x.skeleton, E.worksheet, ue);
+        Ee.next(ft);
       }));
       const he = (C = this._renderManagerService.getRenderById(w)) == null ? void 0 : C.with(V);
       he == null || he.currentSkeleton$.subscribe((j) => {
@@ -2284,33 +2283,33 @@ let et = class extends ne {
   // eslint-disable-next-line max-lines-per-function
   _createRangePositionObserver(t, e, n) {
     let { startRow: r, startColumn: s } = t;
-    const o = Je(r, s, n), a = new We(o), d = Je(t.endRow, t.endColumn, n), u = new We(d), c = () => {
+    const o = Je(r, s, n), a = new ke(o), l = Je(t.endRow, t.endColumn, n), u = new ke(l), c = () => {
       const m = Je(r, s, n), _ = Je(t.endRow, t.endColumn, n);
       a.next(m), u.next(_);
-    }, l = new pt();
-    l.add(e.engine.clientRect$.subscribe(() => c())), l.add(this._commandService.onCommandExecuted((m) => {
-      if (m.id === Qr.id && m.params.rowsAutoHeightInfo.findIndex((v) => v.row === r) > -1) {
+    }, d = new wt();
+    d.add(e.engine.clientRect$.subscribe(() => c())), d.add(this._commandService.onCommandExecuted((m) => {
+      if (m.id === gi.id && m.params.rowsAutoHeightInfo.findIndex((v) => v.row === r) > -1) {
         c();
         return;
       }
-      (ei.indexOf(m.id) > -1 || m.id === Ti.id || m.id === An.id) && c();
+      (fi.indexOf(m.id) > -1 || m.id === Fr.id || m.id === _n.id) && c();
     }));
     const g = (m, _) => {
       r = m, s = _, c();
     }, h = () => ({
       rotate: 0,
-      width: d.right - o.left,
-      height: d.bottom - o.top,
+      width: l.right - o.left,
+      height: l.bottom - o.top,
       absolute: {
         left: !0,
         top: !0
       },
       startX: o.left,
       startY: o.top,
-      endX: d.right,
-      endY: d.bottom
+      endX: l.right,
+      endY: l.bottom
     }), f = a.pipe(
-      be((m) => {
+      Re((m) => {
         const _ = Je(t.endRow, t.endColumn, n);
         return {
           rotate: 0,
@@ -2333,18 +2332,18 @@ let et = class extends ne {
       updateRowCol: g,
       topLeftPos$: a,
       rightBottomPos$: u,
-      disposable: l
+      disposable: d
     };
   }
 };
 et = ys([
-  Ce(0, A(Z)),
-  Ce(1, Se),
-  Ce(2, A(G)),
-  Ce(3, ie),
-  Ce(4, A(Wi)),
-  Ce(5, re),
-  Ce(6, A(Wr))
+  Ie(0, A(J)),
+  Ie(1, Se),
+  Ie(2, A(G)),
+  Ie(3, ie),
+  Ie(4, A(Wi)),
+  Ie(5, re),
+  Ie(6, A(Jr))
 ], et);
 function Je(i, t, e) {
   const n = e.getCellWithCoordByIndex(i, t), r = n.isMergedMainCell ? n.mergeInfo : n;
@@ -2359,23 +2358,23 @@ function It(i, t, e) {
   var u, c;
   e = e != null ? e : 1;
   const n = i.endX - i.startX, r = i.endY - i.startY, s = (u = t == null ? void 0 : t.width) != null ? u : n, o = (c = t == null ? void 0 : t.height) != null ? c : r;
-  let a = 0, d = 0;
+  let a = 0, l = 0;
   if (t) {
     if (t.horizonOffsetAlign === "right") {
-      const l = Ct(t.marginX, n * e);
-      a = i.endX - l - s;
+      const d = Ct(t.marginX, n * e);
+      a = i.endX - d - s;
     } else
       a = i.startX + Ct(t.marginX, n);
     if (t.verticalOffsetAlign === "bottom") {
-      const l = Ct(t.marginY, r * e);
-      d = i.endY - l - o;
+      const d = Ct(t.marginY, r * e);
+      l = i.endY - d - o;
     } else
-      d = i.startY + Ct(t.marginY, r);
+      l = i.startY + Ct(t.marginY, r);
   }
   return {
     rotate: 0,
     startX: a,
-    startY: d,
+    startY: l,
     endX: i.endX,
     endY: i.endY,
     width: s,
@@ -2394,12 +2393,12 @@ function Ct(i, t) {
 }
 const Es = (i) => {
   const { floatDomInfos: t, scene: e, skeleton: n, worksheet: r } = i, s = Qi(() => t.map((o) => {
-    const { width: a, height: d, angle: u, left: c, top: l } = o.transform, g = Ir(
+    const { width: a, height: l, angle: u, left: c, top: d } = o.transform, g = Ir(
       {
         left: c != null ? c : 0,
         right: (c != null ? c : 0) + (a != null ? a : 0),
-        top: l != null ? l : 0,
-        bottom: (l != null ? l : 0) + (d != null ? d : 0)
+        top: d != null ? d : 0,
+        bottom: (d != null ? d : 0) + (l != null ? l : 0)
       },
       e,
       n,
@@ -2413,10 +2412,10 @@ const Es = (i) => {
       endY: g.bottom,
       rotate: u,
       width: a * h,
-      height: d * f,
+      height: l * f,
       absolute: g.absolute
     }, m = {
-      position$: new We(p),
+      position$: new ke(p),
       position: p,
       id: o.drawingId,
       componentKey: o.componentKey,
@@ -2439,7 +2438,7 @@ var Ts = Object.getOwnPropertyDescriptor, Os = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? Ts(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (r = o(r) || r);
   return r;
-}, De = (i, t) => (e, n) => t(e, n, i);
+}, Ce = (i, t) => (e, n) => t(e, n, i);
 let Ot = class extends ne {
   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();
@@ -2451,8 +2450,8 @@ let Ot = class extends ne {
         {
           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((d) => {
-              const u = a.data[d];
+            return a && a.order.forEach((l) => {
+              const u = a.data[l];
               u.drawingType !== B.DRAWING_CHART && u.drawingType !== B.DRAWING_DOM && this._drawingRenderService.renderDrawing(u, r);
             }), e();
           }
@@ -2469,16 +2468,16 @@ let Ot = class extends ne {
             const o = s.with(V).getSkeletonParam(r);
             if (!o)
               return e(i);
-            const a = this._drawingManagerService.getDrawingDataForUnit(n), d = a == null ? void 0 : a[t.subUnitId];
-            if (!d)
+            const a = this._drawingManagerService.getDrawingDataForUnit(n), l = a == null ? void 0 : a[t.subUnitId];
+            if (!l)
               return e(i);
-            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]);
+            const { scaleX: u, scaleY: c } = s.scene, d = i ? { ...i } : { startColumn: 0, endColumn: 0, endRow: 0, startRow: 0 }, g = l.order.map((h) => l.data[h]);
             return g.length ? (g.forEach((h) => {
-              if (!h.groupId && h.transform && Re.isDefine(h.transform.left) && Re.isDefine(h.transform.top) && Re.isDefine(h.transform.width) && Re.isDefine(h.transform.height)) {
+              if (!h.groupId && h.transform && De.isDefine(h.transform.left) && De.isDefine(h.transform.top) && De.isDefine(h.transform.width) && De.isDefine(h.transform.height)) {
                 const f = o.skeleton.getCellIndexByOffset(h.transform.left, h.transform.top, u, c, { x: 0, y: 0 }), p = o.skeleton.getCellIndexByOffset(h.transform.left + h.transform.width, h.transform.top + h.transform.height, u, c, { x: 0, y: 0 });
-                f.column < l.startColumn && (l.startColumn = f.column), f.row < l.startRow && (l.startRow = f.row), l.endRow < p.row && (l.endRow = p.row), l.endColumn < p.column && (l.endColumn = p.column);
+                f.column < d.startColumn && (d.startColumn = f.column), f.row < d.startRow && (d.startRow = f.row), d.endRow < p.row && (d.endRow = p.row), d.endColumn < p.column && (d.endColumn = p.column);
               }
-            }), e(l)) : e(i);
+            }), e(d)) : e(i);
           }
         }
       )
@@ -2497,22 +2496,22 @@ let Ot = class extends ne {
                 if (c.drawingType === B.DRAWING_CHART)
                   return {
                     ...c,
-                    componentKey: this._componetManager.get($r)
+                    componentKey: this._componetManager.get(Qr)
                   };
                 if (c.drawingType === B.DRAWING_DOM) {
-                  const l = this._sheetPrintInterceptorService.getPrintComponent(c.componentKey);
+                  const d = this._sheetPrintInterceptorService.getPrintComponent(c.componentKey);
                   return {
                     ...c,
-                    componentKey: this._componetManager.get(l || c.componentKey)
+                    componentKey: this._componetManager.get(d || c.componentKey)
                   };
                 }
                 return null;
-              }).filter(Boolean), d = ji(Es, this._injector);
-              return hi(
-                /* @__PURE__ */ oe(d, { floatDomInfos: a, scene: t.scene, skeleton: t.skeleton, worksheet: t.worksheet }),
+              }).filter(Boolean), l = ji(Es, this._injector);
+              return Di(
+                /* @__PURE__ */ oe(l, { floatDomInfos: a, scene: t.scene, skeleton: t.skeleton, worksheet: t.worksheet }),
                 t.root
               ), i == null || i.add(() => {
-                gi(t.root);
+                Ri(t.root);
               }), e(i);
             }
           }
@@ -2522,13 +2521,13 @@ let Ot = class extends ne {
   }
 };
 Ot = Os([
-  De(0, A(Oi)),
-  De(1, A(lr)),
-  De(2, ie),
-  De(3, Z),
-  De(4, A(et)),
-  De(5, A(dr)),
-  De(6, A(Ye))
+  Ce(0, A(xr)),
+  Ce(1, A(lr)),
+  Ce(2, ie),
+  Ce(3, J),
+  Ce(4, A(et)),
+  Ce(5, A(dr)),
+  Ce(6, A(Ye))
 ], Ot);
 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--)
@@ -2536,36 +2535,36 @@ var Us = Object.getOwnPropertyDescriptor, Ps = (i, t, e, n) => {
   return r;
 }, me = (i, t) => (e, n) => t(e, n, i);
 const As = [
-  Xn.id,
-  Gn.id,
   Ln.id,
   Vn.id,
   Hn.id,
   zn.id,
   Kn.id,
   Jn.id,
-  Jt.id,
-  Zt.id,
   Zn.id,
   qn.id,
+  Jt.id,
+  Zt.id,
   Qn.id,
   er.id,
   tr.id,
   nr.id,
   rr.id,
   ir.id,
-  sr.id
+  sr.id,
+  or.id,
+  ar.id
 ], Ns = [
-  ti.id,
-  ni.id,
-  ri.id,
-  ii.id,
-  si.id,
-  oi.id
+  mi.id,
+  pi.id,
+  wi.id,
+  _i.id,
+  Si.id,
+  vi.id
 ];
 let rn = class extends ne {
-  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();
+  constructor(i, t, e, n, r, s, o, a, l) {
+    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 = l, this._sheetInterceptorListener(), this._commandListener(), this._sheetRefreshListener();
   }
   _sheetInterceptorListener() {
     this.disposeWithMe(
@@ -2576,51 +2575,51 @@ let rn = class extends ne {
           if (i.params == null)
             return { redos: [], undos: [] };
           const t = i.id;
-          if (t === Xn.id)
+          if (t === Ln.id)
             return this._moveRowInterceptor(i.params, "insert");
-          if ([rr.id, ir.id, sr.id].includes(t))
+          if ([sr.id, or.id, ar.id].includes(t))
             return this._moveRangeInterceptor(i.params);
-          if (t === Gn.id)
+          if (t === Vn.id)
             return this._moveColInterceptor(i.params, "insert");
-          if (t === Ln.id)
+          if (t === Hn.id)
             return this._moveRowInterceptor(i.params, "remove");
-          if (t === Vn.id)
+          if (t === zn.id)
             return this._moveColInterceptor(i.params, "remove");
-          if (t === Hn.id) {
+          if (t === Kn.id) {
             const { range: e } = i.params;
             return this._getRangeMoveUndo(
               e,
               0
               /* deleteLeft */
             );
-          } else if (t === zn.id) {
+          } else if (t === Jn.id) {
             const { range: e } = i.params;
             return this._getRangeMoveUndo(
               e,
               1
               /* deleteUp */
             );
-          } else if (t === Kn.id) {
+          } else if (t === Zn.id) {
             const { range: e } = i.params;
             return this._getRangeMoveUndo(
               e,
               2
               /* insertDown */
             );
-          } else if (t === Jn.id) {
+          } else if (t === qn.id) {
             const { range: e } = i.params;
             return this._getRangeMoveUndo(
               e,
               3
               /* insertRight */
             );
-          } else if (t === Qn.id || t === er.id) {
+          } else if (t === tr.id || t === nr.id) {
             const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e;
             return this._getDrawingUndoForRowVisible(n, r, s);
-          } else if (t === tr.id || t === nr.id) {
+          } else if (t === rr.id || t === ir.id) {
             const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e;
             return this._getDrawingUndoForColVisible(n, r, s);
-          } else if (t === Jt.id || t === Zt.id || t === Zn.id || t === qn.id) {
+          } else if (t === Jt.id || t === Zt.id || t === Qn.id || t === er.id) {
             const e = i.params, { unitId: n, subUnitId: r, ranges: s } = e, o = t === Jt.id || t === Zt.id;
             return this._getDrawingUndoForRowAndColSize(n, r, s, o);
           }
@@ -2633,19 +2632,19 @@ let rn = class extends ne {
     const e = se(this._univerInstanceService);
     if (e == null)
       return { redos: [], undos: [] };
-    const n = e.unitId, r = e.subUnitId, s = [], o = [], a = this._sheetDrawingService.getDrawingData(n, r), d = [], u = [];
+    const n = e.unitId, r = e.subUnitId, s = [], o = [], a = this._sheetDrawingService.getDrawingData(n, r), l = [], 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)
+      const d = a[c], { updateDrawings: g, deleteDrawings: h } = this._getUpdateOrDeleteDrawings(i, t, d);
+      l.push(...g), u.push(...h);
+    }), l.length === 0 && u.length === 0)
       return { redos: [], undos: [] };
-    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 (l.length > 0) {
+      const c = this._sheetDrawingService.getBatchUpdateOp(l), { undo: d, 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: d, objects: h, type: U.UPDATE } });
     }
     if (u.length > 0) {
-      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 } });
+      const c = this._sheetDrawingService.getBatchRemoveOp(u), d = 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: d, objects: h, type: U.INSERT } });
     }
     return s.push({ id: Y.id, params: [n] }), o.push({ id: Y.id, params: [n] }), {
       redos: s,
@@ -2653,7 +2652,7 @@ let rn = class extends ne {
     };
   }
   _getUpdateOrDeleteDrawings(i, t, e) {
-    const n = [], r = [], { sheetTransform: s, anchorType: o = O.Position, transform: a, unitId: d, subUnitId: u, drawingId: c } = e, { from: l, to: g } = s, { row: h, column: f } = l, { row: p, column: m } = g;
+    const n = [], r = [], { sheetTransform: s, anchorType: o = O.Position, transform: a, unitId: l, subUnitId: u, drawingId: c } = e, { from: d, to: g } = s, { row: h, column: f } = d, { row: p, column: m } = g;
     if (s == null || a == null)
       return {
         updateDrawings: n,
@@ -2663,14 +2662,14 @@ let rn = class extends ne {
     let S = null, C = null;
     if (t === 0 && h >= _ && p <= v)
       if (f >= I && m <= R)
-        r.push({ unitId: d, subUnitId: u, drawingId: c });
+        r.push({ unitId: l, subUnitId: u, drawingId: c });
       else {
         const w = this._shrinkCol(s, a, I, R, o);
         S = w == null ? void 0 : w.newSheetTransform, C = w == null ? void 0 : w.newTransform;
       }
     else if (t === 1 && f >= I && m <= R)
       if (h >= _ && p <= v)
-        r.push({ unitId: d, subUnitId: u, drawingId: c });
+        r.push({ unitId: l, subUnitId: u, drawingId: c });
       else {
         const w = this._shrinkRow(s, a, _, v, o);
         S = w == null ? void 0 : w.newSheetTransform, C = w == null ? void 0 : w.newTransform;
@@ -2699,9 +2698,9 @@ let rn = class extends ne {
   _getDrawingUndoForColVisible(i, t, e) {
     const n = this._drawingManagerService.getDrawingData(i, t), r = [], s = [];
     if (Object.keys(n).forEach((c) => {
-      const l = n[c], { sheetTransform: g, transform: h, anchorType: f = O.Position } = l;
+      const d = n[c], { sheetTransform: g, transform: h, anchorType: f = O.Position } = d;
       if (f === O.None)
-        this._remainDrawingSize(h, r, l);
+        this._remainDrawingSize(h, r, d);
       else {
         const { from: p, to: m } = g, { row: _, column: v } = p, { row: I, column: R } = m;
         for (let S = 0; S < e.length; S++) {
@@ -2717,10 +2716,10 @@ let rn = class extends ne {
               N = { ...h, left: x.startX };
             }
             if (N != null && (b = $(N, this._selectionRenderService), b != null && N != null)) {
-              r.push({ ...l, sheetTransform: b, transform: N });
+              r.push({ ...d, sheetTransform: b, transform: N });
               break;
             }
-            this._remainDrawingSize(h, r, l);
+            this._remainDrawingSize(h, r, d);
             continue;
           }
           if (v >= D && R <= E)
@@ -2751,28 +2750,28 @@ let rn = class extends ne {
               ...h,
               width: ((h == null ? void 0 : h.width) || 0) - b.endX + b.startX
             }, T = $(M, this._selectionRenderService), T != null && M != null) {
-              s.push({ ...l, sheetTransform: T, transform: M });
+              s.push({ ...d, sheetTransform: T, transform: M });
               break;
             }
           }
           if (M != null && (T = $(M, this._selectionRenderService)), M != null && T != null) {
-            r.push({ ...l, sheetTransform: T, transform: M });
+            r.push({ ...d, sheetTransform: T, transform: M });
             break;
           } else
-            this._remainDrawingSize(h, r, l);
+            this._remainDrawingSize(h, r, d);
         }
       }
     }), r.length === 0 && s.length === 0)
       return { redos: [], undos: [] };
-    const { redos: o, undos: a } = this._createUndoAndRedoMutation(i, t, r), d = [], u = [];
+    const { redos: o, undos: a } = this._createUndoAndRedoMutation(i, t, r), l = [], u = [];
     if (s.length > 0) {
-      const { redos: c, undos: l } = this._createUndoAndRedoMutation(i, t, s);
-      d.push(...c), u.push(...l);
+      const { redos: c, undos: d } = this._createUndoAndRedoMutation(i, t, s);
+      l.push(...c), u.push(...d);
     }
     return {
       redos: o,
       undos: a,
-      preRedos: d,
+      preRedos: l,
       preUndos: u
     };
   }
@@ -2780,22 +2779,22 @@ let rn = class extends ne {
     const n = this._sheetDrawingService.getBatchUpdateOp(e), { undo: r, redo: s, objects: o } = n, a = [
       { id: P.id, params: { unitId: i, subUnitId: t, op: s, objects: o, type: U.UPDATE } },
       { id: Y.id, params: [i] }
-    ], d = [
+    ], l = [
       { id: P.id, params: { unitId: i, subUnitId: t, op: r, objects: o, type: U.UPDATE } },
       { id: Y.id, params: [i] }
     ];
     return {
       redos: a,
-      undos: d
+      undos: l
     };
   }
   // 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((c) => {
-      const l = n[c], { sheetTransform: g, transform: h, anchorType: f = O.Position } = l;
+      const d = n[c], { sheetTransform: g, transform: h, anchorType: f = O.Position } = d;
       if (f === O.None)
-        this._remainDrawingSize(h, r, l);
+        this._remainDrawingSize(h, r, d);
       else {
         const { from: p, to: m } = g, { row: _, column: v } = p, { row: I, column: R } = m;
         for (let S = 0; S < e.length; S++) {
@@ -2811,10 +2810,10 @@ let rn = class extends ne {
               N = { ...h, top: x.startY };
             }
             if (N != null && (b = $(N, this._selectionRenderService), b != null && N != null)) {
-              r.push({ ...l, sheetTransform: b, transform: N });
+              r.push({ ...d, sheetTransform: b, transform: N });
               break;
             }
-            this._remainDrawingSize(h, r, l);
+            this._remainDrawingSize(h, r, d);
             continue;
           }
           if (_ >= w && I <= y)
@@ -2845,39 +2844,39 @@ let rn = class extends ne {
               ...h,
               height: ((h == null ? void 0 : h.height) || 0) - b.endY + b.startY
             }, T = $(M, this._selectionRenderService), T != null && M != null) {
-              s.push({ ...l, sheetTransform: T, transform: M });
+              s.push({ ...d, sheetTransform: T, transform: M });
               break;
             }
           }
           if (M != null && (T = $(M, this._selectionRenderService)), M != null && T != null) {
-            r.push({ ...l, sheetTransform: T, transform: M });
+            r.push({ ...d, sheetTransform: T, transform: M });
             break;
           } else
-            this._remainDrawingSize(h, r, l);
+            this._remainDrawingSize(h, r, d);
         }
       }
     }), r.length === 0 && s.length === 0)
       return { redos: [], undos: [] };
-    const { redos: o, undos: a } = this._createUndoAndRedoMutation(i, t, r), d = [], u = [];
+    const { redos: o, undos: a } = this._createUndoAndRedoMutation(i, t, r), l = [], u = [];
     if (s.length > 0) {
-      const { redos: c, undos: l } = this._createUndoAndRedoMutation(i, t, s);
-      d.push(...c), u.push(...l);
+      const { redos: c, undos: d } = this._createUndoAndRedoMutation(i, t, s);
+      l.push(...c), u.push(...d);
     }
     return {
       redos: o,
       undos: a,
-      preRedos: d,
+      preRedos: l,
       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: d, transform: u, anchorType: c = O.Position } = a;
+      const a = r[o], { sheetTransform: l, transform: u, anchorType: c = O.Position } = a;
       if (c === O.None)
         this._remainDrawingSize(u, s, a);
       else {
-        const { from: l, to: g } = d, { row: h, column: f } = l, { row: p, column: m } = g;
+        const { from: d, to: g } = l, { row: h, column: f } = d, { row: p, column: m } = g;
         for (let _ = 0; _ < e.length; _++) {
           const v = e[_], { startRow: I, endRow: R, startColumn: S, endColumn: C } = v;
           if (p < I || m < S)
@@ -2886,7 +2885,7 @@ let rn = class extends ne {
             this._remainDrawingSize(u, s, a);
             continue;
           }
-          const w = z({ ...d }, this._selectionRenderService, this._skeletonManagerService);
+          const w = z({ ...l }, this._selectionRenderService, this._skeletonManagerService);
           if (w != null) {
             s.push({
               ...a,
@@ -2918,10 +2917,10 @@ let rn = class extends ne {
     const { unitId: r, subUnitId: s } = n, o = (R = (I = this._renderManagerService.getRenderById(r)) == null ? void 0 : I.with(V)) == null ? void 0 : R.getCurrentSkeleton();
     if (!o)
       return { redos: [], undos: [] };
-    const a = ar(o, e);
+    const a = Yn(o, e);
     if (!a)
       return { redos: [], undos: [] };
-    const { startX: d, endX: u, startY: c, endY: l } = a, g = this._sheetDrawingService.getDrawingData(r, s), h = [];
+    const { startX: l, endX: u, startY: c, endY: d } = a, g = this._sheetDrawingService.getDrawingData(r, s), h = [];
     Object.keys(g).forEach((S) => {
       const C = g[S];
       if (C.anchorType !== O.Both)
@@ -2935,7 +2934,7 @@ let rn = class extends ne {
         drawingStartY: D,
         drawingEndY: D + T
       };
-      d <= M && b <= u && c <= N && x <= l && h.push(C);
+      l <= M && b <= u && c <= N && x <= d && h.push(C);
     });
     const f = [], p = [], m = t.startRow - e.startRow, _ = t.startColumn - e.startColumn, v = h.map((S) => {
       const C = S.sheetTransform, w = {
@@ -2960,7 +2959,7 @@ let rn = class extends ne {
     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, d = [], u = [], c = this._sheetDrawingService.getDrawingData(n, r), l = [], g = [];
+    const { unitId: n, subUnitId: r } = e, { range: s } = i, o = s.startRow, a = s.endRow, l = [], u = [], c = this._sheetDrawingService.getDrawingData(n, r), d = [], g = [];
     if (Object.keys(c).forEach((h) => {
       const f = c[h], { sheetTransform: p, transform: m, anchorType: _ = O.Position } = f;
       if (p == null || m == null)
@@ -2981,19 +2980,19 @@ let rn = class extends ne {
       if (!v || !I)
         return;
       const R = { unitId: n, subUnitId: r, drawingId: h, transform: I, sheetTransform: v };
-      l.push(R);
-    }), l.length === 0 && g.length === 0)
+      d.push(R);
+    }), d.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;
-      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: U.UPDATE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: m, type: U.UPDATE } });
+    if (d.length > 0) {
+      const h = this._sheetDrawingService.getBatchUpdateOp(d), { undo: f, redo: p, objects: m } = h;
+      l.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: U.UPDATE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: m, type: U.UPDATE } });
     }
     if (g.length > 0) {
       const h = this._sheetDrawingService.getBatchRemoveOp(g), f = h.undo, p = h.redo, m = h.objects;
-      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: U.REMOVE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: m, type: U.INSERT } });
+      l.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: U.REMOVE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: m, type: U.INSERT } });
     }
-    return d.push({ id: Y.id, params: [n] }), u.push({ id: Y.id, params: [n] }), {
-      redos: d,
+    return l.push({ id: Y.id, params: [n] }), u.push({ id: Y.id, params: [n] }), {
+      redos: l,
       undos: u
     };
   }
@@ -3001,7 +3000,7 @@ let rn = class extends ne {
     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, d = [], u = [], c = this._sheetDrawingService.getDrawingData(n, r), l = [], g = [];
+    const { unitId: n, subUnitId: r } = e, { range: s } = i, o = s.startColumn, a = s.endColumn, l = [], u = [], c = this._sheetDrawingService.getDrawingData(n, r), d = [], g = [];
     if (Object.keys(c).forEach((h) => {
       const f = c[h], { sheetTransform: p, transform: m, anchorType: _ = O.Position } = f;
       if (p == null || m == null)
@@ -3022,85 +3021,85 @@ let rn = class extends ne {
       if (!v || !I)
         return;
       const R = { unitId: n, subUnitId: r, drawingId: h, transform: I, sheetTransform: v };
-      l.push(R);
-    }), l.length === 0 && g.length === 0)
+      d.push(R);
+    }), d.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;
-      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: U.UPDATE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: m, type: U.UPDATE } });
+    if (d.length > 0) {
+      const h = this._sheetDrawingService.getBatchUpdateOp(d), { undo: f, redo: p, objects: m } = h;
+      l.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: U.UPDATE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: m, type: U.UPDATE } });
     }
     if (g.length > 0) {
       const h = this._sheetDrawingService.getBatchRemoveOp(g), f = h.undo, p = h.redo, m = h.objects;
-      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: U.REMOVE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: m, type: U.INSERT } });
+      l.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: U.REMOVE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: m, type: U.INSERT } });
     }
-    return d.push({ id: Y.id, params: [n] }), u.push({ id: Y.id, params: [n] }), { redos: d, undos: u };
+    return l.push({ id: Y.id, params: [n] }), u.push({ id: Y.id, params: [n] }), { redos: l, undos: u };
   }
   _expandCol(i, t, e, n, r = O.Position) {
-    const s = n - e + 1, { from: o, to: a } = i, { column: d } = o, { column: u } = a;
+    const s = n - e + 1, { from: o, to: a } = i, { column: l } = o, { column: u } = a;
     if (r === O.None)
       return {
         newSheetTransform: $({ ...t }, this._selectionRenderService),
         newTransform: t
       };
-    let c = null, l = null;
-    if (d >= e) {
+    let c = null, d = null;
+    if (l >= 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 }, c = $(l, this._selectionRenderService);
+      d = { ...t, left: (t.left || 0) + g.endX - g.startX }, c = $(d, this._selectionRenderService);
     } else if (u >= n)
       if (r === O.Both)
         c = {
           from: { ...o },
           to: { ...a, column: u + s }
-        }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
+        }, d = z(c, this._selectionRenderService, this._skeletonManagerService);
       else
         return {
           newSheetTransform: $({ ...t }, this._selectionRenderService),
           newTransform: t
         };
-    return c != null && l != null ? {
+    return c != null && d != null ? {
       newSheetTransform: c,
-      newTransform: l
+      newTransform: d
     } : null;
   }
   _shrinkCol(i, t, e, n, r = O.Position) {
-    const s = n - e + 1, { from: o, to: a } = i, { column: d } = o, { column: u } = a;
+    const s = n - e + 1, { from: o, to: a } = i, { column: l } = o, { column: u } = a;
     if (r === O.None)
       return {
         newSheetTransform: $({ ...t }, this._selectionRenderService),
         newTransform: t
       };
-    let c = null, l = null;
-    if (d > n)
+    let c = null, d = null;
+    if (l > n)
       c = {
-        from: { ...o, column: d - s },
+        from: { ...o, column: l - s },
         to: { ...a, column: u - s }
-      }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
+      }, d = z(c, this._selectionRenderService, this._skeletonManagerService);
     else {
-      if (d >= e && u <= n)
+      if (l >= e && u <= n)
         return null;
-      if (d < e && u > n)
+      if (l < e && u > n)
         if (r === O.Both)
           c = {
             from: { ...o },
             to: { ...a, column: u - s }
-          }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
+          }, d = z(c, this._selectionRenderService, this._skeletonManagerService);
         else
           return {
             newSheetTransform: $({ ...t }, this._selectionRenderService),
             newTransform: t
           };
-      else if (d >= e && d <= n) {
-        if (d === e)
-          l = { ...t, left: (t.left || 0) - i.from.columnOffset };
+      else if (l >= e && l <= n) {
+        if (l === e)
+          d = { ...t, left: (t.left || 0) - i.from.columnOffset };
         else {
-          const g = this._skeletonManagerService.attachRangeWithCoord({ startColumn: e, endColumn: d - 1, startRow: o.row, endRow: a.row });
+          const g = this._skeletonManagerService.attachRangeWithCoord({ startColumn: e, endColumn: l - 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 = { ...t, left: (t.left || 0) - g.endX + g.startX - i.from.columnOffset };
         }
-        c = $(l, this._selectionRenderService);
+        c = $(d, this._selectionRenderService);
       } else if (u >= e && u <= n && r === O.Both) {
         const g = this._skeletonManagerService.attachRangeWithCoord({
           startColumn: e - 1,
@@ -3113,27 +3112,27 @@ let rn = class extends ne {
         c = {
           from: { ...o },
           to: { ...a, column: e - 1, columnOffset: g.endX - g.startX }
-        }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
+        }, d = z(c, this._selectionRenderService, this._skeletonManagerService);
       }
     }
-    return c != null && l != null ? {
+    return c != null && d != null ? {
       newSheetTransform: c,
-      newTransform: l
+      newTransform: d
     } : null;
   }
   _expandRow(i, t, e, n, r = O.Position) {
-    const s = n - e + 1, { from: o, to: a } = i, { row: d } = o, { row: u } = a;
+    const s = n - e + 1, { from: o, to: a } = i, { row: l } = o, { row: u } = a;
     if (r === O.None)
       return {
         newSheetTransform: $({ ...t }, this._selectionRenderService),
         newTransform: t
       };
-    let c = null, l = null;
-    if (d >= e) {
+    let c = null, d = null;
+    if (l >= 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 }, c = $(l, this._selectionRenderService);
+      d = { ...t, top: (t.top || 0) + g.endY - g.startY }, c = $(d, this._selectionRenderService);
     } else if (u >= n)
       if (r === O.Both)
         c = {
@@ -3142,54 +3141,54 @@ let rn = class extends ne {
             ...a,
             row: u + s
           }
-        }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
+        }, d = z(c, this._selectionRenderService, this._skeletonManagerService);
       else
         return {
           newSheetTransform: $({ ...t }, this._selectionRenderService),
           newTransform: t
         };
-    return c != null && l != null ? {
+    return c != null && d != null ? {
       newSheetTransform: c,
-      newTransform: l
+      newTransform: d
     } : null;
   }
   _shrinkRow(i, t, e, n, r = O.Position) {
-    const s = n - e + 1, { from: o, to: a } = i, { row: d } = o, { row: u } = a;
+    const s = n - e + 1, { from: o, to: a } = i, { row: l } = o, { row: u } = a;
     if (r === O.None)
       return {
         newSheetTransform: $({ ...t }, this._selectionRenderService),
         newTransform: t
       };
-    let c = null, l = null;
-    if (d > n)
+    let c = null, d = null;
+    if (l > n)
       c = {
-        from: { ...o, row: d - s },
+        from: { ...o, row: l - s },
         to: { ...a, row: u - s }
-      }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
+      }, d = z(c, this._selectionRenderService, this._skeletonManagerService);
     else {
-      if (d >= e && u <= n)
+      if (l >= e && u <= n)
         return null;
-      if (d < e && u > n)
+      if (l < e && u > n)
         if (r === O.Both)
           c = {
             from: { ...o },
             to: { ...a, row: u - s }
-          }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
+          }, d = z(c, this._selectionRenderService, this._skeletonManagerService);
         else
           return {
             newSheetTransform: $({ ...t }, this._selectionRenderService),
             newTransform: t
           };
-      else if (d >= e && d <= n) {
-        if (d === e)
-          l = { ...t, top: (t.top || 0) - i.from.rowOffset };
+      else if (l >= e && l <= n) {
+        if (l === e)
+          d = { ...t, top: (t.top || 0) - i.from.rowOffset };
         else {
-          const g = this._skeletonManagerService.attachRangeWithCoord({ startRow: e, endRow: d - 1, startColumn: o.column, endColumn: a.column });
+          const g = this._skeletonManagerService.attachRangeWithCoord({ startRow: e, endRow: l - 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 = { ...t, top: (t.top || 0) - g.endY + g.startY - i.from.rowOffset };
         }
-        c = $(l, this._selectionRenderService);
+        c = $(d, 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)
@@ -3197,12 +3196,12 @@ let rn = class extends ne {
         c = {
           from: { ...o },
           to: { ...a, row: e - 1, rowOffset: g.endY - g.startY }
-        }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
+        }, d = z(c, this._selectionRenderService, this._skeletonManagerService);
       }
     }
-    return c != null && l != null ? {
+    return c != null && d != null ? {
       newSheetTransform: c,
-      newTransform: l
+      newTransform: d
     } : null;
   }
   _commandListener() {
@@ -3211,7 +3210,7 @@ let rn = class extends ne {
       // 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 === ai.id) {
+        if (i.id === Ii.id) {
           const { unitId: t, subUnitId: e } = i.params;
           this._updateDrawings(t, e);
         }
@@ -3247,13 +3246,13 @@ let rn = class extends ne {
       Object.keys(e).forEach((s) => {
         const o = e[s];
         o != null && Object.keys(o).forEach((a) => {
-          const d = o[a].data;
-          d != null && Object.keys(d).forEach((u) => {
+          const l = o[a].data;
+          l != null && Object.keys(l).forEach((u) => {
             if (s === i && a === t) {
-              const c = d[u];
-              c.transform = z(c.sheetTransform, this._selectionRenderService, this._skeletonManagerService), n.push(d[u]);
+              const c = l[u];
+              c.transform = z(c.sheetTransform, this._selectionRenderService, this._skeletonManagerService), n.push(l[u]);
             } else
-              r.push(d[u]);
+              r.push(l[u]);
           });
         });
       }), this._drawingManagerService.removeNotification(r), this._drawingManagerService.addNotification(n);
@@ -3272,13 +3271,13 @@ let rn = class extends ne {
   _refreshDrawingTransform(i, t, e) {
     const n = this._drawingManagerService.getDrawingData(i, t), r = [];
     Object.keys(n).forEach((s) => {
-      const o = n[s], { sheetTransform: a, transform: d, anchorType: u = O.Position } = o;
+      const o = n[s], { sheetTransform: a, transform: l, anchorType: u = O.Position } = o;
       if (u === O.None)
         return !0;
-      const { from: c, to: l } = a, { row: g, column: h } = c, { row: f, column: p } = l;
+      const { from: c, to: d } = a, { row: g, column: h } = c, { row: f, column: p } = d;
       for (let m = 0; m < e.length; m++) {
         const _ = e[m], { startRow: v, endRow: I, startColumn: R, endColumn: S } = _;
-        if (Fr.intersects(
+        if (ei.intersects(
           {
             startRow: v,
             endRow: I,
@@ -3297,8 +3296,8 @@ let rn = class extends ne {
             ...o,
             transform: {
               ...w,
-              width: C ? d == null ? void 0 : d.width : w == null ? void 0 : w.width,
-              height: C ? d == null ? void 0 : d.height : w == null ? void 0 : w.height
+              width: C ? l == null ? void 0 : l.width : w == null ? void 0 : w.width,
+              height: C ? l == null ? void 0 : l.height : w == null ? void 0 : w.height
             }
           });
           break;
@@ -3308,9 +3307,9 @@ let rn = class extends ne {
   }
 };
 rn = Ps([
-  me(1, Z),
+  me(1, J),
   me(2, G),
-  me(3, Xe),
+  me(3, Fe),
   me(4, A(V)),
   me(5, A(At)),
   me(6, re),
@@ -3319,13 +3318,13 @@ rn = Ps([
 ], rn);
 const ks = (i) => {
   var v;
-  const t = qe(G), e = qe(tt), n = qe(ie), r = qe(Z), { drawings: s } = i, o = s[0];
+  const t = qe(G), e = qe(tt), n = qe(ie), r = qe(J), { drawings: s } = i, o = s[0];
   if (o == null)
     return;
-  const { unitId: a } = o, d = r.getRenderById(a), u = d == null ? void 0 : d.scene;
+  const { unitId: a } = o, l = r.getRenderById(a), u = l == null ? void 0 : l.scene;
   if (u == null)
     return;
-  const c = u.getTransformerByCreate(), [l, g] = Qt(!0), h = (v = o.anchorType) != null ? v : O.Position, [f, p] = Qt(h);
+  const c = u.getTransformerByCreate(), [d, g] = Qt(!0), h = (v = o.anchorType) != null ? v : O.Position, [f, p] = Qt(h);
   function m(I, R) {
     const S = [];
     return I.forEach((C) => {
@@ -3380,8 +3379,8 @@ const ks = (i) => {
   return /* @__PURE__ */ qt(
     "div",
     {
-      className: fi("univer-grid univer-gap-2 univer-py-2 univer-text-gray-400", {
-        "univer-hidden": !l
+      className: bi("univer-grid univer-gap-2 univer-py-2 univer-text-gray-400", {
+        "univer-hidden": !d
       }),
       children: [
         /* @__PURE__ */ oe(
@@ -3391,7 +3390,7 @@ const ks = (i) => {
             children: /* @__PURE__ */ oe("div", { children: e.t("drawing-anchor.title") })
           }
         ),
-        /* @__PURE__ */ oe("div", { children: /* @__PURE__ */ qt(mi, { value: f, onChange: _, direction: "vertical", children: [
+        /* @__PURE__ */ oe("div", { children: /* @__PURE__ */ qt(Mi, { value: f, onChange: _, direction: "vertical", children: [
           /* @__PURE__ */ oe(Yt, { value: O.Both, children: e.t("drawing-anchor.both") }),
           /* @__PURE__ */ oe(Yt, { value: O.Position, children: e.t("drawing-anchor.position") }),
           /* @__PURE__ */ oe(Yt, { value: O.None, children: e.t("drawing-anchor.none") })
@@ -3420,7 +3419,7 @@ function Bs(i) {
     icon: "AddImageIcon",
     tooltip: "sheetImage.title",
     hidden$: an(i, F.UNIVER_SHEET),
-    disabled$: Ui(i, { workbookTypes: [zt], worksheetTypes: [Kt], rangeTypes: [ci] })
+    disabled$: Yr(i, { workbookTypes: [zt], worksheetTypes: [Kt], rangeTypes: [Ci] })
   };
 }
 function js(i) {
@@ -3456,13 +3455,13 @@ const Fs = {
   }
 };
 function it(i) {
-  return !i.getContextValue(xr) && !i.getContextValue(Yr) && !i.getContextValue(Xr) && i.getContextValue($e);
+  return !i.getContextValue(ti) && !i.getContextValue(ni) && !i.getContextValue(ri) && i.getContextValue(je);
 }
 const xs = {
   id: rt.id,
   description: "shortcut.drawing-move-down",
   group: "4_drawing-view",
-  binding: Fe.ARROW_DOWN,
+  binding: $e.ARROW_DOWN,
   priority: 100,
   preconditions: it,
   staticParameters: {
@@ -3472,7 +3471,7 @@ const xs = {
   id: rt.id,
   description: "shortcut.drawing-move-up",
   group: "4_drawing-view",
-  binding: Fe.ARROW_UP,
+  binding: $e.ARROW_UP,
   priority: 100,
   preconditions: it,
   staticParameters: {
@@ -3482,7 +3481,7 @@ const xs = {
   id: rt.id,
   description: "shortcut.drawing-move-left",
   group: "4_drawing-view",
-  binding: Fe.ARROW_LEFT,
+  binding: $e.ARROW_LEFT,
   priority: 100,
   preconditions: it,
   staticParameters: {
@@ -3492,7 +3491,7 @@ const xs = {
   id: rt.id,
   description: "shortcut.drawing-move-right",
   group: "4_drawing-view",
-  binding: Fe.ARROW_RIGHT,
+  binding: $e.ARROW_RIGHT,
   priority: 100,
   preconditions: it,
   staticParameters: {
@@ -3504,14 +3503,14 @@ const xs = {
   group: "4_drawing-view",
   // when focusing on any other input tag do not trigger this shortcut
   preconditions: it,
-  binding: Fe.DELETE,
-  mac: Fe.BACKSPACE
+  binding: $e.DELETE,
+  mac: $e.BACKSPACE
 };
 var Vs = Object.getOwnPropertyDescriptor, Hs = (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;
-}, ke = (i, t) => (e, n) => t(e, n, i);
+}, Ne = (i, t) => (e, n) => t(e, n, i);
 let Ut = class extends ne {
   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();
@@ -3557,12 +3556,12 @@ let Ut = class extends ne {
   }
 };
 Ut = Hs([
-  ke(0, A(dr)),
-  ke(1, Fi),
-  ke(2, G),
-  ke(3, xi),
-  ke(4, ie),
-  ke(5, A(sn))
+  Ne(0, A(dr)),
+  Ne(1, Fi),
+  Ne(2, G),
+  Ne(3, xi),
+  Ne(4, ie),
+  Ne(5, A(on))
 ], Ut);
 var zs = Object.defineProperty, Ks = Object.getOwnPropertyDescriptor, Js = (i, t, e) => t in i ? zs(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e, 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--)
@@ -3570,10 +3569,10 @@ var zs = Object.defineProperty, Ks = Object.getOwnPropertyDescriptor, Js = (i, t
   return r;
 }, Lt = (i, t) => (e, n) => t(e, n, i), Dr = (i, t, e) => Js(i, typeof t != "symbol" ? t + "" : t, e);
 const qs = "SHEET_IMAGE_UI_PLUGIN";
-let Pt = class extends Vr {
+let Pt = class extends oi {
   constructor(i = jn, t, e, n) {
     super(), this._config = i, this._injector = t, this._renderManagerService = e, this._configService = n;
-    const { menu: r, ...s } = Hr(
+    const { menu: r, ...s } = ai(
       {},
       jn,
       this._config
@@ -3581,7 +3580,7 @@ let Pt = class extends Vr {
     r && this._configService.setConfig("menu", r, { merge: !0 }), this._configService.setConfig(ss, s);
   }
   onStarting() {
-    zr(this._injector, [
+    ci(this._injector, [
       [et],
       [Ut],
       [Rt],
@@ -3591,18 +3590,18 @@ let Pt = class extends Vr {
       [bt],
       [Mt],
       [yt]
-    ]), Ft(this._injector, [
+    ]), xt(this._injector, [
       [et]
     ]);
   }
   onReady() {
-    Ft(this._injector, [
+    xt(this._injector, [
       [Et],
       [yt]
     ]);
   }
   onRendered() {
-    this._registerRenderModules(), Ft(this._injector, [
+    this._registerRenderModules(), xt(this._injector, [
       [Tt],
       [Ot],
       [Ut],
@@ -3627,10 +3626,10 @@ let Pt = class extends Vr {
 Dr(Pt, "type", F.UNIVER_SHEET);
 Dr(Pt, "pluginName", qs);
 Pt = Zs([
-  Gr(vi, Xi, Ki, Kr),
+  ii(Ui, Xi, Ki, di),
   Lt(1, A(Ye)),
-  Lt(2, Z),
-  Lt(3, Lr)
+  Lt(2, J),
+  Lt(3, si)
 ], Pt);
 export {
   Y as ClearSheetDrawingTransformerOperation,
@@ -3648,5 +3647,8 @@ export {
   Qe as SheetDrawingUpdateController,
   wr as SidebarSheetDrawingOperation,
   mr as UngroupSheetDrawingCommand,
-  Pt as UniverSheetsDrawingUIPlugin
+  Pt as UniverSheetsDrawingUIPlugin,
+  ge as calcSheetFloatDomPosition,
+  z as drawingPositionToTransform,
+  $ as transformToDrawingPosition
 };