@atlaskit/editor-plugin-paste 2.2.2 → 2.3.1

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-paste
 
+## 2.3.1
+
+### Patch Changes
+
+- [#114384](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114384)
+  [`72325f32502fb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/72325f32502fb) -
+  [ED-26291] Update document moved event to reflect multiple selection information
+- Updated dependencies
+
+## 2.3.0
+
+### Minor Changes
+
+- [#114421](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114421)
+  [`1b137b82b89d3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1b137b82b89d3) -
+  [ECOHELP-54944] Strip macro IDs on paste for extensions and inline extensions
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.2.2
 
 ### Patch Changes

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

@@ -513,6 +513,9 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
         if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_2')) {
           slice = (0, _transforms.transformSingleColumnLayout)(slice, schema);
         }
+        if ((0, _platformFeatureFlags.fg)('platform_editor_macroid_reset_for_ext_on_paste')) {
+          slice = (0, _transforms.transformSliceToRemoveMacroId)(slice, schema);
+        }
         return slice;
       },
       transformPastedHTML: function transformPastedHTML(html) {

package/dist/cjs/pm-plugins/move-analytics/commands.js

@@ -17,7 +17,9 @@ var updateContentMoved = exports.updateContentMoved = function updateContentMove
       currentActions: [].concat((0, _toConsumableArray2.default)(contentMoved.currentActions), [nextAction]),
       size: (nextState === null || nextState === void 0 ? void 0 : nextState.size) || contentMoved.size,
       nodeName: nextState === null || nextState === void 0 ? void 0 : nextState.nodeName,
-      nodeDepth: nextState === null || nextState === void 0 ? void 0 : nextState.nodeDepth
+      nodeDepth: nextState === null || nextState === void 0 ? void 0 : nextState.nodeDepth,
+      nodeTypes: nextState === null || nextState === void 0 ? void 0 : nextState.nodeTypes,
+      hasSelectedMultipleNodes: nextState === null || nextState === void 0 ? void 0 : nextState.hasSelectedMultipleNodes
     };
     return {
       type: _actions.MoveAnalyticPluginTypes.UpdateMovedAction,

package/dist/cjs/pm-plugins/move-analytics/plugin.js

@@ -1,16 +1,21 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createPlugin = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("./commands");
 var _pluginFactory = require("./plugin-factory");
 var _pluginKey = require("./plugin-key");
 var _types = require("./types");
 var _utils = require("./utils");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 // This plugin exists only in FullPage/FullWidth Editor and is used to register an event that tells us
 // that a user cut and than pasted a node. This order of actions could be considered an alternative
 // to new Drag and Drop functionality. The event (document moved) is not accurate, but should be enough to be
@@ -51,11 +56,12 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, editor
           actionSubjectId: _analytics.ACTION_SUBJECT_ID.NODE,
           eventType: _analytics.EVENT_TYPE.TRACK,
           attributes: {
+            // keep nodeName from copied slice
             nodeType: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName,
             nodeDepth: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeDepth,
-            destinationNodeDepth: (0, _utils.getParentNodeDepth)(state.selection)
-
-            // keep nodeName from copied slice
+            destinationNodeDepth: (0, _utils.getParentNodeDepth)(state.selection),
+            nodeTypes: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeTypes,
+            hasSelectedMultipleNodes: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.hasSelectedMultipleNodes
           }
         })(tr);
 
@@ -74,6 +80,9 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, editor
         var resetState = false;
         var content = slice.content,
           size = slice.size;
+        var selection = state.selection;
+        // Note: the following is not the case once `platform_editor_element_drag_and_drop_multiselect` is enabled
+        // we now want to track cut events for multiple nodes
         // Content should be just one node, so we added a check for slice.content.childCount === 1;
         // 1. It is possible to select a table by dragging the mouse over the table's rows.
         // As a result, slice will contain rows without tableNode itself and the childCount will be the number of rows.
@@ -82,35 +91,57 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, editor
         // the paragraph below the node. Visually only the node in between is selected, in reality, three nodes are
         // in the slice.
         // These cases are ignored and moveContent event won't be counted.
-        if (content.childCount !== 1) {
-          resetState = true;
-        }
+        var isMultiSelectEnabled = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true);
         var nodeName = ((_content$firstChild2 = content.firstChild) === null || _content$firstChild2 === void 0 ? void 0 : _content$firstChild2.type.name) || '';
-
-        // Some nodes are not relevant as they are parts of nodes, not whole nodes (like tableCell, tableHeader instead of table node)
-        // Some nodes like lists, taskList(item), decisionList(item) requires tricky checks that we want to avoid doing.
-        // These nodes were added to excludedNodes array.
-        if (!resetState && (0, _utils.isExcludedNode)(nodeName)) {
-          resetState = true;
-        }
-        var selection = state.selection;
-        if (!resetState && !(0, _utils.isEntireNestedParagraphOrHeadingSelected)(selection)) {
-          resetState = true;
-        }
-        if (!resetState && (0, _utils.isInlineNode)(nodeName) && (0, _utils.isNestedInlineNode)(selection)) {
-          resetState = true;
-        }
-        if (!resetState && (0, _utils.isNestedInTable)(state)) {
+        var nodeTypes,
+          hasSelectedMultipleNodes = false;
+        if (content.childCount > 1) {
+          if (isMultiSelectEnabled) {
+            if ((0, _utils.containsExcludedNode)(content)) {
+              resetState = true;
+            } else {
+              var attributes = (0, _utils.getMultipleSelectionAttributes)(content);
+              nodeTypes = attributes.nodeTypes;
+              hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
+            }
+          } else {
+            resetState = true;
+          }
+        } else if (content.childCount === 1) {
+          // Some nodes are not relevant as they are parts of nodes, not whole nodes (like tableCell, tableHeader instead of table node)
+          // Some nodes like lists, taskList(item), decisionList(item) requires tricky checks that we want to avoid doing.
+          // These nodes were added to excludedNodes array.
+          if (!resetState && (0, _utils.isExcludedNode)(nodeName)) {
+            resetState = true;
+          }
+          if (!resetState && !(0, _utils.isEntireNestedParagraphOrHeadingSelected)(selection)) {
+            resetState = true;
+          }
+          if (!resetState && (0, _utils.isInlineNode)(nodeName) && (0, _utils.isNestedInlineNode)(selection)) {
+            resetState = true;
+          }
+          if (!resetState && (0, _utils.isNestedInTable)(state)) {
+            resetState = true;
+          }
+        } else {
           resetState = true;
         }
         if (resetState) {
           (0, _commands.resetContentMoved)()(state, dispatch);
         } else {
-          (0, _commands.updateContentMoved)({
+          var newState = {
             size: size,
             nodeName: nodeName,
             nodeDepth: (0, _utils.getParentNodeDepth)(selection)
-          }, 'contentCut')(state, dispatch);
+          };
+          if (isMultiSelectEnabled) {
+            var _nodeTypes;
+            newState = _objectSpread(_objectSpread({}, newState), {}, {
+              nodeTypes: (_nodeTypes = nodeTypes) !== null && _nodeTypes !== void 0 ? _nodeTypes : nodeName,
+              hasSelectedMultipleNodes: hasSelectedMultipleNodes
+            });
+          }
+          (0, _commands.updateContentMoved)(newState, 'contentCut')(state, dispatch);
         }
         isCutEvent = false;
         return slice;

package/dist/cjs/pm-plugins/move-analytics/types.js

@@ -15,6 +15,8 @@ var defaultState = exports.defaultState = {
     nodeName: undefined,
     size: undefined,
     nodeDepth: undefined,
-    currentActions: []
+    currentActions: [],
+    nodeTypes: undefined,
+    hasSelectedMultipleNodes: undefined
   }
 };

package/dist/cjs/pm-plugins/move-analytics/utils.js

@@ -1,11 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isNestedInlineNode = exports.isNestedInTable = exports.isInlineNode = exports.isExcludedNode = exports.isEntireNestedParagraphOrHeadingSelected = exports.isCursorSelectionAtTopLevel = exports.getParentNodeDepth = void 0;
+exports.isNestedInlineNode = exports.isNestedInTable = exports.isInlineNode = exports.isExcludedNode = exports.isEntireNestedParagraphOrHeadingSelected = exports.isCursorSelectionAtTopLevel = exports.getParentNodeDepth = exports.getMultipleSelectionAttributes = exports.containsExcludedNode = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var excludedNodes = ['caption', 'layoutColumn', 'listItem', 'tableHeader', 'tableCell', 'tableRow', 'text', 'placeholder', 'unsupportedBlock', 'unsupportedInline', 'hardBreak', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'taskItem', 'decisionItem'];
 var isExcludedNode = exports.isExcludedNode = function isExcludedNode(nodeName) {
   return excludedNodes.includes(nodeName);
@@ -69,4 +72,26 @@ var isEntireNestedParagraphOrHeadingSelected = exports.isEntireNestedParagraphOr
   var $from = selection.$from,
     $to = selection.$to;
   return $from.textOffset === 0 && $to.textOffset === 0;
+};
+var containsExcludedNode = exports.containsExcludedNode = function containsExcludedNode(content) {
+  for (var i = 0; i < content.childCount; i++) {
+    var _content$maybeChild;
+    var nodeName = ((_content$maybeChild = content.maybeChild(i)) === null || _content$maybeChild === void 0 ? void 0 : _content$maybeChild.type.name) || '';
+    if (isExcludedNode(nodeName)) {
+      return true;
+    }
+  }
+  return false;
+};
+var getMultipleSelectionAttributes = exports.getMultipleSelectionAttributes = function getMultipleSelectionAttributes(content) {
+  var nodeTypes = [];
+  if (content.size) {
+    content.forEach(function (node) {
+      nodeTypes.push(node.type.name);
+    });
+  }
+  return {
+    nodeTypes: (0, _platformFeatureFlags.fg)('platform_editor_track_node_types') ? (0, _toConsumableArray2.default)(new Set(nodeTypes)).sort().join(',') : undefined,
+    hasSelectedMultipleNodes: nodeTypes.length > 1
+  };
 };

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

@@ -6,7 +6,7 @@ import { getExtensionAutoConvertersFromProvider } from '@atlaskit/editor-common/
 import { isPastedFile as isPastedFileFromEvent, md } from '@atlaskit/editor-common/paste';
 import { measureRender } from '@atlaskit/editor-common/performance/measure-render';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { transformSingleLineCodeBlockToCodeMark, transformSingleColumnLayout, transformSliceNestedExpandToExpand, transformSliceToDecisionList, transformSliceToJoinAdjacentCodeBlocks, transformSliceToRemoveLegacyContentMacro } from '@atlaskit/editor-common/transforms';
+import { transformSingleLineCodeBlockToCodeMark, transformSingleColumnLayout, transformSliceNestedExpandToExpand, transformSliceToDecisionList, transformSliceToJoinAdjacentCodeBlocks, transformSliceToRemoveLegacyContentMacro, transformSliceToRemoveMacroId } from '@atlaskit/editor-common/transforms';
 import { containsAnyAnnotations, extractSliceFromStep, linkifyContent, mapChildren } from '@atlaskit/editor-common/utils';
 import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
@@ -487,6 +487,9 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         if (fg('platform_editor_advanced_layouts_post_fix_patch_2')) {
           slice = transformSingleColumnLayout(slice, schema);
         }
+        if (fg('platform_editor_macroid_reset_for_ext_on_paste')) {
+          slice = transformSliceToRemoveMacroId(slice, schema);
+        }
         return slice;
       },
       transformPastedHTML(html) {

package/dist/es2019/pm-plugins/move-analytics/commands.js

@@ -9,7 +9,9 @@ export const updateContentMoved = (nextState, nextAction) => createCommand(state
     currentActions: [...contentMoved.currentActions, nextAction],
     size: (nextState === null || nextState === void 0 ? void 0 : nextState.size) || contentMoved.size,
     nodeName: nextState === null || nextState === void 0 ? void 0 : nextState.nodeName,
-    nodeDepth: nextState === null || nextState === void 0 ? void 0 : nextState.nodeDepth
+    nodeDepth: nextState === null || nextState === void 0 ? void 0 : nextState.nodeDepth,
+    nodeTypes: nextState === null || nextState === void 0 ? void 0 : nextState.nodeTypes,
+    hasSelectedMultipleNodes: nextState === null || nextState === void 0 ? void 0 : nextState.hasSelectedMultipleNodes
   };
   return {
     type: MoveAnalyticPluginTypes.UpdateMovedAction,

package/dist/es2019/pm-plugins/move-analytics/plugin.js

@@ -1,10 +1,11 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { resetContentMoved, resetContentMovedTransform, updateContentMoved } from './commands';
 import { createPluginState, getPluginState } from './plugin-factory';
 import { pluginKey } from './plugin-key';
 import { defaultState } from './types';
-import { getParentNodeDepth, isCursorSelectionAtTopLevel, isEntireNestedParagraphOrHeadingSelected, isExcludedNode, isInlineNode, isNestedInlineNode, isNestedInTable } from './utils';
+import { containsExcludedNode, getMultipleSelectionAttributes, getParentNodeDepth, isCursorSelectionAtTopLevel, isEntireNestedParagraphOrHeadingSelected, isExcludedNode, isInlineNode, isNestedInlineNode, isNestedInTable } from './utils';
 
 // This plugin exists only in FullPage/FullWidth Editor and is used to register an event that tells us
 // that a user cut and than pasted a node. This order of actions could be considered an alternative
@@ -52,11 +53,12 @@ export const createPlugin = (dispatch, editorAnalyticsAPI) => {
           actionSubjectId: ACTION_SUBJECT_ID.NODE,
           eventType: EVENT_TYPE.TRACK,
           attributes: {
+            // keep nodeName from copied slice
             nodeType: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName,
             nodeDepth: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeDepth,
-            destinationNodeDepth: getParentNodeDepth(state.selection)
-
-            // keep nodeName from copied slice
+            destinationNodeDepth: getParentNodeDepth(state.selection),
+            nodeTypes: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeTypes,
+            hasSelectedMultipleNodes: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.hasSelectedMultipleNodes
           }
         })(tr);
 
@@ -78,6 +80,11 @@ export const createPlugin = (dispatch, editorAnalyticsAPI) => {
           content,
           size
         } = slice;
+        const {
+          selection
+        } = state;
+        // Note: the following is not the case once `platform_editor_element_drag_and_drop_multiselect` is enabled
+        // we now want to track cut events for multiple nodes
         // Content should be just one node, so we added a check for slice.content.childCount === 1;
         // 1. It is possible to select a table by dragging the mouse over the table's rows.
         // As a result, slice will contain rows without tableNode itself and the childCount will be the number of rows.
@@ -86,37 +93,58 @@ export const createPlugin = (dispatch, editorAnalyticsAPI) => {
         // the paragraph below the node. Visually only the node in between is selected, in reality, three nodes are
         // in the slice.
         // These cases are ignored and moveContent event won't be counted.
-        if (content.childCount !== 1) {
-          resetState = true;
-        }
+        const isMultiSelectEnabled = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
         const nodeName = ((_content$firstChild2 = content.firstChild) === null || _content$firstChild2 === void 0 ? void 0 : _content$firstChild2.type.name) || '';
-
-        // Some nodes are not relevant as they are parts of nodes, not whole nodes (like tableCell, tableHeader instead of table node)
-        // Some nodes like lists, taskList(item), decisionList(item) requires tricky checks that we want to avoid doing.
-        // These nodes were added to excludedNodes array.
-        if (!resetState && isExcludedNode(nodeName)) {
-          resetState = true;
-        }
-        const {
-          selection
-        } = state;
-        if (!resetState && !isEntireNestedParagraphOrHeadingSelected(selection)) {
-          resetState = true;
-        }
-        if (!resetState && isInlineNode(nodeName) && isNestedInlineNode(selection)) {
-          resetState = true;
-        }
-        if (!resetState && isNestedInTable(state)) {
+        let nodeTypes,
+          hasSelectedMultipleNodes = false;
+        if (content.childCount > 1) {
+          if (isMultiSelectEnabled) {
+            if (containsExcludedNode(content)) {
+              resetState = true;
+            } else {
+              const attributes = getMultipleSelectionAttributes(content);
+              nodeTypes = attributes.nodeTypes;
+              hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
+            }
+          } else {
+            resetState = true;
+          }
+        } else if (content.childCount === 1) {
+          // Some nodes are not relevant as they are parts of nodes, not whole nodes (like tableCell, tableHeader instead of table node)
+          // Some nodes like lists, taskList(item), decisionList(item) requires tricky checks that we want to avoid doing.
+          // These nodes were added to excludedNodes array.
+          if (!resetState && isExcludedNode(nodeName)) {
+            resetState = true;
+          }
+          if (!resetState && !isEntireNestedParagraphOrHeadingSelected(selection)) {
+            resetState = true;
+          }
+          if (!resetState && isInlineNode(nodeName) && isNestedInlineNode(selection)) {
+            resetState = true;
+          }
+          if (!resetState && isNestedInTable(state)) {
+            resetState = true;
+          }
+        } else {
           resetState = true;
         }
         if (resetState) {
           resetContentMoved()(state, dispatch);
         } else {
-          updateContentMoved({
+          let newState = {
             size: size,
             nodeName: nodeName,
             nodeDepth: getParentNodeDepth(selection)
-          }, 'contentCut')(state, dispatch);
+          };
+          if (isMultiSelectEnabled) {
+            var _nodeTypes;
+            newState = {
+              ...newState,
+              nodeTypes: (_nodeTypes = nodeTypes) !== null && _nodeTypes !== void 0 ? _nodeTypes : nodeName,
+              hasSelectedMultipleNodes
+            };
+          }
+          updateContentMoved(newState, 'contentCut')(state, dispatch);
         }
         isCutEvent = false;
         return slice;

package/dist/es2019/pm-plugins/move-analytics/types.js

@@ -9,6 +9,8 @@ export const defaultState = {
     nodeName: undefined,
     size: undefined,
     nodeDepth: undefined,
-    currentActions: []
+    currentActions: [],
+    nodeTypes: undefined,
+    hasSelectedMultipleNodes: undefined
   }
 };

package/dist/es2019/pm-plugins/move-analytics/utils.js

@@ -1,5 +1,6 @@
 import { findParentNodeClosestToPos, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { fg } from '@atlaskit/platform-feature-flags';
 const excludedNodes = ['caption', 'layoutColumn', 'listItem', 'tableHeader', 'tableCell', 'tableRow', 'text', 'placeholder', 'unsupportedBlock', 'unsupportedInline', 'hardBreak', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'taskItem', 'decisionItem'];
 export const isExcludedNode = nodeName => excludedNodes.includes(nodeName);
 export const isCursorSelectionAtTopLevel = selection => {
@@ -67,4 +68,26 @@ export const isEntireNestedParagraphOrHeadingSelected = selection => {
     $to
   } = selection;
   return $from.textOffset === 0 && $to.textOffset === 0;
+};
+export const containsExcludedNode = content => {
+  for (let i = 0; i < content.childCount; i++) {
+    var _content$maybeChild;
+    const nodeName = ((_content$maybeChild = content.maybeChild(i)) === null || _content$maybeChild === void 0 ? void 0 : _content$maybeChild.type.name) || '';
+    if (isExcludedNode(nodeName)) {
+      return true;
+    }
+  }
+  return false;
+};
+export const getMultipleSelectionAttributes = content => {
+  const nodeTypes = [];
+  if (content.size) {
+    content.forEach(node => {
+      nodeTypes.push(node.type.name);
+    });
+  }
+  return {
+    nodeTypes: fg('platform_editor_track_node_types') ? [...new Set(nodeTypes)].sort().join(',') : undefined,
+    hasSelectedMultipleNodes: nodeTypes.length > 1
+  };
 };

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

@@ -8,7 +8,7 @@ import { getExtensionAutoConvertersFromProvider } from '@atlaskit/editor-common/
 import { isPastedFile as isPastedFileFromEvent, md } from '@atlaskit/editor-common/paste';
 import { measureRender } from '@atlaskit/editor-common/performance/measure-render';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { transformSingleLineCodeBlockToCodeMark, transformSingleColumnLayout, transformSliceNestedExpandToExpand, transformSliceToDecisionList, transformSliceToJoinAdjacentCodeBlocks, transformSliceToRemoveLegacyContentMacro } from '@atlaskit/editor-common/transforms';
+import { transformSingleLineCodeBlockToCodeMark, transformSingleColumnLayout, transformSliceNestedExpandToExpand, transformSliceToDecisionList, transformSliceToJoinAdjacentCodeBlocks, transformSliceToRemoveLegacyContentMacro, transformSliceToRemoveMacroId } from '@atlaskit/editor-common/transforms';
 import { containsAnyAnnotations, extractSliceFromStep, linkifyContent, mapChildren } from '@atlaskit/editor-common/utils';
 import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
@@ -505,6 +505,9 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
         if (fg('platform_editor_advanced_layouts_post_fix_patch_2')) {
           slice = transformSingleColumnLayout(slice, schema);
         }
+        if (fg('platform_editor_macroid_reset_for_ext_on_paste')) {
+          slice = transformSliceToRemoveMacroId(slice, schema);
+        }
         return slice;
       },
       transformPastedHTML: function transformPastedHTML(html) {

package/dist/esm/pm-plugins/move-analytics/commands.js

@@ -10,7 +10,9 @@ export var updateContentMoved = function updateContentMoved(nextState, nextActio
       currentActions: [].concat(_toConsumableArray(contentMoved.currentActions), [nextAction]),
       size: (nextState === null || nextState === void 0 ? void 0 : nextState.size) || contentMoved.size,
       nodeName: nextState === null || nextState === void 0 ? void 0 : nextState.nodeName,
-      nodeDepth: nextState === null || nextState === void 0 ? void 0 : nextState.nodeDepth
+      nodeDepth: nextState === null || nextState === void 0 ? void 0 : nextState.nodeDepth,
+      nodeTypes: nextState === null || nextState === void 0 ? void 0 : nextState.nodeTypes,
+      hasSelectedMultipleNodes: nextState === null || nextState === void 0 ? void 0 : nextState.hasSelectedMultipleNodes
     };
     return {
       type: MoveAnalyticPluginTypes.UpdateMovedAction,

package/dist/esm/pm-plugins/move-analytics/plugin.js

@@ -1,10 +1,14 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { resetContentMoved, resetContentMovedTransform, updateContentMoved } from './commands';
 import { createPluginState, getPluginState } from './plugin-factory';
 import { pluginKey } from './plugin-key';
 import { defaultState } from './types';
-import { getParentNodeDepth, isCursorSelectionAtTopLevel, isEntireNestedParagraphOrHeadingSelected, isExcludedNode, isInlineNode, isNestedInlineNode, isNestedInTable } from './utils';
+import { containsExcludedNode, getMultipleSelectionAttributes, getParentNodeDepth, isCursorSelectionAtTopLevel, isEntireNestedParagraphOrHeadingSelected, isExcludedNode, isInlineNode, isNestedInlineNode, isNestedInTable } from './utils';
 
 // This plugin exists only in FullPage/FullWidth Editor and is used to register an event that tells us
 // that a user cut and than pasted a node. This order of actions could be considered an alternative
@@ -46,11 +50,12 @@ export var createPlugin = function createPlugin(dispatch, editorAnalyticsAPI) {
           actionSubjectId: ACTION_SUBJECT_ID.NODE,
           eventType: EVENT_TYPE.TRACK,
           attributes: {
+            // keep nodeName from copied slice
             nodeType: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName,
             nodeDepth: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeDepth,
-            destinationNodeDepth: getParentNodeDepth(state.selection)
-
-            // keep nodeName from copied slice
+            destinationNodeDepth: getParentNodeDepth(state.selection),
+            nodeTypes: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeTypes,
+            hasSelectedMultipleNodes: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.hasSelectedMultipleNodes
           }
         })(tr);
 
@@ -69,6 +74,9 @@ export var createPlugin = function createPlugin(dispatch, editorAnalyticsAPI) {
         var resetState = false;
         var content = slice.content,
           size = slice.size;
+        var selection = state.selection;
+        // Note: the following is not the case once `platform_editor_element_drag_and_drop_multiselect` is enabled
+        // we now want to track cut events for multiple nodes
         // Content should be just one node, so we added a check for slice.content.childCount === 1;
         // 1. It is possible to select a table by dragging the mouse over the table's rows.
         // As a result, slice will contain rows without tableNode itself and the childCount will be the number of rows.
@@ -77,35 +85,57 @@ export var createPlugin = function createPlugin(dispatch, editorAnalyticsAPI) {
         // the paragraph below the node. Visually only the node in between is selected, in reality, three nodes are
         // in the slice.
         // These cases are ignored and moveContent event won't be counted.
-        if (content.childCount !== 1) {
-          resetState = true;
-        }
+        var isMultiSelectEnabled = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
         var nodeName = ((_content$firstChild2 = content.firstChild) === null || _content$firstChild2 === void 0 ? void 0 : _content$firstChild2.type.name) || '';
-
-        // Some nodes are not relevant as they are parts of nodes, not whole nodes (like tableCell, tableHeader instead of table node)
-        // Some nodes like lists, taskList(item), decisionList(item) requires tricky checks that we want to avoid doing.
-        // These nodes were added to excludedNodes array.
-        if (!resetState && isExcludedNode(nodeName)) {
-          resetState = true;
-        }
-        var selection = state.selection;
-        if (!resetState && !isEntireNestedParagraphOrHeadingSelected(selection)) {
-          resetState = true;
-        }
-        if (!resetState && isInlineNode(nodeName) && isNestedInlineNode(selection)) {
-          resetState = true;
-        }
-        if (!resetState && isNestedInTable(state)) {
+        var nodeTypes,
+          hasSelectedMultipleNodes = false;
+        if (content.childCount > 1) {
+          if (isMultiSelectEnabled) {
+            if (containsExcludedNode(content)) {
+              resetState = true;
+            } else {
+              var attributes = getMultipleSelectionAttributes(content);
+              nodeTypes = attributes.nodeTypes;
+              hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
+            }
+          } else {
+            resetState = true;
+          }
+        } else if (content.childCount === 1) {
+          // Some nodes are not relevant as they are parts of nodes, not whole nodes (like tableCell, tableHeader instead of table node)
+          // Some nodes like lists, taskList(item), decisionList(item) requires tricky checks that we want to avoid doing.
+          // These nodes were added to excludedNodes array.
+          if (!resetState && isExcludedNode(nodeName)) {
+            resetState = true;
+          }
+          if (!resetState && !isEntireNestedParagraphOrHeadingSelected(selection)) {
+            resetState = true;
+          }
+          if (!resetState && isInlineNode(nodeName) && isNestedInlineNode(selection)) {
+            resetState = true;
+          }
+          if (!resetState && isNestedInTable(state)) {
+            resetState = true;
+          }
+        } else {
           resetState = true;
         }
         if (resetState) {
           resetContentMoved()(state, dispatch);
         } else {
-          updateContentMoved({
+          var newState = {
             size: size,
             nodeName: nodeName,
             nodeDepth: getParentNodeDepth(selection)
-          }, 'contentCut')(state, dispatch);
+          };
+          if (isMultiSelectEnabled) {
+            var _nodeTypes;
+            newState = _objectSpread(_objectSpread({}, newState), {}, {
+              nodeTypes: (_nodeTypes = nodeTypes) !== null && _nodeTypes !== void 0 ? _nodeTypes : nodeName,
+              hasSelectedMultipleNodes: hasSelectedMultipleNodes
+            });
+          }
+          updateContentMoved(newState, 'contentCut')(state, dispatch);
         }
         isCutEvent = false;
         return slice;

package/dist/esm/pm-plugins/move-analytics/types.js

@@ -9,6 +9,8 @@ export var defaultState = {
     nodeName: undefined,
     size: undefined,
     nodeDepth: undefined,
-    currentActions: []
+    currentActions: [],
+    nodeTypes: undefined,
+    hasSelectedMultipleNodes: undefined
   }
 };

package/dist/esm/pm-plugins/move-analytics/utils.js

@@ -1,5 +1,7 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { findParentNodeClosestToPos, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { fg } from '@atlaskit/platform-feature-flags';
 var excludedNodes = ['caption', 'layoutColumn', 'listItem', 'tableHeader', 'tableCell', 'tableRow', 'text', 'placeholder', 'unsupportedBlock', 'unsupportedInline', 'hardBreak', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'taskItem', 'decisionItem'];
 export var isExcludedNode = function isExcludedNode(nodeName) {
   return excludedNodes.includes(nodeName);
@@ -63,4 +65,26 @@ export var isEntireNestedParagraphOrHeadingSelected = function isEntireNestedPar
   var $from = selection.$from,
     $to = selection.$to;
   return $from.textOffset === 0 && $to.textOffset === 0;
+};
+export var containsExcludedNode = function containsExcludedNode(content) {
+  for (var i = 0; i < content.childCount; i++) {
+    var _content$maybeChild;
+    var nodeName = ((_content$maybeChild = content.maybeChild(i)) === null || _content$maybeChild === void 0 ? void 0 : _content$maybeChild.type.name) || '';
+    if (isExcludedNode(nodeName)) {
+      return true;
+    }
+  }
+  return false;
+};
+export var getMultipleSelectionAttributes = function getMultipleSelectionAttributes(content) {
+  var nodeTypes = [];
+  if (content.size) {
+    content.forEach(function (node) {
+      nodeTypes.push(node.type.name);
+    });
+  }
+  return {
+    nodeTypes: fg('platform_editor_track_node_types') ? _toConsumableArray(new Set(nodeTypes)).sort().join(',') : undefined,
+    hasSelectedMultipleNodes: nodeTypes.length > 1
+  };
 };

package/dist/types/pm-plugins/move-analytics/types.d.ts

@@ -5,6 +5,8 @@ export type ContentMoved = {
     size?: number;
     currentActions: Array<ActionType>;
     nodeDepth?: number;
+    nodeTypes?: string;
+    hasSelectedMultipleNodes?: boolean;
 };
 export type MoveAnalyticsPluginState = {
     contentMoved: ContentMoved;

package/dist/types/pm-plugins/move-analytics/utils.d.ts

@@ -1,3 +1,4 @@
+import type { Fragment } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 export declare const isExcludedNode: (nodeName: string) => boolean;
 export declare const isCursorSelectionAtTopLevel: (selection: Selection) => boolean;
@@ -6,3 +7,8 @@ export declare const isNestedInlineNode: (selection: Selection) => boolean;
 export declare const isNestedInTable: (state: EditorState) => boolean;
 export declare const getParentNodeDepth: (selection: Selection) => number;
 export declare const isEntireNestedParagraphOrHeadingSelected: (selection: Selection) => boolean;
+export declare const containsExcludedNode: (content: Fragment) => boolean;
+export declare const getMultipleSelectionAttributes: (content: Fragment) => {
+    nodeTypes: string | undefined;
+    hasSelectedMultipleNodes: boolean;
+};

package/dist/types-ts4.5/pm-plugins/move-analytics/types.d.ts

@@ -5,6 +5,8 @@ export type ContentMoved = {
     size?: number;
     currentActions: Array<ActionType>;
     nodeDepth?: number;
+    nodeTypes?: string;
+    hasSelectedMultipleNodes?: boolean;
 };
 export type MoveAnalyticsPluginState = {
     contentMoved: ContentMoved;

package/dist/types-ts4.5/pm-plugins/move-analytics/utils.d.ts

@@ -1,3 +1,4 @@
+import type { Fragment } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 export declare const isExcludedNode: (nodeName: string) => boolean;
 export declare const isCursorSelectionAtTopLevel: (selection: Selection) => boolean;
@@ -6,3 +7,8 @@ export declare const isNestedInlineNode: (selection: Selection) => boolean;
 export declare const isNestedInTable: (state: EditorState) => boolean;
 export declare const getParentNodeDepth: (selection: Selection) => number;
 export declare const isEntireNestedParagraphOrHeadingSelected: (selection: Selection) => boolean;
+export declare const containsExcludedNode: (content: Fragment) => boolean;
+export declare const getMultipleSelectionAttributes: (content: Fragment) => {
+    nodeTypes: string | undefined;
+    hasSelectedMultipleNodes: boolean;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "2.2.2",
+	"version": "2.3.1",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.2.1",
 		"@atlaskit/code": "^15.6.9",
-		"@atlaskit/editor-common": "^99.14.0",
+		"@atlaskit/editor-common": "^99.17.0",
 		"@atlaskit/editor-markdown-transformer": "^5.15.0",
 		"@atlaskit/editor-plugin-analytics": "^1.12.0",
 		"@atlaskit/editor-plugin-annotation": "^1.28.0",
@@ -47,7 +47,7 @@
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/media-client": "^31.1.0",
 		"@atlaskit/media-common": "^11.8.0",
-		"@atlaskit/platform-feature-flags": "^1.0.0",
+		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/tmp-editor-statsig": "^2.46.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
@@ -60,7 +60,7 @@
 	"devDependencies": {
 		"@af/visual-regression": "*",
 		"@atlaskit/editor-plugin-block-type": "^4.3.0",
-		"@atlaskit/editor-plugin-history": "^1.4.0",
+		"@atlaskit/editor-plugin-history": "^1.5.0",
 		"@atlaskit/editor-plugin-type-ahead": "^1.13.0",
 		"@atlaskit/ssr": "*",
 		"@atlaskit/visual-regression": "*",
@@ -132,8 +132,14 @@
 		"platform_editor_legacy_content_macro": {
 			"type": "boolean"
 		},
+		"platform_editor_macroid_reset_for_ext_on_paste": {
+			"type": "boolean"
+		},
 		"platform_editor_legacy_content_macro_insert": {
 			"type": "boolean"
+		},
+		"platform_editor_track_node_types": {
+			"type": "boolean"
 		}
 	}
 }