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

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

@@ -115,59 +115,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 = (0, _experiments.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);
-                (0, _getSelection.selectNode)(tr, $from.pos, $from.node().type.name, api);
-              } else {
-                tr.setSelection(_state.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);
+              (0, _getSelection.selectNode)(tr, $from.pos, $from.node().type.name, api);
+            } else {
+              tr.setSelection(_state.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 = (0, _selection.getSelectedSlicePosition)(start, tr, api);
-            var attributes = (0, _analytics2.getMultiSelectAnalyticsAttributes)(tr, position.from, position.to);
-            nodeTypes = attributes.nodeTypes;
+          var position = (0, _selection.getSelectedSlicePosition)(start, tr, api);
+          var attributes = (0, _analytics2.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: _analytics.EVENT_TYPE.UI,
             action: _analytics.ACTION.CANCELLED,
             actionSubject: _analytics.ACTION_SUBJECT.DRAG,
             actionSubjectId: _analytics.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 ((0, _platformFeatureFlags.fg)('platform_editor_ease_of_use_metrics')) {
@@ -337,7 +327,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
         };
       }
     }
-    if (multiSelectDnD && flags.isMultiSelectEnabled) {
+    if (multiSelectDnD) {
       multiSelectDnD.anchor = tr.mapping.map(multiSelectDnD.anchor);
       multiSelectDnD.head = tr.mapping.map(multiSelectDnD.head);
     }
@@ -346,7 +336,7 @@ var _apply = exports.apply = function apply(api, formatMessage, tr, currentState
   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) && (0, _expValEquals.expValEquals)('platform_editor_block_controls_perf_optimization', 'isEnabled', true)) {
       // When dragging, we want to keep the multiSelectDnD object unless both document and selection
@@ -795,12 +785,8 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
   var isAdvancedLayoutEnabled = (0, _experiments.editorExperiment)('advanced_layouts', true, {
     exposure: true
   });
-  var isMultiSelectEnabled = (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true, {
-    exposure: true
-  });
   var toolbarFlagsEnabled = (0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
   var flags = {
-    isMultiSelectEnabled: isMultiSelectEnabled,
     toolbarFlagsEnabled: toolbarFlagsEnabled
   };
   var anchorRectCache;
@@ -855,7 +841,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
           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 ((0, _platformFeatureFlags.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()({
@@ -874,7 +860,7 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
           // 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;
@@ -1001,55 +987,32 @@ var createPlugin = exports.createPlugin = function createPlugin(api, getIntl, no
           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 && (0, _keymap.boundKeydownHandler)(api, formatMessage)(view, event)) {
-                event.preventDefault();
-                return true;
-              }
-            }
-            if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
-              var isDragHandle = event.target.closest((0, _experiments.editorExperiment)('platform_editor_block_menu', true) ? _styles.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') && (0, _experiments.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) && (0, _experiments.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 && (0, _keymap.boundKeydownHandler)(api, formatMessage)(view, event)) {
+              event.preventDefault();
+              return true;
             }
-            if (!event.repeat && event.shiftKey && (0, _platformFeatureFlags.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 && (0, _keymap.boundKeydownHandler)(api, formatMessage)(view, event)) {
-                event.preventDefault();
-                return true;
-              }
-            }
-            if ((event.key === 'Enter' || event.key === ' ') && event.target instanceof HTMLElement && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
-              var _isDragHandle = event.target.closest((0, _experiments.editorExperiment)('platform_editor_block_menu', true) ? _styles.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') && (0, _experiments.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) && (0, _experiments.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 && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+            var isDragHandle = event.target.closest((0, _experiments.editorExperiment)('platform_editor_block_menu', true) ? _styles.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') && (0, _experiments.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) && (0, _experiments.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 && (0, _platformFeatureFlags.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/cjs/pm-plugins/utils/analytics.js

@@ -8,7 +8,7 @@ exports.getMultiSelectAnalyticsAttributes = exports.fireInsertLayoutAnalytics =
 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 attachMoveNodeAnalytics = exports.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: _analytics.EVENT_TYPE.TRACK,
@@ -17,7 +17,6 @@ var attachMoveNodeAnalytics = exports.attachMoveNodeAnalytics = function attachM
     actionSubjectId: _analytics.ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
     attributes: {
       nodeDepth: fromDepth,
-      nodeType: fromNodeType,
       nodeTypes: fromNodeTypes,
       hasSelectedMultipleNodes: hasSelectedMultipleNodes,
       destinationNodeDepth: toDepth,

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

@@ -11,18 +11,8 @@ var _checkFragment = require("./check-fragment");
 var _consts = require("./consts");
 var _updateColumnWidths = require("./update-column-widths");
 var removeFromSource = exports.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 ((0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true)) {
-    sourceContent = tr.doc.slice($from.pos, to).content;
-    isLayoutColumn = (0, _checkFragment.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 = (0, _checkFragment.isFragmentOfType)(sourceContent, 'layoutColumn');
 
   /**
    * This logic is used to handle the case when a user tries to delete a layout column
@@ -35,7 +25,7 @@ var removeFromSource = exports.removeFromSource = function removeFromSource(tr,
       // 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.
@@ -58,6 +48,6 @@ var removeFromSource = exports.removeFromSource = function removeFromSource(tr,
       (0, _updateColumnWidths.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/cjs/ui/drag-handle.js

@@ -390,7 +390,6 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     interactionState = _useSharedPluginState.interactionState;
   var start = getPos();
   var isLayoutColumn = nodeType === 'layoutColumn';
-  var isMultiSelect = (0, _experiments.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 = (0, _react.useMemo)(function () {
@@ -474,7 +473,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         actionSubjectId: _analytics.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);
       (0, _expandAndUpdateSelection.expandAndUpdateSelection)({
@@ -506,9 +505,6 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
   }, [api, view, getPos, nodeType, anchorName]);
   var handleOnClick = (0, _react.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;
@@ -518,7 +514,7 @@ var DragHandle = exports.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 = (0, _getSelection.selectNode)(tr, startPos, nodeType, api);
       } else if (isTopLevelNodeValue && $anchor.depth <= _consts2.DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH && e.shiftKey && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_shift_click_select')) {
         var _api$blockControls3;
@@ -539,13 +535,13 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         actionSubjectId: _analytics.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 = (0, _react.useCallback)(function (e) {
     // allow user to use spacebar to select the node
     if (!e.repeat && e.key === ' ') {
@@ -563,9 +559,6 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         var $startPos = tr.doc.resolve(startPos + node.nodeSize);
         var selection = new _state.TextSelection($startPos);
         tr.setSelection(selection);
-        !isMultiSelect && tr.setMeta(_main.key, {
-          pos: startPos
-        });
         return tr;
       });
     } else if (![e.altKey, e.ctrlKey, e.shiftKey].some(function (pressed) {
@@ -575,7 +568,7 @@ var DragHandle = exports.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 = (0, _react.useCallback)(function (e) {
     // allow user to use spacebar to select the node
     if (e.key === 'Enter' || !e.repeat && e.key === ' ') {
@@ -645,28 +638,25 @@ var DragHandle = exports.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 = (0, _getSelection.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 = (0, _getSelection.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 = (0, _getSelection.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 = (0, _getSelection.selectNode)(tr, handlePos, nodeType, api);
+          }
+          return tr;
+        });
         var startPos = getPos();
         var state = view.state;
         var doc = state.doc,
@@ -681,7 +671,7 @@ var DragHandle = exports.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;
         (0, _setCustomNativeDragPreview.setCustomNativeDragPreview)({
           getOffset: function getOffset() {
             if (!isDraggingMultiLine) {
@@ -789,20 +779,18 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
             action: _analytics.ACTION.DRAGGED,
             actionSubject: _analytics.ACTION_SUBJECT.ELEMENT,
             actionSubjectId: _analytics.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 = (0, _react.useCallback)(function () {
     var pos = getPos();
     var $pos = (0, _expValEquals.expValEquals)('platform_editor_native_anchor_with_dnd', 'isEnabled', true) ? typeof pos === 'number' && view.state.doc.resolve(pos) : pos && view.state.doc.resolve(pos);
@@ -885,14 +873,14 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     }
   }, [buttonRef, handleOptions === null || handleOptions === void 0 ? void 0 : handleOptions.isFocused, view]);
   (0, _react.useEffect)(function () {
-    if (!isMultiSelect || typeof start !== 'number' || !selection) {
+    if (typeof start !== 'number' || !selection) {
       return;
     }
     setDragHandleSelected((0, _getSelection.isHandleCorrelatedToSelection)(view.state, selection, start));
-  }, [start, selection, view, isMultiSelect]);
+  }, [start, selection, view]);
   (0, _react.useEffect)(function () {
     var _api$blockControls$sh4;
-    if (!isMultiSelect || isShiftDown === undefined || view.state.selection.empty || !(0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_shift_click_select')) {
+    if (isShiftDown === undefined || view.state.selection.empty || !(0, _platformFeatureFlags.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;
@@ -902,7 +890,7 @@ var DragHandle = exports.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 = (0, _experiments.editorExperiment)('platform_editor_block_menu', true) ? formatMessage(_messages.blockControlsMessages.dragToMoveClickToOpen, {
     br: (0, _react2.jsx)("br", null)
   }) : formatMessage(_messages.blockControlsMessages.dragToMove);
@@ -980,7 +968,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     return descriptor.keymap ? [descriptor.description, (0, _keymaps.getAriaKeyshortcuts)(descriptor.keymap)] : [descriptor.description];
   }).join('. ');
   var handleOnDrop = function handleOnDrop(event) {
-    (0, _experiments.editorExperiment)('platform_editor_element_drag_and_drop_multiselect', true) && event.stopPropagation();
+    event.stopPropagation();
   };
   var hasHadInteraction = interactionState !== 'hasNotHadInteraction';
   var browser = (0, _browser.getBrowserInfo)();

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

@@ -15,7 +15,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { key } from '../pm-plugins/main';
 import { attachMoveNodeAnalytics, getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
 import { getNestedNodePosition } from '../pm-plugins/utils/getNestedNodePosition';
-import { selectNode, setCursorPositionAtMovedNode } from '../pm-plugins/utils/getSelection';
+import { setCursorPositionAtMovedNode } from '../pm-plugins/utils/getSelection';
 import { removeFromSource } from '../pm-plugins/utils/remove-from-source';
 import { getSelectedSlicePosition } from '../pm-plugins/utils/selection';
 import { getInsertLayoutStep, updateSelection } from '../pm-plugins/utils/update-selection';
@@ -124,7 +124,6 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
       selection
     } = state;
     const isParentNodeOfTypeLayout = !!findParentNodeOfType([state.schema.nodes.layoutSection])(state.selection);
-    const isMultiSelectEnabled = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
     const expandedSelection = expandSelectionBounds(selection.$anchor, selection.$head);
     const expandedAnchor = expandedSelection.$anchor.pos;
     const expandedHead = expandedSelection.$head.pos;
@@ -135,11 +134,11 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
       const LAYOUT_COL_DEPTH = 3;
       hoistedPos = state.doc.resolve(from).before(LAYOUT_COL_DEPTH);
     }
-    const currentNodePos = isMultiSelectEnabled && !getFocusedHandle(state) && !selection.empty ? (_hoistedPos = hoistedPos) !== null && _hoistedPos !== void 0 ? _hoistedPos : from : getCurrentNodePos(state);
+    const currentNodePos = !getFocusedHandle(state) && !selection.empty ? (_hoistedPos = hoistedPos) !== null && _hoistedPos !== void 0 ? _hoistedPos : from : getCurrentNodePos(state);
     if (currentNodePos > -1) {
       var _state$doc$nodeAt;
       const $currentNodePos = state.doc.resolve(currentNodePos);
-      const nodeAfterPos = isMultiSelectEnabled && !getFocusedHandle(state) ? Math.max(expandedAnchor, expandedHead) : $currentNodePos.posAtIndex($currentNodePos.index() + 1);
+      const nodeAfterPos = !getFocusedHandle(state) ? Math.max(expandedAnchor, expandedHead) : $currentNodePos.posAtIndex($currentNodePos.index() + 1);
       const isTopLevelNode = $currentNodePos.depth === 0;
       let moveToPos = -1;
       const isLayoutColumnSelected = selection instanceof NodeSelection && selection.node.type.name === 'layoutColumn';
@@ -284,21 +283,10 @@ export const moveNodeViaShortcut = (api, direction, formatMessage) => {
           return tr;
         });
         return true;
-      } else if (nodeType && !isMultiSelectEnabled) {
+      } else {
         var _api$core8;
-        // If the node is first/last one, only select the node
         api === null || api === void 0 ? void 0 : (_api$core8 = api.core) === null || _api$core8 === void 0 ? void 0 : _api$core8.actions.execute(({
           tr
-        }) => {
-          selectNode(tr, currentNodePos, nodeType, api);
-          tr.scrollIntoView();
-          return tr;
-        });
-        return true;
-      } else if (isMultiSelectEnabled) {
-        var _api$core9;
-        api === null || api === void 0 ? void 0 : (_api$core9 = api.core) === null || _api$core9 === void 0 ? void 0 : _api$core9.actions.execute(({
-          tr
         }) => {
           api === null || api === void 0 ? void 0 : api.blockControls.commands.setMultiSelectPositions($newAnchor.pos, $newHead.pos)({
             tr
@@ -326,7 +314,6 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
   let sliceFrom = start;
   let sliceTo;
   let sourceNodeTypes, hasSelectedMultipleNodes;
-  const isMultiSelect = editorExperiment('platform_editor_element_drag_and_drop_multiselect', true);
   if (fg('platform_editor_ease_of_use_metrics')) {
     var _api$metrics;
     api === null || api === void 0 ? void 0 : (_api$metrics = api.metrics) === null || _api$metrics === void 0 ? void 0 : _api$metrics.commands.setContentMoved()({
@@ -342,17 +329,13 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
     const attributes = getMultiSelectAnalyticsAttributes(tr, sliceFrom, sliceTo);
     hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
     sourceNodeTypes = attributes.nodeTypes;
-  } else if (isMultiSelect) {
+  } else {
     const slicePosition = getSelectedSlicePosition(start, tr, api);
     sliceFrom = slicePosition.from;
     sliceTo = slicePosition.to;
     const attributes = getMultiSelectAnalyticsAttributes(tr, sliceFrom, sliceTo);
     hasSelectedMultipleNodes = attributes.hasSelectedMultipleNodes;
     sourceNodeTypes = attributes.nodeTypes;
-  } else {
-    var _handleNode$nodeSize;
-    const size = (_handleNode$nodeSize = handleNode === null || handleNode === void 0 ? void 0 : handleNode.nodeSize) !== null && _handleNode$nodeSize !== void 0 ? _handleNode$nodeSize : 1;
-    sliceTo = sliceFrom + size;
   }
   const {
     expand,
@@ -429,13 +412,11 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
       ...currMeta,
       preservedSelectionMapping: new Mapping([new StepMap([0, 0, nodeMovedOffset])])
     });
-  } else if (isMultiSelect) {
+  } else {
     var _api$blockControls$co2;
     tr = (_api$blockControls$co2 = api === null || api === void 0 ? void 0 : api.blockControls.commands.setMultiSelectPositions(mappedTo, mappedTo + sliceSize)({
       tr
     })) !== null && _api$blockControls$co2 !== void 0 ? _api$blockControls$co2 : tr;
-  } else {
-    tr = selectNode(tr, mappedTo, handleNode.type.name, api);
   }
   const currMeta = tr.getMeta(key);
   tr.setMeta(key, {
@@ -457,7 +438,7 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
     }
   }
   if (editorExperiment('advanced_layouts', true)) {
-    attachMoveNodeAnalytics(tr, inputMethod, $handlePos.depth, handleNode.type.name, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name, $handlePos.sameParent($mappedTo), api, sourceNodeTypes, hasSelectedMultipleNodes);
+    attachMoveNodeAnalytics(tr, inputMethod, $handlePos.depth, sourceNodeTypes, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth, $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name, $handlePos.sameParent($mappedTo), api, hasSelectedMultipleNodes);
   } else {
     var _api$analytics;
     api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.attachAnalyticsEvent({
@@ -467,14 +448,11 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
       actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
       attributes: {
         nodeDepth: $handlePos.depth,
-        nodeType: handleNode.type.name,
+        nodeTypes: sourceNodeTypes,
         destinationNodeDepth: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.depth,
         destinationNodeType: $mappedTo === null || $mappedTo === void 0 ? void 0 : $mappedTo.parent.type.name,
         inputMethod,
-        ...(isMultiSelect && {
-          sourceNodeTypes,
-          hasSelectedMultipleNodes
-        })
+        hasSelectedMultipleNodes
       }
     })(tr);
   }