@atlaskit/editor-plugin-block-controls 7.13.2 → 7.14.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 7.14.0
+
+### Minor Changes
+
+- [`5f21c5a85f65a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5f21c5a85f65a) -
+  ED-29714 fix some alignment issues
+
+### Patch Changes
+
+- Updated dependencies
+
+## 7.13.3
+
+### Patch Changes
+
+- [`7c295bfea1292`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7c295bfea1292) -
+  EDITOR-3380 Use preserved selection when deleting selected range
+- Updated dependencies
+
 ## 7.13.2
 
 ### Patch Changes

package/dist/cjs/blockControlsPlugin.js

@@ -49,7 +49,7 @@ var blockControlsPlugin = exports.blockControlsPlugin = function blockControlsPl
       if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
         pmPlugins.push({
           name: 'blockControlsSelectionPreservationPlugin',
-          plugin: _pmPlugin2.createSelectionPreservationPlugin
+          plugin: (0, _pmPlugin2.createSelectionPreservationPlugin)(api)
         });
       }
 

package/dist/cjs/pm-plugins/decorations-drag-handle.js

@@ -12,6 +12,7 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
 var _uuid = _interopRequireDefault(require("uuid"));
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _dragHandle = require("../ui/drag-handle");
 var _decorationsCommon = require("./decorations-common");
@@ -32,6 +33,50 @@ var findHandleDec = exports.findHandleDec = function findHandleDec(decorations,
     return spec.type === _decorationsCommon.TYPE_HANDLE_DEC;
   });
 };
+/**
+ * Fix for widget positioning to ensure it is not placed into a previous mark's DOM structure.
+ * A ProseMirror widget can appear in the wrong DOM position, specifically being added
+ * to a previous mark instead of its intended location, which leads to various rendering issues.
+ * For example, when nodeBefore has an alignment mark but the current node doesn't, ProseMirror may
+ * incorrectly render the widget inside the previous node's alignment mark wrapper instead.
+ */
+var fixWidgetSide = function fixWidgetSide($pos) {
+  var defaultSide = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : -1;
+  var alignmentMark = $pos.doc.type.schema.marks.alignment;
+  var indentationMark = $pos.doc.type.schema.marks.indentation;
+
+  // Only apply fix for alignment and indent marks
+  if (!alignmentMark && !indentationMark) {
+    return defaultSide;
+  }
+  if ($pos.nodeBefore && $pos.nodeAfter) {
+    var _$pos$nodeBefore, _$pos$nodeAfter;
+    var beforeMarks = ((_$pos$nodeBefore = $pos.nodeBefore) === null || _$pos$nodeBefore === void 0 ? void 0 : _$pos$nodeBefore.marks.filter(function (mark) {
+      return mark.type === alignmentMark || mark.type === indentationMark;
+    })) || [];
+    var afterMarks = ((_$pos$nodeAfter = $pos.nodeAfter) === null || _$pos$nodeAfter === void 0 ? void 0 : _$pos$nodeAfter.marks.filter(function (mark) {
+      return mark.type === alignmentMark || mark.type === indentationMark;
+    })) || [];
+    if (beforeMarks.length === 0) {
+      return defaultSide;
+    } else if (afterMarks.length === 0) {
+      return 0;
+    }
+
+    // Check if previous node has marks that current node doesn't have
+    var hasMissingMark = beforeMarks.some(function (mark) {
+      return !afterMarks.some(function (nextMark) {
+        return nextMark.eq(mark);
+      });
+    });
+
+    // if we have missing mark, we set side to 0 to render widget outside previous mark DOM
+    if (hasMissingMark) {
+      return 0;
+    }
+  }
+  return defaultSide;
+};
 var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDecoration(_ref) {
   var api = _ref.api,
     formatMessage = _ref.formatMessage,
@@ -50,8 +95,10 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
   var unbind;
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   var key = (0, _uuid.default)();
+  var $pos = editorState.doc.resolve(pos);
+  var side = (0, _expValEquals.expValEquals)('platform_editor_native_anchor_with_dnd', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_native_anchor_patch_1') ? fixWidgetSide($pos) : -1;
   var widgetSpec = (0, _experiments.editorExperiment)('platform_editor_breakout_resizing', true) ? {
-    side: -1,
+    side: side,
     type: _decorationsCommon.TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     testid: "".concat(_decorationsCommon.TYPE_HANDLE_DEC, "-").concat((0, _uuid.default)()),
@@ -68,7 +115,7 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
       }
     }
   } : {
-    side: -1,
+    side: side,
     type: _decorationsCommon.TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     testid: "".concat(_decorationsCommon.TYPE_HANDLE_DEC, "-").concat((0, _uuid.default)()),
@@ -91,13 +138,14 @@ var dragHandleDecoration = exports.dragHandleDecoration = function dragHandleDec
       try {
         return getPosUnsafe();
       } catch (e) {
+        // Ignore errors from getPosUnsafe
         return undefined;
       }
     };
     var newPos = getPos();
     if (typeof newPos === 'number') {
-      var $pos = view.state.doc.resolve(newPos);
-      isTopLevelNode = ($pos === null || $pos === void 0 ? void 0 : $pos.parent.type.name) === 'doc';
+      var _$pos = view.state.doc.resolve(newPos);
+      isTopLevelNode = (_$pos === null || _$pos === void 0 ? void 0 : _$pos.parent.type.name) === 'doc';
     }
     /*
      * We disable mouseover event to fix flickering issue on hover

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

@@ -42,55 +42,86 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * when modal dialogs are active. In these states, any selection changes are from ProseMirror's
  * internal behavior (not user input) and should be prevented. Do not use during normal editing.
  */
-var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugin = function createSelectionPreservationPlugin() {
-  return new _safePlugin.SafePlugin({
-    key: _pluginKey.selectionPreservationPluginKey,
-    state: {
-      init: function init() {
-        return {
-          preservedSelection: undefined
-        };
+var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugin = function createSelectionPreservationPlugin(api) {
+  return function () {
+    return new _safePlugin.SafePlugin({
+      key: _pluginKey.selectionPreservationPluginKey,
+      state: {
+        init: function init() {
+          return {
+            preservedSelection: undefined
+          };
+        },
+        apply: function apply(tr, pluginState) {
+          var meta = (0, _utils.getSelectionPreservationMeta)(tr);
+          var newState = _objectSpread({}, pluginState);
+          if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'startPreserving') {
+            newState.preservedSelection = tr.selection;
+          } else if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'stopPreserving') {
+            newState.preservedSelection = undefined;
+          }
+          if (newState.preservedSelection && tr.docChanged) {
+            newState.preservedSelection = (0, _selection.mapPreservedSelection)(newState.preservedSelection, tr);
+          }
+          return newState;
+        }
       },
-      apply: function apply(tr, pluginState) {
-        var meta = (0, _utils.getSelectionPreservationMeta)(tr);
-        var newState = _objectSpread({}, pluginState);
-        if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'startPreserving') {
-          newState.preservedSelection = tr.selection;
-        } else if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'stopPreserving') {
-          newState.preservedSelection = undefined;
+      appendTransaction: function appendTransaction(transactions, _oldState, newState) {
+        var pluginState = _pluginKey.selectionPreservationPluginKey.getState(newState);
+        var savedSel = pluginState === null || pluginState === void 0 ? void 0 : pluginState.preservedSelection;
+        if (!savedSel) {
+          return null;
         }
-        if (newState.preservedSelection && tr.docChanged) {
-          newState.preservedSelection = (0, _selection.mapPreservedSelection)(newState.preservedSelection, tr);
+        if ((0, _utils.hasUserSelectionChange)(transactions)) {
+          // Auto-stop if user explicitly changes selection
+          return (0, _editorCommands.stopPreservingSelection)({
+            tr: newState.tr
+          });
+        }
+        var currSel = newState.selection;
+        var selectionUnchanged = currSel.from === savedSel.from && currSel.to === savedSel.to;
+        var selectionInvalid = savedSel.from < 0 || savedSel.to > newState.doc.content.size;
+        if (selectionUnchanged || selectionInvalid) {
+          return null;
+        }
+        try {
+          return newState.tr.setSelection(savedSel);
+        } catch (error) {
+          (0, _monitoring.logException)(error, {
+            location: 'editor-plugin-block-controls/SelectionPreservationPlugin'
+          });
         }
-        return newState;
-      }
-    },
-    appendTransaction: function appendTransaction(transactions, _oldState, newState) {
-      var pluginState = _pluginKey.selectionPreservationPluginKey.getState(newState);
-      var savedSel = pluginState === null || pluginState === void 0 ? void 0 : pluginState.preservedSelection;
-      if (!savedSel) {
-        return null;
-      }
-      if ((0, _utils.hasUserSelectionChange)(transactions)) {
-        // Auto-stop if user explicitly changes selection
-        return (0, _editorCommands.stopPreservingSelection)({
-          tr: newState.tr
-        });
-      }
-      var currSel = newState.selection;
-      var selectionUnchanged = currSel.from === savedSel.from && currSel.to === savedSel.to;
-      var selectionInvalid = savedSel.from < 0 || savedSel.to > newState.doc.content.size;
-      if (selectionUnchanged || selectionInvalid) {
         return null;
+      },
+      props: {
+        handleKeyDown: function handleKeyDown(view, event) {
+          var _api$userIntent;
+          var _ref = _pluginKey.selectionPreservationPluginKey.getState(view.state) || {},
+            preservedSelection = _ref.preservedSelection;
+
+          // If there is no current preserved selection, do nothing
+          if (!preservedSelection) {
+            return false;
+          }
+
+          // While preserving selection, if user presses delete/backspace, prevent event from being
+          // handled by ProseMirror natively so that we can apply custom delete logic in block menu
+          if (event.key === 'Backspace' || event.key === 'Delete') {
+            return true;
+          }
+          var blockMenuOpen = (api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent) === 'blockMenuOpen';
+
+          // When block menu isn't open and user presses any key, stop preserving selection
+          if (!blockMenuOpen) {
+            var tr = view.state.tr;
+            (0, _editorCommands.stopPreservingSelection)({
+              tr: tr
+            });
+            view.dispatch(tr);
+            return false;
+          }
+        }
       }
-      try {
-        return newState.tr.setSelection(savedSel);
-      } catch (error) {
-        (0, _monitoring.logException)(error, {
-          location: 'editor-plugin-block-controls/SelectionPreservationPlugin'
-        });
-      }
-      return null;
-    }
-  });
+    });
+  };
 };

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

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getActiveBlockMarks = void 0;
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 /**
  * Returns list of block marks on schema that widgets are allowed to render inside
  * Currently
@@ -21,9 +23,36 @@ exports.getActiveBlockMarks = void 0;
 var getActiveBlockMarks = exports.getActiveBlockMarks = function getActiveBlockMarks(state, pos) {
   var alignment = state.schema.marks.alignment;
   var resolvedPos = state.doc.resolve(pos);
+
   // find all active marks at the position
   var marks = resolvedPos.marks();
-  return marks.filter(function (mark) {
+  var supportedMarks = marks.filter(function (mark) {
     return mark.type === alignment;
   });
+
+  /**
+   * Fix for widget positioning at alignment mark boundaries.
+   * When the previous node has alignment but the next node doesn't, we need to prevent
+   * the widget from inheriting alignment marks. This ensures the widget is positioned
+   * correctly at the boundary rather than being absorbed into the alignment wrapper.
+   */
+  if (supportedMarks.length > 0 && (0, _expValEquals.expValEquals)('platform_editor_native_anchor_with_dnd', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_native_anchor_patch_1')) {
+    var _resolvedPos$nodeAfte;
+    var nextNodeMarks = ((_resolvedPos$nodeAfte = resolvedPos.nodeAfter) === null || _resolvedPos$nodeAfte === void 0 ? void 0 : _resolvedPos$nodeAfte.marks.filter(function (mark) {
+      return mark.type === alignment;
+    })) || [];
+
+    // Compare alignment values to ensure they are the same
+    var alignmentValuesMatch = supportedMarks.length === nextNodeMarks.length && supportedMarks.some(function (mark) {
+      return nextNodeMarks.some(function (nextMark) {
+        return nextMark.eq(mark);
+      });
+    });
+
+    // previous node has alignment but next node does not have alignment or alignment values differ
+    if (nextNodeMarks.length === 0 || !alignmentValuesMatch) {
+      return [];
+    }
+  }
+  return supportedMarks;
 };

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

@@ -17,7 +17,6 @@ var _browser = require("@atlaskit/editor-common/browser");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
-var _selection = require("@atlaskit/editor-common/selection");
 var _styles = require("@atlaskit/editor-common/styles");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _state = require("@atlaskit/editor-prosemirror/state");
@@ -39,7 +38,7 @@ var _pluginKey = require("../pm-plugins/selection-preservation/plugin-key");
 var _analytics2 = require("../pm-plugins/utils/analytics");
 var _dragHandlePositions = require("../pm-plugins/utils/drag-handle-positions");
 var _getSelection = require("../pm-plugins/utils/getSelection");
-var _selection2 = require("../pm-plugins/utils/selection");
+var _selection = require("../pm-plugins/utils/selection");
 var _consts2 = require("./consts");
 var _dragPreview = require("./drag-preview");
 var _anchorName = require("./utils/anchor-name");
@@ -482,8 +481,8 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
         tr = (0, _getSelection.selectNode)(tr, startPos, nodeType, api);
       } else if (isTopLevelNode && $anchor.depth <= _consts2.DRAG_HANDLE_MAX_SHIFT_CLICK_DEPTH && e.shiftKey && (0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_shift_click_select')) {
         var _api$blockControls3;
-        var alignAnchorHeadToSel = (0, _selection2.alignAnchorHeadInDirectionOfPos)(tr.selection, startPos);
-        var selectionWithExpandedHead = (0, _selection2.expandSelectionHeadToNodeAtPos)(alignAnchorHeadToSel, startPos);
+        var alignAnchorHeadToSel = (0, _selection.alignAnchorHeadInDirectionOfPos)(tr.selection, startPos);
+        var selectionWithExpandedHead = (0, _selection.expandSelectionHeadToNodeAtPos)(alignAnchorHeadToSel, startPos);
         tr.setSelection(selectionWithExpandedHead);
         api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.setMultiSelectPositions()({
           tr: tr
@@ -574,20 +573,6 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
         });
         return tr;
       });
-    } else if (e.key === 'Backspace' || e.key === 'Delete') {
-      e.preventDefault();
-      e.stopPropagation();
-      api === null || api === void 0 || api.core.actions.execute(function (_ref7) {
-        var _api$blockControls5;
-        var tr = _ref7.tr;
-        (0, _selection.deleteSelectedRange)(tr);
-        api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 || _api$blockControls5.commands.toggleBlockMenu({
-          closeMenu: true
-        })({
-          tr: tr
-        });
-        return tr;
-      });
     } else if (![e.altKey, e.ctrlKey, e.shiftKey].some(function (pressed) {
       return pressed;
     })) {
@@ -609,21 +594,21 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
           start: start
         };
       },
-      onGenerateDragPreview: function onGenerateDragPreview(_ref8) {
+      onGenerateDragPreview: function onGenerateDragPreview(_ref7) {
         var _api$blockControls$sh2;
-        var nativeSetDragImage = _ref8.nativeSetDragImage;
+        var nativeSetDragImage = _ref7.nativeSetDragImage;
         if (isMultiSelect) {
           var _api$core6;
-          api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 || _api$core6.actions.execute(function (_ref9) {
-            var tr = _ref9.tr;
+          api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 || _api$core6.actions.execute(function (_ref8) {
+            var tr = _ref8.tr;
             var handlePos = getPos();
             if (typeof handlePos !== 'number') {
               return tr;
             }
             var newHandlePosCheck = (0, _getSelection.isHandleCorrelatedToSelection)(view.state, tr.selection, handlePos);
             if (!tr.selection.empty && newHandlePosCheck) {
-              var _api$blockControls6;
-              api === null || api === void 0 || (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 || _api$blockControls6.commands.setMultiSelectPositions()({
+              var _api$blockControls5;
+              api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 || _api$blockControls5.commands.setMultiSelectPositions()({
                 tr: tr
               });
             } else if ((0, _platformFeatureFlags.fg)('platform_editor_elements_dnd_select_node_on_drag')) {
@@ -693,8 +678,8 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
               };
             }
           },
-          render: function render(_ref0) {
-            var container = _ref0.container;
+          render: function render(_ref9) {
+            var container = _ref9.container;
             var dom = view.dom.querySelector("[".concat((0, _domAttrName.getAnchorAttrName)(), "=\"").concat(anchorName, "\"]"));
             if (!dom) {
               return;
@@ -730,9 +715,9 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
         if (start === undefined) {
           return;
         }
-        api === null || api === void 0 || (_api$core7 = api.core) === null || _api$core7 === void 0 || _api$core7.actions.execute(function (_ref1) {
-          var _api$blockControls$sh3, _api$blockControls7, _api$analytics3;
-          var tr = _ref1.tr;
+        api === null || api === void 0 || (_api$core7 = api.core) === null || _api$core7 === void 0 || _api$core7.actions.execute(function (_ref0) {
+          var _api$blockControls$sh3, _api$blockControls6, _api$analytics3;
+          var tr = _ref0.tr;
           var nodeTypes, hasSelectedMultipleNodes;
           var resolvedMovingNode = tr.doc.resolve(start);
           var maybeNode = resolvedMovingNode.nodeAfter;
@@ -745,7 +730,7 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
             nodeTypes = maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name;
             hasSelectedMultipleNodes = false;
           }
-          api === null || api === void 0 || (_api$blockControls7 = api.blockControls) === null || _api$blockControls7 === void 0 || _api$blockControls7.commands.setNodeDragged(getPos, anchorName, nodeType)({
+          api === null || api === void 0 || (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 || _api$blockControls6.commands.setNodeDragged(getPos, anchorName, nodeType)({
             tr: tr
           });
           tr.setMeta('scrollIntoView', false);
@@ -1128,15 +1113,15 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
   var render = isTooltip ? buttonWithTooltip() : renderButton();
   return (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? stickyRender : render;
 };
-var DragHandleWithVisibility = exports.DragHandleWithVisibility = function DragHandleWithVisibility(_ref10) {
-  var view = _ref10.view,
-    api = _ref10.api,
-    formatMessage = _ref10.formatMessage,
-    getPos = _ref10.getPos,
-    anchorName = _ref10.anchorName,
-    nodeType = _ref10.nodeType,
-    handleOptions = _ref10.handleOptions,
-    anchorRectCache = _ref10.anchorRectCache;
+var DragHandleWithVisibility = exports.DragHandleWithVisibility = function DragHandleWithVisibility(_ref1) {
+  var view = _ref1.view,
+    api = _ref1.api,
+    formatMessage = _ref1.formatMessage,
+    getPos = _ref1.getPos,
+    anchorName = _ref1.anchorName,
+    nodeType = _ref1.nodeType,
+    handleOptions = _ref1.handleOptions,
+    anchorRectCache = _ref1.anchorRectCache;
   return (0, _react2.jsx)(_visibilityContainer.VisibilityContainer, {
     api: api
   }, (0, _react2.jsx)(DragHandle, {

package/dist/es2019/blockControlsPlugin.js

@@ -38,7 +38,7 @@ export const blockControlsPlugin = ({
     if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
       pmPlugins.push({
         name: 'blockControlsSelectionPreservationPlugin',
-        plugin: createSelectionPreservationPlugin
+        plugin: createSelectionPreservationPlugin(api)
       });
     }
 

package/dist/es2019/pm-plugins/decorations-drag-handle.js

@@ -5,6 +5,7 @@ import ReactDOM from 'react-dom';
 import uuid from 'uuid';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DragHandle, DragHandleWithVisibility } from '../ui/drag-handle';
 import { TYPE_HANDLE_DEC, TYPE_NODE_DEC, unmountDecorations } from './decorations-common';
@@ -22,6 +23,43 @@ export const emptyParagraphNodeDecorations = () => {
 export const findHandleDec = (decorations, from, to) => {
   return decorations.find(from, to, spec => spec.type === TYPE_HANDLE_DEC);
 };
+/**
+ * Fix for widget positioning to ensure it is not placed into a previous mark's DOM structure.
+ * A ProseMirror widget can appear in the wrong DOM position, specifically being added
+ * to a previous mark instead of its intended location, which leads to various rendering issues.
+ * For example, when nodeBefore has an alignment mark but the current node doesn't, ProseMirror may
+ * incorrectly render the widget inside the previous node's alignment mark wrapper instead.
+ */
+const fixWidgetSide = ($pos, defaultSide = -1) => {
+  const alignmentMark = $pos.doc.type.schema.marks.alignment;
+  const indentationMark = $pos.doc.type.schema.marks.indentation;
+
+  // Only apply fix for alignment and indent marks
+  if (!alignmentMark && !indentationMark) {
+    return defaultSide;
+  }
+  if ($pos.nodeBefore && $pos.nodeAfter) {
+    var _$pos$nodeBefore, _$pos$nodeAfter;
+    const beforeMarks = ((_$pos$nodeBefore = $pos.nodeBefore) === null || _$pos$nodeBefore === void 0 ? void 0 : _$pos$nodeBefore.marks.filter(mark => mark.type === alignmentMark || mark.type === indentationMark)) || [];
+    const afterMarks = ((_$pos$nodeAfter = $pos.nodeAfter) === null || _$pos$nodeAfter === void 0 ? void 0 : _$pos$nodeAfter.marks.filter(mark => mark.type === alignmentMark || mark.type === indentationMark)) || [];
+    if (beforeMarks.length === 0) {
+      return defaultSide;
+    } else if (afterMarks.length === 0) {
+      return 0;
+    }
+
+    // Check if previous node has marks that current node doesn't have
+    const hasMissingMark = beforeMarks.some(mark => {
+      return !afterMarks.some(nextMark => nextMark.eq(mark));
+    });
+
+    // if we have missing mark, we set side to 0 to render widget outside previous mark DOM
+    if (hasMissingMark) {
+      return 0;
+    }
+  }
+  return defaultSide;
+};
 export const dragHandleDecoration = ({
   api,
   formatMessage,
@@ -41,8 +79,10 @@ export const dragHandleDecoration = ({
   let unbind;
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   const key = uuid();
+  const $pos = editorState.doc.resolve(pos);
+  const side = expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) && fg('platform_editor_native_anchor_patch_1') ? fixWidgetSide($pos) : -1;
   const widgetSpec = editorExperiment('platform_editor_breakout_resizing', true) ? {
-    side: -1,
+    side,
     type: TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     testid: `${TYPE_HANDLE_DEC}-${uuid()}`,
@@ -59,7 +99,7 @@ export const dragHandleDecoration = ({
       }
     }
   } : {
-    side: -1,
+    side,
     type: TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     testid: `${TYPE_HANDLE_DEC}-${uuid()}`,
@@ -82,6 +122,7 @@ export const dragHandleDecoration = ({
       try {
         return getPosUnsafe();
       } catch (e) {
+        // Ignore errors from getPosUnsafe
         return undefined;
       }
     };

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

@@ -33,7 +33,7 @@ import { getSelectionPreservationMeta, hasUserSelectionChange } from './utils';
  * 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 = () => {
+export const createSelectionPreservationPlugin = api => () => {
   return new SafePlugin({
     key: selectionPreservationPluginKey,
     state: {
@@ -84,6 +84,36 @@ export const createSelectionPreservationPlugin = () => {
         });
       }
       return null;
+    },
+    props: {
+      handleKeyDown: (view, event) => {
+        var _api$userIntent, _api$userIntent$share;
+        const {
+          preservedSelection
+        } = selectionPreservationPluginKey.getState(view.state) || {};
+
+        // If there is no current preserved selection, do nothing
+        if (!preservedSelection) {
+          return false;
+        }
+
+        // While preserving selection, if user presses delete/backspace, prevent event from being
+        // handled by ProseMirror natively so that we can apply custom delete logic in block menu
+        if (event.key === 'Backspace' || event.key === 'Delete') {
+          return true;
+        }
+        const blockMenuOpen = (api === null || api === void 0 ? void 0 : (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 ? void 0 : (_api$userIntent$share = _api$userIntent.sharedState.currentState()) === null || _api$userIntent$share === void 0 ? void 0 : _api$userIntent$share.currentUserIntent) === 'blockMenuOpen';
+
+        // When block menu isn't open and user presses any key, stop preserving selection
+        if (!blockMenuOpen) {
+          const tr = view.state.tr;
+          stopPreservingSelection({
+            tr
+          });
+          view.dispatch(tr);
+          return false;
+        }
+      }
     }
   });
 };

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

@@ -1,3 +1,6 @@
+import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+
 /**
  * Returns list of block marks on schema that widgets are allowed to render inside
  * Currently
@@ -17,7 +20,28 @@ export const getActiveBlockMarks = (state, pos) => {
     alignment
   } = state.schema.marks;
   const resolvedPos = state.doc.resolve(pos);
+
   // find all active marks at the position
   const marks = resolvedPos.marks();
-  return marks.filter(mark => mark.type === alignment);
+  const supportedMarks = marks.filter(mark => mark.type === alignment);
+
+  /**
+   * Fix for widget positioning at alignment mark boundaries.
+   * When the previous node has alignment but the next node doesn't, we need to prevent
+   * the widget from inheriting alignment marks. This ensures the widget is positioned
+   * correctly at the boundary rather than being absorbed into the alignment wrapper.
+   */
+  if (supportedMarks.length > 0 && expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) && fg('platform_editor_native_anchor_patch_1')) {
+    var _resolvedPos$nodeAfte;
+    const nextNodeMarks = ((_resolvedPos$nodeAfte = resolvedPos.nodeAfter) === null || _resolvedPos$nodeAfte === void 0 ? void 0 : _resolvedPos$nodeAfte.marks.filter(mark => mark.type === alignment)) || [];
+
+    // Compare alignment values to ensure they are the same
+    const alignmentValuesMatch = supportedMarks.length === nextNodeMarks.length && supportedMarks.some(mark => nextNodeMarks.some(nextMark => nextMark.eq(mark)));
+
+    // previous node has alignment but next node does not have alignment or alignment values differ
+    if (nextNodeMarks.length === 0 || !alignmentValuesMatch) {
+      return [];
+    }
+  }
+  return supportedMarks;
 };

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

@@ -14,7 +14,6 @@ import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-commo
 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 { DRAG_HANDLE_WIDTH, tableControlsSpacing } from '@atlaskit/editor-common/styles';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -553,21 +552,6 @@ export const DragHandle = ({
         });
         return tr;
       });
-    } else if (e.key === 'Backspace' || e.key === 'Delete') {
-      e.preventDefault();
-      e.stopPropagation();
-      api === null || api === void 0 ? void 0 : api.core.actions.execute(({
-        tr
-      }) => {
-        var _api$blockControls5;
-        deleteSelectedRange(tr);
-        api === null || api === void 0 ? void 0 : (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 ? void 0 : _api$blockControls5.commands.toggleBlockMenu({
-          closeMenu: true
-        })({
-          tr
-        });
-        return tr;
-      });
     } else if (![e.altKey, e.ctrlKey, e.shiftKey].some(pressed => pressed)) {
       // If not trying to press shortcut keys,
       // return focus to editor to resume editing from caret position
@@ -600,8 +584,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$blockControls5;
+              api === null || api === void 0 ? void 0 : (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 ? void 0 : _api$blockControls5.commands.setMultiSelectPositions()({
                 tr
               });
             } else if (fg('platform_editor_elements_dnd_select_node_on_drag')) {
@@ -716,7 +700,7 @@ export const DragHandle = ({
         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$analytics3;
+          var _api$blockControls$sh3, _api$blockControls6, _api$analytics3;
           let nodeTypes, hasSelectedMultipleNodes;
           const resolvedMovingNode = tr.doc.resolve(start);
           const maybeNode = resolvedMovingNode.nodeAfter;
@@ -729,7 +713,7 @@ 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$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 ? void 0 : _api$blockControls6.commands.setNodeDragged(getPos, anchorName, nodeType)({
             tr
           });
           tr.setMeta('scrollIntoView', false);

package/dist/esm/blockControlsPlugin.js

@@ -42,7 +42,7 @@ export var blockControlsPlugin = function blockControlsPlugin(_ref) {
       if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
         pmPlugins.push({
           name: 'blockControlsSelectionPreservationPlugin',
-          plugin: createSelectionPreservationPlugin
+          plugin: createSelectionPreservationPlugin(api)
         });
       }
 

package/dist/esm/pm-plugins/decorations-drag-handle.js

@@ -6,6 +6,7 @@ import ReactDOM from 'react-dom';
 import uuid from 'uuid';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DragHandle, DragHandleWithVisibility } from '../ui/drag-handle';
 import { TYPE_HANDLE_DEC, TYPE_NODE_DEC, unmountDecorations } from './decorations-common';
@@ -24,6 +25,50 @@ export var findHandleDec = function findHandleDec(decorations, from, to) {
     return spec.type === TYPE_HANDLE_DEC;
   });
 };
+/**
+ * Fix for widget positioning to ensure it is not placed into a previous mark's DOM structure.
+ * A ProseMirror widget can appear in the wrong DOM position, specifically being added
+ * to a previous mark instead of its intended location, which leads to various rendering issues.
+ * For example, when nodeBefore has an alignment mark but the current node doesn't, ProseMirror may
+ * incorrectly render the widget inside the previous node's alignment mark wrapper instead.
+ */
+var fixWidgetSide = function fixWidgetSide($pos) {
+  var defaultSide = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : -1;
+  var alignmentMark = $pos.doc.type.schema.marks.alignment;
+  var indentationMark = $pos.doc.type.schema.marks.indentation;
+
+  // Only apply fix for alignment and indent marks
+  if (!alignmentMark && !indentationMark) {
+    return defaultSide;
+  }
+  if ($pos.nodeBefore && $pos.nodeAfter) {
+    var _$pos$nodeBefore, _$pos$nodeAfter;
+    var beforeMarks = ((_$pos$nodeBefore = $pos.nodeBefore) === null || _$pos$nodeBefore === void 0 ? void 0 : _$pos$nodeBefore.marks.filter(function (mark) {
+      return mark.type === alignmentMark || mark.type === indentationMark;
+    })) || [];
+    var afterMarks = ((_$pos$nodeAfter = $pos.nodeAfter) === null || _$pos$nodeAfter === void 0 ? void 0 : _$pos$nodeAfter.marks.filter(function (mark) {
+      return mark.type === alignmentMark || mark.type === indentationMark;
+    })) || [];
+    if (beforeMarks.length === 0) {
+      return defaultSide;
+    } else if (afterMarks.length === 0) {
+      return 0;
+    }
+
+    // Check if previous node has marks that current node doesn't have
+    var hasMissingMark = beforeMarks.some(function (mark) {
+      return !afterMarks.some(function (nextMark) {
+        return nextMark.eq(mark);
+      });
+    });
+
+    // if we have missing mark, we set side to 0 to render widget outside previous mark DOM
+    if (hasMissingMark) {
+      return 0;
+    }
+  }
+  return defaultSide;
+};
 export var dragHandleDecoration = function dragHandleDecoration(_ref) {
   var api = _ref.api,
     formatMessage = _ref.formatMessage,
@@ -42,8 +87,10 @@ export var dragHandleDecoration = function dragHandleDecoration(_ref) {
   var unbind;
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   var key = uuid();
+  var $pos = editorState.doc.resolve(pos);
+  var side = expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) && fg('platform_editor_native_anchor_patch_1') ? fixWidgetSide($pos) : -1;
   var widgetSpec = editorExperiment('platform_editor_breakout_resizing', true) ? {
-    side: -1,
+    side: side,
     type: TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     testid: "".concat(TYPE_HANDLE_DEC, "-").concat(uuid()),
@@ -60,7 +107,7 @@ export var dragHandleDecoration = function dragHandleDecoration(_ref) {
       }
     }
   } : {
-    side: -1,
+    side: side,
     type: TYPE_HANDLE_DEC,
     // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
     testid: "".concat(TYPE_HANDLE_DEC, "-").concat(uuid()),
@@ -83,13 +130,14 @@ export var dragHandleDecoration = function dragHandleDecoration(_ref) {
       try {
         return getPosUnsafe();
       } catch (e) {
+        // Ignore errors from getPosUnsafe
         return undefined;
       }
     };
     var newPos = getPos();
     if (typeof newPos === 'number') {
-      var $pos = view.state.doc.resolve(newPos);
-      isTopLevelNode = ($pos === null || $pos === void 0 ? void 0 : $pos.parent.type.name) === 'doc';
+      var _$pos = view.state.doc.resolve(newPos);
+      isTopLevelNode = (_$pos === null || _$pos === void 0 ? void 0 : _$pos.parent.type.name) === 'doc';
     }
     /*
      * We disable mouseover event to fix flickering issue on hover

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

@@ -36,55 +36,86 @@ import { getSelectionPreservationMeta, hasUserSelectionChange } from './utils';
  * 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
-        };
+export var createSelectionPreservationPlugin = function createSelectionPreservationPlugin(api) {
+  return function () {
+    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 = tr.selection;
+          } else if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'stopPreserving') {
+            newState.preservedSelection = undefined;
+          }
+          if (newState.preservedSelection && tr.docChanged) {
+            newState.preservedSelection = mapPreservedSelection(newState.preservedSelection, tr);
+          }
+          return newState;
+        }
       },
-      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 = tr.selection;
-        } else if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'stopPreserving') {
-          newState.preservedSelection = undefined;
+      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 (newState.preservedSelection && tr.docChanged) {
-          newState.preservedSelection = mapPreservedSelection(newState.preservedSelection, tr);
+        if (hasUserSelectionChange(transactions)) {
+          // Auto-stop if user explicitly changes selection
+          return stopPreservingSelection({
+            tr: newState.tr
+          });
+        }
+        var currSel = newState.selection;
+        var selectionUnchanged = currSel.from === savedSel.from && currSel.to === savedSel.to;
+        var selectionInvalid = savedSel.from < 0 || savedSel.to > newState.doc.content.size;
+        if (selectionUnchanged || selectionInvalid) {
+          return null;
+        }
+        try {
+          return newState.tr.setSelection(savedSel);
+        } catch (error) {
+          logException(error, {
+            location: 'editor-plugin-block-controls/SelectionPreservationPlugin'
+          });
         }
-        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 selectionUnchanged = currSel.from === savedSel.from && currSel.to === savedSel.to;
-      var selectionInvalid = savedSel.from < 0 || savedSel.to > newState.doc.content.size;
-      if (selectionUnchanged || selectionInvalid) {
         return null;
+      },
+      props: {
+        handleKeyDown: function handleKeyDown(view, event) {
+          var _api$userIntent;
+          var _ref = selectionPreservationPluginKey.getState(view.state) || {},
+            preservedSelection = _ref.preservedSelection;
+
+          // If there is no current preserved selection, do nothing
+          if (!preservedSelection) {
+            return false;
+          }
+
+          // While preserving selection, if user presses delete/backspace, prevent event from being
+          // handled by ProseMirror natively so that we can apply custom delete logic in block menu
+          if (event.key === 'Backspace' || event.key === 'Delete') {
+            return true;
+          }
+          var blockMenuOpen = (api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent) === 'blockMenuOpen';
+
+          // When block menu isn't open and user presses any key, stop preserving selection
+          if (!blockMenuOpen) {
+            var tr = view.state.tr;
+            stopPreservingSelection({
+              tr: tr
+            });
+            view.dispatch(tr);
+            return false;
+          }
+        }
       }
-      try {
-        return newState.tr.setSelection(savedSel);
-      } catch (error) {
-        logException(error, {
-          location: 'editor-plugin-block-controls/SelectionPreservationPlugin'
-        });
-      }
-      return null;
-    }
-  });
+    });
+  };
 };

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

@@ -1,3 +1,6 @@
+import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+
 /**
  * Returns list of block marks on schema that widgets are allowed to render inside
  * Currently
@@ -15,9 +18,36 @@
 export var getActiveBlockMarks = function getActiveBlockMarks(state, pos) {
   var alignment = state.schema.marks.alignment;
   var resolvedPos = state.doc.resolve(pos);
+
   // find all active marks at the position
   var marks = resolvedPos.marks();
-  return marks.filter(function (mark) {
+  var supportedMarks = marks.filter(function (mark) {
     return mark.type === alignment;
   });
+
+  /**
+   * Fix for widget positioning at alignment mark boundaries.
+   * When the previous node has alignment but the next node doesn't, we need to prevent
+   * the widget from inheriting alignment marks. This ensures the widget is positioned
+   * correctly at the boundary rather than being absorbed into the alignment wrapper.
+   */
+  if (supportedMarks.length > 0 && expValEquals('platform_editor_native_anchor_with_dnd', 'isEnabled', true) && fg('platform_editor_native_anchor_patch_1')) {
+    var _resolvedPos$nodeAfte;
+    var nextNodeMarks = ((_resolvedPos$nodeAfte = resolvedPos.nodeAfter) === null || _resolvedPos$nodeAfte === void 0 ? void 0 : _resolvedPos$nodeAfte.marks.filter(function (mark) {
+      return mark.type === alignment;
+    })) || [];
+
+    // Compare alignment values to ensure they are the same
+    var alignmentValuesMatch = supportedMarks.length === nextNodeMarks.length && supportedMarks.some(function (mark) {
+      return nextNodeMarks.some(function (nextMark) {
+        return nextMark.eq(mark);
+      });
+    });
+
+    // previous node has alignment but next node does not have alignment or alignment values differ
+    if (nextNodeMarks.length === 0 || !alignmentValuesMatch) {
+      return [];
+    }
+  }
+  return supportedMarks;
 };

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

@@ -19,7 +19,6 @@ import { browser as browserLegacy, getBrowserInfo } from '@atlaskit/editor-commo
 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 { DRAG_HANDLE_WIDTH, tableControlsSpacing } from '@atlaskit/editor-common/styles';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -571,20 +570,6 @@ export var DragHandle = function DragHandle(_ref2) {
         });
         return tr;
       });
-    } else if (e.key === 'Backspace' || e.key === 'Delete') {
-      e.preventDefault();
-      e.stopPropagation();
-      api === null || api === void 0 || api.core.actions.execute(function (_ref7) {
-        var _api$blockControls5;
-        var tr = _ref7.tr;
-        deleteSelectedRange(tr);
-        api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 || _api$blockControls5.commands.toggleBlockMenu({
-          closeMenu: true
-        })({
-          tr: tr
-        });
-        return tr;
-      });
     } else if (![e.altKey, e.ctrlKey, e.shiftKey].some(function (pressed) {
       return pressed;
     })) {
@@ -606,21 +591,21 @@ export var DragHandle = function DragHandle(_ref2) {
           start: start
         };
       },
-      onGenerateDragPreview: function onGenerateDragPreview(_ref8) {
+      onGenerateDragPreview: function onGenerateDragPreview(_ref7) {
         var _api$blockControls$sh2;
-        var nativeSetDragImage = _ref8.nativeSetDragImage;
+        var nativeSetDragImage = _ref7.nativeSetDragImage;
         if (isMultiSelect) {
           var _api$core6;
-          api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 || _api$core6.actions.execute(function (_ref9) {
-            var tr = _ref9.tr;
+          api === null || api === void 0 || (_api$core6 = api.core) === null || _api$core6 === void 0 || _api$core6.actions.execute(function (_ref8) {
+            var tr = _ref8.tr;
             var handlePos = getPos();
             if (typeof handlePos !== 'number') {
               return tr;
             }
             var newHandlePosCheck = isHandleCorrelatedToSelection(view.state, tr.selection, handlePos);
             if (!tr.selection.empty && newHandlePosCheck) {
-              var _api$blockControls6;
-              api === null || api === void 0 || (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 || _api$blockControls6.commands.setMultiSelectPositions()({
+              var _api$blockControls5;
+              api === null || api === void 0 || (_api$blockControls5 = api.blockControls) === null || _api$blockControls5 === void 0 || _api$blockControls5.commands.setMultiSelectPositions()({
                 tr: tr
               });
             } else if (fg('platform_editor_elements_dnd_select_node_on_drag')) {
@@ -690,8 +675,8 @@ export var DragHandle = function DragHandle(_ref2) {
               };
             }
           },
-          render: function render(_ref0) {
-            var container = _ref0.container;
+          render: function render(_ref9) {
+            var container = _ref9.container;
             var dom = view.dom.querySelector("[".concat(getAnchorAttrName(), "=\"").concat(anchorName, "\"]"));
             if (!dom) {
               return;
@@ -727,9 +712,9 @@ export var DragHandle = function DragHandle(_ref2) {
         if (start === undefined) {
           return;
         }
-        api === null || api === void 0 || (_api$core7 = api.core) === null || _api$core7 === void 0 || _api$core7.actions.execute(function (_ref1) {
-          var _api$blockControls$sh3, _api$blockControls7, _api$analytics3;
-          var tr = _ref1.tr;
+        api === null || api === void 0 || (_api$core7 = api.core) === null || _api$core7 === void 0 || _api$core7.actions.execute(function (_ref0) {
+          var _api$blockControls$sh3, _api$blockControls6, _api$analytics3;
+          var tr = _ref0.tr;
           var nodeTypes, hasSelectedMultipleNodes;
           var resolvedMovingNode = tr.doc.resolve(start);
           var maybeNode = resolvedMovingNode.nodeAfter;
@@ -742,7 +727,7 @@ export var DragHandle = function DragHandle(_ref2) {
             nodeTypes = maybeNode === null || maybeNode === void 0 ? void 0 : maybeNode.type.name;
             hasSelectedMultipleNodes = false;
           }
-          api === null || api === void 0 || (_api$blockControls7 = api.blockControls) === null || _api$blockControls7 === void 0 || _api$blockControls7.commands.setNodeDragged(getPos, anchorName, nodeType)({
+          api === null || api === void 0 || (_api$blockControls6 = api.blockControls) === null || _api$blockControls6 === void 0 || _api$blockControls6.commands.setNodeDragged(getPos, anchorName, nodeType)({
             tr: tr
           });
           tr.setMeta('scrollIntoView', false);
@@ -1125,15 +1110,15 @@ export var DragHandle = function DragHandle(_ref2) {
   var render = isTooltip ? buttonWithTooltip() : renderButton();
   return editorExperiment('platform_editor_controls', 'variant1') ? stickyRender : render;
 };
-export var DragHandleWithVisibility = function DragHandleWithVisibility(_ref10) {
-  var view = _ref10.view,
-    api = _ref10.api,
-    formatMessage = _ref10.formatMessage,
-    getPos = _ref10.getPos,
-    anchorName = _ref10.anchorName,
-    nodeType = _ref10.nodeType,
-    handleOptions = _ref10.handleOptions,
-    anchorRectCache = _ref10.anchorRectCache;
+export var DragHandleWithVisibility = function DragHandleWithVisibility(_ref1) {
+  var view = _ref1.view,
+    api = _ref1.api,
+    formatMessage = _ref1.formatMessage,
+    getPos = _ref1.getPos,
+    anchorName = _ref1.anchorName,
+    nodeType = _ref1.nodeType,
+    handleOptions = _ref1.handleOptions,
+    anchorRectCache = _ref1.anchorRectCache;
   return jsx(VisibilityContainer, {
     api: api
   }, jsx(DragHandle, {

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

@@ -1,4 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { BlockControlsPlugin } from '../../blockControlsPluginType';
 import type { SelectionPreservationPluginState } from './types';
 /**
  * Selection Preservation Plugin
@@ -28,4 +30,4 @@ import type { SelectionPreservationPluginState } from './types';
  * 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 declare const createSelectionPreservationPlugin: () => SafePlugin<SelectionPreservationPluginState>;
+export declare const createSelectionPreservationPlugin: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined) => () => SafePlugin<SelectionPreservationPluginState>;

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

@@ -1,4 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { BlockControlsPlugin } from '../../blockControlsPluginType';
 import type { SelectionPreservationPluginState } from './types';
 /**
  * Selection Preservation Plugin
@@ -28,4 +30,4 @@ import type { SelectionPreservationPluginState } from './types';
  * 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 declare const createSelectionPreservationPlugin: () => SafePlugin<SelectionPreservationPluginState>;
+export declare const createSelectionPreservationPlugin: (api: ExtractInjectionAPI<BlockControlsPlugin> | undefined) => () => SafePlugin<SelectionPreservationPluginState>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "7.13.2",
+	"version": "7.14.0",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -10,7 +10,7 @@
 	"atlassian": {
 		"team": "Editor: Jenga"
 	},
-	"repository": "https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo",
+	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-monorepo",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",
 	"module:es2019": "dist/es2019/index.js",
@@ -28,7 +28,7 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^51.5.1",
+		"@atlaskit/adf-schema": "^51.5.0",
 		"@atlaskit/browser-apis": "^0.0.1",
 		"@atlaskit/editor-plugin-accessibility-utils": "^6.0.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
@@ -43,10 +43,10 @@
 		"@atlaskit/editor-plugin-type-ahead": "^6.5.0",
 		"@atlaskit/editor-plugin-user-intent": "^4.0.0",
 		"@atlaskit/editor-plugin-width": "^7.0.0",
-		"@atlaskit/editor-prosemirror": "7.0.0",
+		"@atlaskit/editor-prosemirror": "^7.2.0",
 		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/icon": "^29.0.0",
+		"@atlaskit/icon": "^29.1.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
@@ -54,7 +54,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^16.4.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^15.0.0",
+		"@atlaskit/tmp-editor-statsig": "^15.10.0",
 		"@atlaskit/tokens": "^8.4.0",
 		"@atlaskit/tooltip": "^20.11.0",
 		"@babel/runtime": "^7.0.0",
@@ -66,7 +66,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.40.0",
+		"@atlaskit/editor-common": "^110.42.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -151,6 +151,9 @@
 		},
 		"platform_editor_toolbar_aifc_user_intent_fix": {
 			"type": "boolean"
+		},
+		"platform_editor_native_anchor_patch_1": {
+			"type": "boolean"
 		}
 	}
 }