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

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

@@ -0,0 +1,28 @@
+import { selectionPreservationPluginKey } from './plugin-key';
+/**
+ * Start preserving the selection when a UI interaction requires it
+ *
+ * e.g., block menu open, drag-and-drop in progress
+ */
+export const startPreservingSelection = ({
+  tr
+}) => {
+  const meta = {
+    type: 'startPreserving'
+  };
+  return tr.setMeta(selectionPreservationPluginKey, meta);
+};
+
+/**
+ * Stop preserving the selection when a UI interaction completes
+ *
+ * e.g., block menu closed, drag-and-drop ended
+ */
+export const stopPreservingSelection = ({
+  tr
+}) => {
+  const meta = {
+    type: 'stopPreserving'
+  };
+  return tr.setMeta(selectionPreservationPluginKey, meta);
+};

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

@@ -0,0 +1,2 @@
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+export const selectionPreservationPluginKey = new PluginKey('selectionPreservationPlugin');

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

@@ -0,0 +1,92 @@
+import { logException } from '@atlaskit/editor-common/monitoring';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { stopPreservingSelection } from './editor-commands';
+import { selectionPreservationPluginKey } from './plugin-key';
+import { getSelectionPreservationMeta, hasUserSelectionChange } from './utils';
+
+/**
+ * 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.
+ */
+export const createSelectionPreservationPlugin = () => {
+  return new SafePlugin({
+    key: selectionPreservationPluginKey,
+    state: {
+      init() {
+        return {
+          preservedSelection: undefined
+        };
+      },
+      apply(tr, pluginState) {
+        const meta = getSelectionPreservationMeta(tr);
+        const newState = {
+          ...pluginState
+        };
+        if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'startPreserving') {
+          newState.preservedSelection = new 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) {
+          const mapped = new 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(transactions, _oldState, newState) {
+      const pluginState = selectionPreservationPluginKey.getState(newState);
+      const savedSel = pluginState === null || pluginState === void 0 ? void 0 : pluginState.preservedSelection;
+      if (!savedSel) {
+        return null;
+      }
+      if (hasUserSelectionChange(transactions)) {
+        // Auto-stop if user explicitly changes selection
+        return stopPreservingSelection({
+          tr: newState.tr
+        });
+      }
+      const currSel = newState.selection;
+      const wasEmptySelection = savedSel.from === savedSel.to;
+      const selectionUnchanged = currSel.from === savedSel.from && currSel.to === savedSel.to;
+      const selectionInvalid = savedSel.from < 0 || savedSel.to > newState.doc.content.size;
+      if (wasEmptySelection || selectionUnchanged || selectionInvalid) {
+        return null;
+      }
+      try {
+        return newState.tr.setSelection(TextSelection.create(newState.doc, savedSel.from, savedSel.to));
+      } catch (error) {
+        logException(error, {
+          location: 'editor-plugin-block-controls/SelectionPreservationPlugin'
+        });
+      }
+      return null;
+    }
+  });
+};

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

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,16 @@
+import { selectionPreservationPluginKey } from './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.
+ */
+export const hasUserSelectionChange = transactions => {
+  return transactions.some(tr => 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);
+};
+export const getSelectionPreservationMeta = tr => {
+  return tr.getMeta(selectionPreservationPluginKey);
+};

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

@@ -8,17 +8,18 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
 import { bind } from 'bind-event-listener';
+import { getDocument } from '@atlaskit/browser-apis';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { dragToMoveDown, dragToMoveLeft, dragToMoveRight, dragToMoveUp, getAriaKeyshortcuts, TooltipContentWithMultipleShortcuts } from '@atlaskit/editor-common/keymaps';
 import { blockControlsMessages } from '@atlaskit/editor-common/messages';
 import { deleteSelectedRange } from '@atlaskit/editor-common/selection';
-import { tableControlsSpacing, DRAG_HANDLE_WIDTH } from '@atlaskit/editor-common/styles';
+import { DRAG_HANDLE_WIDTH, tableControlsSpacing } from '@atlaskit/editor-common/styles';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { akEditorTableToolbarSize, akEditorFullPageNarrowBreakout, relativeSizeToBaseFontSize } from '@atlaskit/editor-shared-styles/consts';
+import { akEditorFullPageNarrowBreakout, akEditorTableToolbarSize, relativeSizeToBaseFontSize } from '@atlaskit/editor-shared-styles/consts';
 import DragHandleVerticalIcon from '@atlaskit/icon/core/drag-handle-vertical';
 import DragHandlerIcon from '@atlaskit/icon/glyph/drag-handler';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -32,6 +33,7 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import Tooltip from '@atlaskit/tooltip';
 import { getNodeTypeWithLevel } from '../pm-plugins/decorations-common';
 import { key } from '../pm-plugins/main';
+import { selectionPreservationPluginKey } from '../pm-plugins/selection-preservation/plugin-key';
 import { getMultiSelectAnalyticsAttributes } from '../pm-plugins/utils/analytics';
 import { getControlBottomCSSValue, getControlHeightCSSValue, getLeftPosition, getNodeHeight, getTopPosition, shouldBeSticky, shouldMaskNodeControls } from '../pm-plugins/utils/drag-handle-positions';
 import { isHandleCorrelatedToSelection, isNodeWithCodeBlock, selectNode } from '../pm-plugins/utils/getSelection';
@@ -291,6 +293,71 @@ const getNodeMargins = node => {
   }
   return nodeMargins[nodeTypeName] || nodeMargins['default'];
 };
+const 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
+  let blockCount = 0;
+  for (let i = range.startIndex; i < range.endIndex; i++) {
+    if (range.parent.child(i).isBlock) {
+      blockCount++;
+    }
+    if (blockCount > 1) {
+      return true;
+    }
+  }
+  return false;
+};
+const shouldExpandSelection = (range, startPos) => {
+  return !!range && isRangeSpanningMultipleNodes(range) && range.start <= startPos && range.end >= startPos + 1;
+};
+const calculateBlockRange = ({
+  selection,
+  doc,
+  resolvedStartPos,
+  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
+  const resolvedPosWithinOrAfterNode = doc.resolve(resolvedStartPos.pos + 1);
+  return selection.$from.blockRange(resolvedPosWithinOrAfterNode);
+};
+const createExpandedSelection = (doc, selection, range) => {
+  return TextSelection.create(doc, Math.min(selection.from, range.start), Math.max(selection.to, range.end));
+};
+const createSelectionFromRange = ({
+  tr,
+  selection,
+  startPos,
+  nodeType,
+  range,
+  api
+}) => {
+  if (range && shouldExpandSelection(range, startPos)) {
+    const expandedSelection = createExpandedSelection(tr.doc, selection, range);
+    if (!expandedSelection.eq(tr.selection)) {
+      tr.setSelection(expandedSelection);
+    }
+    return tr;
+  }
+  const node = tr.doc.nodeAt(startPos);
+  const isEmptyNode = (node === null || node === void 0 ? void 0 : node.content.size) === 0;
+  if (isEmptyNode && node.type.name !== 'paragraph') {
+    tr.setSelection(new NodeSelection(tr.doc.resolve(startPos)));
+    return tr;
+  }
+  return selectNode(tr, startPos, nodeType, api);
+};
 export const DragHandle = ({
   view,
   api,
@@ -302,7 +369,7 @@ export const DragHandle = ({
   isTopLevelNode = true,
   anchorRectCache
 }) => {
-  var _api$core3;
+  var _api$core4;
   const buttonRef = useRef(null);
   const [dragHandleSelected, setDragHandleSelected] = useState(false);
   const [dragHandleDisabled, setDragHandleDisabled] = useState(false);
@@ -344,15 +411,71 @@ export const DragHandle = ({
       }
     }
   }, [anchorName, nodeType, view.dom]);
-  const handleOnClick = useCallback(e => {
+  const handleOnClickNew = useCallback(e => {
     var _api$core;
+    api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({
+      tr
+    }) => {
+      var _api$analytics, _resolvedStartPos$nod, _selectionPreservatio, _api$blockControls, _api$blockControls2;
+      const startPos = getPos();
+      if (startPos === undefined) {
+        return tr;
+      }
+      const resolvedStartPos = tr.doc.resolve(startPos);
+      api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.attachAnalyticsEvent({
+        eventType: EVENT_TYPE.UI,
+        action: ACTION.CLICKED,
+        actionSubject: ACTION_SUBJECT.BUTTON,
+        actionSubjectId: ACTION_SUBJECT_ID.ELEMENT_DRAG_HANDLE,
+        attributes: {
+          nodeDepth: resolvedStartPos.depth,
+          nodeType: ((_resolvedStartPos$nod = resolvedStartPos.nodeAfter) === null || _resolvedStartPos$nod === void 0 ? void 0 : _resolvedStartPos$nod.type.name) || ''
+        }
+      })(tr);
+      const preservedSelection = (_selectionPreservatio = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
+      const selection = preservedSelection || tr.selection;
+      const range = calculateBlockRange({
+        doc: tr.doc,
+        selection,
+        resolvedStartPos,
+        isShiftPressed: e.shiftKey
+      });
+      tr = createSelectionFromRange({
+        tr,
+        selection,
+        startPos,
+        nodeType,
+        range,
+        api
+      });
+      api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.commands.startPreservingSelection()({
+        tr
+      });
+      api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.toggleBlockMenu({
+        anchorName,
+        openedViaKeyboard: false,
+        triggerByNode: expValEqualsNoExposure('platform_synced_block', 'isEnabled', true) ? {
+          nodeType,
+          pos: startPos,
+          rootPos: tr.doc.resolve(startPos).before(1)
+        } : undefined
+      })({
+        tr
+      });
+      tr.setMeta('scrollIntoView', false);
+      return tr;
+    });
+    view.focus();
+  }, [api, view, getPos, nodeType, anchorName]);
+  const handleOnClick = useCallback(e => {
+    var _api$core2;
     if (!isMultiSelect) {
       setDragHandleSelected(!dragHandleSelected);
     }
-    api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({
+    api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
       tr
     }) => {
-      var _api$blockControls$sh, _api$analytics;
+      var _api$blockControls$sh, _api$analytics2;
       const startPos = getPos();
       if (startPos === undefined) {
         return tr;
@@ -381,8 +504,8 @@ export const DragHandle = ({
           rootPos
         } : undefined;
         if (BLOCK_MENU_ENABLED && editorExperiment('platform_editor_controls', 'variant1')) {
-          var _api$blockControls;
-          api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.commands.toggleBlockMenu({
+          var _api$blockControls3;
+          api === null || api === void 0 ? void 0 : (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.toggleBlockMenu({
             anchorName,
             triggerByNode,
             openedViaKeyboard: expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? false : undefined
@@ -391,8 +514,8 @@ export const DragHandle = ({
           });
           e.stopPropagation();
         } else if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
-          var _api$blockControls2;
-          api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.toggleBlockMenu({
+          var _api$blockControls4;
+          api === null || api === void 0 ? void 0 : (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands.toggleBlockMenu({
             anchorName,
             triggerByNode,
             openedViaKeyboard: expValEqualsNoExposure('platform_editor_block_menu_keyboard_navigation', 'isEnabled', true) ? false : undefined
@@ -402,18 +525,18 @@ export const DragHandle = ({
           e.stopPropagation();
         }
       } else if (isTopLevelNode && $anchor.depth <= DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH && e.shiftKey && fg('platform_editor_elements_dnd_shift_click_select')) {
-        var _api$blockControls3;
+        var _api$blockControls5;
         const alignAnchorHeadToSel = alignAnchorHeadInDirectionOfPos(tr.selection, startPos);
         const selectionWithExpandedHead = expandSelectionHeadToNodeAtPos(alignAnchorHeadToSel, startPos);
         tr.setSelection(selectionWithExpandedHead);
-        api === null || api === void 0 ? void 0 : (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.setMultiSelectPositions()({
+        api === null || api === void 0 ? void 0 : (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 ? void 0 : _api$blockControls5.commands.setMultiSelectPositions()({
           tr
         });
       }
       const resolvedMovingNode = tr.doc.resolve(startPos);
       const maybeNode = resolvedMovingNode.nodeAfter;
       tr.setMeta('scrollIntoView', false);
-      api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.attachAnalyticsEvent({
+      api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions.attachAnalyticsEvent({
         eventType: EVENT_TYPE.UI,
         action: ACTION.CLICKED,
         actionSubject: ACTION_SUBJECT.BUTTON,
@@ -430,9 +553,9 @@ export const DragHandle = ({
   const handleKeyDown = useCallback(e => {
     // allow user to use spacebar to select the node
     if (!e.repeat && e.key === ' ') {
-      var _api$core2;
+      var _api$core3;
       const startPos = getPos();
-      api === null || api === void 0 ? void 0 : (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(({
+      api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(({
         tr
       }) => {
         if (startPos === undefined) {
@@ -455,21 +578,21 @@ export const DragHandle = ({
       // return focus to editor to resume editing from caret position
       view.focus();
     }
-  }, [getPos, api === null || api === void 0 ? void 0 : (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions, isMultiSelect, view]);
+  }, [getPos, api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions, isMultiSelect, view]);
   const handleKeyDownNew = useCallback(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 = getDocument()) === null || _getDocument === void 0 ? void 0 : _getDocument.activeElement) !== buttonRef.current) {
         return;
       }
       e.preventDefault();
       e.stopPropagation();
       const startPos = getPos();
-      api === null || api === void 0 ? void 0 : (_api$core4 = api.core) === null || _api$core4 === void 0 ? void 0 : _api$core4.actions.execute(({
+      api === null || api === void 0 ? void 0 : (_api$core5 = api.core) === null || _api$core5 === void 0 ? void 0 : _api$core5.actions.execute(({
         tr
       }) => {
-        var _api$blockControls4, _api$userIntent;
+        var _api$blockControls6, _api$userIntent;
         if (startPos === undefined) {
           return tr;
         }
@@ -483,7 +606,7 @@ export const DragHandle = ({
           pos: startPos,
           rootPos
         } : undefined;
-        api === null || api === void 0 ? void 0 : (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands.toggleBlockMenu({
+        api === null || api === void 0 ? void 0 : (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 ? void 0 : _api$blockControls6.commands.toggleBlockMenu({
           anchorName,
           triggerByNode,
           openedViaKeyboard: true
@@ -501,9 +624,9 @@ export const DragHandle = ({
       api === null || api === void 0 ? void 0 : api.core.actions.execute(({
         tr
       }) => {
-        var _api$blockControls5;
+        var _api$blockControls7;
         deleteSelectedRange(tr);
-        api === null || api === void 0 ? void 0 : (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 ? void 0 : _api$blockControls5.commands.toggleBlockMenu({
+        api === null || api === void 0 ? void 0 : (_api$blockControls7 = api.blockControls) === null || _api$blockControls7 === void 0 ? void 0 : _api$blockControls7.commands.toggleBlockMenu({
           closeMenu: true
         })({
           tr
@@ -532,8 +655,8 @@ export const DragHandle = ({
       }) => {
         var _api$blockControls$sh2;
         if (isMultiSelect) {
-          var _api$core5;
-          api === null || api === void 0 ? void 0 : (_api$core5 = api.core) === null || _api$core5 === void 0 ? void 0 : _api$core5.actions.execute(({
+          var _api$core6;
+          api === null || api === void 0 ? void 0 : (_api$core6 = api.core) === null || _api$core6 === void 0 ? void 0 : _api$core6.actions.execute(({
             tr
           }) => {
             const handlePos = getPos();
@@ -542,8 +665,8 @@ export const DragHandle = ({
             }
             const newHandlePosCheck = isHandleCorrelatedToSelection(view.state, tr.selection, handlePos);
             if (!tr.selection.empty && newHandlePosCheck) {
-              var _api$blockControls6;
-              api === null || api === void 0 ? void 0 : (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 ? void 0 : _api$blockControls6.commands.setMultiSelectPositions()({
+              var _api$blockControls8;
+              api === null || api === void 0 ? void 0 : (_api$blockControls8 = api.blockControls) === null || _api$blockControls8 === void 0 ? void 0 : _api$blockControls8.commands.setMultiSelectPositions()({
                 tr
               });
             } else if (fg('platform_editor_elements_dnd_select_node_on_drag')) {
@@ -651,14 +774,14 @@ export const DragHandle = ({
         });
       },
       onDragStart() {
-        var _api$core6;
+        var _api$core7;
         if (start === undefined) {
           return;
         }
-        api === null || api === void 0 ? void 0 : (_api$core6 = api.core) === null || _api$core6 === void 0 ? void 0 : _api$core6.actions.execute(({
+        api === null || api === void 0 ? void 0 : (_api$core7 = api.core) === null || _api$core7 === void 0 ? void 0 : _api$core7.actions.execute(({
           tr
         }) => {
-          var _api$blockControls$sh3, _api$blockControls7, _api$analytics2;
+          var _api$blockControls$sh3, _api$blockControls9, _api$analytics3;
           let nodeTypes, hasSelectedMultipleNodes;
           const resolvedMovingNode = tr.doc.resolve(start);
           const maybeNode = resolvedMovingNode.nodeAfter;
@@ -671,11 +794,11 @@ export const DragHandle = ({
             nodeTypes = maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name;
             hasSelectedMultipleNodes = false;
           }
-          api === null || api === void 0 ? void 0 : (_api$blockControls7 = api.blockControls) === null || _api$blockControls7 === void 0 ? void 0 : _api$blockControls7.commands.setNodeDragged(getPos, anchorName, nodeType)({
+          api === null || api === void 0 ? void 0 : (_api$blockControls9 = api.blockControls) === null || _api$blockControls9 === void 0 ? void 0 : _api$blockControls9.commands.setNodeDragged(getPos, anchorName, nodeType)({
             tr
           });
           tr.setMeta('scrollIntoView', false);
-          api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions.attachAnalyticsEvent({
+          api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions.attachAnalyticsEvent({
             eventType: EVENT_TYPE.UI,
             action: ACTION.DRAGGED,
             actionSubject: ACTION_SUBJECT.ELEMENT,
@@ -973,7 +1096,7 @@ export const DragHandle = ({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     ,
     style: !editorExperiment('platform_editor_controls', 'variant1') ? editorExperiment('platform_editor_block_control_optimise_render', true) ? positionStyles : positionStylesOld : {},
-    onClick: handleOnClick,
+    onClick: expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) ? handleOnClickNew : handleOnClick,
     onKeyDown: expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) && 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
     ,

package/dist/esm/blockControlsPlugin.js

@@ -15,6 +15,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 as _startPreservingSelection, stopPreservingSelection as _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';
@@ -38,6 +40,12 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
           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))) {
@@ -232,6 +240,12 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
       },
       moveNodeWithBlockMenu: function moveNodeWithBlockMenu(direction) {
         return _moveNodeWithBlockMenu(api, direction);
+      },
+      startPreservingSelection: function startPreservingSelection() {
+        return _startPreservingSelection;
+      },
+      stopPreservingSelection: function stopPreservingSelection() {
+        return _stopPreservingSelection;
       }
     },
     getSharedState: function getSharedState(editorState) {

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

@@ -0,0 +1,26 @@
+import { selectionPreservationPluginKey } from './plugin-key';
+/**
+ * Start preserving the selection when a UI interaction requires it
+ *
+ * e.g., block menu open, drag-and-drop in progress
+ */
+export var startPreservingSelection = function startPreservingSelection(_ref) {
+  var tr = _ref.tr;
+  var meta = {
+    type: 'startPreserving'
+  };
+  return tr.setMeta(selectionPreservationPluginKey, meta);
+};
+
+/**
+ * Stop preserving the selection when a UI interaction completes
+ *
+ * e.g., block menu closed, drag-and-drop ended
+ */
+export var stopPreservingSelection = function stopPreservingSelection(_ref2) {
+  var tr = _ref2.tr;
+  var meta = {
+    type: 'stopPreserving'
+  };
+  return tr.setMeta(selectionPreservationPluginKey, meta);
+};

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

@@ -0,0 +1,2 @@
+import { PluginKey } from '@atlaskit/editor-prosemirror/state';
+export var selectionPreservationPluginKey = new PluginKey('selectionPreservationPlugin');

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

@@ -0,0 +1,93 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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) { _defineProperty(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; }
+import { logException } from '@atlaskit/editor-common/monitoring';
+import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { stopPreservingSelection } from './editor-commands';
+import { selectionPreservationPluginKey } from './plugin-key';
+import { getSelectionPreservationMeta, hasUserSelectionChange } from './utils';
+
+/**
+ * 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.
+ */
+export var createSelectionPreservationPlugin = function createSelectionPreservationPlugin() {
+  return new SafePlugin({
+    key: selectionPreservationPluginKey,
+    state: {
+      init: function init() {
+        return {
+          preservedSelection: undefined
+        };
+      },
+      apply: function apply(tr, pluginState) {
+        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);
+        } else if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'stopPreserving') {
+          newState.preservedSelection = undefined;
+        }
+        if (newState.preservedSelection && tr.docChanged) {
+          var mapped = new 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 = selectionPreservationPluginKey.getState(newState);
+      var savedSel = pluginState === null || pluginState === void 0 ? void 0 : pluginState.preservedSelection;
+      if (!savedSel) {
+        return null;
+      }
+      if (hasUserSelectionChange(transactions)) {
+        // Auto-stop if user explicitly changes selection
+        return 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(TextSelection.create(newState.doc, savedSel.from, savedSel.to));
+      } catch (error) {
+        logException(error, {
+          location: 'editor-plugin-block-controls/SelectionPreservationPlugin'
+        });
+      }
+      return null;
+    }
+  });
+};

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

@@ -0,0 +1 @@
+export {};