@atlaskit/editor-plugin-block-menu 5.2.27 → 6.0.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 6.0.0
+
+### Patch Changes
+
+- [`4da819b186eaf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4da819b186eaf) -
+  EDITOR-3911 selection preservation key handling
+- [`2f000c01bd8ac`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2f000c01bd8ac) -
+  Retain block marks for text -> text transforms
+- Updated dependencies
+
+## 5.2.28
+
+### Patch Changes
+
+- [`8c62a0141a5fa`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8c62a0141a5fa) -
+  [ux] Fixes contextual transform options for direct children of top level nodes.
+- Updated dependencies
+
 ## 5.2.27
 
 ### Patch Changes

package/dist/cjs/blockMenuPlugin.js

@@ -28,7 +28,9 @@ var blockMenuPlugin = exports.blockMenuPlugin = function blockMenuPlugin(_ref) {
     pmPlugins: function pmPlugins() {
       return [{
         name: 'blockMenuPlugin',
-        plugin: _main.createPlugin
+        plugin: function plugin() {
+          return (0, _main.createPlugin)(api);
+        }
       }];
     },
     actions: {

package/dist/cjs/editor-actions/isTransformToTargetDisabled.js

@@ -9,13 +9,19 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _transform = require("../editor-commands/transform-node-utils/transform");
 var _types = require("../editor-commands/transform-node-utils/types");
 var _utils = require("../editor-commands/transform-node-utils/utils");
-var canParentContainNodeType = exports.canParentContainNodeType = function canParentContainNodeType(schema, parentNode, nodeTypeName, nodeTypeAttrs) {
-  var adjustedNodeTypeName = (0, _utils.getTargetNodeTypeNameInContext)(nodeTypeName, true);
+var canParentContainNodeType = exports.canParentContainNodeType = function canParentContainNodeType(schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs) {
+  var adjustedNodeTypeName = parentNode.type.name === 'layoutColumn' || parentNode.type.name === 'bodiedSyncBlock' ? nodeTypeName : (0, _utils.getTargetNodeTypeNameInContext)(nodeTypeName, true);
   if (!adjustedNodeTypeName) {
     return false;
   }
   var nodeType = schema.nodes[adjustedNodeTypeName];
-  return parentNode.type.validContent(_model.Fragment.from(nodeType.createAndFill(nodeTypeAttrs)));
+  var content = null;
+  var nodesThatCantBeNestedInNestedExpand = ['blockCard', 'embedCard', 'table'];
+  if (nodesThatCantBeNestedInNestedExpand.includes(selectedNodeTypeName) && (adjustedNodeTypeName === 'expand' || adjustedNodeTypeName === 'nestedExpand')) {
+    var table = schema.nodes[selectedNodeTypeName];
+    content = table.createAndFill();
+  }
+  return parentNode.type.validContent(_model.Fragment.from(nodeType.createAndFill(nodeTypeAttrs, content)));
 };
 var isHeadingToHeadingTransformEnabled = function isHeadingToHeadingTransformEnabled(selectedNode, targetNodeTypeAttrs) {
   var _selectedNode$attrs;
@@ -38,7 +44,7 @@ var isTransformEnabledForNode = function isTransformEnabledForNode(node, targetN
   if (selectedNodeTypeName === 'heading' && targetNodeTypeName === 'heading') {
     return isHeadingToHeadingTransformEnabled(node, targetNodeTypeAttrs);
   }
-  if (isNested && !canParentContainNodeType(schema, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
+  if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
     return false;
   }
   return true;

package/dist/cjs/editor-commands/transform-node-utils/flattenStep.js

@@ -7,8 +7,9 @@ exports.flattenStep = void 0;
 var flattenStep = exports.flattenStep = function flattenStep(nodes, context) {
   var schema = context.schema,
     targetNodeTypeName = context.targetNodeTypeName;
+  var paragraph = schema.nodes.paragraph;
   var targetNodeType = schema.nodes[targetNodeTypeName];
-  if (!targetNodeType) {
+  if (!targetNodeType || !paragraph) {
     return nodes;
   }
 
@@ -26,6 +27,6 @@ var flattenStep = exports.flattenStep = function flattenStep(nodes, context) {
     if (!isValidWithin) {
       return node;
     }
-    return schema.nodes.paragraph.create({}, node.content);
+    return paragraph.create({}, node.content, node.marks);
   });
 };

package/dist/cjs/editor-commands/transform-node-utils/steps/applyTargetTextTypeStep.js

@@ -42,7 +42,7 @@ var applyTargetTextTypeStep = exports.applyTargetTextTypeStep = function applyTa
       // Convert textblock nodes (paragraphs, headings) to heading with specified level
       return headingType.create({
         level: headingLevel
-      }, node.content);
+      }, node.content, node.marks);
     }
     // Non-textblock nodes are left unchanged
     return node;

package/dist/cjs/pm-plugins/main.js

@@ -7,7 +7,7 @@ exports.createPlugin = exports.blockMenuPluginKey = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var blockMenuPluginKey = exports.blockMenuPluginKey = new _state.PluginKey('blockMenuPlugin');
-var createPlugin = exports.createPlugin = function createPlugin() {
+var createPlugin = exports.createPlugin = function createPlugin(api) {
   return new _safePlugin.SafePlugin({
     key: blockMenuPluginKey,
     state: {
@@ -23,6 +23,26 @@ var createPlugin = exports.createPlugin = function createPlugin() {
           showFlag: (_meta$showFlag = meta === null || meta === void 0 ? void 0 : meta.showFlag) !== null && _meta$showFlag !== void 0 ? _meta$showFlag : currentPluginState.showFlag
         };
       }
+    },
+    props: {
+      handleKeyDown: function handleKeyDown(_editorView, event) {
+        var _api$userIntent;
+        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';
+
+        // Exit early and do nothing when block menu is closed
+        if (!blockMenuOpen) {
+          return false;
+        }
+
+        // Block further handling of key events when block menu is open
+        // Except for backspace/delete/copy/cut/paste which should be handled by the selection preservation plugin
+        var key = event.key.toLowerCase();
+        var isMetaCtrl = event.metaKey || event.ctrlKey;
+        var isBackspaceDelete = ['backspace', 'delete'].includes(key);
+        var isCopyCutPaste = isMetaCtrl && ['c', 'x', 'v'].includes(key);
+        var suppressNativeHandling = !isCopyCutPaste && !isBackspaceDelete;
+        return suppressNativeHandling;
+      }
     }
   });
 };

package/dist/cjs/ui/block-menu.js

@@ -16,7 +16,6 @@ var _css = require("@atlaskit/css");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _errorBoundary = require("@atlaskit/editor-common/error-boundary");
 var _hooks = require("@atlaskit/editor-common/hooks");
-var _selection = require("@atlaskit/editor-common/selection");
 var _styles = require("@atlaskit/editor-common/styles");
 var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
@@ -185,25 +184,20 @@ var BlockMenu = function BlockMenu(_ref4) {
   if (!isMenuOpen) {
     return null;
   }
-  var handleBackspaceDeleteKeydown = function handleBackspaceDeleteKeydown(event) {
-    // Pevents delete/backspace keypress being handled by editor, avoids double deletions
-    event === null || event === void 0 || event.preventDefault();
-    event === null || event === void 0 || event.stopPropagation();
-    api === null || api === void 0 || api.core.actions.execute(function (_ref6) {
-      var _api$blockControls, _api$blockControls2;
-      var tr = _ref6.tr;
-      (0, _selection.deleteSelectedRange)(tr, api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.sharedState.currentState()) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.preservedSelection);
-      api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.toggleBlockMenu({
-        closeMenu: true
-      })({
-        tr: tr
-      });
-      if (editorView && !editorView.hasFocus()) {
-        // if focus is outside editor, e.g. in block menu popup, then refocus editor after delete
-        editorView.focus();
-      }
-      return tr;
-    });
+  var handleKeyDown = function handleKeyDown(event) {
+    var _api$core, _api$blockControls;
+    // When the editor view has focus, the keydown will be handled by the
+    // selection preservation plugin – exit early to avoid double handling
+    if (!editorView || editorView !== null && editorView !== void 0 && editorView.hasFocus()) {
+      return;
+    }
+
+    // Necessary to prevent the editor from handling the delete natively
+    if (['backspace', 'delete'].includes(event.key.toLowerCase())) {
+      event.preventDefault();
+      event.stopPropagation();
+    }
+    api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.commands) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.handleKeyDownWithPreservedSelection(event));
   };
   var handleClickOutside = function handleClickOutside(e) {
     // check if the clicked element was another drag handle, if so don't close the menu
@@ -213,10 +207,10 @@ var BlockMenu = function BlockMenu(_ref4) {
     closeMenu();
   };
   var closeMenu = function closeMenu() {
-    api === null || api === void 0 || api.core.actions.execute(function (_ref7) {
-      var _api$blockControls3, _api$userIntent3;
-      var tr = _ref7.tr;
-      api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.toggleBlockMenu({
+    api === null || api === void 0 || api.core.actions.execute(function (_ref6) {
+      var _api$blockControls2, _api$userIntent3;
+      var tr = _ref6.tr;
+      api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.toggleBlockMenu({
         closeMenu: true
       })({
         tr: tr
@@ -249,7 +243,7 @@ var BlockMenu = function BlockMenu(_ref4) {
     alignY: 'start',
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: closeMenu,
-    handleBackspaceDeleteKeydown: handleBackspaceDeleteKeydown,
+    handleKeyDown: handleKeyDown,
     mountTo: mountTo,
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,

package/dist/es2019/blockMenuPlugin.js

@@ -22,7 +22,7 @@ export const blockMenuPlugin = ({
     pmPlugins() {
       return [{
         name: 'blockMenuPlugin',
-        plugin: createPlugin
+        plugin: () => createPlugin(api)
       }];
     },
     actions: {

package/dist/es2019/editor-actions/isTransformToTargetDisabled.js

@@ -3,13 +3,19 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isTransformDisabledBasedOnStepsConfig } from '../editor-commands/transform-node-utils/transform';
 import { toNodeTypeValue } from '../editor-commands/transform-node-utils/types';
 import { getBlockNodesInRange, getTargetNodeTypeNameInContext } from '../editor-commands/transform-node-utils/utils';
-export const canParentContainNodeType = (schema, parentNode, nodeTypeName, nodeTypeAttrs) => {
-  const adjustedNodeTypeName = getTargetNodeTypeNameInContext(nodeTypeName, true);
+export const canParentContainNodeType = (schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs) => {
+  const adjustedNodeTypeName = parentNode.type.name === 'layoutColumn' || parentNode.type.name === 'bodiedSyncBlock' ? nodeTypeName : getTargetNodeTypeNameInContext(nodeTypeName, true);
   if (!adjustedNodeTypeName) {
     return false;
   }
   const nodeType = schema.nodes[adjustedNodeTypeName];
-  return parentNode.type.validContent(Fragment.from(nodeType.createAndFill(nodeTypeAttrs)));
+  let content = null;
+  const nodesThatCantBeNestedInNestedExpand = ['blockCard', 'embedCard', 'table'];
+  if (nodesThatCantBeNestedInNestedExpand.includes(selectedNodeTypeName) && (adjustedNodeTypeName === 'expand' || adjustedNodeTypeName === 'nestedExpand')) {
+    const table = schema.nodes[selectedNodeTypeName];
+    content = table.createAndFill();
+  }
+  return parentNode.type.validContent(Fragment.from(nodeType.createAndFill(nodeTypeAttrs, content)));
 };
 const isHeadingToHeadingTransformEnabled = (selectedNode, targetNodeTypeAttrs) => {
   var _selectedNode$attrs;
@@ -32,7 +38,7 @@ const isTransformEnabledForNode = (node, targetNodeTypeName, targetNodeTypeAttrs
   if (selectedNodeTypeName === 'heading' && targetNodeTypeName === 'heading') {
     return isHeadingToHeadingTransformEnabled(node, targetNodeTypeAttrs);
   }
-  if (isNested && !canParentContainNodeType(schema, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
+  if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
     return false;
   }
   return true;

package/dist/es2019/editor-commands/transform-node-utils/flattenStep.js

@@ -3,8 +3,11 @@ export const flattenStep = (nodes, context) => {
     schema,
     targetNodeTypeName
   } = context;
+  const {
+    paragraph
+  } = schema.nodes;
   const targetNodeType = schema.nodes[targetNodeTypeName];
-  if (!targetNodeType) {
+  if (!targetNodeType || !paragraph) {
     return nodes;
   }
 
@@ -20,6 +23,6 @@ export const flattenStep = (nodes, context) => {
     if (!isValidWithin) {
       return node;
     }
-    return schema.nodes.paragraph.create({}, node.content);
+    return paragraph.create({}, node.content, node.marks);
   });
 };

package/dist/es2019/editor-commands/transform-node-utils/steps/applyTargetTextTypeStep.js

@@ -38,7 +38,7 @@ export const applyTargetTextTypeStep = (nodes, context) => {
       // Convert textblock nodes (paragraphs, headings) to heading with specified level
       return headingType.create({
         level: headingLevel
-      }, node.content);
+      }, node.content, node.marks);
     }
     // Non-textblock nodes are left unchanged
     return node;

package/dist/es2019/pm-plugins/main.js

@@ -1,7 +1,7 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 export const blockMenuPluginKey = new PluginKey('blockMenuPlugin');
-export const createPlugin = () => {
+export const createPlugin = api => {
   return new SafePlugin({
     key: blockMenuPluginKey,
     state: {
@@ -17,6 +17,26 @@ export const createPlugin = () => {
           showFlag: (_meta$showFlag = meta === null || meta === void 0 ? void 0 : meta.showFlag) !== null && _meta$showFlag !== void 0 ? _meta$showFlag : currentPluginState.showFlag
         };
       }
+    },
+    props: {
+      handleKeyDown: (_editorView, event) => {
+        var _api$userIntent, _api$userIntent$share;
+        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';
+
+        // Exit early and do nothing when block menu is closed
+        if (!blockMenuOpen) {
+          return false;
+        }
+
+        // Block further handling of key events when block menu is open
+        // Except for backspace/delete/copy/cut/paste which should be handled by the selection preservation plugin
+        const key = event.key.toLowerCase();
+        const isMetaCtrl = event.metaKey || event.ctrlKey;
+        const isBackspaceDelete = ['backspace', 'delete'].includes(key);
+        const isCopyCutPaste = isMetaCtrl && ['c', 'x', 'v'].includes(key);
+        const suppressNativeHandling = !isCopyCutPaste && !isBackspaceDelete;
+        return suppressNativeHandling;
+      }
     }
   });
 };

package/dist/es2019/ui/block-menu.js

@@ -7,7 +7,6 @@ import { cx } from '@atlaskit/css';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { deleteSelectedRange } from '@atlaskit/editor-common/selection';
 import { DRAG_HANDLE_SELECTOR, DRAG_HANDLE_WIDTH } from '@atlaskit/editor-common/styles';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationProvider, ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu';
@@ -174,26 +173,20 @@ const BlockMenu = ({
   if (!isMenuOpen) {
     return null;
   }
-  const handleBackspaceDeleteKeydown = event => {
-    // Pevents delete/backspace keypress being handled by editor, avoids double deletions
-    event === null || event === void 0 ? void 0 : event.preventDefault();
-    event === null || event === void 0 ? void 0 : event.stopPropagation();
-    api === null || api === void 0 ? void 0 : api.core.actions.execute(({
-      tr
-    }) => {
-      var _api$blockControls, _api$blockControls$sh, _api$blockControls2;
-      deleteSelectedRange(tr, api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$sh = _api$blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.preservedSelection);
-      api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.toggleBlockMenu({
-        closeMenu: true
-      })({
-        tr
-      });
-      if (editorView && !editorView.hasFocus()) {
-        // if focus is outside editor, e.g. in block menu popup, then refocus editor after delete
-        editorView.focus();
-      }
-      return tr;
-    });
+  const handleKeyDown = event => {
+    var _api$core, _api$blockControls, _api$blockControls$co;
+    // When the editor view has focus, the keydown will be handled by the
+    // selection preservation plugin – exit early to avoid double handling
+    if (!editorView || editorView !== null && editorView !== void 0 && editorView.hasFocus()) {
+      return;
+    }
+
+    // Necessary to prevent the editor from handling the delete natively
+    if (['backspace', 'delete'].includes(event.key.toLowerCase())) {
+      event.preventDefault();
+      event.stopPropagation();
+    }
+    api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$co = _api$blockControls.commands) === null || _api$blockControls$co === void 0 ? void 0 : _api$blockControls$co.handleKeyDownWithPreservedSelection(event));
   };
   const handleClickOutside = e => {
     // check if the clicked element was another drag handle, if so don't close the menu
@@ -206,8 +199,8 @@ const BlockMenu = ({
     api === null || api === void 0 ? void 0 : api.core.actions.execute(({
       tr
     }) => {
-      var _api$blockControls3, _api$userIntent3;
-      api === null || api === void 0 ? void 0 : (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.toggleBlockMenu({
+      var _api$blockControls2, _api$userIntent3;
+      api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.toggleBlockMenu({
         closeMenu: true
       })({
         tr
@@ -240,7 +233,7 @@ const BlockMenu = ({
     alignY: 'start',
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: closeMenu,
-    handleBackspaceDeleteKeydown: handleBackspaceDeleteKeydown,
+    handleKeyDown: handleKeyDown,
     mountTo: mountTo,
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,

package/dist/esm/blockMenuPlugin.js

@@ -21,7 +21,9 @@ export var blockMenuPlugin = function blockMenuPlugin(_ref) {
     pmPlugins: function pmPlugins() {
       return [{
         name: 'blockMenuPlugin',
-        plugin: createPlugin
+        plugin: function plugin() {
+          return createPlugin(api);
+        }
       }];
     },
     actions: {

package/dist/esm/editor-actions/isTransformToTargetDisabled.js

@@ -3,13 +3,19 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { isTransformDisabledBasedOnStepsConfig } from '../editor-commands/transform-node-utils/transform';
 import { toNodeTypeValue } from '../editor-commands/transform-node-utils/types';
 import { getBlockNodesInRange, getTargetNodeTypeNameInContext } from '../editor-commands/transform-node-utils/utils';
-export var canParentContainNodeType = function canParentContainNodeType(schema, parentNode, nodeTypeName, nodeTypeAttrs) {
-  var adjustedNodeTypeName = getTargetNodeTypeNameInContext(nodeTypeName, true);
+export var canParentContainNodeType = function canParentContainNodeType(schema, selectedNodeTypeName, parentNode, nodeTypeName, nodeTypeAttrs) {
+  var adjustedNodeTypeName = parentNode.type.name === 'layoutColumn' || parentNode.type.name === 'bodiedSyncBlock' ? nodeTypeName : getTargetNodeTypeNameInContext(nodeTypeName, true);
   if (!adjustedNodeTypeName) {
     return false;
   }
   var nodeType = schema.nodes[adjustedNodeTypeName];
-  return parentNode.type.validContent(Fragment.from(nodeType.createAndFill(nodeTypeAttrs)));
+  var content = null;
+  var nodesThatCantBeNestedInNestedExpand = ['blockCard', 'embedCard', 'table'];
+  if (nodesThatCantBeNestedInNestedExpand.includes(selectedNodeTypeName) && (adjustedNodeTypeName === 'expand' || adjustedNodeTypeName === 'nestedExpand')) {
+    var table = schema.nodes[selectedNodeTypeName];
+    content = table.createAndFill();
+  }
+  return parentNode.type.validContent(Fragment.from(nodeType.createAndFill(nodeTypeAttrs, content)));
 };
 var isHeadingToHeadingTransformEnabled = function isHeadingToHeadingTransformEnabled(selectedNode, targetNodeTypeAttrs) {
   var _selectedNode$attrs;
@@ -32,7 +38,7 @@ var isTransformEnabledForNode = function isTransformEnabledForNode(node, targetN
   if (selectedNodeTypeName === 'heading' && targetNodeTypeName === 'heading') {
     return isHeadingToHeadingTransformEnabled(node, targetNodeTypeAttrs);
   }
-  if (isNested && !canParentContainNodeType(schema, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
+  if (isNested && !canParentContainNodeType(schema, selectedNodeTypeName, parent, targetNodeTypeName, targetNodeTypeAttrs)) {
     return false;
   }
   return true;

package/dist/esm/editor-commands/transform-node-utils/flattenStep.js

@@ -1,8 +1,9 @@
 export var flattenStep = function flattenStep(nodes, context) {
   var schema = context.schema,
     targetNodeTypeName = context.targetNodeTypeName;
+  var paragraph = schema.nodes.paragraph;
   var targetNodeType = schema.nodes[targetNodeTypeName];
-  if (!targetNodeType) {
+  if (!targetNodeType || !paragraph) {
     return nodes;
   }
 
@@ -20,6 +21,6 @@ export var flattenStep = function flattenStep(nodes, context) {
     if (!isValidWithin) {
       return node;
     }
-    return schema.nodes.paragraph.create({}, node.content);
+    return paragraph.create({}, node.content, node.marks);
   });
 };

package/dist/esm/editor-commands/transform-node-utils/steps/applyTargetTextTypeStep.js

@@ -36,7 +36,7 @@ export var applyTargetTextTypeStep = function applyTargetTextTypeStep(nodes, con
       // Convert textblock nodes (paragraphs, headings) to heading with specified level
       return headingType.create({
         level: headingLevel
-      }, node.content);
+      }, node.content, node.marks);
     }
     // Non-textblock nodes are left unchanged
     return node;

package/dist/esm/pm-plugins/main.js

@@ -1,7 +1,7 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 export var blockMenuPluginKey = new PluginKey('blockMenuPlugin');
-export var createPlugin = function createPlugin() {
+export var createPlugin = function createPlugin(api) {
   return new SafePlugin({
     key: blockMenuPluginKey,
     state: {
@@ -17,6 +17,26 @@ export var createPlugin = function createPlugin() {
           showFlag: (_meta$showFlag = meta === null || meta === void 0 ? void 0 : meta.showFlag) !== null && _meta$showFlag !== void 0 ? _meta$showFlag : currentPluginState.showFlag
         };
       }
+    },
+    props: {
+      handleKeyDown: function handleKeyDown(_editorView, event) {
+        var _api$userIntent;
+        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';
+
+        // Exit early and do nothing when block menu is closed
+        if (!blockMenuOpen) {
+          return false;
+        }
+
+        // Block further handling of key events when block menu is open
+        // Except for backspace/delete/copy/cut/paste which should be handled by the selection preservation plugin
+        var key = event.key.toLowerCase();
+        var isMetaCtrl = event.metaKey || event.ctrlKey;
+        var isBackspaceDelete = ['backspace', 'delete'].includes(key);
+        var isCopyCutPaste = isMetaCtrl && ['c', 'x', 'v'].includes(key);
+        var suppressNativeHandling = !isCopyCutPaste && !isBackspaceDelete;
+        return suppressNativeHandling;
+      }
     }
   });
 };

package/dist/esm/ui/block-menu.js

@@ -8,7 +8,6 @@ import { cx } from '@atlaskit/css';
 import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { deleteSelectedRange } from '@atlaskit/editor-common/selection';
 import { DRAG_HANDLE_SELECTOR, DRAG_HANDLE_WIDTH } from '@atlaskit/editor-common/styles';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationProvider, ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu';
@@ -176,25 +175,20 @@ var BlockMenu = function BlockMenu(_ref4) {
   if (!isMenuOpen) {
     return null;
   }
-  var handleBackspaceDeleteKeydown = function handleBackspaceDeleteKeydown(event) {
-    // Pevents delete/backspace keypress being handled by editor, avoids double deletions
-    event === null || event === void 0 || event.preventDefault();
-    event === null || event === void 0 || event.stopPropagation();
-    api === null || api === void 0 || api.core.actions.execute(function (_ref6) {
-      var _api$blockControls, _api$blockControls2;
-      var tr = _ref6.tr;
-      deleteSelectedRange(tr, api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.sharedState.currentState()) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.preservedSelection);
-      api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.toggleBlockMenu({
-        closeMenu: true
-      })({
-        tr: tr
-      });
-      if (editorView && !editorView.hasFocus()) {
-        // if focus is outside editor, e.g. in block menu popup, then refocus editor after delete
-        editorView.focus();
-      }
-      return tr;
-    });
+  var handleKeyDown = function handleKeyDown(event) {
+    var _api$core, _api$blockControls;
+    // When the editor view has focus, the keydown will be handled by the
+    // selection preservation plugin – exit early to avoid double handling
+    if (!editorView || editorView !== null && editorView !== void 0 && editorView.hasFocus()) {
+      return;
+    }
+
+    // Necessary to prevent the editor from handling the delete natively
+    if (['backspace', 'delete'].includes(event.key.toLowerCase())) {
+      event.preventDefault();
+      event.stopPropagation();
+    }
+    api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.commands) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.handleKeyDownWithPreservedSelection(event));
   };
   var handleClickOutside = function handleClickOutside(e) {
     // check if the clicked element was another drag handle, if so don't close the menu
@@ -204,10 +198,10 @@ var BlockMenu = function BlockMenu(_ref4) {
     closeMenu();
   };
   var closeMenu = function closeMenu() {
-    api === null || api === void 0 || api.core.actions.execute(function (_ref7) {
-      var _api$blockControls3, _api$userIntent3;
-      var tr = _ref7.tr;
-      api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.toggleBlockMenu({
+    api === null || api === void 0 || api.core.actions.execute(function (_ref6) {
+      var _api$blockControls2, _api$userIntent3;
+      var tr = _ref6.tr;
+      api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.toggleBlockMenu({
         closeMenu: true
       })({
         tr: tr
@@ -240,7 +234,7 @@ var BlockMenu = function BlockMenu(_ref4) {
     alignY: 'start',
     handleClickOutside: handleClickOutside,
     handleEscapeKeydown: closeMenu,
-    handleBackspaceDeleteKeydown: handleBackspaceDeleteKeydown,
+    handleKeyDown: handleKeyDown,
     mountTo: mountTo,
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement,

package/dist/types/editor-actions/isTransformToTargetDisabled.d.ts

@@ -6,6 +6,6 @@ type TransformDisabledArgs = {
     targetNodeTypeAttrs?: Record<string, unknown>;
     targetNodeTypeName: string;
 };
-export declare const canParentContainNodeType: (schema: Schema, parentNode: PMNode, nodeTypeName: NodeTypeName, nodeTypeAttrs?: Record<string, unknown>) => boolean;
+export declare const canParentContainNodeType: (schema: Schema, selectedNodeTypeName: NodeTypeName, parentNode: PMNode, nodeTypeName: NodeTypeName, nodeTypeAttrs?: Record<string, unknown>) => boolean;
 export declare const isTransformToTargetDisabled: ({ selection, targetNodeTypeName, targetNodeTypeAttrs, }: TransformDisabledArgs) => boolean;
 export {};

package/dist/types/pm-plugins/main.d.ts

@@ -1,9 +1,10 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { FLAG_ID } from '../blockMenuPluginType';
+import type { BlockMenuPlugin, FLAG_ID } from '../blockMenuPluginType';
 export declare const blockMenuPluginKey: PluginKey<any>;
 type BlockMenuPluginState = {
     showFlag: FLAG_ID | false;
 };
-export declare const createPlugin: () => SafePlugin<BlockMenuPluginState>;
+export declare const createPlugin: (api: ExtractInjectionAPI<BlockMenuPlugin> | undefined) => SafePlugin<BlockMenuPluginState>;
 export {};

package/dist/types-ts4.5/editor-actions/isTransformToTargetDisabled.d.ts

@@ -6,6 +6,6 @@ type TransformDisabledArgs = {
     targetNodeTypeAttrs?: Record<string, unknown>;
     targetNodeTypeName: string;
 };
-export declare const canParentContainNodeType: (schema: Schema, parentNode: PMNode, nodeTypeName: NodeTypeName, nodeTypeAttrs?: Record<string, unknown>) => boolean;
+export declare const canParentContainNodeType: (schema: Schema, selectedNodeTypeName: NodeTypeName, parentNode: PMNode, nodeTypeName: NodeTypeName, nodeTypeAttrs?: Record<string, unknown>) => boolean;
 export declare const isTransformToTargetDisabled: ({ selection, targetNodeTypeName, targetNodeTypeAttrs, }: TransformDisabledArgs) => boolean;
 export {};

package/dist/types-ts4.5/pm-plugins/main.d.ts

@@ -1,9 +1,10 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { FLAG_ID } from '../blockMenuPluginType';
+import type { BlockMenuPlugin, FLAG_ID } from '../blockMenuPluginType';
 export declare const blockMenuPluginKey: PluginKey<any>;
 type BlockMenuPluginState = {
     showFlag: FLAG_ID | false;
 };
-export declare const createPlugin: () => SafePlugin<BlockMenuPluginState>;
+export declare const createPlugin: (api: ExtractInjectionAPI<BlockMenuPlugin> | undefined) => SafePlugin<BlockMenuPluginState>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.2.27",
+	"version": "6.0.0",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -30,11 +30,11 @@
 	"dependencies": {
 		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
-		"@atlaskit/editor-plugin-analytics": "^6.2.0",
-		"@atlaskit/editor-plugin-block-controls": "^7.18.0",
-		"@atlaskit/editor-plugin-decorations": "^6.1.0",
-		"@atlaskit/editor-plugin-selection": "^6.1.0",
-		"@atlaskit/editor-plugin-user-intent": "^4.0.0",
+		"@atlaskit/editor-plugin-analytics": "^7.0.0",
+		"@atlaskit/editor-plugin-block-controls": "^8.0.0",
+		"@atlaskit/editor-plugin-decorations": "^7.0.0",
+		"@atlaskit/editor-plugin-selection": "^7.0.0",
+		"@atlaskit/editor-plugin-user-intent": "^5.0.0",
 		"@atlaskit/editor-prosemirror": "^7.2.0",
 		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/editor-tables": "^2.9.0",
@@ -49,7 +49,7 @@
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.50.0",
+		"@atlaskit/editor-common": "^111.0.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},