@univerjs/docs 0.2.9 → 0.2.10

package/lib/es/index.js

@@ -1903,6 +1903,19 @@ function getCellOffsets(viewModel, range, position) {
   }
 }
 __name(getCellOffsets, "getCellOffsets");
+function getCustomBlockIdsInSelections(body, selections) {
+  const customBlockIds = [], { customBlocks = [] } = body;
+  for (const selection of selections) {
+    const { startOffset, endOffset } = selection;
+    if (!(startOffset == null || endOffset == null))
+      for (const customBlock of customBlocks) {
+        const { startIndex } = customBlock;
+        startIndex >= startOffset && startIndex < endOffset && customBlockIds.push(customBlock.blockId);
+      }
+  }
+  return customBlockIds;
+}
+__name(getCustomBlockIdsInSelections, "getCustomBlockIdsInSelections");
 function hasRangeInTable(ranges) {
   return ranges.some((range) => {
     const { anchorNodePosition } = range;
@@ -1913,10 +1926,10 @@ __name(hasRangeInTable, "hasRangeInTable");
 const InnerPasteCommand = {
   id: "doc.command.inner-paste",
   type: CommandType.COMMAND,
-  // eslint-disable-next-line max-lines-per-function
+  // eslint-disable-next-line max-lines-per-function, complexity
   handler: /* @__PURE__ */ __name(async (accessor, params) => {
-    var _a11;
-    const { segmentId, textRanges, doc } = params, commandService = accessor.get(ICommandService), textSelectionManagerService = accessor.get(TextSelectionManagerService), univerInstanceService = accessor.get(IUniverInstanceService), selections = textSelectionManagerService.getCurrentTextRanges(), { body, tableSource } = doc;
+    var _a11, _b, _c, _d;
+    const { segmentId, textRanges, doc } = params, commandService = accessor.get(ICommandService), textSelectionManagerService = accessor.get(TextSelectionManagerService), univerInstanceService = accessor.get(IUniverInstanceService), selections = textSelectionManagerService.getCurrentTextRanges(), { body, tableSource, drawings } = doc;
     if (!Array.isArray(selections) || selections.length === 0 || body == null)
       return !1;
     const docDataModel = univerInstanceService.getCurrentUniverDocInstance(), originBody = docDataModel == null ? void 0 : docDataModel.getSelfOrHeaderFooterModel(segmentId).getBody();
@@ -1932,7 +1945,7 @@ const InnerPasteCommand = {
       }
     }, memoryCursor = new MemoryCursor();
     memoryCursor.reset();
-    const textX = new TextX(), jsonX = JSONX.getInstance(), rawActions = [], hasTable = !!((_a11 = body.tables) != null && _a11.length);
+    const textX = new TextX(), jsonX = JSONX.getInstance(), rawActions = [], hasTable = !!((_a11 = body.tables) != null && _a11.length), hasCustomBlock = !!((_b = body.customBlocks) != null && _b.length);
     if (hasTable && segmentId || hasTable && hasRangeInTable(selections))
       return !1;
     for (const selection of selections) {
@@ -1946,6 +1959,17 @@ const InnerPasteCommand = {
           const action = jsonX.insertOp(["tableSource", tableId], table);
           rawActions.push(action);
         }
+      if (hasCustomBlock && drawings) {
+        const drawingLen = (_d = (_c = docDataModel.getSnapshot().drawingsOrder) == null ? void 0 : _c.length) != null ? _d : 0;
+        for (const block of cloneBody.customBlocks) {
+          const { blockId } = block, drawingId = Tools.generateRandomId(6);
+          block.blockId = drawingId;
+          const drawing = Tools.deepClone(drawings[blockId]);
+          drawing.drawingId = drawingId;
+          const action = jsonX.insertOp(["drawings", drawingId], drawing), orderAction = jsonX.insertOp(["drawingsOrder", drawingLen], drawingId);
+          rawActions.push(action), rawActions.push(orderAction);
+        }
+      }
       if (collapsed)
         textX.push({
           t: TextXActionType.RETAIN,
@@ -2070,11 +2094,23 @@ function getCutActionsFromRectRanges(ranges, docDataModel, viewModel, segmentId)
   return rawActions.push(jsonX.editOp(textX.serialize(), path)), rawActions.reduce((acc, cur) => JSONX.compose(acc, cur), null);
 }
 __name(getCutActionsFromRectRanges, "getCutActionsFromRectRanges");
+function getCutActionsFromDocRanges(textRanges, rectRanges, docDataModel, viewModel, segmentId) {
+  let rawActions = [];
+  if (Array.isArray(textRanges) && (textRanges == null ? void 0 : textRanges.length) !== 0 && (rawActions = getCutActionsFromTextRanges(textRanges, docDataModel, segmentId)), Array.isArray(rectRanges) && (rectRanges == null ? void 0 : rectRanges.length) !== 0) {
+    const actions = getCutActionsFromRectRanges(rectRanges, docDataModel, viewModel, segmentId);
+    rawActions == null || rawActions.length === 0 ? rawActions = actions : rawActions = JSONX.compose(
+      rawActions,
+      JSONX.transform(actions, rawActions, "right")
+    );
+  }
+  return rawActions;
+}
+__name(getCutActionsFromDocRanges, "getCutActionsFromDocRanges");
 const INNER_CUT_COMMAND_ID = "doc.command.inner-cut", CutContentCommand = {
   id: INNER_CUT_COMMAND_ID,
   type: CommandType.COMMAND,
   handler: /* @__PURE__ */ __name(async (accessor, params) => {
-    var _a11, _b, _c;
+    var _a11, _b;
     const { segmentId, textRanges } = params, commandService = accessor.get(ICommandService), textSelectionManagerService = accessor.get(TextSelectionManagerService), univerInstanceService = accessor.get(IUniverInstanceService), selections = (_a11 = params.selections) != null ? _a11 : textSelectionManagerService.getCurrentTextRanges(), rectRanges = textSelectionManagerService.getCurrentRectRanges();
     if ((!Array.isArray(selections) || selections.length === 0) && (!Array.isArray(rectRanges) || rectRanges.length === 0))
       return !1;
@@ -2095,30 +2131,9 @@ const INNER_CUT_COMMAND_ID = "doc.command.inner-cut", CutContentCommand = {
         textRanges
       }
     };
-    if (Array.isArray(selections) && (selections == null ? void 0 : selections.length) !== 0 && (doMutation.params.actions = getCutActionsFromTextRanges(selections, docDataModel, segmentId)), Array.isArray(rectRanges) && (rectRanges == null ? void 0 : rectRanges.length) !== 0) {
-      const actions = getCutActionsFromRectRanges(rectRanges, docDataModel, viewModel, segmentId);
-      ((_c = doMutation.params.actions) == null ? void 0 : _c.length) === 0 || doMutation.params.actions == null ? doMutation.params.actions = actions : doMutation.params.actions = JSONX.compose(
-        doMutation.params.actions,
-        JSONX.transform(actions, doMutation.params.actions, "right")
-      );
-    }
-    return !!commandService.syncExecuteCommand(doMutation.id, doMutation.params);
+    return doMutation.params.actions = getCutActionsFromDocRanges(selections, rectRanges, docDataModel, viewModel, segmentId), !!commandService.syncExecuteCommand(doMutation.id, doMutation.params);
   }, "handler")
-};
-function getCustomBlockIdsInSelections(body, selections) {
-  const customBlockIds = [], { customBlocks = [] } = body;
-  for (const selection of selections) {
-    const { startOffset, endOffset } = selection;
-    if (!(startOffset == null || endOffset == null))
-      for (const customBlock of customBlocks) {
-        const { startIndex } = customBlock;
-        startIndex >= startOffset && startIndex < endOffset && customBlockIds.push(customBlock.blockId);
-      }
-  }
-  return customBlockIds;
-}
-__name(getCustomBlockIdsInSelections, "getCustomBlockIdsInSelections");
-const DeleteCustomBlockCommand = {
+}, DeleteCustomBlockCommand = {
   id: "doc.command.delete-custom-block",
   type: CommandType.COMMAND,
   handler: /* @__PURE__ */ __name(async (accessor, params) => {
@@ -4614,7 +4629,9 @@ export {
   generateParagraphs,
   getCommandSkeleton,
   getCursorWhenDelete,
+  getCustomBlockIdsInSelections,
   getCustomRangesInterestsWithRange,
+  getCutActionsFromDocRanges,
   getDeleteSelection,
   getDocObject,
   getDocObjectById,

package/lib/types/commands/commands/clipboard.inner.command.d.ts

@@ -1,11 +1,13 @@
-import { ICommand, IDocumentData, ITextRange } from '@univerjs/core';
-import { ITextRangeWithStyle } from '@univerjs/engine-render';
+import { DocumentDataModel, ICommand, IDocumentBody, IDocumentData, ITextRange, JSONXActions, Nullable } from '@univerjs/core';
+import { DocumentViewModel, ITextRangeWithStyle, RectRange, TextRange } from '@univerjs/engine-render';
+export declare function getCustomBlockIdsInSelections(body: IDocumentBody, selections: ITextRange[]): string[];
 export interface IInnerPasteCommandParams {
     segmentId: string;
     doc: Partial<IDocumentData>;
     textRanges: ITextRangeWithStyle[];
 }
 export declare const InnerPasteCommand: ICommand<IInnerPasteCommandParams>;
+export declare function getCutActionsFromDocRanges(textRanges: Readonly<Nullable<(ITextRange | TextRange)[]>>, rectRanges: Readonly<Nullable<RectRange[]>>, docDataModel: DocumentDataModel, viewModel: DocumentViewModel, segmentId: string): JSONXActions;
 export interface IInnerCutCommandParams {
     segmentId: string;
     textRanges: ITextRangeWithStyle[];

package/lib/types/index.d.ts

@@ -55,6 +55,7 @@ export { ChangeListNestingLevelType } from './commands/commands/list.command';
 export { getCommandSkeleton } from './commands/util';
 export { generateParagraphs } from './commands/commands/break-line.command';
 export type { IInnerCutCommandParams } from './commands/commands/clipboard.inner.command';
+export { getCutActionsFromDocRanges, getCustomBlockIdsInSelections } from './commands/commands/clipboard.inner.command';
 export { CreateDocTableCommand, type ICreateDocTableCommandParams } from './commands/commands/table/doc-table-create.command';
 export { DocTableDeleteRowsCommand, DocTableDeleteColumnsCommand, DocTableDeleteTableCommand } from './commands/commands/table/doc-table-delete.command';
 export type { IDocTableDeleteRowsCommandParams, IDocTableDeleteColumnsCommandParams, IDocTableDeleteTableCommandParams } from './commands/commands/table/doc-table-delete.command';