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

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

@@ -14,12 +14,12 @@ 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';
 
@@ -259,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,
@@ -282,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;
@@ -338,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({
@@ -346,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;
 };
@@ -191,7 +196,7 @@ var canMoveToLayout = function canMoveToLayout(api, from, to, tr, moveNodeAtCurs
     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;
@@ -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

@@ -13,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);

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

@@ -1,4 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import rafSchedule from 'raf-schd';
 import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
@@ -19,7 +22,9 @@ import { dropTargetDecorations, findDropTargetDecs } from './decorations-drop-ta
 import { handleMouseOver } from './handle-mouse-over';
 import { boundKeydownHandler } from './keymap';
 import { defaultActiveAnchorTracker } from './utils/active-anchor-tracker';
+import { getMultiSelectAnalyticsAttributes } from './utils/analytics';
 import { AnchorRectCache, isAnchorSupported } from './utils/anchor-utils';
+import { getSelectedSlicePosition } from './utils/selection';
 import { getTrMetadata } from './utils/transactions';
 export var key = new PluginKey('blockControls');
 var EDITOR_BLOCKS_DRAG_INIT = 'Editor Blocks Drag Initialization Time';
@@ -71,7 +76,8 @@ var destroyFn = function destroyFn(api, editorView) {
       }
       api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref3) {
         var tr = _ref3.tr;
-        if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
+        var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
+        if (isMultiSelect) {
           var _api$blockControls, _api$selection;
           var _ref4 = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
             multiSelectDnD = _ref4.multiSelectDnD;
@@ -92,6 +98,13 @@ var destroyFn = function destroyFn(api, editorView) {
         // if no drop targets are rendered, assume that drop is invalid
         if (location.current.dropTargets.length === 0) {
           var _api$analytics2;
+          var nodeTypes, hasSelectedMultipleNodes;
+          if (isMultiSelect && api) {
+            var position = getSelectedSlicePosition(start, tr, api);
+            var attributes = getMultiSelectAnalyticsAttributes(tr, position.from, position.to);
+            nodeTypes = attributes.nodeTypes;
+            hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
+          }
           var resolvedMovingNode = tr.doc.resolve(start);
           var maybeNode = resolvedMovingNode.nodeAfter;
           api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
@@ -99,10 +112,13 @@ var destroyFn = function destroyFn(api, editorView) {
             action: ACTION.CANCELLED,
             actionSubject: ACTION_SUBJECT.DRAG,
             actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-            attributes: {
+            attributes: _objectSpread({
               nodeDepth: resolvedMovingNode.depth,
               nodeType: (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name) || ''
-            }
+            }, isMultiSelect && {
+              nodeTypes: nodeTypes,
+              hasSelectedMultipleNodes: hasSelectedMultipleNodes
+            })
           })(tr);
         }
         return tr.setMeta(key, {
@@ -127,6 +143,10 @@ var initialState = {
   isPMDragging: false,
   multiSelectDnD: undefined
 };
+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$activeNode, _activeNode, _activeNode2, _meta$activeNode$hand, _meta$isDragging, _meta$isDragging2, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging, _meta$multiSelectDnD;
   var activeNode = currentState.activeNode,
@@ -462,12 +482,12 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
     },
     props: {
       decorations: function decorations(state) {
-        var _api$editorDisabled, _key$getState;
+        var _api$editorDisabled, _key$getState2;
         var isDisabled = api === null || api === void 0 || (_api$editorDisabled = api.editorDisabled) === null || _api$editorDisabled === void 0 || (_api$editorDisabled = _api$editorDisabled.sharedState.currentState()) === null || _api$editorDisabled === void 0 ? void 0 : _api$editorDisabled.editorDisabled;
         if (isDisabled) {
           return;
         }
-        return (_key$getState = key.getState(state)) === null || _key$getState === void 0 ? void 0 : _key$getState.decorations;
+        return (_key$getState2 = key.getState(state)) === null || _key$getState2 === void 0 ? void 0 : _key$getState2.decorations;
       },
       handleDOMEvents: {
         drop: function drop(view, event) {
@@ -540,10 +560,10 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
           }));
         },
         dragend: function dragend(view) {
-          var _key$getState2;
+          var _key$getState3;
           var state = view.state,
             dispatch = view.dispatch;
-          if ((_key$getState2 = key.getState(state)) !== null && _key$getState2 !== void 0 && _key$getState2.isPMDragging) {
+          if ((_key$getState3 = key.getState(state)) !== null && _key$getState3 !== void 0 && _key$getState3.isPMDragging) {
             dispatch(state.tr.setMeta(key, {
               isPMDragging: false
             }));

package/dist/esm/pm-plugins/utils/{fire-analytics.js → analytics.js}

@@ -1,5 +1,7 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-export var attachMoveNodeAnalytics = function attachMoveNodeAnalytics(tr, inputMethod, fromDepth, fromNodeType, toDepth, toNodeType, isSameParent, api) {
+import { fg } from '@atlaskit/platform-feature-flags';
+export var attachMoveNodeAnalytics = function attachMoveNodeAnalytics(tr, inputMethod, fromDepth, fromNodeType, toDepth, toNodeType, isSameParent, api, fromNodeTypes, hasSelectedMultipleNodes) {
   var _api$analytics;
   return api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 ? void 0 : _api$analytics.attachAnalyticsEvent({
     eventType: EVENT_TYPE.TRACK,
@@ -9,6 +11,8 @@ export var attachMoveNodeAnalytics = function attachMoveNodeAnalytics(tr, inputM
     attributes: {
       nodeDepth: fromDepth,
       nodeType: fromNodeType,
+      nodeTypes: fromNodeTypes,
+      hasSelectedMultipleNodes: hasSelectedMultipleNodes,
       destinationNodeDepth: toDepth,
       destinationNodeType: toNodeType,
       isSameParent: isSameParent,
@@ -16,15 +20,40 @@ export var attachMoveNodeAnalytics = function attachMoveNodeAnalytics(tr, inputM
     }
   })(tr);
 };
-export var fireInsertLayoutAnalytics = function fireInsertLayoutAnalytics(tr, api) {
+export var fireInsertLayoutAnalytics = function fireInsertLayoutAnalytics(tr, api, nodeTypes, hasSelectedMultipleNodes) {
   var _api$analytics2;
   api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || (_api$analytics2 = _api$analytics2.actions) === null || _api$analytics2 === void 0 || _api$analytics2.attachAnalyticsEvent({
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
     actionSubjectId: ACTION_SUBJECT_ID.LAYOUT,
     attributes: {
-      inputMethod: INPUT_METHOD.DRAG_AND_DROP
+      inputMethod: INPUT_METHOD.DRAG_AND_DROP,
+      nodeTypes: nodeTypes,
+      hasSelectedMultipleNodes: hasSelectedMultipleNodes
     },
     eventType: EVENT_TYPE.TRACK
   })(tr);
+};
+
+/**
+ * Given a range, return distinctive types of node and whether there are multiple nodes in the range
+ */
+export var getMultiSelectAnalyticsAttributes = function getMultiSelectAnalyticsAttributes(tr, anchor, head) {
+  var nodeTypes = [];
+  var from = Math.min(anchor, head);
+  var to = Math.max(anchor, head);
+  tr.doc.nodesBetween(from, to, function (node, pos) {
+    if (pos < from) {
+      // ignore parent node
+      return true;
+    }
+    nodeTypes.push(node.type.name);
+
+    // only care about the top level (relatively in the range) nodes
+    return false;
+  });
+  return {
+    nodeTypes: fg('platform_editor_track_node_types') ? _toConsumableArray(new Set(nodeTypes)).sort().join(',') : undefined,
+    hasSelectedMultipleNodes: nodeTypes.length > 1
+  };
 };

package/dist/esm/pm-plugins/utils/selection.js

@@ -1,6 +1,6 @@
 export var getMultiSelectionIfPosInside = function getMultiSelectionIfPosInside(api, pos) {
   var _api$blockControls;
-  var _ref = (api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
+  var _ref = ((_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
     multiSelectDnD = _ref.multiSelectDnD;
   if (multiSelectDnD && multiSelectDnD.anchor >= 0 && multiSelectDnD.head >= 0) {
     var multiFrom = Math.min(multiSelectDnD.anchor, multiSelectDnD.head);
@@ -13,4 +13,24 @@ export var getMultiSelectionIfPosInside = function getMultiSelectionIfPosInside(
     } : {};
   }
   return {};
+};
+
+/**
+ *
+ * @returns from and to positions of the selected content (after expansion)
+ */
+export var getSelectedSlicePosition = function getSelectedSlicePosition(handlePos, tr, api) {
+  var _activeNode$nodeSize;
+  var _getMultiSelectionIfP = getMultiSelectionIfPosInside(api, handlePos),
+    anchor = _getMultiSelectionIfP.anchor,
+    head = _getMultiSelectionIfP.head;
+  var inSelection = anchor !== undefined && head !== undefined;
+  var from = inSelection ? Math.min(anchor, head) : handlePos;
+  var activeNode = tr.doc.nodeAt(handlePos);
+  var activeNodeEndPos = handlePos + ((_activeNode$nodeSize = activeNode === null || activeNode === void 0 ? void 0 : activeNode.nodeSize) !== null && _activeNode$nodeSize !== void 0 ? _activeNode$nodeSize : 1);
+  var to = inSelection ? Math.max(anchor, head) : activeNodeEndPos;
+  return {
+    from: from,
+    to: to
+  };
 };

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

@@ -1,5 +1,8 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -23,6 +26,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';
@@ -254,7 +258,11 @@ export var DragHandle = function DragHandle(_ref) {
           var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true, {
             exposure: true
           });
+          var nodeTypes, hasSelectedMultipleNodes;
+          var resolvedMovingNode = tr.doc.resolve(start);
+          var maybeNode = resolvedMovingNode.nodeAfter;
           if (isMultiSelect) {
+            var _tr$getMeta;
             var handlePos = getPos();
             if (typeof handlePos !== 'number') {
               return tr;
@@ -265,22 +273,32 @@ export var DragHandle = function DragHandle(_ref) {
                 tr: tr
               });
             }
+            var multiSelectDnD = (_tr$getMeta = tr.getMeta(key)) === null || _tr$getMeta === void 0 ? void 0 : _tr$getMeta.multiSelectDnD;
+            if (multiSelectDnD) {
+              var 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 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.setNodeDragged(getPos, anchorName, nodeType)({
             tr: tr
           });
-          var resolvedMovingNode = tr.doc.resolve(start);
-          var maybeNode = resolvedMovingNode.nodeAfter;
           tr.setMeta('scrollIntoView', false);
           api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || _api$analytics3.actions.attachAnalyticsEvent({
             eventType: EVENT_TYPE.UI,
             action: ACTION.DRAGGED,
             actionSubject: ACTION_SUBJECT.ELEMENT,
             actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-            attributes: {
+            attributes: _objectSpread({
               nodeDepth: resolvedMovingNode.depth,
               nodeType: (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name) || ''
-            }
+            }, isMultiSelect && {
+              nodeTypes: nodeTypes,
+              hasSelectedMultipleNodes: hasSelectedMultipleNodes
+            })
           })(tr);
           return tr;
         });

package/dist/types/editor-commands/show-drag-handle.d.ts

@@ -1,3 +1,3 @@
 import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { BlockControlsPlugin } from '../blockControlsPluginType';
-export declare const showDragHandleAtSelection: (api?: ExtractInjectionAPI<BlockControlsPlugin>, shouldFocusParentNode?: boolean) => Command;
+export declare const showDragHandleAtSelection: (api?: ExtractInjectionAPI<BlockControlsPlugin>) => Command;

package/dist/types/pm-plugins/decorations-common.d.ts

@@ -5,4 +5,5 @@ export declare const TYPE_HANDLE_DEC = "drag-handle";
 export declare const TYPE_NODE_DEC = "node-decoration";
 export declare const getNestedDepth: () => 0 | 100;
 export declare const getNodeAnchor: (node: PMNode) => string;
+export declare const getNodeTypeWithLevel: (node: PMNode) => string;
 export declare const unmountDecorations: (nodeViewPortalProviderAPI: PortalProviderAPI, selector: string, key: string) => void;

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

@@ -12,6 +12,7 @@ export interface FlagType {
     isNestedEnabled: boolean;
     isMultiSelectEnabled: boolean;
 }
+export declare const getDecorations: (state: EditorState) => DecorationSet | undefined;
 export declare const newApply: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined, formatMessage: IntlShape['formatMessage'], tr: ReadonlyTransaction, currentState: PluginState, newState: EditorState, flags: FlagType, nodeViewPortalProviderAPI: PortalProviderAPI, anchorRectCache?: AnchorRectCache) => {
     decorations: DecorationSet;
     activeNode: any;

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

@@ -0,0 +1,12 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import { type Transaction } from '@atlaskit/editor-prosemirror/state';
+import { type BlockControlsPlugin } from '../../blockControlsPluginType';
+export declare const attachMoveNodeAnalytics: (tr: Transaction, inputMethod: string, fromDepth: number, fromNodeType: string, toDepth?: number, toNodeType?: string, isSameParent?: boolean, api?: ExtractInjectionAPI<BlockControlsPlugin>, fromNodeTypes?: string, hasSelectedMultipleNodes?: boolean) => boolean | undefined;
+export declare const fireInsertLayoutAnalytics: (tr: Transaction, api?: ExtractInjectionAPI<BlockControlsPlugin>, nodeTypes?: string, hasSelectedMultipleNodes?: boolean) => void;
+/**
+ * Given a range, return distinctive types of node and whether there are multiple nodes in the range
+ */
+export declare const getMultiSelectAnalyticsAttributes: (tr: Transaction, anchor: number, head: number) => {
+    nodeTypes: string | undefined;
+    hasSelectedMultipleNodes: boolean;
+};