@atlaskit/editor-plugin-block-menu 5.2.5 → 5.2.7

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.2.7
+
+### Patch Changes
+
+- [`b2e5262017fa8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b2e5262017fa8) -
+  Editor-2676: Remove moveFocusTo in block menu provider
+- Updated dependencies
+
+## 5.2.6
+
+### Patch Changes
+
+- [`fa50da8ee6860`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fa50da8ee6860) -
+  EDITOR-3879 [multi-select] Detect nodes from multi-selection
+- Updated dependencies
+
 ## 5.2.5
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -39,6 +39,9 @@
 		{
 			"path": "../../editor-plugin-user-intent/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../editor-prosemirror/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../editor-shared-styles/afm-cc/tsconfig.json"
 		},

package/afm-jira/tsconfig.json

@@ -39,6 +39,9 @@
 		{
 			"path": "../../editor-plugin-user-intent/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../editor-prosemirror/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../editor-shared-styles/afm-jira/tsconfig.json"
 		},

package/afm-products/tsconfig.json

@@ -39,6 +39,9 @@
 		{
 			"path": "../../editor-plugin-user-intent/afm-products/tsconfig.json"
 		},
+		{
+			"path": "../../editor-prosemirror/afm-products/tsconfig.json"
+		},
 		{
 			"path": "../../editor-shared-styles/afm-products/tsconfig.json"
 		},

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

@@ -0,0 +1,91 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.wrapBlockquoteToDecisionListStep = void 0;
+var _types = require("../types");
+/**
+ * Determines if a node is a text node (heading or paragraph).
+ * Only text nodes should have their inline content extracted for decisionItem.
+ * All other nodes should break out.
+ */
+var isTextNode = function isTextNode(node) {
+  var category = _types.NODE_CATEGORY_BY_TYPE[node.type.name];
+  return category === 'text';
+};
+
+/**
+ * Creates a decisionItem with the given inline content.
+ */
+var createDecisionItem = function createDecisionItem(inlineContent, schema) {
+  var decisionItemType = schema.nodes.decisionItem;
+  if (!decisionItemType) {
+    return null;
+  }
+  var canContentBeWrappedInDecisionItem = decisionItemType.validContent(inlineContent);
+
+  // Check if the content is valid for decisionItem
+  if (!canContentBeWrappedInDecisionItem) {
+    return null;
+  }
+  return decisionItemType.createAndFill({}, inlineContent);
+};
+
+/**
+ * Creates a decisionList containing the given decisionItems.
+ */
+var createDecisionListWithItems = function createDecisionListWithItems(decisionItems, schema) {
+  var decisionListType = schema.nodes.decisionList;
+  if (!decisionListType || decisionItems.length === 0) {
+    return null;
+  }
+  return decisionListType.createAndFill({}, decisionItems);
+};
+
+/**
+ * Wraps blockquote content into decisionList:
+ * - Text nodes (paragraph, heading) have their inline content extracted and wrapped in decisionItems
+ * - Consecutive text nodes are grouped into a single decisionList with multiple decisionItems
+ * - All other nodes break out (lists, code blocks, media, tables, macros, containers, etc.)
+ *
+ * The logic follows the transform rules:
+ * - Only flatten text nodes into decisionItem (since that's the intent - converting text to decisions)
+ * - Structures that can't be represented in a decisionItem should break out unchanged
+ * - When a break-out node is encountered, flush accumulated decisionItems into a decisionList
+ *
+ * Example: blockquote(p('a'), p('b'), ul(...), p('c')) → [decisionList(decisionItem('a'), decisionItem('b')), ul(...), decisionList(decisionItem('c'))]
+ */
+var wrapBlockquoteToDecisionListStep = exports.wrapBlockquoteToDecisionListStep = function wrapBlockquoteToDecisionListStep(nodes, context) {
+  var schema = context.schema;
+  var decisionItemType = schema.nodes.decisionItem;
+  if (!decisionItemType) {
+    return nodes;
+  }
+  var result = [];
+  var currentDecisionItems = [];
+  var flushCurrentDecisionList = function flushCurrentDecisionList() {
+    if (currentDecisionItems.length > 0) {
+      var decisionList = createDecisionListWithItems(currentDecisionItems, schema);
+      if (decisionList) {
+        result.push(decisionList);
+      }
+      currentDecisionItems = [];
+    }
+  };
+  nodes.forEach(function (node) {
+    var decisionItem = isTextNode(node) ? createDecisionItem(node.content, schema) : null;
+    if (decisionItem) {
+      // Accumulate consecutive decisionItems
+      currentDecisionItems.push(decisionItem);
+    } else {
+      // Content can't be wrapped in decisionItem - break out the node
+      flushCurrentDecisionList();
+      result.push(node);
+    }
+  });
+
+  // Flush any remaining decisionItems
+  flushCurrentDecisionList();
+  return result.length > 0 ? result : nodes;
+};

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

@@ -45,11 +45,7 @@ var canWrapInTarget = function canWrapInTarget(node, targetNodeType, targetNodeT
   }
 
   // Use the schema to determine if this node can be contained in the target
-  try {
-    return targetNodeType.validContent(_model.Fragment.from(node));
-  } catch (_unused) {
-    return false;
-  }
+  return targetNodeType.validContent(_model.Fragment.from(node));
 };
 
 /**

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

@@ -12,6 +12,7 @@ var _listToDecisionListStep = require("./steps/listToDecisionListStep");
 var _listToListStep = require("./steps/listToListStep");
 var _unwrapLayoutStep = require("./steps/unwrapLayoutStep");
 var _unwrapListStep = require("./steps/unwrapListStep");
+var _wrapBlockquoteToDecisionListStep = require("./steps/wrapBlockquoteToDecisionListStep");
 var _wrapMixedContentStep = require("./steps/wrapMixedContentStep");
 var _stubStep = require("./stubStep");
 var _types = require("./types");
@@ -83,7 +84,8 @@ var TRANSFORM_STEPS_OVERRIDE = {
     expand: [_wrapStep.wrapStep],
     nestedExpand: [_wrapStep.wrapStep],
     layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep],
-    codeBlock: [_unwrapStep.unwrapStep, _flattenStep.flattenStep, _wrapStep.wrapStep]
+    codeBlock: [_unwrapStep.unwrapStep, _flattenStep.flattenStep, _wrapStep.wrapStep],
+    decisionList: [_unwrapStep.unwrapStep, _wrapBlockquoteToDecisionListStep.wrapBlockquoteToDecisionListStep]
   },
   layoutSection: {
     blockquote: [_unwrapLayoutStep.unwrapLayoutStep, _wrapStep.wrapStep],

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isListType = exports.getTargetNodeTypeNameInContext = exports.getSelectedNode = exports.expandSelectionToBlockRange = void 0;
+exports.isListType = exports.getTargetNodeTypeNameInContext = exports.getSelectedNode = exports.getBlockNodesInRange = exports.expandSelectionToBlockRange = void 0;
 var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
@@ -95,4 +95,16 @@ var isListType = exports.isListType = function isListType(node, schema) {
   return lists.some(function (list) {
     return list === node.type;
   });
+};
+var getBlockNodesInRange = exports.getBlockNodesInRange = function getBlockNodesInRange(range) {
+  if (range.endIndex - range.startIndex <= 1) {
+    return [range.parent.child(range.startIndex)];
+  }
+  var blockNodes = [];
+  for (var i = range.startIndex; i < range.endIndex; i++) {
+    if (range.parent.child(i).isBlock) {
+      blockNodes.push(range.parent.child(i));
+    }
+  }
+  return blockNodes;
 };

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

@@ -9,7 +9,6 @@ var _react = _interopRequireWildcard(require("react"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var BlockMenuContext = /*#__PURE__*/(0, _react.createContext)({
   onDropdownOpenChanged: function onDropdownOpenChanged() {},
-  moveFocusTo: function moveFocusTo() {},
   moveDownRef: /*#__PURE__*/_react.default.createRef(),
   moveUpRef: /*#__PURE__*/_react.default.createRef()
 });
@@ -37,19 +36,9 @@ var BlockMenuProvider = exports.BlockMenuProvider = function BlockMenuProvider(_
       }, 1);
     }
   }, [api]);
-  var moveFocusTo = (0, _react.useCallback)(function (direction) {
-    if (direction === 'moveUp') {
-      var _moveUpRef$current;
-      (_moveUpRef$current = moveUpRef.current) === null || _moveUpRef$current === void 0 || _moveUpRef$current.focus();
-    } else if (direction === 'moveDown') {
-      var _moveDownRef$current;
-      (_moveDownRef$current = moveDownRef.current) === null || _moveDownRef$current === void 0 || _moveDownRef$current.focus();
-    }
-  }, []);
   return /*#__PURE__*/_react.default.createElement(BlockMenuContext.Provider, {
     value: {
       onDropdownOpenChanged: onDropdownOpenChanged,
-      moveFocusTo: moveFocusTo,
       moveDownRef: moveDownRef,
       moveUpRef: moveUpRef
     }

package/dist/cjs/ui/move-down.js

@@ -22,7 +22,7 @@ var MoveDownDropdownItemContent = function MoveDownDropdownItemContent(_ref) {
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var _useBlockMenu = (0, _blockMenuProvider.useBlockMenu)(),
-    moveFocusTo = _useBlockMenu.moveFocusTo,
+    moveUpRef = _useBlockMenu.moveUpRef,
     moveDownRef = _useBlockMenu.moveDownRef;
   var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['blockControls'], function (_ref2) {
       var _blockControlsState$b;
@@ -33,14 +33,10 @@ var MoveDownDropdownItemContent = function MoveDownDropdownItemContent(_ref) {
     }),
     canMoveDown = _useSharedPluginState.canMoveDown;
   (0, _react.useEffect)(function () {
-    var moveDownElement = moveDownRef.current;
-    if (!moveDownElement) {
-      return;
+    if (!canMoveDown && moveDownRef.current && moveDownRef.current === document.activeElement && moveUpRef.current) {
+      moveUpRef.current.focus();
     }
-    if (!canMoveDown && moveDownElement === document.activeElement) {
-      moveFocusTo('moveUp');
-    }
-  }, [canMoveDown, moveFocusTo, moveDownRef]);
+  }, [canMoveDown, moveUpRef, moveDownRef]);
   var handleClick = function handleClick() {
     api === null || api === void 0 || api.core.actions.execute(function (_ref3) {
       var _api$analytics, _api$blockControls;

package/dist/cjs/ui/move-up.js

@@ -22,8 +22,8 @@ var MoveUpDropdownItemContent = function MoveUpDropdownItemContent(_ref) {
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var _useBlockMenu = (0, _blockMenuProvider.useBlockMenu)(),
-    moveFocusTo = _useBlockMenu.moveFocusTo,
-    moveUpRef = _useBlockMenu.moveUpRef;
+    moveUpRef = _useBlockMenu.moveUpRef,
+    moveDownRef = _useBlockMenu.moveDownRef;
   var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['blockControls'], function (_ref2) {
       var _blockControlsState$b;
       var blockControlsState = _ref2.blockControlsState;
@@ -33,14 +33,10 @@ var MoveUpDropdownItemContent = function MoveUpDropdownItemContent(_ref) {
     }),
     canMoveUp = _useSharedPluginState.canMoveUp;
   (0, _react.useEffect)(function () {
-    var moveUpElement = moveUpRef.current;
-    if (!moveUpElement) {
-      return;
+    if (!canMoveUp && moveUpRef.current && moveUpRef.current === document.activeElement && moveDownRef.current) {
+      moveDownRef.current.focus();
     }
-    if (!canMoveUp && moveUpElement === document.activeElement) {
-      moveFocusTo('moveDown');
-    }
-  }, [canMoveUp, moveFocusTo, moveUpRef]);
+  }, [canMoveUp, moveDownRef, moveUpRef]);
   var handleClick = function handleClick() {
     api === null || api === void 0 || api.core.actions.execute(function (_ref3) {
       var _api$analytics, _api$blockControls;

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

@@ -0,0 +1,88 @@
+import { NODE_CATEGORY_BY_TYPE } from '../types';
+
+/**
+ * Determines if a node is a text node (heading or paragraph).
+ * Only text nodes should have their inline content extracted for decisionItem.
+ * All other nodes should break out.
+ */
+const isTextNode = node => {
+  const category = NODE_CATEGORY_BY_TYPE[node.type.name];
+  return category === 'text';
+};
+
+/**
+ * Creates a decisionItem with the given inline content.
+ */
+const createDecisionItem = (inlineContent, schema) => {
+  const decisionItemType = schema.nodes.decisionItem;
+  if (!decisionItemType) {
+    return null;
+  }
+  const canContentBeWrappedInDecisionItem = decisionItemType.validContent(inlineContent);
+
+  // Check if the content is valid for decisionItem
+  if (!canContentBeWrappedInDecisionItem) {
+    return null;
+  }
+  return decisionItemType.createAndFill({}, inlineContent);
+};
+
+/**
+ * Creates a decisionList containing the given decisionItems.
+ */
+const createDecisionListWithItems = (decisionItems, schema) => {
+  const decisionListType = schema.nodes.decisionList;
+  if (!decisionListType || decisionItems.length === 0) {
+    return null;
+  }
+  return decisionListType.createAndFill({}, decisionItems);
+};
+
+/**
+ * Wraps blockquote content into decisionList:
+ * - Text nodes (paragraph, heading) have their inline content extracted and wrapped in decisionItems
+ * - Consecutive text nodes are grouped into a single decisionList with multiple decisionItems
+ * - All other nodes break out (lists, code blocks, media, tables, macros, containers, etc.)
+ *
+ * The logic follows the transform rules:
+ * - Only flatten text nodes into decisionItem (since that's the intent - converting text to decisions)
+ * - Structures that can't be represented in a decisionItem should break out unchanged
+ * - When a break-out node is encountered, flush accumulated decisionItems into a decisionList
+ *
+ * Example: blockquote(p('a'), p('b'), ul(...), p('c')) → [decisionList(decisionItem('a'), decisionItem('b')), ul(...), decisionList(decisionItem('c'))]
+ */
+export const wrapBlockquoteToDecisionListStep = (nodes, context) => {
+  const {
+    schema
+  } = context;
+  const decisionItemType = schema.nodes.decisionItem;
+  if (!decisionItemType) {
+    return nodes;
+  }
+  const result = [];
+  let currentDecisionItems = [];
+  const flushCurrentDecisionList = () => {
+    if (currentDecisionItems.length > 0) {
+      const decisionList = createDecisionListWithItems(currentDecisionItems, schema);
+      if (decisionList) {
+        result.push(decisionList);
+      }
+      currentDecisionItems = [];
+    }
+  };
+  nodes.forEach(node => {
+    const decisionItem = isTextNode(node) ? createDecisionItem(node.content, schema) : null;
+    if (decisionItem) {
+      // Accumulate consecutive decisionItems
+      currentDecisionItems.push(decisionItem);
+    } else {
+      // Content can't be wrapped in decisionItem - break out the node
+      flushCurrentDecisionList();
+      result.push(node);
+    }
+  });
+
+  // Flush any remaining decisionItems
+  flushCurrentDecisionList();
+  return result.length > 0 ? result : nodes;
+};

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

@@ -40,11 +40,7 @@ const canWrapInTarget = (node, targetNodeType, targetNodeTypeName) => {
   }
 
   // Use the schema to determine if this node can be contained in the target
-  try {
-    return targetNodeType.validContent(Fragment.from(node));
-  } catch {
-    return false;
-  }
+  return targetNodeType.validContent(Fragment.from(node));
 };
 
 /**

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

@@ -6,6 +6,7 @@ import { listToDecisionListStep } from './steps/listToDecisionListStep';
 import { listToListStep } from './steps/listToListStep';
 import { unwrapLayoutStep } from './steps/unwrapLayoutStep';
 import { unwrapListStep } from './steps/unwrapListStep';
+import { wrapBlockquoteToDecisionListStep } from './steps/wrapBlockquoteToDecisionListStep';
 import { wrapMixedContentStep } from './steps/wrapMixedContentStep';
 import { stubStep } from './stubStep';
 import { NODE_CATEGORY_BY_TYPE, toNodeTypeValue } from './types';
@@ -78,7 +79,8 @@ const TRANSFORM_STEPS_OVERRIDE = {
     expand: [wrapStep],
     nestedExpand: [wrapStep],
     layoutSection: [wrapIntoLayoutStep],
-    codeBlock: [unwrapStep, flattenStep, wrapStep]
+    codeBlock: [unwrapStep, flattenStep, wrapStep],
+    decisionList: [unwrapStep, wrapBlockquoteToDecisionListStep]
   },
   layoutSection: {
     blockquote: [unwrapLayoutStep, wrapStep],

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

@@ -90,4 +90,16 @@ export const expandSelectionToBlockRange = (selection, schema) => {
 export const isListType = (node, schema) => {
   const lists = [schema.nodes.taskList, schema.nodes.bulletList, schema.nodes.orderedList];
   return lists.some(list => list === node.type);
+};
+export const getBlockNodesInRange = range => {
+  if (range.endIndex - range.startIndex <= 1) {
+    return [range.parent.child(range.startIndex)];
+  }
+  const blockNodes = [];
+  for (let i = range.startIndex; i < range.endIndex; i++) {
+    if (range.parent.child(i).isBlock) {
+      blockNodes.push(range.parent.child(i));
+    }
+  }
+  return blockNodes;
 };

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

@@ -1,7 +1,6 @@
 import React, { useCallback, createContext, useContext, useRef } from 'react';
 const BlockMenuContext = /*#__PURE__*/createContext({
   onDropdownOpenChanged: () => {},
-  moveFocusTo: () => {},
   moveDownRef: /*#__PURE__*/React.createRef(),
   moveUpRef: /*#__PURE__*/React.createRef()
 });
@@ -28,19 +27,9 @@ export const BlockMenuProvider = ({
       }), 1);
     }
   }, [api]);
-  const moveFocusTo = useCallback(direction => {
-    if (direction === 'moveUp') {
-      var _moveUpRef$current;
-      (_moveUpRef$current = moveUpRef.current) === null || _moveUpRef$current === void 0 ? void 0 : _moveUpRef$current.focus();
-    } else if (direction === 'moveDown') {
-      var _moveDownRef$current;
-      (_moveDownRef$current = moveDownRef.current) === null || _moveDownRef$current === void 0 ? void 0 : _moveDownRef$current.focus();
-    }
-  }, []);
   return /*#__PURE__*/React.createElement(BlockMenuContext.Provider, {
     value: {
       onDropdownOpenChanged,
-      moveFocusTo,
       moveDownRef,
       moveUpRef
     }

package/dist/es2019/ui/move-down.js

@@ -15,7 +15,7 @@ const MoveDownDropdownItemContent = ({
     formatMessage
   } = useIntl();
   const {
-    moveFocusTo,
+    moveUpRef,
     moveDownRef
   } = useBlockMenu();
   const {
@@ -29,14 +29,10 @@ const MoveDownDropdownItemContent = ({
     };
   });
   useEffect(() => {
-    const moveDownElement = moveDownRef.current;
-    if (!moveDownElement) {
-      return;
+    if (!canMoveDown && moveDownRef.current && moveDownRef.current === document.activeElement && moveUpRef.current) {
+      moveUpRef.current.focus();
     }
-    if (!canMoveDown && moveDownElement === document.activeElement) {
-      moveFocusTo('moveUp');
-    }
-  }, [canMoveDown, moveFocusTo, moveDownRef]);
+  }, [canMoveDown, moveUpRef, moveDownRef]);
   const handleClick = () => {
     api === null || api === void 0 ? void 0 : api.core.actions.execute(({
       tr

package/dist/es2019/ui/move-up.js

@@ -15,8 +15,8 @@ const MoveUpDropdownItemContent = ({
     formatMessage
   } = useIntl();
   const {
-    moveFocusTo,
-    moveUpRef
+    moveUpRef,
+    moveDownRef
   } = useBlockMenu();
   const {
     canMoveUp
@@ -29,14 +29,10 @@ const MoveUpDropdownItemContent = ({
     };
   });
   useEffect(() => {
-    const moveUpElement = moveUpRef.current;
-    if (!moveUpElement) {
-      return;
+    if (!canMoveUp && moveUpRef.current && moveUpRef.current === document.activeElement && moveDownRef.current) {
+      moveDownRef.current.focus();
     }
-    if (!canMoveUp && moveUpElement === document.activeElement) {
-      moveFocusTo('moveDown');
-    }
-  }, [canMoveUp, moveFocusTo, moveUpRef]);
+  }, [canMoveUp, moveDownRef, moveUpRef]);
   const handleClick = () => {
     api === null || api === void 0 ? void 0 : api.core.actions.execute(({
       tr

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

@@ -0,0 +1,86 @@
+import { NODE_CATEGORY_BY_TYPE } from '../types';
+
+/**
+ * Determines if a node is a text node (heading or paragraph).
+ * Only text nodes should have their inline content extracted for decisionItem.
+ * All other nodes should break out.
+ */
+var isTextNode = function isTextNode(node) {
+  var category = NODE_CATEGORY_BY_TYPE[node.type.name];
+  return category === 'text';
+};
+
+/**
+ * Creates a decisionItem with the given inline content.
+ */
+var createDecisionItem = function createDecisionItem(inlineContent, schema) {
+  var decisionItemType = schema.nodes.decisionItem;
+  if (!decisionItemType) {
+    return null;
+  }
+  var canContentBeWrappedInDecisionItem = decisionItemType.validContent(inlineContent);
+
+  // Check if the content is valid for decisionItem
+  if (!canContentBeWrappedInDecisionItem) {
+    return null;
+  }
+  return decisionItemType.createAndFill({}, inlineContent);
+};
+
+/**
+ * Creates a decisionList containing the given decisionItems.
+ */
+var createDecisionListWithItems = function createDecisionListWithItems(decisionItems, schema) {
+  var decisionListType = schema.nodes.decisionList;
+  if (!decisionListType || decisionItems.length === 0) {
+    return null;
+  }
+  return decisionListType.createAndFill({}, decisionItems);
+};
+
+/**
+ * Wraps blockquote content into decisionList:
+ * - Text nodes (paragraph, heading) have their inline content extracted and wrapped in decisionItems
+ * - Consecutive text nodes are grouped into a single decisionList with multiple decisionItems
+ * - All other nodes break out (lists, code blocks, media, tables, macros, containers, etc.)
+ *
+ * The logic follows the transform rules:
+ * - Only flatten text nodes into decisionItem (since that's the intent - converting text to decisions)
+ * - Structures that can't be represented in a decisionItem should break out unchanged
+ * - When a break-out node is encountered, flush accumulated decisionItems into a decisionList
+ *
+ * Example: blockquote(p('a'), p('b'), ul(...), p('c')) → [decisionList(decisionItem('a'), decisionItem('b')), ul(...), decisionList(decisionItem('c'))]
+ */
+export var wrapBlockquoteToDecisionListStep = function wrapBlockquoteToDecisionListStep(nodes, context) {
+  var schema = context.schema;
+  var decisionItemType = schema.nodes.decisionItem;
+  if (!decisionItemType) {
+    return nodes;
+  }
+  var result = [];
+  var currentDecisionItems = [];
+  var flushCurrentDecisionList = function flushCurrentDecisionList() {
+    if (currentDecisionItems.length > 0) {
+      var decisionList = createDecisionListWithItems(currentDecisionItems, schema);
+      if (decisionList) {
+        result.push(decisionList);
+      }
+      currentDecisionItems = [];
+    }
+  };
+  nodes.forEach(function (node) {
+    var decisionItem = isTextNode(node) ? createDecisionItem(node.content, schema) : null;
+    if (decisionItem) {
+      // Accumulate consecutive decisionItems
+      currentDecisionItems.push(decisionItem);
+    } else {
+      // Content can't be wrapped in decisionItem - break out the node
+      flushCurrentDecisionList();
+      result.push(node);
+    }
+  });
+
+  // Flush any remaining decisionItems
+  flushCurrentDecisionList();
+  return result.length > 0 ? result : nodes;
+};

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

@@ -40,11 +40,7 @@ var canWrapInTarget = function canWrapInTarget(node, targetNodeType, targetNodeT
   }
 
   // Use the schema to determine if this node can be contained in the target
-  try {
-    return targetNodeType.validContent(Fragment.from(node));
-  } catch (_unused) {
-    return false;
-  }
+  return targetNodeType.validContent(Fragment.from(node));
 };
 
 /**

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

@@ -6,6 +6,7 @@ import { listToDecisionListStep } from './steps/listToDecisionListStep';
 import { listToListStep } from './steps/listToListStep';
 import { unwrapLayoutStep } from './steps/unwrapLayoutStep';
 import { unwrapListStep } from './steps/unwrapListStep';
+import { wrapBlockquoteToDecisionListStep } from './steps/wrapBlockquoteToDecisionListStep';
 import { wrapMixedContentStep } from './steps/wrapMixedContentStep';
 import { stubStep } from './stubStep';
 import { NODE_CATEGORY_BY_TYPE, toNodeTypeValue } from './types';
@@ -78,7 +79,8 @@ var TRANSFORM_STEPS_OVERRIDE = {
     expand: [wrapStep],
     nestedExpand: [wrapStep],
     layoutSection: [wrapIntoLayoutStep],
-    codeBlock: [unwrapStep, flattenStep, wrapStep]
+    codeBlock: [unwrapStep, flattenStep, wrapStep],
+    decisionList: [unwrapStep, wrapBlockquoteToDecisionListStep]
   },
   layoutSection: {
     blockquote: [unwrapLayoutStep, wrapStep],

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

@@ -89,4 +89,16 @@ export var isListType = function isListType(node, schema) {
   return lists.some(function (list) {
     return list === node.type;
   });
+};
+export var getBlockNodesInRange = function getBlockNodesInRange(range) {
+  if (range.endIndex - range.startIndex <= 1) {
+    return [range.parent.child(range.startIndex)];
+  }
+  var blockNodes = [];
+  for (var i = range.startIndex; i < range.endIndex; i++) {
+    if (range.parent.child(i).isBlock) {
+      blockNodes.push(range.parent.child(i));
+    }
+  }
+  return blockNodes;
 };

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

@@ -1,7 +1,6 @@
 import React, { useCallback, createContext, useContext, useRef } from 'react';
 var BlockMenuContext = /*#__PURE__*/createContext({
   onDropdownOpenChanged: function onDropdownOpenChanged() {},
-  moveFocusTo: function moveFocusTo() {},
   moveDownRef: /*#__PURE__*/React.createRef(),
   moveUpRef: /*#__PURE__*/React.createRef()
 });
@@ -29,19 +28,9 @@ export var BlockMenuProvider = function BlockMenuProvider(_ref) {
       }, 1);
     }
   }, [api]);
-  var moveFocusTo = useCallback(function (direction) {
-    if (direction === 'moveUp') {
-      var _moveUpRef$current;
-      (_moveUpRef$current = moveUpRef.current) === null || _moveUpRef$current === void 0 || _moveUpRef$current.focus();
-    } else if (direction === 'moveDown') {
-      var _moveDownRef$current;
-      (_moveDownRef$current = moveDownRef.current) === null || _moveDownRef$current === void 0 || _moveDownRef$current.focus();
-    }
-  }, []);
   return /*#__PURE__*/React.createElement(BlockMenuContext.Provider, {
     value: {
       onDropdownOpenChanged: onDropdownOpenChanged,
-      moveFocusTo: moveFocusTo,
       moveDownRef: moveDownRef,
       moveUpRef: moveUpRef
     }

package/dist/esm/ui/move-down.js

@@ -13,7 +13,7 @@ var MoveDownDropdownItemContent = function MoveDownDropdownItemContent(_ref) {
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var _useBlockMenu = useBlockMenu(),
-    moveFocusTo = _useBlockMenu.moveFocusTo,
+    moveUpRef = _useBlockMenu.moveUpRef,
     moveDownRef = _useBlockMenu.moveDownRef;
   var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['blockControls'], function (_ref2) {
       var _blockControlsState$b;
@@ -24,14 +24,10 @@ var MoveDownDropdownItemContent = function MoveDownDropdownItemContent(_ref) {
     }),
     canMoveDown = _useSharedPluginState.canMoveDown;
   useEffect(function () {
-    var moveDownElement = moveDownRef.current;
-    if (!moveDownElement) {
-      return;
+    if (!canMoveDown && moveDownRef.current && moveDownRef.current === document.activeElement && moveUpRef.current) {
+      moveUpRef.current.focus();
     }
-    if (!canMoveDown && moveDownElement === document.activeElement) {
-      moveFocusTo('moveUp');
-    }
-  }, [canMoveDown, moveFocusTo, moveDownRef]);
+  }, [canMoveDown, moveUpRef, moveDownRef]);
   var handleClick = function handleClick() {
     api === null || api === void 0 || api.core.actions.execute(function (_ref3) {
       var _api$analytics, _api$blockControls;

package/dist/esm/ui/move-up.js

@@ -13,8 +13,8 @@ var MoveUpDropdownItemContent = function MoveUpDropdownItemContent(_ref) {
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var _useBlockMenu = useBlockMenu(),
-    moveFocusTo = _useBlockMenu.moveFocusTo,
-    moveUpRef = _useBlockMenu.moveUpRef;
+    moveUpRef = _useBlockMenu.moveUpRef,
+    moveDownRef = _useBlockMenu.moveDownRef;
   var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['blockControls'], function (_ref2) {
       var _blockControlsState$b;
       var blockControlsState = _ref2.blockControlsState;
@@ -24,14 +24,10 @@ var MoveUpDropdownItemContent = function MoveUpDropdownItemContent(_ref) {
     }),
     canMoveUp = _useSharedPluginState.canMoveUp;
   useEffect(function () {
-    var moveUpElement = moveUpRef.current;
-    if (!moveUpElement) {
-      return;
+    if (!canMoveUp && moveUpRef.current && moveUpRef.current === document.activeElement && moveDownRef.current) {
+      moveDownRef.current.focus();
     }
-    if (!canMoveUp && moveUpElement === document.activeElement) {
-      moveFocusTo('moveDown');
-    }
-  }, [canMoveUp, moveFocusTo, moveUpRef]);
+  }, [canMoveUp, moveDownRef, moveUpRef]);
   var handleClick = function handleClick() {
     api === null || api === void 0 || api.core.actions.execute(function (_ref3) {
       var _api$analytics, _api$blockControls;

package/dist/types/editor-commands/transform-node-utils/steps/wrapBlockquoteToDecisionListStep.d.ts

@@ -0,0 +1,15 @@
+import type { TransformStep } from '../types';
+/**
+ * Wraps blockquote content into decisionList:
+ * - Text nodes (paragraph, heading) have their inline content extracted and wrapped in decisionItems
+ * - Consecutive text nodes are grouped into a single decisionList with multiple decisionItems
+ * - All other nodes break out (lists, code blocks, media, tables, macros, containers, etc.)
+ *
+ * The logic follows the transform rules:
+ * - Only flatten text nodes into decisionItem (since that's the intent - converting text to decisions)
+ * - Structures that can't be represented in a decisionItem should break out unchanged
+ * - When a break-out node is encountered, flush accumulated decisionItems into a decisionList
+ *
+ * Example: blockquote(p('a'), p('b'), ul(...), p('c')) → [decisionList(decisionItem('a'), decisionItem('b')), ul(...), decisionList(decisionItem('c'))]
+ */
+export declare const wrapBlockquoteToDecisionListStep: TransformStep;

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

@@ -1,5 +1,4 @@
-import type { Schema } from '@atlaskit/editor-prosemirror/model';
-import { type Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { Schema, Node as PMNode, NodeRange } from '@atlaskit/editor-prosemirror/model';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import { type ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 import type { NodeTypeName } from './types';
@@ -17,3 +16,4 @@ export declare const expandSelectionToBlockRange: (selection: Selection, schema:
     $to: import("prosemirror-model").ResolvedPos;
 };
 export declare const isListType: (node: PMNode, schema: Schema) => boolean;
+export declare const getBlockNodesInRange: (range: NodeRange) => PMNode[];

package/dist/types/ui/block-menu-provider.d.ts

@@ -8,11 +8,6 @@ type BlockMenuProviderProps = {
 };
 export type BlockMenuContextType = {
     moveDownRef: React.MutableRefObject<HTMLButtonElement | null>;
-    /**
-     * Function to move focus between move up and move down items.
-     * Used when one item is disabled and focused.
-     */
-    moveFocusTo: (direction: Direction) => void;
     moveUpRef: React.MutableRefObject<HTMLButtonElement | null>;
     /**
      * Callback for when the dropdown is open/closed. Receives an object with `isOpen` state.

package/dist/types-ts4.5/editor-commands/transform-node-utils/steps/wrapBlockquoteToDecisionListStep.d.ts

@@ -0,0 +1,15 @@
+import type { TransformStep } from '../types';
+/**
+ * Wraps blockquote content into decisionList:
+ * - Text nodes (paragraph, heading) have their inline content extracted and wrapped in decisionItems
+ * - Consecutive text nodes are grouped into a single decisionList with multiple decisionItems
+ * - All other nodes break out (lists, code blocks, media, tables, macros, containers, etc.)
+ *
+ * The logic follows the transform rules:
+ * - Only flatten text nodes into decisionItem (since that's the intent - converting text to decisions)
+ * - Structures that can't be represented in a decisionItem should break out unchanged
+ * - When a break-out node is encountered, flush accumulated decisionItems into a decisionList
+ *
+ * Example: blockquote(p('a'), p('b'), ul(...), p('c')) → [decisionList(decisionItem('a'), decisionItem('b')), ul(...), decisionList(decisionItem('c'))]
+ */
+export declare const wrapBlockquoteToDecisionListStep: TransformStep;

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

@@ -1,5 +1,4 @@
-import type { Schema } from '@atlaskit/editor-prosemirror/model';
-import { type Node as PMNode } from '@atlaskit/editor-prosemirror/model';
+import type { Schema, Node as PMNode, NodeRange } from '@atlaskit/editor-prosemirror/model';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import { type ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 import type { NodeTypeName } from './types';
@@ -17,3 +16,4 @@ export declare const expandSelectionToBlockRange: (selection: Selection, schema:
     $to: import("prosemirror-model").ResolvedPos;
 };
 export declare const isListType: (node: PMNode, schema: Schema) => boolean;
+export declare const getBlockNodesInRange: (range: NodeRange) => PMNode[];

package/dist/types-ts4.5/ui/block-menu-provider.d.ts

@@ -8,11 +8,6 @@ type BlockMenuProviderProps = {
 };
 export type BlockMenuContextType = {
     moveDownRef: React.MutableRefObject<HTMLButtonElement | null>;
-    /**
-     * Function to move focus between move up and move down items.
-     * Used when one item is disabled and focused.
-     */
-    moveFocusTo: (direction: Direction) => void;
     moveUpRef: React.MutableRefObject<HTMLButtonElement | null>;
     /**
      * Callback for when the dropdown is open/closed. Receives an object with `isOpen` state.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.2.5",
+	"version": "5.2.7",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,7 +35,7 @@
 		"@atlaskit/editor-plugin-decorations": "^6.1.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-plugin-user-intent": "^4.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/editor-toolbar": "^0.18.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^16.4.0",
-		"@atlaskit/tmp-editor-statsig": "^15.7.0",
+		"@atlaskit/tmp-editor-statsig": "^15.9.0",
 		"@atlaskit/tokens": "^8.4.0",
 		"@babel/runtime": "^7.0.0"
 	},