@univerjs/docs-drawing-ui 0.6.3 → 0.6.4-nightly.202503101606

package/lib/es/index.js

@@ -1,25 +1,25 @@
 var Ct = Object.defineProperty;
 var Dt = (i, e, n) => e in i ? Ct(i, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : i[e] = n;
 var Ce = (i, e, n) => Dt(i, typeof e != "symbol" ? e + "" : e, n);
-import { Disposable as Xe, UndoCommand as Ot, RedoCommand as Tt, JSONX as q, IUniverInstanceService as K, ICommandService as z, PositionedObjectLayoutType as H, CommandType as Y, BooleanNumber as oe, ObjectRelativeFromH as ne, ObjectRelativeFromV as V, Tools as ye, TextX as vn, TextXActionType as Q, toDisposable as Le, throttle as Tn, COLORS as Pt, MemoryCursor as yt, IUndoRedoService as Vn, BuildTextUtils as bt, ArrangeTypeEnum as Ze, Inject as ve, IContextService as jn, LocaleService as ln, WrapTextType as $e, DrawingTypeEnum as Mt, FOCUSING_COMMON_DRAWINGS as tn, UniverInstanceType as be, Direction as fe, DocumentFlavor as fn, DOCS_ZEN_EDITOR_UNIT_ID_KEY as In, FOCUSING_UNIVER_EDITOR as Rt, RxDisposable as Nt, SHEET_EDITOR_UNITS as Et, LifecycleService as At, fromEventSubject as xt, LifecycleStages as Pn, DependentOn as Lt, Injector as Bt, IConfigService as Ut, Plugin as kt, merge as Ft } from "@univerjs/core";
-import { IDocDrawingService as Be, UniverDocsDrawingPlugin as Ht } from "@univerjs/docs-drawing";
-import { IDrawingManagerService as Ie, IImageIoService as Wt, DRAWING_IMAGE_ALLOW_IMAGE_LIST as Gt, DRAWING_IMAGE_COUNT_LIMIT as yn, ImageUploadStatusType as hn, DRAWING_IMAGE_ALLOW_SIZE as Vt, getImageSize as jt, getDrawingShapeKeyByDrawingSearch as $t, DRAWING_IMAGE_WIDTH_LIMIT as bn, DRAWING_IMAGE_HEIGHT_LIMIT as Mn, UniverDrawingPlugin as zt } from "@univerjs/drawing";
-import { DrawingCommonPanel as qt, ImageCropperObject as Xt, COMPONENT_IMAGE_POPUP_MENU as Kt, OpenImageCropOperation as Yt, ImageResetSizeOperation as Zt, UniverDrawingUIPlugin as Qt } from "@univerjs/drawing-ui";
-import { IRenderManagerService as ee, DocumentEditArea as Fe, Liquid as $n, PageLayoutType as Rn, DocumentSkeletonPageType as Nn, Vector2 as Jt, Rect as ei, getColor as ni, getCurrentTypeOfRenderer as ti, TRANSFORM_CHANGE_OBSERVABLE_TYPE as ii } from "@univerjs/engine-render";
-import { IMessageService as ri, ILocalFileService as oi, ISidebarService as si, useDependency as we, getMenuHiddenObservable as zn, MenuItemType as qn, RibbonStartGroup as ai, KeyCode as He, ComponentManager as ci, IMenuManagerService as di, IShortcutService as li, UniverUIPlugin as gi } from "@univerjs/ui";
+import { Disposable as Xe, BlockType as Ot, UndoCommand as Tt, RedoCommand as Pt, JSONX as q, IUniverInstanceService as K, ICommandService as z, PositionedObjectLayoutType as H, CommandType as Y, BooleanNumber as oe, ObjectRelativeFromH as ne, ObjectRelativeFromV as V, Tools as ye, TextX as vn, TextXActionType as Q, toDisposable as Le, throttle as Tn, COLORS as yt, MemoryCursor as bt, IUndoRedoService as Vn, BuildTextUtils as Mt, ArrangeTypeEnum as Ze, Inject as ve, IContextService as jn, LocaleService as ln, WrapTextType as $e, DrawingTypeEnum as Rt, FOCUSING_COMMON_DRAWINGS as tn, UniverInstanceType as be, Direction as fe, DocumentFlavor as fn, DOCS_ZEN_EDITOR_UNIT_ID_KEY as In, FOCUSING_UNIVER_EDITOR as Nt, RxDisposable as Et, SHEET_EDITOR_UNITS as At, LifecycleService as xt, fromEventSubject as Lt, LifecycleStages as Pn, DependentOn as Bt, Injector as Ut, IConfigService as kt, Plugin as Ft, merge as Ht } from "@univerjs/core";
+import { IDocDrawingService as Be, UniverDocsDrawingPlugin as Wt } from "@univerjs/docs-drawing";
+import { IDrawingManagerService as Ie, IImageIoService as Gt, DRAWING_IMAGE_ALLOW_IMAGE_LIST as Vt, DRAWING_IMAGE_COUNT_LIMIT as yn, ImageUploadStatusType as hn, DRAWING_IMAGE_ALLOW_SIZE as jt, getImageSize as $t, getDrawingShapeKeyByDrawingSearch as zt, DRAWING_IMAGE_WIDTH_LIMIT as bn, DRAWING_IMAGE_HEIGHT_LIMIT as Mn, UniverDrawingPlugin as qt } from "@univerjs/drawing";
+import { DrawingCommonPanel as Xt, ImageCropperObject as Kt, COMPONENT_IMAGE_POPUP_MENU as Yt, OpenImageCropOperation as Zt, ImageResetSizeOperation as Qt, UniverDrawingUIPlugin as Jt } from "@univerjs/drawing-ui";
+import { IRenderManagerService as ee, DocumentEditArea as Fe, Liquid as $n, PageLayoutType as Rn, DocumentSkeletonPageType as Nn, Vector2 as ei, Rect as ni, getColor as ti, getCurrentTypeOfRenderer as ii, TRANSFORM_CHANGE_OBSERVABLE_TYPE as ri } from "@univerjs/engine-render";
+import { IMessageService as oi, ILocalFileService as si, ISidebarService as ai, useDependency as we, getMenuHiddenObservable as zn, MenuItemType as qn, RibbonStartGroup as ci, KeyCode as He, ComponentManager as di, IMenuManagerService as li, IShortcutService as gi, UniverUIPlugin as mi } from "@univerjs/ui";
 import { RichTextEditingMutation as J, DocSkeletonManagerService as se, DocSelectionManagerService as _n } from "@univerjs/docs";
-import { DocSelectionRenderService as Me, getRichTextEditPath as ze, NodePositionConvertToCursor as En, getOneTextSelectionRange as An, getAnchorBounding as mi, TEXT_RANGE_LAYER_INDEX as ui, getDocObject as fi, getCustomBlockIdsInSelections as hi, docDrawingPositionToTransform as pi, DocCanvasPopManagerService as wi, IEditorService as vi, SetDocZoomRatioOperation as Ii } from "@univerjs/docs-ui";
-import { BehaviorSubject as _i, debounceTime as Xn, Observable as Si, takeUntil as xn, filter as Ln } from "rxjs";
-import { MessageType as Bn, clsx as j, InputNumber as ke, Select as Un, Checkbox as Ci, RadioGroup as kn, Radio as Pe } from "@univerjs/design";
+import { DocSelectionRenderService as Me, getRichTextEditPath as ze, NodePositionConvertToCursor as En, getOneTextSelectionRange as An, getAnchorBounding as ui, TEXT_RANGE_LAYER_INDEX as fi, getDocObject as hi, getCustomBlockIdsInSelections as pi, docDrawingPositionToTransform as wi, DocCanvasPopManagerService as vi, IEditorService as Ii, SetDocZoomRatioOperation as _i } from "@univerjs/docs-ui";
+import { BehaviorSubject as Si, debounceTime as Xn, Observable as Ci, takeUntil as xn, filter as Ln } from "rxjs";
+import { MessageType as Bn, clsx as j, InputNumber as ke, Select as Un, Checkbox as Di, RadioGroup as kn, Radio as Pe } from "@univerjs/design";
 import { jsxs as X, jsx as f } from "react/jsx-runtime";
-import { forwardRef as Kn, useRef as Di, createElement as Yn, useState as re, useEffect as Sn } from "react";
-const Oi = "docs-drawing-ui.config", Fn = {};
-var Ti = Object.getOwnPropertyDescriptor, Pi = (i, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Ti(e, n) : e, o = i.length - 1, s; o >= 0; o--)
+import { forwardRef as Kn, useRef as Oi, createElement as Yn, useState as re, useEffect as Sn } from "react";
+const Ti = "docs-drawing-ui.config", Fn = {};
+var Pi = Object.getOwnPropertyDescriptor, yi = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? Pi(e, n) : e, o = i.length - 1, s; o >= 0; o--)
     (s = i[o]) && (r = s(r) || r);
   return r;
 }, Ve = (i, e) => (n, t) => e(n, t, i);
-function yi(i) {
+function bi(i) {
   var t, r, o, s;
   if (q.isNoop(i) || !Array.isArray(i))
     return null;
@@ -42,7 +42,7 @@ function yi(i) {
     });
   return n;
 }
-function bi(i) {
+function Mi(i) {
   if (!Array.isArray(i) || i.length < 3 || i[0] !== "drawingsOrder")
     return [];
   const e = [];
@@ -67,24 +67,27 @@ let rn = class extends Xe {
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((i) => {
+        var a, d;
         if (i.id !== J.id)
           return;
-        const e = i.params, { unitId: n, actions: t } = e, r = yi(t);
-        if (r != null)
-          for (const { type: o, drawingId: s, drawing: a } of r)
-            o === "add" ? this._addDrawings(n, [a]) : this._removeDrawings(n, [s]);
+        const e = i.params, { unitId: n, actions: t } = e, r = this._univerInstanceService.getUniverDocInstance(n), o = (d = (a = r == null ? void 0 : r.getBody()) == null ? void 0 : a.customBlocks) != null ? d : [], s = bi(t);
+        if (s != null)
+          for (const { type: c, drawingId: l, drawing: m } of s) {
+            const g = o.find((p) => p.blockId === l);
+            (g == null ? void 0 : g.blockType) !== Ot.CUSTOM && (c === "add" ? this._addDrawings(n, [m]) : this._removeDrawings(n, [l]));
+          }
       })
     ), this.disposeWithMe(
       this._commandService.onCommandExecuted((i) => {
         if (i.id !== J.id)
           return;
         const e = i.params, { unitId: n, actions: t } = e;
-        bi(t).length > 0 && this._updateDrawingsOrder(n);
+        Mi(t).length > 0 && this._updateDrawingsOrder(n);
       })
     ), this.disposeWithMe(
       this._commandService.onCommandExecuted((i) => {
         var s;
-        if (i.id !== Ot.id && i.id !== Tt.id)
+        if (i.id !== Tt.id && i.id !== Pt.id)
           return;
         const e = (s = this._univerInstanceService.getCurrentUniverDocInstance()) == null ? void 0 : s.getUnitId(), n = this._drawingManagerService.getFocusDrawings();
         if (e == null || n.length === 0)
@@ -125,7 +128,7 @@ let rn = class extends Xe {
     t.orderNotification(o), r.orderNotification(o);
   }
 };
-rn = Pi([
+rn = yi([
   Ve(0, K),
   Ve(1, z),
   Ve(2, Ie),
@@ -134,7 +137,7 @@ rn = Pi([
 ], rn);
 class gn {
   constructor() {
-    Ce(this, "_refreshDrawings$", new _i(null));
+    Ce(this, "_refreshDrawings$", new Si(null));
     Ce(this, "refreshDrawings$", this._refreshDrawings$.asObservable());
   }
   refreshDrawings(e) {
@@ -142,7 +145,7 @@ class gn {
   }
 }
 var ue = /* @__PURE__ */ ((i) => (i.INLINE = "inline", i.BEHIND_TEXT = "behindText", i.IN_FRONT_OF_TEXT = "inFrontOfText", i.WRAP_SQUARE = "wrapSquare", i.WRAP_TOP_AND_BOTTOM = "wrapTopAndBottom", i))(ue || {});
-const Mi = {
+const Ri = {
   inline: H.INLINE,
   wrapSquare: H.WRAP_SQUARE,
   wrapTopAndBottom: H.WRAP_TOP_AND_BOTTOM,
@@ -239,7 +242,7 @@ const Qn = {
       return !1;
     const p = l.getEditArea(), h = m.getTransformerByCreate(), { pages: v, skeHeaders: w, skeFooters: S } = c, O = q.getInstance(), D = [], { drawings: T = {} } = g.getSnapshot();
     for (const N of n) {
-      const { drawingId: I } = N, L = T[I].layoutType, W = Mi[t];
+      const { drawingId: I } = N, L = T[I].layoutType, W = Ri[t];
       if (L !== W) {
         const C = O.replaceOp(["drawings", I, "layoutType"], L, W);
         D.push(C);
@@ -499,12 +502,12 @@ const Qn = {
     return s.refreshControls(), !!W;
   }
 };
-var Ri = Object.getOwnPropertyDescriptor, Ni = (i, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Ri(e, n) : e, o = i.length - 1, s; o >= 0; o--)
+var Ni = Object.getOwnPropertyDescriptor, Ei = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? Ni(e, n) : e, o = i.length - 1, s; o >= 0; o--)
     (s = i[o]) && (r = s(r) || r);
   return r;
 }, Qe = (i, e) => (n, t) => e(n, t, i);
-const Ei = "__InlineDrawingAnchor__";
+const Ai = "__InlineDrawingAnchor__";
 function Hn(i) {
   const { path: e } = i;
   return e.some((n) => n === "cells");
@@ -921,7 +924,7 @@ let on = class extends Xe {
     return { scene: t, transformer: r };
   }
   _getTransformCoordForDocumentOffset(e, n, t, r) {
-    const { documentTransform: o } = e.getOffsetConfig(), s = n.transformVector2SceneCoord(Jt.FromArray([t, r]));
+    const { documentTransform: o } = e.getOffsetConfig(), s = n.transformVector2SceneCoord(ei.FromArray([t, r]));
     if (s)
       return o.clone().invert().applyPoint(s);
   }
@@ -932,23 +935,23 @@ let on = class extends Xe {
     const { mainComponent: r, scene: o } = t, s = r, {
       docsLeft: a,
       docsTop: d
-    } = s.getOffsetConfig(), c = mi(n), { left: l, top: m, height: g } = c, p = l + a, h = m + d;
+    } = s.getOffsetConfig(), c = ui(n), { left: l, top: m, height: g } = c, p = l + a, h = m + d;
     if (this._anchorShape) {
       this._anchorShape.transformByState({ left: p, top: h, height: g }), this._anchorShape.show();
       return;
     }
-    const v = 6, w = new ei(Ei + ye.generateRandomId(v), {
+    const v = 6, w = new ni(Ai + ye.generateRandomId(v), {
       left: p,
       top: h,
       height: g,
       strokeWidth: 2,
-      stroke: ni(Pt.darkGray, 1),
+      stroke: ti(yt.darkGray, 1),
       evented: !1
     });
-    this._anchorShape = w, o.addObject(w, ui);
+    this._anchorShape = w, o.addObject(w, fi);
   }
   _getDocObject() {
-    return fi(this._univerInstanceService, this._renderManagerService);
+    return hi(this._univerInstanceService, this._renderManagerService);
   }
   _getPageContentSize(e) {
     const n = this._renderManagerService.getRenderById(e.unitId), t = n == null ? void 0 : n.with(se).getSkeleton(), r = 500, o = 500, s = t == null ? void 0 : t.getSkeletonData();
@@ -979,7 +982,7 @@ let on = class extends Xe {
       };
   }
 };
-on = Ni([
+on = Ei([
   Qe(0, z),
   Qe(1, K),
   Qe(2, Ie),
@@ -993,7 +996,7 @@ var he = function() {
     }
     return i;
   }, he.apply(this, arguments);
-}, Ai = function(i, e) {
+}, xi = function(i, e) {
   var n = {};
   for (var t in i) Object.prototype.hasOwnProperty.call(i, t) && e.indexOf(t) < 0 && (n[t] = i[t]);
   if (i != null && typeof Object.getOwnPropertySymbols == "function")
@@ -1001,15 +1004,15 @@ var he = function() {
       e.indexOf(t[r]) < 0 && Object.prototype.propertyIsEnumerable.call(i, t[r]) && (n[t[r]] = i[t[r]]);
   return n;
 }, it = Kn(function(i, e) {
-  var n = i.icon, t = i.id, r = i.className, o = i.extend, s = Ai(i, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(t, " ").concat(r || "").trim(), d = Di("_".concat(Bi()));
+  var n = i.icon, t = i.id, r = i.className, o = i.extend, s = xi(i, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(t, " ").concat(r || "").trim(), d = Oi("_".concat(Ui()));
   return rt(n, "".concat(t), { defIds: n.defIds, idSuffix: d.current }, he({ ref: e, className: a }, s), o);
 });
 function rt(i, e, n, t, r) {
-  return Yn(i.tag, he(he({ key: e }, xi(i, n, r)), t), (Li(i, n).children || []).map(function(o, s) {
+  return Yn(i.tag, he(he({ key: e }, Li(i, n, r)), t), (Bi(i, n).children || []).map(function(o, s) {
     return rt(o, "".concat(e, "-").concat(i.tag, "-").concat(s), n, void 0, r);
   }));
 }
-function xi(i, e, n) {
+function Li(i, e, n) {
   var t = he({}, i.attrs);
   n != null && n.colorChannel1 && t.fill === "colorChannel1" && (t.fill = n.colorChannel1), i.tag === "mask" && t.id && (t.id = t.id + e.idSuffix), Object.entries(t).forEach(function(o) {
     var s = o[0], a = o[1];
@@ -1021,21 +1024,21 @@ function xi(i, e, n) {
     typeof a == "string" && (t[s] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), t;
 }
-function Li(i, e) {
+function Bi(i, e) {
   var n, t = e.defIds;
   return !t || t.length === 0 ? i : i.tag === "defs" && (!((n = i.children) === null || n === void 0) && n.length) ? he(he({}, i), { children: i.children.map(function(r) {
     return typeof r.attrs.id == "string" && t && t.indexOf(r.attrs.id) > -1 ? he(he({}, r), { attrs: he(he({}, r.attrs), { id: r.attrs.id + e.idSuffix }) }) : r;
   }) }) : i;
 }
-function Bi() {
+function Ui() {
   return Math.random().toString(36).substring(2, 8);
 }
 it.displayName = "UniverIcon";
-var Ui = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M2.2498 3.65005C2.2498 2.87685 2.87661 2.25005 3.64981 2.25005H7.9998C8.33118 2.25005 8.5998 1.98142 8.5998 1.65005C8.5998 1.31868 8.33118 1.05005 7.9998 1.05005H3.64981C2.21387 1.05005 1.0498 2.21411 1.0498 3.65005V12.35C1.0498 13.786 2.21386 14.95 3.6498 14.95H12.3498C13.7857 14.95 14.9498 13.786 14.9498 12.3501V8.00005C14.9498 7.66868 14.6812 7.40005 14.3498 7.40005C14.0184 7.40005 13.7498 7.66868 13.7498 8.00005V9.23974L12.2385 8.1063C11.7252 7.72129 11.0068 7.7723 10.5531 8.22605L9.00869 9.77041L6.73916 7.8251C6.24387 7.40055 5.5095 7.41278 5.02864 7.85359L2.2498 10.4009V3.65005ZM2.2498 12.0287V12.35C2.2498 13.1232 2.87661 13.75 3.6498 13.75H12.3498C13.123 13.75 13.7498 13.1232 13.7498 12.3501V10.7397L11.5186 9.06631C11.4829 9.03956 11.433 9.04314 11.4016 9.07458L9.92249 10.5537L11.1015 11.5642C11.3531 11.7799 11.3822 12.1587 11.1666 12.4103C10.9509 12.6619 10.5721 12.691 10.3205 12.4753L5.9582 8.7362C5.92384 8.70674 5.87288 8.70758 5.83952 8.73816L2.2498 12.0287Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M11.8097 1.14783C12.1411 1.14783 12.4097 1.41646 12.4097 1.74783V3.297H14.1541C14.4855 3.297 14.7541 3.56563 14.7541 3.897C14.7541 4.22837 14.4855 4.497 14.1541 4.497H12.4097V6.24167C12.4097 6.57304 12.1411 6.84167 11.8097 6.84167C11.4783 6.84167 11.2097 6.57304 11.2097 6.24167V4.497H9.6603C9.32893 4.497 9.0603 4.22837 9.0603 3.897C9.0603 3.56563 9.32893 3.297 9.6603 3.297H11.2097V1.74783C11.2097 1.41646 11.4783 1.14783 11.8097 1.14783Z" } }] }, ot = Kn(function(i, e) {
+var ki = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M2.2498 3.65005C2.2498 2.87685 2.87661 2.25005 3.64981 2.25005H7.9998C8.33118 2.25005 8.5998 1.98142 8.5998 1.65005C8.5998 1.31868 8.33118 1.05005 7.9998 1.05005H3.64981C2.21387 1.05005 1.0498 2.21411 1.0498 3.65005V12.35C1.0498 13.786 2.21386 14.95 3.6498 14.95H12.3498C13.7857 14.95 14.9498 13.786 14.9498 12.3501V8.00005C14.9498 7.66868 14.6812 7.40005 14.3498 7.40005C14.0184 7.40005 13.7498 7.66868 13.7498 8.00005V9.23974L12.2385 8.1063C11.7252 7.72129 11.0068 7.7723 10.5531 8.22605L9.00869 9.77041L6.73916 7.8251C6.24387 7.40055 5.5095 7.41278 5.02864 7.85359L2.2498 10.4009V3.65005ZM2.2498 12.0287V12.35C2.2498 13.1232 2.87661 13.75 3.6498 13.75H12.3498C13.123 13.75 13.7498 13.1232 13.7498 12.3501V10.7397L11.5186 9.06631C11.4829 9.03956 11.433 9.04314 11.4016 9.07458L9.92249 10.5537L11.1015 11.5642C11.3531 11.7799 11.3822 12.1587 11.1666 12.4103C10.9509 12.6619 10.5721 12.691 10.3205 12.4753L5.9582 8.7362C5.92384 8.70674 5.87288 8.70758 5.83952 8.73816L2.2498 12.0287Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M11.8097 1.14783C12.1411 1.14783 12.4097 1.41646 12.4097 1.74783V3.297H14.1541C14.4855 3.297 14.7541 3.56563 14.7541 3.897C14.7541 4.22837 14.4855 4.497 14.1541 4.497H12.4097V6.24167C12.4097 6.57304 12.1411 6.84167 11.8097 6.84167C11.4783 6.84167 11.2097 6.57304 11.2097 6.24167V4.497H9.6603C9.32893 4.497 9.0603 4.22837 9.0603 3.897C9.0603 3.56563 9.32893 3.297 9.6603 3.297H11.2097V1.74783C11.2097 1.41646 11.4783 1.14783 11.8097 1.14783Z" } }] }, ot = Kn(function(i, e) {
   return Yn(it, Object.assign({}, i, {
     id: "add-image-single",
     ref: e,
-    icon: Ui
+    icon: ki
   }));
 });
 ot.displayName = "AddImageSingle";
@@ -1048,7 +1051,7 @@ const Cn = {
     const n = i.get(z), t = i.get(K), r = i.get(ee), o = t.getCurrentUniverDocInstance();
     if (e == null || o == null)
       return !1;
-    const s = r.getRenderById(e.unitId).with(Me), { drawings: a } = e, d = (M = s.getSegment()) != null ? M : "", c = new vn(), l = q.getInstance(), m = (E = (y = o.getSelfOrHeaderFooterModel(d).getBody()) == null ? void 0 : y.customBlocks) != null ? E : [], g = a.map((N) => m.find((I) => I.blockId === N.drawingId)).filter((N) => !!N).sort((N, I) => N.startIndex > I.startIndex ? 1 : -1), p = a[0].unitId, h = new yt();
+    const s = r.getRenderById(e.unitId).with(Me), { drawings: a } = e, d = (M = s.getSegment()) != null ? M : "", c = new vn(), l = q.getInstance(), m = (E = (y = o.getSelfOrHeaderFooterModel(d).getBody()) == null ? void 0 : y.customBlocks) != null ? E : [], g = a.map((N) => m.find((I) => I.blockId === N.drawingId)).filter((N) => !!N).sort((N, I) => N.startIndex > I.startIndex ? 1 : -1), p = a[0].unitId, h = new bt();
     h.reset();
     const v = g[0].startIndex, w = [
       {
@@ -1140,9 +1143,9 @@ const Cn = {
         len: l
       });
     else {
-      const I = bt.selection.delete([o], g, 0, null, !1);
+      const I = Mt.selection.delete([o], g, 0, null, !1);
       p.push(...I);
-      const L = hi(g, [o]), W = (U = s.getDrawings()) != null ? U : {}, x = (N = s.getDrawingsOrder()) != null ? N : [], G = L.sort((_, C) => x.indexOf(_) > x.indexOf(C) ? -1 : x.indexOf(_) < x.indexOf(C) ? 1 : 0);
+      const L = pi(g, [o]), W = (U = s.getDrawings()) != null ? U : {}, x = (N = s.getDrawingsOrder()) != null ? N : [], G = L.sort((_, C) => x.indexOf(_) > x.indexOf(C) ? -1 : x.indexOf(_) < x.indexOf(C) ? 1 : 0);
       if (G.length > 0)
         for (const _ of G) {
           const C = W[_], R = x.indexOf(_);
@@ -1223,8 +1226,8 @@ const Cn = {
     return !1;
   }
 };
-var ki = Object.getOwnPropertyDescriptor, Fi = (i, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? ki(e, n) : e, o = i.length - 1, s; o >= 0; o--)
+var Fi = Object.getOwnPropertyDescriptor, Hi = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? Fi(e, n) : e, o = i.length - 1, s; o >= 0; o--)
     (s = i[o]) && (r = s(r) || r);
   return r;
 }, me = (i, e) => (n, t) => e(n, t, i);
@@ -1235,7 +1238,7 @@ let sn = class extends Xe {
   async insertDocImage() {
     const i = await this._fileOpenerService.openFile({
       multiple: !0,
-      accept: Gt.map((n) => `.${n.replace("image/", "")}`).join(",")
+      accept: Vt.map((n) => `.${n.replace("image/", "")}`).join(",")
     }), e = i.length;
     return e > yn ? (this._messageService.show({
       type: Bn.Error,
@@ -1252,7 +1255,7 @@ let sn = class extends Xe {
       let s = "";
       switch (o) {
         case hn.ERROR_EXCEED_SIZE:
-          s = this._localeService.t("update-status.exceedMaxSize", String(Vt / (1024 * 1024)));
+          s = this._localeService.t("update-status.exceedMaxSize", String(jt / (1024 * 1024)));
           break;
         case hn.ERROR_IMAGE_TYPE:
           s = this._localeService.t("update-status.invalidImageType");
@@ -1272,7 +1275,7 @@ let sn = class extends Xe {
     for (const r of e) {
       if (r == null)
         continue;
-      const { imageId: o, imageSourceType: s, source: a, base64Cache: d } = r, { width: c, height: l, image: m } = await jt(d || "");
+      const { imageId: o, imageSourceType: s, source: a, base64Cache: d } = r, { width: c, height: l, image: m } = await $t(d || "");
       this._imageIoService.addImageSourceCache(o, s, m);
       let g = 1;
       if (c > bn || l > Mn) {
@@ -1286,10 +1289,10 @@ let sn = class extends Xe {
         unitId: n,
         subUnitId: n,
         drawingId: o,
-        drawingType: Mt.DRAWING_IMAGE,
+        drawingType: Rt.DRAWING_IMAGE,
         imageSourceType: s,
         source: a,
-        transform: pi(p),
+        transform: wi(p),
         docTransform: p,
         behindDoc: oe.FALSE,
         title: "",
@@ -1410,7 +1413,7 @@ let sn = class extends Xe {
       return;
     const r = i.getSnapshot(), { drawings: o = {} } = r, s = t.getEditArea() === Fe.BODY;
     for (const d of Object.keys(o)) {
-      const c = o[d], l = $t({ unitId: n, drawingId: c.drawingId, subUnitId: n }), m = e.fuzzyMathObjects(l, !0);
+      const c = o[d], l = zt({ unitId: n, drawingId: c.drawingId, subUnitId: n }), m = e.fuzzyMathObjects(l, !0);
       if (m.length)
         for (const g of m)
           e.detachTransformerFrom(g), g.setOpacity(0.5), (s && c.isMultiTransform !== oe.TRUE || !s && c.isMultiTransform === oe.TRUE) && (e.attachTransformerTo(g), g.setOpacity(1));
@@ -1444,19 +1447,19 @@ let sn = class extends Xe {
     this._docSelectionManagerService.replaceDocRanges(t);
   }
 };
-sn = Fi([
+sn = Hi([
   me(1, z),
   me(2, ve(_n)),
   me(3, ee),
-  me(4, Wt),
+  me(4, Gt),
   me(5, Be),
   me(6, Ie),
   me(7, jn),
-  me(8, ri),
+  me(8, oi),
   me(9, ve(ln)),
   me(10, ve(Me)),
   me(11, ve(gn)),
-  me(12, oi)
+  me(12, si)
 ], sn);
 const gt = {
   id: "doc.command.insert-float-image",
@@ -1464,7 +1467,7 @@ const gt = {
   handler: (i) => {
     var t, r;
     const e = i.get(K), n = i.get(ee);
-    return (r = (t = ti(be.UNIVER_DOC, e, n)) == null ? void 0 : t.with(sn).insertDocImage()) != null ? r : !1;
+    return (r = (t = ii(be.UNIVER_DOC, e, n)) == null ? void 0 : t.with(sn).insertDocImage()) != null ? r : !1;
   }
 }, Ke = {
   id: "doc.command.move-drawing",
@@ -1497,7 +1500,7 @@ const gt = {
     });
     return m.refreshControls(), !!h;
   }
-}, Hi = {
+}, Wi = {
   id: "doc.operation.clear-drawing-transformer",
   type: Y.MUTATION,
   handler: (i, e) => {
@@ -1511,7 +1514,7 @@ const gt = {
   id: "sidebar.operation.doc-image",
   type: Y.COMMAND,
   handler: async (i, e) => {
-    const n = i.get(si), t = i.get(ln), r = i.get(Ie);
+    const n = i.get(ai), t = i.get(ln), r = i.get(Ie);
     switch (e.value) {
       case "open":
         n.open({
@@ -1537,17 +1540,17 @@ const gt = {
     const n = i.get(Ie), t = i.get(z);
     return e == null ? !1 : (n.focusDrawing([e]), t.executeCommand(ut.id, { value: "open" }), !0);
   }
-}, Wi = "univer-image-common-panel", Gi = "univer-image-common-panel-grid", Vi = "univer-image-common-panel-border", ji = "univer-image-common-panel-title", $i = "univer-image-common-panel-subtitle", zi = "univer-image-common-panel-row", qi = "univer-image-common-panel-column", Xi = "univer-image-common-panel-span2", Ki = "univer-image-common-panel-input", u = {
-  imageCommonPanel: Wi,
-  imageCommonPanelGrid: Gi,
-  imageCommonPanelBorder: Vi,
-  imageCommonPanelTitle: ji,
-  imageCommonPanelSubtitle: $i,
-  imageCommonPanelRow: zi,
-  imageCommonPanelColumn: qi,
-  imageCommonPanelSpan2: Xi,
-  imageCommonPanelInput: Ki
-}, Wn = -1e3, Gn = 1e3, Yi = (i) => {
+}, Gi = "univer-image-common-panel", Vi = "univer-image-common-panel-grid", ji = "univer-image-common-panel-border", $i = "univer-image-common-panel-title", zi = "univer-image-common-panel-subtitle", qi = "univer-image-common-panel-row", Xi = "univer-image-common-panel-column", Ki = "univer-image-common-panel-span2", Yi = "univer-image-common-panel-input", u = {
+  imageCommonPanel: Gi,
+  imageCommonPanelGrid: Vi,
+  imageCommonPanelBorder: ji,
+  imageCommonPanelTitle: $i,
+  imageCommonPanelSubtitle: zi,
+  imageCommonPanelRow: qi,
+  imageCommonPanelColumn: Xi,
+  imageCommonPanelSpan2: Ki,
+  imageCommonPanelInput: Yi
+}, Wn = -1e3, Gn = 1e3, Zi = (i) => {
   const e = we(z), n = we(ln), t = we(Ie), r = we(ee), o = we(K), { drawings: s } = i, a = s[0];
   if (a == null)
     return;
@@ -1776,9 +1779,9 @@ const gt = {
       ] }) })
     ] }),
     /* @__PURE__ */ f("div", { className: u.imageCommonPanelRow, children: /* @__PURE__ */ f("div", { className: j(u.imageCommonPanelColumn, u.imageCommonPanelSubtitle), children: /* @__PURE__ */ f("div", { children: n.t("image-position.options") }) }) }),
-    /* @__PURE__ */ f("div", { className: u.imageCommonPanelRow, style: { marginBottom: "50px" }, children: /* @__PURE__ */ f("div", { className: u.imageCommonPanelColumn, children: /* @__PURE__ */ f(Ci, { disabled: w, checked: y, onChange: _, children: n.t("image-position.moveObjectWithText") }) }) })
+    /* @__PURE__ */ f("div", { className: u.imageCommonPanelRow, style: { marginBottom: "50px" }, children: /* @__PURE__ */ f("div", { className: u.imageCommonPanelColumn, children: /* @__PURE__ */ f(Di, { disabled: w, checked: y, onChange: _, children: n.t("image-position.moveObjectWithText") }) }) })
   ] });
-}, Je = 0, en = 100, Zi = (i) => {
+}, Je = 0, en = 100, Qi = (i) => {
   const e = we(z), n = we(ln), t = we(Ie), r = we(ee), o = we(K), { drawings: s } = i, a = s[0];
   if (a == null)
     return null;
@@ -1991,7 +1994,7 @@ const gt = {
       ] }) })
     ] })
   ] });
-}, Qi = () => {
+}, Ji = () => {
   const i = we(Ie), e = i.getFocusDrawings(), [n, t] = re(e);
   return Sn(() => {
     const r = i.focus$.subscribe((o) => {
@@ -2001,13 +2004,13 @@ const gt = {
       r.unsubscribe();
     };
   }, []), !!(n != null && n.length) && /* @__PURE__ */ X("div", { className: u.imageCommonPanel, children: [
-    /* @__PURE__ */ f(qt, { drawings: n, hasAlign: !1, hasCropper: !1, hasGroup: !1, hasTransform: !1 }),
-    /* @__PURE__ */ f(Zi, { drawings: n }),
-    /* @__PURE__ */ f(Yi, { drawings: n })
+    /* @__PURE__ */ f(Xt, { drawings: n, hasAlign: !1, hasCropper: !1, hasGroup: !1, hasTransform: !1 }),
+    /* @__PURE__ */ f(Qi, { drawings: n }),
+    /* @__PURE__ */ f(Zi, { drawings: n })
   ] });
-}, ht = "addition-and-subtraction-single", pt = "doc.menu.image", wt = gt.id, Ji = (i) => {
+}, ht = "addition-and-subtraction-single", pt = "doc.menu.image", wt = gt.id, er = (i) => {
   const e = i.get(_n), n = i.get(K);
-  return new Si((t) => {
+  return new Ci((t) => {
     const r = e.textSelection$.subscribe(() => {
       var s;
       const o = e.getActiveTextRange();
@@ -2029,17 +2032,17 @@ const gt = {
     return () => r.unsubscribe();
   });
 };
-function er(i) {
+function nr(i) {
   return {
     id: pt,
     type: qn.SUBITEMS,
     icon: ht,
     tooltip: "docImage.title",
-    disabled$: Ji(i),
+    disabled$: er(i),
     hidden$: zn(i, be.UNIVER_DOC, void 0, In)
   };
 }
-function nr(i) {
+function tr(i) {
   return {
     id: wt,
     title: "docImage.upload.float",
@@ -2047,22 +2050,22 @@ function nr(i) {
     hidden$: zn(i, be.UNIVER_DOC, void 0, In)
   };
 }
-const tr = {
-  [ai.LAYOUT]: {
+const ir = {
+  [ci.LAYOUT]: {
     [pt]: {
       order: 0,
-      menuItemFactory: er,
+      menuItemFactory: nr,
       [wt]: {
         order: 0,
-        menuItemFactory: nr
+        menuItemFactory: tr
       }
     }
   }
 };
 function Ye(i) {
-  return i.getContextValue(Rt) && i.getContextValue(tn);
+  return i.getContextValue(Nt) && i.getContextValue(tn);
 }
-const ir = {
+const rr = {
   id: Ke.id,
   description: "shortcut.doc.drawing-move-down",
   group: "4_doc-drawing-view",
@@ -2072,7 +2075,7 @@ const ir = {
   staticParameters: {
     direction: fe.DOWN
   }
-}, rr = {
+}, or = {
   id: Ke.id,
   description: "shortcut.doc.drawing-move-up",
   group: "4_doc-drawing-view",
@@ -2082,7 +2085,7 @@ const ir = {
   staticParameters: {
     direction: fe.UP
   }
-}, or = {
+}, sr = {
   id: Ke.id,
   description: "shortcut.doc.drawing-move-left",
   group: "4_doc-drawing-view",
@@ -2092,7 +2095,7 @@ const ir = {
   staticParameters: {
     direction: fe.LEFT
   }
-}, sr = {
+}, ar = {
   id: Ke.id,
   description: "shortcut.doc.drawing-move-right",
   group: "4_doc-drawing-view",
@@ -2102,7 +2105,7 @@ const ir = {
   staticParameters: {
     direction: fe.RIGHT
   }
-}, ar = {
+}, cr = {
   id: st.id,
   description: "shortcut.doc.drawing-delete",
   group: "4_doc-drawing-view",
@@ -2111,8 +2114,8 @@ const ir = {
   binding: He.DELETE,
   mac: He.BACKSPACE
 };
-var cr = Object.getOwnPropertyDescriptor, dr = (i, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? cr(e, n) : e, o = i.length - 1, s; o >= 0; o--)
+var dr = Object.getOwnPropertyDescriptor, lr = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? dr(e, n) : e, o = i.length - 1, s; o >= 0; o--)
     (s = i[o]) && (r = s(r) || r);
   return r;
 }, nn = (i, e) => (n, t) => e(n, t, i);
@@ -2122,10 +2125,10 @@ let an = class extends Xe {
   }
   _initCustomComponents() {
     const i = this._componentManager;
-    this.disposeWithMe(i.register(ht, ot)), this.disposeWithMe(i.register(mt, Qi));
+    this.disposeWithMe(i.register(ht, ot)), this.disposeWithMe(i.register(mt, Ji));
   }
   _initMenus() {
-    this._menuManagerService.mergeMenu(tr);
+    this._menuManagerService.mergeMenu(ir);
   }
   _initCommands() {
     [
@@ -2139,7 +2142,7 @@ let an = class extends Xe {
       tt,
       Cn,
       ut,
-      Hi,
+      Wi,
       ft,
       at,
       lt,
@@ -2151,11 +2154,11 @@ let an = class extends Xe {
   _initShortcuts() {
     [
       // sheet drawing shortcuts
-      ir,
       rr,
       or,
       sr,
-      ar
+      ar,
+      cr
     ].forEach((i) => {
       this.disposeWithMe(this._shortcutService.registerShortcut(i));
     });
@@ -2164,18 +2167,18 @@ let an = class extends Xe {
     this._initCommands(), this._initCustomComponents(), this._initMenus(), this._initShortcuts();
   }
 };
-an = dr([
-  nn(0, ve(ci)),
-  nn(1, di),
+an = lr([
+  nn(0, ve(di)),
+  nn(1, li),
   nn(2, z),
-  nn(3, li)
+  nn(3, gi)
 ], an);
-var lr = Object.getOwnPropertyDescriptor, gr = (i, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? lr(e, n) : e, o = i.length - 1, s; o >= 0; o--)
+var gr = Object.getOwnPropertyDescriptor, mr = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? gr(e, n) : e, o = i.length - 1, s; o >= 0; o--)
     (s = i[o]) && (r = s(r) || r);
   return r;
 }, je = (i, e) => (n, t) => e(n, t, i);
-let cn = class extends Nt {
+let cn = class extends Et {
   constructor(e, n, t, r, o) {
     super();
     Ce(this, "_initImagePopupMenu", /* @__PURE__ */ new Set());
@@ -2197,7 +2200,7 @@ let cn = class extends Nt {
   _hasCropObject(e) {
     const n = e.getAllObjects();
     for (const t of n)
-      if (t instanceof Xt)
+      if (t instanceof Kt)
         return !0;
     return !1;
   }
@@ -2228,7 +2231,7 @@ let cn = class extends Nt {
           const { unitId: l, subUnitId: m, drawingId: g } = c, p = this._canvasPopManagerService.attachPopupToObject(
             a,
             {
-              componentKey: Kt,
+              componentKey: Yt,
               direction: "horizontal",
               offset: [2, 0],
               extraProps: {
@@ -2271,7 +2274,7 @@ let cn = class extends Nt {
         index: 0,
         commandId: ft.id,
         commandParams: { unitId: e, subUnitId: n, drawingId: t },
-        disable: !!Et.includes(e)
+        disable: !!At.includes(e)
       },
       {
         label: "image-popup.delete",
@@ -2283,7 +2286,7 @@ let cn = class extends Nt {
       {
         label: "image-popup.crop",
         index: 2,
-        commandId: Yt.id,
+        commandId: Zt.id,
         commandParams: { unitId: e, subUnitId: n, drawingId: t },
         disable: !0
         // TODO: @JOCS, feature is not ready.
@@ -2291,7 +2294,7 @@ let cn = class extends Nt {
       {
         label: "image-popup.reset",
         index: 3,
-        commandId: Zt.id,
+        commandId: Qt.id,
         commandParams: [{ unitId: e, subUnitId: n, drawingId: t }],
         disable: !0
         // TODO: @JOCS, feature is not ready.
@@ -2299,15 +2302,15 @@ let cn = class extends Nt {
     ];
   }
 };
-cn = gr([
+cn = mr([
   je(0, Ie),
-  je(1, ve(wi)),
+  je(1, ve(vi)),
   je(2, ee),
   je(3, K),
   je(4, jn)
 ], cn);
-var mr = Object.getOwnPropertyDescriptor, ur = (i, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? mr(e, n) : e, o = i.length - 1, s; o >= 0; o--)
+var ur = Object.getOwnPropertyDescriptor, fr = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? ur(e, n) : e, o = i.length - 1, s; o >= 0; o--)
     (s = i[o]) && (r = s(r) || r);
   return r;
 }, xe = (i, e) => (n, t) => e(n, t, i);
@@ -2328,7 +2331,7 @@ let wn = class extends Xe {
     });
   }
   _commandExecutedListener() {
-    const e = [J.id, Ii.id];
+    const e = [J.id, _i.id];
     this.disposeWithMe(
       this._commandService.onCommandExecuted((n) => {
         if (e.includes(n.id)) {
@@ -2349,8 +2352,8 @@ let wn = class extends Xe {
   }
   _initResize() {
     this.disposeWithMe(
-      xt(this._context.engine.onTransformChange$).pipe(
-        Ln((e) => e.type === ii.resize),
+      Lt(this._context.engine.onTransformChange$).pipe(
+        Ln((e) => e.type === ri.resize),
         Xn(16)
       ).subscribe(() => {
         var t;
@@ -2447,30 +2450,30 @@ let wn = class extends Xe {
     }, 1e3) : this._lifecycleService.lifecycle$.pipe(Ln((n) => n === Pn.Steady)).subscribe(e);
   }
 };
-wn = ur([
+wn = fr([
   xe(1, ve(se)),
   xe(2, z),
-  xe(3, vi),
+  xe(3, Ii),
   xe(4, Ie),
   xe(5, ve(gn)),
   xe(6, K),
-  xe(7, ve(At))
+  xe(7, ve(xt))
 ], wn);
-var fr = Object.defineProperty, hr = Object.getOwnPropertyDescriptor, pr = (i, e, n) => e in i ? fr(i, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : i[e] = n, wr = (i, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? hr(e, n) : e, o = i.length - 1, s; o >= 0; o--)
+var hr = Object.defineProperty, pr = Object.getOwnPropertyDescriptor, wr = (i, e, n) => e in i ? hr(i, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : i[e] = n, vr = (i, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? pr(e, n) : e, o = i.length - 1, s; o >= 0; o--)
     (s = i[o]) && (r = s(r) || r);
   return r;
-}, pn = (i, e) => (n, t) => e(n, t, i), vt = (i, e, n) => pr(i, typeof e != "symbol" ? e + "" : e, n);
-const vr = "DOC_DRAWING_UI_PLUGIN";
-let dn = class extends kt {
+}, pn = (i, e) => (n, t) => e(n, t, i), vt = (i, e, n) => wr(i, typeof e != "symbol" ? e + "" : e, n);
+const Ir = "DOC_DRAWING_UI_PLUGIN";
+let dn = class extends Ft {
   constructor(i = Fn, e, n, t) {
     super(), this._config = i, this._injector = e, this._renderManagerSrv = n, this._configService = t;
-    const { ...r } = Ft(
+    const { ...r } = Ht(
       {},
       Fn,
       this._config
     );
-    this._configService.setConfig(Oi, r);
+    this._configService.setConfig(Ti, r);
   }
   onStarting() {
     [
@@ -2492,15 +2495,15 @@ let dn = class extends kt {
   }
 };
 vt(dn, "type", be.UNIVER_DOC);
-vt(dn, "pluginName", vr);
-dn = wr([
-  Lt(Qt, zt, Ht, gi),
-  pn(1, ve(Bt)),
+vt(dn, "pluginName", Ir);
+dn = vr([
+  Bt(Jt, qt, Wt, mi),
+  pn(1, ve(Ut)),
   pn(2, ee),
-  pn(3, Ut)
+  pn(3, kt)
 ], dn);
 export {
-  Hi as ClearDocDrawingTransformerOperation,
+  Wi as ClearDocDrawingTransformerOperation,
   pt as DOCS_IMAGE_MENU_ID,
   st as DeleteDocDrawingsCommand,
   ft as EditDocDrawingOperation,