@atlaskit/editor-plugin-block-controls 2.26.0 → 2.26.2

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

@@ -21,6 +21,7 @@ import { Box, xcss } from '@atlaskit/primitives';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import Tooltip from '@atlaskit/tooltip';
 import { key } from '../pm-plugins/main';
+import { getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
 import { getLeftPosition, getTopPosition } from '../pm-plugins/utils/drag-handle-positions';
 import { getNestedNodePosition } from '../pm-plugins/utils/getNestedNodePosition';
 import { isHandleInSelection, selectNode } from '../pm-plugins/utils/getSelection';
@@ -246,7 +247,11 @@ export const DragHandle = ({
           const isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true, {
             exposure: true
           });
+          let nodeTypes, hasSelectedMultipleNodes;
+          const resolvedMovingNode = tr.doc.resolve(start);
+          const maybeNode = resolvedMovingNode.nodeAfter;
           if (isMultiSelect) {
+            var _tr$getMeta;
             const handlePos = getPos();
             if (typeof handlePos !== 'number') {
               return tr;
@@ -257,12 +262,19 @@ export const DragHandle = ({
                 tr
               });
             }
+            const multiSelectDnD = (_tr$getMeta = tr.getMeta(key)) === null || _tr$getMeta === void 0 ? void 0 : _tr$getMeta.multiSelectDnD;
+            if (multiSelectDnD) {
+              const attributes = getMultiSelectAnalyticsAttributes(tr, multiSelectDnD.anchor, multiSelectDnD.head);
+              nodeTypes = attributes.nodeTypes;
+              hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
+            } else {
+              nodeTypes = maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name;
+              hasSelectedMultipleNodes = false;
+            }
           }
           api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.setNodeDragged(getPos, anchorName, nodeType)({
             tr
           });
-          const resolvedMovingNode = tr.doc.resolve(start);
-          const maybeNode = resolvedMovingNode.nodeAfter;
           tr.setMeta('scrollIntoView', false);
           api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions.attachAnalyticsEvent({
             eventType: EVENT_TYPE.UI,
@@ -271,7 +283,11 @@ export const DragHandle = ({
             actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
             attributes: {
               nodeDepth: resolvedMovingNode.depth,
-              nodeType: (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name) || ''
+              nodeType: (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name) || '',
+              ...(isMultiSelect && {
+                nodeTypes,
+                hasSelectedMultipleNodes
+              })
             }
           })(tr);
           return tr;
@@ -369,7 +385,21 @@ export const DragHandle = ({
     }
     setDragHandleSelected(isHandleInSelection(view.state, selection, start));
   }, [start, selection, view.state]);
-  let helpDescriptors = [{
+  let helpDescriptors = isTopLevelNode && fg('platform_editor_advanced_layouts_accessibility') ? [{
+    description: formatMessage(blockControlsMessages.dragToMove)
+  }, {
+    description: formatMessage(blockControlsMessages.moveUp),
+    keymap: dragToMoveUp
+  }, {
+    description: formatMessage(blockControlsMessages.moveDown),
+    keymap: dragToMoveDown
+  }, {
+    description: formatMessage(blockControlsMessages.moveLeft),
+    keymap: dragToMoveLeft
+  }, {
+    description: formatMessage(blockControlsMessages.moveRight),
+    keymap: dragToMoveRight
+  }] : [{
     description: formatMessage(blockControlsMessages.dragToMove)
   }, {
     description: formatMessage(blockControlsMessages.moveUp),

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

@@ -14,12 +14,13 @@ import { findTable, isInTable, isTableSelected } from '@atlaskit/editor-tables/u
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
+import { attachMoveNodeAnalytics, getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
 import { DIRECTION } from '../pm-plugins/utils/consts';
-import { attachMoveNodeAnalytics } from '../pm-plugins/utils/fire-analytics';
 import { getNestedNodePosition } from '../pm-plugins/utils/getNestedNodePosition';
 import { selectNode, setCursorPositionAtMovedNode } from '../pm-plugins/utils/getSelection';
 import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
-import { getMultiSelectionIfPosInside } from '../pm-plugins/utils/selection';
+import { getSelectedSlicePosition } from '../pm-plugins/utils/selection';
+import { getInsertLayoutStep, updateSelection } from '../pm-plugins/utils/update-selection';
 import { canMoveNodeToIndex, isInsideTable, transformSliceExpandToNestedExpand } from '../pm-plugins/utils/validation';
 
 /**
@@ -52,7 +53,7 @@ var isDragLayoutColumnToTopLevel = function isDragLayoutColumnToTopLevel($from,
  *
  * @returns the start position of a node if the node can be moved, otherwise -1
  */
-var getCurrentNodePos = function getCurrentNodePos(state, isParentNodeOfTypeLayout) {
+var getCurrentNodePos = function getCurrentNodePos(state) {
   var _activeNode$handleOpt;
   var selection = state.selection;
   var _ref = key.getState(state) || {},
@@ -88,27 +89,46 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
     if (shouldEnableNestedDndA11y) {
       isParentNodeOfTypeLayout = !!findParentNodeOfType([state.schema.nodes.layoutSection])(state.selection);
     }
-    var currentNodePos = getCurrentNodePos(state, isParentNodeOfTypeLayout);
+    var currentNodePos = getCurrentNodePos(state);
     if (currentNodePos > -1) {
       var _state$doc$nodeAt;
       var $pos = state.doc.resolve(currentNodePos);
+      var isTopLevelNode = $pos.depth === 0;
       var moveToPos = -1;
       var nodeIndex = $pos.index();
       var isLayoutColumnSelected = selection instanceof NodeSelection && selection.node.type.name === 'layoutColumn';
       if (direction === DIRECTION.LEFT && shouldEnableNestedDndA11y) {
-        if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
-          var _$pos$nodeBefore, _api$core;
-          moveToPos = selection.from - (((_$pos$nodeBefore = $pos.nodeBefore) === null || _$pos$nodeBefore === void 0 ? void 0 : _$pos$nodeBefore.nodeSize) || 1);
+        if (isTopLevelNode && editorExperiment('advanced_layouts', true) && fg('platform_editor_advanced_layouts_accessibility')) {
+          var _api$core, _api$core2;
+          var nodeBefore = $pos.nodeBefore;
+          if (nodeBefore) {
+            moveToPos = currentNodePos - nodeBefore.nodeSize;
+          }
+          if (moveToPos < 0) {
+            return false;
+          }
           api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref2) {
             var _api$blockControls;
             var tr = _ref2.tr;
             api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.commands) === null || _api$blockControls === void 0 || _api$blockControls.moveToLayout(currentNodePos, moveToPos, {
-              selectMovedNode: true
+              moveToEnd: true,
+              moveNodeAtCursorPos: true
             })({
               tr: tr
             });
+            var insertColumnStep = getInsertLayoutStep(tr);
+            var mappedTo = insertColumnStep === null || insertColumnStep === void 0 ? void 0 : insertColumnStep.from;
+            updateSelection(tr, mappedTo, true);
             return tr;
           });
+          api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.focus();
+          return true;
+        } else if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
+          var _$pos$nodeBefore, _api$core3, _api$blockControls2;
+          moveToPos = selection.from - (((_$pos$nodeBefore = $pos.nodeBefore) === null || _$pos$nodeBefore === void 0 ? void 0 : _$pos$nodeBefore.nodeSize) || 1);
+          api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.moveToLayout(currentNodePos, moveToPos, {
+            selectMovedNode: true
+          }));
           return true;
         } else {
           if ($pos.depth < 2 || !isParentNodeOfTypeLayout) {
@@ -122,8 +142,30 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
           moveToPos = $pos.start() - ((previousNode === null || previousNode === void 0 ? void 0 : previousNode.nodeSize) || 1);
         }
       } else if (direction === DIRECTION.RIGHT && shouldEnableNestedDndA11y) {
-        if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
-          var _api$core2;
+        if (isTopLevelNode && editorExperiment('advanced_layouts', true) && fg('platform_editor_advanced_layouts_accessibility')) {
+          var _api$core4, _api$core5;
+          var endOfDoc = $pos.end();
+          moveToPos = $pos.posAtIndex($pos.index() + 1);
+          if (moveToPos >= endOfDoc) {
+            return false;
+          }
+          api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.execute(function (_ref3) {
+            var _api$blockControls3;
+            var tr = _ref3.tr;
+            api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || (_api$blockControls3 = _api$blockControls3.commands) === null || _api$blockControls3 === void 0 || _api$blockControls3.moveToLayout(currentNodePos, moveToPos, {
+              moveNodeAtCursorPos: true
+            })({
+              tr: tr
+            });
+            var insertColumnStep = getInsertLayoutStep(tr);
+            var mappedTo = insertColumnStep === null || insertColumnStep === void 0 ? void 0 : insertColumnStep.from;
+            updateSelection(tr, mappedTo);
+            return tr;
+          });
+          api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.focus();
+          return true;
+        } else if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
+          var _api$core6, _api$blockControls4;
           var _index = $pos.index($pos.depth);
           var parent = $pos.node($pos.depth);
           // get the next layoutColumn node
@@ -136,17 +178,10 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
           }
           var moveToEnd = _index === parent.childCount - 2;
           moveToPos = moveToEnd ? $pos.before() : selection.to + ((nextNode === null || nextNode === void 0 ? void 0 : nextNode.nodeSize) || 1);
-          api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref3) {
-            var _api$blockControls2;
-            var tr = _ref3.tr;
-            api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || (_api$blockControls2 = _api$blockControls2.commands) === null || _api$blockControls2 === void 0 || _api$blockControls2.moveToLayout(currentNodePos, moveToPos, {
-              moveToEnd: moveToEnd,
-              selectMovedNode: true
-            })({
-              tr: tr
-            });
-            return tr;
-          });
+          api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 || _api$core6.actions.execute(api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 || (_api$blockControls4 = _api$blockControls4.commands) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.moveToLayout(currentNodePos, moveToPos, {
+            moveToEnd: moveToEnd,
+            selectMovedNode: true
+          }));
           return true;
         } else {
           if ($pos.depth < 2 || !isParentNodeOfTypeLayout) {
@@ -158,15 +193,15 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
         if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
           moveToPos = $pos.start() - 1;
         } else {
-          var nodeBefore = $pos.depth > 1 && nodeIndex === 0 && shouldEnableNestedDndA11y ? $pos.node($pos.depth) : $pos.nodeBefore;
-          if (nodeBefore) {
-            moveToPos = currentNodePos - nodeBefore.nodeSize;
+          var _nodeBefore = $pos.depth > 1 && nodeIndex === 0 && shouldEnableNestedDndA11y ? $pos.node($pos.depth) : $pos.nodeBefore;
+          if (_nodeBefore) {
+            moveToPos = currentNodePos - _nodeBefore.nodeSize;
           }
         }
       } else {
-        var endOfDoc = $pos.end();
+        var _endOfDoc = $pos.end();
         var nodeAfterPos = $pos.posAtIndex($pos.index() + 1);
-        if (nodeAfterPos > endOfDoc) {
+        if (nodeAfterPos > _endOfDoc) {
           return false;
         }
         if (isLayoutColumnSelected && fg('platform_editor_advanced_layouts_accessibility')) {
@@ -184,8 +219,8 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
       // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
       var shouldMoveNode = (shouldEnableNestedDndA11y ? moveToPos > -1 && $pos.depth === state.doc.resolve(moveToPos).depth || nodeType === 'layoutColumn' : moveToPos > -1) || nodeType === 'layoutColumn' && fg('platform_editor_advanced_layouts_accessibility');
       if (shouldMoveNode) {
-        var _api$core3;
-        api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref4) {
+        var _api$core7;
+        api === null || api === void 0 || (_api$core7 = api.core) === null || _api$core7 === void 0 || _api$core7.actions.execute(function (_ref4) {
           var tr = _ref4.tr;
           moveNode(api)(currentNodePos, moveToPos, INPUT_METHOD.SHORTCUT, formatMessage)({
             tr: tr
@@ -195,9 +230,9 @@ export var moveNodeViaShortcut = function moveNodeViaShortcut(api, direction, fo
         });
         return true;
       } else if (nodeType) {
-        var _api$core4;
+        var _api$core8;
         // If the node is first/last one, only select the node
-        api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.execute(function (_ref5) {
+        api === null || api === void 0 || (_api$core8 = api.core) === null || _api$core8 === void 0 || _api$core8.actions.execute(function (_ref5) {
           var tr = _ref5.tr;
           selectNode(tr, currentNodePos, nodeType);
           tr.scrollIntoView();
@@ -224,22 +259,21 @@ export var moveNode = function moveNode(api) {
       }
       var sliceFrom = start;
       var sliceTo;
+      var mappedTo;
+      var sourceNodeTypes, hasSelectedMultipleNodes;
       var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true, {
         exposure: true
       });
       if (isMultiSelect) {
-        var _handleNode$nodeSize;
-        var _getMultiSelectionIfP = getMultiSelectionIfPosInside(api, start),
-          anchor = _getMultiSelectionIfP.anchor,
-          head = _getMultiSelectionIfP.head;
-        var inSelection = anchor !== undefined && head !== undefined;
-        sliceFrom = inSelection ? Math.min(anchor, head) : start;
-        var handleSize = (_handleNode$nodeSize = handleNode === null || handleNode === void 0 ? void 0 : handleNode.nodeSize) !== null && _handleNode$nodeSize !== void 0 ? _handleNode$nodeSize : 1;
-        var handleEnd = sliceFrom + handleSize;
-        sliceTo = inSelection ? Math.max(anchor, head) : handleEnd;
+        var slicePosition = getSelectedSlicePosition(start, tr, api);
+        sliceFrom = slicePosition.from;
+        sliceTo = slicePosition.to;
+        var attributes = getMultiSelectAnalyticsAttributes(tr, sliceFrom, sliceTo);
+        hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
+        sourceNodeTypes = attributes.nodeTypes;
       } else {
-        var _handleNode$nodeSize2;
-        var size = (_handleNode$nodeSize2 = handleNode === null || handleNode === void 0 ? void 0 : handleNode.nodeSize) !== null && _handleNode$nodeSize2 !== void 0 ? _handleNode$nodeSize2 : 1;
+        var _handleNode$nodeSize;
+        var size = (_handleNode$nodeSize = handleNode === null || handleNode === void 0 ? void 0 : handleNode.nodeSize) !== null && _handleNode$nodeSize !== void 0 ? _handleNode$nodeSize : 1;
         sliceTo = sliceFrom + size;
       }
       var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
@@ -247,7 +281,6 @@ export var moveNode = function moveNode(api) {
         nestedExpand = _tr$doc$type$schema$n.nestedExpand;
       var $to = tr.doc.resolve(to);
       var $handlePos = tr.doc.resolve(start);
-      var mappedTo;
       if (editorExperiment('nested-dnd', true)) {
         var nodeCopy = tr.doc.slice(sliceFrom, sliceTo, false); // cut the content
         var destType = $to.node().type;
@@ -303,7 +336,7 @@ export var moveNode = function moveNode(api) {
         }
       }
       if (editorExperiment('advanced_layouts', true)) {
-        attachMoveNodeAnalytics(tr, inputMethod, $handlePos.depth, handleNode.type.name, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name, $handlePos.sameParent($mappedTo), api);
+        attachMoveNodeAnalytics(tr, inputMethod, $handlePos.depth, handleNode.type.name, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name, $handlePos.sameParent($mappedTo), api, sourceNodeTypes, hasSelectedMultipleNodes);
       } else {
         var _api$analytics;
         api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
@@ -311,13 +344,16 @@ export var moveNode = function moveNode(api) {
           action: ACTION.MOVED,
           actionSubject: ACTION_SUBJECT.ELEMENT,
           actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-          attributes: _objectSpread({
+          attributes: _objectSpread(_objectSpread({
             nodeDepth: $handlePos.depth,
             nodeType: handleNode.type.name,
             destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth,
             destinationNodeType: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name
           }, fg('platform_editor_element_drag_and_drop_ed_23873') && {
             inputMethod: inputMethod
+          }), isMultiSelect && {
+            sourceNodeTypes: sourceNodeTypes,
+            hasSelectedMultipleNodes: hasSelectedMultipleNodes
           })
         })(tr);
       }

package/dist/esm/editor-commands/move-to-layout.js

@@ -4,9 +4,9 @@ import { Fragment, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import { fireInsertLayoutAnalytics, attachMoveNodeAnalytics, getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
 import { isFragmentOfType, containsNodeOfType } from '../pm-plugins/utils/check-fragment';
 import { maxLayoutColumnSupported } from '../pm-plugins/utils/consts';
-import { fireInsertLayoutAnalytics, attachMoveNodeAnalytics } from '../pm-plugins/utils/fire-analytics';
 import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
 import { getMultiSelectionIfPosInside } from '../pm-plugins/utils/selection';
 import { updateColumnWidths } from '../pm-plugins/utils/update-column-widths';
@@ -41,9 +41,14 @@ var createNewLayout = function createNewLayout(schema, layoutContents) {
 var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos, sourceContent, from, to, tr, $originalFrom, $originalTo, api, selectMovedNode) {
   var isSameLayout = isInSameLayout($originalFrom, $originalTo);
   var sourceContentEndPos = -1;
-  if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
+  var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
+  var sourceNodeTypes, hasSelectedMultipleNodes;
+  if (isMultiSelect) {
     if (sourceContent instanceof Fragment) {
       sourceContentEndPos = from + sourceContent.size;
+      var attributes = getMultiSelectAnalyticsAttributes(tr, from, sourceContentEndPos);
+      hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
+      sourceNodeTypes = attributes.nodeTypes;
     }
   } else {
     if (sourceContent instanceof PMNode) {
@@ -62,7 +67,7 @@ var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos,
     if (!fg('platform_editor_advanced_layouts_post_fix_patch_1') || selectMovedNode) {
       tr.setSelection(new NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
     }
-    attachMoveNodeAnalytics(tr, INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf === void 0 ? void 0 : _$originalFrom$nodeAf.type.name) || '', 1, 'layoutSection', true, api);
+    attachMoveNodeAnalytics(tr, INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf === void 0 ? void 0 : _$originalFrom$nodeAf.type.name) || '', 1, 'layoutSection', true, api, sourceNodeTypes, hasSelectedMultipleNodes);
   } else if (toLayout.childCount < maxLayoutColumnSupported()) {
     var _$originalFrom$nodeAf2;
     if (fg('platform_editor_advanced_layouts_post_fix_patch_1')) {
@@ -73,7 +78,7 @@ var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos,
       var mappedFrom = tr.mapping.map(from);
       removeFromSource(tr, tr.doc.resolve(mappedFrom), tr.mapping.map(sourceContentEndPos));
     }
-    attachMoveNodeAnalytics(tr, INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf2 = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf2 === void 0 ? void 0 : _$originalFrom$nodeAf2.type.name) || '', 1, 'layoutSection', false, api);
+    attachMoveNodeAnalytics(tr, INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, ((_$originalFrom$nodeAf2 = $originalFrom.nodeAfter) === null || _$originalFrom$nodeAf2 === void 0 ? void 0 : _$originalFrom$nodeAf2.type.name) || '', 1, 'layoutSection', false, api, sourceNodeTypes, hasSelectedMultipleNodes);
   }
   return tr;
 };
@@ -156,7 +161,7 @@ var insertToDestination = function insertToDestination(tr, to, sourceContent, to
  * Check if the node at `from` can be moved to node at `to` to create/expand a layout.
  * Returns the source and destination nodes and positions if it's a valid move, otherwise, undefined
  */
-var canMoveToLayout = function canMoveToLayout(api, from, to, tr) {
+var canMoveToLayout = function canMoveToLayout(api, from, to, tr, moveNodeAtCursorPos) {
   if (from === to) {
     return;
   }
@@ -187,11 +192,11 @@ var canMoveToLayout = function canMoveToLayout(api, from, to, tr) {
   var sourceContent = $from.nodeAfter;
   var sourceFrom = from;
   var sourceTo = from + sourceContent.nodeSize;
-  if (isMultiSelect) {
+  if (isMultiSelect && !moveNodeAtCursorPos) {
     var _getMultiSelectionIfP = getMultiSelectionIfPosInside(api, from),
       anchor = _getMultiSelectionIfP.anchor,
       head = _getMultiSelectionIfP.head;
-    if (anchor && head) {
+    if (anchor !== undefined && head !== undefined) {
       sourceFrom = Math.min(anchor, head);
       sourceTo = Math.max(anchor, head);
       sourceContent = tr.doc.slice(sourceFrom, sourceTo).content;
@@ -248,7 +253,7 @@ var getBreakoutMode = function getBreakoutMode(content, breakout) {
       var _content$marks$find;
       return (_content$marks$find = content.marks.find(function (m) {
         return m.type === breakout;
-      })) === null || _content$marks$find === void 0 ? void 0 : _content$marks$find.attrs;
+      })) === null || _content$marks$find === void 0 ? void 0 : _content$marks$find.attrs.mode;
     } else if (content instanceof Fragment) {
       // Find the first breakout mode in the fragment
       var firstBreakoutMode;
@@ -284,7 +289,7 @@ export var moveToLayout = function moveToLayout(api) {
       if (!api) {
         return tr;
       }
-      var canMove = canMoveToLayout(api, from, to, tr);
+      var canMove = canMoveToLayout(api, from, to, tr, options === null || options === void 0 ? void 0 : options.moveNodeAtCursorPos);
       if (!canMove) {
         return tr;
       }
@@ -308,6 +313,7 @@ export var moveToLayout = function moveToLayout(api) {
       if (!fromContentWithoutBreakout) {
         return tr;
       }
+      var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
       if (toNode.type === layoutSection) {
         var toPos = options !== null && options !== void 0 && options.moveToEnd ? to + toNode.nodeSize - 1 : to + 1;
         return moveToExistingLayout(toNode, to, fromContentWithoutBreakout, $sourceFrom.pos, toPos, tr, $sourceFrom, $to, api, options === null || options === void 0 ? void 0 : options.selectMovedNode);
@@ -327,7 +333,7 @@ export var moveToLayout = function moveToLayout(api) {
           // resolve again the source node after node updated (remove breakout marks)
           toNodeWithoutBreakout = tr.doc.resolve(to).nodeAfter || toNode;
         }
-        if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
+        if (isMultiSelect) {
           if (isFragmentOfType(fromContentWithoutBreakout, 'layoutColumn') && fromContentWithoutBreakout.firstChild) {
             fromContentWithoutBreakout = fromContentWithoutBreakout.firstChild.content;
           }
@@ -339,6 +345,12 @@ export var moveToLayout = function moveToLayout(api) {
         var layoutContents = options !== null && options !== void 0 && options.moveToEnd ? [toNodeWithoutBreakout, fromContentWithoutBreakout] : [fromContentWithoutBreakout, toNodeWithoutBreakout];
         var newLayout = createNewLayout(tr.doc.type.schema, layoutContents);
         if (newLayout) {
+          var sourceNodeTypes, hasSelectedMultipleNodes;
+          if (isMultiSelect) {
+            var attributes = getMultiSelectAnalyticsAttributes(tr, $sourceFrom.pos, sourceTo);
+            hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
+            sourceNodeTypes = attributes.nodeTypes;
+          }
           tr = removeFromSource(tr, $sourceFrom, sourceTo);
           var mappedTo = tr.mapping.map(to);
           tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout);
@@ -348,7 +360,7 @@ export var moveToLayout = function moveToLayout(api) {
           breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
             mode: breakoutMode
           })]);
-          fireInsertLayoutAnalytics(tr, api);
+          fireInsertLayoutAnalytics(tr, api, sourceNodeTypes, hasSelectedMultipleNodes);
         }
         return tr;
       }

package/dist/esm/editor-commands/show-drag-handle.js

@@ -1,8 +1,11 @@
+import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { isInTable } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { key } from '../pm-plugins/main';
+import { findNodeDecs } from '../pm-plugins/decorations-anchor';
+import { getDecorations, key } from '../pm-plugins/main';
 import { getNestedNodePosition } from '../pm-plugins/utils/getNestedNodePosition';
-export var showDragHandleAtSelection = function showDragHandleAtSelection(api, shouldFocusParentNode) {
+var showDragHandleAtSelectionOld = function showDragHandleAtSelectionOld(api, shouldFocusParentNode) {
   return function (state, _, view) {
     var $from = state.selection.$from;
     var shouldFocusParentNode;
@@ -62,4 +65,87 @@ export var showDragHandleAtSelection = function showDragHandleAtSelection(api, s
     }
     return false;
   };
+};
+var findParentPosForHandle = function findParentPosForHandle(state) {
+  var _activeNode$handleOpt2;
+  var $from = state.selection.$from;
+  var _ref2 = key.getState(state) || {},
+    activeNode = _ref2.activeNode;
+
+  // if a node handle is already focused, return the parent pos of that node (with focused handle)
+  if (activeNode && (_activeNode$handleOpt2 = activeNode.handleOptions) !== null && _activeNode$handleOpt2 !== void 0 && _activeNode$handleOpt2.isFocused) {
+    var $activeNodePos = state.doc.resolve(activeNode.pos);
+
+    // if the handle is at the top level already, do nothing
+    if ($activeNodePos.depth === 0) {
+      return undefined;
+    }
+    return $activeNodePos.before();
+  }
+
+  // if we are in second level of nested node, we should focus the node at level 1
+  if ($from.depth <= 1) {
+    return $from.before(1);
+  }
+
+  // if we are inside a table, we should focus the table's handle
+  var parentTableNode = findParentNodeOfType([state.schema.nodes.table])(state.selection);
+  if (parentTableNode) {
+    return parentTableNode.pos;
+  }
+
+  // else find closest parent node
+  return getNestedNodePosition(state);
+};
+var findNextAnchorDecoration = function findNextAnchorDecoration(state) {
+  var decorations = getDecorations(state);
+  if (!decorations) {
+    return undefined;
+  }
+  var nextHandleNodePos = findParentPosForHandle(state);
+  if (nextHandleNodePos === undefined) {
+    return undefined;
+  }
+  var nextHandleNode = state.doc.nodeAt(nextHandleNodePos);
+  var nodeDecorations = nextHandleNode && findNodeDecs(decorations, nextHandleNodePos, nextHandleNodePos + nextHandleNode.nodeSize);
+  if (!nodeDecorations || nodeDecorations.length === 0) {
+    return undefined;
+  }
+
+  // ensure the decoration covers the position of the look up node
+  nodeDecorations = nodeDecorations.filter(function (decoration) {
+    return decoration.from <= nextHandleNodePos;
+  });
+  if (nodeDecorations.length === 0) {
+    return undefined;
+  }
+
+  // sort the decorations by the position of the node
+  // so we can find the closest decoration to the node
+  nodeDecorations.sort(function (a, b) {
+    if (a.from === b.from) {
+      return a.to - b.to;
+    }
+    return b.from - a.from;
+  });
+
+  // return the closest decoration to the node
+  return nodeDecorations[0];
+};
+var showDragHandleAtSelectionNew = function showDragHandleAtSelectionNew(api) {
+  return function (state) {
+    var decoration = findNextAnchorDecoration(state);
+    if (api && decoration) {
+      api.core.actions.execute(api.blockControls.commands.showDragHandleAt(decoration.from, decoration.spec.anchorName, decoration.spec.nodeTypeWithLevel, {
+        isFocused: true
+      }));
+      return true;
+    }
+    return false;
+  };
+};
+export var showDragHandleAtSelection = function showDragHandleAtSelection(api) {
+  return function (state, dispatch, view) {
+    return editorExperiment('nested-dnd', true) && fg('platform_editor_advanced_layouts_a11y') ? showDragHandleAtSelectionNew(api)(state) : showDragHandleAtSelectionOld(api)(state, dispatch, view);
+  };
 };

package/dist/esm/pm-plugins/decorations-anchor.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { getNestedDepth, getNodeAnchor, TYPE_NODE_DEC } from './decorations-common';
+import { getNestedDepth, getNodeAnchor, getNodeTypeWithLevel, TYPE_NODE_DEC } from './decorations-common';
 var IGNORE_NODES = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption', 'layoutColumn'];
 var IGNORE_NODES_NEXT = ['tableCell', 'tableHeader', 'tableRow', 'listItem', 'caption'];
 var IGNORE_NODE_DESCENDANTS = ['listItem', 'taskList', 'decisionList', 'mediaSingle'];
@@ -71,11 +71,10 @@ export var nodeDecorations = function nodeDecorations(newState, from, to) {
   var ignore_nodes = editorExperiment('advanced_layouts', true) ? IGNORE_NODES_NEXT : IGNORE_NODES;
   newState.doc.nodesBetween(docFrom, docTo, function (node, pos, parent, index) {
     var depth = 0;
-    var anchorName;
     var shouldDescend = shouldDescendIntoNode(node);
-    anchorName = getNodeAnchor(node);
+    var anchorName = getNodeAnchor(node);
+    var nodeTypeWithLevel = getNodeTypeWithLevel(node);
     if (editorExperiment('nested-dnd', true)) {
-      var _anchorName;
       // Doesn't descend into a node
       if (node.isInline) {
         return false;
@@ -84,19 +83,15 @@ export var nodeDecorations = function nodeDecorations(newState, from, to) {
       if (shouldIgnoreNode(node, ignore_nodes, depth, parent)) {
         return shouldDescend; //skip over, don't consider it a valid depth
       }
-      anchorName = (_anchorName = anchorName) !== null && _anchorName !== void 0 ? _anchorName : "--node-anchor-".concat(node.type.name, "-").concat(pos);
-    } else {
-      var _anchorName2;
-      anchorName = (_anchorName2 = anchorName) !== null && _anchorName2 !== void 0 ? _anchorName2 : "--node-anchor-".concat(node.type.name, "-").concat(index);
     }
     var anchorStyles = "anchor-name: ".concat(anchorName, ";");
-    var subType = node.attrs.level ? "-".concat(node.attrs.level) : '';
     decs.push(Decoration.node(pos, pos + node.nodeSize, _defineProperty(_defineProperty(_defineProperty({
       style: anchorStyles
-    }, 'data-drag-handler-anchor-name', anchorName), 'data-drag-handler-node-type', node.type.name + subType), 'data-drag-handler-anchor-depth', "".concat(depth)), {
+    }, 'data-drag-handler-anchor-name', anchorName), 'data-drag-handler-node-type', nodeTypeWithLevel), 'data-drag-handler-anchor-depth', "".concat(depth)), {
       type: TYPE_NODE_DEC,
       anchorName: anchorName,
-      nodeType: node.type.name
+      nodeType: node.type.name,
+      nodeTypeWithLevel: nodeTypeWithLevel
     }));
     return shouldDescend && depth < getNestedDepth();
   });

package/dist/esm/pm-plugins/decorations-common.js

@@ -1,9 +1,7 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import ReactDOM from 'react-dom';
 import uuid from 'uuid';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export var TYPE_DROP_TARGET_DEC = 'drop-target-decoration';
 export var TYPE_HANDLE_DEC = 'drag-handle';
@@ -15,6 +13,10 @@ export var getNodeAnchor = function getNodeAnchor(node) {
   var handleId = ObjHash.getForNode(node);
   return "--node-anchor-".concat(node.type.name, "-").concat(handleId);
 };
+export var getNodeTypeWithLevel = function getNodeTypeWithLevel(node) {
+  var subType = node.attrs.level ? "-".concat(node.attrs.level) : '';
+  return node.type.name + subType;
+};
 var ObjHash = /*#__PURE__*/function () {
   function ObjHash() {
     _classCallCheck(this, ObjHash);
@@ -37,13 +39,9 @@ export var unmountDecorations = function unmountDecorations(nodeViewPortalProvid
   // as it was more responsive and causes less re-rendering
   var decorationsToRemove = document.querySelectorAll("[".concat(selector, "=\"true\"]"));
   decorationsToRemove.forEach(function (el) {
-    if (fg('platform_editor_react18_plugin_portalprovider')) {
-      var nodeKey = el.getAttribute(key);
-      if (nodeKey) {
-        nodeViewPortalProviderAPI.remove(nodeKey);
-      }
-    } else {
-      ReactDOM.unmountComponentAtNode(el);
+    var nodeKey = el.getAttribute(key);
+    if (nodeKey) {
+      nodeViewPortalProviderAPI.remove(nodeKey);
     }
   });
 };