@atlaskit/editor-plugin-block-controls 7.11.0 → 7.11.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 7.11.2
+
+### Patch Changes
+
+- [`d555d4bd26286`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d555d4bd26286) -
+  EDITOR-3565 fix block menu multi-select move actions
+- Updated dependencies
+
+## 7.11.1
+
+### Patch Changes
+
+- [`00c08e3995cb2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/00c08e3995cb2) -
+  Clean up platform_editor_block_menu_empty_line
+- Updated dependencies
+
 ## 7.11.0
 
 ### Minor Changes

package/dist/cjs/editor-commands/move-node-with-block-menu.js

@@ -6,10 +6,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.moveNodeWithBlockMenu = void 0;
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _types = require("@atlaskit/editor-common/types");
-var _state = require("@atlaskit/editor-prosemirror/state");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _moveNode = require("./move-node");
 var _moveNodeUtils = require("./utils/move-node-utils");
+var getSelectionToIndex = function getSelectionToIndex(fromIndex, $to, depth) {
+  var toIndex = $to.index(depth);
+  var toIndexAfter = $to.indexAfter(depth);
+
+  // If $to is at the start of a node (indexAfter === index), don't include that node
+  // This occurs when the preserved selection is outside of inline positions at node boundaries
+  if (toIndexAfter === toIndex && toIndex > fromIndex) {
+    return toIndex - 1;
+  }
+  return toIndex;
+};
 var moveNodeWithBlockMenu = exports.moveNodeWithBlockMenu = function moveNodeWithBlockMenu(api, direction) {
   return function (_ref) {
     var _api$blockControls$sh;
@@ -26,33 +36,27 @@ var moveNodeWithBlockMenu = exports.moveNodeWithBlockMenu = function moveNodeWit
       schema: tr.doc.type.schema,
       resolve: tr.doc.resolve.bind(tr.doc)
     });
-    if (currentNodePos > -1) {
-      var $currentNodePos = tr.doc.resolve(currentNodePos);
-      var nodeAfterPos = $currentNodePos.posAtIndex($currentNodePos.index() + 1);
-      var moveToPos = direction === _types.DIRECTION.UP ? (0, _moveNodeUtils.getPosWhenMoveNodeUp)($currentNodePos, currentNodePos) : (0, _moveNodeUtils.getPosWhenMoveNodeDown)({
-        $currentNodePos: $currentNodePos,
-        nodeAfterPos: nodeAfterPos,
-        tr: tr
-      });
-
-      // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
-      var shouldMoveNode = (0, _moveNodeUtils.getShouldMoveNode)({
-        currentNodePos: currentNodePos,
-        moveToPos: moveToPos,
-        tr: tr
-      });
-      if (shouldMoveNode) {
-        (0, _moveNode.moveNode)(api)(currentNodePos, moveToPos, _analytics.INPUT_METHOD.BLOCK_MENU)({
+    var $from = selection.$from,
+      $to = selection.$to;
+    var depth = tr.doc.resolve(currentNodePos).depth;
+    var fromIndex = $from.index(depth);
+    if (direction === _types.DIRECTION.UP) {
+      if (fromIndex > 0) {
+        var moveToPos = $from.posAtIndex(fromIndex - 1, depth);
+        return (0, _moveNode.moveNode)(api)(currentNodePos, moveToPos, _analytics.INPUT_METHOD.BLOCK_MENU)({
+          tr: tr
+        });
+      }
+    } else {
+      // selectionToIndex is the index of the last node in the selection
+      var selectionToIndex = getSelectionToIndex(fromIndex, $to, depth);
+      // Adding 2 so we jump over the next node to the position after it
+      var moveToIndex = selectionToIndex + 2;
+      if (moveToIndex <= $to.node(depth).childCount) {
+        var _moveToPos = $to.posAtIndex(moveToIndex, depth);
+        return (0, _moveNode.moveNode)(api)(currentNodePos, _moveToPos, _analytics.INPUT_METHOD.BLOCK_MENU)({
           tr: tr
         });
-        if (tr.selection.empty && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_empty_line', 'isEnabled', true)) {
-          var nodeAtCurrentPos = tr.doc.nodeAt(currentNodePos);
-          var nodeAfter = tr.doc.nodeAt(moveToPos);
-          var isConsecutiveEmptyLineMove = (nodeAtCurrentPos === null || nodeAtCurrentPos === void 0 ? void 0 : nodeAtCurrentPos.content.size) === 0 && (nodeAfter === null || nodeAfter === void 0 ? void 0 : nodeAfter.content.size) === 0;
-          var cursorPos = direction === _types.DIRECTION.UP || direction === _types.DIRECTION.DOWN && isConsecutiveEmptyLineMove ? moveToPos : moveToPos - 1;
-          tr.setSelection(_state.TextSelection.create(tr.doc, cursorPos));
-        }
-        tr.scrollIntoView();
       }
     }
     return tr;

package/dist/cjs/editor-commands/move-node.js

@@ -313,7 +313,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
     var inputMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _analytics.INPUT_METHOD.DRAG_AND_DROP;
     var formatMessage = arguments.length > 3 ? arguments[3] : undefined;
     return function (_ref7) {
-      var _convertedNodeSlice, _api$blockControls$co, _api$accessibilityUti;
+      var _api$blockControls$sh, _convertedNodeSlice, _api$accessibilityUti;
       var tr = _ref7.tr;
       if (!api || start < 0 || to < 0) {
         return tr;
@@ -332,13 +332,22 @@ var moveNode = exports.moveNode = function moveNode(api) {
           tr: tr
         });
       }
-      var slicePosition = (0, _selection2.getSelectedSlicePosition)(start, tr, api);
-      if (isMultiSelect) {
-        sliceFrom = slicePosition.from;
-        sliceTo = slicePosition.to;
+      var preservedSelection = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) ? api === null || api === void 0 || (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.preservedSelection : undefined;
+      if (preservedSelection) {
+        var $from = tr.doc.resolve(Math.min(start, preservedSelection.from));
+        var expandedRange = $from.blockRange(preservedSelection.$to);
+        sliceFrom = expandedRange ? expandedRange.start : preservedSelection.from;
+        sliceTo = expandedRange ? expandedRange.end : preservedSelection.to;
         var attributes = (0, _analytics2.getMultiSelectAnalyticsAttributes)(tr, sliceFrom, sliceTo);
         hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
         sourceNodeTypes = attributes.nodeTypes;
+      } else if (isMultiSelect) {
+        var slicePosition = (0, _selection2.getSelectedSlicePosition)(start, tr, api);
+        sliceFrom = slicePosition.from;
+        sliceTo = slicePosition.to;
+        var _attributes = (0, _analytics2.getMultiSelectAnalyticsAttributes)(tr, sliceFrom, sliceTo);
+        hasSelectedMultipleNodes = _attributes.hasSelectedMultipleNodes;
+        sourceNodeTypes = _attributes.nodeTypes;
       } else {
         var _handleNode$nodeSize;
         var size = (_handleNode$nodeSize = handleNode === null || handleNode === void 0 ? void 0 : handleNode.nodeSize) !== null && _handleNode$nodeSize !== void 0 ? _handleNode$nodeSize : 1;
@@ -414,12 +423,22 @@ var moveNode = exports.moveNode = function moveNode(api) {
         tr.insert(mappedTo, convertedNode);
       }
       var sliceSize = sliceTo - sliceFrom;
-      tr = inputMethod === _analytics.INPUT_METHOD.DRAG_AND_DROP ? (0, _getSelection.setCursorPositionAtMovedNode)(tr, mappedTo, api) : isMultiSelect ? (_api$blockControls$co = api === null || api === void 0 ? void 0 : api.blockControls.commands.setMultiSelectPositions(mappedTo, mappedTo + sliceSize)({
-        tr: tr
-      })) !== null && _api$blockControls$co !== void 0 ? _api$blockControls$co : tr : (0, _getSelection.selectNode)(tr, mappedTo, handleNode.type.name, api);
+      if (inputMethod === _analytics.INPUT_METHOD.DRAG_AND_DROP) {
+        tr = (0, _getSelection.setCursorPositionAtMovedNode)(tr, mappedTo, api);
+      } else if (preservedSelection) {
+        // do nothing here to allow the selection preservation plugin to handle mapping the selection
+      } else if (isMultiSelect) {
+        var _api$blockControls$co;
+        tr = (_api$blockControls$co = api === null || api === void 0 ? void 0 : api.blockControls.commands.setMultiSelectPositions(mappedTo, mappedTo + sliceSize)({
+          tr: tr
+        })) !== null && _api$blockControls$co !== void 0 ? _api$blockControls$co : tr;
+      } else {
+        tr = (0, _getSelection.selectNode)(tr, mappedTo, handleNode.type.name, api);
+      }
       var currMeta = tr.getMeta(_main.key);
       tr.setMeta(_main.key, _objectSpread(_objectSpread({}, currMeta), {}, {
-        nodeMoved: true
+        nodeMoved: true,
+        nodeMovedOffset: mappedTo - sliceFrom
       }));
       api === null || api === void 0 || api.core.actions.focus();
       var $mappedTo = tr.doc.resolve(mappedTo);

package/dist/cjs/editor-commands/utils/move-node-utils.js

@@ -14,7 +14,7 @@ var getCurrentNodePosFromDragHandleSelection = exports.getCurrentNodePosFromDrag
     schema = _ref.schema,
     resolve = _ref.resolve;
   var currentNodePos = -1;
-  if (selection.empty && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_empty_line', 'isEnabled', true)) {
+  if (selection.empty && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
     currentNodePos = selection.$from.pos;
   }
   if ((0, _utils.isTableSelected)(selection)) {
@@ -57,7 +57,7 @@ var getPosWhenMoveNodeDown = exports.getPosWhenMoveNodeDown = function getPosWhe
     return -1;
   }
   var nodeAfter = tr.doc.nodeAt(nodeAfterPos);
-  if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_empty_line', 'isEnabled', true)) {
+  if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
     var nodeAtCurrentPos = tr.doc.nodeAt($currentNodePos.pos);
     // if move empty line down to another empty line, move to the position of the next empty line
     if ((nodeAtCurrentPos === null || nodeAtCurrentPos === void 0 ? void 0 : nodeAtCurrentPos.content.size) === 0 && nodeAtCurrentPos.type.name !== 'extension' && (nodeAfter === null || nodeAfter === void 0 ? void 0 : nodeAfter.content.size) === 0 && nodeAfter.type.name !== 'extension') {

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.key = exports.getDecorations = exports.createPlugin = exports.apply = void 0;
+exports.key = exports.getDecorations = exports.getBlockControlsMeta = exports.createPlugin = exports.apply = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -891,4 +891,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
       };
     }
   });
+};
+var getBlockControlsMeta = exports.getBlockControlsMeta = function getBlockControlsMeta(tr) {
+  return tr.getMeta(key);
 };

package/dist/cjs/pm-plugins/selection-preservation/pm-plugin.js

@@ -9,6 +9,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _main = require("../main");
+var _getSelection = require("../utils/getSelection");
 var _editorCommands = require("./editor-commands");
 var _pluginKey = require("./plugin-key");
 var _utils = require("./utils");
@@ -96,15 +99,22 @@ var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugi
   });
 };
 var mapSelection = function mapSelection(selection, tr) {
+  var _ref = (0, _main.getBlockControlsMeta)(tr) || {},
+    nodeMoved = _ref.nodeMoved,
+    nodeMovedOffset = _ref.nodeMovedOffset;
+  var mapping = nodeMoved && typeof nodeMovedOffset === 'number' ? new _transform.Mapping([new _transform.StepMap([0, 0, nodeMovedOffset])]) : tr.mapping;
   if (selection instanceof _state.TextSelection) {
-    var from = tr.mapping.map(selection.from);
-    var to = tr.mapping.map(selection.to);
+    var from = mapping.map(selection.from);
+    var to = mapping.map(selection.to);
 
     // expand the text selection range to block boundaries, so as document changes occur the
     // selection always includes whole nodes
-    var _expandToBlockRange = expandToBlockRange(tr.doc.resolve(from), tr.doc.resolve(to)),
-      $from = _expandToBlockRange.$from,
-      $to = _expandToBlockRange.$to;
+    var expanded = (0, _getSelection.expandToBlockRange)(tr.doc.resolve(from), tr.doc.resolve(to));
+
+    // collapse the expanded range to a valid selection range
+    var _collapseToSelectionR = (0, _getSelection.collapseToSelectionRange)(expanded.$from, expanded.$to),
+      $from = _collapseToSelectionR.$from,
+      $to = _collapseToSelectionR.$to;
 
     // stop preserving if preserved selection becomes invalid or collapsed to a cursor
     // e.g. after deleting the selection
@@ -114,21 +124,8 @@ var mapSelection = function mapSelection(selection, tr) {
     return new _state.TextSelection($from, $to);
   }
   try {
-    return selection.map(tr.doc, tr.mapping);
+    return selection.map(tr.doc, mapping);
   } catch (_unused) {
     return undefined;
   }
-};
-var expandToBlockRange = function expandToBlockRange($from, $to) {
-  var range = $from.blockRange($to);
-  if (!range) {
-    return {
-      $from: $from,
-      $to: $to
-    };
-  }
-  return {
-    $from: $from.doc.resolve(range.start),
-    $to: $to.doc.resolve(range.end)
-  };
 };

package/dist/cjs/pm-plugins/utils/getSelection.js

@@ -3,21 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setCursorPositionAtMovedNode = exports.selectNode = exports.rootTaskListDepth = exports.rootListDepth = exports.isNodeWithCodeBlock = exports.isHandleCorrelatedToSelection = exports.getSelection = exports.getInlineNodePos = void 0;
+exports.setCursorPositionAtMovedNode = exports.selectNode = exports.rootTaskListDepth = exports.rootListDepth = exports.isNodeWithCodeBlock = exports.isHandleCorrelatedToSelection = exports.getSelection = exports.getInlineNodePos = exports.expandToBlockRange = exports.collapseToSelectionRange = void 0;
 var _selection2 = require("@atlaskit/editor-common/selection");
 var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _utils2 = require("@atlaskit/editor-tables/utils");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
-var getInlineNodePos = exports.getInlineNodePos = function getInlineNodePos(tr, start, nodeSize) {
-  var $startPos = tr.doc.resolve(start);
+var getInlineNodePos = exports.getInlineNodePos = function getInlineNodePos(doc, start, nodeSize) {
+  var $startPos = doc.resolve(start);
   // To trigger the annotation floating toolbar for non-selectable node, we need to select inline nodes
   // Find the first inline node in the node
   var inlineNodePos = start;
   var foundInlineNode = false;
   var inlineNodeEndPos = 0;
-  tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n, pos) {
+  doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n, pos) {
     if (n.isInline) {
       inlineNodeEndPos = pos + n.nodeSize;
     }
@@ -42,10 +42,10 @@ var isNodeWithCodeBlock = exports.isNodeWithCodeBlock = function isNodeWithCodeB
   });
   return hasCodeBlock;
 };
-var isNodeWithMediaOrExtension = function isNodeWithMediaOrExtension(tr, start, nodeSize) {
-  var $startPos = tr.doc.resolve(start);
+var isNodeWithMediaOrExtension = function isNodeWithMediaOrExtension(doc, start, nodeSize) {
+  var $startPos = doc.resolve(start);
   var hasMediaOrExtension = false;
-  tr.doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n) {
+  doc.nodesBetween($startPos.pos, $startPos.pos + nodeSize, function (n) {
     if (['media', 'extension'].includes(n.type.name)) {
       hasMediaOrExtension = true;
     }
@@ -58,8 +58,8 @@ var oldGetSelection = function oldGetSelection(tr, start) {
   var nodeSize = node ? node.nodeSize : 1;
   var $startPos = tr.doc.resolve(start);
   var nodeName = node === null || node === void 0 ? void 0 : node.type.name;
-  var isBlockQuoteWithMediaOrExtension = nodeName === 'blockquote' && isNodeWithMediaOrExtension(tr, start, nodeSize);
-  var isListWithMediaOrExtension = nodeName === 'bulletList' && isNodeWithMediaOrExtension(tr, start, nodeSize) || nodeName === 'orderedList' && isNodeWithMediaOrExtension(tr, start, nodeSize);
+  var isBlockQuoteWithMediaOrExtension = nodeName === 'blockquote' && isNodeWithMediaOrExtension(tr.doc, start, nodeSize);
+  var isListWithMediaOrExtension = nodeName === 'bulletList' && isNodeWithMediaOrExtension(tr.doc, start, nodeSize) || nodeName === 'orderedList' && isNodeWithMediaOrExtension(tr.doc, start, nodeSize);
   if (isNodeSelection && nodeName !== 'blockquote' || isListWithMediaOrExtension || isBlockQuoteWithMediaOrExtension ||
   // decisionList/layoutColumn node is not selectable, but we want to select the whole node not just text
   ['decisionList', 'layoutColumn'].includes(nodeName || '')) {
@@ -75,55 +75,55 @@ var oldGetSelection = function oldGetSelection(tr, start) {
   } else if (nodeName === 'taskList') {
     return _state.TextSelection.create(tr.doc, start, start + nodeSize);
   } else {
-    var _getInlineNodePos = getInlineNodePos(tr, start, nodeSize),
+    var _getInlineNodePos = getInlineNodePos(tr.doc, start, nodeSize),
       inlineNodePos = _getInlineNodePos.inlineNodePos,
       inlineNodeEndPos = _getInlineNodePos.inlineNodeEndPos;
     return new _state.TextSelection(tr.doc.resolve(inlineNodePos), tr.doc.resolve(inlineNodeEndPos));
   }
 };
-var newGetSelection = function newGetSelection(tr, start) {
-  var node = tr.doc.nodeAt(start);
+var newGetSelection = function newGetSelection(doc, selectionEmpty, start) {
+  var node = doc.nodeAt(start);
   var isNodeSelection = node && _state.NodeSelection.isSelectable(node);
   var nodeSize = node ? node.nodeSize : 1;
   var nodeName = node === null || node === void 0 ? void 0 : node.type.name;
 
   // this is a fix for empty paragraph selection - put first to avoid any extra work
-  if (nodeName === 'paragraph' && tr.selection.empty && (node === null || node === void 0 ? void 0 : node.childCount) === 0 && !(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+  if (nodeName === 'paragraph' && selectionEmpty && (node === null || node === void 0 ? void 0 : node.childCount) === 0 && !(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
     return false;
   }
-  var isParagraphHeadingEmpty = ['paragraph', 'heading'].includes(nodeName || '') && tr.selection.empty && (node === null || node === void 0 ? void 0 : node.childCount) === 0;
+  var isParagraphHeadingEmpty = ['paragraph', 'heading'].includes(nodeName || '') && selectionEmpty && (node === null || node === void 0 ? void 0 : node.childCount) === 0;
   var isBlockQuoteEmpty = nodeName === 'blockquote' && (node === null || node === void 0 ? void 0 : node.textContent) === '';
-  var isListEmpty = ['orderedList', 'bulletList', 'taskList'].includes(nodeName || '') && tr.selection.empty && (node === null || node === void 0 ? void 0 : node.textContent) === '';
+  var isListEmpty = ['orderedList', 'bulletList', 'taskList'].includes(nodeName || '') && selectionEmpty && (node === null || node === void 0 ? void 0 : node.textContent) === '';
 
   // if block menu and empty line format menu are enabled,
   // we want to set the selection to avoid the selection goes to the top of the document
-  if ((isParagraphHeadingEmpty || isBlockQuoteEmpty || isListEmpty) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_empty_line', 'isEnabled', true)) {
-    return _state.TextSelection.create(tr.doc, start + 1, start + 1);
+  if ((isParagraphHeadingEmpty || isBlockQuoteEmpty || isListEmpty) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+    return _state.TextSelection.create(doc, start + 1, start + 1);
   }
-  var isBlockQuoteWithMediaOrExtension = nodeName === 'blockquote' && isNodeWithMediaOrExtension(tr, start, nodeSize);
-  var isListWithMediaOrExtension = nodeName === 'bulletList' && isNodeWithMediaOrExtension(tr, start, nodeSize) || nodeName === 'orderedList' && isNodeWithMediaOrExtension(tr, start, nodeSize);
+  var isBlockQuoteWithMediaOrExtension = nodeName === 'blockquote' && isNodeWithMediaOrExtension(doc, start, nodeSize);
+  var isListWithMediaOrExtension = nodeName === 'bulletList' && isNodeWithMediaOrExtension(doc, start, nodeSize) || nodeName === 'orderedList' && isNodeWithMediaOrExtension(doc, start, nodeSize);
   if (isNodeSelection && nodeName !== 'blockquote' || isListWithMediaOrExtension || isBlockQuoteWithMediaOrExtension ||
   // decisionList/layoutColumn node is not selectable, but we want to select the whole node not just text
   ['decisionList', 'layoutColumn'].includes(nodeName || '') || nodeName === 'mediaGroup' && typeof (node === null || node === void 0 ? void 0 : node.childCount) === 'number' && (node === null || node === void 0 ? void 0 : node.childCount) > 1) {
-    return new _state.NodeSelection(tr.doc.resolve(start));
+    return new _state.NodeSelection(doc.resolve(start));
   }
 
   // if mediaGroup only has a single child, we want to select the child
   if (nodeName === 'mediaGroup') {
-    var $mediaStartPos = tr.doc.resolve(start + 1);
+    var $mediaStartPos = doc.resolve(start + 1);
     return new _state.NodeSelection($mediaStartPos);
   }
   if (nodeName === 'taskList' && !(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
-    return _state.TextSelection.create(tr.doc, start, start + nodeSize);
+    return _state.TextSelection.create(doc, start, start + nodeSize);
   }
-  var _getInlineNodePos2 = getInlineNodePos(tr, start, nodeSize),
+  var _getInlineNodePos2 = getInlineNodePos(doc, start, nodeSize),
     inlineNodePos = _getInlineNodePos2.inlineNodePos,
     inlineNodeEndPos = _getInlineNodePos2.inlineNodeEndPos;
-  return new _state.TextSelection(tr.doc.resolve(inlineNodePos), tr.doc.resolve(inlineNodeEndPos));
+  return new _state.TextSelection(doc.resolve(inlineNodePos), doc.resolve(inlineNodeEndPos));
 };
 var getSelection = exports.getSelection = function getSelection(tr, start, api) {
   if ((0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(api === null || api === void 0 ? void 0 : api.toolbar))) {
-    return newGetSelection(tr, start);
+    return newGetSelection(tr.doc, tr.selection.empty, start);
   }
   return oldGetSelection(tr, start);
 };
@@ -158,7 +158,7 @@ var setCursorPositionAtMovedNode = exports.setCursorPositionAtMovedNode = functi
     tr.setSelection(_selection);
     return tr;
   }
-  var _getInlineNodePos3 = getInlineNodePos(tr, start, nodeSize),
+  var _getInlineNodePos3 = getInlineNodePos(tr.doc, start, nodeSize),
     inlineNodeEndPos = _getInlineNodePos3.inlineNodeEndPos;
   selection = new _state.TextSelection(tr.doc.resolve(inlineNodeEndPos));
   tr.setSelection(selection);
@@ -220,4 +220,52 @@ var rootTaskListDepth = exports.rootTaskListDepth = function rootTaskListDepth(t
     }
   }
   return depth;
+};
+
+/**
+ * This expands the given $from and $to resolved positions to the block boundaries
+ * spanning all nodes in the range up to the nearest common ancestor.
+ *
+ * @param $from The resolved start position
+ * @param $to The resolved end position
+ * @returns An object containing the expanded $from and $to resolved positions
+ */
+var expandToBlockRange = exports.expandToBlockRange = function expandToBlockRange($from, $to) {
+  var range = $from.blockRange($to);
+  if (!range) {
+    return {
+      $from: $from,
+      $to: $to
+    };
+  }
+  return {
+    $from: $from.doc.resolve(range.start),
+    $to: $to.doc.resolve(range.end)
+  };
+};
+
+/**
+ * Collapses the given $from and $to resolved positions to the nearest valid selection range.
+ *
+ * Will retract the from and to positions to nearest inline positions at node boundaries only if needed.
+ *
+ * @param $from the resolved start position
+ * @param $to the resolved end position
+ * @returns An object containing the collapsed $from and $to resolved positions
+ */
+var collapseToSelectionRange = exports.collapseToSelectionRange = function collapseToSelectionRange($from, $to) {
+  var resolvedRangeEnd = $from.doc.resolve($to.pos);
+
+  // Get the selections that would be made for the first and last node in the range
+  // We re-use the getSelection logic as it already handles various node types and edge cases
+  var firstNodeSelection = newGetSelection($from.doc, $from.pos === $to.pos, $from.pos);
+  var lastNodeSize = resolvedRangeEnd.nodeBefore ? resolvedRangeEnd.nodeBefore.nodeSize : 0;
+  var lastNodeStartPos = resolvedRangeEnd.pos - lastNodeSize;
+  var lastNodeSelection = newGetSelection($from.doc, $from.pos === $to.pos, lastNodeStartPos);
+
+  // Return a selection spanning from the start of the first node selection to the end of the last node selection
+  return {
+    $from: $from.doc.resolve(firstNodeSelection ? firstNodeSelection.from : $from.pos),
+    $to: $to.doc.resolve(lastNodeSelection ? lastNodeSelection.to : $to.pos)
+  };
 };

package/dist/cjs/ui/drag-handle.js

@@ -437,7 +437,10 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
 
       // Set selection to expanded selection range if it encompases the clicked drag handle
       if (range && isPosWithinRange(startPos, range) && isMultiNodeRange(range)) {
-        tr.setSelection(_state.TextSelection.create(tr.doc, Math.min(selection.from, range.start), Math.max(selection.to, range.end)));
+        var collapsed = (0, _getSelection.collapseToSelectionRange)(tr.doc.resolve(range.start), tr.doc.resolve(range.end));
+
+        // Then create a selection from the start of the first node to the end of the last node
+        tr.setSelection(_state.TextSelection.create(tr.doc, Math.min(selection.from, collapsed ? collapsed.$from.pos : range.start), Math.max(selection.to, collapsed ? collapsed.$to.pos : range.end)));
       } else {
         // Select the clicked drag handle's node only
         tr = (0, _getSelection.selectNode)(tr, startPos, nodeType, api);

package/dist/es2019/editor-commands/move-node-with-block-menu.js

@@ -1,9 +1,19 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { DIRECTION } from '@atlaskit/editor-common/types';
-import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { moveNode } from './move-node';
-import { getCurrentNodePosFromDragHandleSelection, getPosWhenMoveNodeDown, getPosWhenMoveNodeUp, getShouldMoveNode } from './utils/move-node-utils';
+import { getCurrentNodePosFromDragHandleSelection } from './utils/move-node-utils';
+const getSelectionToIndex = (fromIndex, $to, depth) => {
+  const toIndex = $to.index(depth);
+  const toIndexAfter = $to.indexAfter(depth);
+
+  // If $to is at the start of a node (indexAfter === index), don't include that node
+  // This occurs when the preserved selection is outside of inline positions at node boundaries
+  if (toIndexAfter === toIndex && toIndex > fromIndex) {
+    return toIndex - 1;
+  }
+  return toIndex;
+};
 export const moveNodeWithBlockMenu = (api, direction) => {
   return ({
     tr
@@ -21,33 +31,29 @@ export const moveNodeWithBlockMenu = (api, direction) => {
       schema: tr.doc.type.schema,
       resolve: tr.doc.resolve.bind(tr.doc)
     });
-    if (currentNodePos > -1) {
-      const $currentNodePos = tr.doc.resolve(currentNodePos);
-      const nodeAfterPos = $currentNodePos.posAtIndex($currentNodePos.index() + 1);
-      const moveToPos = direction === DIRECTION.UP ? getPosWhenMoveNodeUp($currentNodePos, currentNodePos) : getPosWhenMoveNodeDown({
-        $currentNodePos,
-        nodeAfterPos,
-        tr
-      });
-
-      // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
-      const shouldMoveNode = getShouldMoveNode({
-        currentNodePos,
-        moveToPos,
-        tr
-      });
-      if (shouldMoveNode) {
-        moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.BLOCK_MENU)({
+    const {
+      $from,
+      $to
+    } = selection;
+    const depth = tr.doc.resolve(currentNodePos).depth;
+    const fromIndex = $from.index(depth);
+    if (direction === DIRECTION.UP) {
+      if (fromIndex > 0) {
+        const moveToPos = $from.posAtIndex(fromIndex - 1, depth);
+        return moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.BLOCK_MENU)({
+          tr
+        });
+      }
+    } else {
+      // selectionToIndex is the index of the last node in the selection
+      const selectionToIndex = getSelectionToIndex(fromIndex, $to, depth);
+      // Adding 2 so we jump over the next node to the position after it
+      const moveToIndex = selectionToIndex + 2;
+      if (moveToIndex <= $to.node(depth).childCount) {
+        const moveToPos = $to.posAtIndex(moveToIndex, depth);
+        return moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.BLOCK_MENU)({
           tr
         });
-        if (tr.selection.empty && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) && expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true)) {
-          const nodeAtCurrentPos = tr.doc.nodeAt(currentNodePos);
-          const nodeAfter = tr.doc.nodeAt(moveToPos);
-          const isConsecutiveEmptyLineMove = (nodeAtCurrentPos === null || nodeAtCurrentPos === void 0 ? void 0 : nodeAtCurrentPos.content.size) === 0 && (nodeAfter === null || nodeAfter === void 0 ? void 0 : nodeAfter.content.size) === 0;
-          const cursorPos = direction === DIRECTION.UP || direction === DIRECTION.DOWN && isConsecutiveEmptyLineMove ? moveToPos : moveToPos - 1;
-          tr.setSelection(TextSelection.create(tr.doc, cursorPos));
-        }
-        tr.scrollIntoView();
       }
     }
     return tr;

package/dist/es2019/editor-commands/move-node.js

@@ -6,7 +6,7 @@ import { transformSliceNestedExpandToExpand } from '@atlaskit/editor-common/tran
 import { DIRECTION } from '@atlaskit/editor-common/types';
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import { Selection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
+import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { findChildrenByType, findParentNodeOfType, findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { findTable, isInTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -19,7 +19,7 @@ import { selectNode, setCursorPositionAtMovedNode } from '../pm-plugins/utils/ge
 import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
 import { getSelectedSlicePosition } from '../pm-plugins/utils/selection';
 import { getInsertLayoutStep, updateSelection } from '../pm-plugins/utils/update-selection';
-import { canMoveNodeToIndex, isInsideTable, transformSliceExpandToNestedExpand, transformFragmentExpandToNestedExpand } from '../pm-plugins/utils/validation';
+import { canMoveNodeToIndex, isInsideTable, transformFragmentExpandToNestedExpand, transformSliceExpandToNestedExpand } from '../pm-plugins/utils/validation';
 import { getPosWhenMoveNodeDown, getPosWhenMoveNodeUp } from './utils/move-node-utils';
 
 /**
@@ -315,7 +315,7 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
 export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_DROP, formatMessage) => ({
   tr
 }) => {
-  var _convertedNodeSlice, _api$blockControls$co2, _api$accessibilityUti;
+  var _api$blockControls$sh, _convertedNodeSlice, _api$accessibilityUti;
   if (!api || start < 0 || to < 0) {
     return tr;
   }
@@ -333,8 +333,17 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
       tr
     });
   }
-  const slicePosition = getSelectedSlicePosition(start, tr, api);
-  if (isMultiSelect) {
+  const preservedSelection = expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? api === null || api === void 0 ? void 0 : (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.preservedSelection : undefined;
+  if (preservedSelection) {
+    const $from = tr.doc.resolve(Math.min(start, preservedSelection.from));
+    const expandedRange = $from.blockRange(preservedSelection.$to);
+    sliceFrom = expandedRange ? expandedRange.start : preservedSelection.from;
+    sliceTo = expandedRange ? expandedRange.end : preservedSelection.to;
+    const attributes = getMultiSelectAnalyticsAttributes(tr, sliceFrom, sliceTo);
+    hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
+    sourceNodeTypes = attributes.nodeTypes;
+  } else if (isMultiSelect) {
+    const slicePosition = getSelectedSlicePosition(start, tr, api);
     sliceFrom = slicePosition.from;
     sliceTo = slicePosition.to;
     const attributes = getMultiSelectAnalyticsAttributes(tr, sliceFrom, sliceTo);
@@ -414,13 +423,23 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
     tr.insert(mappedTo, convertedNode);
   }
   const sliceSize = sliceTo - sliceFrom;
-  tr = inputMethod === INPUT_METHOD.DRAG_AND_DROP ? setCursorPositionAtMovedNode(tr, mappedTo, api) : isMultiSelect ? (_api$blockControls$co2 = api === null || api === void 0 ? void 0 : api.blockControls.commands.setMultiSelectPositions(mappedTo, mappedTo + sliceSize)({
-    tr
-  })) !== null && _api$blockControls$co2 !== void 0 ? _api$blockControls$co2 : tr : selectNode(tr, mappedTo, handleNode.type.name, api);
+  if (inputMethod === INPUT_METHOD.DRAG_AND_DROP) {
+    tr = setCursorPositionAtMovedNode(tr, mappedTo, api);
+  } else if (preservedSelection) {
+    // do nothing here to allow the selection preservation plugin to handle mapping the selection
+  } else if (isMultiSelect) {
+    var _api$blockControls$co2;
+    tr = (_api$blockControls$co2 = api === null || api === void 0 ? void 0 : api.blockControls.commands.setMultiSelectPositions(mappedTo, mappedTo + sliceSize)({
+      tr
+    })) !== null && _api$blockControls$co2 !== void 0 ? _api$blockControls$co2 : tr;
+  } else {
+    tr = selectNode(tr, mappedTo, handleNode.type.name, api);
+  }
   const currMeta = tr.getMeta(key);
   tr.setMeta(key, {
     ...currMeta,
-    nodeMoved: true
+    nodeMoved: true,
+    nodeMovedOffset: mappedTo - sliceFrom
   });
   api === null || api === void 0 ? void 0 : api.core.actions.focus();
   const $mappedTo = tr.doc.resolve(mappedTo);

package/dist/es2019/editor-commands/utils/move-node-utils.js

@@ -9,7 +9,7 @@ export const getCurrentNodePosFromDragHandleSelection = ({
   resolve
 }) => {
   let currentNodePos = -1;
-  if (selection.empty && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) && expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true)) {
+  if (selection.empty && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
     currentNodePos = selection.$from.pos;
   }
   if (isTableSelected(selection)) {
@@ -53,7 +53,7 @@ export const getPosWhenMoveNodeDown = ({
     return -1;
   }
   const nodeAfter = tr.doc.nodeAt(nodeAfterPos);
-  if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) && expValEqualsNoExposure('platform_editor_block_menu_empty_line', 'isEnabled', true)) {
+  if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
     const nodeAtCurrentPos = tr.doc.nodeAt($currentNodePos.pos);
     // if move empty line down to another empty line, move to the position of the next empty line
     if ((nodeAtCurrentPos === null || nodeAtCurrentPos === void 0 ? void 0 : nodeAtCurrentPos.content.size) === 0 && nodeAtCurrentPos.type.name !== 'extension' && (nodeAfter === null || nodeAfter === void 0 ? void 0 : nodeAfter.content.size) === 0 && nodeAfter.type.name !== 'extension') {