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

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 2.26.3
+
+### Patch Changes
+
+- [#112186](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/112186)
+  [`9462d8ca2405a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9462d8ca2405a) -
+  Bump adf-schema to 47.2.1
+
+## 2.26.2
+
+### Patch Changes
+
+- [#109976](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/109976)
+  [`2f1cbe0e2b32f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2f1cbe0e2b32f) -
+  [ED-26272] Update DnD related analytics, e.g. element moved, to reflect multi-select info
+  (distinctive types of nodes, whether multiple nodes are selected)
+- Updated dependencies
+
 ## 2.26.1
 
 ### Patch Changes

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

@@ -19,8 +19,8 @@ var _utils3 = require("@atlaskit/editor-tables/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _main = require("../pm-plugins/main");
+var _analytics2 = require("../pm-plugins/utils/analytics");
 var _consts = require("../pm-plugins/utils/consts");
-var _fireAnalytics = require("../pm-plugins/utils/fire-analytics");
 var _getNestedNodePosition = require("../pm-plugins/utils/getNestedNodePosition");
 var _getSelection = require("../pm-plugins/utils/getSelection");
 var _removeFromSource = require("../pm-plugins/utils/remove-from-source");
@@ -265,22 +265,21 @@ var moveNode = exports.moveNode = function moveNode(api) {
       }
       var sliceFrom = start;
       var sliceTo;
+      var mappedTo;
+      var sourceNodeTypes, hasSelectedMultipleNodes;
       var isMultiSelect = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true, {
         exposure: true
       });
       if (isMultiSelect) {
-        var _handleNode$nodeSize;
-        var _getMultiSelectionIfP = (0, _selection2.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 = (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$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,
@@ -288,7 +287,6 @@ var moveNode = exports.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 ((0, _experiments.editorExperiment)('nested-dnd', true)) {
         var nodeCopy = tr.doc.slice(sliceFrom, sliceTo, false); // cut the content
         var destType = $to.node().type;
@@ -344,7 +342,7 @@ var moveNode = exports.moveNode = function moveNode(api) {
         }
       }
       if ((0, _experiments.editorExperiment)('advanced_layouts', true)) {
-        (0, _fireAnalytics.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);
+        (0, _analytics2.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({
@@ -352,13 +350,16 @@ var moveNode = exports.moveNode = function moveNode(api) {
           action: _analytics.ACTION.MOVED,
           actionSubject: _analytics.ACTION_SUBJECT.ELEMENT,
           actionSubjectId: _analytics.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
           }, (0, _platformFeatureFlags.fg)('platform_editor_element_drag_and_drop_ed_23873') && {
             inputMethod: inputMethod
+          }), isMultiSelect && {
+            sourceNodeTypes: sourceNodeTypes,
+            hasSelectedMultipleNodes: hasSelectedMultipleNodes
           })
         })(tr);
       }

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

@@ -10,9 +10,9 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+var _analytics2 = require("../pm-plugins/utils/analytics");
 var _checkFragment = require("../pm-plugins/utils/check-fragment");
 var _consts = require("../pm-plugins/utils/consts");
-var _fireAnalytics = require("../pm-plugins/utils/fire-analytics");
 var _removeFromSource = require("../pm-plugins/utils/remove-from-source");
 var _selection = require("../pm-plugins/utils/selection");
 var _updateColumnWidths = require("../pm-plugins/utils/update-column-widths");
@@ -47,9 +47,14 @@ var createNewLayout = function createNewLayout(schema, layoutContents) {
 var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos, sourceContent, from, to, tr, $originalFrom, $originalTo, api, selectMovedNode) {
   var isSameLayout = (0, _validation.isInSameLayout)($originalFrom, $originalTo);
   var sourceContentEndPos = -1;
-  if ((0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true)) {
+  var isMultiSelect = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true);
+  var sourceNodeTypes, hasSelectedMultipleNodes;
+  if (isMultiSelect) {
     if (sourceContent instanceof _model.Fragment) {
       sourceContentEndPos = from + sourceContent.size;
+      var attributes = (0, _analytics2.getMultiSelectAnalyticsAttributes)(tr, from, sourceContentEndPos);
+      hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
+      sourceNodeTypes = attributes.nodeTypes;
     }
   } else {
     if (sourceContent instanceof _model.Node) {
@@ -68,7 +73,7 @@ var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos,
     if (!(0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1') || selectMovedNode) {
       tr.setSelection(new _state.NodeSelection(tr.doc.resolve(mappedTo))).scrollIntoView();
     }
-    (0, _fireAnalytics.attachMoveNodeAnalytics)(tr, _analytics.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);
+    (0, _analytics2.attachMoveNodeAnalytics)(tr, _analytics.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 < (0, _consts.maxLayoutColumnSupported)()) {
     var _$originalFrom$nodeAf2;
     if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_1')) {
@@ -79,7 +84,7 @@ var moveToExistingLayout = function moveToExistingLayout(toLayout, toLayoutPos,
       var mappedFrom = tr.mapping.map(from);
       (0, _removeFromSource.removeFromSource)(tr, tr.doc.resolve(mappedFrom), tr.mapping.map(sourceContentEndPos));
     }
-    (0, _fireAnalytics.attachMoveNodeAnalytics)(tr, _analytics.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);
+    (0, _analytics2.attachMoveNodeAnalytics)(tr, _analytics.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;
 };
@@ -197,7 +202,7 @@ var canMoveToLayout = function canMoveToLayout(api, from, to, tr, moveNodeAtCurs
     var _getMultiSelectionIfP = (0, _selection.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;
@@ -254,7 +259,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 _model.Fragment) {
       // Find the first breakout mode in the fragment
       var firstBreakoutMode;
@@ -314,6 +319,7 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
       if (!fromContentWithoutBreakout) {
         return tr;
       }
+      var isMultiSelect = (0, _experiments.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);
@@ -333,7 +339,7 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
           // resolve again the source node after node updated (remove breakout marks)
           toNodeWithoutBreakout = tr.doc.resolve(to).nodeAfter || toNode;
         }
-        if ((0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true)) {
+        if (isMultiSelect) {
           if ((0, _checkFragment.isFragmentOfType)(fromContentWithoutBreakout, 'layoutColumn') && fromContentWithoutBreakout.firstChild) {
             fromContentWithoutBreakout = fromContentWithoutBreakout.firstChild.content;
           }
@@ -345,6 +351,12 @@ var moveToLayout = exports.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 = (0, _analytics2.getMultiSelectAnalyticsAttributes)(tr, $sourceFrom.pos, sourceTo);
+            hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
+            sourceNodeTypes = attributes.nodeTypes;
+          }
           tr = (0, _removeFromSource.removeFromSource)(tr, $sourceFrom, sourceTo);
           var mappedTo = tr.mapping.map(to);
           tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout);
@@ -354,7 +366,7 @@ var moveToLayout = exports.moveToLayout = function moveToLayout(api) {
           breakoutMode && tr.setNodeMarkup(mappedTo, newLayout.type, newLayout.attrs, [breakout.create({
             mode: breakoutMode
           })]);
-          (0, _fireAnalytics.fireInsertLayoutAnalytics)(tr, api);
+          (0, _analytics2.fireInsertLayoutAnalytics)(tr, api, sourceNodeTypes, hasSelectedMultipleNodes);
         }
         return tr;
       }

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

@@ -4,11 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.showDragHandleAtSelection = void 0;
-var _utils = require("@atlaskit/editor-tables/utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _utils2 = require("@atlaskit/editor-tables/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+var _decorationsAnchor = require("../pm-plugins/decorations-anchor");
 var _main = require("../pm-plugins/main");
 var _getNestedNodePosition = require("../pm-plugins/utils/getNestedNodePosition");
-var showDragHandleAtSelection = exports.showDragHandleAtSelection = function showDragHandleAtSelection(api, shouldFocusParentNode) {
+var showDragHandleAtSelectionOld = function showDragHandleAtSelectionOld(api, shouldFocusParentNode) {
   return function (state, _, view) {
     var $from = state.selection.$from;
     var shouldFocusParentNode;
@@ -19,7 +22,7 @@ var showDragHandleAtSelection = exports.showDragHandleAtSelection = function sho
 
       // if the node is already focused, pressing the keymap second times should focus the parent node
       shouldFocusParentNode = activeNode && ((_activeNode$handleOpt = activeNode.handleOptions) === null || _activeNode$handleOpt === void 0 ? void 0 : _activeNode$handleOpt.isFocused);
-      var parentPos = (0, _utils.isInTable)(state) ? $from.before(1) : shouldFocusParentNode ? $from.before(1) : (0, _getNestedNodePosition.getNestedNodePosition)(state) + 1;
+      var parentPos = (0, _utils2.isInTable)(state) ? $from.before(1) : shouldFocusParentNode ? $from.before(1) : (0, _getNestedNodePosition.getNestedNodePosition)(state) + 1;
       var parentElement = view === null || view === void 0 || (_view$domAtPos = view.domAtPos(parentPos, 0)) === null || _view$domAtPos === void 0 ? void 0 : _view$domAtPos.node;
       if (parentElement) {
         // Ignored via go/ees005
@@ -68,4 +71,87 @@ var showDragHandleAtSelection = exports.showDragHandleAtSelection = function sho
     }
     return false;
   };
+};
+var findParentPosForHandle = function findParentPosForHandle(state) {
+  var _activeNode$handleOpt2;
+  var $from = state.selection.$from;
+  var _ref2 = _main.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 = (0, _utils.findParentNodeOfType)([state.schema.nodes.table])(state.selection);
+  if (parentTableNode) {
+    return parentTableNode.pos;
+  }
+
+  // else find closest parent node
+  return (0, _getNestedNodePosition.getNestedNodePosition)(state);
+};
+var findNextAnchorDecoration = function findNextAnchorDecoration(state) {
+  var decorations = (0, _main.getDecorations)(state);
+  if (!decorations) {
+    return undefined;
+  }
+  var nextHandleNodePos = findParentPosForHandle(state);
+  if (nextHandleNodePos === undefined) {
+    return undefined;
+  }
+  var nextHandleNode = state.doc.nodeAt(nextHandleNodePos);
+  var nodeDecorations = nextHandleNode && (0, _decorationsAnchor.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;
+  };
+};
+var showDragHandleAtSelection = exports.showDragHandleAtSelection = function showDragHandleAtSelection(api) {
+  return function (state, dispatch, view) {
+    return (0, _experiments.editorExperiment)('nested-dnd', true) && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_a11y') ? showDragHandleAtSelectionNew(api)(state) : showDragHandleAtSelectionOld(api)(state, dispatch, view);
+  };
 };

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

@@ -78,11 +78,10 @@ var nodeDecorations = exports.nodeDecorations = function nodeDecorations(newStat
   var ignore_nodes = (0, _experiments.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 = (0, _decorationsCommon.getNodeAnchor)(node);
+    var anchorName = (0, _decorationsCommon.getNodeAnchor)(node);
+    var nodeTypeWithLevel = (0, _decorationsCommon.getNodeTypeWithLevel)(node);
     if ((0, _experiments.editorExperiment)('nested-dnd', true)) {
-      var _anchorName;
       // Doesn't descend into a node
       if (node.isInline) {
         return false;
@@ -91,19 +90,15 @@ var nodeDecorations = exports.nodeDecorations = function nodeDecorations(newStat
       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(_view.Decoration.node(pos, pos + node.nodeSize, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
       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: _decorationsCommon.TYPE_NODE_DEC,
       anchorName: anchorName,
-      nodeType: node.type.name
+      nodeType: node.type.name,
+      nodeTypeWithLevel: nodeTypeWithLevel
     }));
     return shouldDescend && depth < (0, _decorationsCommon.getNestedDepth)();
   });

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.unmountDecorations = exports.getNodeAnchor = exports.getNestedDepth = exports.TYPE_NODE_DEC = exports.TYPE_HANDLE_DEC = exports.TYPE_DROP_TARGET_DEC = void 0;
+exports.unmountDecorations = exports.getNodeTypeWithLevel = exports.getNodeAnchor = exports.getNestedDepth = exports.TYPE_NODE_DEC = exports.TYPE_HANDLE_DEC = exports.TYPE_DROP_TARGET_DEC = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -20,6 +20,10 @@ var getNodeAnchor = exports.getNodeAnchor = function getNodeAnchor(node) {
   var handleId = ObjHash.getForNode(node);
   return "--node-anchor-".concat(node.type.name, "-").concat(handleId);
 };
+var getNodeTypeWithLevel = exports.getNodeTypeWithLevel = function getNodeTypeWithLevel(node) {
+  var subType = node.attrs.level ? "-".concat(node.attrs.level) : '';
+  return node.type.name + subType;
+};
 var ObjHash = /*#__PURE__*/function () {
   function ObjHash() {
     (0, _classCallCheck2.default)(this, ObjHash);

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

@@ -4,8 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.oldApply = exports.newApply = exports.key = exports.createPlugin = void 0;
+exports.oldApply = exports.newApply = exports.key = exports.getDecorations = exports.createPlugin = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));
 var _steps = require("@atlaskit/adf-schema/steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -26,8 +27,12 @@ var _decorationsDropTarget = require("./decorations-drop-target");
 var _handleMouseOver = require("./handle-mouse-over");
 var _keymap = require("./keymap");
 var _activeAnchorTracker = require("./utils/active-anchor-tracker");
+var _analytics2 = require("./utils/analytics");
 var _anchorUtils = require("./utils/anchor-utils");
+var _selection = require("./utils/selection");
 var _transactions = require("./utils/transactions");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var key = exports.key = new _state.PluginKey('blockControls');
 var EDITOR_BLOCKS_DRAG_INIT = 'Editor Blocks Drag Initialization Time';
 var isHTMLElement = function isHTMLElement(element) {
@@ -78,7 +83,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 ((0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true)) {
+        var isMultiSelect = (0, _experiments.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;
@@ -99,6 +105,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 = (0, _selection.getSelectedSlicePosition)(start, tr, api);
+            var attributes = (0, _analytics2.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({
@@ -106,10 +119,13 @@ var destroyFn = function destroyFn(api, editorView) {
             action: _analytics.ACTION.CANCELLED,
             actionSubject: _analytics.ACTION_SUBJECT.DRAG,
             actionSubjectId: _analytics.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, {
@@ -134,6 +150,10 @@ var initialState = {
   isPMDragging: false,
   multiSelectDnD: undefined
 };
+var getDecorations = exports.getDecorations = function getDecorations(state) {
+  var _key$getState;
+  return (_key$getState = key.getState(state)) === null || _key$getState === void 0 ? void 0 : _key$getState.decorations;
+};
 var newApply = exports.newApply = function newApply(api, formatMessage, tr, currentState, newState, flags, nodeViewPortalProviderAPI, anchorRectCache) {
   var _meta$activeNode, _activeNode, _activeNode2, _meta$activeNode$hand, _meta$isDragging, _meta$isDragging2, _meta$editorHeight, _meta$editorWidthLeft, _meta$editorWidthRigh, _meta$isPMDragging, _meta$multiSelectDnD;
   var activeNode = currentState.activeNode,
@@ -469,12 +489,12 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
     },
     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) {
@@ -547,10 +567,10 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
           }));
         },
         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/cjs/pm-plugins/utils/analytics.js

@@ -0,0 +1,66 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getMultiSelectAnalyticsAttributes = exports.fireInsertLayoutAnalytics = exports.attachMoveNodeAnalytics = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var attachMoveNodeAnalytics = exports.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: _analytics.EVENT_TYPE.TRACK,
+    action: _analytics.ACTION.MOVED,
+    actionSubject: _analytics.ACTION_SUBJECT.ELEMENT,
+    actionSubjectId: _analytics.ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
+    attributes: {
+      nodeDepth: fromDepth,
+      nodeType: fromNodeType,
+      nodeTypes: fromNodeTypes,
+      hasSelectedMultipleNodes: hasSelectedMultipleNodes,
+      destinationNodeDepth: toDepth,
+      destinationNodeType: toNodeType,
+      isSameParent: isSameParent,
+      inputMethod: inputMethod
+    }
+  })(tr);
+};
+var fireInsertLayoutAnalytics = exports.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: _analytics.ACTION.INSERTED,
+    actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
+    actionSubjectId: _analytics.ACTION_SUBJECT_ID.LAYOUT,
+    attributes: {
+      inputMethod: _analytics.INPUT_METHOD.DRAG_AND_DROP,
+      nodeTypes: nodeTypes,
+      hasSelectedMultipleNodes: hasSelectedMultipleNodes
+    },
+    eventType: _analytics.EVENT_TYPE.TRACK
+  })(tr);
+};
+
+/**
+ * Given a range, return distinctive types of node and whether there are multiple nodes in the range
+ */
+var getMultiSelectAnalyticsAttributes = exports.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: (0, _platformFeatureFlags.fg)('platform_editor_track_node_types') ? (0, _toConsumableArray2.default)(new Set(nodeTypes)).sort().join(',') : undefined,
+    hasSelectedMultipleNodes: nodeTypes.length > 1
+  };
+};

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

@@ -3,10 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getMultiSelectionIfPosInside = void 0;
+exports.getSelectedSlicePosition = exports.getMultiSelectionIfPosInside = void 0;
 var getMultiSelectionIfPosInside = exports.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);
@@ -19,4 +19,24 @@ var getMultiSelectionIfPosInside = exports.getMultiSelectionIfPosInside = functi
     } : {};
   }
   return {};
+};
+
+/**
+ *
+ * @returns from and to positions of the selected content (after expansion)
+ */
+var getSelectedSlicePosition = exports.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
+  };
 };