@univerjs/docs-drawing-ui 0.2.8 → 0.2.10

package/lib/es/index.js

@@ -9,7 +9,7 @@ import { IDocDrawingService, UniverDocsDrawingPlugin } from "@univerjs/docs-draw
 import { ITextSelectionRenderManager, IRenderManagerService, DocumentEditArea, Liquid, TRANSFORM_CHANGE_OBSERVABLE_TYPE, PageLayoutType, NodePositionConvertToCursor, getOneTextSelectionRange, DocumentSkeletonPageType, Vector2, getAnchorBounding, Rect, getColor, TEXT_RANGE_LAYER_INDEX } from "@univerjs/engine-render";
 import { takeUntil, Observable, BehaviorSubject, filter, debounceTime } from "rxjs";
 import { DocCanvasPopManagerService, docDrawingPositionToTransform } from "@univerjs/docs-ui";
-import { RichTextEditingMutation, getRichTextEditPath, TextSelectionManagerService, DocSkeletonManagerService, getRetainAndDeleteFromReplace, SetDocZoomRatioOperation, getDocObject } from "@univerjs/docs";
+import { RichTextEditingMutation, getRichTextEditPath, TextSelectionManagerService, DocSkeletonManagerService, getRetainAndDeleteFromReplace, getCustomBlockIdsInSelections, SetDocZoomRatioOperation, getDocObject } from "@univerjs/docs";
 import { ISidebarService, MenuItemType, MenuPosition, MenuGroup, getMenuHiddenObservable, KeyCode, ComponentManager, IMenuService, IShortcutService, IMessageService, IEditorService } from "@univerjs/ui";
 import React, { forwardRef, useRef, createElement, useState, useEffect } from "react";
 import clsx from "clsx";
@@ -1276,7 +1276,7 @@ const UpdateDocDrawingWrappingStyleCommand = {
   type: CommandType.COMMAND,
   // eslint-disable-next-line max-lines-per-function
   handler: /* @__PURE__ */ __name((accessor, params) => {
-    var _a8, _b;
+    var _a8, _b, _c, _d;
     if (params == null)
       return !1;
     const commandService = accessor.get(ICommandService), textSelectionManagerService = accessor.get(TextSelectionManagerService), univerInstanceService = accessor.get(IUniverInstanceService), activeTextRange = textSelectionManagerService.getActiveTextRangeWithStyle(), documentDataModel = univerInstanceService.getCurrentUniverDocInstance();
@@ -1286,6 +1286,7 @@ const UpdateDocDrawingWrappingStyleCommand = {
     if (body == null)
       return !1;
     const textX = new TextX(), jsonX = JSONX.getInstance(), rawActions = [], drawingOrderLength = (_b = (_a8 = documentDataModel.getSnapshot().drawingsOrder) == null ? void 0 : _a8.length) != null ? _b : 0;
+    let removeDrawingLen = 0;
     if (collapsed)
       startOffset > 0 && textX.push({
         t: TextXActionType.RETAIN,
@@ -1295,6 +1296,15 @@ const UpdateDocDrawingWrappingStyleCommand = {
     else {
       const { dos } = getRetainAndDeleteFromReplace(activeTextRange, segmentId, 0, body);
       textX.push(...dos);
+      const removedCustomBlockIds = getCustomBlockIdsInSelections(body, [activeTextRange]), drawings2 = (_c = documentDataModel.getDrawings()) != null ? _c : {}, drawingOrder = (_d = documentDataModel.getDrawingsOrder()) != null ? _d : [], sortedRemovedCustomBlockIds = removedCustomBlockIds.sort((a, b) => drawingOrder.indexOf(a) > drawingOrder.indexOf(b) ? -1 : drawingOrder.indexOf(a) < drawingOrder.indexOf(b) ? 1 : 0);
+      if (sortedRemovedCustomBlockIds.length > 0)
+        for (const blockId of sortedRemovedCustomBlockIds) {
+          const drawing = drawings2[blockId], drawingIndex = drawingOrder.indexOf(blockId);
+          if (drawing == null || drawingIndex < 0)
+            continue;
+          const removeDrawingAction = jsonX.removeOp(["drawings", blockId], drawing), removeDrawingOrderAction = jsonX.removeOp(["drawingsOrder", drawingIndex], blockId);
+          rawActions.push(removeDrawingAction), rawActions.push(removeDrawingOrderAction), removeDrawingLen++;
+        }
     }
     textX.push({
       t: TextXActionType.INSERT,
@@ -1312,7 +1322,7 @@ const UpdateDocDrawingWrappingStyleCommand = {
     const path = getRichTextEditPath(documentDataModel, segmentId), placeHolderAction = jsonX.editOp(textX.serialize(), path);
     rawActions.push(placeHolderAction);
     for (const drawing of drawings) {
-      const { drawingId } = drawing, addDrawingAction = jsonX.insertOp(["drawings", drawingId], drawing), addDrawingOrderAction = jsonX.insertOp(["drawingsOrder", drawingOrderLength], drawingId);
+      const { drawingId } = drawing, addDrawingAction = jsonX.insertOp(["drawings", drawingId], drawing), addDrawingOrderAction = jsonX.insertOp(["drawingsOrder", drawingOrderLength - removeDrawingLen], drawingId);
       rawActions.push(addDrawingAction), rawActions.push(addDrawingOrderAction);
     }
     const doMutation = {