@atlaskit/editor-plugin-block-controls 7.7.4 → 7.7.6

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 7.7.6
+
+### Patch Changes
+
+- [`253460bc61db3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/253460bc61db3) -
+  [ux] EDITOR-3380 use preserved selection for block menu move action
+- [`1b3603981c776`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1b3603981c776) -
+  EDITOR-3380 ensure we preserve the same selection type
+- Updated dependencies
+
+## 7.7.5
+
+### Patch Changes
+
+- [`6f765533c791b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6f765533c791b) -
+  FG platform_editor_block_menu_patch_1 clean up.
+- Updated dependencies
+
 ## 7.7.4
 
 ### Patch Changes

package/dist/cjs/blockControlsPlugin.js

@@ -21,6 +21,7 @@ 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 _pluginKey = require("./pm-plugins/selection-preservation/plugin-key");
 var _pmPlugin2 = require("./pm-plugins/selection-preservation/pm-plugin");
 var _getSelection = require("./pm-plugins/utils/getSelection");
 var _blockMenu = _interopRequireDefault(require("./ui/block-menu"));
@@ -279,6 +280,10 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
         var _interactionTrackingP2, _interactionTrackingP3;
         sharedState.isMouseOut = (_interactionTrackingP2 = (_interactionTrackingP3 = _pmPlugin.interactionTrackingPluginKey.getState(editorState)) === null || _interactionTrackingP3 === void 0 ? void 0 : _interactionTrackingP3.isMouseOut) !== null && _interactionTrackingP2 !== void 0 ? _interactionTrackingP2 : false;
       }
+      if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+        var _selectionPreservatio;
+        sharedState.preservedSelection = (_selectionPreservatio = _pluginKey.selectionPreservationPluginKey.getState(editorState)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
+      }
       return sharedState;
     },
     contentComponent: function contentComponent(_ref8) {

package/dist/cjs/editor-commands/move-node-with-block-menu.js

@@ -12,14 +12,17 @@ var _moveNode = require("./move-node");
 var _moveNodeUtils = require("./utils/move-node-utils");
 var moveNodeWithBlockMenu = exports.moveNodeWithBlockMenu = function moveNodeWithBlockMenu(api, direction) {
   return function (_ref) {
+    var _api$blockControls$sh;
     var tr = _ref.tr;
     if (!(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
       return tr;
     }
+    var preservedSelection = api === null || api === void 0 || (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.preservedSelection;
+    var selection = preservedSelection !== null && preservedSelection !== void 0 ? preservedSelection : tr.selection;
 
     // Nodes like lists nest within themselves, we need to find the top most position
     var currentNodePos = (0, _moveNodeUtils.getCurrentNodePosFromDragHandleSelection)({
-      selection: tr.selection,
+      selection: selection,
       schema: tr.doc.type.schema,
       resolve: tr.doc.resolve.bind(tr.doc)
     });

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

@@ -15,13 +15,18 @@ 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
+ * Selection Preservation Plugin
  *
- * 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.
+ * Used to ensure the selection remains stable across selected nodes during specific UI operations,
+ * such as when block menus are open or during drag-and-drop actions.
+ *
+ * We use a TextSelection to span multi-node selections, however there is a ProseMirror limitation
+ * where TextSelection cannot include non inline 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.
@@ -50,23 +55,12 @@ var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugi
         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);
+          newState.preservedSelection = tr.selection;
         } else if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'stopPreserving') {
           newState.preservedSelection = undefined;
         }
         if (newState.preservedSelection && tr.docChanged) {
-          var from = tr.mapping.map(newState.preservedSelection.from);
-          var to = tr.mapping.map(newState.preservedSelection.to);
-          if (from < 0 || to > tr.doc.content.size || from >= to) {
-            // stop preserving if preserved selection becomes invalid or collapsed to a cursor
-            // e.g. after deleting the selection
-            newState.preservedSelection = undefined;
-          } else {
-            var _expandToBlockRange = expandToBlockRange(tr.doc.resolve(from), tr.doc.resolve(to)),
-              $from = _expandToBlockRange.$from,
-              $to = _expandToBlockRange.$to;
-            newState.preservedSelection = new _state.TextSelection($from, $to);
-          }
+          newState.preservedSelection = mapSelection(newState.preservedSelection, tr);
         }
         return newState;
       }
@@ -91,7 +85,7 @@ var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugi
         return null;
       }
       try {
-        return newState.tr.setSelection(_state.TextSelection.create(newState.doc, savedSel.from, savedSel.to));
+        return newState.tr.setSelection(savedSel);
       } catch (error) {
         (0, _monitoring.logException)(error, {
           location: 'editor-plugin-block-controls/SelectionPreservationPlugin'
@@ -101,6 +95,30 @@ var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugi
     }
   });
 };
+var mapSelection = function mapSelection(selection, tr) {
+  if (selection instanceof _state.TextSelection) {
+    var from = tr.mapping.map(selection.from);
+    var to = tr.mapping.map(selection.to);
+
+    // expand the text selection range to block boundaries, so as document changes occur the
+    // selection always includes whole nodes
+    var _expandToBlockRange = expandToBlockRange(tr.doc.resolve(from), tr.doc.resolve(to)),
+      $from = _expandToBlockRange.$from,
+      $to = _expandToBlockRange.$to;
+
+    // stop preserving if preserved selection becomes invalid or collapsed to a cursor
+    // e.g. after deleting the selection
+    if ($from.pos < 0 || $to.pos > tr.doc.content.size || $from.pos >= $to.pos) {
+      return undefined;
+    }
+    return new _state.TextSelection($from, $to);
+  }
+  try {
+    return selection.map(tr.doc, tr.mapping);
+  } catch (_unused) {
+    return undefined;
+  }
+};
 var expandToBlockRange = function expandToBlockRange($from, $to) {
   var range = $from.blockRange($to);
   if (!range) {

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

@@ -986,12 +986,12 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
       setDragHandleDisabled(false);
     }
   }, [api === null || api === void 0 ? void 0 : api.blockControls.sharedState, isMultiSelect, isShiftDown, isTopLevelNode, view]);
-  var dragHandleMessage = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_1') ? formatMessage(_messages.blockControlsMessages.dragToMoveClickToOpen, {
+  var dragHandleMessage = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) ? formatMessage(_messages.blockControlsMessages.dragToMoveClickToOpen, {
     br: (0, _react2.jsx)("br", null)
   }) : formatMessage(_messages.blockControlsMessages.dragToMove);
 
   // Create a string version for aria-label
-  var dragHandleAriaLabel = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_block_menu_patch_1') ? formatMessage(_messages.blockControlsMessages.dragToMoveClickToOpen, {
+  var dragHandleAriaLabel = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) ? formatMessage(_messages.blockControlsMessages.dragToMoveClickToOpen, {
     br: ' '
   }) : formatMessage(_messages.blockControlsMessages.dragToMove);
   var helpDescriptors = isTopLevelNode ? [{

package/dist/es2019/blockControlsPlugin.js

@@ -13,6 +13,7 @@ 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 { selectionPreservationPluginKey } from './pm-plugins/selection-preservation/plugin-key';
 import { createSelectionPreservationPlugin } from './pm-plugins/selection-preservation/pm-plugin';
 import { selectNode } from './pm-plugins/utils/getSelection';
 import BlockMenu from './ui/block-menu';
@@ -269,6 +270,10 @@ export const blockControlsPlugin = ({
       var _interactionTrackingP2, _interactionTrackingP3;
       sharedState.isMouseOut = (_interactionTrackingP2 = (_interactionTrackingP3 = interactionTrackingPluginKey.getState(editorState)) === null || _interactionTrackingP3 === void 0 ? void 0 : _interactionTrackingP3.isMouseOut) !== null && _interactionTrackingP2 !== void 0 ? _interactionTrackingP2 : false;
     }
+    if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+      var _selectionPreservatio;
+      sharedState.preservedSelection = (_selectionPreservatio = selectionPreservationPluginKey.getState(editorState)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
+    }
     return sharedState;
   },
   contentComponent({

package/dist/es2019/editor-commands/move-node-with-block-menu.js

@@ -8,13 +8,16 @@ export const moveNodeWithBlockMenu = (api, direction) => {
   return ({
     tr
   }) => {
+    var _api$blockControls$sh;
     if (!expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
       return tr;
     }
+    const preservedSelection = api === null || api === void 0 ? void 0 : (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.preservedSelection;
+    const selection = preservedSelection !== null && preservedSelection !== void 0 ? preservedSelection : tr.selection;
 
     // Nodes like lists nest within themselves, we need to find the top most position
     const currentNodePos = getCurrentNodePosFromDragHandleSelection({
-      selection: tr.selection,
+      selection,
       schema: tr.doc.type.schema,
       resolve: tr.doc.resolve.bind(tr.doc)
     });

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

@@ -6,13 +6,18 @@ import { selectionPreservationPluginKey } from './plugin-key';
 import { getSelectionPreservationMeta, hasUserSelectionChange } from './utils';
 
 /**
- * Selection Preservation Plugin for ProseMirror Editor
+ * Selection Preservation Plugin
  *
- * 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.
+ * Used to ensure the selection remains stable across selected nodes during specific UI operations,
+ * such as when block menus are open or during drag-and-drop actions.
+ *
+ * We use a TextSelection to span multi-node selections, however there is a ProseMirror limitation
+ * where TextSelection cannot include non inline 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.
@@ -43,24 +48,12 @@ export const createSelectionPreservationPlugin = () => {
           ...pluginState
         };
         if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'startPreserving') {
-          newState.preservedSelection = new TextSelection(tr.selection.$from, tr.selection.$to);
+          newState.preservedSelection = tr.selection;
         } else if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'stopPreserving') {
           newState.preservedSelection = undefined;
         }
         if (newState.preservedSelection && tr.docChanged) {
-          const from = tr.mapping.map(newState.preservedSelection.from);
-          const to = tr.mapping.map(newState.preservedSelection.to);
-          if (from < 0 || to > tr.doc.content.size || from >= to) {
-            // stop preserving if preserved selection becomes invalid or collapsed to a cursor
-            // e.g. after deleting the selection
-            newState.preservedSelection = undefined;
-          } else {
-            const {
-              $from,
-              $to
-            } = expandToBlockRange(tr.doc.resolve(from), tr.doc.resolve(to));
-            newState.preservedSelection = new TextSelection($from, $to);
-          }
+          newState.preservedSelection = mapSelection(newState.preservedSelection, tr);
         }
         return newState;
       }
@@ -85,7 +78,7 @@ export const createSelectionPreservationPlugin = () => {
         return null;
       }
       try {
-        return newState.tr.setSelection(TextSelection.create(newState.doc, savedSel.from, savedSel.to));
+        return newState.tr.setSelection(savedSel);
       } catch (error) {
         logException(error, {
           location: 'editor-plugin-block-controls/SelectionPreservationPlugin'
@@ -95,6 +88,31 @@ export const createSelectionPreservationPlugin = () => {
     }
   });
 };
+const mapSelection = (selection, tr) => {
+  if (selection instanceof TextSelection) {
+    const from = tr.mapping.map(selection.from);
+    const to = tr.mapping.map(selection.to);
+
+    // expand the text selection range to block boundaries, so as document changes occur the
+    // selection always includes whole nodes
+    const {
+      $from,
+      $to
+    } = expandToBlockRange(tr.doc.resolve(from), tr.doc.resolve(to));
+
+    // stop preserving if preserved selection becomes invalid or collapsed to a cursor
+    // e.g. after deleting the selection
+    if ($from.pos < 0 || $to.pos > tr.doc.content.size || $from.pos >= $to.pos) {
+      return undefined;
+    }
+    return new TextSelection($from, $to);
+  }
+  try {
+    return selection.map(tr.doc, tr.mapping);
+  } catch {
+    return undefined;
+  }
+};
 const expandToBlockRange = ($from, $to) => {
   const range = $from.blockRange($to);
   if (!range) {

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

@@ -975,12 +975,12 @@ export const DragHandle = ({
       setDragHandleDisabled(false);
     }
   }, [api === null || api === void 0 ? void 0 : api.blockControls.sharedState, isMultiSelect, isShiftDown, isTopLevelNode, view]);
-  const dragHandleMessage = expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_block_menu_patch_1') ? formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
+  const dragHandleMessage = expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
     br: jsx("br", null)
   }) : formatMessage(blockControlsMessages.dragToMove);
 
   // Create a string version for aria-label
-  const dragHandleAriaLabel = expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_block_menu_patch_1') ? formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
+  const dragHandleAriaLabel = expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
     br: ' '
   }) : formatMessage(blockControlsMessages.dragToMove);
   let helpDescriptors = isTopLevelNode ? [{

package/dist/esm/blockControlsPlugin.js

@@ -16,6 +16,7 @@ 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 as _startPreservingSelection, stopPreservingSelection as _stopPreservingSelection } from './pm-plugins/selection-preservation/editor-commands';
+import { selectionPreservationPluginKey } from './pm-plugins/selection-preservation/plugin-key';
 import { createSelectionPreservationPlugin } from './pm-plugins/selection-preservation/pm-plugin';
 import { selectNode } from './pm-plugins/utils/getSelection';
 import BlockMenu from './ui/block-menu';
@@ -272,6 +273,10 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
         var _interactionTrackingP2, _interactionTrackingP3;
         sharedState.isMouseOut = (_interactionTrackingP2 = (_interactionTrackingP3 = interactionTrackingPluginKey.getState(editorState)) === null || _interactionTrackingP3 === void 0 ? void 0 : _interactionTrackingP3.isMouseOut) !== null && _interactionTrackingP2 !== void 0 ? _interactionTrackingP2 : false;
       }
+      if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+        var _selectionPreservatio;
+        sharedState.preservedSelection = (_selectionPreservatio = selectionPreservationPluginKey.getState(editorState)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
+      }
       return sharedState;
     },
     contentComponent: function contentComponent(_ref8) {

package/dist/esm/editor-commands/move-node-with-block-menu.js

@@ -6,14 +6,17 @@ import { moveNode } from './move-node';
 import { getCurrentNodePosFromDragHandleSelection, getPosWhenMoveNodeDown, getPosWhenMoveNodeUp, getShouldMoveNode } from './utils/move-node-utils';
 export var moveNodeWithBlockMenu = function moveNodeWithBlockMenu(api, direction) {
   return function (_ref) {
+    var _api$blockControls$sh;
     var tr = _ref.tr;
     if (!expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
       return tr;
     }
+    var preservedSelection = api === null || api === void 0 || (_api$blockControls$sh = api.blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.preservedSelection;
+    var selection = preservedSelection !== null && preservedSelection !== void 0 ? preservedSelection : tr.selection;
 
     // Nodes like lists nest within themselves, we need to find the top most position
     var currentNodePos = getCurrentNodePosFromDragHandleSelection({
-      selection: tr.selection,
+      selection: selection,
       schema: tr.doc.type.schema,
       resolve: tr.doc.resolve.bind(tr.doc)
     });

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

@@ -9,13 +9,18 @@ import { selectionPreservationPluginKey } from './plugin-key';
 import { getSelectionPreservationMeta, hasUserSelectionChange } from './utils';
 
 /**
- * Selection Preservation Plugin for ProseMirror Editor
+ * Selection Preservation Plugin
  *
- * 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.
+ * Used to ensure the selection remains stable across selected nodes during specific UI operations,
+ * such as when block menus are open or during drag-and-drop actions.
+ *
+ * We use a TextSelection to span multi-node selections, however there is a ProseMirror limitation
+ * where TextSelection cannot include non inline 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.
@@ -44,23 +49,12 @@ export var createSelectionPreservationPlugin = function createSelectionPreservat
         var meta = getSelectionPreservationMeta(tr);
         var newState = _objectSpread({}, pluginState);
         if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'startPreserving') {
-          newState.preservedSelection = new TextSelection(tr.selection.$from, tr.selection.$to);
+          newState.preservedSelection = tr.selection;
         } else if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'stopPreserving') {
           newState.preservedSelection = undefined;
         }
         if (newState.preservedSelection && tr.docChanged) {
-          var from = tr.mapping.map(newState.preservedSelection.from);
-          var to = tr.mapping.map(newState.preservedSelection.to);
-          if (from < 0 || to > tr.doc.content.size || from >= to) {
-            // stop preserving if preserved selection becomes invalid or collapsed to a cursor
-            // e.g. after deleting the selection
-            newState.preservedSelection = undefined;
-          } else {
-            var _expandToBlockRange = expandToBlockRange(tr.doc.resolve(from), tr.doc.resolve(to)),
-              $from = _expandToBlockRange.$from,
-              $to = _expandToBlockRange.$to;
-            newState.preservedSelection = new TextSelection($from, $to);
-          }
+          newState.preservedSelection = mapSelection(newState.preservedSelection, tr);
         }
         return newState;
       }
@@ -85,7 +79,7 @@ export var createSelectionPreservationPlugin = function createSelectionPreservat
         return null;
       }
       try {
-        return newState.tr.setSelection(TextSelection.create(newState.doc, savedSel.from, savedSel.to));
+        return newState.tr.setSelection(savedSel);
       } catch (error) {
         logException(error, {
           location: 'editor-plugin-block-controls/SelectionPreservationPlugin'
@@ -95,6 +89,30 @@ export var createSelectionPreservationPlugin = function createSelectionPreservat
     }
   });
 };
+var mapSelection = function mapSelection(selection, tr) {
+  if (selection instanceof TextSelection) {
+    var from = tr.mapping.map(selection.from);
+    var to = tr.mapping.map(selection.to);
+
+    // expand the text selection range to block boundaries, so as document changes occur the
+    // selection always includes whole nodes
+    var _expandToBlockRange = expandToBlockRange(tr.doc.resolve(from), tr.doc.resolve(to)),
+      $from = _expandToBlockRange.$from,
+      $to = _expandToBlockRange.$to;
+
+    // stop preserving if preserved selection becomes invalid or collapsed to a cursor
+    // e.g. after deleting the selection
+    if ($from.pos < 0 || $to.pos > tr.doc.content.size || $from.pos >= $to.pos) {
+      return undefined;
+    }
+    return new TextSelection($from, $to);
+  }
+  try {
+    return selection.map(tr.doc, tr.mapping);
+  } catch (_unused) {
+    return undefined;
+  }
+};
 var expandToBlockRange = function expandToBlockRange($from, $to) {
   var range = $from.blockRange($to);
   if (!range) {

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

@@ -983,12 +983,12 @@ export var DragHandle = function DragHandle(_ref2) {
       setDragHandleDisabled(false);
     }
   }, [api === null || api === void 0 ? void 0 : api.blockControls.sharedState, isMultiSelect, isShiftDown, isTopLevelNode, view]);
-  var dragHandleMessage = expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_block_menu_patch_1') ? formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
+  var dragHandleMessage = expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
     br: jsx("br", null)
   }) : formatMessage(blockControlsMessages.dragToMove);
 
   // Create a string version for aria-label
-  var dragHandleAriaLabel = expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) && fg('platform_editor_block_menu_patch_1') ? formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
+  var dragHandleAriaLabel = expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? formatMessage(blockControlsMessages.dragToMoveClickToOpen, {
     br: ' '
   }) : formatMessage(blockControlsMessages.dragToMove);
   var helpDescriptors = isTopLevelNode ? [{

package/dist/types/blockControlsPluginType.d.ts

@@ -14,6 +14,7 @@ import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
 import type { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import { type DecorationSet } from '@atlaskit/editor-prosemirror/view';
 export type ActiveNode = {
     anchorName: string;
@@ -71,6 +72,7 @@ export interface PluginState {
     menuTriggerBy?: string;
     menuTriggerByNode?: TriggerByNode;
     multiSelectDnD?: MultiSelectDnD;
+    preservedSelection?: Selection;
 }
 export type ReleaseHiddenDecoration = () => boolean | undefined;
 export type BlockControlsSharedState = {
@@ -92,6 +94,7 @@ export type BlockControlsSharedState = {
     menuTriggerBy?: string;
     menuTriggerByNode?: TriggerByNode;
     multiSelectDnD?: MultiSelectDnD;
+    preservedSelection?: Selection;
 } | undefined;
 export type HandleOptions = {
     isFocused: boolean;

package/dist/types/pm-plugins/selection-preservation/pm-plugin.d.ts

@@ -1,13 +1,18 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { SelectionPreservationPluginState } from './types';
 /**
- * Selection Preservation Plugin for ProseMirror Editor
+ * Selection Preservation Plugin
  *
- * 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.
+ * Used to ensure the selection remains stable across selected nodes during specific UI operations,
+ * such as when block menus are open or during drag-and-drop actions.
+ *
+ * We use a TextSelection to span multi-node selections, however there is a ProseMirror limitation
+ * where TextSelection cannot include non inline 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.

package/dist/types-ts4.5/blockControlsPluginType.d.ts

@@ -14,6 +14,7 @@ import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
 import type { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import { type DecorationSet } from '@atlaskit/editor-prosemirror/view';
 export type ActiveNode = {
     anchorName: string;
@@ -71,6 +72,7 @@ export interface PluginState {
     menuTriggerBy?: string;
     menuTriggerByNode?: TriggerByNode;
     multiSelectDnD?: MultiSelectDnD;
+    preservedSelection?: Selection;
 }
 export type ReleaseHiddenDecoration = () => boolean | undefined;
 export type BlockControlsSharedState = {
@@ -92,6 +94,7 @@ export type BlockControlsSharedState = {
     menuTriggerBy?: string;
     menuTriggerByNode?: TriggerByNode;
     multiSelectDnD?: MultiSelectDnD;
+    preservedSelection?: Selection;
 } | undefined;
 export type HandleOptions = {
     isFocused: boolean;

package/dist/types-ts4.5/pm-plugins/selection-preservation/pm-plugin.d.ts

@@ -1,13 +1,18 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { SelectionPreservationPluginState } from './types';
 /**
- * Selection Preservation Plugin for ProseMirror Editor
+ * Selection Preservation Plugin
  *
- * 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.
+ * Used to ensure the selection remains stable across selected nodes during specific UI operations,
+ * such as when block menus are open or during drag-and-drop actions.
+ *
+ * We use a TextSelection to span multi-node selections, however there is a ProseMirror limitation
+ * where TextSelection cannot include non inline 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.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "7.7.4",
+	"version": "7.7.6",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -54,8 +54,8 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^16.2.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^13.39.0",
-		"@atlaskit/tokens": "^8.1.0",
+		"@atlaskit/tmp-editor-statsig": "^13.40.0",
+		"@atlaskit/tokens": "^8.2.0",
 		"@atlaskit/tooltip": "^20.10.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -143,9 +143,6 @@
 		"dst-a11y__replace-anchor-with-link__editor-jenga": {
 			"type": "boolean"
 		},
-		"platform_editor_block_menu_patch_1": {
-			"type": "boolean"
-		},
 		"editor_native_anchor_remove_decoration_in_apply": {
 			"type": "boolean"
 		},