@atlaskit/editor-plugin-block-controls 7.7.2 → 7.7.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 7.7.3
+
+### Patch Changes
+
+- [`aa5913a5d4962`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/aa5913a5d4962) -
+  [ux] EDITOR-2679 Fix multiselect collapsing issues for drag handle selections and block menu
+- Updated dependencies
+
 ## 7.7.2
 
 ### Patch Changes

package/dist/cjs/blockControlsPlugin.js

@@ -20,6 +20,8 @@ var _moveNodeUtils = require("./editor-commands/utils/move-node-utils");
 var _firstNodeDecPlugin = require("./pm-plugins/first-node-dec-plugin");
 var _pmPlugin = require("./pm-plugins/interaction-tracking/pm-plugin");
 var _main = require("./pm-plugins/main");
+var _editorCommands = require("./pm-plugins/selection-preservation/editor-commands");
+var _pmPlugin2 = require("./pm-plugins/selection-preservation/pm-plugin");
 var _getSelection = require("./pm-plugins/utils/getSelection");
 var _blockMenu = _interopRequireDefault(require("./ui/block-menu"));
 var _dragHandleMenu = require("./ui/drag-handle-menu");
@@ -45,6 +47,12 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
           plugin: _pmPlugin.createInteractionTrackingPlugin
         });
       }
+      if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+        pmPlugins.push({
+          name: 'blockControlsSelectionPreservationPlugin',
+          plugin: _pmPlugin2.createSelectionPreservationPlugin
+        });
+      }
 
       // platform_editor_controls note: quick insert rendering fixes
       if ((0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(api === null || api === void 0 ? void 0 : api.toolbar))) {
@@ -239,6 +247,12 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
       },
       moveNodeWithBlockMenu: function moveNodeWithBlockMenu(direction) {
         return (0, _moveNodeWithBlockMenu2.moveNodeWithBlockMenu)(api, direction);
+      },
+      startPreservingSelection: function startPreservingSelection() {
+        return _editorCommands.startPreservingSelection;
+      },
+      stopPreservingSelection: function stopPreservingSelection() {
+        return _editorCommands.stopPreservingSelection;
       }
     },
     getSharedState: function getSharedState(editorState) {

package/dist/cjs/pm-plugins/selection-preservation/editor-commands.js

@@ -0,0 +1,32 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.stopPreservingSelection = exports.startPreservingSelection = void 0;
+var _pluginKey = require("./plugin-key");
+/**
+ * Start preserving the selection when a UI interaction requires it
+ *
+ * e.g., block menu open, drag-and-drop in progress
+ */
+var startPreservingSelection = exports.startPreservingSelection = function startPreservingSelection(_ref) {
+  var tr = _ref.tr;
+  var meta = {
+    type: 'startPreserving'
+  };
+  return tr.setMeta(_pluginKey.selectionPreservationPluginKey, meta);
+};
+
+/**
+ * Stop preserving the selection when a UI interaction completes
+ *
+ * e.g., block menu closed, drag-and-drop ended
+ */
+var stopPreservingSelection = exports.stopPreservingSelection = function stopPreservingSelection(_ref2) {
+  var tr = _ref2.tr;
+  var meta = {
+    type: 'stopPreserving'
+  };
+  return tr.setMeta(_pluginKey.selectionPreservationPluginKey, meta);
+};

package/dist/cjs/pm-plugins/selection-preservation/plugin-key.js

@@ -0,0 +1,8 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.selectionPreservationPluginKey = void 0;
+var _state = require("@atlaskit/editor-prosemirror/state");
+var selectionPreservationPluginKey = exports.selectionPreservationPluginKey = new _state.PluginKey('selectionPreservationPlugin');

package/dist/cjs/pm-plugins/selection-preservation/pm-plugin.js

@@ -0,0 +1,99 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createSelectionPreservationPlugin = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _editorCommands = require("./editor-commands");
+var _pluginKey = require("./plugin-key");
+var _utils = require("./utils");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+/**
+ * Selection Preservation Plugin for ProseMirror Editor
+ *
+ * Solves a ProseMirror limitation where TextSelection cannot include positions at node boundaries
+ * (like media/images). When a selection spans text + media nodes, subsequent transactions cause
+ * ProseMirror to collapse the selection to the nearest inline position, excluding the media node.
+ * This is problematic for features like block menus and drag-and-drop that need stable multi-node
+ * selections while performing operations.
+ *
+ * The plugin works in three phases:
+ * (1) Explicitly save a selection via startPreservingSelection() when opening block menus or starting drag operations.
+ * (2) Map the saved selection through document changes to keep positions valid.
+ * (3) Detect when transactions collapse the selection and restore it via appendTransaction().
+ *
+ * Stops preserving via stopPreservingSelection() when the menu closes or operation completes.
+ *
+ * Commands: startPreservingSelection() to begin preservation, stopPreservingSelection() to end it.
+ *
+ * NOTE: Only use when the UI blocks user selection changes. For example: when a block menu overlay
+ * is open (editor becomes non-interactive), during drag-and-drop operations (user is mid-drag), or
+ * when modal dialogs are active. In these states, any selection changes are from ProseMirror's
+ * internal behavior (not user input) and should be prevented. Do not use during normal editing.
+ */
+var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugin = function createSelectionPreservationPlugin() {
+  return new _safePlugin.SafePlugin({
+    key: _pluginKey.selectionPreservationPluginKey,
+    state: {
+      init: function init() {
+        return {
+          preservedSelection: undefined
+        };
+      },
+      apply: function apply(tr, pluginState) {
+        var meta = (0, _utils.getSelectionPreservationMeta)(tr);
+        var newState = _objectSpread({}, pluginState);
+        if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'startPreserving') {
+          newState.preservedSelection = new _state.TextSelection(tr.selection.$from, tr.selection.$to);
+        } else if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'stopPreserving') {
+          newState.preservedSelection = undefined;
+        }
+        if (newState.preservedSelection && tr.docChanged) {
+          var mapped = new _state.TextSelection(newState.preservedSelection.$from, newState.preservedSelection.$to);
+          mapped.map(tr.doc, tr.mapping);
+          if (mapped.from >= 0 && mapped.to <= tr.doc.content.size && mapped.from !== mapped.to) {
+            newState.preservedSelection = mapped;
+          } else if (mapped.from === mapped.to) {
+            // If selection has collapsed to a cursor, e.g. after deleting the selection, stop preserving
+            newState.preservedSelection = undefined;
+          }
+        }
+        return newState;
+      }
+    },
+    appendTransaction: function appendTransaction(transactions, _oldState, newState) {
+      var pluginState = _pluginKey.selectionPreservationPluginKey.getState(newState);
+      var savedSel = pluginState === null || pluginState === void 0 ? void 0 : pluginState.preservedSelection;
+      if (!savedSel) {
+        return null;
+      }
+      if ((0, _utils.hasUserSelectionChange)(transactions)) {
+        // Auto-stop if user explicitly changes selection
+        return (0, _editorCommands.stopPreservingSelection)({
+          tr: newState.tr
+        });
+      }
+      var currSel = newState.selection;
+      var wasEmptySelection = savedSel.from === savedSel.to;
+      var selectionUnchanged = currSel.from === savedSel.from && currSel.to === savedSel.to;
+      var selectionInvalid = savedSel.from < 0 || savedSel.to > newState.doc.content.size;
+      if (wasEmptySelection || selectionUnchanged || selectionInvalid) {
+        return null;
+      }
+      try {
+        return newState.tr.setSelection(_state.TextSelection.create(newState.doc, savedSel.from, savedSel.to));
+      } catch (error) {
+        (0, _monitoring.logException)(error, {
+          location: 'editor-plugin-block-controls/SelectionPreservationPlugin'
+        });
+      }
+      return null;
+    }
+  });
+};

package/dist/cjs/pm-plugins/selection-preservation/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasUserSelectionChange = exports.getSelectionPreservationMeta = void 0;
+var _pluginKey = require("./plugin-key");
+/**
+ * Detects if any of the transactions include user-driven selection changes.
+ *
+ * @param transactions The list of transactions to check.
+ * @returns True if any transaction includes a user-driven selection change, otherwise false.
+ */
+var hasUserSelectionChange = exports.hasUserSelectionChange = function hasUserSelectionChange(transactions) {
+  return transactions.some(function (tr) {
+    return tr.getMeta('pointer') || tr.getMeta('uiEvent') || tr.getMeta('paste') || tr.getMeta('cut') || tr.getMeta('composition') ||
+    // IME input
+    // Keyboard events that change selection
+    tr.getMeta('addToHistory') && tr.selectionSet;
+  });
+};
+var getSelectionPreservationMeta = exports.getSelectionPreservationMeta = function getSelectionPreservationMeta(tr) {
+  return tr.getMeta(_pluginKey.selectionPreservationPluginKey);
+};

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

@@ -11,6 +11,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _bindEventListener = require("bind-event-listener");
+var _browserApis = require("@atlaskit/browser-apis");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _browser = require("@atlaskit/editor-common/browser");
 var _hooks = require("@atlaskit/editor-common/hooks");
@@ -34,6 +35,7 @@ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _decorationsCommon = require("../pm-plugins/decorations-common");
 var _main = require("../pm-plugins/main");
+var _pluginKey = require("../pm-plugins/selection-preservation/plugin-key");
 var _analytics2 = require("../pm-plugins/utils/analytics");
 var _dragHandlePositions = require("../pm-plugins/utils/drag-handle-positions");
 var _getSelection = require("../pm-plugins/utils/getSelection");
@@ -296,18 +298,81 @@ var getNodeMargins = function getNodeMargins(node) {
   }
   return _consts2.nodeMargins[nodeTypeName] || _consts2.nodeMargins['default'];
 };
-var DragHandle = exports.DragHandle = function DragHandle(_ref) {
-  var _api$core3;
-  var view = _ref.view,
-    api = _ref.api,
-    formatMessage = _ref.formatMessage,
-    getPos = _ref.getPos,
-    anchorName = _ref.anchorName,
-    nodeType = _ref.nodeType,
-    handleOptions = _ref.handleOptions,
-    _ref$isTopLevelNode = _ref.isTopLevelNode,
-    isTopLevelNode = _ref$isTopLevelNode === void 0 ? true : _ref$isTopLevelNode,
-    anchorRectCache = _ref.anchorRectCache;
+var isRangeSpanningMultipleNodes = function isRangeSpanningMultipleNodes(range) {
+  if (range.endIndex - range.startIndex <= 1) {
+    return false; // At most one child
+  }
+
+  // Count block nodes in the range, return true if more than one
+  var blockCount = 0;
+  for (var i = range.startIndex; i < range.endIndex; i++) {
+    if (range.parent.child(i).isBlock) {
+      blockCount++;
+    }
+    if (blockCount > 1) {
+      return true;
+    }
+  }
+  return false;
+};
+var shouldExpandSelection = function shouldExpandSelection(range, startPos) {
+  return !!range && isRangeSpanningMultipleNodes(range) && range.start <= startPos && range.end >= startPos + 1;
+};
+var calculateBlockRange = function calculateBlockRange(_ref) {
+  var selection = _ref.selection,
+    doc = _ref.doc,
+    resolvedStartPos = _ref.resolvedStartPos,
+    isShiftPressed = _ref.isShiftPressed;
+  if (!isShiftPressed) {
+    // When not pressing shift, create range including all block nodes within the selection
+    return selection.$from.blockRange(selection.$to);
+  }
+  if (resolvedStartPos.pos < selection.from) {
+    // If shift+click selecting upwards, get range from start of node to end of selection
+    return resolvedStartPos.blockRange(selection.$to);
+  }
+
+  // Shift+click selecting downwards, get range from start of selection to pos within or after node
+  var resolvedPosWithinOrAfterNode = doc.resolve(resolvedStartPos.pos + 1);
+  return selection.$from.blockRange(resolvedPosWithinOrAfterNode);
+};
+var createExpandedSelection = function createExpandedSelection(doc, selection, range) {
+  return _state.TextSelection.create(doc, Math.min(selection.from, range.start), Math.max(selection.to, range.end));
+};
+var createSelectionFromRange = function createSelectionFromRange(_ref2) {
+  var tr = _ref2.tr,
+    selection = _ref2.selection,
+    startPos = _ref2.startPos,
+    nodeType = _ref2.nodeType,
+    range = _ref2.range,
+    api = _ref2.api;
+  if (range && shouldExpandSelection(range, startPos)) {
+    var expandedSelection = createExpandedSelection(tr.doc, selection, range);
+    if (!expandedSelection.eq(tr.selection)) {
+      tr.setSelection(expandedSelection);
+    }
+    return tr;
+  }
+  var node = tr.doc.nodeAt(startPos);
+  var isEmptyNode = (node === null || node === void 0 ? void 0 : node.content.size) === 0;
+  if (isEmptyNode && node.type.name !== 'paragraph') {
+    tr.setSelection(new _state.NodeSelection(tr.doc.resolve(startPos)));
+    return tr;
+  }
+  return (0, _getSelection.selectNode)(tr, startPos, nodeType, api);
+};
+var DragHandle = exports.DragHandle = function DragHandle(_ref3) {
+  var _api$core4;
+  var view = _ref3.view,
+    api = _ref3.api,
+    formatMessage = _ref3.formatMessage,
+    getPos = _ref3.getPos,
+    anchorName = _ref3.anchorName,
+    nodeType = _ref3.nodeType,
+    handleOptions = _ref3.handleOptions,
+    _ref3$isTopLevelNode = _ref3.isTopLevelNode,
+    isTopLevelNode = _ref3$isTopLevelNode === void 0 ? true : _ref3$isTopLevelNode,
+    anchorRectCache = _ref3.anchorRectCache;
   var buttonRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -368,14 +433,69 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
       }
     }
   }, [anchorName, nodeType, view.dom]);
-  var handleOnClick = (0, _react.useCallback)(function (e) {
+  var handleOnClickNew = (0, _react.useCallback)(function (e) {
     var _api$core;
+    api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref4) {
+      var _api$analytics, _resolvedStartPos$nod, _selectionPreservatio, _api$blockControls, _api$blockControls2;
+      var tr = _ref4.tr;
+      var startPos = getPos();
+      if (startPos === undefined) {
+        return tr;
+      }
+      var resolvedStartPos = tr.doc.resolve(startPos);
+      api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
+        eventType: _analytics.EVENT_TYPE.UI,
+        action: _analytics.ACTION.CLICKED,
+        actionSubject: _analytics.ACTION_SUBJECT.BUTTON,
+        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) || ''
+        }
+      })(tr);
+      var preservedSelection = (_selectionPreservatio = _pluginKey.selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
+      var selection = preservedSelection || tr.selection;
+      var range = calculateBlockRange({
+        doc: tr.doc,
+        selection: selection,
+        resolvedStartPos: resolvedStartPos,
+        isShiftPressed: e.shiftKey
+      });
+      tr = createSelectionFromRange({
+        tr: tr,
+        selection: selection,
+        startPos: startPos,
+        nodeType: nodeType,
+        range: range,
+        api: api
+      });
+      api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || _api$blockControls.commands.startPreservingSelection()({
+        tr: tr
+      });
+      api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.toggleBlockMenu({
+        anchorName: anchorName,
+        openedViaKeyboard: false,
+        triggerByNode: (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_synced_block', 'isEnabled', true) ? {
+          nodeType: nodeType,
+          pos: startPos,
+          rootPos: tr.doc.resolve(startPos).before(1)
+        } : undefined
+      })({
+        tr: tr
+      });
+      tr.setMeta('scrollIntoView', false);
+      return tr;
+    });
+    view.focus();
+  }, [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$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref2) {
-      var _api$blockControls$sh, _api$analytics;
-      var tr = _ref2.tr;
+    api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref5) {
+      var _api$blockControls$sh, _api$analytics2;
+      var tr = _ref5.tr;
       var startPos = getPos();
       if (startPos === undefined) {
         return tr;
@@ -404,8 +524,8 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
           rootPos: rootPos
         } : undefined;
         if (_consts2.BLOCK_MENU_ENABLED && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
-          var _api$blockControls;
-          api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || _api$blockControls.commands.toggleBlockMenu({
+          var _api$blockControls3;
+          api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.toggleBlockMenu({
             anchorName: anchorName,
             triggerByNode: triggerByNode,
             openedViaKeyboard: (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? false : undefined
@@ -414,8 +534,8 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
           });
           e.stopPropagation();
         } else if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
-          var _api$blockControls2;
-          api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.toggleBlockMenu({
+          var _api$blockControls4;
+          api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 || _api$blockControls4.commands.toggleBlockMenu({
             anchorName: anchorName,
             triggerByNode: triggerByNode,
             openedViaKeyboard: (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? false : undefined
@@ -425,18 +545,18 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
           e.stopPropagation();
         }
       } else if (isTopLevelNode && $anchor.depth <= _consts2.DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH && e.shiftKey && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_shift_click_select')) {
-        var _api$blockControls3;
+        var _api$blockControls5;
         var alignAnchorHeadToSel = (0, _selection3.alignAnchorHeadInDirectionOfPos)(tr.selection, startPos);
         var selectionWithExpandedHead = (0, _selection3.expandSelectionHeadToNodeAtPos)(alignAnchorHeadToSel, startPos);
         tr.setSelection(selectionWithExpandedHead);
-        api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.setMultiSelectPositions()({
+        api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 || _api$blockControls5.commands.setMultiSelectPositions()({
           tr: tr
         });
       }
       var resolvedMovingNode = tr.doc.resolve(startPos);
       var maybeNode = resolvedMovingNode.nodeAfter;
       tr.setMeta('scrollIntoView', false);
-      api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
+      api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
         eventType: _analytics.EVENT_TYPE.UI,
         action: _analytics.ACTION.CLICKED,
         actionSubject: _analytics.ACTION_SUBJECT.BUTTON,
@@ -453,10 +573,10 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
   var handleKeyDown = (0, _react.useCallback)(function (e) {
     // allow user to use spacebar to select the node
     if (!e.repeat && e.key === ' ') {
-      var _api$core2;
+      var _api$core3;
       var startPos = getPos();
-      api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 || _api$core2.actions.execute(function (_ref3) {
-        var tr = _ref3.tr;
+      api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 || _api$core3.actions.execute(function (_ref6) {
+        var tr = _ref6.tr;
         if (startPos === undefined) {
           return tr;
         }
@@ -479,20 +599,20 @@ 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$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions, isMultiSelect, view]);
+  }, [getPos, api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions, isMultiSelect, 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 === ' ') {
-      var _api$core4;
-      if (document.activeElement !== buttonRef.current) {
+      var _getDocument, _api$core5;
+      if (((_getDocument = (0, _browserApis.getDocument)()) === null || _getDocument === void 0 ? void 0 : _getDocument.activeElement) !== buttonRef.current) {
         return;
       }
       e.preventDefault();
       e.stopPropagation();
       var startPos = getPos();
-      api === null || api === void 0 || (_api$core4 = api.core) === null || _api$core4 === void 0 || _api$core4.actions.execute(function (_ref4) {
-        var _api$blockControls4, _api$userIntent;
-        var tr = _ref4.tr;
+      api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.execute(function (_ref7) {
+        var _api$blockControls6, _api$userIntent;
+        var tr = _ref7.tr;
         if (startPos === undefined) {
           return tr;
         }
@@ -506,7 +626,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
           pos: startPos,
           rootPos: rootPos
         } : undefined;
-        api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 || _api$blockControls4.commands.toggleBlockMenu({
+        api === null || api === void 0 || (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 || _api$blockControls6.commands.toggleBlockMenu({
           anchorName: anchorName,
           triggerByNode: triggerByNode,
           openedViaKeyboard: true
@@ -521,11 +641,11 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
     } else if (e.key === 'Backspace' || e.key === 'Delete') {
       e.preventDefault();
       e.stopPropagation();
-      api === null || api === void 0 || api.core.actions.execute(function (_ref5) {
-        var _api$blockControls5;
-        var tr = _ref5.tr;
+      api === null || api === void 0 || api.core.actions.execute(function (_ref8) {
+        var _api$blockControls7;
+        var tr = _ref8.tr;
         (0, _selection2.deleteSelectedRange)(tr);
-        api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 || _api$blockControls5.commands.toggleBlockMenu({
+        api === null || api === void 0 || (_api$blockControls7 = api.blockControls) === null || _api$blockControls7 === void 0 || _api$blockControls7.commands.toggleBlockMenu({
           closeMenu: true
         })({
           tr: tr
@@ -553,21 +673,21 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
           start: start
         };
       },
-      onGenerateDragPreview: function onGenerateDragPreview(_ref6) {
+      onGenerateDragPreview: function onGenerateDragPreview(_ref9) {
         var _api$blockControls$sh2;
-        var nativeSetDragImage = _ref6.nativeSetDragImage;
+        var nativeSetDragImage = _ref9.nativeSetDragImage;
         if (isMultiSelect) {
-          var _api$core5;
-          api === null || api === void 0 || (_api$core5 = api.core) === null || _api$core5 === void 0 || _api$core5.actions.execute(function (_ref7) {
-            var tr = _ref7.tr;
+          var _api$core6;
+          api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 || _api$core6.actions.execute(function (_ref0) {
+            var tr = _ref0.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()({
+              var _api$blockControls8;
+              api === null || api === void 0 || (_api$blockControls8 = api.blockControls) === null || _api$blockControls8 === void 0 || _api$blockControls8.commands.setMultiSelectPositions()({
                 tr: tr
               });
             } else if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_select_node_on_drag')) {
@@ -637,8 +757,8 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
               };
             }
           },
-          render: function render(_ref8) {
-            var container = _ref8.container;
+          render: function render(_ref1) {
+            var container = _ref1.container;
             var dom = view.dom.querySelector("[".concat((0, _domAttrName.getAnchorAttrName)(), "=\"").concat(anchorName, "\"]"));
             if (!dom) {
               return;
@@ -670,13 +790,13 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         });
       },
       onDragStart: function onDragStart() {
-        var _api$core6;
+        var _api$core7;
         if (start === undefined) {
           return;
         }
-        api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 || _api$core6.actions.execute(function (_ref9) {
-          var _api$blockControls$sh3, _api$blockControls7, _api$analytics2;
-          var tr = _ref9.tr;
+        api === null || api === void 0 || (_api$core7 = api.core) === null || _api$core7 === void 0 || _api$core7.actions.execute(function (_ref10) {
+          var _api$blockControls$sh3, _api$blockControls9, _api$analytics3;
+          var tr = _ref10.tr;
           var nodeTypes, hasSelectedMultipleNodes;
           var resolvedMovingNode = tr.doc.resolve(start);
           var maybeNode = resolvedMovingNode.nodeAfter;
@@ -689,11 +809,11 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
             nodeTypes = maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name;
             hasSelectedMultipleNodes = false;
           }
-          api === null || api === void 0 || (_api$blockControls7 = api.blockControls) === null || _api$blockControls7 === void 0 || _api$blockControls7.commands.setNodeDragged(getPos, anchorName, nodeType)({
+          api === null || api === void 0 || (_api$blockControls9 = api.blockControls) === null || _api$blockControls9 === void 0 || _api$blockControls9.commands.setNodeDragged(getPos, anchorName, nodeType)({
             tr: tr
           });
           tr.setMeta('scrollIntoView', false);
-          api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
+          api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 || _api$analytics3.actions.attachAnalyticsEvent({
             eventType: _analytics.EVENT_TYPE.UI,
             action: _analytics.ACTION.DRAGGED,
             actionSubject: _analytics.ACTION_SUBJECT.ELEMENT,
@@ -987,7 +1107,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
         ,
         style: !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? (0, _experiments.editorExperiment)('platform_editor_block_control_optimise_render', true) ? positionStyles : positionStylesOld : {},
-        onClick: handleOnClick,
+        onClick: (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) ? handleOnClickNew : handleOnClick,
         onKeyDown: (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? handleKeyDownNew : handleKeyDown
         // eslint-disable-next-line @atlaskit/design-system/no-direct-use-of-web-platform-drag-and-drop
         ,
@@ -1072,15 +1192,15 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref) {
   var render = isTooltip ? buttonWithTooltip() : renderButton();
   return (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? stickyRender : render;
 };
-var DragHandleWithVisibility = exports.DragHandleWithVisibility = function DragHandleWithVisibility(_ref0) {
-  var view = _ref0.view,
-    api = _ref0.api,
-    formatMessage = _ref0.formatMessage,
-    getPos = _ref0.getPos,
-    anchorName = _ref0.anchorName,
-    nodeType = _ref0.nodeType,
-    handleOptions = _ref0.handleOptions,
-    anchorRectCache = _ref0.anchorRectCache;
+var DragHandleWithVisibility = exports.DragHandleWithVisibility = function DragHandleWithVisibility(_ref11) {
+  var view = _ref11.view,
+    api = _ref11.api,
+    formatMessage = _ref11.formatMessage,
+    getPos = _ref11.getPos,
+    anchorName = _ref11.anchorName,
+    nodeType = _ref11.nodeType,
+    handleOptions = _ref11.handleOptions,
+    anchorRectCache = _ref11.anchorRectCache;
   return (0, _react2.jsx)(_visibilityContainer.VisibilityContainer, {
     api: api
   }, (0, _react2.jsx)(DragHandle, {

package/dist/es2019/blockControlsPlugin.js

@@ -12,6 +12,8 @@ import { canMoveNodeUpOrDown } from './editor-commands/utils/move-node-utils';
 import { firstNodeDecPlugin } from './pm-plugins/first-node-dec-plugin';
 import { createInteractionTrackingPlugin, interactionTrackingPluginKey } from './pm-plugins/interaction-tracking/pm-plugin';
 import { createPlugin, key } from './pm-plugins/main';
+import { startPreservingSelection, stopPreservingSelection } from './pm-plugins/selection-preservation/editor-commands';
+import { createSelectionPreservationPlugin } from './pm-plugins/selection-preservation/pm-plugin';
 import { selectNode } from './pm-plugins/utils/getSelection';
 import BlockMenu from './ui/block-menu';
 import { DragHandleMenu } from './ui/drag-handle-menu';
@@ -34,6 +36,12 @@ export const blockControlsPlugin = ({
         plugin: createInteractionTrackingPlugin
       });
     }
+    if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+      pmPlugins.push({
+        name: 'blockControlsSelectionPreservationPlugin',
+        plugin: createSelectionPreservationPlugin
+      });
+    }
 
     // platform_editor_controls note: quick insert rendering fixes
     if (areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar))) {
@@ -233,7 +241,9 @@ export const blockControlsPlugin = ({
     },
     moveNodeWithBlockMenu: direction => {
       return moveNodeWithBlockMenu(api, direction);
-    }
+    },
+    startPreservingSelection: () => startPreservingSelection,
+    stopPreservingSelection: () => stopPreservingSelection
   },
   getSharedState(editorState) {
     var _key$getState$isMenuO, _key$getState, _key$getState$menuTri, _key$getState2, _key$getState$menuTri2, _key$getState3, _key$getState$blockMe, _key$getState4, _key$getState$activeN, _key$getState5, _key$getState$activeD, _key$getState6, _key$getState$isDragg, _key$getState7, _key$getState$isPMDra, _key$getState8, _key$getState$multiSe, _key$getState9, _key$getState$isShift, _key$getState0, _key$getState$lastDra, _key$getState1, _interactionTrackingP, _key$getState$isSelec, _key$getState10;