@atlaskit/editor-plugin-paste 1.12.5 → 1.12.6

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-paste
 
+## 1.12.6
+
+### Patch Changes
+
+- [`037ce68784704`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/037ce68784704) -
+  ED-25123 Update document moved to fire for all cases
+- Updated dependencies
+
 ## 1.12.5
 
 ### Patch Changes

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

@@ -1,11 +1,9 @@
 "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");
@@ -14,8 +12,6 @@ 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
@@ -44,15 +40,9 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, editor
         if (!hasCutAction) {
           return;
         }
-        var content = slice.content,
-          size = slice.size;
+        var content = slice.content;
         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 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)) {
+        if (!nodeName || !(contentMoved !== null && contentMoved !== void 0 && contentMoved.nodeName) || !(0, _utils.isCursorSelectionAtTopLevel)(state.selection)) {
           return;
         }
         var tr = state.tr;
@@ -61,12 +51,13 @@ 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: _objectSpread({
-            nodeType: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName
-          }, (0, _experiments.editorExperiment)('nested-dnd', true) && {
+          attributes: {
+            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
+          }
         })(tr);
 
         // reset to default state
@@ -104,52 +95,23 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, editor
           resetState = true;
         }
         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) && (0, _experiments.editorExperiment)('nested-dnd', false)) {
-          resetState = true;
-        }
-        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) && (0, _experiments.editorExperiment)('nested-dnd', false)) {
+        if (!resetState && !(0, _utils.isEntireNestedParagraphOrHeadingSelected)(selection)) {
           resetState = true;
         }
         if (!resetState && (0, _utils.isInlineNode)(nodeName) && (0, _utils.isNestedInlineNode)(selection)) {
           resetState = true;
         }
-        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' && (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 && (0, _experiments.editorExperiment)('nested-dnd', false)) {
+        if (!resetState && (0, _utils.isNestedInTable)(state) && (0, _experiments.editorExperiment)('table-nested-dnd', false)) {
           resetState = true;
         }
         if (resetState) {
           (0, _commands.resetContentMoved)()(state, dispatch);
         } else {
-          (0, _commands.updateContentMoved)(_objectSpread({
+          (0, _commands.updateContentMoved)({
             size: size,
-            nodeName: nodeName
-          }, (0, _experiments.editorExperiment)('nested-dnd', true) && {
+            nodeName: nodeName,
             nodeDepth: (0, _utils.getParentNodeDepth)(selection)
-          }), 'contentCut')(state, dispatch);
+          }, 'contentCut')(state, dispatch);
         }
         isCutEvent = false;
         return slice;

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

@@ -4,9 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-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;
+exports.isNestedInlineNode = exports.isNestedInTable = exports.isInlineNode = exports.isExcludedNode = exports.isEntireNestedParagraphOrHeadingSelected = exports.isCursorSelectionAtTopLevel = 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 _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
@@ -14,15 +13,6 @@ var excludedNodes = ['caption', 'layoutColumn', 'listItem', 'tableHeader', 'tabl
 var isExcludedNode = exports.isExcludedNode = function isExcludedNode(nodeName) {
   return excludedNodes.includes(nodeName);
 };
-var isCursorSelectionAndInsideTopLevelNode = exports.isCursorSelectionAndInsideTopLevelNode = function isCursorSelectionAndInsideTopLevelNode(selection) {
-  var $from = selection.$from,
-    from = selection.from,
-    to = selection.to;
-  if (from !== to || $from.depth > 1) {
-    return false;
-  }
-  return true;
-};
 var isCursorSelectionAtTopLevel = exports.isCursorSelectionAtTopLevel = function isCursorSelectionAtTopLevel(selection) {
   var from = selection.from,
     to = selection.to,
@@ -56,15 +46,6 @@ var isNestedInlineNode = exports.isNestedInlineNode = function isNestedInlineNod
   }
   return true;
 };
-var blockNodes = ['bodiedExtension', 'blockCard', 'codeBlock', 'embedCard', 'expand', 'extension', 'layoutSection', 'mediaGroup', 'mediaSingle', 'panel', 'rule'];
-var isBlockNodeWithoutTable = exports.isBlockNodeWithoutTable = function isBlockNodeWithoutTable(nodeName) {
-  return blockNodes.includes(nodeName);
-};
-var parentNodes = ['expand', 'extension', 'bodiedExtension', 'layoutSection'];
-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;
@@ -87,72 +68,6 @@ var getParentNodeDepth = exports.getParentNodeDepth = function getParentNodeDept
   }
   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';
-  }
-  return nodeName;
-};
-var isValidNodeName = exports.isValidNodeName = function isValidNodeName(copiedNodeName, pastedNodeName) {
-  if (copiedNodeName === pastedNodeName) {
-    return true;
-  }
-  if (getPastedNameOfInlineNode(copiedNodeName) === pastedNodeName) {
-    return true;
-  }
-  return false;
-};
-var isTextSelection = exports.isTextSelection = function isTextSelection(selection) {
-  return selection instanceof _state.TextSelection && selection.from !== selection.to;
-};
-var isNodeSelection = exports.isNodeSelection = function isNodeSelection(selection) {
-  return selection instanceof _state.NodeSelection;
-};
-var isEntireHeadingOrParagraphSelected = function isEntireHeadingOrParagraphSelected(selection, nodeName) {
-  if (!isTextSelection(selection)) {
-    return false;
-  }
-  var $from = selection.$from,
-    $to = selection.$to;
-  if (!($from.parent.type.name === nodeName)) {
-    return false;
-  }
-  if ($from.parent === $to.parent) {
-    var node = $from.parent;
-    return $from.parentOffset === 0 && $to.parentOffset === node.content.size;
-  }
-};
-var isEntireTopLevelHeadingOrParagraphSelected = exports.isEntireTopLevelHeadingOrParagraphSelected = function isEntireTopLevelHeadingOrParagraphSelected(selection, nodeName) {
-  if (selection.$from.depth !== 1) {
-    return false;
-  }
-  return isEntireHeadingOrParagraphSelected(selection, nodeName);
-};
-var isEntireTopLevelBlockquoteSelected = exports.isEntireTopLevelBlockquoteSelected = function isEntireTopLevelBlockquoteSelected(state) {
-  var schema = state.schema,
-    selection = state.selection;
-  var blockquote = schema.nodes.blockquote;
-  var blockquoteNode = (0, _utils.findParentNodeOfTypeClosestToPos)(selection.$from, blockquote);
-  if (!blockquoteNode) {
-    return false;
-  }
-
-  // checks if it is a top level blockquote
-  var depth = blockquoteNode.depth;
-  if (depth !== 1) {
-    return false;
-  }
-  var from = selection.from,
-    to = selection.to;
-  var selectedNodesCount = 0;
-  state.doc.nodesBetween(from, to, function (node, pos) {
-    if (pos >= from && pos + node.nodeSize <= to) {
-      selectedNodesCount++;
-      return false;
-    }
-  });
-  return selectedNodesCount === blockquoteNode.node.childCount;
-};
 var isEntireNestedParagraphOrHeadingSelected = exports.isEntireNestedParagraphOrHeadingSelected = function isEntireNestedParagraphOrHeadingSelected(selection) {
   var $from = selection.$from,
     $to = selection.$to;

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

@@ -5,7 +5,7 @@ import { resetContentMoved, resetContentMovedTransform, updateContentMoved } fro
 import { createPluginState, getPluginState } from './plugin-factory';
 import { pluginKey } from './plugin-key';
 import { defaultState } from './types';
-import { getParentNodeDepth, isBlockNodeWithoutTable, isCursorSelectionAndInsideTopLevelNode, isCursorSelectionAtTopLevel, isEntireNestedParagraphOrHeadingSelected, isEntireTopLevelBlockquoteSelected, isEntireTopLevelHeadingOrParagraphSelected, isExcludedNode, isInlineNode, isNestedInlineNode, isNestedInTable, isNestedTable, isNodeSelection, isTextSelection, isValidNodeName } from './utils';
+import { 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
@@ -38,16 +38,10 @@ export const createPlugin = (dispatch, editorAnalyticsAPI) => {
           return;
         }
         const {
-          content,
-          size
+          content
         } = 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 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)) {
+        if (!nodeName || !(contentMoved !== null && contentMoved !== void 0 && contentMoved.nodeName) || !isCursorSelectionAtTopLevel(state.selection)) {
           return;
         }
         const {
@@ -60,10 +54,9 @@ export const createPlugin = (dispatch, editorAnalyticsAPI) => {
           eventType: EVENT_TYPE.TRACK,
           attributes: {
             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)
-            })
+            nodeDepth: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeDepth,
+            destinationNodeDepth: getParentNodeDepth(state.selection)
+
             // keep nodeName from copied slice
           }
         })(tr);
@@ -108,41 +101,13 @@ export const createPlugin = (dispatch, editorAnalyticsAPI) => {
         const {
           selection
         } = 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) && editorExperiment('nested-dnd', false)) {
-          resetState = true;
-        }
-        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) && editorExperiment('nested-dnd', false)) {
+        if (!resetState && !isEntireNestedParagraphOrHeadingSelected(selection)) {
           resetState = true;
         }
         if (!resetState && isInlineNode(nodeName) && isNestedInlineNode(selection)) {
           resetState = true;
         }
-        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' && 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 && editorExperiment('nested-dnd', false)) {
+        if (!resetState && isNestedInTable(state) && editorExperiment('table-nested-dnd', false)) {
           resetState = true;
         }
         if (resetState) {
@@ -151,9 +116,7 @@ export const createPlugin = (dispatch, editorAnalyticsAPI) => {
           updateContentMoved({
             size: size,
             nodeName: nodeName,
-            ...(editorExperiment('nested-dnd', true) && {
-              nodeDepth: getParentNodeDepth(selection)
-            })
+            nodeDepth: getParentNodeDepth(selection)
           }, 'contentCut')(state, dispatch);
         }
         isCutEvent = false;

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

@@ -1,20 +1,8 @@
-import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 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 {
-    $from,
-    from,
-    to
-  } = selection;
-  if (from !== to || $from.depth > 1) {
-    return false;
-  }
-  return true;
-};
 export const isCursorSelectionAtTopLevel = selection => {
   const {
     from,
@@ -50,15 +38,6 @@ export const isNestedInlineNode = selection => {
   }
   return true;
 };
-const blockNodes = ['bodiedExtension', 'blockCard', 'codeBlock', 'embedCard', 'expand', 'extension', 'layoutSection', 'mediaGroup', 'mediaSingle', 'panel', 'rule'];
-export const isBlockNodeWithoutTable = nodeName => {
-  return blockNodes.includes(nodeName);
-};
-const parentNodes = ['expand', 'extension', 'bodiedExtension', 'layoutSection'];
-export const isNestedTable = selection => {
-  const parentNode = selection.$anchor.node(1);
-  return parentNode && parentNodes.includes(parentNode.type.name);
-};
 export const isNestedInTable = state => {
   const {
     schema,
@@ -83,82 +62,6 @@ export const getParentNodeDepth = selection => {
   }
   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';
-  }
-  return nodeName;
-};
-export const isValidNodeName = (copiedNodeName, pastedNodeName) => {
-  if (copiedNodeName === pastedNodeName) {
-    return true;
-  }
-  if (getPastedNameOfInlineNode(copiedNodeName) === pastedNodeName) {
-    return true;
-  }
-  return false;
-};
-export const isTextSelection = selection => {
-  return selection instanceof TextSelection && selection.from !== selection.to;
-};
-export const isNodeSelection = selection => {
-  return selection instanceof NodeSelection;
-};
-const isEntireHeadingOrParagraphSelected = (selection, nodeName) => {
-  if (!isTextSelection(selection)) {
-    return false;
-  }
-  const {
-    $from,
-    $to
-  } = selection;
-  if (!($from.parent.type.name === nodeName)) {
-    return false;
-  }
-  if ($from.parent === $to.parent) {
-    const node = $from.parent;
-    return $from.parentOffset === 0 && $to.parentOffset === node.content.size;
-  }
-};
-export const isEntireTopLevelHeadingOrParagraphSelected = (selection, nodeName) => {
-  if (selection.$from.depth !== 1) {
-    return false;
-  }
-  return isEntireHeadingOrParagraphSelected(selection, nodeName);
-};
-export const isEntireTopLevelBlockquoteSelected = state => {
-  const {
-    schema,
-    selection
-  } = state;
-  const {
-    blockquote
-  } = schema.nodes;
-  const blockquoteNode = findParentNodeOfTypeClosestToPos(selection.$from, blockquote);
-  if (!blockquoteNode) {
-    return false;
-  }
-
-  // checks if it is a top level blockquote
-  const {
-    depth
-  } = blockquoteNode;
-  if (depth !== 1) {
-    return false;
-  }
-  const {
-    from,
-    to
-  } = selection;
-  let selectedNodesCount = 0;
-  state.doc.nodesBetween(from, to, (node, pos) => {
-    if (pos >= from && pos + node.nodeSize <= to) {
-      selectedNodesCount++;
-      return false;
-    }
-  });
-  return selectedNodesCount === blockquoteNode.node.childCount;
-};
 export const isEntireNestedParagraphOrHeadingSelected = selection => {
   const {
     $from,

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

@@ -1,6 +1,3 @@
-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';
@@ -8,7 +5,7 @@ import { resetContentMoved, resetContentMovedTransform, updateContentMoved } fro
 import { createPluginState, getPluginState } from './plugin-factory';
 import { pluginKey } from './plugin-key';
 import { defaultState } from './types';
-import { getParentNodeDepth, isBlockNodeWithoutTable, isCursorSelectionAndInsideTopLevelNode, isCursorSelectionAtTopLevel, isEntireNestedParagraphOrHeadingSelected, isEntireTopLevelBlockquoteSelected, isEntireTopLevelHeadingOrParagraphSelected, isExcludedNode, isInlineNode, isNestedInlineNode, isNestedInTable, isNestedTable, isNodeSelection, isTextSelection, isValidNodeName } from './utils';
+import { 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
@@ -38,15 +35,9 @@ export var createPlugin = function createPlugin(dispatch, editorAnalyticsAPI) {
         if (!hasCutAction) {
           return;
         }
-        var content = slice.content,
-          size = slice.size;
+        var content = slice.content;
         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 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)) {
+        if (!nodeName || !(contentMoved !== null && contentMoved !== void 0 && contentMoved.nodeName) || !isCursorSelectionAtTopLevel(state.selection)) {
           return;
         }
         var tr = state.tr;
@@ -55,12 +46,13 @@ export var createPlugin = function createPlugin(dispatch, editorAnalyticsAPI) {
           actionSubject: ACTION_SUBJECT.DOCUMENT,
           actionSubjectId: ACTION_SUBJECT_ID.NODE,
           eventType: EVENT_TYPE.TRACK,
-          attributes: _objectSpread({
-            nodeType: contentMoved === null || contentMoved === void 0 ? void 0 : contentMoved.nodeName
-          }, editorExperiment('nested-dnd', true) && {
+          attributes: {
+            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
+          }
         })(tr);
 
         // reset to default state
@@ -98,52 +90,23 @@ export var createPlugin = function createPlugin(dispatch, editorAnalyticsAPI) {
           resetState = true;
         }
         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) && editorExperiment('nested-dnd', false)) {
-          resetState = true;
-        }
-        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) && editorExperiment('nested-dnd', false)) {
+        if (!resetState && !isEntireNestedParagraphOrHeadingSelected(selection)) {
           resetState = true;
         }
         if (!resetState && isInlineNode(nodeName) && isNestedInlineNode(selection)) {
           resetState = true;
         }
-        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' && 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 && editorExperiment('nested-dnd', false)) {
+        if (!resetState && isNestedInTable(state) && editorExperiment('table-nested-dnd', false)) {
           resetState = true;
         }
         if (resetState) {
           resetContentMoved()(state, dispatch);
         } else {
-          updateContentMoved(_objectSpread({
+          updateContentMoved({
             size: size,
-            nodeName: nodeName
-          }, editorExperiment('nested-dnd', true) && {
+            nodeName: nodeName,
             nodeDepth: getParentNodeDepth(selection)
-          }), 'contentCut')(state, dispatch);
+          }, 'contentCut')(state, dispatch);
         }
         isCutEvent = false;
         return slice;

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

@@ -1,5 +1,4 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeClosestToPos, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
@@ -7,15 +6,6 @@ var excludedNodes = ['caption', 'layoutColumn', 'listItem', 'tableHeader', 'tabl
 export var isExcludedNode = function isExcludedNode(nodeName) {
   return excludedNodes.includes(nodeName);
 };
-export var isCursorSelectionAndInsideTopLevelNode = function isCursorSelectionAndInsideTopLevelNode(selection) {
-  var $from = selection.$from,
-    from = selection.from,
-    to = selection.to;
-  if (from !== to || $from.depth > 1) {
-    return false;
-  }
-  return true;
-};
 export var isCursorSelectionAtTopLevel = function isCursorSelectionAtTopLevel(selection) {
   var from = selection.from,
     to = selection.to,
@@ -49,15 +39,6 @@ export var isNestedInlineNode = function isNestedInlineNode(selection) {
   }
   return true;
 };
-var blockNodes = ['bodiedExtension', 'blockCard', 'codeBlock', 'embedCard', 'expand', 'extension', 'layoutSection', 'mediaGroup', 'mediaSingle', 'panel', 'rule'];
-export var isBlockNodeWithoutTable = function isBlockNodeWithoutTable(nodeName) {
-  return blockNodes.includes(nodeName);
-};
-var parentNodes = ['expand', 'extension', 'bodiedExtension', 'layoutSection'];
-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;
@@ -80,72 +61,6 @@ export var getParentNodeDepth = function getParentNodeDepth(selection) {
   }
   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';
-  }
-  return nodeName;
-};
-export var isValidNodeName = function isValidNodeName(copiedNodeName, pastedNodeName) {
-  if (copiedNodeName === pastedNodeName) {
-    return true;
-  }
-  if (getPastedNameOfInlineNode(copiedNodeName) === pastedNodeName) {
-    return true;
-  }
-  return false;
-};
-export var isTextSelection = function isTextSelection(selection) {
-  return selection instanceof TextSelection && selection.from !== selection.to;
-};
-export var isNodeSelection = function isNodeSelection(selection) {
-  return selection instanceof NodeSelection;
-};
-var isEntireHeadingOrParagraphSelected = function isEntireHeadingOrParagraphSelected(selection, nodeName) {
-  if (!isTextSelection(selection)) {
-    return false;
-  }
-  var $from = selection.$from,
-    $to = selection.$to;
-  if (!($from.parent.type.name === nodeName)) {
-    return false;
-  }
-  if ($from.parent === $to.parent) {
-    var node = $from.parent;
-    return $from.parentOffset === 0 && $to.parentOffset === node.content.size;
-  }
-};
-export var isEntireTopLevelHeadingOrParagraphSelected = function isEntireTopLevelHeadingOrParagraphSelected(selection, nodeName) {
-  if (selection.$from.depth !== 1) {
-    return false;
-  }
-  return isEntireHeadingOrParagraphSelected(selection, nodeName);
-};
-export var isEntireTopLevelBlockquoteSelected = function isEntireTopLevelBlockquoteSelected(state) {
-  var schema = state.schema,
-    selection = state.selection;
-  var blockquote = schema.nodes.blockquote;
-  var blockquoteNode = findParentNodeOfTypeClosestToPos(selection.$from, blockquote);
-  if (!blockquoteNode) {
-    return false;
-  }
-
-  // checks if it is a top level blockquote
-  var depth = blockquoteNode.depth;
-  if (depth !== 1) {
-    return false;
-  }
-  var from = selection.from,
-    to = selection.to;
-  var selectedNodesCount = 0;
-  state.doc.nodesBetween(from, to, function (node, pos) {
-    if (pos >= from && pos + node.nodeSize <= to) {
-      selectedNodesCount++;
-      return false;
-    }
-  });
-  return selectedNodesCount === blockquoteNode.node.childCount;
-};
 export var isEntireNestedParagraphOrHeadingSelected = function isEntireNestedParagraphOrHeadingSelected(selection) {
   var $from = selection.$from,
     $to = selection.$to;

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

@@ -1,16 +1,8 @@
 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/utils.d.ts

@@ -1,16 +1,8 @@
 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.5",
+	"version": "1.12.6",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,20 +31,20 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^91.0.0",
+		"@atlaskit/editor-common": "^91.1.0",
 		"@atlaskit/editor-markdown-transformer": "^5.12.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-annotation": "^1.19.0",
 		"@atlaskit/editor-plugin-better-type-history": "^1.8.0",
-		"@atlaskit/editor-plugin-card": "^3.0.0",
+		"@atlaskit/editor-plugin-card": "^3.2.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
 		"@atlaskit/editor-plugin-list": "^3.8.0",
-		"@atlaskit/editor-plugin-media": "^1.32.0",
+		"@atlaskit/editor-plugin-media": "^1.33.0",
 		"@atlaskit/editor-plugin-mentions": "^2.6.0",
 		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/editor-tables": "^2.8.0",
 		"@atlaskit/media-client": "^28.0.0",
-		"@atlaskit/media-common": "^11.4.0",
+		"@atlaskit/media-common": "^11.5.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/tmp-editor-statsig": "*",
 		"@babel/runtime": "^7.0.0",