@atlaskit/editor-plugin-paste 1.12.3 → 1.12.4

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-paste
 
+## 1.12.4
+
+### Patch Changes
+
+- [#142433](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/142433)
+  [`896303d4b4390`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/896303d4b4390) -
+  ED-24552 Update document moved event to fire when nested nodes are cut/paste into nodes and add
+  nodeDepth attributes
+- Updated dependencies
+
 ## 1.12.3
 
 ### Patch Changes

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

@@ -16,7 +16,8 @@ var updateContentMoved = exports.updateContentMoved = function updateContentMove
     var data = {
       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
+      nodeName: nextState === null || nextState === void 0 ? void 0 : nextState.nodeName,
+      nodeDepth: nextState === null || nextState === void 0 ? void 0 : nextState.nodeDepth
     };
     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
@@ -42,8 +47,12 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, editor
         var content = slice.content,
           size = slice.size;
         var nodeName = (_content$firstChild = content.firstChild) === null || _content$firstChild === void 0 ? void 0 : _content$firstChild.type.name;
-        // We should not account for pastes that go inside another node and create nested content as DnD can't do it.
-        if (!nodeName || !(contentMoved !== null && contentMoved !== void 0 && contentMoved.nodeName) || !(0, _utils.isValidNodeName)(contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName, nodeName) || size !== (contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.size) || !(0, _utils.isCursorSelectionAndInsideTopLevelNode)(state.selection)) {
+
+        // We should not account for pastes that go inside another node and create nested content as DnD can't do it when nested-dnd is disabled
+        if ((!nodeName || !(contentMoved !== null && contentMoved !== void 0 && contentMoved.nodeName) || !(0, _utils.isValidNodeName)(contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName, nodeName) || size !== (contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.size) || !(0, _utils.isCursorSelectionAndInsideTopLevelNode)(state.selection)) && (0, _experiments.editorExperiment)('nested-dnd', false)) {
+          return;
+        }
+        if (!nodeName || !(contentMoved !== null && contentMoved !== void 0 && contentMoved.nodeName) || !(0, _utils.isCursorSelectionAtTopLevel)(state.selection) && (0, _experiments.editorExperiment)('nested-dnd', true)) {
           return;
         }
         var tr = state.tr;
@@ -52,9 +61,12 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, editor
           actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
           actionSubjectId: _analytics.ACTION_SUBJECT_ID.NODE,
           eventType: _analytics.EVENT_TYPE.TRACK,
-          attributes: {
-            nodeType: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName // keep nodeName from copied slice
-          }
+          attributes: _objectSpread({
+            nodeType: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName
+          }, (0, _experiments.editorExperiment)('nested-dnd', true) && {
+            nodeDepth: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeDepth,
+            destinationNodeDepth: (0, _utils.getParentNodeDepth)(state.selection)
+          })
         })(tr);
 
         // reset to default state
@@ -84,6 +96,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, editor
           resetState = 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.
@@ -93,42 +106,50 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, editor
         var selection = state.selection;
         // DnD can't drag part of text in a paragraph/heading. DnD will select the whole node with all the text inside.
         // So we are only interested in cut slices that contain the entire node, not just a part of it.
-        if (!resetState && nodeName === 'paragraph' && !(0, _utils.isEntireTopLevelHeadingOrParagraphSelected)(selection, nodeName)) {
+        if (!resetState && nodeName === 'paragraph' && !(0, _utils.isEntireTopLevelHeadingOrParagraphSelected)(selection, nodeName) && (0, _experiments.editorExperiment)('nested-dnd', false)) {
           resetState = true;
         }
-        if (!resetState && nodeName === 'heading' && !(0, _utils.isEntireTopLevelHeadingOrParagraphSelected)(selection, nodeName)) {
+        if (!resetState && nodeName === 'heading' && !(0, _utils.isEntireTopLevelHeadingOrParagraphSelected)(selection, nodeName) && (0, _experiments.editorExperiment)('nested-dnd', false)) {
+          resetState = true;
+        }
+        if (!resetState && !(0, _utils.isEntireNestedParagraphOrHeadingSelected)(selection) && (0, _experiments.editorExperiment)('nested-dnd', true)) {
           resetState = true;
         }
 
         // DnD can't drag just one paragraph (when blockquote contains multiple paragraphs) or just a part of a paragraph in the blockquote.
         // DnD will select and drag the whole blockquote. So we need to register cut events that have the entire blockquote too.
-        if (!resetState && nodeName === 'blockquote' && !(0, _utils.isEntireTopLevelBlockquoteSelected)(state)) {
+        if (!resetState && nodeName === 'blockquote' && !(0, _utils.isEntireTopLevelBlockquoteSelected)(state) && (0, _experiments.editorExperiment)('nested-dnd', false)) {
           resetState = true;
         }
         if (!resetState && (0, _utils.isInlineNode)(nodeName) && (0, _utils.isNestedInlineNode)(selection)) {
           resetState = true;
         }
-        if (!resetState && nodeName === 'table' && (0, _utils.isNestedTable)(selection)) {
+        if (!resetState && nodeName === 'table' && (0, _utils.isNestedTable)(selection) && (0, _experiments.editorExperiment)('nested-dnd', false)) {
+          resetState = true;
+        }
+        if (!resetState && (0, _utils.isNestedInTable)(state) && (0, _experiments.editorExperiment)('nested-dnd', true) && (0, _experiments.editorExperiment)('table-nested-dnd', false)) {
           resetState = true;
         }
         var isBlockNode = (0, _utils.isBlockNodeWithoutTable)(nodeName);
-        if (!resetState && (0, _utils.isNodeSelection)(selection) && isBlockNode && selection.$anchor.node().type.name !== 'doc' // checks that the block node is not a topLevel node
+        if (!resetState && (0, _utils.isNodeSelection)(selection) && isBlockNode && selection.$anchor.node().type.name !== 'doc' && (0, _experiments.editorExperiment)('nested-dnd', false) // checks that the block node is not a topLevel node
         ) {
           resetState = true;
         }
 
         // Some blockNodes can have text inside of them cut, in that case TextSelection occurs, we don't need to track
         // these cut events.
-        if (!resetState && (0, _utils.isTextSelection)(selection) && isBlockNode) {
+        if (!resetState && (0, _utils.isTextSelection)(selection) && isBlockNode && (0, _experiments.editorExperiment)('nested-dnd', false)) {
           resetState = true;
         }
         if (resetState) {
           (0, _commands.resetContentMoved)()(state, dispatch);
         } else {
-          (0, _commands.updateContentMoved)({
+          (0, _commands.updateContentMoved)(_objectSpread({
             size: size,
             nodeName: nodeName
-          }, 'contentCut')(state, dispatch);
+          }, (0, _experiments.editorExperiment)('nested-dnd', true) && {
+            nodeDepth: (0, _utils.getParentNodeDepth)(selection)
+          }), 'contentCut')(state, dispatch);
         }
         isCutEvent = false;
         return slice;

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

@@ -14,6 +14,7 @@ var defaultState = exports.defaultState = {
   contentMoved: {
     nodeName: undefined,
     size: undefined,
+    nodeDepth: undefined,
     currentActions: []
   }
 };

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

@@ -1,12 +1,16 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isValidNodeName = exports.isTextSelection = exports.isNodeSelection = exports.isNestedTable = exports.isNestedInlineNode = exports.isInlineNode = exports.isExcludedNode = exports.isEntireTopLevelHeadingOrParagraphSelected = exports.isEntireTopLevelBlockquoteSelected = exports.isCursorSelectionAndInsideTopLevelNode = exports.isBlockNodeWithoutTable = void 0;
+exports.isValidNodeName = exports.isTextSelection = exports.isNodeSelection = exports.isNestedTable = exports.isNestedInlineNode = exports.isNestedInTable = exports.isInlineNode = exports.isExcludedNode = exports.isEntireTopLevelHeadingOrParagraphSelected = exports.isEntireTopLevelBlockquoteSelected = exports.isEntireNestedParagraphOrHeadingSelected = exports.isCursorSelectionAtTopLevel = exports.isCursorSelectionAndInsideTopLevelNode = exports.isBlockNodeWithoutTable = exports.getParentNodeDepth = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var excludedNodes = ['caption', 'layoutColumn', 'listItem', 'nestedExpand', 'tableHeader', 'tableCell', 'tableRow', 'text', 'placeholder', 'unsupportedBlock', 'unsupportedInline', 'hardBreak', 'media', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'bulletList', 'orderedList', 'taskList', 'taskItem', 'decisionList', 'decisionItem'];
+var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+var excludedNodes = ['caption', 'layoutColumn', 'listItem', 'tableHeader', 'tableCell', 'tableRow', 'text', 'placeholder', 'unsupportedBlock', 'unsupportedInline', 'hardBreak', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'taskItem', 'decisionItem'].concat((0, _toConsumableArray2.default)((0, _experiments.editorExperiment)('nested-dnd', false) ? ['bulletList', 'orderedList', 'taskList', 'decisionList', 'nestedExpand', 'media'] : []));
 var isExcludedNode = exports.isExcludedNode = function isExcludedNode(nodeName) {
   return excludedNodes.includes(nodeName);
 };
@@ -19,6 +23,15 @@ var isCursorSelectionAndInsideTopLevelNode = exports.isCursorSelectionAndInsideT
   }
   return true;
 };
+var isCursorSelectionAtTopLevel = exports.isCursorSelectionAtTopLevel = function isCursorSelectionAtTopLevel(selection) {
+  var from = selection.from,
+    to = selection.to,
+    $from = selection.$from;
+  if (from !== to) {
+    return false;
+  }
+  return $from.parentOffset === 0;
+};
 var inlineNodes = ['emoji', 'date', 'status', 'mention', 'mediaInline', 'inlineCard', 'inlineExtension'];
 var isInlineNode = exports.isInlineNode = function isInlineNode(nodeName) {
   return inlineNodes.includes(nodeName);
@@ -52,6 +65,28 @@ var isNestedTable = exports.isNestedTable = function isNestedTable(selection) {
   var parentNode = selection.$anchor.node(1);
   return parentNode && parentNodes.includes(parentNode.type.name);
 };
+var isNestedInTable = exports.isNestedInTable = function isNestedInTable(state) {
+  var schema = state.schema,
+    selection = state.selection;
+  if (selection instanceof _cellSelection.CellSelection) {
+    return false;
+  }
+  var table = schema.nodes.table;
+  var tableNode = (0, _utils.findParentNodeOfTypeClosestToPos)(selection.$from, table);
+  if (!tableNode) {
+    return false;
+  }
+  return true;
+};
+var getParentNodeDepth = exports.getParentNodeDepth = function getParentNodeDepth(selection) {
+  var parentNode = (0, _utils.findParentNodeClosestToPos)(selection.$from, function () {
+    return true;
+  });
+  if (!parentNode) {
+    return 0;
+  }
+  return parentNode.node.type.name === 'heading' || parentNode.node.type.name === 'paragraph' ? parentNode.depth - 1 : parentNode.depth;
+};
 var getPastedNameOfInlineNode = function getPastedNameOfInlineNode(nodeName) {
   if (inlineNodes.includes(nodeName)) {
     return 'paragraph';
@@ -117,4 +152,9 @@ var isEntireTopLevelBlockquoteSelected = exports.isEntireTopLevelBlockquoteSelec
     }
   });
   return selectedNodesCount === blockquoteNode.node.childCount;
+};
+var isEntireNestedParagraphOrHeadingSelected = exports.isEntireNestedParagraphOrHeadingSelected = function isEntireNestedParagraphOrHeadingSelected(selection) {
+  var $from = selection.$from,
+    $to = selection.$to;
+  return $from.textOffset === 0 && $to.textOffset === 0;
 };

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

@@ -8,7 +8,8 @@ export const updateContentMoved = (nextState, nextAction) => createCommand(state
   const data = {
     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
+    nodeName: nextState === null || nextState === void 0 ? void 0 : nextState.nodeName,
+    nodeDepth: nextState === null || nextState === void 0 ? void 0 : nextState.nodeDepth
   };
   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 { isBlockNodeWithoutTable, isCursorSelectionAndInsideTopLevelNode, isEntireTopLevelBlockquoteSelected, isEntireTopLevelHeadingOrParagraphSelected, isExcludedNode, isInlineNode, isNestedInlineNode, isNestedTable, isNodeSelection, isTextSelection, isValidNodeName } from './utils';
+import { getParentNodeDepth, isBlockNodeWithoutTable, isCursorSelectionAndInsideTopLevelNode, isCursorSelectionAtTopLevel, isEntireNestedParagraphOrHeadingSelected, isEntireTopLevelBlockquoteSelected, isEntireTopLevelHeadingOrParagraphSelected, isExcludedNode, isInlineNode, isNestedInlineNode, isNestedInTable, isNestedTable, isNodeSelection, isTextSelection, isValidNodeName } 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
@@ -41,8 +42,12 @@ export const createPlugin = (dispatch, editorAnalyticsAPI) => {
           size
         } = slice;
         const nodeName = (_content$firstChild = content.firstChild) === null || _content$firstChild === void 0 ? void 0 : _content$firstChild.type.name;
-        // We should not account for pastes that go inside another node and create nested content as DnD can't do it.
-        if (!nodeName || !(contentMoved !== null && contentMoved !== void 0 && contentMoved.nodeName) || !isValidNodeName(contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName, nodeName) || size !== (contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.size) || !isCursorSelectionAndInsideTopLevelNode(state.selection)) {
+
+        // We should not account for pastes that go inside another node and create nested content as DnD can't do it when nested-dnd is disabled
+        if ((!nodeName || !(contentMoved !== null && contentMoved !== void 0 && contentMoved.nodeName) || !isValidNodeName(contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName, nodeName) || size !== (contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.size) || !isCursorSelectionAndInsideTopLevelNode(state.selection)) && editorExperiment('nested-dnd', false)) {
+          return;
+        }
+        if (!nodeName || !(contentMoved !== null && contentMoved !== void 0 && contentMoved.nodeName) || !isCursorSelectionAtTopLevel(state.selection) && editorExperiment('nested-dnd', true)) {
           return;
         }
         const {
@@ -54,7 +59,12 @@ export const createPlugin = (dispatch, editorAnalyticsAPI) => {
           actionSubjectId: ACTION_SUBJECT_ID.NODE,
           eventType: EVENT_TYPE.TRACK,
           attributes: {
-            nodeType: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName // keep nodeName from copied slice
+            nodeType: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName,
+            ...(editorExperiment('nested-dnd', true) && {
+              nodeDepth: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeDepth,
+              destinationNodeDepth: getParentNodeDepth(state.selection)
+            })
+            // keep nodeName from copied slice
           }
         })(tr);
 
@@ -88,6 +98,7 @@ export const createPlugin = (dispatch, editorAnalyticsAPI) => {
           resetState = 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.
@@ -99,33 +110,39 @@ export const createPlugin = (dispatch, editorAnalyticsAPI) => {
         } = state;
         // DnD can't drag part of text in a paragraph/heading. DnD will select the whole node with all the text inside.
         // So we are only interested in cut slices that contain the entire node, not just a part of it.
-        if (!resetState && nodeName === 'paragraph' && !isEntireTopLevelHeadingOrParagraphSelected(selection, nodeName)) {
+        if (!resetState && nodeName === 'paragraph' && !isEntireTopLevelHeadingOrParagraphSelected(selection, nodeName) && editorExperiment('nested-dnd', false)) {
           resetState = true;
         }
-        if (!resetState && nodeName === 'heading' && !isEntireTopLevelHeadingOrParagraphSelected(selection, nodeName)) {
+        if (!resetState && nodeName === 'heading' && !isEntireTopLevelHeadingOrParagraphSelected(selection, nodeName) && editorExperiment('nested-dnd', false)) {
+          resetState = true;
+        }
+        if (!resetState && !isEntireNestedParagraphOrHeadingSelected(selection) && editorExperiment('nested-dnd', true)) {
           resetState = true;
         }
 
         // DnD can't drag just one paragraph (when blockquote contains multiple paragraphs) or just a part of a paragraph in the blockquote.
         // DnD will select and drag the whole blockquote. So we need to register cut events that have the entire blockquote too.
-        if (!resetState && nodeName === 'blockquote' && !isEntireTopLevelBlockquoteSelected(state)) {
+        if (!resetState && nodeName === 'blockquote' && !isEntireTopLevelBlockquoteSelected(state) && editorExperiment('nested-dnd', false)) {
           resetState = true;
         }
         if (!resetState && isInlineNode(nodeName) && isNestedInlineNode(selection)) {
           resetState = true;
         }
-        if (!resetState && nodeName === 'table' && isNestedTable(selection)) {
+        if (!resetState && nodeName === 'table' && isNestedTable(selection) && editorExperiment('nested-dnd', false)) {
+          resetState = true;
+        }
+        if (!resetState && isNestedInTable(state) && editorExperiment('nested-dnd', true) && editorExperiment('table-nested-dnd', false)) {
           resetState = true;
         }
         const isBlockNode = isBlockNodeWithoutTable(nodeName);
-        if (!resetState && isNodeSelection(selection) && isBlockNode && selection.$anchor.node().type.name !== 'doc' // checks that the block node is not a topLevel node
+        if (!resetState && isNodeSelection(selection) && isBlockNode && selection.$anchor.node().type.name !== 'doc' && editorExperiment('nested-dnd', false) // checks that the block node is not a topLevel node
         ) {
           resetState = true;
         }
 
         // Some blockNodes can have text inside of them cut, in that case TextSelection occurs, we don't need to track
         // these cut events.
-        if (!resetState && isTextSelection(selection) && isBlockNode) {
+        if (!resetState && isTextSelection(selection) && isBlockNode && editorExperiment('nested-dnd', false)) {
           resetState = true;
         }
         if (resetState) {
@@ -133,7 +150,10 @@ export const createPlugin = (dispatch, editorAnalyticsAPI) => {
         } else {
           updateContentMoved({
             size: size,
-            nodeName: nodeName
+            nodeName: nodeName,
+            ...(editorExperiment('nested-dnd', true) && {
+              nodeDepth: getParentNodeDepth(selection)
+            })
           }, 'contentCut')(state, dispatch);
         }
         isCutEvent = false;

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

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

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

@@ -1,6 +1,8 @@
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
-const excludedNodes = ['caption', 'layoutColumn', 'listItem', 'nestedExpand', 'tableHeader', 'tableCell', 'tableRow', 'text', 'placeholder', 'unsupportedBlock', 'unsupportedInline', 'hardBreak', 'media', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'bulletList', 'orderedList', 'taskList', 'taskItem', 'decisionList', 'decisionItem'];
+import { findParentNodeClosestToPos, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+const excludedNodes = ['caption', 'layoutColumn', 'listItem', 'tableHeader', 'tableCell', 'tableRow', 'text', 'placeholder', 'unsupportedBlock', 'unsupportedInline', 'hardBreak', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'taskItem', 'decisionItem', ...(editorExperiment('nested-dnd', false) ? ['bulletList', 'orderedList', 'taskList', 'decisionList', 'nestedExpand', 'media'] : [])];
 export const isExcludedNode = nodeName => excludedNodes.includes(nodeName);
 export const isCursorSelectionAndInsideTopLevelNode = selection => {
   const {
@@ -13,6 +15,17 @@ export const isCursorSelectionAndInsideTopLevelNode = selection => {
   }
   return true;
 };
+export const isCursorSelectionAtTopLevel = selection => {
+  const {
+    from,
+    to,
+    $from
+  } = selection;
+  if (from !== to) {
+    return false;
+  }
+  return $from.parentOffset === 0;
+};
 const inlineNodes = ['emoji', 'date', 'status', 'mention', 'mediaInline', 'inlineCard', 'inlineExtension'];
 export const isInlineNode = nodeName => {
   return inlineNodes.includes(nodeName);
@@ -46,6 +59,30 @@ export const isNestedTable = selection => {
   const parentNode = selection.$anchor.node(1);
   return parentNode && parentNodes.includes(parentNode.type.name);
 };
+export const isNestedInTable = state => {
+  const {
+    schema,
+    selection
+  } = state;
+  if (selection instanceof CellSelection) {
+    return false;
+  }
+  const {
+    table
+  } = schema.nodes;
+  const tableNode = findParentNodeOfTypeClosestToPos(selection.$from, table);
+  if (!tableNode) {
+    return false;
+  }
+  return true;
+};
+export const getParentNodeDepth = selection => {
+  const parentNode = findParentNodeClosestToPos(selection.$from, () => true);
+  if (!parentNode) {
+    return 0;
+  }
+  return parentNode.node.type.name === 'heading' || parentNode.node.type.name === 'paragraph' ? parentNode.depth - 1 : parentNode.depth;
+};
 const getPastedNameOfInlineNode = nodeName => {
   if (inlineNodes.includes(nodeName)) {
     return 'paragraph';
@@ -121,4 +158,11 @@ export const isEntireTopLevelBlockquoteSelected = state => {
     }
   });
   return selectedNodesCount === blockquoteNode.node.childCount;
+};
+export const isEntireNestedParagraphOrHeadingSelected = selection => {
+  const {
+    $from,
+    $to
+  } = selection;
+  return $from.textOffset === 0 && $to.textOffset === 0;
 };

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

@@ -9,7 +9,8 @@ export var updateContentMoved = function updateContentMoved(nextState, nextActio
     var data = {
       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
+      nodeName: nextState === null || nextState === void 0 ? void 0 : nextState.nodeName,
+      nodeDepth: nextState === null || nextState === void 0 ? void 0 : nextState.nodeDepth
     };
     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 { isBlockNodeWithoutTable, isCursorSelectionAndInsideTopLevelNode, isEntireTopLevelBlockquoteSelected, isEntireTopLevelHeadingOrParagraphSelected, isExcludedNode, isInlineNode, isNestedInlineNode, isNestedTable, isNodeSelection, isTextSelection, isValidNodeName } from './utils';
+import { getParentNodeDepth, isBlockNodeWithoutTable, isCursorSelectionAndInsideTopLevelNode, isCursorSelectionAtTopLevel, isEntireNestedParagraphOrHeadingSelected, isEntireTopLevelBlockquoteSelected, isEntireTopLevelHeadingOrParagraphSelected, isExcludedNode, isInlineNode, isNestedInlineNode, isNestedInTable, isNestedTable, isNodeSelection, isTextSelection, isValidNodeName } 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
@@ -37,8 +41,12 @@ export var createPlugin = function createPlugin(dispatch, editorAnalyticsAPI) {
         var content = slice.content,
           size = slice.size;
         var nodeName = (_content$firstChild = content.firstChild) === null || _content$firstChild === void 0 ? void 0 : _content$firstChild.type.name;
-        // We should not account for pastes that go inside another node and create nested content as DnD can't do it.
-        if (!nodeName || !(contentMoved !== null && contentMoved !== void 0 && contentMoved.nodeName) || !isValidNodeName(contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName, nodeName) || size !== (contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.size) || !isCursorSelectionAndInsideTopLevelNode(state.selection)) {
+
+        // We should not account for pastes that go inside another node and create nested content as DnD can't do it when nested-dnd is disabled
+        if ((!nodeName || !(contentMoved !== null && contentMoved !== void 0 && contentMoved.nodeName) || !isValidNodeName(contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName, nodeName) || size !== (contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.size) || !isCursorSelectionAndInsideTopLevelNode(state.selection)) && editorExperiment('nested-dnd', false)) {
+          return;
+        }
+        if (!nodeName || !(contentMoved !== null && contentMoved !== void 0 && contentMoved.nodeName) || !isCursorSelectionAtTopLevel(state.selection) && editorExperiment('nested-dnd', true)) {
           return;
         }
         var tr = state.tr;
@@ -47,9 +55,12 @@ export var createPlugin = function createPlugin(dispatch, editorAnalyticsAPI) {
           actionSubject: ACTION_SUBJECT.DOCUMENT,
           actionSubjectId: ACTION_SUBJECT_ID.NODE,
           eventType: EVENT_TYPE.TRACK,
-          attributes: {
-            nodeType: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName // keep nodeName from copied slice
-          }
+          attributes: _objectSpread({
+            nodeType: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName
+          }, editorExperiment('nested-dnd', true) && {
+            nodeDepth: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeDepth,
+            destinationNodeDepth: getParentNodeDepth(state.selection)
+          })
         })(tr);
 
         // reset to default state
@@ -79,6 +90,7 @@ export var createPlugin = function createPlugin(dispatch, editorAnalyticsAPI) {
           resetState = 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.
@@ -88,42 +100,50 @@ export var createPlugin = function createPlugin(dispatch, editorAnalyticsAPI) {
         var selection = state.selection;
         // DnD can't drag part of text in a paragraph/heading. DnD will select the whole node with all the text inside.
         // So we are only interested in cut slices that contain the entire node, not just a part of it.
-        if (!resetState && nodeName === 'paragraph' && !isEntireTopLevelHeadingOrParagraphSelected(selection, nodeName)) {
+        if (!resetState && nodeName === 'paragraph' && !isEntireTopLevelHeadingOrParagraphSelected(selection, nodeName) && editorExperiment('nested-dnd', false)) {
           resetState = true;
         }
-        if (!resetState && nodeName === 'heading' && !isEntireTopLevelHeadingOrParagraphSelected(selection, nodeName)) {
+        if (!resetState && nodeName === 'heading' && !isEntireTopLevelHeadingOrParagraphSelected(selection, nodeName) && editorExperiment('nested-dnd', false)) {
+          resetState = true;
+        }
+        if (!resetState && !isEntireNestedParagraphOrHeadingSelected(selection) && editorExperiment('nested-dnd', true)) {
           resetState = true;
         }
 
         // DnD can't drag just one paragraph (when blockquote contains multiple paragraphs) or just a part of a paragraph in the blockquote.
         // DnD will select and drag the whole blockquote. So we need to register cut events that have the entire blockquote too.
-        if (!resetState && nodeName === 'blockquote' && !isEntireTopLevelBlockquoteSelected(state)) {
+        if (!resetState && nodeName === 'blockquote' && !isEntireTopLevelBlockquoteSelected(state) && editorExperiment('nested-dnd', false)) {
           resetState = true;
         }
         if (!resetState && isInlineNode(nodeName) && isNestedInlineNode(selection)) {
           resetState = true;
         }
-        if (!resetState && nodeName === 'table' && isNestedTable(selection)) {
+        if (!resetState && nodeName === 'table' && isNestedTable(selection) && editorExperiment('nested-dnd', false)) {
+          resetState = true;
+        }
+        if (!resetState && isNestedInTable(state) && editorExperiment('nested-dnd', true) && editorExperiment('table-nested-dnd', false)) {
           resetState = true;
         }
         var isBlockNode = isBlockNodeWithoutTable(nodeName);
-        if (!resetState && isNodeSelection(selection) && isBlockNode && selection.$anchor.node().type.name !== 'doc' // checks that the block node is not a topLevel node
+        if (!resetState && isNodeSelection(selection) && isBlockNode && selection.$anchor.node().type.name !== 'doc' && editorExperiment('nested-dnd', false) // checks that the block node is not a topLevel node
         ) {
           resetState = true;
         }
 
         // Some blockNodes can have text inside of them cut, in that case TextSelection occurs, we don't need to track
         // these cut events.
-        if (!resetState && isTextSelection(selection) && isBlockNode) {
+        if (!resetState && isTextSelection(selection) && isBlockNode && editorExperiment('nested-dnd', false)) {
           resetState = true;
         }
         if (resetState) {
           resetContentMoved()(state, dispatch);
         } else {
-          updateContentMoved({
+          updateContentMoved(_objectSpread({
             size: size,
             nodeName: nodeName
-          }, 'contentCut')(state, dispatch);
+          }, editorExperiment('nested-dnd', true) && {
+            nodeDepth: getParentNodeDepth(selection)
+          }), 'contentCut')(state, dispatch);
         }
         isCutEvent = false;
         return slice;

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

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

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

@@ -1,6 +1,9 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
-var excludedNodes = ['caption', 'layoutColumn', 'listItem', 'nestedExpand', 'tableHeader', 'tableCell', 'tableRow', 'text', 'placeholder', 'unsupportedBlock', 'unsupportedInline', 'hardBreak', 'media', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'bulletList', 'orderedList', 'taskList', 'taskItem', 'decisionList', 'decisionItem'];
+import { findParentNodeClosestToPos, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+var excludedNodes = ['caption', 'layoutColumn', 'listItem', 'tableHeader', 'tableCell', 'tableRow', 'text', 'placeholder', 'unsupportedBlock', 'unsupportedInline', 'hardBreak', 'confluenceUnsupportedBlock', 'confluenceUnsupportedInline', 'taskItem', 'decisionItem'].concat(_toConsumableArray(editorExperiment('nested-dnd', false) ? ['bulletList', 'orderedList', 'taskList', 'decisionList', 'nestedExpand', 'media'] : []));
 export var isExcludedNode = function isExcludedNode(nodeName) {
   return excludedNodes.includes(nodeName);
 };
@@ -13,6 +16,15 @@ export var isCursorSelectionAndInsideTopLevelNode = function isCursorSelectionAn
   }
   return true;
 };
+export var isCursorSelectionAtTopLevel = function isCursorSelectionAtTopLevel(selection) {
+  var from = selection.from,
+    to = selection.to,
+    $from = selection.$from;
+  if (from !== to) {
+    return false;
+  }
+  return $from.parentOffset === 0;
+};
 var inlineNodes = ['emoji', 'date', 'status', 'mention', 'mediaInline', 'inlineCard', 'inlineExtension'];
 export var isInlineNode = function isInlineNode(nodeName) {
   return inlineNodes.includes(nodeName);
@@ -46,6 +58,28 @@ export var isNestedTable = function isNestedTable(selection) {
   var parentNode = selection.$anchor.node(1);
   return parentNode && parentNodes.includes(parentNode.type.name);
 };
+export var isNestedInTable = function isNestedInTable(state) {
+  var schema = state.schema,
+    selection = state.selection;
+  if (selection instanceof CellSelection) {
+    return false;
+  }
+  var table = schema.nodes.table;
+  var tableNode = findParentNodeOfTypeClosestToPos(selection.$from, table);
+  if (!tableNode) {
+    return false;
+  }
+  return true;
+};
+export var getParentNodeDepth = function getParentNodeDepth(selection) {
+  var parentNode = findParentNodeClosestToPos(selection.$from, function () {
+    return true;
+  });
+  if (!parentNode) {
+    return 0;
+  }
+  return parentNode.node.type.name === 'heading' || parentNode.node.type.name === 'paragraph' ? parentNode.depth - 1 : parentNode.depth;
+};
 var getPastedNameOfInlineNode = function getPastedNameOfInlineNode(nodeName) {
   if (inlineNodes.includes(nodeName)) {
     return 'paragraph';
@@ -111,4 +145,9 @@ export var isEntireTopLevelBlockquoteSelected = function isEntireTopLevelBlockqu
     }
   });
   return selectedNodesCount === blockquoteNode.node.childCount;
+};
+export var isEntireNestedParagraphOrHeadingSelected = function isEntireNestedParagraphOrHeadingSelected(selection) {
+  var $from = selection.$from,
+    $to = selection.$to;
+  return $from.textOffset === 0 && $to.textOffset === 0;
 };

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

@@ -4,6 +4,7 @@ export type ContentMoved = {
     nodeName?: NodeName;
     size?: number;
     currentActions: Array<ActionType>;
+    nodeDepth?: number;
 };
 export type MoveAnalyticsPluginState = {
     contentMoved: ContentMoved;

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

@@ -1,12 +1,16 @@
 import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 export declare const isExcludedNode: (nodeName: string) => boolean;
 export declare const isCursorSelectionAndInsideTopLevelNode: (selection: Selection) => boolean;
+export declare const isCursorSelectionAtTopLevel: (selection: Selection) => boolean;
 export declare const isInlineNode: (nodeName: string) => boolean;
 export declare const isNestedInlineNode: (selection: Selection) => boolean;
 export declare const isBlockNodeWithoutTable: (nodeName: string) => boolean;
 export declare const isNestedTable: (selection: Selection) => boolean;
+export declare const isNestedInTable: (state: EditorState) => boolean;
+export declare const getParentNodeDepth: (selection: Selection) => number;
 export declare const isValidNodeName: (copiedNodeName: string, pastedNodeName: string) => boolean;
 export declare const isTextSelection: (selection: Selection) => boolean;
 export declare const isNodeSelection: (selection: Selection) => boolean;
 export declare const isEntireTopLevelHeadingOrParagraphSelected: (selection: Selection, nodeName: 'paragraph' | 'heading') => boolean | undefined;
 export declare const isEntireTopLevelBlockquoteSelected: (state: EditorState) => boolean;
+export declare const isEntireNestedParagraphOrHeadingSelected: (selection: Selection) => boolean;

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

@@ -4,6 +4,7 @@ export type ContentMoved = {
     nodeName?: NodeName;
     size?: number;
     currentActions: Array<ActionType>;
+    nodeDepth?: number;
 };
 export type MoveAnalyticsPluginState = {
     contentMoved: ContentMoved;

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

@@ -1,12 +1,16 @@
 import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 export declare const isExcludedNode: (nodeName: string) => boolean;
 export declare const isCursorSelectionAndInsideTopLevelNode: (selection: Selection) => boolean;
+export declare const isCursorSelectionAtTopLevel: (selection: Selection) => boolean;
 export declare const isInlineNode: (nodeName: string) => boolean;
 export declare const isNestedInlineNode: (selection: Selection) => boolean;
 export declare const isBlockNodeWithoutTable: (nodeName: string) => boolean;
 export declare const isNestedTable: (selection: Selection) => boolean;
+export declare const isNestedInTable: (state: EditorState) => boolean;
+export declare const getParentNodeDepth: (selection: Selection) => number;
 export declare const isValidNodeName: (copiedNodeName: string, pastedNodeName: string) => boolean;
 export declare const isTextSelection: (selection: Selection) => boolean;
 export declare const isNodeSelection: (selection: Selection) => boolean;
 export declare const isEntireTopLevelHeadingOrParagraphSelected: (selection: Selection, nodeName: 'paragraph' | 'heading') => boolean | undefined;
 export declare const isEntireTopLevelBlockquoteSelected: (state: EditorState) => boolean;
+export declare const isEntireNestedParagraphOrHeadingSelected: (selection: Selection) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "1.12.3",
+	"version": "1.12.4",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^89.1.0",
+		"@atlaskit/editor-common": "^90.0.0",
 		"@atlaskit/editor-markdown-transformer": "^5.12.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-annotation": "^1.19.0",
@@ -46,6 +46,7 @@
 		"@atlaskit/media-client": "^28.0.0",
 		"@atlaskit/media-common": "^11.4.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
+		"@atlaskit/tmp-editor-statsig": "*",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"uuid": "^3.1.0"
@@ -56,7 +57,7 @@
 	"devDependencies": {
 		"@af/visual-regression": "*",
 		"@atlaskit/adf-schema": "^40.9.0",
-		"@atlaskit/editor-plugin-block-type": "^3.14.0",
+		"@atlaskit/editor-plugin-block-type": "^3.15.0",
 		"@atlaskit/editor-plugin-history": "^1.3.0",
 		"@atlaskit/editor-plugin-type-ahead": "^1.8.0",
 		"@atlaskit/ssr": "*",