@atlaskit/editor-plugin-block-controls 11.2.9 → 11.2.11

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

@@ -41,26 +41,13 @@ const createNewLayout = (schema, layoutContents) => {
 };
 const moveToExistingLayout = (toLayout, toLayoutPos, sourceContent, from, to, tr, $originalFrom, $originalTo, api, selectMovedNode) => {
   const isSameLayout = isInSameLayout($originalFrom, $originalTo);
-  let sourceContentEndPos = -1;
-  const isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
-  let sourceNodeTypes, hasSelectedMultipleNodes;
-  if (isMultiSelect) {
-    if (sourceContent instanceof Fragment) {
-      sourceContentEndPos = from + sourceContent.size;
-      const attributes = getMultiSelectAnalyticsAttributes(tr, from, sourceContentEndPos);
-      hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
-      sourceNodeTypes = attributes.nodeTypes;
-    }
-  } else {
-    if (sourceContent instanceof PMNode) {
-      sourceContentEndPos = from + sourceContent.nodeSize;
-    }
-  }
-  if (sourceContentEndPos === -1) {
-    return tr;
-  }
+  const sourceContentEndPos = from + sourceContent.size;
+  const attributes = getMultiSelectAnalyticsAttributes(tr, from, sourceContentEndPos);
+  const {
+    nodeTypes: sourceNodeTypes,
+    hasSelectedMultipleNodes
+  } = attributes;
   if (isSameLayout) {
-    var _$originalFrom$nodeAf;
     // reorder columns
     tr.delete(from, sourceContentEndPos);
     const mappedTo = tr.mapping.map(to);
@@ -68,12 +55,11 @@ const moveToExistingLayout = (toLayout, toLayoutPos, sourceContent, from, to, tr
     if (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, sourceNodeTypes, hasSelectedMultipleNodes);
+    attachMoveNodeAnalytics(tr, INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, sourceNodeTypes, 1, 'layoutSection', true, api, hasSelectedMultipleNodes);
   } else if (toLayout.childCount < maxLayoutColumnSupported()) {
-    var _$originalFrom$nodeAf2;
     removeFromSource(tr, tr.doc.resolve(from), sourceContentEndPos);
     insertToDestinationNoWidthUpdate(tr, tr.mapping.map(to), sourceContent);
-    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);
+    attachMoveNodeAnalytics(tr, INPUT_METHOD.DRAG_AND_DROP, $originalFrom.depth, sourceNodeTypes, 1, 'layoutSection', false, api, hasSelectedMultipleNodes);
   }
   return tr;
 };
@@ -92,22 +78,11 @@ const insertToDestinationNoWidthUpdate = (tr, to, sourceContent) => {
   } = tr.doc.type.schema.nodes || {};
   let content = null;
   try {
-    if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
-      if (sourceContent instanceof Fragment) {
-        var _sourceFragment$first;
-        const sourceFragment = sourceContent;
-        content = layoutColumn.createChecked({
-          width: 0
-        }, isFragmentOfType(sourceFragment, 'layoutColumn') ? (_sourceFragment$first = sourceFragment.firstChild) === null || _sourceFragment$first === void 0 ? void 0 : _sourceFragment$first.content : sourceFragment);
-      }
-    } else {
-      if (sourceContent instanceof PMNode) {
-        const sourceNode = sourceContent;
-        content = layoutColumn.createChecked({
-          width: 0
-        }, sourceNode.type.name === 'layoutColumn' ? sourceNode.content : sourceNode);
-      }
-    }
+    var _sourceFragment$first;
+    const sourceFragment = sourceContent;
+    content = layoutColumn.createChecked({
+      width: 0
+    }, isFragmentOfType(sourceFragment, 'layoutColumn') ? (_sourceFragment$first = sourceFragment.firstChild) === null || _sourceFragment$first === void 0 ? void 0 : _sourceFragment$first.content : sourceFragment);
   } catch (error) {
     logException(error, {
       location: 'editor-plugin-block-controls/move-to-layout'
@@ -151,7 +126,6 @@ const canMoveToLayout = (api, from, to, tr, moveNodeAtCursorPos) => {
     return;
   }
   const $from = tr.doc.resolve(from);
-  const isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
 
   // invalid from position or dragging a layout
   if (!$from.nodeAfter || $from.nodeAfter.type === layoutSection) {
@@ -160,7 +134,7 @@ const canMoveToLayout = (api, from, to, tr, moveNodeAtCursorPos) => {
   let sourceContent = $from.nodeAfter;
   let sourceFrom = from;
   let sourceTo = from + sourceContent.nodeSize;
-  if (isMultiSelect && !moveNodeAtCursorPos) {
+  if (!moveNodeAtCursorPos) {
     const {
       anchor,
       head
@@ -188,62 +162,46 @@ const canMoveToLayout = (api, from, to, tr, moveNodeAtCursorPos) => {
   };
 };
 const removeBreakoutMarks = (tr, $from, to) => {
-  let fromContentWithoutBreakout = $from.nodeAfter;
+  let fromContentWithoutBreakout = null;
   const {
     breakout
   } = tr.doc.type.schema.marks || {};
-  if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
-    tr.doc.nodesBetween($from.pos, to, (node, pos, parent) => {
-      // should never remove breakout from previous layoutSection
-      if (expValEquals('platform_editor_breakout_resizing', 'isEnabled', true)) {
-        if (node.type.name === 'layoutSection') {
-          return false;
-        }
-      }
-
-      // breakout doesn't exist on nested nodes
-      if ((parent === null || parent === void 0 ? void 0 : parent.type.name) === 'doc' && node.marks.some(m => m.type === breakout)) {
-        tr.removeNodeMark(pos, breakout);
+  tr.doc.nodesBetween($from.pos, to, (node, pos, parent) => {
+    // should never remove breakout from previous layoutSection
+    if (expValEquals('platform_editor_breakout_resizing', 'isEnabled', true)) {
+      if (node.type.name === 'layoutSection') {
+        return false;
       }
+    }
 
-      // descending is not needed as  breakout doesn't exist on nested nodes
-      return false;
-    });
-    // resolve again the source content after node updated (remove breakout marks)
-    fromContentWithoutBreakout = tr.doc.slice($from.pos, to).content;
-  } else {
-    if (breakout && $from.nodeAfter && $from.nodeAfter.marks.some(m => m.type === breakout)) {
-      tr.removeNodeMark($from.pos, breakout);
-      // resolve again the source node after node updated (remove breakout marks)
-      fromContentWithoutBreakout = tr.doc.resolve($from.pos).nodeAfter;
+    // breakout doesn't exist on nested nodes
+    if ((parent === null || parent === void 0 ? void 0 : parent.type.name) === 'doc' && node.marks.some(m => m.type === breakout)) {
+      tr.removeNodeMark(pos, breakout);
     }
-  }
+
+    // descending is not needed as  breakout doesn't exist on nested nodes
+    return false;
+  });
+  // resolve again the source content after node updated (remove breakout marks)
+  fromContentWithoutBreakout = tr.doc.slice($from.pos, to).content;
   return fromContentWithoutBreakout;
 };
 const getBreakoutMode = (content, breakout) => {
-  if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
-    if (content instanceof PMNode) {
-      var _content$marks$find;
-      return (_content$marks$find = content.marks.find(m => m.type === breakout)) === 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
-      let firstBreakoutMode;
-      for (let i = 0; i < content.childCount; i++) {
-        const child = content.child(i);
-        const breakoutMark = child.marks.find(m => m.type === breakout);
-        if (breakoutMark) {
-          firstBreakoutMode = breakoutMark.attrs.mode;
-          break;
-        }
+  if (content instanceof PMNode) {
+    var _content$marks$find;
+    return (_content$marks$find = content.marks.find(m => m.type === breakout)) === 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
+    let firstBreakoutMode;
+    for (let i = 0; i < content.childCount; i++) {
+      const child = content.child(i);
+      const breakoutMark = child.marks.find(m => m.type === breakout);
+      if (breakoutMark) {
+        firstBreakoutMode = breakoutMark.attrs.mode;
+        break;
       }
-      return firstBreakoutMode;
-    }
-  } else {
-    // Without multi-select support, we can assume source content is of type PMNode
-    if (content instanceof PMNode) {
-      var _content$marks$find2;
-      return (_content$marks$find2 = content.marks.find(m => m.type === breakout)) === null || _content$marks$find2 === void 0 ? void 0 : _content$marks$find2.attrs.mode;
     }
+    return firstBreakoutMode;
   }
 };
 const getBreakoutModeAndWidth = (content, breakout) => {
@@ -252,30 +210,20 @@ const getBreakoutModeAndWidth = (content, breakout) => {
     breakoutMode: mark.attrs.mode,
     breakoutWidth: mark.attrs.width
   } : null;
-  if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
-    if (content instanceof PMNode) {
-      return extractBreakoutAttributes(findBreakoutMark(content));
-    } else if (content instanceof Fragment) {
-      // Find the first breakout mode in the fragment
-      for (let i = 0; i < content.childCount; i++) {
-        const child = content.child(i);
-        const breakoutMark = findBreakoutMark(child);
-        if (breakoutMark) {
-          return extractBreakoutAttributes(breakoutMark);
-        }
+  if (content instanceof PMNode) {
+    return extractBreakoutAttributes(findBreakoutMark(content));
+  } else if (content instanceof Fragment) {
+    // Find the first breakout mode in the fragment
+    for (let i = 0; i < content.childCount; i++) {
+      const child = content.child(i);
+      const breakoutMark = findBreakoutMark(child);
+      if (breakoutMark) {
+        return extractBreakoutAttributes(breakoutMark);
       }
     }
-  } else {
-    // Without multi-select support, we can assume source content is of type PMNode
-    if (content instanceof PMNode) {
-      return extractBreakoutAttributes(findBreakoutMark(content));
-    }
   }
   return null;
 };
-
-// TODO: ED-26959 - As part of platform_editor_element_drag_and_drop_multiselect clean up,
-// source content variable that has type of `PMNode | Fragment` should be updated to `Fragment` only
 export const moveToLayout = api => (from, to, options) => ({
   tr
 }) => {
@@ -315,8 +263,8 @@ export const moveToLayout = api => (from, to, options) => ({
   }
 
   // we don't want to remove marks when moving/re-ordering layoutSection
-  const shouldRemoveMarks = !($sourceFrom.node().type === layoutSection && editorExperiment('platform_editor_element_drag_and_drop_multiselect', true));
-  const fromContentBeforeBreakoutMarksRemoved = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true) ? tr.doc.slice($sourceFrom.pos, sourceTo).content : $sourceFrom.nodeAfter;
+  const shouldRemoveMarks = $sourceFrom.node().type !== layoutSection;
+  const fromContentBeforeBreakoutMarksRemoved = tr.doc.slice($sourceFrom.pos, sourceTo).content;
 
   // remove breakout from source content
   let fromContentWithoutBreakout = shouldRemoveMarks ? removeBreakoutMarks(tr, $sourceFrom, sourceTo) : fromContentBeforeBreakoutMarksRemoved;
@@ -329,7 +277,6 @@ export const moveToLayout = api => (from, to, options) => ({
       tr
     });
   }
-  const isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
   if (toNode.type === layoutSection) {
     const 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);
@@ -347,24 +294,17 @@ export const moveToLayout = api => (from, to, options) => ({
       // resolve again the source node after node updated (remove breakout marks)
       toNodeWithoutBreakout = tr.doc.resolve(to).nodeAfter || toNode;
     }
-    if (isMultiSelect) {
-      if (isFragmentOfType(fromContentWithoutBreakout, 'layoutColumn') && fromContentWithoutBreakout.firstChild) {
-        fromContentWithoutBreakout = fromContentWithoutBreakout.firstChild.content;
-      }
-    } else {
-      if (fromContentWithoutBreakout instanceof PMNode && fromContentWithoutBreakout.type.name === 'layoutColumn') {
-        fromContentWithoutBreakout = fromContentWithoutBreakout.content;
-      }
+    if (isFragmentOfType(fromContentWithoutBreakout, 'layoutColumn') && fromContentWithoutBreakout.firstChild) {
+      fromContentWithoutBreakout = fromContentWithoutBreakout.firstChild.content;
     }
     const layoutContents = options !== null && options !== void 0 && options.moveToEnd ? [toNodeWithoutBreakout, fromContentWithoutBreakout] : [fromContentWithoutBreakout, toNodeWithoutBreakout];
     const newLayout = createNewLayout(tr.doc.type.schema, layoutContents);
     if (newLayout) {
-      let sourceNodeTypes, hasSelectedMultipleNodes;
-      if (isMultiSelect) {
-        const attributes = getMultiSelectAnalyticsAttributes(tr, $sourceFrom.pos, sourceTo);
-        hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
-        sourceNodeTypes = attributes.nodeTypes;
-      }
+      const attributes = getMultiSelectAnalyticsAttributes(tr, $sourceFrom.pos, sourceTo);
+      const {
+        nodeTypes: sourceNodeTypes,
+        hasSelectedMultipleNodes
+      } = attributes;
       tr = removeFromSource(tr, $sourceFrom, sourceTo);
       const mappedTo = tr.mapping.map(to);
       tr.delete(mappedTo, mappedTo + toNodeWithoutBreakout.nodeSize).insert(mappedTo, newLayout);

package/dist/es2019/pm-plugins/decorations-drop-target-active.js

@@ -40,24 +40,19 @@ export const canMoveNodeOrSliceToPos = (state, node, parent, index, $toPos, acti
   const $activeNodePos = typeof activeNodePos === 'number' && state.doc.resolve(activeNodePos);
   const activePMNode = $activeNodePos && $activeNodePos.nodeAfter;
   const handleInsideSelection = activeNodePos !== undefined && activeNodePos >= selectionFrom && activeNodePos <= selectionTo;
-  if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
-    const selectionSlice = state.doc.slice(selectionFrom, selectionTo, false);
-    const selectionSliceChildCount = selectionSlice.content.childCount;
-    let canDropSingleNode = true;
-    let canDropMultipleNodes = true;
+  const selectionSlice = state.doc.slice(selectionFrom, selectionTo, false);
+  const selectionSliceChildCount = selectionSlice.content.childCount;
+  let canDropSingleNode = true;
+  let canDropMultipleNodes = true;
 
-    // when there is only one node in the slice, use the same logic as when multi select is not on
-    if (selectionSliceChildCount > 1 && handleInsideSelection) {
-      canDropMultipleNodes = canMoveSliceToIndex(selectionSlice, selectionFrom, selectionTo, parent, index, $toPos);
-    } else {
-      canDropSingleNode = !!(activePMNode && canMoveNodeToIndex(parent, index, activePMNode, $toPos, node));
-    }
-    if (!canDropMultipleNodes || !canDropSingleNode) {
-      return false;
-    }
+  // when there is only one node in the slice, use the same logic as when multi select is not on
+  if (selectionSliceChildCount > 1 && handleInsideSelection) {
+    canDropMultipleNodes = canMoveSliceToIndex(selectionSlice, selectionFrom, selectionTo, parent, index, $toPos);
   } else {
-    const canDrop = activePMNode && canMoveNodeToIndex(parent, index, activePMNode, $toPos, node);
-    return canDrop;
+    canDropSingleNode = !!(activePMNode && canMoveNodeToIndex(parent, index, activePMNode, $toPos, node));
+  }
+  if (!canDropMultipleNodes || !canDropSingleNode) {
+    return false;
   }
   return true;
 };

package/dist/es2019/pm-plugins/decorations-drop-target.js

@@ -161,7 +161,6 @@ export const dropTargetDecorations = (newState, api, formatMessage, nodeViewPort
   const activeNodePos = activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos;
   const $activeNodePos = typeof activeNodePos === 'number' && newState.doc.resolve(activeNodePos);
   const activePMNode = $activeNodePos && $activeNodePos.nodeAfter;
-  const isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
   anchorRectCache === null || anchorRectCache === void 0 ? void 0 : anchorRectCache.clear();
   const prevNodeStack = [];
   const popNodeStack = depth => {
@@ -218,31 +217,21 @@ export const dropTargetDecorations = (newState, api, formatMessage, nodeViewPort
       return shouldDescend(node); //skip over, don't consider it a valid depth
     }
 
-    // When multi select is on, validate all the nodes in the selection instead of just the handle node
-    if (isMultiSelect) {
-      const selectionSlice = newState.doc.slice(selectionFrom, selectionTo, false);
-      const selectionSliceChildCount = selectionSlice.content.childCount;
-      let canDropSingleNode = true;
-      let canDropMultipleNodes = true;
+    // validate all the nodes in the selection instead of just the handle node
+    const selectionSlice = newState.doc.slice(selectionFrom, selectionTo, false);
+    const selectionSliceChildCount = selectionSlice.content.childCount;
+    let canDropSingleNode = true;
+    let canDropMultipleNodes = true;
 
-      // when there is only one node in the slice, use the same logic as when multi select is not on
-      if (selectionSliceChildCount > 1 && handleInsideSelection) {
-        canDropMultipleNodes = canMoveSliceToIndex(selectionSlice, selectionFrom, selectionTo, parent, index, $pos);
-      } else {
-        canDropSingleNode = !!(activePMNode && canMoveNodeToIndex(parent, index, activePMNode, $pos, node));
-      }
-      if (!canDropMultipleNodes || !canDropSingleNode) {
-        pushNodeStack(node, depth);
-        return false; //not valid pos, so nested not valid either
-      }
+    // when there is only one node in the slice, use the same logic as when multi select is not on
+    if (selectionSliceChildCount > 1 && handleInsideSelection) {
+      canDropMultipleNodes = canMoveSliceToIndex(selectionSlice, selectionFrom, selectionTo, parent, index, $pos);
     } else {
-      const canDrop = activePMNode && canMoveNodeToIndex(parent, index, activePMNode, $pos, node);
-
-      //NOTE: This will block drop targets showing for nodes that are valid after transformation (i.e. expand -> nestedExpand)
-      if (!canDrop) {
-        pushNodeStack(node, depth);
-        return false; //not valid pos, so nested not valid either
-      }
+      canDropSingleNode = !!(activePMNode && canMoveNodeToIndex(parent, index, activePMNode, $pos, node));
+    }
+    if (!canDropMultipleNodes || !canDropSingleNode) {
+      pushNodeStack(node, depth);
+      return false; //not valid pos, so nested not valid either
     }
     const parentTypesWithEndDropTarget = editorExperiment('platform_synced_block', true) ? PARENT_WITH_END_DROP_TARGET_NEXT : PARENT_WITH_END_DROP_TARGET;
     if (parent.lastChild === node && !isEmptyParagraph(node) && parentTypesWithEndDropTarget.includes(parent.type.name)) {

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

@@ -105,32 +105,28 @@ const destroyFn = (api, editorView) => {
       (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({
         tr
       }) => {
-        var _api$userIntent;
-        const isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
-        if (isMultiSelect) {
-          var _api$blockControls, _api$selection;
-          const {
-            multiSelectDnD
-          } = ((_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {};
-          // Restore the users initial Editor selection when the drop completes
-          if (multiSelectDnD) {
-            // If the TextSelection between the drag start and end has changed, the document has changed, and we should not reapply the last selection
-            const expandedSelectionUnchanged = multiSelectDnD.textAnchor === tr.selection.anchor && multiSelectDnD.textHead === tr.selection.head;
-            if (expandedSelectionUnchanged) {
-              const $anchor = tr.doc.resolve(multiSelectDnD.userAnchor);
-              const $head = tr.doc.resolve(multiSelectDnD.userHead);
-              if ($head.node() === $anchor.node()) {
-                const $from = $anchor.min($head);
-                selectNode(tr, $from.pos, $from.node().type.name, api);
-              } else {
-                tr.setSelection(TextSelection.create(tr.doc, multiSelectDnD.userAnchor, multiSelectDnD.userHead));
-              }
+        var _api$blockControls, _api$selection, _api$userIntent;
+        const {
+          multiSelectDnD
+        } = ((_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {};
+        // Restore the users initial Editor selection when the drop completes
+        if (multiSelectDnD) {
+          // If the TextSelection between the drag start and end has changed, the document has changed, and we should not reapply the last selection
+          const expandedSelectionUnchanged = multiSelectDnD.textAnchor === tr.selection.anchor && multiSelectDnD.textHead === tr.selection.head;
+          if (expandedSelectionUnchanged) {
+            const $anchor = tr.doc.resolve(multiSelectDnD.userAnchor);
+            const $head = tr.doc.resolve(multiSelectDnD.userHead);
+            if ($head.node() === $anchor.node()) {
+              const $from = $anchor.min($head);
+              selectNode(tr, $from.pos, $from.node().type.name, api);
+            } else {
+              tr.setSelection(TextSelection.create(tr.doc, multiSelectDnD.userAnchor, multiSelectDnD.userHead));
             }
           }
-          (_api$selection = api.selection) === null || _api$selection === void 0 ? void 0 : _api$selection.commands.clearManualSelection()({
-            tr
-          });
         }
+        (_api$selection = api.selection) === null || _api$selection === void 0 ? void 0 : _api$selection.commands.clearManualSelection()({
+          tr
+        });
         const {
           start
         } = source.data;
@@ -138,15 +134,13 @@ const destroyFn = (api, editorView) => {
         const lastDragCancelled = location.current.dropTargets.length === 0;
         if (lastDragCancelled) {
           var _api$analytics2;
-          let nodeTypes, hasSelectedMultipleNodes;
-          if (isMultiSelect) {
-            const position = getSelectedSlicePosition(start, tr, api);
-            const attributes = getMultiSelectAnalyticsAttributes(tr, position.from, position.to);
-            nodeTypes = attributes.nodeTypes;
-            hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
-          }
+          const position = getSelectedSlicePosition(start, tr, api);
+          const attributes = getMultiSelectAnalyticsAttributes(tr, position.from, position.to);
+          const {
+            nodeTypes,
+            hasSelectedMultipleNodes
+          } = attributes;
           const resolvedMovingNode = tr.doc.resolve(start);
-          const maybeNode = resolvedMovingNode.nodeAfter;
           (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions.attachAnalyticsEvent({
             eventType: EVENT_TYPE.UI,
             action: ACTION.CANCELLED,
@@ -154,11 +148,8 @@ const destroyFn = (api, editorView) => {
             actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
             attributes: {
               nodeDepth: resolvedMovingNode.depth,
-              nodeType: (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name) || '',
-              ...(isMultiSelect && {
-                nodeTypes,
-                hasSelectedMultipleNodes
-              })
+              nodeTypes: nodeTypes || '',
+              hasSelectedMultipleNodes
             }
           })(tr);
         }
@@ -328,7 +319,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
         };
       }
     }
-    if (multiSelectDnD && flags.isMultiSelectEnabled) {
+    if (multiSelectDnD) {
       multiSelectDnD.anchor = tr.mapping.map(multiSelectDnD.anchor);
       multiSelectDnD.head = tr.mapping.map(multiSelectDnD.head);
     }
@@ -337,7 +328,7 @@ export const apply = (api, formatMessage, tr, currentState, newState, flags, nod
   isResizerResizing = resizerMeta !== null && resizerMeta !== void 0 ? resizerMeta : isResizerResizing;
   const hasJustFinishedResizing = resizerMeta === false;
   multiSelectDnD = (_meta$multiSelectDnD = meta === null || meta === void 0 ? void 0 : meta.multiSelectDnD) !== null && _meta$multiSelectDnD !== void 0 ? _meta$multiSelectDnD : multiSelectDnD;
-  if (multiSelectDnD && flags.isMultiSelectEnabled) {
+  if (multiSelectDnD) {
     var _meta$isDragging;
     if (((_meta$isDragging = meta === null || meta === void 0 ? void 0 : meta.isDragging) !== null && _meta$isDragging !== void 0 ? _meta$isDragging : isDragging) && expValEquals('platform_editor_block_controls_perf_optimization', 'isEnabled', true)) {
       // When dragging, we want to keep the multiSelectDnD object unless both document and selection
@@ -694,12 +685,8 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI, nodeDecora
   const isAdvancedLayoutEnabled = editorExperiment('advanced_layouts', true, {
     exposure: true
   });
-  const isMultiSelectEnabled = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true, {
-    exposure: true
-  });
   const toolbarFlagsEnabled = areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
   const flags = {
-    isMultiSelectEnabled,
     toolbarFlagsEnabled
   };
   let anchorRectCache;
@@ -754,7 +741,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI, nodeDecora
           const tr = state.tr;
           let pluginState = key.getState(state);
           const dndDragCancelled = (_pluginState = pluginState) === null || _pluginState === void 0 ? void 0 : _pluginState.lastDragCancelled;
-          if ((_pluginState2 = pluginState) !== null && _pluginState2 !== void 0 && _pluginState2.isPMDragging || dndDragCancelled && isMultiSelectEnabled) {
+          if ((_pluginState2 = pluginState) !== null && _pluginState2 !== void 0 && _pluginState2.isPMDragging || dndDragCancelled) {
             if (fg('platform_editor_ease_of_use_metrics')) {
               var _api$metrics2;
               api === null || api === void 0 ? void 0 : (_api$metrics2 = api.metrics) === null || _api$metrics2 === void 0 ? void 0 : _api$metrics2.commands.startActiveSessionTimer()({
@@ -774,7 +761,7 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI, nodeDecora
           // Currently we can only drag one node at a time
           // so we only need to check first child
           const draggable = dragging === null || dragging === void 0 ? void 0 : dragging.slice.content.firstChild;
-          if (dndDragCancelled && isMultiSelectEnabled || (draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn') {
+          if (dndDragCancelled || (draggable === null || draggable === void 0 ? void 0 : draggable.type.name) === 'layoutColumn') {
             // we prevent native DnD for layoutColumn to prevent single column layout.
             event.preventDefault();
             return false;
@@ -905,56 +892,33 @@ export const createPlugin = (api, getIntl, nodeViewPortalProviderAPI, nodeDecora
           if (api !== null && api !== void 0 && (_api$limitedMode8 = api.limitedMode) !== null && _api$limitedMode8 !== void 0 && (_api$limitedMode8$sha = _api$limitedMode8.sharedState.currentState()) !== null && _api$limitedMode8$sha !== void 0 && _api$limitedMode8$sha.enabled) {
             return;
           }
-          if (isMultiSelectEnabled) {
-            if (event.shiftKey && event.ctrlKey) {
-              //prevent holding down key combo from firing repeatedly
-              if (!event.repeat && boundKeydownHandler(api, formatMessage)(view, event)) {
-                event.preventDefault();
-                return true;
-              }
-            }
-            if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && editorExperiment('platform_editor_controls', 'variant1')) {
-              const isDragHandle = event.target.closest(editorExperiment('platform_editor_block_menu', true) ? DRAG_HANDLE_SELECTOR : '[data-editor-block-ctrl-drag-handle="true"]') !== null;
-              api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));
+          if (event.shiftKey && event.ctrlKey) {
+            //prevent holding down key combo from firing repeatedly
+            if (!event.repeat && boundKeydownHandler(api, formatMessage)(view, event)) {
+              event.preventDefault();
+              return true;
             }
-            if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && editorExperiment('platform_editor_controls', 'variant1')) {
-              var _api$blockControls$sh2, _api$blockControls$sh3;
-              const isBlockMenuOpen = (api === null || api === void 0 ? void 0 : (_api$blockControls$sh2 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh2 === void 0 ? void 0 : _api$blockControls$sh2.isMenuOpen) && editorExperiment('platform_editor_block_menu', true);
-              // when block menu is just open, and we press arrow keys, we want to use the arrow keys to navigate the block menu
-              // in this scenario, isSelectedViaDragHandle should not be set to false
-              if (api !== null && api !== void 0 && (_api$blockControls$sh3 = api.blockControls.sharedState.currentState()) !== null && _api$blockControls$sh3 !== void 0 && _api$blockControls$sh3.isSelectedViaDragHandle && !isBlockMenuOpen) {
-                api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(false));
-              }
-            }
-            if (!event.repeat && event.shiftKey && fg('platform_editor_elements_dnd_shift_click_select')) {
-              view.dispatch(view.state.tr.setMeta(key, {
-                ...view.state.tr.getMeta(key),
-                isShiftDown: true
-              }));
-            }
-            return false;
-          } else {
-            if (event.shiftKey && event.ctrlKey) {
-              //prevent holding down key combo from firing repeatedly
-              if (!event.repeat && boundKeydownHandler(api, formatMessage)(view, event)) {
-                event.preventDefault();
-                return true;
-              }
-            }
-            if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && editorExperiment('platform_editor_controls', 'variant1')) {
-              const isDragHandle = event.target.closest(editorExperiment('platform_editor_block_menu', true) ? DRAG_HANDLE_SELECTOR : '[data-editor-block-ctrl-drag-handle="true"]') !== null;
-              api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));
-            }
-            if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && editorExperiment('platform_editor_controls', 'variant1')) {
-              var _api$blockControls$sh4, _api$blockControls$sh5;
-              const isBlockMenuOpen = (api === null || api === void 0 ? void 0 : (_api$blockControls$sh4 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh4 === void 0 ? void 0 : _api$blockControls$sh4.isMenuOpen) && editorExperiment('platform_editor_block_menu', true);
-              // when block menu is just open, and we press arrow keys, we want to use the arrow keys to navigate the block menu
-              // in this scenario, isSelectedViaDragHandle should not be set to false
-              if (api !== null && api !== void 0 && (_api$blockControls$sh5 = api.blockControls.sharedState.currentState()) !== null && _api$blockControls$sh5 !== void 0 && _api$blockControls$sh5.isSelectedViaDragHandle && !isBlockMenuOpen) {
-                api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(false));
-              }
+          }
+          if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && editorExperiment('platform_editor_controls', 'variant1')) {
+            const isDragHandle = event.target.closest(editorExperiment('platform_editor_block_menu', true) ? DRAG_HANDLE_SELECTOR : '[data-editor-block-ctrl-drag-handle="true"]') !== null;
+            api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(isDragHandle));
+          }
+          if ((event.key === 'ArrowLeft' || event.key === 'ArrowRight' || event.key === 'ArrowDown' || event.key === 'ArrowUp') && editorExperiment('platform_editor_controls', 'variant1')) {
+            var _api$blockControls$sh2, _api$blockControls$sh3;
+            const isBlockMenuOpen = (api === null || api === void 0 ? void 0 : (_api$blockControls$sh2 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh2 === void 0 ? void 0 : _api$blockControls$sh2.isMenuOpen) && editorExperiment('platform_editor_block_menu', true);
+            // when block menu is just open, and we press arrow keys, we want to use the arrow keys to navigate the block menu
+            // in this scenario, isSelectedViaDragHandle should not be set to false
+            if (api !== null && api !== void 0 && (_api$blockControls$sh3 = api.blockControls.sharedState.currentState()) !== null && _api$blockControls$sh3 !== void 0 && _api$blockControls$sh3.isSelectedViaDragHandle && !isBlockMenuOpen) {
+              api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(false));
             }
           }
+          if (!event.repeat && event.shiftKey && fg('platform_editor_elements_dnd_shift_click_select')) {
+            view.dispatch(view.state.tr.setMeta(key, {
+              ...view.state.tr.getMeta(key),
+              isShiftDown: true
+            }));
+          }
+          return false;
         },
         keyup(view, event) {
           var _api$limitedMode9, _api$limitedMode9$sha;

package/dist/es2019/pm-plugins/utils/analytics.js

@@ -1,6 +1,6 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { fg } from '@atlaskit/platform-feature-flags';
-export const attachMoveNodeAnalytics = (tr, inputMethod, fromDepth, fromNodeType, toDepth, toNodeType, isSameParent, api, fromNodeTypes, hasSelectedMultipleNodes) => {
+export const attachMoveNodeAnalytics = (tr, inputMethod, fromDepth, fromNodeTypes, toDepth, toNodeType, isSameParent, api, hasSelectedMultipleNodes) => {
   var _api$analytics, _api$analytics$action;
   return api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : (_api$analytics$action = _api$analytics.actions) === null || _api$analytics$action === void 0 ? void 0 : _api$analytics$action.attachAnalyticsEvent({
     eventType: EVENT_TYPE.TRACK,
@@ -9,7 +9,6 @@ export const attachMoveNodeAnalytics = (tr, inputMethod, fromDepth, fromNodeType
     actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
     attributes: {
       nodeDepth: fromDepth,
-      nodeType: fromNodeType,
       nodeTypes: fromNodeTypes,
       hasSelectedMultipleNodes,
       destinationNodeDepth: toDepth,