@atlaskit/editor-plugin-block-controls 3.1.3 → 3.1.5

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 3.1.5
+
+### Patch Changes
+
+- [#119444](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/119444)
+  [`853538e68d556`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/853538e68d556) -
+  Fix cancelled drag causing layout duplication and locked handle
+- Updated dependencies
+
+## 3.1.4
+
+### Patch Changes
+
+- [#120000](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/120000)
+  [`a021079ba8f13`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a021079ba8f13) -
+  [ux] Remove copy/delete button from block menu
+
 ## 3.1.3
 
 ### Patch Changes

package/dist/cjs/blockControlsPlugin.js

@@ -142,7 +142,7 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
       }
     },
     getSharedState: function getSharedState(editorState) {
-      var _key$getState$isMenuO, _key$getState, _key$getState$menuTri, _key$getState2, _key$getState$activeN, _key$getState3, _key$getState$isDragg, _key$getState4, _key$getState$isPMDra, _key$getState5, _key$getState$multiSe, _key$getState6, _key$getState$isShift, _key$getState7;
+      var _key$getState$isMenuO, _key$getState, _key$getState$menuTri, _key$getState2, _key$getState$activeN, _key$getState3, _key$getState$isDragg, _key$getState4, _key$getState$isPMDra, _key$getState5, _key$getState$multiSe, _key$getState6, _key$getState$isShift, _key$getState7, _key$getState$lastDra, _key$getState8;
       if (!editorState) {
         return undefined;
       }
@@ -153,7 +153,8 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
         isDragging: (_key$getState$isDragg = (_key$getState4 = _main.key.getState(editorState)) === null || _key$getState4 === void 0 ? void 0 : _key$getState4.isDragging) !== null && _key$getState$isDragg !== void 0 ? _key$getState$isDragg : false,
         isPMDragging: (_key$getState$isPMDra = (_key$getState5 = _main.key.getState(editorState)) === null || _key$getState5 === void 0 ? void 0 : _key$getState5.isPMDragging) !== null && _key$getState$isPMDra !== void 0 ? _key$getState$isPMDra : false,
         multiSelectDnD: (_key$getState$multiSe = (_key$getState6 = _main.key.getState(editorState)) === null || _key$getState6 === void 0 ? void 0 : _key$getState6.multiSelectDnD) !== null && _key$getState$multiSe !== void 0 ? _key$getState$multiSe : undefined,
-        isShiftDown: (_key$getState$isShift = (_key$getState7 = _main.key.getState(editorState)) === null || _key$getState7 === void 0 ? void 0 : _key$getState7.isShiftDown) !== null && _key$getState$isShift !== void 0 ? _key$getState$isShift : undefined
+        isShiftDown: (_key$getState$isShift = (_key$getState7 = _main.key.getState(editorState)) === null || _key$getState7 === void 0 ? void 0 : _key$getState7.isShiftDown) !== null && _key$getState$isShift !== void 0 ? _key$getState$isShift : undefined,
+        lastDragCancelled: (_key$getState$lastDra = (_key$getState8 = _main.key.getState(editorState)) === null || _key$getState8 === void 0 ? void 0 : _key$getState8.lastDragCancelled) !== null && _key$getState$lastDra !== void 0 ? _key$getState$lastDra : false
       };
     },
     contentComponent: function contentComponent(_ref7) {

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

@@ -13,11 +13,9 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _browser = require("@atlaskit/editor-common/browser");
 var _performanceMeasures = require("@atlaskit/editor-common/performance-measures");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _selection2 = require("@atlaskit/editor-common/selection");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
-var _editorTables = require("@atlaskit/editor-tables");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _element = require("@atlaskit/pragmatic-drag-and-drop-auto-scroll/element");
 var _combine = require("@atlaskit/pragmatic-drag-and-drop/combine");
@@ -32,7 +30,8 @@ var _keymap = require("./keymap");
 var _activeAnchorTracker = require("./utils/active-anchor-tracker");
 var _analytics2 = require("./utils/analytics");
 var _anchorUtils = require("./utils/anchor-utils");
-var _selection3 = require("./utils/selection");
+var _getSelection = require("./utils/getSelection");
+var _selection2 = require("./utils/selection");
 var _transactions = require("./utils/transactions");
 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; }
@@ -96,7 +95,14 @@ var destroyFn = function destroyFn(api, editorView) {
             // If the TextSelection between the drag start and end has changed, the document has changed, and we should not reapply the last selection
             var expandedSelectionUnchanged = multiSelectDnD.textAnchor === tr.selection.anchor && multiSelectDnD.textHead === tr.selection.head;
             if (expandedSelectionUnchanged) {
-              tr.setSelection(_state.TextSelection.create(tr.doc, multiSelectDnD.userAnchor, multiSelectDnD.userHead));
+              var $anchor = tr.doc.resolve(multiSelectDnD.userAnchor);
+              var $head = tr.doc.resolve(multiSelectDnD.userHead);
+              if ($head.node() === $anchor.node()) {
+                var $from = $anchor.min($head);
+                (0, _getSelection.selectNode)(tr, $from.pos, $from.node().type.name);
+              } else {
+                tr.setSelection(_state.TextSelection.create(tr.doc, multiSelectDnD.userAnchor, multiSelectDnD.userHead));
+              }
             }
           }
           api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || _api$selection.commands.clearManualSelection()({
@@ -106,11 +112,12 @@ var destroyFn = function destroyFn(api, editorView) {
         var _ref5 = source.data,
           start = _ref5.start;
         // if no drop targets are rendered, assume that drop is invalid
-        if (location.current.dropTargets.length === 0) {
+        var lastDragCancelled = location.current.dropTargets.length === 0;
+        if (lastDragCancelled) {
           var _api$analytics2;
           var nodeTypes, hasSelectedMultipleNodes;
           if (isMultiSelect && api) {
-            var position = (0, _selection3.getSelectedSlicePosition)(start, tr, api);
+            var position = (0, _selection2.getSelectedSlicePosition)(start, tr, api);
             var attributes = (0, _analytics2.getMultiSelectAnalyticsAttributes)(tr, position.from, position.to);
             nodeTypes = attributes.nodeTypes;
             hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
@@ -133,7 +140,8 @@ var destroyFn = function destroyFn(api, editorView) {
         }
         return tr.setMeta(key, _objectSpread(_objectSpread({}, tr.getMeta(key)), {}, {
           isDragging: false,
-          isPMDragging: false
+          isPMDragging: false,
+          lastDragCancelled: lastDragCancelled
         }));
       });
     }
@@ -151,14 +159,15 @@ var initialState = {
   isResizerResizing: false,
   isDocSizeLimitEnabled: null,
   isPMDragging: false,
-  multiSelectDnD: undefined
+  multiSelectDnD: undefined,
+  lastDragCancelled: false
 };
 var getDecorations = exports.getDecorations = function getDecorations(state) {
   var _key$getState;
   return (_key$getState = key.getState(state)) === null || _key$getState === void 0 ? void 0 : _key$getState.decorations;
 };
 var newApply = exports.newApply = function newApply(api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache) {
-  var _meta$multiSelectDnD, _meta$activeNode, _activeNode, _activeNode2, _meta$activeNode$hand, _meta$isDragging, _meta$isDragging2, _meta$toggleMenu, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging, _meta$isShiftDown;
+  var _meta$multiSelectDnD, _meta$activeNode, _activeNode, _activeNode2, _meta$activeNode$hand, _meta$isDragging, _meta$isDragging2, _meta$toggleMenu, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging, _meta$isShiftDown, _meta$lastDragCancell;
   var activeNode = currentState.activeNode,
     decorations = currentState.decorations,
     isResizerResizing = currentState.isResizerResizing,
@@ -170,7 +179,8 @@ var newApply = exports.newApply = function newApply(api, formatMessage, tr, curr
     isMenuOpen = currentState.isMenuOpen,
     menuTriggerBy = currentState.menuTriggerBy,
     isPMDragging = currentState.isPMDragging,
-    isShiftDown = currentState.isShiftDown;
+    isShiftDown = currentState.isShiftDown,
+    lastDragCancelled = currentState.lastDragCancelled;
   var isActiveNodeDeleted = false;
 
   // When steps exist, remap existing decorations, activeNode and multi select positions
@@ -326,11 +336,12 @@ var newApply = exports.newApply = function newApply(api, formatMessage, tr, curr
     isDocSizeLimitEnabled: initialState.isDocSizeLimitEnabled,
     isPMDragging: (_meta$isPMDragging = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging !== void 0 ? _meta$isPMDragging : isPMDragging,
     multiSelectDnD: multiSelectDnD,
-    isShiftDown: (_meta$isShiftDown = meta === null || meta === void 0 ? void 0 : meta.isShiftDown) !== null && _meta$isShiftDown !== void 0 ? _meta$isShiftDown : isShiftDown
+    isShiftDown: (_meta$isShiftDown = meta === null || meta === void 0 ? void 0 : meta.isShiftDown) !== null && _meta$isShiftDown !== void 0 ? _meta$isShiftDown : isShiftDown,
+    lastDragCancelled: (_meta$lastDragCancell = meta === null || meta === void 0 ? void 0 : meta.lastDragCancelled) !== null && _meta$lastDragCancell !== void 0 ? _meta$lastDragCancell : lastDragCancelled
   };
 };
 var oldApply = exports.oldApply = function oldApply(api, formatMessage, tr, currentState, oldState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache) {
-  var _meta$activeNode2, _meta$activeNode$hand2, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2;
+  var _meta$activeNode2, _meta$activeNode$hand2, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2, _meta$lastDragCancell2;
   var isNestedEnabled = flags.isNestedEnabled;
   var activeNode = currentState.activeNode,
     isMenuOpen = currentState.isMenuOpen,
@@ -338,7 +349,8 @@ var oldApply = exports.oldApply = function oldApply(api, formatMessage, tr, curr
     editorWidthLeft = currentState.editorWidthLeft,
     editorWidthRight = currentState.editorWidthRight,
     isDragging = currentState.isDragging,
-    isPMDragging = currentState.isPMDragging;
+    isPMDragging = currentState.isPMDragging,
+    lastDragCancelled = currentState.lastDragCancelled;
   var decorations = currentState.decorations,
     isResizerResizing = currentState.isResizerResizing;
 
@@ -488,7 +500,8 @@ var oldApply = exports.oldApply = function oldApply(api, formatMessage, tr, curr
     editorWidthRight: (_meta$editorWidthRigh2 = meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== null && _meta$editorWidthRigh2 !== void 0 ? _meta$editorWidthRigh2 : currentState.editorWidthRight,
     isResizerResizing: isResizerResizing,
     isDocSizeLimitEnabled: initialState.isDocSizeLimitEnabled,
-    isPMDragging: (_meta$isPMDragging2 = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging2 !== void 0 ? _meta$isPMDragging2 : isPMDragging
+    isPMDragging: (_meta$isPMDragging2 = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging2 !== void 0 ? _meta$isPMDragging2 : isPMDragging,
+    lastDragCancelled: (_meta$lastDragCancell2 = meta === null || meta === void 0 ? void 0 : meta.lastDragCancelled) !== null && _meta$lastDragCancell2 !== void 0 ? _meta$lastDragCancell2 : lastDragCancelled
   };
 };
 var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, nodeViewPortalProviderAPI) {
@@ -533,26 +546,28 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
       },
       handleDOMEvents: {
         drop: function drop(view, event) {
-          var _event$target;
-          // prosemirror has sends a default transaction on drop (meta where uiEvent is 'drop'),
-          // this duplicates an empty version of the node it was dropping,
-          // Adding some check here to prevent that if drop position is within activeNode
-          var state = view.state,
-            dispatch = view.dispatch,
-            dragging = view.dragging;
+          var _pluginState, _pluginState2, _pluginState3, _event$target;
+          // Prevent native DnD from triggering if we are in drag
+          var dispatch = view.dispatch,
+            dragging = view.dragging,
+            state = view.state;
+          var tr = state.tr;
           var pluginState = key.getState(state);
-          if (pluginState !== null && pluginState !== void 0 && pluginState.isPMDragging) {
-            dispatch(state.tr.setMeta(key, _objectSpread(_objectSpread({}, state.tr.getMeta(key)), {}, {
-              isPMDragging: false
+          var dndDragCancelled = (_pluginState = pluginState) === null || _pluginState === void 0 ? void 0 : _pluginState.lastDragCancelled;
+          if ((_pluginState2 = pluginState) !== null && _pluginState2 !== void 0 && _pluginState2.isPMDragging || dndDragCancelled && isMultiSelectEnabled) {
+            dispatch(tr.setMeta(key, _objectSpread(_objectSpread({}, tr.getMeta(key)), {}, {
+              isPMDragging: false,
+              lastDragCancelled: false
             })));
           }
-          if (!(event.target instanceof HTMLElement) || !(pluginState !== null && pluginState !== void 0 && pluginState.activeNode)) {
+          pluginState = key.getState(view.state);
+          if (!(event.target instanceof HTMLElement) || !((_pluginState3 = pluginState) !== null && _pluginState3 !== void 0 && _pluginState3.activeNode)) {
             return false;
           }
           // Currently we can only drag one node at a time
           // so we only need to check first child
           var draggable = dragging === null || dragging === void 0 ? void 0 : dragging.slice.content.firstChild;
-          if ((draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn' && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
+          if (dndDragCancelled && isMultiSelectEnabled || (draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn' && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
             // we prevent native DnD for layoutColumn to prevent single column layout.
             event.preventDefault();
             return false;
@@ -566,26 +581,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
           var domPos = Math.max(view.posAtDOM(nodeElement, 0) - 1, 0);
           var nodeTarget = state.doc.nodeAt(domPos);
           var isSameNode = !!(nodeTarget && draggable !== null && draggable !== void 0 && draggable.eq(nodeTarget));
-
-          // CellSelection doesn't expose true from/to positions, we need to query the ranges
-          var selectionRange = state.selection instanceof _editorTables.CellSelection ? state.selection.ranges.reduce(function (previousValue, currentValue, _currentIndex, _array) {
-            return {
-              $from: currentValue.$from.min(previousValue.$from),
-              $to: currentValue.$to.max(previousValue.$to)
-            };
-          }) : {
-            $from: state.selection.$from,
-            $to: state.selection.$to
-          };
-          var expandedSelection = (0, _selection2.expandSelectionBounds)(selectionRange.$from, selectionRange.$to);
-          var expandedAnchor = expandedSelection.$anchor;
-          var expandedHead = expandedSelection.$head;
-          var expandedSelectionFrom = Math.min(expandedAnchor.pos, expandedHead.pos);
-          var expandedSelectionTo = Math.max(expandedAnchor.pos, expandedHead.pos);
-          var isInExpandedSelection = domPos >= expandedSelectionFrom && domPos < expandedSelectionTo;
-
-          // Prevent the default drop behavior if the position is within the activeNode or within the expanded selection when multiselect is on
-          if (isSameNode || isInExpandedSelection && isMultiSelectEnabled) {
+          if (isSameNode) {
             event.preventDefault();
             return true;
           }
@@ -658,7 +654,6 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
               view.dispatch(view.state.tr.setMeta(key, _objectSpread(_objectSpread({}, view.state.tr.getMeta(key)), {}, {
                 isShiftDown: true
               })));
-              return true;
             }
             return false;
           } else {

package/dist/cjs/ui/block-menu-items.js

@@ -1,23 +1,18 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.menuItemsCallback = exports.getBlockMenuItems = void 0;
 var _react = require("@emotion/react");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
+var _messages = require("@atlaskit/editor-common/messages");
 var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
 var _arrowDown = _interopRequireDefault(require("@atlaskit/icon/core/arrow-down"));
 var _arrowUp = _interopRequireDefault(require("@atlaskit/icon/core/arrow-up"));
-var _copy = _interopRequireDefault(require("@atlaskit/icon/core/copy"));
-var _delete2 = _interopRequireDefault(require("@atlaskit/icon/core/delete"));
 var _moveNode = require("../editor-commands/move-node");
 var _consts = require("../pm-plugins/utils/consts");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /* eslint-disable @atlaskit/design-system/prefer-primitives */
 /**
  * @jsxRuntime classic
@@ -55,34 +50,6 @@ var getBlockMenuItems = exports.getBlockMenuItems = function getBlockMenuItems(f
         css: _shortcut.shortcutStyle
       }, (0, _keymaps.tooltip)(_keymaps.dragToMoveDown))
     }]
-  }, {
-    items: [{
-      content: formatMessage(_messages.default.copyToClipboard),
-      value: {
-        name: 'copy'
-      },
-      elemBefore: (0, _react.jsx)(_copy.default, {
-        label: ""
-      }),
-      key: 'copy',
-      // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
-      elemAfter: (0, _react.jsx)("div", {
-        css: _shortcut.shortcutStyle
-      }, (0, _keymaps.tooltip)(_keymaps.copy))
-    }, {
-      content: formatMessage(_messages.blockControlsMessages.delete),
-      value: {
-        name: 'delete'
-      },
-      elemBefore: (0, _react.jsx)(_delete2.default, {
-        label: ""
-      }),
-      key: 'delete',
-      // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
-      elemAfter: (0, _react.jsx)("div", {
-        css: _shortcut.shortcutStyle
-      }, (0, _keymaps.tooltip)(_keymaps.deleteKey))
-    }]
   }];
 };
 var menuItemsCallback = exports.menuItemsCallback = {
@@ -91,13 +58,5 @@ var menuItemsCallback = exports.menuItemsCallback = {
   },
   moveDown: function moveDown(api, formatMessage) {
     return (0, _moveNode.moveNodeViaShortcut)(api, _consts.DIRECTION.DOWN, formatMessage);
-  },
-  copy: function copy() {
-    // TODO: implement copy
-    // console.log('copy');
-  },
-  delete: function _delete() {
-    // TODO: implement delete
-    // console.log('delete');
   }
 };

package/dist/es2019/blockControlsPlugin.js

@@ -133,7 +133,7 @@ export const blockControlsPlugin = ({
     }
   },
   getSharedState(editorState) {
-    var _key$getState$isMenuO, _key$getState, _key$getState$menuTri, _key$getState2, _key$getState$activeN, _key$getState3, _key$getState$isDragg, _key$getState4, _key$getState$isPMDra, _key$getState5, _key$getState$multiSe, _key$getState6, _key$getState$isShift, _key$getState7;
+    var _key$getState$isMenuO, _key$getState, _key$getState$menuTri, _key$getState2, _key$getState$activeN, _key$getState3, _key$getState$isDragg, _key$getState4, _key$getState$isPMDra, _key$getState5, _key$getState$multiSe, _key$getState6, _key$getState$isShift, _key$getState7, _key$getState$lastDra, _key$getState8;
     if (!editorState) {
       return undefined;
     }
@@ -144,7 +144,8 @@ export const blockControlsPlugin = ({
       isDragging: (_key$getState$isDragg = (_key$getState4 = key.getState(editorState)) === null || _key$getState4 === void 0 ? void 0 : _key$getState4.isDragging) !== null && _key$getState$isDragg !== void 0 ? _key$getState$isDragg : false,
       isPMDragging: (_key$getState$isPMDra = (_key$getState5 = key.getState(editorState)) === null || _key$getState5 === void 0 ? void 0 : _key$getState5.isPMDragging) !== null && _key$getState$isPMDra !== void 0 ? _key$getState$isPMDra : false,
       multiSelectDnD: (_key$getState$multiSe = (_key$getState6 = key.getState(editorState)) === null || _key$getState6 === void 0 ? void 0 : _key$getState6.multiSelectDnD) !== null && _key$getState$multiSe !== void 0 ? _key$getState$multiSe : undefined,
-      isShiftDown: (_key$getState$isShift = (_key$getState7 = key.getState(editorState)) === null || _key$getState7 === void 0 ? void 0 : _key$getState7.isShiftDown) !== null && _key$getState$isShift !== void 0 ? _key$getState$isShift : undefined
+      isShiftDown: (_key$getState$isShift = (_key$getState7 = key.getState(editorState)) === null || _key$getState7 === void 0 ? void 0 : _key$getState7.isShiftDown) !== null && _key$getState$isShift !== void 0 ? _key$getState$isShift : undefined,
+      lastDragCancelled: (_key$getState$lastDra = (_key$getState8 = key.getState(editorState)) === null || _key$getState8 === void 0 ? void 0 : _key$getState8.lastDragCancelled) !== null && _key$getState$lastDra !== void 0 ? _key$getState$lastDra : false
     };
   },
   contentComponent({

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

@@ -4,11 +4,9 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
 import { browser } from '@atlaskit/editor-common/browser';
 import { isMeasuring, startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { expandSelectionBounds } from '@atlaskit/editor-common/selection';
 import { isEmptyDocument, isTextInput } from '@atlaskit/editor-common/utils';
 import { NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { CellSelection } from '@atlaskit/editor-tables';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-scroll/element';
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
@@ -23,6 +21,7 @@ import { boundKeydownHandler } from './keymap';
 import { defaultActiveAnchorTracker } from './utils/active-anchor-tracker';
 import { getMultiSelectAnalyticsAttributes } from './utils/analytics';
 import { AnchorRectCache, isAnchorSupported } from './utils/anchor-utils';
+import { selectNode } from './utils/getSelection';
 import { getSelectedSlicePosition } from './utils/selection';
 import { getTrMetadata } from './utils/transactions';
 export const key = new PluginKey('blockControls');
@@ -89,7 +88,14 @@ const destroyFn = (api, editorView) => {
             // If the TextSelection between the drag start and end has changed, the document has changed, and we should not reapply the last selection
             const expandedSelectionUnchanged = multiSelectDnD.textAnchor === tr.selection.anchor && multiSelectDnD.textHead === tr.selection.head;
             if (expandedSelectionUnchanged) {
-              tr.setSelection(TextSelection.create(tr.doc, multiSelectDnD.userAnchor, multiSelectDnD.userHead));
+              const $anchor = tr.doc.resolve(multiSelectDnD.userAnchor);
+              const $head = tr.doc.resolve(multiSelectDnD.userHead);
+              if ($head.node() === $anchor.node()) {
+                const $from = $anchor.min($head);
+                selectNode(tr, $from.pos, $from.node().type.name);
+              } else {
+                tr.setSelection(TextSelection.create(tr.doc, multiSelectDnD.userAnchor, multiSelectDnD.userHead));
+              }
             }
           }
           api === null || api === void 0 ? void 0 : (_api$selection = api.selection) === null || _api$selection === void 0 ? void 0 : _api$selection.commands.clearManualSelection()({
@@ -100,7 +106,8 @@ const destroyFn = (api, editorView) => {
           start
         } = source.data;
         // if no drop targets are rendered, assume that drop is invalid
-        if (location.current.dropTargets.length === 0) {
+        const lastDragCancelled = location.current.dropTargets.length === 0;
+        if (lastDragCancelled) {
           var _api$analytics2;
           let nodeTypes, hasSelectedMultipleNodes;
           if (isMultiSelect && api) {
@@ -129,7 +136,8 @@ const destroyFn = (api, editorView) => {
         return tr.setMeta(key, {
           ...tr.getMeta(key),
           isDragging: false,
-          isPMDragging: false
+          isPMDragging: false,
+          lastDragCancelled
         });
       });
     }
@@ -147,14 +155,15 @@ const initialState = {
   isResizerResizing: false,
   isDocSizeLimitEnabled: null,
   isPMDragging: false,
-  multiSelectDnD: undefined
+  multiSelectDnD: undefined,
+  lastDragCancelled: false
 };
 export const getDecorations = state => {
   var _key$getState;
   return (_key$getState = key.getState(state)) === null || _key$getState === void 0 ? void 0 : _key$getState.decorations;
 };
 export const newApply = (api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache) => {
-  var _meta$multiSelectDnD, _meta$activeNode, _activeNode, _activeNode2, _meta$activeNode$hand, _meta$isDragging, _meta$isDragging2, _meta$toggleMenu, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging, _meta$isShiftDown;
+  var _meta$multiSelectDnD, _meta$activeNode, _activeNode, _activeNode2, _meta$activeNode$hand, _meta$isDragging, _meta$isDragging2, _meta$toggleMenu, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging, _meta$isShiftDown, _meta$lastDragCancell;
   let {
     activeNode,
     decorations,
@@ -169,7 +178,8 @@ export const newApply = (api, formatMessage, tr, currentState, newState, flags,
     isMenuOpen,
     menuTriggerBy,
     isPMDragging,
-    isShiftDown
+    isShiftDown,
+    lastDragCancelled
   } = currentState;
   let isActiveNodeDeleted = false;
 
@@ -325,11 +335,12 @@ export const newApply = (api, formatMessage, tr, currentState, newState, flags,
     isDocSizeLimitEnabled: initialState.isDocSizeLimitEnabled,
     isPMDragging: (_meta$isPMDragging = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging !== void 0 ? _meta$isPMDragging : isPMDragging,
     multiSelectDnD,
-    isShiftDown: (_meta$isShiftDown = meta === null || meta === void 0 ? void 0 : meta.isShiftDown) !== null && _meta$isShiftDown !== void 0 ? _meta$isShiftDown : isShiftDown
+    isShiftDown: (_meta$isShiftDown = meta === null || meta === void 0 ? void 0 : meta.isShiftDown) !== null && _meta$isShiftDown !== void 0 ? _meta$isShiftDown : isShiftDown,
+    lastDragCancelled: (_meta$lastDragCancell = meta === null || meta === void 0 ? void 0 : meta.lastDragCancelled) !== null && _meta$lastDragCancell !== void 0 ? _meta$lastDragCancell : lastDragCancelled
   };
 };
 export const oldApply = (api, formatMessage, tr, currentState, oldState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache) => {
-  var _meta$activeNode2, _meta$activeNode$hand2, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2;
+  var _meta$activeNode2, _meta$activeNode$hand2, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2, _meta$lastDragCancell2;
   const {
     isNestedEnabled
   } = flags;
@@ -340,7 +351,8 @@ export const oldApply = (api, formatMessage, tr, currentState, oldState, newStat
     editorWidthLeft,
     editorWidthRight,
     isDragging,
-    isPMDragging
+    isPMDragging,
+    lastDragCancelled
   } = currentState;
   let {
     decorations,
@@ -468,7 +480,8 @@ export const oldApply = (api, formatMessage, tr, currentState, oldState, newStat
     editorWidthRight: (_meta$editorWidthRigh2 = meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== null && _meta$editorWidthRigh2 !== void 0 ? _meta$editorWidthRigh2 : currentState.editorWidthRight,
     isResizerResizing: isResizerResizing,
     isDocSizeLimitEnabled: initialState.isDocSizeLimitEnabled,
-    isPMDragging: (_meta$isPMDragging2 = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging2 !== void 0 ? _meta$isPMDragging2 : isPMDragging
+    isPMDragging: (_meta$isPMDragging2 = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging2 !== void 0 ? _meta$isPMDragging2 : isPMDragging,
+    lastDragCancelled: (_meta$lastDragCancell2 = meta === null || meta === void 0 ? void 0 : meta.lastDragCancelled) !== null && _meta$lastDragCancell2 !== void 0 ? _meta$lastDragCancell2 : lastDragCancelled
   };
 };
 export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
@@ -514,29 +527,31 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
       },
       handleDOMEvents: {
         drop(view, event) {
-          var _event$target;
-          // prosemirror has sends a default transaction on drop (meta where uiEvent is 'drop'),
-          // this duplicates an empty version of the node it was dropping,
-          // Adding some check here to prevent that if drop position is within activeNode
+          var _pluginState, _pluginState2, _pluginState3, _event$target;
+          // Prevent native DnD from triggering if we are in drag
           const {
-            state,
             dispatch,
-            dragging
+            dragging,
+            state
           } = view;
-          const pluginState = key.getState(state);
-          if (pluginState !== null && pluginState !== void 0 && pluginState.isPMDragging) {
-            dispatch(state.tr.setMeta(key, {
-              ...state.tr.getMeta(key),
-              isPMDragging: false
+          const tr = state.tr;
+          let pluginState = key.getState(state);
+          const dndDragCancelled = (_pluginState = pluginState) === null || _pluginState === void 0 ? void 0 : _pluginState.lastDragCancelled;
+          if ((_pluginState2 = pluginState) !== null && _pluginState2 !== void 0 && _pluginState2.isPMDragging || dndDragCancelled && isMultiSelectEnabled) {
+            dispatch(tr.setMeta(key, {
+              ...tr.getMeta(key),
+              isPMDragging: false,
+              lastDragCancelled: false
             }));
           }
-          if (!(event.target instanceof HTMLElement) || !(pluginState !== null && pluginState !== void 0 && pluginState.activeNode)) {
+          pluginState = key.getState(view.state);
+          if (!(event.target instanceof HTMLElement) || !((_pluginState3 = pluginState) !== null && _pluginState3 !== void 0 && _pluginState3.activeNode)) {
             return false;
           }
           // Currently we can only drag one node at a time
           // so we only need to check first child
           const draggable = dragging === null || dragging === void 0 ? void 0 : dragging.slice.content.firstChild;
-          if ((draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn' && fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+          if (dndDragCancelled && isMultiSelectEnabled || (draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn' && fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
             // we prevent native DnD for layoutColumn to prevent single column layout.
             event.preventDefault();
             return false;
@@ -550,26 +565,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
           const domPos = Math.max(view.posAtDOM(nodeElement, 0) - 1, 0);
           const nodeTarget = state.doc.nodeAt(domPos);
           const isSameNode = !!(nodeTarget && draggable !== null && draggable !== void 0 && draggable.eq(nodeTarget));
-
-          // CellSelection doesn't expose true from/to positions, we need to query the ranges
-          const selectionRange = state.selection instanceof CellSelection ? state.selection.ranges.reduce((previousValue, currentValue, _currentIndex, _array) => {
-            return {
-              $from: currentValue.$from.min(previousValue.$from),
-              $to: currentValue.$to.max(previousValue.$to)
-            };
-          }) : {
-            $from: state.selection.$from,
-            $to: state.selection.$to
-          };
-          const expandedSelection = expandSelectionBounds(selectionRange.$from, selectionRange.$to);
-          const expandedAnchor = expandedSelection.$anchor;
-          const expandedHead = expandedSelection.$head;
-          const expandedSelectionFrom = Math.min(expandedAnchor.pos, expandedHead.pos);
-          const expandedSelectionTo = Math.max(expandedAnchor.pos, expandedHead.pos);
-          const isInExpandedSelection = domPos >= expandedSelectionFrom && domPos < expandedSelectionTo;
-
-          // Prevent the default drop behavior if the position is within the activeNode or within the expanded selection when multiselect is on
-          if (isSameNode || isInExpandedSelection && isMultiSelectEnabled) {
+          if (isSameNode) {
             event.preventDefault();
             return true;
           }
@@ -648,7 +644,6 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI) => {
                 ...view.state.tr.getMeta(key),
                 isShiftDown: true
               }));
-              return true;
             }
             return false;
           } else {

package/dist/es2019/ui/block-menu-items.js

@@ -6,13 +6,11 @@
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import { copy, deleteKey, dragToMoveDown, dragToMoveUp, tooltip } from '@atlaskit/editor-common/keymaps';
-import commonMessages, { blockControlsMessages } from '@atlaskit/editor-common/messages';
+import { dragToMoveDown, dragToMoveUp, tooltip } from '@atlaskit/editor-common/keymaps';
+import { blockControlsMessages } from '@atlaskit/editor-common/messages';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 import ArrowDownIcon from '@atlaskit/icon/core/arrow-down';
 import ArrowUpIcon from '@atlaskit/icon/core/arrow-up';
-import CopyIcon from '@atlaskit/icon/core/copy';
-import DeleteIcon from '@atlaskit/icon/core/delete';
 import { moveNodeViaShortcut } from '../editor-commands/move-node';
 import { DIRECTION } from '../pm-plugins/utils/consts';
 export const getBlockMenuItems = formatMessage => {
@@ -44,34 +42,6 @@ export const getBlockMenuItems = formatMessage => {
         css: shortcutStyle
       }, tooltip(dragToMoveDown))
     }]
-  }, {
-    items: [{
-      content: formatMessage(commonMessages.copyToClipboard),
-      value: {
-        name: 'copy'
-      },
-      elemBefore: jsx(CopyIcon, {
-        label: ""
-      }),
-      key: 'copy',
-      // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
-      elemAfter: jsx("div", {
-        css: shortcutStyle
-      }, tooltip(copy))
-    }, {
-      content: formatMessage(blockControlsMessages.delete),
-      value: {
-        name: 'delete'
-      },
-      elemBefore: jsx(DeleteIcon, {
-        label: ""
-      }),
-      key: 'delete',
-      // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
-      elemAfter: jsx("div", {
-        css: shortcutStyle
-      }, tooltip(deleteKey))
-    }]
   }];
 };
 export const menuItemsCallback = {
@@ -80,13 +50,5 @@ export const menuItemsCallback = {
   },
   moveDown: (api, formatMessage) => {
     return moveNodeViaShortcut(api, DIRECTION.DOWN, formatMessage);
-  },
-  copy: () => {
-    // TODO: implement copy
-    // console.log('copy');
-  },
-  delete: () => {
-    // TODO: implement delete
-    // console.log('delete');
   }
 };

package/dist/esm/blockControlsPlugin.js

@@ -135,7 +135,7 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
       }
     },
     getSharedState: function getSharedState(editorState) {
-      var _key$getState$isMenuO, _key$getState, _key$getState$menuTri, _key$getState2, _key$getState$activeN, _key$getState3, _key$getState$isDragg, _key$getState4, _key$getState$isPMDra, _key$getState5, _key$getState$multiSe, _key$getState6, _key$getState$isShift, _key$getState7;
+      var _key$getState$isMenuO, _key$getState, _key$getState$menuTri, _key$getState2, _key$getState$activeN, _key$getState3, _key$getState$isDragg, _key$getState4, _key$getState$isPMDra, _key$getState5, _key$getState$multiSe, _key$getState6, _key$getState$isShift, _key$getState7, _key$getState$lastDra, _key$getState8;
       if (!editorState) {
         return undefined;
       }
@@ -146,7 +146,8 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
         isDragging: (_key$getState$isDragg = (_key$getState4 = key.getState(editorState)) === null || _key$getState4 === void 0 ? void 0 : _key$getState4.isDragging) !== null && _key$getState$isDragg !== void 0 ? _key$getState$isDragg : false,
         isPMDragging: (_key$getState$isPMDra = (_key$getState5 = key.getState(editorState)) === null || _key$getState5 === void 0 ? void 0 : _key$getState5.isPMDragging) !== null && _key$getState$isPMDra !== void 0 ? _key$getState$isPMDra : false,
         multiSelectDnD: (_key$getState$multiSe = (_key$getState6 = key.getState(editorState)) === null || _key$getState6 === void 0 ? void 0 : _key$getState6.multiSelectDnD) !== null && _key$getState$multiSe !== void 0 ? _key$getState$multiSe : undefined,
-        isShiftDown: (_key$getState$isShift = (_key$getState7 = key.getState(editorState)) === null || _key$getState7 === void 0 ? void 0 : _key$getState7.isShiftDown) !== null && _key$getState$isShift !== void 0 ? _key$getState$isShift : undefined
+        isShiftDown: (_key$getState$isShift = (_key$getState7 = key.getState(editorState)) === null || _key$getState7 === void 0 ? void 0 : _key$getState7.isShiftDown) !== null && _key$getState$isShift !== void 0 ? _key$getState$isShift : undefined,
+        lastDragCancelled: (_key$getState$lastDra = (_key$getState8 = key.getState(editorState)) === null || _key$getState8 === void 0 ? void 0 : _key$getState8.lastDragCancelled) !== null && _key$getState$lastDra !== void 0 ? _key$getState$lastDra : false
       };
     },
     contentComponent: function contentComponent(_ref7) {

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

@@ -8,11 +8,9 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
 import { browser } from '@atlaskit/editor-common/browser';
 import { isMeasuring, startMeasure, stopMeasure } from '@atlaskit/editor-common/performance-measures';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { expandSelectionBounds } from '@atlaskit/editor-common/selection';
 import { isEmptyDocument, isTextInput } from '@atlaskit/editor-common/utils';
 import { NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { CellSelection } from '@atlaskit/editor-tables';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { autoScrollForElements } from '@atlaskit/pragmatic-drag-and-drop-auto-scroll/element';
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
@@ -27,6 +25,7 @@ import { boundKeydownHandler } from './keymap';
 import { defaultActiveAnchorTracker } from './utils/active-anchor-tracker';
 import { getMultiSelectAnalyticsAttributes } from './utils/analytics';
 import { AnchorRectCache, isAnchorSupported } from './utils/anchor-utils';
+import { selectNode } from './utils/getSelection';
 import { getSelectedSlicePosition } from './utils/selection';
 import { getTrMetadata } from './utils/transactions';
 export var key = new PluginKey('blockControls');
@@ -89,7 +88,14 @@ var destroyFn = function destroyFn(api, editorView) {
             // If the TextSelection between the drag start and end has changed, the document has changed, and we should not reapply the last selection
             var expandedSelectionUnchanged = multiSelectDnD.textAnchor === tr.selection.anchor && multiSelectDnD.textHead === tr.selection.head;
             if (expandedSelectionUnchanged) {
-              tr.setSelection(TextSelection.create(tr.doc, multiSelectDnD.userAnchor, multiSelectDnD.userHead));
+              var $anchor = tr.doc.resolve(multiSelectDnD.userAnchor);
+              var $head = tr.doc.resolve(multiSelectDnD.userHead);
+              if ($head.node() === $anchor.node()) {
+                var $from = $anchor.min($head);
+                selectNode(tr, $from.pos, $from.node().type.name);
+              } else {
+                tr.setSelection(TextSelection.create(tr.doc, multiSelectDnD.userAnchor, multiSelectDnD.userHead));
+              }
             }
           }
           api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || _api$selection.commands.clearManualSelection()({
@@ -99,7 +105,8 @@ var destroyFn = function destroyFn(api, editorView) {
         var _ref5 = source.data,
           start = _ref5.start;
         // if no drop targets are rendered, assume that drop is invalid
-        if (location.current.dropTargets.length === 0) {
+        var lastDragCancelled = location.current.dropTargets.length === 0;
+        if (lastDragCancelled) {
           var _api$analytics2;
           var nodeTypes, hasSelectedMultipleNodes;
           if (isMultiSelect && api) {
@@ -126,7 +133,8 @@ var destroyFn = function destroyFn(api, editorView) {
         }
         return tr.setMeta(key, _objectSpread(_objectSpread({}, tr.getMeta(key)), {}, {
           isDragging: false,
-          isPMDragging: false
+          isPMDragging: false,
+          lastDragCancelled: lastDragCancelled
         }));
       });
     }
@@ -144,14 +152,15 @@ var initialState = {
   isResizerResizing: false,
   isDocSizeLimitEnabled: null,
   isPMDragging: false,
-  multiSelectDnD: undefined
+  multiSelectDnD: undefined,
+  lastDragCancelled: false
 };
 export var getDecorations = function getDecorations(state) {
   var _key$getState;
   return (_key$getState = key.getState(state)) === null || _key$getState === void 0 ? void 0 : _key$getState.decorations;
 };
 export var newApply = function newApply(api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache) {
-  var _meta$multiSelectDnD, _meta$activeNode, _activeNode, _activeNode2, _meta$activeNode$hand, _meta$isDragging, _meta$isDragging2, _meta$toggleMenu, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging, _meta$isShiftDown;
+  var _meta$multiSelectDnD, _meta$activeNode, _activeNode, _activeNode2, _meta$activeNode$hand, _meta$isDragging, _meta$isDragging2, _meta$toggleMenu, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging, _meta$isShiftDown, _meta$lastDragCancell;
   var activeNode = currentState.activeNode,
     decorations = currentState.decorations,
     isResizerResizing = currentState.isResizerResizing,
@@ -163,7 +172,8 @@ export var newApply = function newApply(api, formatMessage, tr, currentState, ne
     isMenuOpen = currentState.isMenuOpen,
     menuTriggerBy = currentState.menuTriggerBy,
     isPMDragging = currentState.isPMDragging,
-    isShiftDown = currentState.isShiftDown;
+    isShiftDown = currentState.isShiftDown,
+    lastDragCancelled = currentState.lastDragCancelled;
   var isActiveNodeDeleted = false;
 
   // When steps exist, remap existing decorations, activeNode and multi select positions
@@ -319,11 +329,12 @@ export var newApply = function newApply(api, formatMessage, tr, currentState, ne
     isDocSizeLimitEnabled: initialState.isDocSizeLimitEnabled,
     isPMDragging: (_meta$isPMDragging = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging !== void 0 ? _meta$isPMDragging : isPMDragging,
     multiSelectDnD: multiSelectDnD,
-    isShiftDown: (_meta$isShiftDown = meta === null || meta === void 0 ? void 0 : meta.isShiftDown) !== null && _meta$isShiftDown !== void 0 ? _meta$isShiftDown : isShiftDown
+    isShiftDown: (_meta$isShiftDown = meta === null || meta === void 0 ? void 0 : meta.isShiftDown) !== null && _meta$isShiftDown !== void 0 ? _meta$isShiftDown : isShiftDown,
+    lastDragCancelled: (_meta$lastDragCancell = meta === null || meta === void 0 ? void 0 : meta.lastDragCancelled) !== null && _meta$lastDragCancell !== void 0 ? _meta$lastDragCancell : lastDragCancelled
   };
 };
 export var oldApply = function oldApply(api, formatMessage, tr, currentState, oldState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache) {
-  var _meta$activeNode2, _meta$activeNode$hand2, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2;
+  var _meta$activeNode2, _meta$activeNode$hand2, _meta$activeNode8, _meta$isDragging4, _meta$editorHeight2, _meta$editorWidthLeft2, _meta$editorWidthRigh2, _meta$isPMDragging2, _meta$lastDragCancell2;
   var isNestedEnabled = flags.isNestedEnabled;
   var activeNode = currentState.activeNode,
     isMenuOpen = currentState.isMenuOpen,
@@ -331,7 +342,8 @@ export var oldApply = function oldApply(api, formatMessage, tr, currentState, ol
     editorWidthLeft = currentState.editorWidthLeft,
     editorWidthRight = currentState.editorWidthRight,
     isDragging = currentState.isDragging,
-    isPMDragging = currentState.isPMDragging;
+    isPMDragging = currentState.isPMDragging,
+    lastDragCancelled = currentState.lastDragCancelled;
   var decorations = currentState.decorations,
     isResizerResizing = currentState.isResizerResizing;
 
@@ -481,7 +493,8 @@ export var oldApply = function oldApply(api, formatMessage, tr, currentState, ol
     editorWidthRight: (_meta$editorWidthRigh2 = meta === null || meta === void 0 ? void 0 : meta.editorWidthRight) !== null && _meta$editorWidthRigh2 !== void 0 ? _meta$editorWidthRigh2 : currentState.editorWidthRight,
     isResizerResizing: isResizerResizing,
     isDocSizeLimitEnabled: initialState.isDocSizeLimitEnabled,
-    isPMDragging: (_meta$isPMDragging2 = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging2 !== void 0 ? _meta$isPMDragging2 : isPMDragging
+    isPMDragging: (_meta$isPMDragging2 = meta === null || meta === void 0 ? void 0 : meta.isPMDragging) !== null && _meta$isPMDragging2 !== void 0 ? _meta$isPMDragging2 : isPMDragging,
+    lastDragCancelled: (_meta$lastDragCancell2 = meta === null || meta === void 0 ? void 0 : meta.lastDragCancelled) !== null && _meta$lastDragCancell2 !== void 0 ? _meta$lastDragCancell2 : lastDragCancelled
   };
 };
 export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProviderAPI) {
@@ -526,26 +539,28 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
       },
       handleDOMEvents: {
         drop: function drop(view, event) {
-          var _event$target;
-          // prosemirror has sends a default transaction on drop (meta where uiEvent is 'drop'),
-          // this duplicates an empty version of the node it was dropping,
-          // Adding some check here to prevent that if drop position is within activeNode
-          var state = view.state,
-            dispatch = view.dispatch,
-            dragging = view.dragging;
+          var _pluginState, _pluginState2, _pluginState3, _event$target;
+          // Prevent native DnD from triggering if we are in drag
+          var dispatch = view.dispatch,
+            dragging = view.dragging,
+            state = view.state;
+          var tr = state.tr;
           var pluginState = key.getState(state);
-          if (pluginState !== null && pluginState !== void 0 && pluginState.isPMDragging) {
-            dispatch(state.tr.setMeta(key, _objectSpread(_objectSpread({}, state.tr.getMeta(key)), {}, {
-              isPMDragging: false
+          var dndDragCancelled = (_pluginState = pluginState) === null || _pluginState === void 0 ? void 0 : _pluginState.lastDragCancelled;
+          if ((_pluginState2 = pluginState) !== null && _pluginState2 !== void 0 && _pluginState2.isPMDragging || dndDragCancelled && isMultiSelectEnabled) {
+            dispatch(tr.setMeta(key, _objectSpread(_objectSpread({}, tr.getMeta(key)), {}, {
+              isPMDragging: false,
+              lastDragCancelled: false
             })));
           }
-          if (!(event.target instanceof HTMLElement) || !(pluginState !== null && pluginState !== void 0 && pluginState.activeNode)) {
+          pluginState = key.getState(view.state);
+          if (!(event.target instanceof HTMLElement) || !((_pluginState3 = pluginState) !== null && _pluginState3 !== void 0 && _pluginState3.activeNode)) {
             return false;
           }
           // Currently we can only drag one node at a time
           // so we only need to check first child
           var draggable = dragging === null || dragging === void 0 ? void 0 : dragging.slice.content.firstChild;
-          if ((draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn' && fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
+          if (dndDragCancelled && isMultiSelectEnabled || (draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn' && fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
             // we prevent native DnD for layoutColumn to prevent single column layout.
             event.preventDefault();
             return false;
@@ -559,26 +574,7 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
           var domPos = Math.max(view.posAtDOM(nodeElement, 0) - 1, 0);
           var nodeTarget = state.doc.nodeAt(domPos);
           var isSameNode = !!(nodeTarget && draggable !== null && draggable !== void 0 && draggable.eq(nodeTarget));
-
-          // CellSelection doesn't expose true from/to positions, we need to query the ranges
-          var selectionRange = state.selection instanceof CellSelection ? state.selection.ranges.reduce(function (previousValue, currentValue, _currentIndex, _array) {
-            return {
-              $from: currentValue.$from.min(previousValue.$from),
-              $to: currentValue.$to.max(previousValue.$to)
-            };
-          }) : {
-            $from: state.selection.$from,
-            $to: state.selection.$to
-          };
-          var expandedSelection = expandSelectionBounds(selectionRange.$from, selectionRange.$to);
-          var expandedAnchor = expandedSelection.$anchor;
-          var expandedHead = expandedSelection.$head;
-          var expandedSelectionFrom = Math.min(expandedAnchor.pos, expandedHead.pos);
-          var expandedSelectionTo = Math.max(expandedAnchor.pos, expandedHead.pos);
-          var isInExpandedSelection = domPos >= expandedSelectionFrom && domPos < expandedSelectionTo;
-
-          // Prevent the default drop behavior if the position is within the activeNode or within the expanded selection when multiselect is on
-          if (isSameNode || isInExpandedSelection && isMultiSelectEnabled) {
+          if (isSameNode) {
             event.preventDefault();
             return true;
           }
@@ -651,7 +647,6 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
               view.dispatch(view.state.tr.setMeta(key, _objectSpread(_objectSpread({}, view.state.tr.getMeta(key)), {}, {
                 isShiftDown: true
               })));
-              return true;
             }
             return false;
           } else {

package/dist/esm/ui/block-menu-items.js

@@ -6,13 +6,11 @@
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
-import { copy, deleteKey, dragToMoveDown, dragToMoveUp, tooltip } from '@atlaskit/editor-common/keymaps';
-import commonMessages, { blockControlsMessages } from '@atlaskit/editor-common/messages';
+import { dragToMoveDown, dragToMoveUp, tooltip } from '@atlaskit/editor-common/keymaps';
+import { blockControlsMessages } from '@atlaskit/editor-common/messages';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 import ArrowDownIcon from '@atlaskit/icon/core/arrow-down';
 import ArrowUpIcon from '@atlaskit/icon/core/arrow-up';
-import CopyIcon from '@atlaskit/icon/core/copy';
-import DeleteIcon from '@atlaskit/icon/core/delete';
 import { moveNodeViaShortcut } from '../editor-commands/move-node';
 import { DIRECTION } from '../pm-plugins/utils/consts';
 export var getBlockMenuItems = function getBlockMenuItems(formatMessage) {
@@ -44,34 +42,6 @@ export var getBlockMenuItems = function getBlockMenuItems(formatMessage) {
         css: shortcutStyle
       }, tooltip(dragToMoveDown))
     }]
-  }, {
-    items: [{
-      content: formatMessage(commonMessages.copyToClipboard),
-      value: {
-        name: 'copy'
-      },
-      elemBefore: jsx(CopyIcon, {
-        label: ""
-      }),
-      key: 'copy',
-      // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
-      elemAfter: jsx("div", {
-        css: shortcutStyle
-      }, tooltip(copy))
-    }, {
-      content: formatMessage(blockControlsMessages.delete),
-      value: {
-        name: 'delete'
-      },
-      elemBefore: jsx(DeleteIcon, {
-        label: ""
-      }),
-      key: 'delete',
-      // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
-      elemAfter: jsx("div", {
-        css: shortcutStyle
-      }, tooltip(deleteKey))
-    }]
   }];
 };
 export var menuItemsCallback = {
@@ -80,13 +50,5 @@ export var menuItemsCallback = {
   },
   moveDown: function moveDown(api, formatMessage) {
     return moveNodeViaShortcut(api, DIRECTION.DOWN, formatMessage);
-  },
-  copy: function copy() {
-    // TODO: implement copy
-    // console.log('copy');
-  },
-  delete: function _delete() {
-    // TODO: implement delete
-    // console.log('delete');
   }
 };

package/dist/types/blockControlsPluginType.d.ts

@@ -47,6 +47,7 @@ export interface PluginState {
     isPMDragging: boolean;
     multiSelectDnD?: MultiSelectDnD;
     isShiftDown?: boolean;
+    lastDragCancelled: boolean;
 }
 export type ReleaseHiddenDecoration = () => boolean | undefined;
 export type BlockControlsSharedState = {

package/dist/types/pm-plugins/main.d.ts

@@ -27,6 +27,7 @@ export declare const newApply: (api: ExtractInjectionAPI<BlockControlsPlugin> |
     isPMDragging: any;
     multiSelectDnD: import("../blockControlsPluginType").MultiSelectDnD | undefined;
     isShiftDown: any;
+    lastDragCancelled: any;
 };
 export declare const oldApply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, oldState: EditorState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
     decorations: DecorationSet;
@@ -39,5 +40,6 @@ export declare const oldApply: (api: ExtractInjectionAPI<BlockControlsPlugin> |
     isResizerResizing: boolean;
     isDocSizeLimitEnabled: boolean | null;
     isPMDragging: any;
+    lastDragCancelled: any;
 };
 export declare const createPlugin: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, getIntl: () => IntlShape, nodeViewPortalProviderAPI: PortalProviderAPI) => SafePlugin<PluginState>;

package/dist/types/ui/block-menu-items.d.ts

@@ -12,6 +12,4 @@ export declare const getBlockMenuItems: (formatMessage: IntlShape['formatMessage
 export declare const menuItemsCallback: {
     moveUp: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage']) => import("@atlaskit/editor-common/types").Command;
     moveDown: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage']) => import("@atlaskit/editor-common/types").Command;
-    copy: () => void;
-    delete: () => void;
 };

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

@@ -47,6 +47,7 @@ export interface PluginState {
     isPMDragging: boolean;
     multiSelectDnD?: MultiSelectDnD;
     isShiftDown?: boolean;
+    lastDragCancelled: boolean;
 }
 export type ReleaseHiddenDecoration = () => boolean | undefined;
 export type BlockControlsSharedState = {

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

@@ -27,6 +27,7 @@ export declare const newApply: (api: ExtractInjectionAPI<BlockControlsPlugin> |
     isPMDragging: any;
     multiSelectDnD: import("../blockControlsPluginType").MultiSelectDnD | undefined;
     isShiftDown: any;
+    lastDragCancelled: any;
 };
 export declare const oldApply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, oldState: EditorState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
     decorations: DecorationSet;
@@ -39,5 +40,6 @@ export declare const oldApply: (api: ExtractInjectionAPI<BlockControlsPlugin> |
     isResizerResizing: boolean;
     isDocSizeLimitEnabled: boolean | null;
     isPMDragging: any;
+    lastDragCancelled: any;
 };
 export declare const createPlugin: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, getIntl: () => IntlShape, nodeViewPortalProviderAPI: PortalProviderAPI) => SafePlugin<PluginState>;

package/dist/types-ts4.5/ui/block-menu-items.d.ts

@@ -12,6 +12,4 @@ export declare const getBlockMenuItems: (formatMessage: IntlShape['formatMessage
 export declare const menuItemsCallback: {
     moveUp: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage']) => import("@atlaskit/editor-common/types").Command;
     moveDown: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage']) => import("@atlaskit/editor-common/types").Command;
-    copy: () => void;
-    delete: () => void;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "3.1.3",
+	"version": "3.1.5",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -40,7 +40,7 @@
 		"@atlaskit/editor-plugin-selection": "^2.0.0",
 		"@atlaskit/editor-plugin-width": "^3.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
-		"@atlaskit/editor-shared-styles": "^3.3.0",
+		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/icon": "^24.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
@@ -49,7 +49,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^2.0.0",
 		"@atlaskit/primitives": "^14.1.0",
 		"@atlaskit/theme": "^17.0.0",
-		"@atlaskit/tmp-editor-statsig": "^3.2.0",
+		"@atlaskit/tmp-editor-statsig": "^3.3.0",
 		"@atlaskit/tokens": "^4.2.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",