@atlaskit/editor-plugin-paste 1.0.12 → 1.0.13

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-paste
 
+## 1.0.13
+
+### Patch Changes
+
+- [#86222](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/86222) [`0e1dc019f1cd`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0e1dc019f1cd) - Fix a table content paste issue when copy content from a table cell inside bodied extension
+- [#86724](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/86724) [`718a9aa2424d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/718a9aa2424d) - [ED-22607] Remove references to maxFrames for multi bodied extensions and bump adf-schema from 35.7.0 to 35.8.0
+
 ## 1.0.12
 
 ### Patch Changes

package/dist/cjs/handlers.js

@@ -23,6 +23,7 @@ exports.handlePastePanelOrDecisionContentIntoList = handlePastePanelOrDecisionCo
 exports.handlePastePreservingMarks = handlePastePreservingMarks;
 exports.handleRichText = handleRichText;
 exports.handleSelectedTable = void 0;
+exports.handleTableContentPasteInBodiedExtension = handleTableContentPasteInBodiedExtension;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -665,6 +666,26 @@ var checkExpand = function checkExpand(slice) {
   });
   return hasExpand;
 };
+function handleTableContentPasteInBodiedExtension(slice) {
+  return function (state, dispatch) {
+    var isInsideBodyExtension = (0, _utils2.hasParentNodeOfType)(state.schema.nodes.bodiedExtension)(state.selection);
+    if (!(0, _coreUtils.insideTable)(state) || !isInsideBodyExtension) {
+      return false;
+    }
+    var bodiedExtension = state.schema.nodes.bodiedExtension;
+    var newSlice = (0, _utils.mapSlice)(slice, function (maybeNode) {
+      if (maybeNode.type === bodiedExtension) {
+        return bodiedExtension.createChecked(maybeNode.attrs, maybeNode.content, maybeNode.marks);
+      }
+      return maybeNode;
+    });
+    if (dispatch) {
+      dispatch(state.tr.replaceSelection(newSlice));
+      return true;
+    }
+    return false;
+  };
+}
 function handleExpandPasteInTable(slice) {
   return function (state, dispatch) {
     // Do not handle expand if it's not being pasted into a table

package/dist/cjs/pm-plugins/main.js

@@ -388,6 +388,12 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
             return true;
           }
 
+          // handle the case when copy content from a table cell inside bodied extension
+          if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.copy-paste-in-bodied-extension')) {
+            if ((0, _handlers.handleTableContentPasteInBodiedExtension)(slice)(state, dispatch)) {
+              return true;
+            }
+          }
           // remove annotation marks from the pasted data if they are not present in the document
           // for the cases when they are pasted from external pages
           if (slice.content.size && (0, _utils.containsAnyAnnotations)(slice, state)) {

package/dist/es2019/handlers.js

@@ -648,6 +648,28 @@ const checkExpand = slice => {
   });
   return hasExpand;
 };
+export function handleTableContentPasteInBodiedExtension(slice) {
+  return (state, dispatch) => {
+    const isInsideBodyExtension = hasParentNodeOfType(state.schema.nodes.bodiedExtension)(state.selection);
+    if (!insideTable(state) || !isInsideBodyExtension) {
+      return false;
+    }
+    const {
+      bodiedExtension
+    } = state.schema.nodes;
+    const newSlice = mapSlice(slice, maybeNode => {
+      if (maybeNode.type === bodiedExtension) {
+        return bodiedExtension.createChecked(maybeNode.attrs, maybeNode.content, maybeNode.marks);
+      }
+      return maybeNode;
+    });
+    if (dispatch) {
+      dispatch(state.tr.replaceSelection(newSlice));
+      return true;
+    }
+    return false;
+  };
+}
 export function handleExpandPasteInTable(slice) {
   return (state, dispatch) => {
     // Do not handle expand if it's not being pasted into a table

package/dist/es2019/pm-plugins/main.js

@@ -14,7 +14,7 @@ import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { PastePluginActionTypes } from '../actions';
 import { splitParagraphs, upgradeTextToLists } from '../commands';
-import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks } from '../handlers';
+import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks, handleTableContentPasteInBodiedExtension } from '../handlers';
 import { transformSliceForMedia, transformSliceToCorrectMediaWrapper, transformSliceToMediaSingleWithNewExperience, unwrapNestedMediaElements } from '../plugins/media';
 import { escapeLinks, getPasteSource, htmlContainsSingleFile, htmlHasInvalidLinkTags, isPastedFromExcel, isPastedFromWord, removeDuplicateInvalidLinks, transformUnsupportedBlockCardToInline } from '../util';
 import { htmlHasIncompleteTable, isPastedFromTinyMCEConfluence, tryRebuildCompleteTableHtml } from '../util/tinyMCE';
@@ -359,6 +359,12 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
             return true;
           }
 
+          // handle the case when copy content from a table cell inside bodied extension
+          if (getBooleanFF('platform.editor.table.copy-paste-in-bodied-extension')) {
+            if (handleTableContentPasteInBodiedExtension(slice)(state, dispatch)) {
+              return true;
+            }
+          }
           // remove annotation marks from the pasted data if they are not present in the document
           // for the cases when they are pasted from external pages
           if (slice.content.size && containsAnyAnnotations(slice, state)) {

package/dist/esm/handlers.js

@@ -643,6 +643,26 @@ var checkExpand = function checkExpand(slice) {
   });
   return hasExpand;
 };
+export function handleTableContentPasteInBodiedExtension(slice) {
+  return function (state, dispatch) {
+    var isInsideBodyExtension = hasParentNodeOfType(state.schema.nodes.bodiedExtension)(state.selection);
+    if (!insideTable(state) || !isInsideBodyExtension) {
+      return false;
+    }
+    var bodiedExtension = state.schema.nodes.bodiedExtension;
+    var newSlice = mapSlice(slice, function (maybeNode) {
+      if (maybeNode.type === bodiedExtension) {
+        return bodiedExtension.createChecked(maybeNode.attrs, maybeNode.content, maybeNode.marks);
+      }
+      return maybeNode;
+    });
+    if (dispatch) {
+      dispatch(state.tr.replaceSelection(newSlice));
+      return true;
+    }
+    return false;
+  };
+}
 export function handleExpandPasteInTable(slice) {
   return function (state, dispatch) {
     // Do not handle expand if it's not being pasted into a table

package/dist/esm/pm-plugins/main.js

@@ -16,7 +16,7 @@ import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { PastePluginActionTypes } from '../actions';
 import { splitParagraphs, upgradeTextToLists } from '../commands';
-import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks } from '../handlers';
+import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks, handleTableContentPasteInBodiedExtension } from '../handlers';
 import { transformSliceForMedia, transformSliceToCorrectMediaWrapper, transformSliceToMediaSingleWithNewExperience, unwrapNestedMediaElements } from '../plugins/media';
 import { escapeLinks, getPasteSource, htmlContainsSingleFile, htmlHasInvalidLinkTags, isPastedFromExcel, isPastedFromWord, removeDuplicateInvalidLinks, transformUnsupportedBlockCardToInline } from '../util';
 import { htmlHasIncompleteTable, isPastedFromTinyMCEConfluence, tryRebuildCompleteTableHtml } from '../util/tinyMCE';
@@ -375,6 +375,12 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
             return true;
           }
 
+          // handle the case when copy content from a table cell inside bodied extension
+          if (getBooleanFF('platform.editor.table.copy-paste-in-bodied-extension')) {
+            if (handleTableContentPasteInBodiedExtension(slice)(state, dispatch)) {
+              return true;
+            }
+          }
           // remove annotation marks from the pasted data if they are not present in the document
           // for the cases when they are pasted from external pages
           if (slice.content.size && containsAnyAnnotations(slice, state)) {

package/dist/types/handlers.d.ts

@@ -19,6 +19,7 @@ export declare function handlePastePreservingMarks(slice: Slice, queueCardsFromC
 export declare function handleMacroAutoConvert(text: string, slice: Slice, queueCardsFromChangedTr: QueueCardsFromTransactionAction | undefined, runMacroAutoConvert: RunMacroAutoConvert | undefined, cardsOptions?: CardOptions, extensionAutoConverter?: ExtensionAutoConvertHandler): Command;
 export declare function handleCodeBlock(text: string): Command;
 export declare function handleMediaSingle(inputMethod: InputMethodInsertMedia, insertMediaAsMediaSingle: InsertMediaAsMediaSingle | undefined): (slice: Slice) => Command;
+export declare function handleTableContentPasteInBodiedExtension(slice: Slice): Command;
 export declare function handleExpandPasteInTable(slice: Slice): Command;
 export declare function handleMarkdown(markdownSlice: Slice, queueCardsFromChangedTr: QueueCardsFromTransactionAction | undefined, from?: number, to?: number): Command;
 export declare function handleParagraphBlockMarks(state: EditorState, slice: Slice): Slice;

package/dist/types-ts4.5/handlers.d.ts

@@ -19,6 +19,7 @@ export declare function handlePastePreservingMarks(slice: Slice, queueCardsFromC
 export declare function handleMacroAutoConvert(text: string, slice: Slice, queueCardsFromChangedTr: QueueCardsFromTransactionAction | undefined, runMacroAutoConvert: RunMacroAutoConvert | undefined, cardsOptions?: CardOptions, extensionAutoConverter?: ExtensionAutoConvertHandler): Command;
 export declare function handleCodeBlock(text: string): Command;
 export declare function handleMediaSingle(inputMethod: InputMethodInsertMedia, insertMediaAsMediaSingle: InsertMediaAsMediaSingle | undefined): (slice: Slice) => Command;
+export declare function handleTableContentPasteInBodiedExtension(slice: Slice): Command;
 export declare function handleExpandPasteInTable(slice: Slice): Command;
 export declare function handleMarkdown(markdownSlice: Slice, queueCardsFromChangedTr: QueueCardsFromTransactionAction | undefined, from?: number, to?: number): Command;
 export declare function handleParagraphBlockMarks(state: EditorState, slice: Slice): Slice;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-paste",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "Paste plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,17 +33,17 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/editor-common": "^78.18.0",
+    "@atlaskit/editor-common": "^78.22.0",
     "@atlaskit/editor-markdown-transformer": "^5.4.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-annotation": "^1.5.0",
     "@atlaskit/editor-plugin-better-type-history": "^1.0.0",
-    "@atlaskit/editor-plugin-card": "^1.2.0",
+    "@atlaskit/editor-plugin-card": "^1.4.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
     "@atlaskit/editor-plugin-list": "^3.1.0",
-    "@atlaskit/editor-plugin-media": "^1.12.0",
+    "@atlaskit/editor-plugin-media": "^1.13.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
-    "@atlaskit/editor-tables": "^2.5.0",
+    "@atlaskit/editor-tables": "^2.6.0",
     "@atlaskit/media-client": "^26.2.0",
     "@atlaskit/media-common": "^11.1.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
@@ -56,7 +56,7 @@
   },
   "devDependencies": {
     "@af/visual-regression": "*",
-    "@atlaskit/adf-schema": "^35.7.0",
+    "@atlaskit/adf-schema": "^35.8.0",
     "@atlaskit/editor-plugin-block-type": "^3.0.0",
     "@atlaskit/editor-plugin-history": "^1.0.0",
     "@atlaskit/editor-plugin-type-ahead": "^1.0.0",
@@ -132,6 +132,9 @@
     },
     "platform.editor.multi-bodied-extension_0rygg": {
       "type": "boolean"
+    },
+    "platform.editor.table.copy-paste-in-bodied-extension": {
+      "type": "boolean"
     }
   }
 }