@atlaskit/editor-plugin-block-controls 8.0.9 → 8.0.11

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 8.0.11
+
+### Patch Changes
+
+- [`de045021d126d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/de045021d126d) -
+  EDITOR-4435 fix code block selection focus
+- [`76afb688dff6a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/76afb688dff6a) -
+  [ux] Update move function to leverage preserveSelection logic for different types of selection
+- Updated dependencies
+
+## 8.0.10
+
+### Patch Changes
+
+- [`df9b89b4945d1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/df9b89b4945d1) -
+  Editor-4255: "Fix heading with alignment nested inside layout not showing block menu"
+- Updated dependencies
+
 ## 8.0.9
 
 ### Patch Changes

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

@@ -36,12 +36,12 @@ var moveNodeWithBlockMenu = exports.moveNodeWithBlockMenu = function moveNodeWit
     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: selection,
-      schema: tr.doc.type.schema,
-      resolve: tr.doc.resolve.bind(tr.doc)
-    });
+    // Use getNodeBoundsFromSelection to get the proper block boundaries
+    var nodeBounds = (0, _moveNodeUtils.getNodeBoundsFromSelection)(selection);
+    if (!nodeBounds) {
+      return tr;
+    }
+    var currentNodePos = nodeBounds.from;
     var $from = selection.$from,
       $to = selection.$to;
     var depth = tr.doc.resolve(currentNodePos).depth;

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

@@ -394,9 +394,6 @@ var moveNode = exports.moveNode = function moveNode(api) {
       if (!convertedNode) {
         return tr;
       }
-      if ((sourceNode === null || sourceNode === void 0 ? void 0 : sourceNode.type.name) === 'taskList' && sliceFrom > 0 && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
-        sliceFrom = sliceFrom - 1;
-      }
 
       // Currently we don't support breakout mark for children nodes of bodiedSyncBlock node
       // Hence strip out the mark for now

package/dist/cjs/editor-commands/utils/move-node-utils.js

@@ -3,42 +3,57 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getShouldMoveNode = exports.getPosWhenMoveNodeUp = exports.getPosWhenMoveNodeDown = exports.getCurrentNodePosFromDragHandleSelection = exports.canMoveNodeUpOrDown = void 0;
-var _selection = require("@atlaskit/editor-common/selection");
+exports.getShouldMoveNode = exports.getPosWhenMoveNodeUp = exports.getPosWhenMoveNodeDown = exports.getNodeBoundsFromSelection = exports.canMoveNodeUpOrDown = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
-var _getNestedNodePosition = require("../../pm-plugins/utils/getNestedNodePosition");
-var getCurrentNodePosFromDragHandleSelection = exports.getCurrentNodePosFromDragHandleSelection = function getCurrentNodePosFromDragHandleSelection(_ref) {
-  var selection = _ref.selection,
-    schema = _ref.schema,
-    resolve = _ref.resolve;
-  var currentNodePos = -1;
-  if (selection.empty && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
-    currentNodePos = selection.$from.pos;
+var _selection = require("../../pm-plugins/utils/selection");
+/**
+ * Gets the current node position and bounds from the selection using the preserved selection logic.
+ * This ensures consistency with how the block controls plugin handles selection boundaries.
+ *
+ * Special handling for tables: When moving a table as a block, we need the outer table node's
+ * position, not the internal cell selection that createPreservedSelection returns.
+ *
+ * @param selection The current editor selection
+ * @returns An object with from and to positions, or undefined if selection is invalid
+ */
+var getNodeBoundsFromSelection = exports.getNodeBoundsFromSelection = function getNodeBoundsFromSelection(selection) {
+  // Special case: if a table is selected, we want to move the entire table node
+  var tableInfo = (0, _utils.findTable)(selection);
+  if (tableInfo && (0, _utils.isTableSelected)(selection)) {
+    var tablePos = tableInfo.pos;
+    var tableTo = tablePos + tableInfo.node.nodeSize;
+    return {
+      from: tablePos,
+      to: tableTo
+    };
   }
-  if ((0, _utils.isTableSelected)(selection)) {
-    var _findTable$pos, _findTable;
-    // We only move table node if it's fully selected
-    // to avoid shortcut collision with table drag and drop
-    currentNodePos = (_findTable$pos = (_findTable = (0, _utils.findTable)(selection)) === null || _findTable === void 0 ? void 0 : _findTable.pos) !== null && _findTable$pos !== void 0 ? _findTable$pos : currentNodePos;
-  } else if (selection instanceof _state.NodeSelection && selection.node.type === schema.nodes.media && selection.node.attrs.type === 'file' && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
-    // When a file is selected, it is actually wrapped in a media group
-    // return the position of the media group , as the group is the node that we want to move up or down
-    currentNodePos = selection.$from.pos - 1;
-  } else if (!(selection instanceof _selection.GapCursorSelection)) {
-    // 2. caret cursor is inside the node
-    // 3. the start of the selection is inside the node
-    currentNodePos = selection.$from.before(1);
-    if (selection.$from.depth > 0) {
-      currentNodePos = (0, _getNestedNodePosition.getNestedNodePosition)({
-        selection: selection,
-        schema: schema,
-        resolve: resolve
-      });
+
+  // Special case: if a media node (file) is selected, we need to get the parent mediaGroup
+  // This handles the case where clicking on a file creates a NodeSelection of the media node
+  // but we want to move the entire mediaGroup that wraps it
+  if (selection instanceof _state.NodeSelection && selection.node.type.name === 'media' && selection.node.attrs.type === 'file' && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+    // The media node is wrapped in a mediaGroup, so we need to get the parent position
+    var mediaGroupPos = selection.$from.pos - 1;
+    var mediaGroupNode = selection.$from.doc.nodeAt(mediaGroupPos);
+    if (mediaGroupNode && mediaGroupNode.type.name === 'mediaGroup') {
+      return {
+        from: mediaGroupPos,
+        to: mediaGroupPos + mediaGroupNode.nodeSize
+      };
     }
   }
-  return currentNodePos;
+
+  // Use createPreservedSelection to get properly expanded block boundaries
+  var preservedSelection = (0, _selection.createPreservedSelection)(selection.$from, selection.$to);
+  if (!preservedSelection) {
+    return undefined;
+  }
+  return {
+    from: preservedSelection.from,
+    to: preservedSelection.to
+  };
 };
 var getPosWhenMoveNodeUp = exports.getPosWhenMoveNodeUp = function getPosWhenMoveNodeUp($currentNodePos, currentNodePos) {
   var nodeIndex = $currentNodePos.index();
@@ -48,10 +63,10 @@ var getPosWhenMoveNodeUp = exports.getPosWhenMoveNodeUp = function getPosWhenMov
   }
   return nodeBefore ? currentNodePos - nodeBefore.nodeSize : -1;
 };
-var getPosWhenMoveNodeDown = exports.getPosWhenMoveNodeDown = function getPosWhenMoveNodeDown(_ref2) {
-  var $currentNodePos = _ref2.$currentNodePos,
-    nodeAfterPos = _ref2.nodeAfterPos,
-    tr = _ref2.tr;
+var getPosWhenMoveNodeDown = exports.getPosWhenMoveNodeDown = function getPosWhenMoveNodeDown(_ref) {
+  var $currentNodePos = _ref.$currentNodePos,
+    nodeAfterPos = _ref.nodeAfterPos,
+    tr = _ref.tr;
   var endOfDoc = $currentNodePos.end();
   if (nodeAfterPos > endOfDoc) {
     return -1;
@@ -68,27 +83,24 @@ var getPosWhenMoveNodeDown = exports.getPosWhenMoveNodeDown = function getPosWhe
   // if not the last node, move to the end of the next node
   return nodeAfter ? nodeAfterPos + nodeAfter.nodeSize : -1;
 };
-var getShouldMoveNode = exports.getShouldMoveNode = function getShouldMoveNode(_ref3) {
-  var currentNodePos = _ref3.currentNodePos,
-    moveToPos = _ref3.moveToPos,
-    tr = _ref3.tr;
+var getShouldMoveNode = exports.getShouldMoveNode = function getShouldMoveNode(_ref2) {
+  var currentNodePos = _ref2.currentNodePos,
+    moveToPos = _ref2.moveToPos,
+    tr = _ref2.tr;
   // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
   return moveToPos > -1 && tr.doc.resolve(currentNodePos).depth === tr.doc.resolve(moveToPos).depth;
 };
 var canMoveNodeUpOrDown = exports.canMoveNodeUpOrDown = function canMoveNodeUpOrDown(tr) {
-  var currentNodePos = getCurrentNodePosFromDragHandleSelection({
-    selection: tr.selection,
-    schema: tr.doc.type.schema,
-    resolve: tr.doc.resolve.bind(tr.doc)
-  });
-  if (currentNodePos <= -1) {
+  var nodeBounds = getNodeBoundsFromSelection(tr.selection);
+  if (!nodeBounds || nodeBounds.from <= -1) {
     return {
       moveUp: false,
       moveDown: false
     };
   }
+  var currentNodePos = nodeBounds.from;
   var $currentNodePos = tr.doc.resolve(currentNodePos);
-  var nodeAfterPos = $currentNodePos.posAtIndex($currentNodePos.index() + 1);
+  var nodeAfterPos = nodeBounds.to;
   var moveUpPos = getPosWhenMoveNodeUp($currentNodePos, currentNodePos);
   var moveDownPos = getPosWhenMoveNodeDown({
     $currentNodePos: $currentNodePos,

package/dist/cjs/pm-plugins/handle-mouse-over.js

@@ -64,6 +64,11 @@ var handleMouseOver = exports.handleMouseOver = function handleMouseOver(view, e
     return false;
   }
 
+  // If the editor view is not in focus when the block menu is open, do not update the drag handle
+  if (!view.hasFocus() && isMenuOpen && (0, _expValEquals.expValEquals)('platform_editor_block_menu', 'isEnabled', true)) {
+    return false;
+  }
+
   // Most mouseover events don't fire during drag but some can slip through
   // when the drag begins. This prevents those.
   if (isDragging) {

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createSelectionPreservationPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _bindEventListener = require("bind-event-listener");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _styles = require("@atlaskit/editor-common/styles");
 var _main = require("../main");
@@ -66,7 +67,7 @@ var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugi
             newState.preservedSelection = (0, _selection.mapPreservedSelection)(newState.preservedSelection, tr);
           }
           if (!(0, _utils.compareSelections)(newState.preservedSelection, pluginState.preservedSelection)) {
-            if (newState !== null && newState !== void 0 && newState.preservedSelection) {
+            if (newState.preservedSelection) {
               var _api$selection;
               api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.commands) === null || _api$selection === void 0 ? void 0 : _api$selection.setBlockSelection(newState.preservedSelection));
             } else {
@@ -85,8 +86,8 @@ var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugi
           return null;
         }
 
-        // Auto-stop if user explicitly changes selection or selection is set within a code block
-        if ((0, _utils.hasUserSelectionChange)(transactions) || (0, _utils.isSelectionWithinCodeBlock)(stateSel)) {
+        // Auto-stop if user explicitly changes selection
+        if ((0, _utils.hasUserSelectionChange)(transactions)) {
           return (0, _editorCommands.stopPreservingSelection)({
             tr: newState.tr
           });
@@ -106,10 +107,51 @@ var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugi
         }
         return newState.tr.setSelection(newSelection);
       },
-      view: function view() {
+      view: function view(initialView) {
+        var view = initialView;
+        var unbindDocumentMouseDown = (0, _bindEventListener.bind)(document, {
+          type: 'mousedown',
+          listener: function listener(e) {
+            if (!(e.target instanceof HTMLElement)) {
+              return;
+            }
+            var _ref = _pluginKey.selectionPreservationPluginKey.getState(view.state) || {},
+              preservedSelection = _ref.preservedSelection;
+
+            // If there is no current preserved selection or the editor is not focused, do nothing
+            if (!preservedSelection) {
+              return;
+            }
+            var clickedDragHandle = !!e.target.closest(_styles.DRAG_HANDLE_SELECTOR);
+
+            // When mouse down on a drag handle we continue preserving the selection
+            if (clickedDragHandle) {
+              return;
+            }
+            var clickedOutsideEditor = !e.target.closest('.ProseMirror');
+
+            // When mouse down outside the editor continue to preserve the selection
+            if (clickedOutsideEditor) {
+              return;
+            }
+
+            // Otherwise mouse down anywhere else in the editor stops preserving the selection
+            var tr = view.state.tr;
+            (0, _editorCommands.stopPreservingSelection)({
+              tr: tr
+            });
+            view.dispatch(tr);
+          },
+          // Use capture phase to stop preservation before appendTransaction runs,
+          // preventing unwanted selection restoration when the user clicks into the editor.
+          options: {
+            capture: true
+          }
+        });
         return {
-          update: function update(view, prevState) {
+          update: function update(updateView, prevState) {
             var _selectionPreservatio, _selectionPreservatio2, _key$getState, _key$getState2;
+            view = updateView;
             var prevPreservedSelection = (_selectionPreservatio = _pluginKey.selectionPreservationPluginKey.getState(prevState)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
             var currPreservedSelection = (_selectionPreservatio2 = _pluginKey.selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio2 === void 0 ? void 0 : _selectionPreservatio2.preservedSelection;
             var prevActiveNode = (_key$getState = _main.key.getState(prevState)) === null || _key$getState === void 0 ? void 0 : _key$getState.activeNode;
@@ -117,33 +159,13 @@ var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugi
             if (currPreservedSelection && view.hasFocus() && (!(0, _utils.compareSelections)(prevPreservedSelection, currPreservedSelection) || prevActiveNode !== currActiveNode)) {
               (0, _utils.syncDOMSelection)(view.state.selection);
             }
+          },
+          destroy: function destroy() {
+            unbindDocumentMouseDown();
           }
         };
       },
       props: {
-        handleClick: function handleClick(view, pos, event) {
-          var _ref = _pluginKey.selectionPreservationPluginKey.getState(view.state) || {},
-            preservedSelection = _ref.preservedSelection;
-
-          // If there is no current preserved selection, do nothing
-          if (!preservedSelection) {
-            return false;
-          }
-          var clickedDragHandle = event.target instanceof HTMLElement && event.target.closest(_styles.DRAG_HANDLE_SELECTOR);
-
-          // When clicking a drag handle we continue preserving the selection
-          if (!clickedDragHandle) {
-            return false;
-          }
-
-          // Otherwise clicking anywhere else in the editor stops preserving the selection
-          var tr = view.state.tr;
-          (0, _editorCommands.stopPreservingSelection)({
-            tr: tr
-          });
-          view.dispatch(tr);
-          return false;
-        },
         handleKeyDown: function handleKeyDown(view, event) {
           var _api$core, _api$blockControls;
           var _ref2 = _pluginKey.selectionPreservationPluginKey.getState(view.state) || {},

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.syncDOMSelection = exports.isSelectionWithinCodeBlock = exports.hasUserSelectionChange = exports.getSelectionPreservationMeta = exports.compareSelections = void 0;
+exports.syncDOMSelection = exports.hasUserSelectionChange = exports.getSelectionPreservationMeta = exports.compareSelections = void 0;
 var _pluginKey = require("./plugin-key");
 /**
  * Detects if any of the transactions include user-driven selection changes.
@@ -20,18 +20,6 @@ var getSelectionPreservationMeta = exports.getSelectionPreservationMeta = functi
   return tr.getMeta(_pluginKey.selectionPreservationPluginKey);
 };
 
-/**
- * Checks if the current selection is within a code block.
- *
- * @param selection The current selection to check.
- * @returns True if the selection is within a code block, otherwise false.
- */
-var isSelectionWithinCodeBlock = exports.isSelectionWithinCodeBlock = function isSelectionWithinCodeBlock(_ref) {
-  var $from = _ref.$from,
-    $to = _ref.$to;
-  return $from.sameParent($to) && $from.parent.type.name === 'codeBlock';
-};
-
 /**
  * Compares two selections for equality based on their from and to positions.
  *

package/dist/cjs/pm-plugins/utils/getSelection.js

@@ -96,11 +96,21 @@ var newGetSelection = exports.newGetSelection = function newGetSelection(doc, se
   var nodeSize = node ? node.nodeSize : 1;
   var nodeName = node === null || node === void 0 ? void 0 : node.type.name;
   if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+    var _doc$nodeAt;
     // if mediaGroup only has a single child, we want to select the child
     if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
       var $mediaStartPos = doc.resolve(start + 1);
       return new _state.NodeSelection($mediaStartPos);
     }
+
+    // if heading with alignment nested inside a layout column, return TextSelection
+    // As NodeSelection cause the desc.selectNode is not a function error in the syncNodeSelection in prosemirror view
+    // Results in block menu not open on the first 2 clicks for a heading with alignment nested inside a layout column
+    if (nodeName === 'heading' && node !== null && node !== void 0 && node.marks.some(function (mark) {
+      return mark.type.name === 'alignment';
+    }) && ((_doc$nodeAt = doc.nodeAt(start - 1)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type.name) === 'layoutColumn') {
+      return _state.TextSelection.create(doc, start, start + nodeSize);
+    }
     return new _state.NodeSelection(doc.resolve(start));
   }
 

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

@@ -4,7 +4,7 @@ import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equ
 import { key } from '../pm-plugins/main';
 import { mapPreservedSelection } from '../pm-plugins/utils/selection';
 import { moveNode } from './move-node';
-import { canMoveNodeUpOrDown, getCurrentNodePosFromDragHandleSelection } from './utils/move-node-utils';
+import { canMoveNodeUpOrDown, getNodeBoundsFromSelection } from './utils/move-node-utils';
 const getSelectionToIndex = (fromIndex, $to, depth) => {
   const toIndex = $to.index(depth);
   const toIndexAfter = $to.indexAfter(depth);
@@ -27,12 +27,12 @@ export const moveNodeWithBlockMenu = (api, direction) => {
     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,
-      schema: tr.doc.type.schema,
-      resolve: tr.doc.resolve.bind(tr.doc)
-    });
+    // Use getNodeBoundsFromSelection to get the proper block boundaries
+    const nodeBounds = getNodeBoundsFromSelection(selection);
+    if (!nodeBounds) {
+      return tr;
+    }
+    const currentNodePos = nodeBounds.from;
     const {
       $from,
       $to

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

@@ -396,9 +396,6 @@ export const moveNode = api => (start, to, inputMethod = INPUT_METHOD.DRAG_AND_D
   if (!convertedNode) {
     return tr;
   }
-  if ((sourceNode === null || sourceNode === void 0 ? void 0 : sourceNode.type.name) === 'taskList' && sliceFrom > 0 && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
-    sliceFrom = sliceFrom - 1;
-  }
 
   // Currently we don't support breakout mark for children nodes of bodiedSyncBlock node
   // Hence strip out the mark for now

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

@@ -1,39 +1,54 @@
-import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
-import { getNestedNodePosition } from '../../pm-plugins/utils/getNestedNodePosition';
-export const getCurrentNodePosFromDragHandleSelection = ({
-  selection,
-  schema,
-  resolve
-}) => {
-  let currentNodePos = -1;
-  if (selection.empty && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
-    currentNodePos = selection.$from.pos;
+import { createPreservedSelection } from '../../pm-plugins/utils/selection';
+
+/**
+ * Gets the current node position and bounds from the selection using the preserved selection logic.
+ * This ensures consistency with how the block controls plugin handles selection boundaries.
+ *
+ * Special handling for tables: When moving a table as a block, we need the outer table node's
+ * position, not the internal cell selection that createPreservedSelection returns.
+ *
+ * @param selection The current editor selection
+ * @returns An object with from and to positions, or undefined if selection is invalid
+ */
+export const getNodeBoundsFromSelection = selection => {
+  // Special case: if a table is selected, we want to move the entire table node
+  const tableInfo = findTable(selection);
+  if (tableInfo && isTableSelected(selection)) {
+    const tablePos = tableInfo.pos;
+    const tableTo = tablePos + tableInfo.node.nodeSize;
+    return {
+      from: tablePos,
+      to: tableTo
+    };
   }
-  if (isTableSelected(selection)) {
-    var _findTable$pos, _findTable;
-    // We only move table node if it's fully selected
-    // to avoid shortcut collision with table drag and drop
-    currentNodePos = (_findTable$pos = (_findTable = findTable(selection)) === null || _findTable === void 0 ? void 0 : _findTable.pos) !== null && _findTable$pos !== void 0 ? _findTable$pos : currentNodePos;
-  } else if (selection instanceof NodeSelection && selection.node.type === schema.nodes.media && selection.node.attrs.type === 'file' && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
-    // When a file is selected, it is actually wrapped in a media group
-    // return the position of the media group , as the group is the node that we want to move up or down
-    currentNodePos = selection.$from.pos - 1;
-  } else if (!(selection instanceof GapCursorSelection)) {
-    // 2. caret cursor is inside the node
-    // 3. the start of the selection is inside the node
-    currentNodePos = selection.$from.before(1);
-    if (selection.$from.depth > 0) {
-      currentNodePos = getNestedNodePosition({
-        selection,
-        schema,
-        resolve
-      });
+
+  // Special case: if a media node (file) is selected, we need to get the parent mediaGroup
+  // This handles the case where clicking on a file creates a NodeSelection of the media node
+  // but we want to move the entire mediaGroup that wraps it
+  if (selection instanceof NodeSelection && selection.node.type.name === 'media' && selection.node.attrs.type === 'file' && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    // The media node is wrapped in a mediaGroup, so we need to get the parent position
+    const mediaGroupPos = selection.$from.pos - 1;
+    const mediaGroupNode = selection.$from.doc.nodeAt(mediaGroupPos);
+    if (mediaGroupNode && mediaGroupNode.type.name === 'mediaGroup') {
+      return {
+        from: mediaGroupPos,
+        to: mediaGroupPos + mediaGroupNode.nodeSize
+      };
     }
   }
-  return currentNodePos;
+
+  // Use createPreservedSelection to get properly expanded block boundaries
+  const preservedSelection = createPreservedSelection(selection.$from, selection.$to);
+  if (!preservedSelection) {
+    return undefined;
+  }
+  return {
+    from: preservedSelection.from,
+    to: preservedSelection.to
+  };
 };
 export const getPosWhenMoveNodeUp = ($currentNodePos, currentNodePos) => {
   const nodeIndex = $currentNodePos.index();
@@ -73,19 +88,16 @@ export const getShouldMoveNode = ({
   return moveToPos > -1 && tr.doc.resolve(currentNodePos).depth === tr.doc.resolve(moveToPos).depth;
 };
 export const canMoveNodeUpOrDown = tr => {
-  const currentNodePos = getCurrentNodePosFromDragHandleSelection({
-    selection: tr.selection,
-    schema: tr.doc.type.schema,
-    resolve: tr.doc.resolve.bind(tr.doc)
-  });
-  if (currentNodePos <= -1) {
+  const nodeBounds = getNodeBoundsFromSelection(tr.selection);
+  if (!nodeBounds || nodeBounds.from <= -1) {
     return {
       moveUp: false,
       moveDown: false
     };
   }
+  const currentNodePos = nodeBounds.from;
   const $currentNodePos = tr.doc.resolve(currentNodePos);
-  const nodeAfterPos = $currentNodePos.posAtIndex($currentNodePos.index() + 1);
+  const nodeAfterPos = nodeBounds.to;
   const moveUpPos = getPosWhenMoveNodeUp($currentNodePos, currentNodePos);
   const moveDownPos = getPosWhenMoveNodeDown({
     $currentNodePos,

package/dist/es2019/pm-plugins/handle-mouse-over.js

@@ -56,6 +56,11 @@ export const handleMouseOver = (view, event, api) => {
     return false;
   }
 
+  // If the editor view is not in focus when the block menu is open, do not update the drag handle
+  if (!view.hasFocus() && isMenuOpen && expValEquals('platform_editor_block_menu', 'isEnabled', true)) {
+    return false;
+  }
+
   // Most mouseover events don't fire during drag but some can slip through
   // when the drag begins. This prevents those.
   if (isDragging) {

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

@@ -1,10 +1,11 @@
+import { bind } from 'bind-event-listener';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { DRAG_HANDLE_SELECTOR } from '@atlaskit/editor-common/styles';
 import { key } from '../main';
 import { createPreservedSelection, mapPreservedSelection } from '../utils/selection';
 import { stopPreservingSelection } from './editor-commands';
 import { selectionPreservationPluginKey } from './plugin-key';
-import { compareSelections, getSelectionPreservationMeta, hasUserSelectionChange, isSelectionWithinCodeBlock, syncDOMSelection } from './utils';
+import { compareSelections, getSelectionPreservationMeta, hasUserSelectionChange, syncDOMSelection } from './utils';
 
 /**
  * Selection Preservation Plugin
@@ -58,7 +59,7 @@ export const createSelectionPreservationPlugin = api => () => {
           newState.preservedSelection = mapPreservedSelection(newState.preservedSelection, tr);
         }
         if (!compareSelections(newState.preservedSelection, pluginState.preservedSelection)) {
-          if (newState !== null && newState !== void 0 && newState.preservedSelection) {
+          if (newState.preservedSelection) {
             var _api$selection, _api$selection$comman;
             api === null || api === void 0 ? void 0 : api.core.actions.execute(api === null || api === void 0 ? void 0 : (_api$selection = api.selection) === null || _api$selection === void 0 ? void 0 : (_api$selection$comman = _api$selection.commands) === null || _api$selection$comman === void 0 ? void 0 : _api$selection$comman.setBlockSelection(newState.preservedSelection));
           } else {
@@ -77,8 +78,8 @@ export const createSelectionPreservationPlugin = api => () => {
         return null;
       }
 
-      // Auto-stop if user explicitly changes selection or selection is set within a code block
-      if (hasUserSelectionChange(transactions) || isSelectionWithinCodeBlock(stateSel)) {
+      // Auto-stop if user explicitly changes selection
+      if (hasUserSelectionChange(transactions)) {
         return stopPreservingSelection({
           tr: newState.tr
         });
@@ -98,10 +99,52 @@ export const createSelectionPreservationPlugin = api => () => {
       }
       return newState.tr.setSelection(newSelection);
     },
-    view() {
+    view(initialView) {
+      let view = initialView;
+      const unbindDocumentMouseDown = bind(document, {
+        type: 'mousedown',
+        listener: e => {
+          if (!(e.target instanceof HTMLElement)) {
+            return;
+          }
+          const {
+            preservedSelection
+          } = selectionPreservationPluginKey.getState(view.state) || {};
+
+          // If there is no current preserved selection or the editor is not focused, do nothing
+          if (!preservedSelection) {
+            return;
+          }
+          const clickedDragHandle = !!e.target.closest(DRAG_HANDLE_SELECTOR);
+
+          // When mouse down on a drag handle we continue preserving the selection
+          if (clickedDragHandle) {
+            return;
+          }
+          const clickedOutsideEditor = !e.target.closest('.ProseMirror');
+
+          // When mouse down outside the editor continue to preserve the selection
+          if (clickedOutsideEditor) {
+            return;
+          }
+
+          // Otherwise mouse down anywhere else in the editor stops preserving the selection
+          const tr = view.state.tr;
+          stopPreservingSelection({
+            tr
+          });
+          view.dispatch(tr);
+        },
+        // Use capture phase to stop preservation before appendTransaction runs,
+        // preventing unwanted selection restoration when the user clicks into the editor.
+        options: {
+          capture: true
+        }
+      });
       return {
-        update(view, prevState) {
+        update(updateView, prevState) {
           var _selectionPreservatio, _selectionPreservatio2, _key$getState, _key$getState2;
+          view = updateView;
           const prevPreservedSelection = (_selectionPreservatio = selectionPreservationPluginKey.getState(prevState)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
           const currPreservedSelection = (_selectionPreservatio2 = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio2 === void 0 ? void 0 : _selectionPreservatio2.preservedSelection;
           const prevActiveNode = (_key$getState = key.getState(prevState)) === null || _key$getState === void 0 ? void 0 : _key$getState.activeNode;
@@ -109,34 +152,13 @@ export const createSelectionPreservationPlugin = api => () => {
           if (currPreservedSelection && view.hasFocus() && (!compareSelections(prevPreservedSelection, currPreservedSelection) || prevActiveNode !== currActiveNode)) {
             syncDOMSelection(view.state.selection);
           }
+        },
+        destroy() {
+          unbindDocumentMouseDown();
         }
       };
     },
     props: {
-      handleClick: (view, pos, event) => {
-        const {
-          preservedSelection
-        } = selectionPreservationPluginKey.getState(view.state) || {};
-
-        // If there is no current preserved selection, do nothing
-        if (!preservedSelection) {
-          return false;
-        }
-        const clickedDragHandle = event.target instanceof HTMLElement && event.target.closest(DRAG_HANDLE_SELECTOR);
-
-        // When clicking a drag handle we continue preserving the selection
-        if (!clickedDragHandle) {
-          return false;
-        }
-
-        // Otherwise clicking anywhere else in the editor stops preserving the selection
-        const tr = view.state.tr;
-        stopPreservingSelection({
-          tr
-        });
-        view.dispatch(tr);
-        return false;
-      },
       handleKeyDown: (view, event) => {
         var _api$core, _api$blockControls, _api$blockControls$co;
         const {

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

@@ -12,19 +12,6 @@ export const getSelectionPreservationMeta = tr => {
   return tr.getMeta(selectionPreservationPluginKey);
 };
 
-/**
- * Checks if the current selection is within a code block.
- *
- * @param selection The current selection to check.
- * @returns True if the selection is within a code block, otherwise false.
- */
-export const isSelectionWithinCodeBlock = ({
-  $from,
-  $to
-}) => {
-  return $from.sameParent($to) && $from.parent.type.name === 'codeBlock';
-};
-
 /**
  * Compares two selections for equality based on their from and to positions.
  *

package/dist/es2019/pm-plugins/utils/getSelection.js

@@ -91,11 +91,19 @@ export const newGetSelection = (doc, selectionEmpty, start) => {
   const nodeSize = node ? node.nodeSize : 1;
   const nodeName = node === null || node === void 0 ? void 0 : node.type.name;
   if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    var _doc$nodeAt;
     // if mediaGroup only has a single child, we want to select the child
     if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
       const $mediaStartPos = doc.resolve(start + 1);
       return new NodeSelection($mediaStartPos);
     }
+
+    // if heading with alignment nested inside a layout column, return TextSelection
+    // As NodeSelection cause the desc.selectNode is not a function error in the syncNodeSelection in prosemirror view
+    // Results in block menu not open on the first 2 clicks for a heading with alignment nested inside a layout column
+    if (nodeName === 'heading' && node !== null && node !== void 0 && node.marks.some(mark => mark.type.name === 'alignment') && ((_doc$nodeAt = doc.nodeAt(start - 1)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type.name) === 'layoutColumn') {
+      return TextSelection.create(doc, start, start + nodeSize);
+    }
     return new NodeSelection(doc.resolve(start));
   }
 

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

@@ -7,7 +7,7 @@ import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equ
 import { key } from '../pm-plugins/main';
 import { mapPreservedSelection } from '../pm-plugins/utils/selection';
 import { moveNode } from './move-node';
-import { canMoveNodeUpOrDown, getCurrentNodePosFromDragHandleSelection } from './utils/move-node-utils';
+import { canMoveNodeUpOrDown, getNodeBoundsFromSelection } from './utils/move-node-utils';
 var getSelectionToIndex = function getSelectionToIndex(fromIndex, $to, depth) {
   var toIndex = $to.index(depth);
   var toIndexAfter = $to.indexAfter(depth);
@@ -29,12 +29,12 @@ export var moveNodeWithBlockMenu = function moveNodeWithBlockMenu(api, direction
     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: selection,
-      schema: tr.doc.type.schema,
-      resolve: tr.doc.resolve.bind(tr.doc)
-    });
+    // Use getNodeBoundsFromSelection to get the proper block boundaries
+    var nodeBounds = getNodeBoundsFromSelection(selection);
+    if (!nodeBounds) {
+      return tr;
+    }
+    var currentNodePos = nodeBounds.from;
     var $from = selection.$from,
       $to = selection.$to;
     var depth = tr.doc.resolve(currentNodePos).depth;

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

@@ -388,9 +388,6 @@ export var moveNode = function moveNode(api) {
       if (!convertedNode) {
         return tr;
       }
-      if ((sourceNode === null || sourceNode === void 0 ? void 0 : sourceNode.type.name) === 'taskList' && sliceFrom > 0 && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
-        sliceFrom = sliceFrom - 1;
-      }
 
       // Currently we don't support breakout mark for children nodes of bodiedSyncBlock node
       // Hence strip out the mark for now

package/dist/esm/editor-commands/utils/move-node-utils.js

@@ -1,38 +1,54 @@
-import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
-import { getNestedNodePosition } from '../../pm-plugins/utils/getNestedNodePosition';
-export var getCurrentNodePosFromDragHandleSelection = function getCurrentNodePosFromDragHandleSelection(_ref) {
-  var selection = _ref.selection,
-    schema = _ref.schema,
-    resolve = _ref.resolve;
-  var currentNodePos = -1;
-  if (selection.empty && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
-    currentNodePos = selection.$from.pos;
+import { createPreservedSelection } from '../../pm-plugins/utils/selection';
+
+/**
+ * Gets the current node position and bounds from the selection using the preserved selection logic.
+ * This ensures consistency with how the block controls plugin handles selection boundaries.
+ *
+ * Special handling for tables: When moving a table as a block, we need the outer table node's
+ * position, not the internal cell selection that createPreservedSelection returns.
+ *
+ * @param selection The current editor selection
+ * @returns An object with from and to positions, or undefined if selection is invalid
+ */
+export var getNodeBoundsFromSelection = function getNodeBoundsFromSelection(selection) {
+  // Special case: if a table is selected, we want to move the entire table node
+  var tableInfo = findTable(selection);
+  if (tableInfo && isTableSelected(selection)) {
+    var tablePos = tableInfo.pos;
+    var tableTo = tablePos + tableInfo.node.nodeSize;
+    return {
+      from: tablePos,
+      to: tableTo
+    };
   }
-  if (isTableSelected(selection)) {
-    var _findTable$pos, _findTable;
-    // We only move table node if it's fully selected
-    // to avoid shortcut collision with table drag and drop
-    currentNodePos = (_findTable$pos = (_findTable = findTable(selection)) === null || _findTable === void 0 ? void 0 : _findTable.pos) !== null && _findTable$pos !== void 0 ? _findTable$pos : currentNodePos;
-  } else if (selection instanceof NodeSelection && selection.node.type === schema.nodes.media && selection.node.attrs.type === 'file' && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
-    // When a file is selected, it is actually wrapped in a media group
-    // return the position of the media group , as the group is the node that we want to move up or down
-    currentNodePos = selection.$from.pos - 1;
-  } else if (!(selection instanceof GapCursorSelection)) {
-    // 2. caret cursor is inside the node
-    // 3. the start of the selection is inside the node
-    currentNodePos = selection.$from.before(1);
-    if (selection.$from.depth > 0) {
-      currentNodePos = getNestedNodePosition({
-        selection: selection,
-        schema: schema,
-        resolve: resolve
-      });
+
+  // Special case: if a media node (file) is selected, we need to get the parent mediaGroup
+  // This handles the case where clicking on a file creates a NodeSelection of the media node
+  // but we want to move the entire mediaGroup that wraps it
+  if (selection instanceof NodeSelection && selection.node.type.name === 'media' && selection.node.attrs.type === 'file' && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    // The media node is wrapped in a mediaGroup, so we need to get the parent position
+    var mediaGroupPos = selection.$from.pos - 1;
+    var mediaGroupNode = selection.$from.doc.nodeAt(mediaGroupPos);
+    if (mediaGroupNode && mediaGroupNode.type.name === 'mediaGroup') {
+      return {
+        from: mediaGroupPos,
+        to: mediaGroupPos + mediaGroupNode.nodeSize
+      };
     }
   }
-  return currentNodePos;
+
+  // Use createPreservedSelection to get properly expanded block boundaries
+  var preservedSelection = createPreservedSelection(selection.$from, selection.$to);
+  if (!preservedSelection) {
+    return undefined;
+  }
+  return {
+    from: preservedSelection.from,
+    to: preservedSelection.to
+  };
 };
 export var getPosWhenMoveNodeUp = function getPosWhenMoveNodeUp($currentNodePos, currentNodePos) {
   var nodeIndex = $currentNodePos.index();
@@ -42,10 +58,10 @@ export var getPosWhenMoveNodeUp = function getPosWhenMoveNodeUp($currentNodePos,
   }
   return nodeBefore ? currentNodePos - nodeBefore.nodeSize : -1;
 };
-export var getPosWhenMoveNodeDown = function getPosWhenMoveNodeDown(_ref2) {
-  var $currentNodePos = _ref2.$currentNodePos,
-    nodeAfterPos = _ref2.nodeAfterPos,
-    tr = _ref2.tr;
+export var getPosWhenMoveNodeDown = function getPosWhenMoveNodeDown(_ref) {
+  var $currentNodePos = _ref.$currentNodePos,
+    nodeAfterPos = _ref.nodeAfterPos,
+    tr = _ref.tr;
   var endOfDoc = $currentNodePos.end();
   if (nodeAfterPos > endOfDoc) {
     return -1;
@@ -62,27 +78,24 @@ export var getPosWhenMoveNodeDown = function getPosWhenMoveNodeDown(_ref2) {
   // if not the last node, move to the end of the next node
   return nodeAfter ? nodeAfterPos + nodeAfter.nodeSize : -1;
 };
-export var getShouldMoveNode = function getShouldMoveNode(_ref3) {
-  var currentNodePos = _ref3.currentNodePos,
-    moveToPos = _ref3.moveToPos,
-    tr = _ref3.tr;
+export var getShouldMoveNode = function getShouldMoveNode(_ref2) {
+  var currentNodePos = _ref2.currentNodePos,
+    moveToPos = _ref2.moveToPos,
+    tr = _ref2.tr;
   // only move the node if the destination is at the same depth, not support moving a nested node to a parent node
   return moveToPos > -1 && tr.doc.resolve(currentNodePos).depth === tr.doc.resolve(moveToPos).depth;
 };
 export var canMoveNodeUpOrDown = function canMoveNodeUpOrDown(tr) {
-  var currentNodePos = getCurrentNodePosFromDragHandleSelection({
-    selection: tr.selection,
-    schema: tr.doc.type.schema,
-    resolve: tr.doc.resolve.bind(tr.doc)
-  });
-  if (currentNodePos <= -1) {
+  var nodeBounds = getNodeBoundsFromSelection(tr.selection);
+  if (!nodeBounds || nodeBounds.from <= -1) {
     return {
       moveUp: false,
       moveDown: false
     };
   }
+  var currentNodePos = nodeBounds.from;
   var $currentNodePos = tr.doc.resolve(currentNodePos);
-  var nodeAfterPos = $currentNodePos.posAtIndex($currentNodePos.index() + 1);
+  var nodeAfterPos = nodeBounds.to;
   var moveUpPos = getPosWhenMoveNodeUp($currentNodePos, currentNodePos);
   var moveDownPos = getPosWhenMoveNodeDown({
     $currentNodePos: $currentNodePos,

package/dist/esm/pm-plugins/handle-mouse-over.js

@@ -57,6 +57,11 @@ export var handleMouseOver = function handleMouseOver(view, event, api) {
     return false;
   }
 
+  // If the editor view is not in focus when the block menu is open, do not update the drag handle
+  if (!view.hasFocus() && isMenuOpen && expValEquals('platform_editor_block_menu', 'isEnabled', true)) {
+    return false;
+  }
+
   // Most mouseover events don't fire during drag but some can slip through
   // when the drag begins. This prevents those.
   if (isDragging) {

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

@@ -1,13 +1,14 @@
 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 { bind } from 'bind-event-listener';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { DRAG_HANDLE_SELECTOR } from '@atlaskit/editor-common/styles';
 import { key } from '../main';
 import { createPreservedSelection, mapPreservedSelection } from '../utils/selection';
 import { stopPreservingSelection } from './editor-commands';
 import { selectionPreservationPluginKey } from './plugin-key';
-import { compareSelections, getSelectionPreservationMeta, hasUserSelectionChange, isSelectionWithinCodeBlock, syncDOMSelection } from './utils';
+import { compareSelections, getSelectionPreservationMeta, hasUserSelectionChange, syncDOMSelection } from './utils';
 
 /**
  * Selection Preservation Plugin
@@ -60,7 +61,7 @@ export var createSelectionPreservationPlugin = function createSelectionPreservat
             newState.preservedSelection = mapPreservedSelection(newState.preservedSelection, tr);
           }
           if (!compareSelections(newState.preservedSelection, pluginState.preservedSelection)) {
-            if (newState !== null && newState !== void 0 && newState.preservedSelection) {
+            if (newState.preservedSelection) {
               var _api$selection;
               api === null || api === void 0 || api.core.actions.execute(api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.commands) === null || _api$selection === void 0 ? void 0 : _api$selection.setBlockSelection(newState.preservedSelection));
             } else {
@@ -79,8 +80,8 @@ export var createSelectionPreservationPlugin = function createSelectionPreservat
           return null;
         }
 
-        // Auto-stop if user explicitly changes selection or selection is set within a code block
-        if (hasUserSelectionChange(transactions) || isSelectionWithinCodeBlock(stateSel)) {
+        // Auto-stop if user explicitly changes selection
+        if (hasUserSelectionChange(transactions)) {
           return stopPreservingSelection({
             tr: newState.tr
           });
@@ -100,10 +101,51 @@ export var createSelectionPreservationPlugin = function createSelectionPreservat
         }
         return newState.tr.setSelection(newSelection);
       },
-      view: function view() {
+      view: function view(initialView) {
+        var view = initialView;
+        var unbindDocumentMouseDown = bind(document, {
+          type: 'mousedown',
+          listener: function listener(e) {
+            if (!(e.target instanceof HTMLElement)) {
+              return;
+            }
+            var _ref = selectionPreservationPluginKey.getState(view.state) || {},
+              preservedSelection = _ref.preservedSelection;
+
+            // If there is no current preserved selection or the editor is not focused, do nothing
+            if (!preservedSelection) {
+              return;
+            }
+            var clickedDragHandle = !!e.target.closest(DRAG_HANDLE_SELECTOR);
+
+            // When mouse down on a drag handle we continue preserving the selection
+            if (clickedDragHandle) {
+              return;
+            }
+            var clickedOutsideEditor = !e.target.closest('.ProseMirror');
+
+            // When mouse down outside the editor continue to preserve the selection
+            if (clickedOutsideEditor) {
+              return;
+            }
+
+            // Otherwise mouse down anywhere else in the editor stops preserving the selection
+            var tr = view.state.tr;
+            stopPreservingSelection({
+              tr: tr
+            });
+            view.dispatch(tr);
+          },
+          // Use capture phase to stop preservation before appendTransaction runs,
+          // preventing unwanted selection restoration when the user clicks into the editor.
+          options: {
+            capture: true
+          }
+        });
         return {
-          update: function update(view, prevState) {
+          update: function update(updateView, prevState) {
             var _selectionPreservatio, _selectionPreservatio2, _key$getState, _key$getState2;
+            view = updateView;
             var prevPreservedSelection = (_selectionPreservatio = selectionPreservationPluginKey.getState(prevState)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection;
             var currPreservedSelection = (_selectionPreservatio2 = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio2 === void 0 ? void 0 : _selectionPreservatio2.preservedSelection;
             var prevActiveNode = (_key$getState = key.getState(prevState)) === null || _key$getState === void 0 ? void 0 : _key$getState.activeNode;
@@ -111,33 +153,13 @@ export var createSelectionPreservationPlugin = function createSelectionPreservat
             if (currPreservedSelection && view.hasFocus() && (!compareSelections(prevPreservedSelection, currPreservedSelection) || prevActiveNode !== currActiveNode)) {
               syncDOMSelection(view.state.selection);
             }
+          },
+          destroy: function destroy() {
+            unbindDocumentMouseDown();
           }
         };
       },
       props: {
-        handleClick: function handleClick(view, pos, event) {
-          var _ref = selectionPreservationPluginKey.getState(view.state) || {},
-            preservedSelection = _ref.preservedSelection;
-
-          // If there is no current preserved selection, do nothing
-          if (!preservedSelection) {
-            return false;
-          }
-          var clickedDragHandle = event.target instanceof HTMLElement && event.target.closest(DRAG_HANDLE_SELECTOR);
-
-          // When clicking a drag handle we continue preserving the selection
-          if (!clickedDragHandle) {
-            return false;
-          }
-
-          // Otherwise clicking anywhere else in the editor stops preserving the selection
-          var tr = view.state.tr;
-          stopPreservingSelection({
-            tr: tr
-          });
-          view.dispatch(tr);
-          return false;
-        },
         handleKeyDown: function handleKeyDown(view, event) {
           var _api$core, _api$blockControls;
           var _ref2 = selectionPreservationPluginKey.getState(view.state) || {},

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

@@ -14,18 +14,6 @@ export var getSelectionPreservationMeta = function getSelectionPreservationMeta(
   return tr.getMeta(selectionPreservationPluginKey);
 };
 
-/**
- * Checks if the current selection is within a code block.
- *
- * @param selection The current selection to check.
- * @returns True if the selection is within a code block, otherwise false.
- */
-export var isSelectionWithinCodeBlock = function isSelectionWithinCodeBlock(_ref) {
-  var $from = _ref.$from,
-    $to = _ref.$to;
-  return $from.sameParent($to) && $from.parent.type.name === 'codeBlock';
-};
-
 /**
  * Compares two selections for equality based on their from and to positions.
  *

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

@@ -90,11 +90,21 @@ export var newGetSelection = function newGetSelection(doc, selectionEmpty, start
   var nodeSize = node ? node.nodeSize : 1;
   var nodeName = node === null || node === void 0 ? void 0 : node.type.name;
   if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    var _doc$nodeAt;
     // if mediaGroup only has a single child, we want to select the child
     if (nodeName === 'mediaGroup' && (node === null || node === void 0 ? void 0 : node.childCount) === 1) {
       var $mediaStartPos = doc.resolve(start + 1);
       return new NodeSelection($mediaStartPos);
     }
+
+    // if heading with alignment nested inside a layout column, return TextSelection
+    // As NodeSelection cause the desc.selectNode is not a function error in the syncNodeSelection in prosemirror view
+    // Results in block menu not open on the first 2 clicks for a heading with alignment nested inside a layout column
+    if (nodeName === 'heading' && node !== null && node !== void 0 && node.marks.some(function (mark) {
+      return mark.type.name === 'alignment';
+    }) && ((_doc$nodeAt = doc.nodeAt(start - 1)) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.type.name) === 'layoutColumn') {
+      return TextSelection.create(doc, start, start + nodeSize);
+    }
     return new NodeSelection(doc.resolve(start));
   }
 

package/dist/types/editor-commands/utils/move-node-utils.d.ts

@@ -1,11 +1,19 @@
-import type { ResolvedPos, Schema } from '@atlaskit/editor-prosemirror/model';
-import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-import { type Selection } from '@atlaskit/editor-prosemirror/state';
-export declare const getCurrentNodePosFromDragHandleSelection: ({ selection, schema, resolve, }: {
-    resolve: (pos: number) => ResolvedPos;
-    schema: Schema;
-    selection: Selection;
-}) => number;
+import type { ResolvedPos } from '@atlaskit/editor-prosemirror/model';
+import { type Selection, type Transaction } from '@atlaskit/editor-prosemirror/state';
+/**
+ * Gets the current node position and bounds from the selection using the preserved selection logic.
+ * This ensures consistency with how the block controls plugin handles selection boundaries.
+ *
+ * Special handling for tables: When moving a table as a block, we need the outer table node's
+ * position, not the internal cell selection that createPreservedSelection returns.
+ *
+ * @param selection The current editor selection
+ * @returns An object with from and to positions, or undefined if selection is invalid
+ */
+export declare const getNodeBoundsFromSelection: (selection: Selection) => {
+    from: number;
+    to: number;
+} | undefined;
 export declare const getPosWhenMoveNodeUp: ($currentNodePos: ResolvedPos, currentNodePos: number) => number;
 export declare const getPosWhenMoveNodeDown: ({ $currentNodePos, nodeAfterPos, tr, }: {
     $currentNodePos: ResolvedPos;

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

@@ -8,13 +8,6 @@ import type { SelectionPreservationMeta } from './types';
  */
 export declare const hasUserSelectionChange: (transactions: readonly Transaction[]) => boolean;
 export declare const getSelectionPreservationMeta: (tr: Transaction | ReadonlyTransaction) => SelectionPreservationMeta | undefined;
-/**
- * Checks if the current selection is within a code block.
- *
- * @param selection The current selection to check.
- * @returns True if the selection is within a code block, otherwise false.
- */
-export declare const isSelectionWithinCodeBlock: ({ $from, $to }: Selection) => boolean;
 /**
  * Compares two selections for equality based on their from and to positions.
  *

package/dist/types-ts4.5/editor-commands/utils/move-node-utils.d.ts

@@ -1,11 +1,19 @@
-import type { ResolvedPos, Schema } from '@atlaskit/editor-prosemirror/model';
-import type { Transaction } from '@atlaskit/editor-prosemirror/state';
-import { type Selection } from '@atlaskit/editor-prosemirror/state';
-export declare const getCurrentNodePosFromDragHandleSelection: ({ selection, schema, resolve, }: {
-    resolve: (pos: number) => ResolvedPos;
-    schema: Schema;
-    selection: Selection;
-}) => number;
+import type { ResolvedPos } from '@atlaskit/editor-prosemirror/model';
+import { type Selection, type Transaction } from '@atlaskit/editor-prosemirror/state';
+/**
+ * Gets the current node position and bounds from the selection using the preserved selection logic.
+ * This ensures consistency with how the block controls plugin handles selection boundaries.
+ *
+ * Special handling for tables: When moving a table as a block, we need the outer table node's
+ * position, not the internal cell selection that createPreservedSelection returns.
+ *
+ * @param selection The current editor selection
+ * @returns An object with from and to positions, or undefined if selection is invalid
+ */
+export declare const getNodeBoundsFromSelection: (selection: Selection) => {
+    from: number;
+    to: number;
+} | undefined;
 export declare const getPosWhenMoveNodeUp: ($currentNodePos: ResolvedPos, currentNodePos: number) => number;
 export declare const getPosWhenMoveNodeDown: ({ $currentNodePos, nodeAfterPos, tr, }: {
     $currentNodePos: ResolvedPos;

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

@@ -8,13 +8,6 @@ import type { SelectionPreservationMeta } from './types';
  */
 export declare const hasUserSelectionChange: (transactions: readonly Transaction[]) => boolean;
 export declare const getSelectionPreservationMeta: (tr: Transaction | ReadonlyTransaction) => SelectionPreservationMeta | undefined;
-/**
- * Checks if the current selection is within a code block.
- *
- * @param selection The current selection to check.
- * @returns True if the selection is within a code block, otherwise false.
- */
-export declare const isSelectionWithinCodeBlock: ({ $from, $to }: Selection) => boolean;
 /**
  * Compares two selections for equality based on their from and to positions.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "8.0.9",
+	"version": "8.0.11",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -54,7 +54,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^17.0.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^16.15.0",
+		"@atlaskit/tmp-editor-statsig": "^16.19.0",
 		"@atlaskit/tokens": "^9.1.0",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@babel/runtime": "^7.0.0",
@@ -66,7 +66,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.7.0",
+		"@atlaskit/editor-common": "^111.8.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"