@atlaskit/editor-plugin-paste 1.0.2 → 1.0.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-paste
 
+## 1.0.4
+
+### Patch Changes
+
+- [#74662](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/74662) [`03889d5b1256`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/03889d5b1256) - ED-22244 Allow copy paste of action within a panel into a panel
+- Updated dependencies
+
+## 1.0.3
+
+### Patch Changes
+
+- [#75368](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/75368) [`0a0d45e03ecf`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0a0d45e03ecf) - ED-22245: Fixing the bug to paste links inside nested codeblock
+
 ## 1.0.2
 
 ### Patch Changes

package/dist/cjs/handlers.js

@@ -40,6 +40,7 @@ var _utils3 = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("./commands");
 var _edgeCases = require("./edge-cases");
+var _lists = require("./edge-cases/lists");
 var _pluginFactory = require("./pm-plugins/plugin-factory");
 var _util = require("./util");
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -83,7 +84,7 @@ function handleMention(slice, schema) {
 }
 function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
-    var _slice$content$firstC, _transformedSlice$con;
+    var _slice$content$firstC, _slice$content$firstC2, _transformedSlice$con;
     var schema = state.schema,
       selection = state.tr.selection;
     var codeMark = schema.marks.code,
@@ -101,23 +102,32 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
       taskList = _schema$nodes.taskList,
       listItem = _schema$nodes.listItem,
       expand = _schema$nodes.expand,
-      heading = _schema$nodes.heading;
+      heading = _schema$nodes.heading,
+      codeBlock = _schema$nodes.codeBlock;
     var selectionIsValidNode = state.selection instanceof _state.NodeSelection && ['decisionList', 'decisionItem', 'taskList', 'taskItem'].includes(state.selection.node.type.name);
     var selectionHasValidParentNode = (0, _utils2.hasParentNodeOfType)([decisionItem, taskItem, panel])(state.selection);
-    var selectionIsPanel = (0, _utils2.hasParentNodeOfType)([panel])(state.selection);
+    var selectionIsCodeBlock = (0, _utils2.hasParentNodeOfType)([codeBlock])(state.selection);
+    var panelNode = (0, _util.isSelectionInsidePanel)(selection);
+    var selectionIsPanel = Boolean(panelNode);
+
+    // we avoid handling codeBlock-in-panel use case in this function
+    // returning false will allow code to flow into `handleCodeBlock` function
+    if (selectionIsPanel && selectionIsCodeBlock) {
+      return false;
+    }
 
     // Some types of content should be handled by the default handler, not this function.
     // Check through slice content to see if it contains an invalid node.
     var sliceIsInvalid = false;
+    var sliceHasTask = false;
     slice.content.nodesBetween(0, slice.content.size, function (node) {
       if (node.type === bulletList || node.type === orderedList || node.type === expand || node.type === heading || node.type === listItem) {
         sliceIsInvalid = true;
       }
       if (selectionIsPanel && node.type === taskList) {
-        sliceIsInvalid = true;
+        sliceHasTask = true;
       }
     });
-
     // If the selection is a panel,
     // and the slice's first node is a paragraph
     // and it is not from a depth that would indicate it being from inside from another node (e.g. text from a decision)
@@ -135,6 +145,12 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
     var transformedSlice = compose.apply(null, filters)(slice);
     var isFirstChildTaskNode = transformedSlice.content.firstChild.type === taskList || transformedSlice.content.firstChild.type === taskItem;
     var tr = (0, _history.closeHistory)(state.tr);
+    if (panelNode && sliceHasTask && ((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.type) === panel && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.handle-paste-for-action-in-panel') && (0, _util.isEmptyNode)(panelNode) && selection.$from.node() === selection.$to.node()) {
+      return Boolean((0, _lists.insertSliceInsideOfPanelNodeSelected)(panelNode)({
+        tr: tr,
+        slice: slice
+      }));
+    }
     var transformedSliceIsValidNode = (transformedSlice.content.firstChild.type.inlineContent || ['decisionList', 'decisionItem', 'taskItem', 'taskList', 'panel'].includes(transformedSlice.content.firstChild.type.name)) && (!(0, _utils.isInListItem)(state) || (0, _utils.isInListItem)(state) && isFirstChildTaskNode);
     // If the slice or the selection are valid nodes to handle,
     // and the slice is not a whole node (i.e. openStart is 1 and openEnd is 0)
@@ -189,7 +205,7 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
 }
 function handlePasteNonNestableBlockNodesIntoList(slice) {
   return function (state, dispatch) {
-    var _tr$doc$nodeAt, _slice$content$firstC2, _sliceContent$firstCh, _findParentNodeOfType;
+    var _tr$doc$nodeAt, _slice$content$firstC3, _sliceContent$firstCh, _findParentNodeOfType;
     var tr = state.tr;
     var selection = tr.selection;
     var $from = selection.$from,
@@ -264,7 +280,7 @@ function handlePasteNonNestableBlockNodesIntoList(slice) {
     }
 
     // handle the insertion of the slice
-    if (((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.type.name) === 'blockquote' && (0, _utils2.contains)(slice.content.firstChild, state.schema.nodes.listItem)) {
+    if (((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.type.name) === 'blockquote' && (0, _utils2.contains)(slice.content.firstChild, state.schema.nodes.listItem)) {
       (0, _edgeCases.insertSliceForListsInsideBlockquote)({
         tr: tr,
         slice: slice
@@ -983,6 +999,6 @@ var handleSelectedTable = exports.handleSelectedTable = function handleSelectedT
   };
 };
 function checkTaskListInList(state, slice) {
-  var _slice$content$firstC3;
-  return Boolean((0, _utils.isInListItem)(state) && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-action-in-list') && ['taskList', 'taskItem'].includes(((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 || (_slice$content$firstC3 = _slice$content$firstC3.type) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.name) || ''));
+  var _slice$content$firstC4;
+  return Boolean((0, _utils.isInListItem)(state) && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-action-in-list') && ['taskList', 'taskItem'].includes(((_slice$content$firstC4 = slice.content.firstChild) === null || _slice$content$firstC4 === void 0 || (_slice$content$firstC4 = _slice$content$firstC4.type) === null || _slice$content$firstC4 === void 0 ? void 0 : _slice$content$firstC4.name) || ''));
 }

package/dist/es2019/handlers.js

@@ -14,8 +14,9 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
 import { insertSliceForLists, insertSliceForListsInsideBlockquote, insertSliceForTaskInsideList } from './edge-cases';
+import { insertSliceInsideOfPanelNodeSelected } from './edge-cases/lists';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
-import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';
+import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType, isEmptyNode, isSelectionInsidePanel } from './util';
 
 /** Helper type for single arg function */
 
@@ -49,7 +50,7 @@ export function handleMention(slice, schema) {
 }
 export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
   return (state, dispatch) => {
-    var _slice$content$firstC, _transformedSlice$con;
+    var _slice$content$firstC, _slice$content$firstC2, _transformedSlice$con;
     const {
       schema,
       tr: {
@@ -74,25 +75,34 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
         taskList,
         listItem,
         expand,
-        heading
+        heading,
+        codeBlock
       }
     } = schema;
     const selectionIsValidNode = state.selection instanceof NodeSelection && ['decisionList', 'decisionItem', 'taskList', 'taskItem'].includes(state.selection.node.type.name);
     const selectionHasValidParentNode = hasParentNodeOfType([decisionItem, taskItem, panel])(state.selection);
-    const selectionIsPanel = hasParentNodeOfType([panel])(state.selection);
+    const selectionIsCodeBlock = hasParentNodeOfType([codeBlock])(state.selection);
+    const panelNode = isSelectionInsidePanel(selection);
+    const selectionIsPanel = Boolean(panelNode);
+
+    // we avoid handling codeBlock-in-panel use case in this function
+    // returning false will allow code to flow into `handleCodeBlock` function
+    if (selectionIsPanel && selectionIsCodeBlock) {
+      return false;
+    }
 
     // Some types of content should be handled by the default handler, not this function.
     // Check through slice content to see if it contains an invalid node.
     let sliceIsInvalid = false;
+    let sliceHasTask = false;
     slice.content.nodesBetween(0, slice.content.size, node => {
       if (node.type === bulletList || node.type === orderedList || node.type === expand || node.type === heading || node.type === listItem) {
         sliceIsInvalid = true;
       }
       if (selectionIsPanel && node.type === taskList) {
-        sliceIsInvalid = true;
+        sliceHasTask = true;
       }
     });
-
     // If the selection is a panel,
     // and the slice's first node is a paragraph
     // and it is not from a depth that would indicate it being from inside from another node (e.g. text from a decision)
@@ -110,6 +120,12 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
     const transformedSlice = compose.apply(null, filters)(slice);
     const isFirstChildTaskNode = transformedSlice.content.firstChild.type === taskList || transformedSlice.content.firstChild.type === taskItem;
     const tr = closeHistory(state.tr);
+    if (panelNode && sliceHasTask && ((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.type) === panel && getBooleanFF('platform.editor.handle-paste-for-action-in-panel') && isEmptyNode(panelNode) && selection.$from.node() === selection.$to.node()) {
+      return Boolean(insertSliceInsideOfPanelNodeSelected(panelNode)({
+        tr,
+        slice
+      }));
+    }
     const transformedSliceIsValidNode = (transformedSlice.content.firstChild.type.inlineContent || ['decisionList', 'decisionItem', 'taskItem', 'taskList', 'panel'].includes(transformedSlice.content.firstChild.type.name)) && (!isInListItem(state) || isInListItem(state) && isFirstChildTaskNode);
     // If the slice or the selection are valid nodes to handle,
     // and the slice is not a whole node (i.e. openStart is 1 and openEnd is 0)
@@ -164,7 +180,7 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
 }
 export function handlePasteNonNestableBlockNodesIntoList(slice) {
   return (state, dispatch) => {
-    var _tr$doc$nodeAt, _slice$content$firstC2, _sliceContent$firstCh, _findParentNodeOfType;
+    var _tr$doc$nodeAt, _slice$content$firstC3, _sliceContent$firstCh, _findParentNodeOfType;
     const {
       tr
     } = state;
@@ -246,7 +262,7 @@ export function handlePasteNonNestableBlockNodesIntoList(slice) {
     }
 
     // handle the insertion of the slice
-    if (((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.type.name) === 'blockquote' && contains(slice.content.firstChild, state.schema.nodes.listItem)) {
+    if (((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.type.name) === 'blockquote' && contains(slice.content.firstChild, state.schema.nodes.listItem)) {
       insertSliceForListsInsideBlockquote({
         tr,
         slice
@@ -962,6 +978,6 @@ export const handleSelectedTable = editorAnalyticsAPI => slice => (state, dispat
   return false;
 };
 export function checkTaskListInList(state, slice) {
-  var _slice$content$firstC3, _slice$content$firstC4;
-  return Boolean(isInListItem(state) && getBooleanFF('platform.editor.allow-action-in-list') && ['taskList', 'taskItem'].includes(((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : (_slice$content$firstC4 = _slice$content$firstC3.type) === null || _slice$content$firstC4 === void 0 ? void 0 : _slice$content$firstC4.name) || ''));
+  var _slice$content$firstC4, _slice$content$firstC5;
+  return Boolean(isInListItem(state) && getBooleanFF('platform.editor.allow-action-in-list') && ['taskList', 'taskItem'].includes(((_slice$content$firstC4 = slice.content.firstChild) === null || _slice$content$firstC4 === void 0 ? void 0 : (_slice$content$firstC5 = _slice$content$firstC4.type) === null || _slice$content$firstC5 === void 0 ? void 0 : _slice$content$firstC5.name) || ''));
 }

package/dist/esm/handlers.js

@@ -22,8 +22,9 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
 import { startTrackingPastedMacroPositions, stopTrackingPastedMacroPositions } from './commands';
 import { insertSliceForLists, insertSliceForListsInsideBlockquote, insertSliceForTaskInsideList } from './edge-cases';
+import { insertSliceInsideOfPanelNodeSelected } from './edge-cases/lists';
 import { getPluginState as getPastePluginState } from './pm-plugins/plugin-factory';
-import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';
+import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType, isEmptyNode, isSelectionInsidePanel } from './util';
 
 /** Helper type for single arg function */
 
@@ -61,7 +62,7 @@ export function handleMention(slice, schema) {
 }
 export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
-    var _slice$content$firstC, _transformedSlice$con;
+    var _slice$content$firstC, _slice$content$firstC2, _transformedSlice$con;
     var schema = state.schema,
       selection = state.tr.selection;
     var codeMark = schema.marks.code,
@@ -79,23 +80,32 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
       taskList = _schema$nodes.taskList,
       listItem = _schema$nodes.listItem,
       expand = _schema$nodes.expand,
-      heading = _schema$nodes.heading;
+      heading = _schema$nodes.heading,
+      codeBlock = _schema$nodes.codeBlock;
     var selectionIsValidNode = state.selection instanceof NodeSelection && ['decisionList', 'decisionItem', 'taskList', 'taskItem'].includes(state.selection.node.type.name);
     var selectionHasValidParentNode = hasParentNodeOfType([decisionItem, taskItem, panel])(state.selection);
-    var selectionIsPanel = hasParentNodeOfType([panel])(state.selection);
+    var selectionIsCodeBlock = hasParentNodeOfType([codeBlock])(state.selection);
+    var panelNode = isSelectionInsidePanel(selection);
+    var selectionIsPanel = Boolean(panelNode);
+
+    // we avoid handling codeBlock-in-panel use case in this function
+    // returning false will allow code to flow into `handleCodeBlock` function
+    if (selectionIsPanel && selectionIsCodeBlock) {
+      return false;
+    }
 
     // Some types of content should be handled by the default handler, not this function.
     // Check through slice content to see if it contains an invalid node.
     var sliceIsInvalid = false;
+    var sliceHasTask = false;
     slice.content.nodesBetween(0, slice.content.size, function (node) {
       if (node.type === bulletList || node.type === orderedList || node.type === expand || node.type === heading || node.type === listItem) {
         sliceIsInvalid = true;
       }
       if (selectionIsPanel && node.type === taskList) {
-        sliceIsInvalid = true;
+        sliceHasTask = true;
       }
     });
-
     // If the selection is a panel,
     // and the slice's first node is a paragraph
     // and it is not from a depth that would indicate it being from inside from another node (e.g. text from a decision)
@@ -113,6 +123,12 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
     var transformedSlice = compose.apply(null, filters)(slice);
     var isFirstChildTaskNode = transformedSlice.content.firstChild.type === taskList || transformedSlice.content.firstChild.type === taskItem;
     var tr = closeHistory(state.tr);
+    if (panelNode && sliceHasTask && ((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.type) === panel && getBooleanFF('platform.editor.handle-paste-for-action-in-panel') && isEmptyNode(panelNode) && selection.$from.node() === selection.$to.node()) {
+      return Boolean(insertSliceInsideOfPanelNodeSelected(panelNode)({
+        tr: tr,
+        slice: slice
+      }));
+    }
     var transformedSliceIsValidNode = (transformedSlice.content.firstChild.type.inlineContent || ['decisionList', 'decisionItem', 'taskItem', 'taskList', 'panel'].includes(transformedSlice.content.firstChild.type.name)) && (!isInListItem(state) || isInListItem(state) && isFirstChildTaskNode);
     // If the slice or the selection are valid nodes to handle,
     // and the slice is not a whole node (i.e. openStart is 1 and openEnd is 0)
@@ -167,7 +183,7 @@ export function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChange
 }
 export function handlePasteNonNestableBlockNodesIntoList(slice) {
   return function (state, dispatch) {
-    var _tr$doc$nodeAt, _slice$content$firstC2, _sliceContent$firstCh, _findParentNodeOfType;
+    var _tr$doc$nodeAt, _slice$content$firstC3, _sliceContent$firstCh, _findParentNodeOfType;
     var tr = state.tr;
     var selection = tr.selection;
     var $from = selection.$from,
@@ -242,7 +258,7 @@ export function handlePasteNonNestableBlockNodesIntoList(slice) {
     }
 
     // handle the insertion of the slice
-    if (((_slice$content$firstC2 = slice.content.firstChild) === null || _slice$content$firstC2 === void 0 ? void 0 : _slice$content$firstC2.type.name) === 'blockquote' && contains(slice.content.firstChild, state.schema.nodes.listItem)) {
+    if (((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.type.name) === 'blockquote' && contains(slice.content.firstChild, state.schema.nodes.listItem)) {
       insertSliceForListsInsideBlockquote({
         tr: tr,
         slice: slice
@@ -961,6 +977,6 @@ export var handleSelectedTable = function handleSelectedTable(editorAnalyticsAPI
   };
 };
 export function checkTaskListInList(state, slice) {
-  var _slice$content$firstC3;
-  return Boolean(isInListItem(state) && getBooleanFF('platform.editor.allow-action-in-list') && ['taskList', 'taskItem'].includes(((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 || (_slice$content$firstC3 = _slice$content$firstC3.type) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.name) || ''));
+  var _slice$content$firstC4;
+  return Boolean(isInListItem(state) && getBooleanFF('platform.editor.allow-action-in-list') && ['taskList', 'taskItem'].includes(((_slice$content$firstC4 = slice.content.firstChild) === null || _slice$content$firstC4 === void 0 || (_slice$content$firstC4 = _slice$content$firstC4.type) === null || _slice$content$firstC4 === void 0 ? void 0 : _slice$content$firstC4.name) || ''));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-paste",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Paste plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,7 +33,7 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/editor-common": "^78.3.0",
+    "@atlaskit/editor-common": "^78.4.0",
     "@atlaskit/editor-markdown-transformer": "^5.3.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-annotation": "^1.0.0",
@@ -125,6 +125,9 @@
     },
     "platform.editor.media.fix-copy-paste-excel_62g4s": {
       "type": "boolean"
+    },
+    "platform.editor.handle-paste-for-action-in-panel": {
+      "type": "boolean"
     }
   }
 }