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

package/lib/index.js

@@ -1,37 +1,37 @@
 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 { 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";
+var Tr = (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) => Tr(i, typeof t != "symbol" ? t + "" : t, e);
+import { precisionTo as mt, IRenderManagerService as J, transformObjectOutOfGroup as Er, getGroupState as Or, getCurrentTypeOfRenderer as sn, CURSOR_TYPE as Ur, RENDER_CLASS_TYPE as Ue, Rect as Pe, 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 xe, 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 Be, 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 Ye, sequenceExecute as Xn, DrawingTypeEnum as B, ArrangeTypeEnum as pt, Inject as A, IContextService as Gn, LocaleService as tt, Injector as Xe, 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 $e, 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 je, InterceptorEffectEnum as Lr, ObjectMatrix as Vr, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY as Hr, Tools as Re, 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 { docDrawingPositionToTransform as Tn, ReplaceSnapshotCommand as yi, InnerPasteCommand as Ti } from "@univerjs/docs-ui";
+import { IImageIoService as Ei, IDrawingManagerService as ie, DRAWING_IMAGE_ALLOW_IMAGE_LIST as En, DRAWING_IMAGE_COUNT_LIMIT as On, ImageUploadStatusType as Ae, 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 Ie, 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 Fe, 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 Re, distinctUntilChanged as Wn, Subject as Gt, filter as Zi, take as qi, BehaviorSubject as ke, 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 be, distinctUntilChanged as Wn, Subject as Gt, filter as Zi, take as qi, BehaviorSubject as We, 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();
+  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 d = Pr(
+  const l = Pr(
     c.unitId,
     c.sheetId,
     { from: n, to: r },
     e
   );
-  let { left: g, top: h, width: f, height: p } = d;
+  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: l,
+    skewX: d,
     skewY: u,
     left: g,
     top: h,
@@ -40,14 +40,14 @@ function z(i, t, e) {
   };
 }
 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)
+  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: d.actualColumn,
-    columnOffset: mt(e - d.startX, 1),
-    row: d.actualRow,
-    rowOffset: mt(n - d.startY, 1)
+    column: l.actualColumn,
+    columnOffset: mt(e - l.startX, 1),
+    row: l.actualRow,
+    rowOffset: mt(n - l.startY, 1)
   }, h = t.getCellWithCoordByOffset(e + r, n + s);
   if (h == null)
     return;
@@ -60,7 +60,7 @@ function $(i, t) {
   return {
     flipY: o,
     flipX: a,
-    angle: l,
+    angle: d,
     skewX: u,
     skewY: c,
     from: g,
@@ -82,14 +82,14 @@ const Y = {
   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);
+    const e = i.get(G), n = i.get(Ye), r = i.get(At), s = i.get(re);
     if (!t) return !1;
     const { drawings: o } = t, a = [];
     o.forEach((S) => {
       const { unitId: C } = S;
       a.push(C);
     });
-    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 } };
+    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({
       unitID: u,
       undoMutations: [
@@ -114,10 +114,10 @@ const Y = {
     if (n.length === 0)
       return !1;
     const r = n[0].unitId, s = n.map((o) => {
-      const { unitId: a, subUnitId: l, drawingId: u, drawingType: c } = o;
+      const { unitId: a, subUnitId: d, drawingId: u, drawingType: c } = o;
       return {
         unitId: a,
-        subUnitId: l,
+        subUnitId: d,
         drawingId: u,
         drawingType: c
       };
@@ -131,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, 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;
+    const { parent: n, children: r } = e, { unitId: s, subUnitId: o, drawingId: a } = n, d = Or(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;
       return {
         unitId: h,
         subUnitId: f,
         drawingId: p,
         transform: {
           ...g,
-          left: g.left - l.left,
-          top: g.top - l.top
+          left: g.left - d.left,
+          top: g.top - d.top
         },
         groupId: a
       };
@@ -149,7 +149,7 @@ function es(i) {
       subUnitId: o,
       drawingId: a,
       drawingType: B.DRAWING_GROUP,
-      transform: l
+      transform: d
     };
     t.push({
       parent: c,
@@ -160,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: l = { width: 0, height: 0 } } = n;
-    if (l == null)
+    const { parent: n, children: r } = e, { unitId: s, subUnitId: o, drawingId: a, transform: d = { width: 0, height: 0 } } = n;
+    if (d == null)
       return;
-    const u = r.map((d) => {
-      const { transform: g } = d, { unitId: h, subUnitId: f, drawingId: p } = d, m = Tr(g || {}, l, l.width || 0, l.height || 0);
+    const u = r.map((l) => {
+      const { transform: g } = l, { unitId: h, subUnitId: f, drawingId: p } = l, m = Er(g || {}, d, d.width || 0, d.height || 0);
       return {
         unitId: h,
         subUnitId: f,
@@ -192,7 +192,7 @@ const gr = {
   id: "sheet.command.group-sheet-image",
   type: Z.COMMAND,
   handler: (i, t) => {
-    const e = i.get(G), n = i.get(xe), r = i.get(re);
+    const e = i.get(G), n = i.get(Ye), r = i.get(re);
     if (!t) return !1;
     const s = [];
     t.forEach(({ parent: h, children: f }) => {
@@ -200,15 +200,15 @@ const gr = {
         s.push(p.unitId);
       });
     });
-    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({
+    const o = r.getGroupDrawingOp(t), { unitId: a, subUnitId: d, undo: u, redo: c, objects: l } = o;
+    return e.syncExecuteCommand(P.id, { op: c, unitId: a, subUnitId: d, objects: l, type: U.GROUP }) ? (n.pushUndoRedo({
       unitID: a,
       undoMutations: [
-        { id: P.id, params: { op: u, unitId: a, subUnitId: l, objects: ts(d), type: U.UNGROUP } },
+        { id: P.id, params: { op: u, unitId: a, subUnitId: d, objects: ts(l), type: U.UNGROUP } },
         { id: Y.id, params: s }
       ],
       redoMutations: [
-        { id: P.id, params: { op: c, unitId: a, subUnitId: l, objects: d, type: U.GROUP } },
+        { id: P.id, params: { op: c, unitId: a, subUnitId: d, objects: l, type: U.GROUP } },
         { id: Y.id, params: s }
       ]
     }), !0) : !1;
@@ -218,9 +218,9 @@ const gr = {
   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);
+    const e = i.get(G), n = i.get(Ye), r = i.get(re), s = i.get(At);
     if (!t) return !1;
-    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 } };
+    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({
       unitID: u,
       undoMutations: [
@@ -241,20 +241,20 @@ const gr = {
   id: "sheet.command.set-drawing-arrange",
   type: Z.COMMAND,
   handler: (i, t) => {
-    const e = i.get(G), n = i.get(xe);
+    const e = i.get(G), n = i.get(Ye);
     if (!t) return !1;
-    const r = i.get(re), { unitId: s, subUnitId: o, drawingIds: a, arrangeType: l } = t, u = { unitId: s, subUnitId: o, drawingIds: a };
+    const r = i.get(re), { unitId: s, subUnitId: o, drawingIds: a, arrangeType: d } = t, u = { unitId: s, subUnitId: o, drawingIds: a };
     let c;
-    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)
+    if (d === pt.forward ? c = r.getForwardDrawingsOp(u) : d === pt.backward ? c = r.getBackwardDrawingOp(u) : d === pt.front ? c = r.getFrontDrawingsOp(u) : d === pt.back && (c = r.getBackDrawingsOp(u)), c == null)
       return !1;
-    const { objects: d, redo: g, undo: h } = c;
-    return e.syncExecuteCommand(P.id, { op: g, unitId: s, subUnitId: o, objects: d, type: U.ARRANGE }) ? (n.pushUndoRedo({
+    const { objects: l, redo: g, undo: h } = c;
+    return e.syncExecuteCommand(P.id, { op: g, unitId: s, subUnitId: o, objects: l, type: U.ARRANGE }) ? (n.pushUndoRedo({
       unitID: s,
       undoMutations: [
-        { id: P.id, params: { op: h, unitId: s, subUnitId: o, objects: d, type: U.ARRANGE } }
+        { id: P.id, params: { op: h, unitId: s, subUnitId: o, objects: l, type: U.ARRANGE } }
       ],
       redoMutations: [
-        { id: P.id, params: { op: g, unitId: s, subUnitId: o, objects: d, type: U.ARRANGE } }
+        { id: P.id, params: { op: g, unitId: s, subUnitId: o, objects: l, type: U.ARRANGE } }
       ]
     }), !0) : !1;
   }
@@ -262,17 +262,17 @@ const gr = {
   id: "sheet.command.set-sheet-image",
   type: Z.COMMAND,
   handler: (i, t) => {
-    const e = i.get(G), n = i.get(xe), r = i.get(re);
+    const e = i.get(G), n = i.get(Ye), r = i.get(re);
     if (!t) return !1;
-    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({
+    const { drawings: s } = t, o = r.getBatchUpdateOp(s), { unitId: a, subUnitId: d, undo: u, redo: c, objects: l } = o;
+    return e.syncExecuteCommand(P.id, { unitId: a, subUnitId: d, op: c, objects: l, type: U.UPDATE }) ? (n.pushUndoRedo({
       unitID: a,
       undoMutations: [
-        { id: P.id, params: { unitId: a, subUnitId: l, op: u, objects: d, type: U.UPDATE } },
+        { id: P.id, params: { unitId: a, subUnitId: d, op: u, objects: l, type: U.UPDATE } },
         { id: Y.id, params: [a] }
       ],
       redoMutations: [
-        { id: P.id, params: { unitId: a, subUnitId: l, op: c, objects: d, type: U.UPDATE } },
+        { id: P.id, params: { unitId: a, subUnitId: d, op: c, objects: l, type: U.UPDATE } },
         { id: Y.id, params: [a] }
       ]
     }), !0) : !1;
@@ -281,7 +281,7 @@ const gr = {
   id: "sheet.command.ungroup-sheet-image",
   type: Z.COMMAND,
   handler: (i, t) => {
-    const e = i.get(G), n = i.get(xe), r = i.get(re);
+    const e = i.get(G), n = i.get(Ye), r = i.get(re);
     if (!t) return !1;
     const s = [];
     t.forEach(({ parent: h, children: f }) => {
@@ -289,15 +289,15 @@ const gr = {
         s.push(p.unitId);
       });
     });
-    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({
+    const o = r.getUngroupDrawingOp(t), { unitId: a, subUnitId: d, undo: u, redo: c, objects: l } = o;
+    return e.syncExecuteCommand(P.id, { op: c, unitId: a, subUnitId: d, objects: l, type: U.UNGROUP }) ? (n.pushUndoRedo({
       unitID: a,
       undoMutations: [
-        { id: P.id, params: { op: u, unitId: a, subUnitId: l, objects: es(d), type: U.GROUP } },
+        { id: P.id, params: { op: u, unitId: a, subUnitId: d, objects: es(l), type: U.GROUP } },
         { id: Y.id, params: s }
       ],
       redoMutations: [
-        { id: P.id, params: { op: c, unitId: a, subUnitId: l, objects: d, type: U.UNGROUP } },
+        { id: P.id, params: { op: c, unitId: a, subUnitId: d, objects: l, type: U.UNGROUP } },
         { id: Y.id, params: s }
       ]
     }), !0) : !1;
@@ -314,28 +314,28 @@ function is(i, t, e) {
 }
 function en(i, t, e, n, r) {
   var v;
-  const { rotatedHeight: s, rotatedWidth: o } = is(e, n, r), l = i.get(J).getRenderById(t.unitId);
-  if (!l)
+  const { rotatedHeight: s, rotatedWidth: o } = is(e, n, r), d = i.get(J).getRenderById(t.unitId);
+  if (!d)
     return !1;
-  const c = (v = l.with(V).getSkeletonParam(t.subUnitId)) == null ? void 0 : v.skeleton;
+  const c = (v = d.with(V).getSkeletonParam(t.subUnitId)) == null ? void 0 : v.skeleton;
   if (c == null)
     return !1;
-  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;
+  const l = c.getCellByIndex(t.row, t.col), g = l.mergeInfo.endX - l.mergeInfo.startX - 2, h = l.mergeInfo.endY - l.mergeInfo.startY - 2, f = o / s, m = Math.ceil(Math.min(g, h * f)) / o, _ = !m || Number.isNaN(m) ? 1e-3 : m;
   return {
     width: e * _,
     height: n * _
   };
 }
 let Qe = class extends ne {
-  constructor(t, e, n, r, s, o, a, l, u, c, d, g, h) {
+  constructor(t, e, n, r, s, o, a, d, u, c, l, 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 = 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();
+    this._context = t, this._skeletonManagerService = e, this._commandService = n, this._selectionRenderService = r, this._imageIoService = s, this._fileOpenerService = o, this._sheetDrawingService = a, this._drawingManagerService = d, this._contextService = u, this._messageService = c, this._localeService = l, this._injector = h, this._workbookSelections = g.getWorkbookSelections(this._context.unitId), this._updateImageListener(), this._updateOrderListener(), this._groupDrawingListener(), this._focusDrawingListener();
   }
   async insertFloatImage() {
     const t = await this._fileOpenerService.openFile({
       multiple: !0,
-      accept: Tn.map((n) => `.${n.replace("image/", "")}`).join(",")
+      accept: En.map((n) => `.${n.replace("image/", "")}`).join(",")
     }), e = t.length;
     return e > On ? (this._messageService.show({
       type: pe.Error,
@@ -345,7 +345,7 @@ let Qe = class extends ne {
   async insertCellImage() {
     const e = (await this._fileOpenerService.openFile({
       multiple: !1,
-      accept: Tn.map((n) => `.${n.replace("image/", "")}`).join(",")
+      accept: En.map((n) => `.${n.replace("image/", "")}`).join(",")
     }))[0];
     return e ? (await this._insertCellImage(e), !0) : !1;
   }
@@ -358,27 +358,27 @@ let Qe = class extends ne {
       e = await this._imageIoService.saveImage(t);
     } catch (v) {
       const I = v.message;
-      I === Ue.ERROR_EXCEED_SIZE ? this._messageService.show({
+      I === Ae.ERROR_EXCEED_SIZE ? this._messageService.show({
         type: pe.Error,
         content: this._localeService.t("update-status.exceedMaxSize", String(Un / (1024 * 1024)))
-      }) : I === Ue.ERROR_IMAGE_TYPE ? this._messageService.show({
+      }) : I === Ae.ERROR_IMAGE_TYPE ? this._messageService.show({
         type: pe.Error,
         content: this._localeService.t("update-status.invalidImageType")
-      }) : I === Ue.ERROR_IMAGE && this._messageService.show({
+      }) : I === Ae.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: 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);
+    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);
     let p = 1;
-    if (c > Pn || d > An) {
-      const v = Pn / c, I = An / d;
+    if (c > Pn || l > An) {
+      const v = Pn / c, I = An / l;
       p = Math.max(v, I);
     }
-    const m = this._getImagePosition(c * p, d * p, h, f);
+    const m = this._getImagePosition(c * p, l * p, h, f);
     if (m == null)
       return;
     const _ = {
@@ -387,7 +387,7 @@ let Qe = class extends ne {
       drawingId: o,
       drawingType: B.DRAWING_IMAGE,
       imageSourceType: a,
-      source: l,
+      source: d,
       transform: z(m, this._selectionRenderService, this._skeletonManagerService),
       sheetTransform: m
     };
@@ -404,26 +404,26 @@ let Qe = class extends ne {
       n = await this._imageIoService.saveImage(t);
     } catch (S) {
       const C = S.message;
-      C === Ue.ERROR_EXCEED_SIZE ? this._messageService.show({
+      C === Ae.ERROR_EXCEED_SIZE ? this._messageService.show({
         type: pe.Error,
         content: this._localeService.t("update-status.exceedMaxSize", String(Un / (1024 * 1024)))
-      }) : C === Ue.ERROR_IMAGE_TYPE ? this._messageService.show({
+      }) : C === Ae.ERROR_IMAGE_TYPE ? this._messageService.show({
         type: pe.Error,
         content: this._localeService.t("update-status.invalidImageType")
-      }) : C === Ue.ERROR_IMAGE && this._messageService.show({
+      }) : C === Ae.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: l, height: u, image: c } = await Xt(a || "");
+    const { imageId: r, imageSourceType: s, source: o, base64Cache: a } = n, { width: d, height: u, image: c } = await Xt(a || "");
     this._imageIoService.addImageSourceCache(o, s, c);
-    const d = this._workbookSelections.getCurrentLastSelection();
-    if (!d)
+    const l = this._workbookSelections.getCurrentLastSelection();
+    if (!l)
       return !1;
-    let g = d.primary.actualRow, h = d.primary.actualColumn;
-    d.primary.isMerged && (g = d.primary.startRow, h = d.primary.startColumn);
+    let g = l.primary.actualRow, h = l.primary.actualColumn;
+    l.primary.isMerged && (g = l.primary.startRow, h = l.primary.startColumn);
     const f = Vt("", {}), p = en(
       this._injector,
       {
@@ -432,7 +432,7 @@ let Qe = class extends ne {
         row: g,
         col: h
       },
-      l,
+      d,
       u,
       0
     );
@@ -459,7 +459,7 @@ let Qe = class extends ne {
       drawingType: B.DRAWING_IMAGE,
       imageSourceType: s,
       source: o,
-      transform: En(m),
+      transform: Tn(m),
       docTransform: m,
       behindDoc: Dn.FALSE,
       title: "",
@@ -501,7 +501,7 @@ let Qe = class extends ne {
     const o = this._workbookSelections.getCurrentLastSelection();
     if (!o)
       return !1;
-    const a = Vt("", {}), l = en(
+    const a = Vt("", {}), d = en(
       this._injector,
       {
         unitId: this._context.unitId,
@@ -513,12 +513,12 @@ let Qe = class extends ne {
       r,
       0
     );
-    if (!l)
+    if (!d)
       return !1;
     const u = {
       size: {
-        width: l.width,
-        height: l.height
+        width: d.width,
+        height: d.height
       },
       positionH: {
         relativeFrom: vn.PAGE,
@@ -536,7 +536,7 @@ let Qe = class extends ne {
       drawingType: B.DRAWING_IMAGE,
       imageSourceType: Rn.URL,
       source: t,
-      transform: En(u),
+      transform: Tn(u),
       docTransform: u,
       behindDoc: Dn.FALSE,
       title: "",
@@ -548,7 +548,7 @@ let Qe = class extends ne {
       distL: 0,
       distR: 0,
       distT: 0
-    }, d = Ht.drawing.add({
+    }, l = Ht.drawing.add({
       documentDataModel: a,
       drawings: [c],
       selection: {
@@ -557,7 +557,7 @@ let Qe = class extends ne {
         endOffset: 0
       }
     });
-    return d ? (a.apply(d), this._commandService.syncExecuteCommand(bn.id, {
+    return l ? (a.apply(l), 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]: {
@@ -589,26 +589,26 @@ let Qe = class extends ne {
     const a = Yn(this._skeletonManagerService.getCurrent().skeleton, o);
     if (a == null)
       return;
-    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);
+    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);
       if (m == null)
         return;
-      c = m.startX, d = m.startY, l = m.actualColumn, u = m.actualRow;
+      c = m.startX, l = m.startY, d = m.actualColumn, u = m.actualRow;
     }
     const h = {
-      column: l,
+      column: d,
       columnOffset: 0,
       row: u,
       rowOffset: 0
-    }, f = this._selectionRenderService.getCellWithCoordByOffset(c + t, d + e);
+    }, f = this._selectionRenderService.getCellWithCoordByOffset(c + t, l + e);
     if (f == null)
       return;
     const p = {
       column: f.actualColumn,
       columnOffset: c + t - f.startX,
       row: f.actualRow,
-      rowOffset: d + e - f.startY
+      rowOffset: l + e - f.startY
     };
     return {
       from: h,
@@ -630,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: l } = n;
-        if (l == null)
+        const { unitId: r, subUnitId: s, drawingId: o, drawingType: a, transform: d } = n;
+        if (d == null)
           return;
         const u = this._sheetDrawingService.getDrawingByParam({ unitId: r, subUnitId: s, drawingId: o });
         if (u == null || u.unitId !== this._context.unitId)
           return;
-        const c = $({ ...u.transform, ...l }, this._selectionRenderService);
+        const c = $({ ...u.transform, ...d }, this._selectionRenderService);
         if (c == null)
           return;
-        const d = {
+        const l = {
           ...n,
-          transform: { ...u.transform, ...l, ...z(c, this._selectionRenderService, this._skeletonManagerService) },
+          transform: { ...u.transform, ...d, ...z(c, this._selectionRenderService, this._skeletonManagerService) },
           sheetTransform: { ...c }
         };
-        e.push(d);
+        e.push(l);
       }), e.length > 0 && this._commandService.executeCommand(Wt.id, {
         unitId: t[0].unitId,
         drawings: e
@@ -663,7 +663,7 @@ let Qe = class extends ne {
   _focusDrawingListener() {
     this.disposeWithMe(
       this._drawingManagerService.focus$.subscribe((t) => {
-        t == null || t.length === 0 ? (this._contextService.setContextValue(je, !1), this._sheetDrawingService.focusDrawing([])) : (this._contextService.setContextValue(je, !0), this._sheetDrawingService.focusDrawing(t));
+        t == null || t.length === 0 ? (this._contextService.setContextValue($e, !1), this._sheetDrawingService.focusDrawing([])) : (this._contextService.setContextValue($e, !0), this._sheetDrawingService.focusDrawing(t));
       })
     );
   }
@@ -671,8 +671,8 @@ let Qe = class extends ne {
 Qe = rs([
   te(1, A(V)),
   te(2, G),
-  te(3, Fe),
-  te(4, Ti),
+  te(3, xe),
+  te(4, Ei),
   te(5, Pi),
   te(6, re),
   te(7, ie),
@@ -680,7 +680,7 @@ Qe = rs([
   te(9, cr),
   te(10, A(tt)),
   te(11, A(on)),
-  te(12, A(Ye))
+  te(12, A(Xe))
 ], Qe);
 const Bt = {
   id: "sheet.command.insert-float-image",
@@ -696,8 +696,8 @@ const Bt = {
       return !1;
     const s = t == null ? void 0 : t.files;
     if (s) {
-      const l = s.map((u) => r.insertFloatImageByFile(u));
-      return (await Promise.all(l)).every((u) => u);
+      const d = s.map((u) => r.insertFloatImageByFile(u));
+      return (await Promise.all(d)).every((u) => u);
     } else
       return (a = r.insertFloatImage()) != null ? a : !1;
   }
@@ -717,14 +717,14 @@ const Bt = {
   id: "sheet.command.move-drawing",
   type: Z.COMMAND,
   handler: (i, t) => {
-    const e = i.get(G), n = i.get(re), r = i.get(Fe), { direction: s } = t, o = n.getFocusDrawings();
+    const e = i.get(G), n = i.get(re), r = i.get(xe), { direction: s } = t, o = n.getFocusDrawings();
     if (o.length === 0)
       return !1;
-    const a = o[0].unitId, l = o.map((c) => {
-      const { transform: d } = c;
-      if (d == null)
+    const a = o[0].unitId, d = o.map((c) => {
+      const { transform: l } = c;
+      if (l == null)
         return null;
-      const g = { ...d }, { left: h = 0, top: f = 0 } = d;
+      const g = { ...l }, { left: h = 0, top: f = 0 } = l;
       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,
@@ -733,7 +733,7 @@ const Bt = {
     }).filter((c) => c != null);
     return e.syncExecuteCommand(Wt.id, {
       unitId: a,
-      drawings: l
+      drawings: d
     }) ? (e.syncExecuteCommand(Y.id, [a]), !0) : !1;
   }
 }, pr = "COMPONENT_SHEET_DRAWING_PANEL", wr = {
@@ -774,10 +774,10 @@ var os = Object.getOwnPropertyDescriptor, as = (i, t, e, n) => {
   return r;
 }, ce = (i, t) => (e, n) => t(e, n, i);
 let Rt = class extends Gr {
-  constructor(t, e, n, r, s, o, a, l, u, c) {
+  constructor(t, e, n, r, s, o, a, d, 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 = l, 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 = d, 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();
@@ -823,7 +823,7 @@ let Rt = class extends Gr {
     let r;
     this.disposeWithMe(
       n.createControl$.subscribe(() => {
-        if (this._contextService.setContextValue(je, !0), this._hasCropObject(e))
+        if (this._contextService.setContextValue($e, !0), this._hasCropObject(e))
           return;
         const o = n.getSelectedObjectMap();
         if (o.size > 1) {
@@ -833,30 +833,30 @@ let Rt = class extends Gr {
         const a = o.values().next().value;
         if (!a)
           return;
-        const l = a.oKey, u = this._drawingManagerService.getDrawingOKey(l);
+        const d = a.oKey, u = this._drawingManagerService.getDrawingOKey(d);
         if (!u)
           return;
-        const { unitId: c, subUnitId: d, drawingId: g, drawingType: h } = u, f = u.data;
+        const { unitId: c, subUnitId: l, drawingId: g, drawingType: h } = u, f = u.data;
         if (f && f.disablePopup)
           return;
         r == null || r.dispose();
-        const p = this._canvasPopManagerService.getFeatureMenu(c, d, g, h);
+        const p = this._canvasPopManagerService.getFeatureMenu(c, l, g, h);
         r = this.disposeWithMe(this._canvasPopManagerService.attachPopupToObject(a, {
           componentKey: Li,
           direction: "horizontal",
           offset: [2, 0],
           extraProps: {
-            menuItems: p || this._getImageMenuItems(c, d, g, h)
+            menuItems: p || this._getImageMenuItems(c, l, g, h)
           }
         }));
       })
     ), this.disposeWithMe(
       n.clearControl$.subscribe(() => {
-        r == null || r.dispose(), this._contextService.setContextValue(je, !1), this._commandService.syncExecuteCommand(Nt.id, []);
+        r == null || r.dispose(), this._contextService.setContextValue($e, !1), this._commandService.syncExecuteCommand(Nt.id, []);
       })
     ), this.disposeWithMe(
       this._contextService.contextChanged$.subscribe((o) => {
-        o[je] === !1 && (r == null || r.dispose());
+        o[$e] === !1 && (r == null || r.dispose());
       })
     ), this.disposeWithMe(
       n.changing$.subscribe(() => {
@@ -898,7 +898,7 @@ let Rt = class extends Gr {
   }
 };
 Rt = as([
-  ce(0, A(Ye)),
+  ce(0, A(Xe)),
   ce(1, A(tt)),
   ce(2, ie),
   ce(3, A(Ar)),
@@ -972,18 +972,18 @@ let nn = class extends ne {
 nn = us([
   vt(1, re),
   vt(2, ie),
-  vt(3, A(Fe)),
+  vt(3, A(xe)),
   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;
-}, Ae = (i, t) => (e, n) => t(e, n, i);
+}, Ne = (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]], l = en(
+    const a = e.p.drawings[e.p.drawingsOrder[0]], d = en(
       i,
       {
         unitId: t.unitId,
@@ -995,8 +995,8 @@ function Sr(i, t, e) {
       a.docTransform.size.height,
       a.docTransform.angle
     );
-    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;
+    if (d)
+      return a.transform.width = d.width, a.transform.height = d.height, a.docTransform.size.width = d.width, a.docTransform.size.height = d.height, a.transform.left = 0, a.transform.top = 0, a.docTransform.positionH.posOffset = 0, a.docTransform.positionV.posOffset = 0, e.p.documentStyle.pageSize.width = 1 / 0, e.p.documentStyle.pageSize.height = 1 / 0, !0;
   }
   return !1;
 }
@@ -1008,7 +1008,7 @@ 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 === yi.id && i.params.unitId === Be && (this._drawingManagerService.removeDrawingDataForUnit(Be), this._docDrawingController.loadDrawingDataForUnit(Be), this._drawingManagerService.initializeNotification(Be));
+      i.id === yi.id && i.params.unitId === je && (this._drawingManagerService.removeDrawingDataForUnit(je), this._docDrawingController.loadDrawingDataForUnit(je), this._drawingManagerService.initializeNotification(je));
     }));
   }
   _initCellContentInterceptor() {
@@ -1028,12 +1028,12 @@ let bt = class extends ne {
   }
 };
 bt = gs([
-  Ae(0, G),
-  Ae(1, A(At)),
-  Ae(2, A(Ye)),
-  Ae(3, ie),
-  Ae(4, A(Yi)),
-  Ae(5, A(kr))
+  Ne(0, G),
+  Ne(1, A(At)),
+  Ne(2, A(Xe)),
+  Ne(3, ie),
+  Ne(4, A(Yi)),
+  Ne(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--)
@@ -1059,7 +1059,7 @@ let Mt = class extends ne {
 };
 Mt = ms([
   $n(0, A(Wr)),
-  $n(1, A(Ye))
+  $n(1, A(Xe))
 ], Mt);
 var ps = Object.getOwnPropertyDescriptor, ws = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? ps(t, e) : t, s = i.length - 1, o; s >= 0; s--)
@@ -1069,7 +1069,7 @@ var ps = Object.getOwnPropertyDescriptor, ws = (i, t, e, n) => {
 const _s = [
   Ze,
   Hr,
-  Be
+  je
 ];
 let yt = class extends ne {
   constructor(i, t, e, n, r) {
@@ -1092,13 +1092,13 @@ let yt = class extends ne {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((i) => {
         var t, e;
-        if (i.id === Ei.id) {
+        if (i.id === Ti.id) {
           const n = i.params, { doc: r } = n, s = this._univerInstanceService.getCurrentUnitOfType(F.UNIVER_DOC);
           if (s == null || !Object.keys((t = r.drawings) != null ? t : {}).length)
             return;
           const o = s.getUnitId();
           if (_s.includes(o)) {
-            if (o !== Be) {
+            if (o !== je) {
               const a = () => {
                 this._dialogService.close("sheet-cell-image-copy-paste"), this._commandService.syncExecuteCommand(pn.id, {
                   visible: !1
@@ -1169,12 +1169,12 @@ function Ds() {
   };
 }
 const Fn = [
-  We.SPECIAL_PASTE_COL_WIDTH,
-  We.SPECIAL_PASTE_VALUE,
-  We.SPECIAL_PASTE_FORMAT,
-  We.SPECIAL_PASTE_FORMULA
+  Be.SPECIAL_PASTE_COL_WIDTH,
+  Be.SPECIAL_PASTE_VALUE,
+  Be.SPECIAL_PASTE_FORMAT,
+  Be.SPECIAL_PASTE_FORMULA
 ];
-let Et = class extends ne {
+let Tt = class extends ne {
   constructor(t, e, n, r, s) {
     super();
     ee(this, "_copyInfo");
@@ -1192,15 +1192,15 @@ let Et = class extends ne {
         if (s.length > 0) {
           const [o] = s;
           if (r === ve.CUT) {
-            const l = {
+            const d = {
               unitId: t,
               drawings: [o]
             };
-            this._commandService.executeCommand(nt.id, l);
+            this._commandService.executeCommand(nt.id, d);
           }
           setTimeout(() => {
-            const l = Ds();
-            o.drawingType === B.DRAWING_IMAGE && o.imageSourceType === Oi.BASE64 ? Cs(o.source) : this._clipboardInterfaceService.writeText(""), l();
+            const d = Ds();
+            o.drawingType === B.DRAWING_IMAGE && o.imageSourceType === Oi.BASE64 ? Cs(o.source) : this._clipboardInterfaceService.writeText(""), d();
           }, 200);
           const a = {
             unitId: o.unitId,
@@ -1216,14 +1216,14 @@ let Et = class extends ne {
       onPasteCells: (t, e, n, r) => {
         if (!this._copyInfo)
           return { redos: [], undos: [] };
-        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);
+        const { copyType: s = ve.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 }, ve.COPY);
       },
       onPastePlainText: (t, e) => ({ undos: [], redos: [] }),
-      onPasteUnrecognized: (t) => this._copyInfo ? this._generateSingleDrawingPasteMutations({ pasteTo: t, pasteType: We.DEFAULT_PASTE }, ve.COPY) : { undos: [], redos: [] },
+      onPasteUnrecognized: (t) => this._copyInfo ? this._generateSingleDrawingPasteMutations({ pasteTo: t, pasteType: Be.DEFAULT_PASTE }, ve.COPY) : { undos: [], redos: [] },
       onPasteFiles: (t, e) => {
         if (this._copyInfo)
-          return this._generateSingleDrawingPasteMutations({ pasteTo: t, pasteType: We.DEFAULT_PASTE }, ve.COPY);
+          return this._generateSingleDrawingPasteMutations({ pasteTo: t, pasteType: Be.DEFAULT_PASTE }, ve.COPY);
         {
           const n = e.filter((r) => r.type.includes("image"));
           if (n.length)
@@ -1248,7 +1248,7 @@ let Et = class extends ne {
     const s = r.attachRangeWithCoord(n);
     if (!s)
       return;
-    const { startX: o, endX: a, startY: l, endY: u } = s, c = this._drawingService.getDrawingData(t, e), d = this._focusedDrawings.slice();
+    const { startX: o, endX: a, startY: d, endY: u } = s, c = this._drawingService.getDrawingData(t, e), l = this._focusedDrawings.slice();
     if (Object.keys(c).forEach((h) => {
       const f = c[h], { transform: p } = f;
       if (f.anchorType !== O.Both || !p)
@@ -1259,11 +1259,11 @@ let Et = class extends ne {
         drawingStartY: _,
         drawingEndY: _ + I
       };
-      o <= R && S <= a && l <= C && w <= u && d.push(f);
-    }), d.length)
+      o <= R && S <= a && d <= C && w <= u && l.push(f);
+    }), l.length)
       return {
         copyRange: n,
-        drawings: d,
+        drawings: l,
         unitId: t,
         subUnitId: e
       };
@@ -1272,10 +1272,10 @@ 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, l = this._renderManagerService.getRenderById(s), u = l == null ? void 0 : l.with(V), c = l == null ? void 0 : l.with(Fe), d = this._copyInfo;
+    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;
     if (!u || !c)
       return { redos: [], undos: [] };
-    const { drawings: g } = d, h = wn(a);
+    const { drawings: g } = l, h = wn(a);
     return this._generateMutations(g, {
       unitId: s,
       subUnitId: o,
@@ -1305,16 +1305,16 @@ let Et = class extends ne {
       subUnitId: r,
       getTransform: s,
       isCut: o
-    } = e, a = [], l = [], { _drawingService: u } = this;
+    } = e, a = [], d = [], { _drawingService: u } = this;
     return t.forEach((c) => {
-      const { transform: d, sheetTransform: g } = c;
-      if (!d)
+      const { transform: l, sheetTransform: g } = c;
+      if (!l)
         return;
-      const h = s(d, g), f = {
+      const h = s(l, g), f = {
         ...c,
         unitId: n,
         subUnitId: r,
-        drawingId: o ? c.drawingId : De.generateRandomId(),
+        drawingId: o ? c.drawingId : Re.generateRandomId(),
         transform: h.transform,
         sheetTransform: h.sheetTransform
       };
@@ -1329,7 +1329,7 @@ let Et = class extends ne {
             op: m,
             objects: _
           }
-        }), l.push({
+        }), d.push({
           id: P.id,
           params: {
             unitId: n,
@@ -1341,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 } }), l.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 } }), d.push({ id: P.id, params: { op: p, unitId: n, subUnitId: r, objects: _, type: U.REMOVE } });
       }
-    }), { redos: a, undos: l };
+    }), { redos: a, undos: d };
   }
   // eslint-disable-next-line max-lines-per-function
   _generateRangeDrawingsPasteMutations(t, e) {
@@ -1355,7 +1355,7 @@ let Et = class extends ne {
       pasteRange: o
     } = t, {
       copyRange: a,
-      copyType: l
+      copyType: d
     } = e;
     if (Fn.includes(s))
       return { redos: [], undos: [] };
@@ -1367,8 +1367,8 @@ let Et = class extends ne {
       return this._generateSingleDrawingPasteMutations({
         pasteTo: { unitId: n, subUnitId: r, range: wn(o) },
         pasteType: s
-      }, 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({
+      }, d);
+    const { ranges: [l, g], mapFunc: h } = jr([a, o]), { row: f, col: p } = h(l.startRow, l.startColumn), { row: m, col: _ } = h(g.startRow, g.startColumn), v = u.attachRangeWithCoord({
       startRow: f,
       endRow: f,
       startColumn: p,
@@ -1385,46 +1385,46 @@ let Et = class extends ne {
     return this._generateMutations(c, {
       unitId: n,
       subUnitId: r,
-      getTransform: (D, E) => {
-        var T, M;
+      getTransform: (D, T) => {
+        var E, M;
         return {
           transform: {
             ...D,
-            left: ((T = D == null ? void 0 : D.left) != null ? T : 0) + R,
+            left: ((E = D == null ? void 0 : D.left) != null ? E : 0) + R,
             top: ((M = D == null ? void 0 : D.top) != null ? M : 0) + S
           },
           sheetTransform: {
-            ...E,
+            ...T,
             to: {
-              ...E.to,
-              row: E.to.row + C,
-              column: E.to.column + w
+              ...T.to,
+              row: T.to.row + C,
+              column: T.to.column + w
             },
             from: {
-              ...E.from,
-              row: E.from.row + C,
-              column: E.from.column + w
+              ...T.from,
+              row: T.from.row + C,
+              column: T.from.column + w
             }
           }
         };
       },
-      isCut: l === ve.CUT
+      isCut: d === ve.CUT
     });
   }
 };
-Et = vs([
+Tt = vs([
   ze(0, $r),
   ze(1, J),
   ze(2, ie),
   ze(3, ki),
   ze(4, G)
-], Et);
+], Tt);
 var Rs = Object.getOwnPropertyDescriptor, bs = (i, t, e, n) => {
   for (var r = n > 1 ? void 0 : n ? Rs(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);
-let Tt = class extends ne {
+let Et = class extends ne {
   constructor(i, t, e, n, r) {
     super(), this._drawingManagerService = i, this._renderManagerService = t, this._permissionService = e, this._univerInstanceService = n, this._userManagerService = r, this._initDrawingVisible(), this._initDrawingEditable(), this._initViewPermissionChange(), this._initEditPermissionChange();
   }
@@ -1454,7 +1454,7 @@ let Tt = class extends ne {
     if (!a)
       return;
     a.getAllObjectsByOrder().forEach((u) => {
-      u.classType === Oe.IMAGE && s.some((c) => u.oKey.includes(c.drawingId)) && a.removeObject(u);
+      u.classType === Ue.IMAGE && s.some((c) => u.oKey.includes(c.drawingId)) && a.removeObject(u);
     });
   }
   _initDrawingEditable() {
@@ -1483,7 +1483,7 @@ let Tt = class extends ne {
     if (!a)
       return;
     a.getAllObjectsByOrder().forEach((u) => {
-      u.classType === Oe.IMAGE && s.some((c) => u.oKey.includes(c.drawingId)) && a.detachTransformerFrom(u);
+      u.classType === Ue.IMAGE && s.some((c) => u.oKey.includes(c.drawingId)) && a.detachTransformerFrom(u);
     });
   }
   _initViewPermissionChange() {
@@ -1494,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), l = a == null ? void 0 : a.scene;
-            if (!l)
+            const s = e.getUnitId(), o = r.getSheetId(), a = this._renderManagerService.getRenderById(s), d = a == null ? void 0 : a.scene;
+            if (!d)
               return fe;
-            const u = l.getTransformerByCreate();
+            const u = d.getTransformerByCreate();
             return this._permissionService.composePermission$([
               new Mn(s).id,
               new yn(s, o).id
             ]).pipe(
-              Re((d) => d.every((g) => g.value)),
+              be((l) => l.every((g) => g.value)),
               Wn()
             ).pipe(
-              Re((d) => ({
-                permission: d,
-                scene: l,
+              be((l) => ({
+                permission: l,
+                scene: d,
                 transformer: u,
                 unitId: s,
                 subUnitId: o
@@ -1518,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(), l = this._drawingManagerService.getDrawingData(s, o), u = Object.values(l);
+          const a = n.getAllObjectsByOrder(), d = this._drawingManagerService.getDrawingData(s, o), u = Object.values(d);
           e ? this._drawingManagerService.addNotification(u) : (a.forEach((c) => {
-            c.classType === Oe.IMAGE && u.some((d) => c.oKey.includes(d.drawingId)) && n.removeObject(c);
+            c.classType === Ue.IMAGE && u.some((l) => c.oKey.includes(l.drawingId)) && n.removeObject(c);
           }), r.clearSelectedObjects());
         },
         complete: () => {
@@ -1542,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), l = a == null ? void 0 : a.scene;
-            if (!l)
+            const s = e.getUnitId(), o = r.getSheetId(), a = this._renderManagerService.getRenderById(s), d = a == null ? void 0 : a.scene;
+            if (!d)
               return fe;
-            const u = l.getTransformerByCreate();
+            const u = d.getTransformerByCreate();
             return this._permissionService.composePermission$([
               new zt(s).id,
               new Kt(s, o).id
             ]).pipe(
-              Re((d) => d.every((g) => g.value)),
+              be((l) => l.every((g) => g.value)),
               Wn()
             ).pipe(
-              Re((d) => ({
-                permission: d,
-                scene: l,
+              be((l) => ({
+                permission: l,
+                scene: d,
                 transformer: u,
                 unitId: s,
                 subUnitId: o
@@ -1566,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(), l = this._drawingManagerService.getDrawingData(s, o), u = Object.values(l);
+          const a = n.getAllObjectsByOrder(), d = this._drawingManagerService.getDrawingData(s, o), u = Object.values(d);
           e ? (a.forEach((c) => {
-            c.classType === Oe.IMAGE && u.some((d) => c.oKey.includes(d.drawingId)) && n.attachTransformerTo(c);
+            c.classType === Ue.IMAGE && u.some((l) => c.oKey.includes(l.drawingId)) && n.attachTransformerTo(c);
           }), this._drawingManagerService.addNotification(u)) : (a.forEach((c) => {
-            c.classType === Oe.IMAGE && u.some((d) => c.oKey.includes(d.drawingId)) && n.detachTransformerFrom(c);
+            c.classType === Ue.IMAGE && u.some((l) => c.oKey.includes(l.drawingId)) && n.detachTransformerFrom(c);
           }), r.clearSelectedObjects());
         },
         complete: () => {
@@ -1583,47 +1583,47 @@ 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 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);
+          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);
           });
         }
       })
     );
   }
 };
-Tt = bs([
+Et = bs([
   Ke(0, ie),
   Ke(1, J),
   Ke(2, zr),
   Ke(3, Se),
   Ke(4, A(Kr))
-], Tt);
+], Et);
 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;
-}, Ie = (i, t) => (e, n) => t(e, n, i);
+}, Ce = (i, t) => (e, n) => t(e, n, i);
 function Ir(i, t, e, n, r, s = !1) {
-  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 = {
+  const { scaleX: o, scaleY: a } = t.getAncestorScale(), d = t.getViewport(xn.VIEW_MAIN), u = n.getFreeze(), { startColumn: c, startRow: l, xSplit: g, ySplit: h } = u, f = {
     left: !0,
     // left means the left of pic is in a viewMainLeft
     top: !0
   };
-  if (!l)
+  if (!d)
     return {
       ...i,
       absolute: f
     };
   const { left: p, right: m, top: _, bottom: v } = i;
-  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,
+  let { top: I, left: R, viewportScrollX: S, viewportScrollY: C } = d;
+  const { boundsOfViewArea: w, scrollDirectionResponse: y } = r || {}, { rowHeaderWidth: D, columnHeaderHeight: T } = e, E = {
+    top: s ? 0 : T,
     left: s ? 0 : D
   };
-  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);
+  w && (Re.isDefine(E.top) && (E.top = w.top), Re.isDefine(E.left) && (E.left = w.left)), y === "HORIZONTAL" && (C = 0), y === "VERTICAL" && (S = 0);
   let M = 0, b = 0;
-  const N = e.rowStartY(d - h) + E, x = e.colStartX(c - g) + D, q = e.rowStartY(d) + E, H = e.colStartX(c) + D;
+  const N = e.rowStartY(l - h) + T, x = e.colStartX(c - g) + D, q = e.rowStartY(l) + T, H = e.colStartX(c) + D;
   if (g === 0)
     f.left = !1, M = (p - S) * o, b = (m - S) * o;
   else {
@@ -1634,10 +1634,10 @@ function Ir(i, t, e, n, r, s = !1) {
   if (h === 0)
     f.top = !1, L = (_ - C) * a, X = (v - C) * a;
   else {
-    const k = _ - (N - E), ae = v - (N - E);
+    const k = _ - (N - T), ae = v - (N - T);
     v < q ? (L = k * a, X = ae * a) : _ <= q && v >= q ? (L = k * a, X = Math.max(I, (v - C) * a)) : _ > q && (f.top = !1, L = Math.max((_ - C) * a, I), X = Math.max((v - C) * a, I));
   }
-  return M = Math.max(M, T.left), L = Math.max(L, T.top), b = Math.max(b, T.left), X = Math.max(X, T.top), {
+  return M = Math.max(M, E.left), L = Math.max(L, E.top), b = Math.max(b, E.left), X = Math.max(X, E.top), {
     left: M,
     right: b,
     top: L,
@@ -1646,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: l, angle: u } = i, c = {
+  const { left: s, top: o, width: a, height: d, angle: u } = i, c = {
     left: s,
     right: s + a,
     top: o,
-    bottom: o + l
-  }, d = Ir(c, t, e, n, r), { scaleX: g, scaleY: h } = t.getAncestorScale();
+    bottom: o + d
+  }, l = Ir(c, t, e, n, r), { scaleX: g, scaleY: h } = t.getAncestorScale();
   return {
-    startX: d.left,
-    endX: d.right,
-    startY: d.top,
-    endY: d.bottom,
+    startX: l.left,
+    endX: l.right,
+    startY: l.top,
+    endY: l.bottom,
     rotate: u,
     width: a * g,
-    height: l * h,
-    absolute: d.absolute
+    height: d * h,
+    absolute: l.absolute
   };
 };
 let et = class extends ne {
@@ -1705,29 +1705,29 @@ 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), l = this._univerInstanceService.getUnit(n, F.UNIVER_SHEET);
-          if (!l)
+          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)
             return;
-          const u = l.getActiveSheet().getSheetId();
+          const u = d.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: d, drawingType: g, data: h } = a;
+          const { transform: l, 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 (d == null)
+          if (l == 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 } = 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 });
+          const { left: _, top: v, width: I, height: R, angle: S, flipX: C, flipY: w, skewX: y, skewY: D } = l, T = Ie({ unitId: n, subUnitId: r, drawingId: s }), E = p.getObject(T);
+          if (E != null) {
+            E.transformByState({ left: _, top: v, width: I, height: R, angle: S, flipX: C, flipY: w, skewX: y, skewY: D });
             return;
           }
           const M = {
@@ -1741,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 Ve(E, M);
+          const N = new Pe(T, 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 = {
+          const x = new wt(), q = ge(N, f.renderUnit.scene, c.skeleton, o.worksheet), H = new We(q), L = {
             dispose: x,
             rect: N,
             position$: H,
@@ -1784,38 +1784,38 @@ let et = class extends ne {
     ), this.disposeWithMe(
       this._drawingManagerService.remove$.subscribe((t) => {
         t.forEach((e) => {
-          var d;
-          const { unitId: n, subUnitId: r, drawingId: s } = e, o = Pe({ unitId: n, subUnitId: r, drawingId: s }), a = this._getSceneAndTransformerByDrawingSearch(n);
+          var l;
+          const { unitId: n, subUnitId: r, drawingId: s } = e, o = Ie({ unitId: n, subUnitId: r, drawingId: s }), a = this._getSceneAndTransformerByDrawingSearch(n);
           if (a == null)
             return;
-          const { transformer: 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());
+          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());
         });
       })
     );
   }
   _scrollUpdateListener() {
     const t = (e, 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);
+      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);
       !r || !o || !a || s.forEach((u) => {
         const c = this._domLayerInfoMap.get(u);
         if (c) {
-          const d = ge(c.rect, r.renderUnit.scene, a.skeleton, o.worksheet, c);
-          c.position$.next(d);
+          const l = ge(c.rect, r.renderUnit.scene, a.skeleton, o.worksheet, c);
+          c.position$.next(l);
         }
       });
     };
     this.disposeWithMe(
       this._univerInstanceService.getCurrentTypeOfUnit$(F.UNIVER_SHEET).pipe(
         we((e) => e ? e.activeSheet$ : Bn(null)),
-        Re((e) => {
+        be((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 ? qr(e.render.scene.getViewport(xn.VIEW_MAIN).onScrollAfter$).pipe(Re(() => ({ unitId: e.unitId, subUnitId: e.subUnitId }))) : Bn(null)
+          (e) => e ? qr(e.render.scene.getViewport(xn.VIEW_MAIN).onScrollAfter$).pipe(be(() => ({ unitId: e.unitId, subUnitId: e.subUnitId }))) : Bn(null)
         )
       ).subscribe((e) => {
         if (!e) return;
@@ -1834,23 +1834,30 @@ 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 = Ie({ unitId: t, subUnitId: e, drawingId: n }), u = a.getObject(d);
+      u && u instanceof Pe && u.setProps(r);
+    }
+  }
   _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(Fe);
+    const { startX: n, endX: r, startY: s, endY: o } = t, a = (g = this._renderManagerService.getRenderById(e)) == null ? void 0 : g.with(xe);
     if (a == null)
       return;
-    const l = a.getCellWithCoordByOffset(n, s);
-    if (l == null)
+    const d = a.getCellWithCoordByOffset(n, s);
+    if (d == null)
       return;
     const u = {
-      column: l.actualColumn,
-      columnOffset: n - l.startX,
-      row: l.actualRow,
-      rowOffset: s - l.startY
+      column: d.actualColumn,
+      columnOffset: n - d.startX,
+      row: d.actualRow,
+      rowOffset: s - d.startY
     }, c = a.getCellWithCoordByOffset(r, o);
     if (c == null)
       return;
-    const d = {
+    const l = {
       column: c.actualColumn,
       columnOffset: r - c.startX,
       row: c.actualRow,
@@ -1858,7 +1865,7 @@ let et = class extends ne {
     };
     return {
       from: u,
-      to: d
+      to: l
     };
   }
   _featureUpdateListener() {
@@ -1900,8 +1907,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: l, allowTransform: u = !0 } = t, c = e != null ? e : Dt(), d = this._getPosition(o, r);
-    if (d == null)
+    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)
       return;
     const g = {
       unitId: r,
@@ -1909,14 +1916,14 @@ let et = class extends ne {
       drawingId: c,
       drawingType: t.type || B.DRAWING_DOM,
       componentKey: a,
-      sheetTransform: d,
+      sheetTransform: l,
       transform: {
         left: o.startX,
         top: o.startY,
         width: o.endX - o.startX,
         height: o.endY - o.startY
       },
-      data: l,
+      data: d,
       allowTransform: u
     };
     return this._commandService.executeCommand(kt.id, {
@@ -1940,7 +1947,7 @@ let et = class extends ne {
       const a = this._drawingManagerService.getDrawingByParam({ unitId: r, subUnitId: s, drawingId: t });
       if (!a)
         return;
-      const l = this._sheetDrawingService.getBatchRemoveOp([a]), { redo: u, objects: c } = l;
+      const d = this._sheetDrawingService.getBatchRemoveOp([a]), { redo: u, objects: c } = d;
       this._commandService.syncExecuteCommand(P.id, { unitId: r, subUnitId: s, op: u, objects: c, type: U.REMOVE });
     }
   }
@@ -1953,21 +1960,21 @@ let et = class extends ne {
     });
     if (!s)
       throw new Error("cannot find current target!");
-    const { unitId: o, subUnitId: a } = s, l = this._getSceneAndTransformerByDrawingSearch(o);
-    if (!l) return;
+    const { unitId: o, subUnitId: a } = s, d = this._getSceneAndTransformerByDrawingSearch(o);
+    if (!d) 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: d, data: g, allowTransform: h = !0 } = e, f = r != null ? r : Dt(), { position: p, position$: m } = this._createRangePositionObserver(t, u, c.skeleton);
+    const { componentKey: l, 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 = l.scene, { scaleX: I } = v.getAncestorScale(), R = It(p, n, I), S = {
+    const v = d.scene, { scaleX: I } = v.getAncestorScale(), R = It(p, n, I), S = {
       unitId: o,
       subUnitId: a,
       drawingId: f,
       drawingType: e.type || B.DRAWING_DOM,
-      componentKey: d,
+      componentKey: l,
       transform: {
         left: R.startX,
         top: R.startY,
@@ -1978,7 +1985,7 @@ let et = class extends ne {
       allowTransform: h
     };
     {
-      const { unitId: D, subUnitId: E, drawingId: T } = S, M = se(this._univerInstanceService, { unitId: D, subUnitId: E }), b = S, N = this._univerInstanceService.getUnit(D, F.UNIVER_SHEET);
+      const { unitId: D, subUnitId: T, drawingId: E } = S, M = se(this._univerInstanceService, { unitId: D, subUnitId: T }), b = S, N = this._univerInstanceService.getUnit(D, F.UNIVER_SHEET);
       if (!N)
         return;
       const x = N.getActiveSheet().getSheetId();
@@ -1987,7 +1994,7 @@ let et = class extends ne {
       const q = (w = this._renderManagerService.getRenderById(D)) == null ? void 0 : w.with(V);
       if (!q)
         return;
-      const H = q.getWorksheetSkeleton(E);
+      const H = q.getWorksheetSkeleton(T);
       if (!H)
         return;
       const { transform: L, drawingType: X, data: K } = b;
@@ -1996,12 +2003,12 @@ let et = class extends ne {
       const k = this._getSceneAndTransformerByDrawingSearch(D);
       if (k == null)
         return;
-      const { scene: ae, canvas: be } = k;
-      if (L == null || x !== E)
+      const { scene: ae, canvas: Me } = k;
+      if (L == null || x !== T)
         return;
-      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);
+      const { left: st, top: ot, width: at, height: ct, angle: jt, flipX: $t, flipY: dt, skewX: lt, skewY: ye } = L, ut = Ie({ unitId: D, subUnitId: T, drawingId: E }), 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: Me });
+        de.transformByState({ left: st, top: ot, width: at, height: ct, angle: jt, flipX: $t, flipY: dt, skewX: lt, skewY: ye });
         return;
       }
       const Q = {
@@ -2010,16 +2017,16 @@ let et = class extends ne {
         top: ot,
         width: at,
         height: ct,
-        zIndex: this._drawingManagerService.getDrawingOrder(D, E).length - 1
-      }, ye = X === B.DRAWING_CHART;
-      if (ye) {
+        zIndex: this._drawingManagerService.getDrawingOrder(D, T).length - 1
+      }, Te = X === B.DRAWING_CHART;
+      if (Te) {
         const W = K ? K.backgroundColor : "white";
         Q.fill = W, Q.rotateEnabled = !1, K && K.border && (Q.stroke = K.border), Q.paintFirst = "stroke", Q.strokeWidth = 1, Q.borderEnabled = !1, Q.radius = 8;
       }
-      const 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,
+      const le = new Pe(ut, Q);
+      Te && le.setObjectType(mn.CHART), ae.addObject(le, Ft), b.allowTransform !== !1 && ae.attachTransformerTo(le);
+      const ue = new wt(), ht = ae.getMainViewport(), { rowHeaderWidth: Ee, columnHeaderHeight: Ge } = H.skeleton, gt = {
+        top: Ge,
         left: Ee,
         bottom: ht.bottom,
         right: ht.right
@@ -2029,12 +2036,12 @@ let et = class extends ne {
         boundsOfViewArea: gt,
         domAnchor: n,
         unitId: D,
-        subUnitId: E
-      }, j = ge(le, k.renderUnit.scene, H.skeleton, M.worksheet, he), Te = new ke(j);
-      he.position$ = Te;
-      let Ge = {
-        position$: Te,
-        id: T,
+        subUnitId: T
+      }, j = ge(le, k.renderUnit.scene, H.skeleton, M.worksheet, he), Oe = new We(j);
+      he.position$ = Oe;
+      let Le = {
+        position$: Oe,
+        id: E,
         componentKey: b.componentKey,
         onPointerDown: () => {
         },
@@ -2043,23 +2050,23 @@ let et = class extends ne {
         onPointerUp: () => {
         },
         onWheel: (W) => {
-          be.dispatchEvent(new WheelEvent(W.type, W));
+          Me.dispatchEvent(new WheelEvent(W.type, W));
         },
         data: K,
         unitId: D
       };
-      e.eventPassThrough && (Ge = {
-        ...Ge,
+      e.eventPassThrough && (Le = {
+        ...Le,
         onPointerDown: (W) => {
-          be.dispatchEvent(new PointerEvent(W.type, W));
+          Me.dispatchEvent(new PointerEvent(W.type, W));
         },
         onPointerMove: (W) => {
-          be.dispatchEvent(new PointerEvent(W.type, W));
+          Me.dispatchEvent(new PointerEvent(W.type, W));
         },
         onPointerUp: (W) => {
-          be.dispatchEvent(new PointerEvent(W.type, W));
+          Me.dispatchEvent(new PointerEvent(W.type, W));
         }
-      }), this._canvasFloatDomService.addFloatDom(Ge), this.disposeWithMe(m.subscribe((W) => {
+      }), this._canvasFloatDomService.addFloatDom(Le), this.disposeWithMe(m.subscribe((W) => {
         var un, hn, gn, fn;
         const ln = It({
           startX: W.startX,
@@ -2072,28 +2079,28 @@ let et = class extends ne {
             left: p.absolute.left,
             top: p.absolute.top
           }
-        }, n), Rr = Pe({ unitId: D, subUnitId: E, drawingId: T }), br = new Ve(Rr, {
+        }, n), Rr = Ie({ unitId: D, subUnitId: T, drawingId: E }), br = new Pe(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
+          zIndex: this._drawingManagerService.getDrawingOrder(D, T).length - 1
         }), Mr = ge(br, k.renderUnit.scene, H.skeleton, M.worksheet, he);
-        Te.next(Mr);
+        Oe.next(Mr);
       }));
-      const Le = (y = this._renderManagerService.getRenderById(D)) == null ? void 0 : y.with(V);
-      Le == null || Le.currentSkeleton$.subscribe((W) => {
+      const Ve = (y = this._renderManagerService.getRenderById(D)) == null ? void 0 : y.with(V);
+      Ve == null || Ve.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);
-        Te.next(
+        Oe.next(
           W
         );
       });
       ue.add(() => {
-        this._canvasFloatDomService.removeFloatDom(T);
-      }), ft && ue.add(ft), this._domLayerInfoMap.set(T, he);
+        this._canvasFloatDomService.removeFloatDom(E);
+      }), ft && ue.add(ft), this._domLayerInfoMap.set(E, he);
     }
     return {
       id: f,
@@ -2117,7 +2124,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: d, data: g, allowTransform: h = !0 } = e, f = r != null ? r : Dt(), { position: p, position$: m } = this._createRangePositionObserver({
+    const { componentKey: l, data: g, allowTransform: h = !0 } = e, f = r != null ? r : Dt(), { position: p, position$: m } = this._createRangePositionObserver({
       startRow: 0,
       endRow: 0,
       startColumn: t,
@@ -2130,7 +2137,7 @@ let et = class extends ne {
       subUnitId: a,
       drawingId: f,
       drawingType: e.type || B.DRAWING_DOM,
-      componentKey: d,
+      componentKey: l,
       transform: {
         left: _.startX,
         top: _.startY,
@@ -2141,11 +2148,11 @@ let et = class extends ne {
       allowTransform: h
     };
     {
-      const { unitId: w, subUnitId: y, drawingId: D } = I, E = se(this._univerInstanceService, { unitId: w, subUnitId: y }), T = I, M = this._univerInstanceService.getUnit(w, F.UNIVER_SHEET);
+      const { unitId: w, subUnitId: y, drawingId: D } = I, T = se(this._univerInstanceService, { unitId: w, subUnitId: y }), E = I, M = this._univerInstanceService.getUnit(w, F.UNIVER_SHEET);
       if (!M)
         return;
       const b = M.getActiveSheet().getSheetId();
-      if (!T || !E)
+      if (!E || !T)
         return;
       const N = (S = this._renderManagerService.getRenderById(w)) == null ? void 0 : S.with(V);
       if (!N)
@@ -2153,18 +2160,18 @@ let et = class extends ne {
       const x = N.getWorksheetSkeleton(y);
       if (!x)
         return;
-      const { transform: q, data: H } = T, L = this._getSceneAndTransformerByDrawingSearch(w);
+      const { transform: q, data: H } = E, L = this._getSceneAndTransformerByDrawingSearch(w);
       if (L == null)
         return;
       const { scene: X, canvas: K } = L;
       if (q == null || b !== y)
         return;
-      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);
+      const { left: k, top: ae, width: Me, height: st, angle: ot, flipX: at, flipY: ct, skewX: jt, skewY: $t } = q, dt = Ie({ unitId: w, subUnitId: y, drawingId: D }), lt = X.getObject(dt);
       if (lt != null) {
-        lt.transformByState({ left: k, top: ae, width: be, height: st, angle: ot, flipX: at, flipY: ct, skewX: jt, skewY: $t });
+        lt.transformByState({ left: k, top: ae, width: Me, height: st, angle: ot, flipX: at, flipY: ct, skewX: jt, skewY: $t });
         return;
       }
-      const Me = It({
+      const ye = It({
         startX: _.startX,
         startY: 0,
         endX: p.endX,
@@ -2176,19 +2183,19 @@ let et = class extends ne {
           top: p.absolute.top
         }
       }, n), ut = {
-        left: Me.startX,
-        top: Me.startY,
-        width: Me.width,
-        height: Me.height,
+        left: ye.startX,
+        top: ye.startY,
+        width: ye.width,
+        height: ye.height,
         zIndex: this._drawingManagerService.getDrawingOrder(w, y).length - 1
-      }, de = new Ve(dt, ut);
-      X.addObject(de, Ft), T.allowTransform !== !1 && X.attachTransformerTo(de);
-      const Q = new wt(), ye = X.getMainViewport(), le = {
+      }, de = new Pe(dt, ut);
+      X.addObject(de, Ft), E.allowTransform !== !1 && X.attachTransformerTo(de);
+      const Q = new wt(), Te = X.getMainViewport(), le = {
         top: 0,
         //viewMain.top,
-        left: ye.left,
-        bottom: ye.bottom,
-        right: ye.right
+        left: Te.left,
+        bottom: Te.bottom,
+        right: Te.right
       }, ue = {
         dispose: Q,
         rect: de,
@@ -2199,12 +2206,12 @@ let et = class extends ne {
         domAnchor: n,
         scrollDirectionResponse: "HORIZONTAL"
         /* HORIZONTAL */
-      }, ht = ge(de, L.renderUnit.scene, x.skeleton, E.worksheet, ue), Ee = new ke(ht);
+      }, ht = ge(de, L.renderUnit.scene, x.skeleton, T.worksheet, ue), Ee = new We(ht);
       ue.position$ = Ee;
-      let Xe = {
+      let Ge = {
         position$: Ee,
         id: D,
-        componentKey: T.componentKey,
+        componentKey: E.componentKey,
         onPointerDown: () => {
         },
         onPointerMove: () => {
@@ -2217,8 +2224,8 @@ let et = class extends ne {
         data: H,
         unitId: w
       };
-      e.eventPassThrough && (Xe = {
-        ...Xe,
+      e.eventPassThrough && (Ge = {
+        ...Ge,
         onPointerDown: (j) => {
           K.dispatchEvent(new PointerEvent(j.type, j));
         },
@@ -2228,15 +2235,15 @@ let et = class extends ne {
         onPointerUp: (j) => {
           K.dispatchEvent(new PointerEvent(j.type, j));
         }
-      }), this._canvasFloatDomService.addFloatDom(Xe);
+      }), this._canvasFloatDomService.addFloatDom(Ge);
       const gt = de.onTransformChange$.subscribeEvent(() => {
-        const j = ge(de, L.renderUnit.scene, x.skeleton, E.worksheet, ue);
+        const j = ge(de, L.renderUnit.scene, x.skeleton, T.worksheet, ue);
         Ee.next(
           j
         );
       });
       this.disposeWithMe(m.subscribe((j) => {
-        const Te = It({
+        const Oe = It({
           startX: j.startX,
           startY: 0,
           endX: j.endX,
@@ -2247,13 +2254,13 @@ let et = class extends ne {
             left: p.absolute.left,
             top: p.absolute.top
           }
-        }, n), Ge = Pe({ unitId: w, subUnitId: y, drawingId: D }), Le = new Ve(Ge, {
-          left: Te.startX,
+        }, n), Le = Ie({ unitId: w, subUnitId: y, drawingId: D }), Ve = new Pe(Le, {
+          left: Oe.startX,
           top: 0,
           width: n.width,
           height: n.height,
           zIndex: this._drawingManagerService.getDrawingOrder(w, y).length - 1
-        }), ft = ge(Le, L.renderUnit.scene, x.skeleton, E.worksheet, ue);
+        }), ft = ge(Ve, L.renderUnit.scene, x.skeleton, T.worksheet, ue);
         Ee.next(ft);
       }));
       const he = (C = this._renderManagerService.getRenderById(w)) == null ? void 0 : C.with(V);
@@ -2283,11 +2290,11 @@ 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 ke(o), l = Je(t.endRow, t.endColumn, n), u = new ke(l), c = () => {
+    const o = Je(r, s, n), a = new We(o), d = Je(t.endRow, t.endColumn, n), u = new We(d), c = () => {
       const m = Je(r, s, n), _ = Je(t.endRow, t.endColumn, n);
       a.next(m), u.next(_);
-    }, d = new wt();
-    d.add(e.engine.clientRect$.subscribe(() => c())), d.add(this._commandService.onCommandExecuted((m) => {
+    }, l = new wt();
+    l.add(e.engine.clientRect$.subscribe(() => c())), l.add(this._commandService.onCommandExecuted((m) => {
       if (m.id === gi.id && m.params.rowsAutoHeightInfo.findIndex((v) => v.row === r) > -1) {
         c();
         return;
@@ -2298,18 +2305,18 @@ let et = class extends ne {
       r = m, s = _, c();
     }, h = () => ({
       rotate: 0,
-      width: l.right - o.left,
-      height: l.bottom - o.top,
+      width: d.right - o.left,
+      height: d.bottom - o.top,
       absolute: {
         left: !0,
         top: !0
       },
       startX: o.left,
       startY: o.top,
-      endX: l.right,
-      endY: l.bottom
+      endX: d.right,
+      endY: d.bottom
     }), f = a.pipe(
-      Re((m) => {
+      be((m) => {
         const _ = Je(t.endRow, t.endColumn, n);
         return {
           rotate: 0,
@@ -2332,18 +2339,18 @@ let et = class extends ne {
       updateRowCol: g,
       topLeftPos$: a,
       rightBottomPos$: u,
-      disposable: d
+      disposable: l
     };
   }
 };
 et = ys([
-  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))
+  Ce(0, A(J)),
+  Ce(1, Se),
+  Ce(2, A(G)),
+  Ce(3, ie),
+  Ce(4, A(Wi)),
+  Ce(5, re),
+  Ce(6, A(Jr))
 ], et);
 function Je(i, t, e) {
   const n = e.getCellWithCoordByIndex(i, t), r = n.isMergedMainCell ? n.mergeInfo : n;
@@ -2358,23 +2365,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, l = 0;
+  let a = 0, d = 0;
   if (t) {
     if (t.horizonOffsetAlign === "right") {
-      const d = Ct(t.marginX, n * e);
-      a = i.endX - d - s;
+      const l = Ct(t.marginX, n * e);
+      a = i.endX - l - s;
     } else
       a = i.startX + Ct(t.marginX, n);
     if (t.verticalOffsetAlign === "bottom") {
-      const d = Ct(t.marginY, r * e);
-      l = i.endY - d - o;
+      const l = Ct(t.marginY, r * e);
+      d = i.endY - l - o;
     } else
-      l = i.startY + Ct(t.marginY, r);
+      d = i.startY + Ct(t.marginY, r);
   }
   return {
     rotate: 0,
     startX: a,
-    startY: l,
+    startY: d,
     endX: i.endX,
     endY: i.endY,
     width: s,
@@ -2391,14 +2398,14 @@ function Ct(i, t) {
   const e = Number.parseFloat(i);
   return t * e / 100;
 }
-const Es = (i) => {
+const Ts = (i) => {
   const { floatDomInfos: t, scene: e, skeleton: n, worksheet: r } = i, s = Qi(() => t.map((o) => {
-    const { width: a, height: l, angle: u, left: c, top: d } = o.transform, g = Ir(
+    const { width: a, height: d, angle: u, left: c, top: l } = o.transform, g = Ir(
       {
         left: c != null ? c : 0,
         right: (c != null ? c : 0) + (a != null ? a : 0),
-        top: d != null ? d : 0,
-        bottom: (d != null ? d : 0) + (l != null ? l : 0)
+        top: l != null ? l : 0,
+        bottom: (l != null ? l : 0) + (d != null ? d : 0)
       },
       e,
       n,
@@ -2412,10 +2419,10 @@ const Es = (i) => {
       endY: g.bottom,
       rotate: u,
       width: a * h,
-      height: l * f,
+      height: d * f,
       absolute: g.absolute
     }, m = {
-      position$: new ke(p),
+      position$: new We(p),
       position: p,
       id: o.drawingId,
       componentKey: o.componentKey,
@@ -2434,11 +2441,11 @@ const Es = (i) => {
   }), [t, e, n, r]);
   return /* @__PURE__ */ oe("div", { style: { position: "absolute", top: 0, left: 0 }, children: s.map(([o, a]) => /* @__PURE__ */ oe(Bi, { layer: a, id: o, position: a.position }, o)) });
 };
-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--)
+var Es = Object.getOwnPropertyDescriptor, Os = (i, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Es(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);
+}, De = (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();
@@ -2450,8 +2457,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((l) => {
-              const u = a.data[l];
+            return a && a.order.forEach((d) => {
+              const u = a.data[d];
               u.drawingType !== B.DRAWING_CHART && u.drawingType !== B.DRAWING_DOM && this._drawingRenderService.renderDrawing(u, r);
             }), e();
           }
@@ -2468,16 +2475,16 @@ let Ot = class extends ne {
             const o = s.with(V).getSkeletonParam(r);
             if (!o)
               return e(i);
-            const a = this._drawingManagerService.getDrawingDataForUnit(n), l = a == null ? void 0 : a[t.subUnitId];
-            if (!l)
+            const a = this._drawingManagerService.getDrawingDataForUnit(n), d = a == null ? void 0 : a[t.subUnitId];
+            if (!d)
               return e(i);
-            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]);
+            const { scaleX: u, scaleY: c } = s.scene, l = i ? { ...i } : { startColumn: 0, endColumn: 0, endRow: 0, startRow: 0 }, g = d.order.map((h) => d.data[h]);
             return g.length ? (g.forEach((h) => {
-              if (!h.groupId && h.transform && De.isDefine(h.transform.left) && De.isDefine(h.transform.top) && De.isDefine(h.transform.width) && De.isDefine(h.transform.height)) {
+              if (!h.groupId && h.transform && Re.isDefine(h.transform.left) && Re.isDefine(h.transform.top) && Re.isDefine(h.transform.width) && Re.isDefine(h.transform.height)) {
                 const 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 < 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);
+                f.column < l.startColumn && (l.startColumn = f.column), f.row < l.startRow && (l.startRow = f.row), l.endRow < p.row && (l.endRow = p.row), l.endColumn < p.column && (l.endColumn = p.column);
               }
-            }), e(d)) : e(i);
+            }), e(l)) : e(i);
           }
         }
       )
@@ -2499,16 +2506,16 @@ let Ot = class extends ne {
                     componentKey: this._componetManager.get(Qr)
                   };
                 if (c.drawingType === B.DRAWING_DOM) {
-                  const d = this._sheetPrintInterceptorService.getPrintComponent(c.componentKey);
+                  const l = this._sheetPrintInterceptorService.getPrintComponent(c.componentKey);
                   return {
                     ...c,
-                    componentKey: this._componetManager.get(d || c.componentKey)
+                    componentKey: this._componetManager.get(l || c.componentKey)
                   };
                 }
                 return null;
-              }).filter(Boolean), l = ji(Es, this._injector);
+              }).filter(Boolean), d = ji(Ts, this._injector);
               return Di(
-                /* @__PURE__ */ oe(l, { floatDomInfos: a, scene: t.scene, skeleton: t.skeleton, worksheet: t.worksheet }),
+                /* @__PURE__ */ oe(d, { floatDomInfos: a, scene: t.scene, skeleton: t.skeleton, worksheet: t.worksheet }),
                 t.root
               ), i == null || i.add(() => {
                 Ri(t.root);
@@ -2521,13 +2528,13 @@ let Ot = class extends ne {
   }
 };
 Ot = Os([
-  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))
+  De(0, A(xr)),
+  De(1, A(lr)),
+  De(2, ie),
+  De(3, J),
+  De(4, A(et)),
+  De(5, A(dr)),
+  De(6, A(Xe))
 ], 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--)
@@ -2563,8 +2570,8 @@ const As = [
   vi.id
 ];
 let rn = class extends ne {
-  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();
+  constructor(i, t, e, n, r, s, o, a, d) {
+    super(), this._context = i, this._renderManagerService = t, this._commandService = e, this._selectionRenderService = n, this._skeletonManagerService = r, this._sheetInterceptorService = s, this._sheetDrawingService = o, this._drawingManagerService = a, this._univerInstanceService = d, this._sheetInterceptorListener(), this._commandListener(), this._sheetRefreshListener();
   }
   _sheetInterceptorListener() {
     this.disposeWithMe(
@@ -2632,19 +2639,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), l = [], u = [];
+    const n = e.unitId, r = e.subUnitId, s = [], o = [], a = this._sheetDrawingService.getDrawingData(n, r), d = [], u = [];
     if (Object.keys(a).forEach((c) => {
-      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)
+      const l = a[c], { updateDrawings: g, deleteDrawings: h } = this._getUpdateOrDeleteDrawings(i, t, l);
+      d.push(...g), u.push(...h);
+    }), d.length === 0 && u.length === 0)
       return { redos: [], undos: [] };
-    if (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 (d.length > 0) {
+      const c = this._sheetDrawingService.getBatchUpdateOp(d), { undo: l, redo: g, objects: h } = c;
+      s.push({ id: P.id, params: { unitId: n, subUnitId: r, op: g, objects: h, type: U.UPDATE } }), o.push({ id: P.id, params: { unitId: n, subUnitId: r, op: l, objects: h, type: U.UPDATE } });
     }
     if (u.length > 0) {
-      const 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 } });
+      const c = this._sheetDrawingService.getBatchRemoveOp(u), l = c.undo, g = c.redo, h = c.objects;
+      s.push({ id: P.id, params: { unitId: n, subUnitId: r, op: g, objects: h, type: U.REMOVE } }), o.push({ id: P.id, params: { unitId: n, subUnitId: r, op: l, objects: h, type: U.INSERT } });
     }
     return s.push({ id: Y.id, params: [n] }), o.push({ id: Y.id, params: [n] }), {
       redos: s,
@@ -2652,7 +2659,7 @@ let rn = class extends ne {
     };
   }
   _getUpdateOrDeleteDrawings(i, t, e) {
-    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;
+    const n = [], r = [], { sheetTransform: s, anchorType: o = O.Position, transform: a, unitId: d, subUnitId: u, drawingId: c } = e, { from: l, to: g } = s, { row: h, column: f } = l, { row: p, column: m } = g;
     if (s == null || a == null)
       return {
         updateDrawings: n,
@@ -2662,14 +2669,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: l, subUnitId: u, drawingId: c });
+        r.push({ unitId: d, 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: l, subUnitId: u, drawingId: c });
+        r.push({ unitId: d, 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;
@@ -2698,35 +2705,35 @@ 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 d = n[c], { sheetTransform: g, transform: h, anchorType: f = O.Position } = d;
+      const l = n[c], { sheetTransform: g, transform: h, anchorType: f = O.Position } = l;
       if (f === O.None)
-        this._remainDrawingSize(h, r, d);
+        this._remainDrawingSize(h, r, l);
       else {
         const { from: p, to: m } = g, { row: _, column: v } = p, { row: I, column: R } = m;
         for (let S = 0; S < e.length; S++) {
-          const C = e[S], { startRow: w, endRow: y, startColumn: D, endColumn: E } = C;
+          const C = e[S], { startRow: w, endRow: y, startColumn: D, endColumn: T } = C;
           if (R < D)
             continue;
           if (f === O.Position) {
             let b = null, N = null;
-            if (v >= D && v <= E) {
-              const x = this._skeletonManagerService.attachRangeWithCoord({ startColumn: v, endColumn: E, startRow: p.row, endRow: m.row });
+            if (v >= D && v <= T) {
+              const x = this._skeletonManagerService.attachRangeWithCoord({ startColumn: v, endColumn: T, startRow: p.row, endRow: m.row });
               if (x == null)
                 return;
               N = { ...h, left: x.startX };
             }
             if (N != null && (b = $(N, this._selectionRenderService), b != null && N != null)) {
-              r.push({ ...d, sheetTransform: b, transform: N });
+              r.push({ ...l, sheetTransform: b, transform: N });
               break;
             }
-            this._remainDrawingSize(h, r, d);
+            this._remainDrawingSize(h, r, l);
             continue;
           }
-          if (v >= D && R <= E)
+          if (v >= D && R <= T)
             continue;
-          let T = null, M = null;
-          if (v >= D && v <= E) {
-            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: v, endColumn: E, startRow: p.row, endRow: m.row });
+          let E = null, M = null;
+          if (v >= D && v <= T) {
+            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: v, endColumn: T, startRow: p.row, endRow: m.row });
             if (b == null)
               return;
             M = {
@@ -2734,7 +2741,7 @@ let rn = class extends ne {
               left: (b == null ? void 0 : b.startX) || 0,
               width: ((h == null ? void 0 : h.width) || 0) - b.endX + b.startX
             };
-          } else if (R >= D && R <= E) {
+          } else if (R >= D && R <= T) {
             const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: D, endColumn: R, startRow: p.row, endRow: m.row });
             if (b == null)
               return;
@@ -2743,35 +2750,35 @@ let rn = class extends ne {
               left: b.startX - ((h == null ? void 0 : h.width) || 0)
             };
           } else {
-            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: D, endColumn: E, startRow: p.row, endRow: m.row });
+            const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: D, endColumn: T, startRow: p.row, endRow: m.row });
             if (b == null)
               return;
             if (M = {
               ...h,
               width: ((h == null ? void 0 : h.width) || 0) - b.endX + b.startX
-            }, T = $(M, this._selectionRenderService), T != null && M != null) {
-              s.push({ ...d, sheetTransform: T, transform: M });
+            }, E = $(M, this._selectionRenderService), E != null && M != null) {
+              s.push({ ...l, sheetTransform: E, transform: M });
               break;
             }
           }
-          if (M != null && (T = $(M, this._selectionRenderService)), M != null && T != null) {
-            r.push({ ...d, sheetTransform: T, transform: M });
+          if (M != null && (E = $(M, this._selectionRenderService)), M != null && E != null) {
+            r.push({ ...l, sheetTransform: E, transform: M });
             break;
           } else
-            this._remainDrawingSize(h, r, d);
+            this._remainDrawingSize(h, r, l);
         }
       }
     }), r.length === 0 && s.length === 0)
       return { redos: [], undos: [] };
-    const { redos: o, undos: a } = this._createUndoAndRedoMutation(i, t, r), l = [], u = [];
+    const { redos: o, undos: a } = this._createUndoAndRedoMutation(i, t, r), d = [], u = [];
     if (s.length > 0) {
-      const { redos: c, undos: d } = this._createUndoAndRedoMutation(i, t, s);
-      l.push(...c), u.push(...d);
+      const { redos: c, undos: l } = this._createUndoAndRedoMutation(i, t, s);
+      d.push(...c), u.push(...l);
     }
     return {
       redos: o,
       undos: a,
-      preRedos: l,
+      preRedos: d,
       preUndos: u
     };
   }
@@ -2779,26 +2786,26 @@ 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] }
-    ], l = [
+    ], d = [
       { id: P.id, params: { unitId: i, subUnitId: t, op: r, objects: o, type: U.UPDATE } },
       { id: Y.id, params: [i] }
     ];
     return {
       redos: a,
-      undos: l
+      undos: d
     };
   }
   // eslint-disable-next-line max-lines-per-function
   _getDrawingUndoForRowVisible(i, t, e) {
     const n = this._drawingManagerService.getDrawingData(i, t), r = [], s = [];
     if (Object.keys(n).forEach((c) => {
-      const d = n[c], { sheetTransform: g, transform: h, anchorType: f = O.Position } = d;
+      const l = n[c], { sheetTransform: g, transform: h, anchorType: f = O.Position } = l;
       if (f === O.None)
-        this._remainDrawingSize(h, r, d);
+        this._remainDrawingSize(h, r, l);
       else {
         const { from: p, to: m } = g, { row: _, column: v } = p, { row: I, column: R } = m;
         for (let S = 0; S < e.length; S++) {
-          const C = e[S], { startRow: w, endRow: y, startColumn: D, endColumn: E } = C;
+          const C = e[S], { startRow: w, endRow: y, startColumn: D, endColumn: T } = C;
           if (I < w)
             continue;
           if (f === O.Position) {
@@ -2810,15 +2817,15 @@ let rn = class extends ne {
               N = { ...h, top: x.startY };
             }
             if (N != null && (b = $(N, this._selectionRenderService), b != null && N != null)) {
-              r.push({ ...d, sheetTransform: b, transform: N });
+              r.push({ ...l, sheetTransform: b, transform: N });
               break;
             }
-            this._remainDrawingSize(h, r, d);
+            this._remainDrawingSize(h, r, l);
             continue;
           }
           if (_ >= w && I <= y)
             continue;
-          let T = null, M = null;
+          let E = null, M = null;
           if (_ >= w && _ <= y) {
             const b = this._skeletonManagerService.attachRangeWithCoord({ startColumn: p.column, endColumn: m.column, startRow: _, endRow: y });
             if (b == null)
@@ -2843,40 +2850,40 @@ let rn = class extends ne {
             if (M = {
               ...h,
               height: ((h == null ? void 0 : h.height) || 0) - b.endY + b.startY
-            }, T = $(M, this._selectionRenderService), T != null && M != null) {
-              s.push({ ...d, sheetTransform: T, transform: M });
+            }, E = $(M, this._selectionRenderService), E != null && M != null) {
+              s.push({ ...l, sheetTransform: E, transform: M });
               break;
             }
           }
-          if (M != null && (T = $(M, this._selectionRenderService)), M != null && T != null) {
-            r.push({ ...d, sheetTransform: T, transform: M });
+          if (M != null && (E = $(M, this._selectionRenderService)), M != null && E != null) {
+            r.push({ ...l, sheetTransform: E, transform: M });
             break;
           } else
-            this._remainDrawingSize(h, r, d);
+            this._remainDrawingSize(h, r, l);
         }
       }
     }), r.length === 0 && s.length === 0)
       return { redos: [], undos: [] };
-    const { redos: o, undos: a } = this._createUndoAndRedoMutation(i, t, r), l = [], u = [];
+    const { redos: o, undos: a } = this._createUndoAndRedoMutation(i, t, r), d = [], u = [];
     if (s.length > 0) {
-      const { redos: c, undos: d } = this._createUndoAndRedoMutation(i, t, s);
-      l.push(...c), u.push(...d);
+      const { redos: c, undos: l } = this._createUndoAndRedoMutation(i, t, s);
+      d.push(...c), u.push(...l);
     }
     return {
       redos: o,
       undos: a,
-      preRedos: l,
+      preRedos: d,
       preUndos: u
     };
   }
   _getDrawingUndoForRowAndColSize(i, t, e, n) {
     const r = this._drawingManagerService.getDrawingData(i, t), s = [];
     return Object.keys(r).forEach((o) => {
-      const a = r[o], { sheetTransform: l, transform: u, anchorType: c = O.Position } = a;
+      const a = r[o], { sheetTransform: d, transform: u, anchorType: c = O.Position } = a;
       if (c === O.None)
         this._remainDrawingSize(u, s, a);
       else {
-        const { from: d, to: g } = l, { row: h, column: f } = d, { row: p, column: m } = g;
+        const { from: l, to: g } = d, { row: h, column: f } = l, { 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)
@@ -2885,7 +2892,7 @@ let rn = class extends ne {
             this._remainDrawingSize(u, s, a);
             continue;
           }
-          const w = z({ ...l }, this._selectionRenderService, this._skeletonManagerService);
+          const w = z({ ...d }, this._selectionRenderService, this._skeletonManagerService);
           if (w != null) {
             s.push({
               ...a,
@@ -2920,7 +2927,7 @@ let rn = class extends ne {
     const a = Yn(o, e);
     if (!a)
       return { redos: [], undos: [] };
-    const { startX: l, endX: u, startY: c, endY: d } = a, g = this._sheetDrawingService.getDrawingData(r, s), h = [];
+    const { startX: d, endX: u, startY: c, endY: l } = a, g = this._sheetDrawingService.getDrawingData(r, s), h = [];
     Object.keys(g).forEach((S) => {
       const C = g[S];
       if (C.anchorType !== O.Both)
@@ -2928,13 +2935,13 @@ let rn = class extends ne {
       const { transform: w } = C;
       if (!w)
         return;
-      const { left: y = 0, top: D = 0, width: E = 0, height: T = 0 } = w, { drawingStartX: M, drawingEndX: b, drawingStartY: N, drawingEndY: x } = {
+      const { left: y = 0, top: D = 0, width: T = 0, height: E = 0 } = w, { drawingStartX: M, drawingEndX: b, drawingStartY: N, drawingEndY: x } = {
         drawingStartX: y,
-        drawingEndX: y + E,
+        drawingEndX: y + T,
         drawingStartY: D,
-        drawingEndY: D + T
+        drawingEndY: D + E
       };
-      l <= M && b <= u && c <= N && x <= d && h.push(C);
+      d <= M && b <= u && c <= N && x <= l && h.push(C);
     });
     const f = [], p = [], m = t.startRow - e.startRow, _ = t.startColumn - e.startColumn, v = h.map((S) => {
       const C = S.sheetTransform, w = {
@@ -2959,7 +2966,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, l = [], u = [], c = this._sheetDrawingService.getDrawingData(n, r), d = [], g = [];
+    const { unitId: n, subUnitId: r } = e, { range: s } = i, o = s.startRow, a = s.endRow, d = [], u = [], c = this._sheetDrawingService.getDrawingData(n, r), l = [], g = [];
     if (Object.keys(c).forEach((h) => {
       const f = c[h], { sheetTransform: p, transform: m, anchorType: _ = O.Position } = f;
       if (p == null || m == null)
@@ -2980,19 +2987,19 @@ let rn = class extends ne {
       if (!v || !I)
         return;
       const R = { unitId: n, subUnitId: r, drawingId: h, transform: I, sheetTransform: v };
-      d.push(R);
-    }), d.length === 0 && g.length === 0)
+      l.push(R);
+    }), l.length === 0 && g.length === 0)
       return { redos: [], undos: [] };
-    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 (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 (g.length > 0) {
       const h = this._sheetDrawingService.getBatchRemoveOp(g), f = h.undo, p = h.redo, m = h.objects;
-      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 } });
+      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: U.REMOVE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: m, type: U.INSERT } });
     }
-    return l.push({ id: Y.id, params: [n] }), u.push({ id: Y.id, params: [n] }), {
-      redos: l,
+    return d.push({ id: Y.id, params: [n] }), u.push({ id: Y.id, params: [n] }), {
+      redos: d,
       undos: u
     };
   }
@@ -3000,7 +3007,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, l = [], u = [], c = this._sheetDrawingService.getDrawingData(n, r), d = [], g = [];
+    const { unitId: n, subUnitId: r } = e, { range: s } = i, o = s.startColumn, a = s.endColumn, d = [], u = [], c = this._sheetDrawingService.getDrawingData(n, r), l = [], g = [];
     if (Object.keys(c).forEach((h) => {
       const f = c[h], { sheetTransform: p, transform: m, anchorType: _ = O.Position } = f;
       if (p == null || m == null)
@@ -3021,85 +3028,85 @@ let rn = class extends ne {
       if (!v || !I)
         return;
       const R = { unitId: n, subUnitId: r, drawingId: h, transform: I, sheetTransform: v };
-      d.push(R);
-    }), d.length === 0 && g.length === 0)
+      l.push(R);
+    }), l.length === 0 && g.length === 0)
       return { redos: [], undos: [] };
-    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 (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 (g.length > 0) {
       const h = this._sheetDrawingService.getBatchRemoveOp(g), f = h.undo, p = h.redo, m = h.objects;
-      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 } });
+      d.push({ id: P.id, params: { unitId: n, subUnitId: r, op: p, objects: m, type: U.REMOVE } }), u.push({ id: P.id, params: { unitId: n, subUnitId: r, op: f, objects: m, type: U.INSERT } });
     }
-    return l.push({ id: Y.id, params: [n] }), u.push({ id: Y.id, params: [n] }), { redos: l, undos: u };
+    return d.push({ id: Y.id, params: [n] }), u.push({ id: Y.id, params: [n] }), { redos: d, undos: u };
   }
   _expandCol(i, t, e, n, r = O.Position) {
-    const s = n - e + 1, { from: o, to: a } = i, { column: l } = o, { column: u } = a;
+    const s = n - e + 1, { from: o, to: a } = i, { column: d } = o, { column: u } = a;
     if (r === O.None)
       return {
         newSheetTransform: $({ ...t }, this._selectionRenderService),
         newTransform: t
       };
-    let c = null, d = null;
-    if (l >= e) {
+    let c = null, l = null;
+    if (d >= e) {
       const g = this._skeletonManagerService.attachRangeWithCoord({ startColumn: e, endColumn: n, startRow: o.row, endRow: a.row });
       if (g == null)
         return;
-      d = { ...t, left: (t.left || 0) + g.endX - g.startX }, c = $(d, this._selectionRenderService);
+      l = { ...t, left: (t.left || 0) + g.endX - g.startX }, c = $(l, this._selectionRenderService);
     } else if (u >= n)
       if (r === O.Both)
         c = {
           from: { ...o },
           to: { ...a, column: u + s }
-        }, d = z(c, this._selectionRenderService, this._skeletonManagerService);
+        }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
       else
         return {
           newSheetTransform: $({ ...t }, this._selectionRenderService),
           newTransform: t
         };
-    return c != null && d != null ? {
+    return c != null && l != null ? {
       newSheetTransform: c,
-      newTransform: d
+      newTransform: l
     } : null;
   }
   _shrinkCol(i, t, e, n, r = O.Position) {
-    const s = n - e + 1, { from: o, to: a } = i, { column: l } = o, { column: u } = a;
+    const s = n - e + 1, { from: o, to: a } = i, { column: d } = o, { column: u } = a;
     if (r === O.None)
       return {
         newSheetTransform: $({ ...t }, this._selectionRenderService),
         newTransform: t
       };
-    let c = null, d = null;
-    if (l > n)
+    let c = null, l = null;
+    if (d > n)
       c = {
-        from: { ...o, column: l - s },
+        from: { ...o, column: d - s },
         to: { ...a, column: u - s }
-      }, d = z(c, this._selectionRenderService, this._skeletonManagerService);
+      }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
     else {
-      if (l >= e && u <= n)
+      if (d >= e && u <= n)
         return null;
-      if (l < e && u > n)
+      if (d < e && u > n)
         if (r === O.Both)
           c = {
             from: { ...o },
             to: { ...a, column: u - s }
-          }, d = z(c, this._selectionRenderService, this._skeletonManagerService);
+          }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
         else
           return {
             newSheetTransform: $({ ...t }, this._selectionRenderService),
             newTransform: t
           };
-      else if (l >= e && l <= n) {
-        if (l === e)
-          d = { ...t, left: (t.left || 0) - i.from.columnOffset };
+      else if (d >= e && d <= n) {
+        if (d === e)
+          l = { ...t, left: (t.left || 0) - i.from.columnOffset };
         else {
-          const g = this._skeletonManagerService.attachRangeWithCoord({ startColumn: e, endColumn: l - 1, startRow: o.row, endRow: a.row });
+          const g = this._skeletonManagerService.attachRangeWithCoord({ startColumn: e, endColumn: d - 1, startRow: o.row, endRow: a.row });
           if (g == null)
             return;
-          d = { ...t, left: (t.left || 0) - g.endX + g.startX - i.from.columnOffset };
+          l = { ...t, left: (t.left || 0) - g.endX + g.startX - i.from.columnOffset };
         }
-        c = $(d, this._selectionRenderService);
+        c = $(l, this._selectionRenderService);
       } else if (u >= e && u <= n && r === O.Both) {
         const g = this._skeletonManagerService.attachRangeWithCoord({
           startColumn: e - 1,
@@ -3112,27 +3119,27 @@ let rn = class extends ne {
         c = {
           from: { ...o },
           to: { ...a, column: e - 1, columnOffset: g.endX - g.startX }
-        }, d = z(c, this._selectionRenderService, this._skeletonManagerService);
+        }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
       }
     }
-    return c != null && d != null ? {
+    return c != null && l != null ? {
       newSheetTransform: c,
-      newTransform: d
+      newTransform: l
     } : null;
   }
   _expandRow(i, t, e, n, r = O.Position) {
-    const s = n - e + 1, { from: o, to: a } = i, { row: l } = o, { row: u } = a;
+    const s = n - e + 1, { from: o, to: a } = i, { row: d } = o, { row: u } = a;
     if (r === O.None)
       return {
         newSheetTransform: $({ ...t }, this._selectionRenderService),
         newTransform: t
       };
-    let c = null, d = null;
-    if (l >= e) {
+    let c = null, l = null;
+    if (d >= e) {
       const g = this._skeletonManagerService.attachRangeWithCoord({ startRow: e, endRow: n, startColumn: o.column, endColumn: a.column });
       if (g == null)
         return;
-      d = { ...t, top: (t.top || 0) + g.endY - g.startY }, c = $(d, this._selectionRenderService);
+      l = { ...t, top: (t.top || 0) + g.endY - g.startY }, c = $(l, this._selectionRenderService);
     } else if (u >= n)
       if (r === O.Both)
         c = {
@@ -3141,54 +3148,54 @@ let rn = class extends ne {
             ...a,
             row: u + s
           }
-        }, d = z(c, this._selectionRenderService, this._skeletonManagerService);
+        }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
       else
         return {
           newSheetTransform: $({ ...t }, this._selectionRenderService),
           newTransform: t
         };
-    return c != null && d != null ? {
+    return c != null && l != null ? {
       newSheetTransform: c,
-      newTransform: d
+      newTransform: l
     } : null;
   }
   _shrinkRow(i, t, e, n, r = O.Position) {
-    const s = n - e + 1, { from: o, to: a } = i, { row: l } = o, { row: u } = a;
+    const s = n - e + 1, { from: o, to: a } = i, { row: d } = o, { row: u } = a;
     if (r === O.None)
       return {
         newSheetTransform: $({ ...t }, this._selectionRenderService),
         newTransform: t
       };
-    let c = null, d = null;
-    if (l > n)
+    let c = null, l = null;
+    if (d > n)
       c = {
-        from: { ...o, row: l - s },
+        from: { ...o, row: d - s },
         to: { ...a, row: u - s }
-      }, d = z(c, this._selectionRenderService, this._skeletonManagerService);
+      }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
     else {
-      if (l >= e && u <= n)
+      if (d >= e && u <= n)
         return null;
-      if (l < e && u > n)
+      if (d < e && u > n)
         if (r === O.Both)
           c = {
             from: { ...o },
             to: { ...a, row: u - s }
-          }, d = z(c, this._selectionRenderService, this._skeletonManagerService);
+          }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
         else
           return {
             newSheetTransform: $({ ...t }, this._selectionRenderService),
             newTransform: t
           };
-      else if (l >= e && l <= n) {
-        if (l === e)
-          d = { ...t, top: (t.top || 0) - i.from.rowOffset };
+      else if (d >= e && d <= n) {
+        if (d === e)
+          l = { ...t, top: (t.top || 0) - i.from.rowOffset };
         else {
-          const g = this._skeletonManagerService.attachRangeWithCoord({ startRow: e, endRow: l - 1, startColumn: o.column, endColumn: a.column });
+          const g = this._skeletonManagerService.attachRangeWithCoord({ startRow: e, endRow: d - 1, startColumn: o.column, endColumn: a.column });
           if (g == null)
             return;
-          d = { ...t, top: (t.top || 0) - g.endY + g.startY - i.from.rowOffset };
+          l = { ...t, top: (t.top || 0) - g.endY + g.startY - i.from.rowOffset };
         }
-        c = $(d, this._selectionRenderService);
+        c = $(l, this._selectionRenderService);
       } else if (u >= e && u <= n && r === O.Both) {
         const g = this._skeletonManagerService.attachRangeWithCoord({ startColumn: o.column, endColumn: o.column, startRow: e - 1, endRow: e - 1 });
         if (g == null)
@@ -3196,12 +3203,12 @@ let rn = class extends ne {
         c = {
           from: { ...o },
           to: { ...a, row: e - 1, rowOffset: g.endY - g.startY }
-        }, d = z(c, this._selectionRenderService, this._skeletonManagerService);
+        }, l = z(c, this._selectionRenderService, this._skeletonManagerService);
       }
     }
-    return c != null && d != null ? {
+    return c != null && l != null ? {
       newSheetTransform: c,
-      newTransform: d
+      newTransform: l
     } : null;
   }
   _commandListener() {
@@ -3246,13 +3253,13 @@ let rn = class extends ne {
       Object.keys(e).forEach((s) => {
         const o = e[s];
         o != null && Object.keys(o).forEach((a) => {
-          const l = o[a].data;
-          l != null && Object.keys(l).forEach((u) => {
+          const d = o[a].data;
+          d != null && Object.keys(d).forEach((u) => {
             if (s === i && a === t) {
-              const c = l[u];
-              c.transform = z(c.sheetTransform, this._selectionRenderService, this._skeletonManagerService), n.push(l[u]);
+              const c = d[u];
+              c.transform = z(c.sheetTransform, this._selectionRenderService, this._skeletonManagerService), n.push(d[u]);
             } else
-              r.push(l[u]);
+              r.push(d[u]);
           });
         });
       }), this._drawingManagerService.removeNotification(r), this._drawingManagerService.addNotification(n);
@@ -3271,10 +3278,10 @@ 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: l, anchorType: u = O.Position } = o;
+      const o = n[s], { sheetTransform: a, transform: d, anchorType: u = O.Position } = o;
       if (u === O.None)
         return !0;
-      const { from: c, to: d } = a, { row: g, column: h } = c, { row: f, column: p } = d;
+      const { from: c, to: l } = a, { row: g, column: h } = c, { row: f, column: p } = l;
       for (let m = 0; m < e.length; m++) {
         const _ = e[m], { startRow: v, endRow: I, startColumn: R, endColumn: S } = _;
         if (ei.intersects(
@@ -3296,8 +3303,8 @@ let rn = class extends ne {
             ...o,
             transform: {
               ...w,
-              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
+              width: C ? d == null ? void 0 : d.width : w == null ? void 0 : w.width,
+              height: C ? d == null ? void 0 : d.height : w == null ? void 0 : w.height
             }
           });
           break;
@@ -3309,7 +3316,7 @@ let rn = class extends ne {
 rn = Ps([
   me(1, J),
   me(2, G),
-  me(3, Fe),
+  me(3, xe),
   me(4, A(V)),
   me(5, A(At)),
   me(6, re),
@@ -3321,21 +3328,21 @@ const ks = (i) => {
   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, l = r.getRenderById(a), u = l == null ? void 0 : l.scene;
+  const { unitId: a } = o, d = r.getRenderById(a), u = d == null ? void 0 : d.scene;
   if (u == null)
     return;
-  const c = u.getTransformerByCreate(), [d, g] = Qt(!0), h = (v = o.anchorType) != null ? v : O.Position, [f, p] = Qt(h);
+  const c = u.getTransformerByCreate(), [l, 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) => {
       const { oKey: w } = C, y = R.getDrawingOKey(w);
       if (y == null)
         return S.push(null), !0;
-      const { unitId: D, subUnitId: E, drawingId: T, drawingType: M, anchorType: b, sheetTransform: N } = y;
+      const { unitId: D, subUnitId: T, drawingId: E, drawingType: M, anchorType: b, sheetTransform: N } = y;
       S.push({
         unitId: D,
-        subUnitId: E,
-        drawingId: T,
+        subUnitId: T,
+        drawingId: E,
         anchorType: b,
         sheetTransform: N,
         drawingType: M
@@ -3380,7 +3387,7 @@ const ks = (i) => {
     "div",
     {
       className: bi("univer-grid univer-gap-2 univer-py-2 univer-text-gray-400", {
-        "univer-hidden": !d
+        "univer-hidden": !l
       }),
       children: [
         /* @__PURE__ */ oe(
@@ -3455,13 +3462,13 @@ const Fs = {
   }
 };
 function it(i) {
-  return !i.getContextValue(ti) && !i.getContextValue(ni) && !i.getContextValue(ri) && i.getContextValue(je);
+  return !i.getContextValue(ti) && !i.getContextValue(ni) && !i.getContextValue(ri) && i.getContextValue($e);
 }
 const xs = {
   id: rt.id,
   description: "shortcut.drawing-move-down",
   group: "4_drawing-view",
-  binding: $e.ARROW_DOWN,
+  binding: Fe.ARROW_DOWN,
   priority: 100,
   preconditions: it,
   staticParameters: {
@@ -3471,7 +3478,7 @@ const xs = {
   id: rt.id,
   description: "shortcut.drawing-move-up",
   group: "4_drawing-view",
-  binding: $e.ARROW_UP,
+  binding: Fe.ARROW_UP,
   priority: 100,
   preconditions: it,
   staticParameters: {
@@ -3481,7 +3488,7 @@ const xs = {
   id: rt.id,
   description: "shortcut.drawing-move-left",
   group: "4_drawing-view",
-  binding: $e.ARROW_LEFT,
+  binding: Fe.ARROW_LEFT,
   priority: 100,
   preconditions: it,
   staticParameters: {
@@ -3491,7 +3498,7 @@ const xs = {
   id: rt.id,
   description: "shortcut.drawing-move-right",
   group: "4_drawing-view",
-  binding: $e.ARROW_RIGHT,
+  binding: Fe.ARROW_RIGHT,
   priority: 100,
   preconditions: it,
   staticParameters: {
@@ -3503,14 +3510,14 @@ const xs = {
   group: "4_drawing-view",
   // when focusing on any other input tag do not trigger this shortcut
   preconditions: it,
-  binding: $e.DELETE,
-  mac: $e.BACKSPACE
+  binding: Fe.DELETE,
+  mac: Fe.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;
-}, Ne = (i, t) => (e, n) => t(e, n, i);
+}, ke = (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();
@@ -3556,12 +3563,12 @@ let Ut = class extends ne {
   }
 };
 Ut = Hs([
-  Ne(0, A(dr)),
-  Ne(1, Fi),
-  Ne(2, G),
-  Ne(3, xi),
-  Ne(4, ie),
-  Ne(5, A(on))
+  ke(0, A(dr)),
+  ke(1, Fi),
+  ke(2, G),
+  ke(3, xi),
+  ke(4, ie),
+  ke(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--)
@@ -3585,8 +3592,8 @@ let Pt = class extends oi {
       [Ut],
       [Rt],
       [Ot],
-      [Tt],
       [Et],
+      [Tt],
       [bt],
       [Mt],
       [yt]
@@ -3596,13 +3603,13 @@ let Pt = class extends oi {
   }
   onReady() {
     xt(this._injector, [
-      [Et],
+      [Tt],
       [yt]
     ]);
   }
   onRendered() {
     this._registerRenderModules(), xt(this._injector, [
-      [Tt],
+      [Et],
       [Ot],
       [Ut],
       [bt],
@@ -3627,7 +3634,7 @@ Dr(Pt, "type", F.UNIVER_SHEET);
 Dr(Pt, "pluginName", qs);
 Pt = Zs([
   ii(Ui, Xi, Ki, di),
-  Lt(1, A(Ye)),
+  Lt(1, A(Xe)),
   Lt(2, J),
   Lt(3, si)
 ], Pt);