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

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

@@ -39,24 +39,19 @@ export var canMoveNodeOrSliceToPos = function canMoveNodeOrSliceToPos(state, nod
   var $activeNodePos = typeof activeNodePos === 'number' && state.doc.resolve(activeNodePos);
   var activePMNode = $activeNodePos && $activeNodePos.nodeAfter;
   var handleInsideSelection = activeNodePos !== undefined && activeNodePos >= selectionFrom && activeNodePos <= selectionTo;
-  if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
-    var selectionSlice = state.doc.slice(selectionFrom, selectionTo, false);
-    var selectionSliceChildCount = selectionSlice.content.childCount;
-    var canDropSingleNode = true;
-    var canDropMultipleNodes = true;
+  var selectionSlice = state.doc.slice(selectionFrom, selectionTo, false);
+  var selectionSliceChildCount = selectionSlice.content.childCount;
+  var canDropSingleNode = true;
+  var 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 {
-    var 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/esm/pm-plugins/decorations-drop-target.js

@@ -167,7 +167,6 @@ export var dropTargetDecorations = function dropTargetDecorations(newState, api,
   var activeNodePos = activeNode === null || activeNode === void 0 ? void 0 : activeNode.pos;
   var $activeNodePos = typeof activeNodePos === 'number' && newState.doc.resolve(activeNodePos);
   var activePMNode = $activeNodePos && $activeNodePos.nodeAfter;
-  var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
   anchorRectCache === null || anchorRectCache === void 0 || anchorRectCache.clear();
   var prevNodeStack = [];
   var popNodeStack = function popNodeStack(depth) {
@@ -223,31 +222,21 @@ export var dropTargetDecorations = function dropTargetDecorations(newState, api,
       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) {
-      var selectionSlice = newState.doc.slice(selectionFrom, selectionTo, false);
-      var selectionSliceChildCount = selectionSlice.content.childCount;
-      var canDropSingleNode = true;
-      var canDropMultipleNodes = true;
+    // validate all the nodes in the selection instead of just the handle node
+    var selectionSlice = newState.doc.slice(selectionFrom, selectionTo, false);
+    var selectionSliceChildCount = selectionSlice.content.childCount;
+    var canDropSingleNode = true;
+    var 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 {
-      var 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
     }
     var 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/esm/pm-plugins/main.js

@@ -108,59 +108,49 @@ var destroyFn = function destroyFn(api, editorView) {
         return;
       }
       (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref3) {
-        var _api$userIntent;
+        var _api$blockControls, _api$selection, _api$userIntent;
         var tr = _ref3.tr;
-        var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
-        if (isMultiSelect) {
-          var _api$blockControls, _api$selection;
-          var _ref4 = ((_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
-            multiSelectDnD = _ref4.multiSelectDnD;
-          // 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
-            var expandedSelectionUnchanged = multiSelectDnD.textAnchor === tr.selection.anchor && multiSelectDnD.textHead === tr.selection.head;
-            if (expandedSelectionUnchanged) {
-              var $anchor = tr.doc.resolve(multiSelectDnD.userAnchor);
-              var $head = tr.doc.resolve(multiSelectDnD.userHead);
-              if ($head.node() === $anchor.node()) {
-                var $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 _ref4 = ((_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState()) || {},
+          multiSelectDnD = _ref4.multiSelectDnD;
+        // 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
+          var expandedSelectionUnchanged = multiSelectDnD.textAnchor === tr.selection.anchor && multiSelectDnD.textHead === tr.selection.head;
+          if (expandedSelectionUnchanged) {
+            var $anchor = tr.doc.resolve(multiSelectDnD.userAnchor);
+            var $head = tr.doc.resolve(multiSelectDnD.userHead);
+            if ($head.node() === $anchor.node()) {
+              var $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 || _api$selection.commands.clearManualSelection()({
-            tr: tr
-          });
         }
+        (_api$selection = api.selection) === null || _api$selection === void 0 || _api$selection.commands.clearManualSelection()({
+          tr: tr
+        });
         var _ref5 = source.data,
           start = _ref5.start;
         // if no drop targets are rendered, assume that drop is invalid
         var lastDragCancelled = location.current.dropTargets.length === 0;
         if (lastDragCancelled) {
           var _api$analytics2;
-          var nodeTypes, hasSelectedMultipleNodes;
-          if (isMultiSelect) {
-            var position = getSelectedSlicePosition(start, tr, api);
-            var attributes = getMultiSelectAnalyticsAttributes(tr, position.from, position.to);
-            nodeTypes = attributes.nodeTypes;
+          var position = getSelectedSlicePosition(start, tr, api);
+          var attributes = getMultiSelectAnalyticsAttributes(tr, position.from, position.to);
+          var nodeTypes = attributes.nodeTypes,
             hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
-          }
           var resolvedMovingNode = tr.doc.resolve(start);
-          var maybeNode = resolvedMovingNode.nodeAfter;
           (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
             eventType: EVENT_TYPE.UI,
             action: ACTION.CANCELLED,
             actionSubject: ACTION_SUBJECT.DRAG,
             actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-            attributes: _objectSpread({
+            attributes: {
               nodeDepth: resolvedMovingNode.depth,
-              nodeType: (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name) || ''
-            }, isMultiSelect && {
-              nodeTypes: nodeTypes,
+              nodeTypes: nodeTypes || '',
               hasSelectedMultipleNodes: hasSelectedMultipleNodes
-            })
+            }
           })(tr);
         }
         if (fg('platform_editor_ease_of_use_metrics')) {
@@ -330,7 +320,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
         };
       }
     }
-    if (multiSelectDnD && flags.isMultiSelectEnabled) {
+    if (multiSelectDnD) {
       multiSelectDnD.anchor = tr.mapping.map(multiSelectDnD.anchor);
       multiSelectDnD.head = tr.mapping.map(multiSelectDnD.head);
     }
@@ -339,7 +329,7 @@ var _apply = function apply(api, formatMessage, tr, currentState, newState, flag
   isResizerResizing = resizerMeta !== null && resizerMeta !== void 0 ? resizerMeta : isResizerResizing;
   var 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
@@ -789,12 +779,8 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
   var isAdvancedLayoutEnabled = editorExperiment('advanced_layouts', true, {
     exposure: true
   });
-  var isMultiSelectEnabled = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true, {
-    exposure: true
-  });
   var toolbarFlagsEnabled = areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
   var flags = {
-    isMultiSelectEnabled: isMultiSelectEnabled,
     toolbarFlagsEnabled: toolbarFlagsEnabled
   };
   var anchorRectCache;
@@ -849,7 +835,7 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
           var tr = state.tr;
           var pluginState = key.getState(state);
           var 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 || (_api$metrics2 = api.metrics) === null || _api$metrics2 === void 0 || _api$metrics2.commands.startActiveSessionTimer()({
@@ -868,7 +854,7 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
           // Currently we can only drag one node at a time
           // so we only need to check first child
           var 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;
@@ -995,55 +981,32 @@ export var createPlugin = function createPlugin(api, getIntl, nodeViewPortalProv
           if (api !== null && api !== void 0 && (_api$limitedMode8 = api.limitedMode) !== null && _api$limitedMode8 !== void 0 && (_api$limitedMode8 = _api$limitedMode8.sharedState.currentState()) !== null && _api$limitedMode8 !== void 0 && _api$limitedMode8.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')) {
-              var 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 || 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;
-              var isBlockMenuOpen = (api === null || api === 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 || api.core.actions.execute(api === null || api === void 0 ? void 0 : api.blockControls.commands.setSelectedViaDragHandle(false));
-              }
+          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.repeat && event.shiftKey && fg('platform_editor_elements_dnd_shift_click_select')) {
-              view.dispatch(view.state.tr.setMeta(key, _objectSpread(_objectSpread({}, 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')) {
-              var _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 || 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;
-              var _isBlockMenuOpen = (api === null || api === 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 || 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')) {
+            var 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 || 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;
+            var isBlockMenuOpen = (api === null || api === 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 || 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, _objectSpread(_objectSpread({}, view.state.tr.getMeta(key)), {}, {
+              isShiftDown: true
+            })));
+          }
+          return false;
         },
         keyup: function keyup(view, event) {
           var _api$limitedMode9;

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

@@ -1,7 +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';
 import { fg } from '@atlaskit/platform-feature-flags';
-export var attachMoveNodeAnalytics = function attachMoveNodeAnalytics(tr, inputMethod, fromDepth, fromNodeType, toDepth, toNodeType, isSameParent, api, fromNodeTypes, hasSelectedMultipleNodes) {
+export var attachMoveNodeAnalytics = function attachMoveNodeAnalytics(tr, inputMethod, fromDepth, fromNodeTypes, toDepth, toNodeType, isSameParent, api, 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,
@@ -10,7 +10,6 @@ export var attachMoveNodeAnalytics = function attachMoveNodeAnalytics(tr, inputM
     actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
     attributes: {
       nodeDepth: fromDepth,
-      nodeType: fromNodeType,
       nodeTypes: fromNodeTypes,
       hasSelectedMultipleNodes: hasSelectedMultipleNodes,
       destinationNodeDepth: toDepth,

package/dist/esm/pm-plugins/utils/remove-from-source.js

@@ -5,18 +5,8 @@ import { isFragmentOfType } from './check-fragment';
 import { MIN_LAYOUT_COLUMN } from './consts';
 import { updateColumnWidths } from './update-column-widths';
 export var removeFromSource = function removeFromSource(tr, $from, to) {
-  var _sourceContent, _sourceContent2;
-  var sourceContent = $from.nodeAfter;
-  var isLayoutColumn = ((_sourceContent = sourceContent) === null || _sourceContent === void 0 ? void 0 : _sourceContent.type.name) === 'layoutColumn';
-  var sourceNodeEndPos = $from.pos + (((_sourceContent2 = sourceContent) === null || _sourceContent2 === void 0 ? void 0 : _sourceContent2.nodeSize) || 1);
-  if (editorExperiment('platform_editor_element_drag_and_drop_multiselect', true)) {
-    sourceContent = tr.doc.slice($from.pos, to).content;
-    isLayoutColumn = isFragmentOfType(sourceContent, 'layoutColumn');
-    sourceNodeEndPos = to === undefined ? $from.pos + sourceContent.size : to;
-  }
-  if (!sourceContent) {
-    return tr;
-  }
+  var sourceContent = tr.doc.slice($from.pos, to).content;
+  var isLayoutColumn = isFragmentOfType(sourceContent, 'layoutColumn');
 
   /**
    * This logic is used to handle the case when a user tries to delete a layout column
@@ -29,7 +19,7 @@ export var removeFromSource = function removeFromSource(tr, $from, to) {
       // Only delete the layout content, but keep the layout column itself
       // This logic should be remove when we clean up the code for single column layouts.
       // since this step has no effect on the layout column, because the parent node is removed in the later step.
-      tr.delete($from.pos + 1, sourceNodeEndPos - 1);
+      tr.delete($from.pos + 1, to - 1);
 
       // This check should be remove when clean up the code for single column layouts.
       // since it has been checked in the previous step.
@@ -52,6 +42,6 @@ export var removeFromSource = function removeFromSource(tr, $from, to) {
       updateColumnWidths(tr, $from.parent, $from.before($from.depth), sourceParent.childCount - 1);
     }
   }
-  tr.delete($from.pos, sourceNodeEndPos);
+  tr.delete($from.pos, to);
   return tr;
 };

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

@@ -386,7 +386,6 @@ export var DragHandle = function DragHandle(_ref) {
     interactionState = _useSharedPluginState.interactionState;
   var start = getPos();
   var isLayoutColumn = nodeType === 'layoutColumn';
-  var isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
 
   // Dynamically calculate if node is top-level based on current position (gated by experiment)
   var isTopLevelNodeDynamic = useMemo(function () {
@@ -470,7 +469,7 @@ export var DragHandle = function DragHandle(_ref) {
         actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
         attributes: {
           nodeDepth: resolvedStartPos.depth,
-          nodeType: ((_resolvedStartPos$nod = resolvedStartPos.nodeAfter) === null || _resolvedStartPos$nod === void 0 ? void 0 : _resolvedStartPos$nod.type.name) || ''
+          nodeTypes: ((_resolvedStartPos$nod = resolvedStartPos.nodeAfter) === null || _resolvedStartPos$nod === void 0 ? void 0 : _resolvedStartPos$nod.type.name) || ''
         }
       })(tr);
       expandAndUpdateSelection({
@@ -502,9 +501,6 @@ export var DragHandle = function DragHandle(_ref) {
   }, [api, view, getPos, nodeType, anchorName]);
   var handleOnClick = useCallback(function (e) {
     var _api$core2;
-    if (!isMultiSelect) {
-      setDragHandleSelected(!dragHandleSelected);
-    }
     api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref3) {
       var _api$blockControls$sh, _api$analytics2;
       var tr = _ref3.tr;
@@ -514,7 +510,7 @@ export var DragHandle = function DragHandle(_ref) {
       }
       var mSelect = api === null || api === void 0 || (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.multiSelectDnD;
       var $anchor = (mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) !== undefined ? tr.doc.resolve(mSelect === null || mSelect === void 0 ? void 0 : mSelect.anchor) : tr.selection.$anchor;
-      if (!isMultiSelect || tr.selection.empty || !e.shiftKey) {
+      if (tr.selection.empty || !e.shiftKey) {
         tr = selectNode(tr, startPos, nodeType, api);
       } else if (isTopLevelNodeValue && $anchor.depth <= DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH && e.shiftKey && fg('platform_editor_elements_dnd_shift_click_select')) {
         var _api$blockControls3;
@@ -535,13 +531,13 @@ export var DragHandle = function DragHandle(_ref) {
         actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
         attributes: {
           nodeDepth: resolvedMovingNode.depth,
-          nodeType: (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name) || ''
+          nodeTypes: (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name) || ''
         }
       })(tr);
       return tr;
     });
     view.focus();
-  }, [isMultiSelect, api, view, dragHandleSelected, getPos, isTopLevelNodeValue, nodeType]);
+  }, [api, view, getPos, isTopLevelNodeValue, nodeType]);
   var handleKeyDown = useCallback(function (e) {
     // allow user to use spacebar to select the node
     if (!e.repeat && e.key === ' ') {
@@ -559,9 +555,6 @@ export var DragHandle = function DragHandle(_ref) {
         var $startPos = tr.doc.resolve(startPos + node.nodeSize);
         var selection = new TextSelection($startPos);
         tr.setSelection(selection);
-        !isMultiSelect && tr.setMeta(key, {
-          pos: startPos
-        });
         return tr;
       });
     } else if (![e.altKey, e.ctrlKey, e.shiftKey].some(function (pressed) {
@@ -571,7 +564,7 @@ export var DragHandle = function DragHandle(_ref) {
       // return focus to editor to resume editing from caret position
       view.focus();
     }
-  }, [getPos, api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions, isMultiSelect, view]);
+  }, [getPos, api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions, view]);
   var handleKeyDownNew = useCallback(function (e) {
     // allow user to use spacebar to select the node
     if (e.key === 'Enter' || !e.repeat && e.key === ' ') {
@@ -641,28 +634,25 @@ export var DragHandle = function DragHandle(_ref) {
         };
       },
       onGenerateDragPreview: function onGenerateDragPreview(_ref6) {
-        var _api$blockControls$sh2;
+        var _api$core6, _api$blockControls$sh2;
         var nativeSetDragImage = _ref6.nativeSetDragImage;
-        if (isMultiSelect) {
-          var _api$core6;
-          api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 || _api$core6.actions.execute(function (_ref7) {
-            var tr = _ref7.tr;
-            var handlePos = getPos();
-            if (typeof handlePos !== 'number') {
-              return tr;
-            }
-            var newHandlePosCheck = isHandleCorrelatedToSelection(view.state, tr.selection, handlePos);
-            if (!tr.selection.empty && newHandlePosCheck) {
-              var _api$blockControls6;
-              api === null || api === void 0 || (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 || _api$blockControls6.commands.setMultiSelectPositions()({
-                tr: tr
-              });
-            } else {
-              tr = selectNode(tr, handlePos, nodeType, api);
-            }
+        api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 || _api$core6.actions.execute(function (_ref7) {
+          var tr = _ref7.tr;
+          var handlePos = getPos();
+          if (typeof handlePos !== 'number') {
             return tr;
-          });
-        }
+          }
+          var newHandlePosCheck = isHandleCorrelatedToSelection(view.state, tr.selection, handlePos);
+          if (!tr.selection.empty && newHandlePosCheck) {
+            var _api$blockControls6;
+            api === null || api === void 0 || (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 || _api$blockControls6.commands.setMultiSelectPositions()({
+              tr: tr
+            });
+          } else {
+            tr = selectNode(tr, handlePos, nodeType, api);
+          }
+          return tr;
+        });
         var startPos = getPos();
         var state = view.state;
         var doc = state.doc,
@@ -677,7 +667,7 @@ export var DragHandle = function DragHandle(_ref) {
           sliceTo = Math.max(anchor, head);
         }
         var expandedSlice = doc.slice(sliceFrom, sliceTo);
-        var isDraggingMultiLine = isMultiSelect && startPos !== undefined && startPos >= sliceFrom && startPos < sliceTo && expandedSlice.content.childCount > 1;
+        var isDraggingMultiLine = startPos !== undefined && startPos >= sliceFrom && startPos < sliceTo && expandedSlice.content.childCount > 1;
         setCustomNativeDragPreview({
           getOffset: function getOffset() {
             if (!isDraggingMultiLine) {
@@ -785,20 +775,18 @@ export var DragHandle = function DragHandle(_ref) {
             action: ACTION.DRAGGED,
             actionSubject: ACTION_SUBJECT.ELEMENT,
             actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
-            attributes: _objectSpread({
+            attributes: {
               nodeDepth: resolvedMovingNode.depth,
-              nodeType: (maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name) || ''
-            }, isMultiSelect && {
-              nodeTypes: nodeTypes,
+              nodeTypes: nodeTypes || '',
               hasSelectedMultipleNodes: hasSelectedMultipleNodes
-            })
+            }
           })(tr);
           return tr;
         });
         view.focus();
       }
     });
-  }, [anchorName, api, getPos, isMultiSelect, nodeType, start, view]);
+  }, [anchorName, api, getPos, nodeType, start, view]);
   var calculatePositionOld = useCallback(function () {
     var pos = getPos();
     var $pos = expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? typeof pos === 'number' && view.state.doc.resolve(pos) : pos && view.state.doc.resolve(pos);
@@ -881,14 +869,14 @@ export var DragHandle = function DragHandle(_ref) {
     }
   }, [buttonRef, handleOptions === null || handleOptions === void 0 ? void 0 : handleOptions.isFocused, view]);
   useEffect(function () {
-    if (!isMultiSelect || typeof start !== 'number' || !selection) {
+    if (typeof start !== 'number' || !selection) {
       return;
     }
     setDragHandleSelected(isHandleCorrelatedToSelection(view.state, selection, start));
-  }, [start, selection, view, isMultiSelect]);
+  }, [start, selection, view]);
   useEffect(function () {
     var _api$blockControls$sh4;
-    if (!isMultiSelect || isShiftDown === undefined || view.state.selection.empty || !fg('platform_editor_elements_dnd_shift_click_select')) {
+    if (isShiftDown === undefined || view.state.selection.empty || !fg('platform_editor_elements_dnd_shift_click_select')) {
       return;
     }
     var mSelect = api === null || api === void 0 || (_api$blockControls$sh4 = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh4 === void 0 ? void 0 : _api$blockControls$sh4.multiSelectDnD;
@@ -898,7 +886,7 @@ export var DragHandle = function DragHandle(_ref) {
     } else {
       setDragHandleDisabled(false);
     }
-  }, [api === null || api === void 0 ? void 0 : api.blockControls.sharedState, isMultiSelect, isShiftDown, isTopLevelNodeValue, view]);
+  }, [api === null || api === void 0 ? void 0 : api.blockControls.sharedState, isShiftDown, isTopLevelNodeValue, view]);
   var dragHandleMessage = editorExperiment('platform_editor_block_menu', true) ? formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
     br: jsx("br", null)
   }) : formatMessage(blockControlsMessages.dragToMove);
@@ -976,7 +964,7 @@ export var DragHandle = function DragHandle(_ref) {
     return descriptor.keymap ? [descriptor.description, getAriaKeyshortcuts(descriptor.keymap)] : [descriptor.description];
   }).join('. ');
   var handleOnDrop = function handleOnDrop(event) {
-    editorExperiment('platform_editor_element_drag_and_drop_multiselect', true) && event.stopPropagation();
+    event.stopPropagation();
   };
   var hasHadInteraction = interactionState !== 'hasNotHadInteraction';
   var browser = getBrowserInfo();

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

@@ -9,7 +9,6 @@ import type { ActiveDropTargetNode, BlockControlsMeta, BlockControlsPlugin, Mult
 import { AnchorRectCache } from './utils/anchor-utils';
 export declare const key: PluginKey<PluginState>;
 export interface FlagType {
-    isMultiSelectEnabled: boolean;
     toolbarFlagsEnabled: boolean;
 }
 export declare const getDecorations: (state: EditorState) => DecorationSet | undefined;

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

@@ -1,12 +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 attachMoveNodeAnalytics: (tr: Transaction, inputMethod: string, fromDepth: number, fromNodeTypes: string | undefined, toDepth?: number, toNodeType?: string, isSameParent?: boolean, api?: ExtractInjectionAPI<BlockControlsPlugin>, hasSelectedMultipleNodes?: boolean) => boolean | undefined;
 export declare const fireInsertLayoutAnalytics: (tr: Transaction, api?: ExtractInjectionAPI<BlockControlsPlugin>, nodeTypes?: string, hasSelectedMultipleNodes?: boolean, columnCount?: number) => 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;
+    nodeTypes: string | undefined;
 };

package/dist/types/pm-plugins/utils/remove-from-source.d.ts

@@ -1,3 +1,3 @@
 import type { ResolvedPos } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const removeFromSource: (tr: Transaction, $from: ResolvedPos, to?: number) => Transaction;
+export declare const removeFromSource: (tr: Transaction, $from: ResolvedPos, to: number) => Transaction;

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

@@ -9,7 +9,6 @@ import type { ActiveDropTargetNode, BlockControlsMeta, BlockControlsPlugin, Mult
 import { AnchorRectCache } from './utils/anchor-utils';
 export declare const key: PluginKey<PluginState>;
 export interface FlagType {
-    isMultiSelectEnabled: boolean;
     toolbarFlagsEnabled: boolean;
 }
 export declare const getDecorations: (state: EditorState) => DecorationSet | undefined;

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

@@ -1,12 +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 attachMoveNodeAnalytics: (tr: Transaction, inputMethod: string, fromDepth: number, fromNodeTypes: string | undefined, toDepth?: number, toNodeType?: string, isSameParent?: boolean, api?: ExtractInjectionAPI<BlockControlsPlugin>, hasSelectedMultipleNodes?: boolean) => boolean | undefined;
 export declare const fireInsertLayoutAnalytics: (tr: Transaction, api?: ExtractInjectionAPI<BlockControlsPlugin>, nodeTypes?: string, hasSelectedMultipleNodes?: boolean, columnCount?: number) => 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;
+    nodeTypes: string | undefined;
 };

package/dist/types-ts4.5/pm-plugins/utils/remove-from-source.d.ts

@@ -1,3 +1,3 @@
 import type { ResolvedPos } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-export declare const removeFromSource: (tr: Transaction, $from: ResolvedPos, to?: number) => Transaction;
+export declare const removeFromSource: (tr: Transaction, $from: ResolvedPos, to: number) => Transaction;