@atlaskit/editor-plugin-block-menu 5.2.12 → 5.2.13

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 5.2.13
+
+### Patch Changes
+
+- [`8da61d284b811`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8da61d284b811) -
+  EDITOR-3911 Expand selection to block range
+- [`010fbe9d85b12`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/010fbe9d85b12) -
+  [ux] Fix bug / make wrap of expand convert to nestedExpand node
+- Updated dependencies
+
 ## 5.2.12
 
 ### Patch Changes

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

@@ -133,7 +133,8 @@ var TRANSFORM_STEPS_OVERRIDE = {
   decisionList: {
     bulletList: [_decisionListToListStep.decisionListToListStep],
     orderedList: [_decisionListToListStep.decisionListToListStep],
-    taskList: [_decisionListToListStep.decisionListToListStep]
+    taskList: [_decisionListToListStep.decisionListToListStep],
+    layoutSection: [_wrapIntoLayoutStep.wrapIntoLayoutStep]
   }
 };
 var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName) {

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

@@ -3,12 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isListType = exports.getTargetNodeTypeNameInContext = exports.getSelectedNode = exports.getBlockNodesInRange = exports.expandSelectionToBlockRange = exports.convertNestedExpandToExpand = exports.convertExpandToNestedExpand = void 0;
-var _selection = require("@atlaskit/editor-common/selection");
+exports.isListType = exports.getTargetNodeTypeNameInContext = exports.getSelectedNode = exports.getBlockNodesInRange = exports.convertNestedExpandToExpand = exports.convertExpandToNestedExpand = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorTables = require("@atlaskit/editor-tables");
-var _utils2 = require("@atlaskit/editor-tables/utils");
 var getSelectedNode = exports.getSelectedNode = function getSelectedNode(selection) {
   if (selection instanceof _state.NodeSelection) {
     return {
@@ -57,56 +55,6 @@ var getTargetNodeTypeNameInContext = exports.getTargetNodeTypeNameInContext = fu
   }
   return nodeTypeName;
 };
-
-/**
- * Use common expandToBlockRange function to get the correct range for the selection
- * For example, if selection starts in a listItem, go find the bullet list or ordered list, their $from
- * @param selection
- * @param schema
- * @returns
- */
-var expandSelectionToBlockRange = exports.expandSelectionToBlockRange = function expandSelectionToBlockRange(selection, schema) {
-  var nodes = schema.nodes;
-  var nodesNeedToExpandRange = [nodes.bulletList, nodes.orderedList, nodes.taskList, nodes.listItem, nodes.taskItem];
-
-  // when adding nodes.tableRow, tableHeader, tableCell in nodesNeedToExpandRang,
-  // expandToBlockRange does not return expected table start position, sometimes even freeze editor
-  // so handle table in the below logic
-  if ((0, _utils2.isTableSelected)(selection)) {
-    var table = (0, _utils2.findTable)(selection);
-    if (table) {
-      var $from = selection.$from.doc.resolve(table.pos);
-      var $to = selection.$from.doc.resolve(table.pos + table.node.nodeSize - 1);
-      return {
-        $from: $from,
-        $to: $to,
-        range: $from.blockRange($to)
-      };
-    }
-  }
-
-  // when selecting a file, selection is on media
-  // need to find media group and return its pos
-  if (selection instanceof _state.NodeSelection) {
-    if (selection.node.type === nodes.media) {
-      var mediaGroup = (0, _utils.findParentNodeOfType)(nodes.mediaGroup)(selection);
-      if (mediaGroup) {
-        var _$from = selection.$from.doc.resolve(mediaGroup.pos);
-        var _$to = selection.$from.doc.resolve(mediaGroup.pos + mediaGroup.node.nodeSize);
-        return {
-          $from: _$from,
-          $to: _$to
-        };
-      }
-    }
-  }
-  return (0, _selection.expandToBlockRange)(selection.$from, selection.$to, function (node) {
-    if (nodesNeedToExpandRange.includes(node.type)) {
-      return false;
-    }
-    return true;
-  });
-};
 var isListType = exports.isListType = function isListType(node, schema) {
   var lists = [schema.nodes.taskList, schema.nodes.bulletList, schema.nodes.orderedList];
   return lists.some(function (list) {

package/dist/cjs/editor-commands/transformNode.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformNode = void 0;
+var _selection = require("@atlaskit/editor-common/selection");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _isNestedNode = require("../ui/utils/isNestedNode");
 var _transform = require("./transform-node-utils/transform");
-var _utils = require("./transform-node-utils/utils");
-var _utils2 = require("./transforms/utils");
+var _utils = require("./transforms/utils");
 var transformNode = exports.transformNode = function transformNode(api) {
   return (
     // eslint-disable-next-line no-unused-vars
@@ -23,13 +23,13 @@ var transformNode = exports.transformNode = function transformNode(api) {
         }
         var schema = tr.doc.type.schema;
         var nodes = schema.nodes;
-        var _expandSelectionToBlo = (0, _utils.expandSelectionToBlockRange)(preservedSelection, schema),
+        var _expandSelectionToBlo = (0, _selection.expandSelectionToBlockRange)(preservedSelection),
           $from = _expandSelectionToBlo.$from,
           $to = _expandSelectionToBlo.$to;
         var isNested = (0, _isNestedNode.isNestedNode)(preservedSelection, '');
         var selectedParent = $from.parent;
         var fragment = _model.Fragment.empty;
-        var isList = (0, _utils2.isListNode)(selectedParent);
+        var isList = (0, _utils.isListNode)(selectedParent);
         var slice = tr.doc.slice(isList ? $from.pos - 1 : $from.pos, isList ? $to.pos + 1 : $to.pos);
         slice.content.forEach(function (node) {
           var outputNode = (0, _transform.getOutputNodes)({

package/dist/cjs/ui/copy-link.js

@@ -31,24 +31,21 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
   var _ref2 = config || {},
     getLinkPath = _ref2.getLinkPath,
     blockLinkHashPrefix = _ref2.blockLinkHashPrefix;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['blockControls', 'selection', 'core'], function (_ref3) {
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['blockControls', 'selection'], function (_ref3) {
       var blockControlsState = _ref3.blockControlsState,
-        selectionState = _ref3.selectionState,
-        coreState = _ref3.coreState;
+        selectionState = _ref3.selectionState;
       return {
         menuTriggerBy: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.menuTriggerBy,
         preservedSelection: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.preservedSelection,
-        defaultSelection: selectionState === null || selectionState === void 0 ? void 0 : selectionState.selection,
-        schema: coreState === null || coreState === void 0 ? void 0 : coreState.schema
+        defaultSelection: selectionState === null || selectionState === void 0 ? void 0 : selectionState.selection
       };
     }),
     preservedSelection = _useSharedPluginState.preservedSelection,
     defaultSelection = _useSharedPluginState.defaultSelection,
-    menuTriggerBy = _useSharedPluginState.menuTriggerBy,
-    schema = _useSharedPluginState.schema;
+    menuTriggerBy = _useSharedPluginState.menuTriggerBy;
   var selection = preservedSelection || defaultSelection;
   var handleClick = (0, _react.useCallback)(function () {
-    if (!selection || !schema) {
+    if (!selection) {
       return;
     }
     api === null || api === void 0 || api.core.actions.execute(function (_ref4) {
@@ -74,8 +71,7 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
     (0, _copyLink.copyLink)({
       getLinkPath: getLinkPath,
       blockLinkHashPrefix: blockLinkHashPrefix,
-      selection: selection,
-      schema: schema
+      selection: selection
     }).then(function (success) {
       if (success) {
         api === null || api === void 0 || api.core.actions.execute(function (_ref5) {
@@ -87,7 +83,7 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
         });
       }
     });
-  }, [api, blockLinkHashPrefix, getLinkPath, onDropdownOpenChanged, schema, selection]);
+  }, [api, blockLinkHashPrefix, getLinkPath, onDropdownOpenChanged, selection]);
 
   // Hide copy link when `platform_editor_adf_with_localid` feature flag is off or when the node is nested or on empty line
   if (!(0, _platformFeatureFlags.fg)('platform_editor_adf_with_localid') || !!menuTriggerBy && (0, _isNestedNode.isNestedNode)(selection, menuTriggerBy) || selection !== null && selection !== void 0 && selection.empty) {

package/dist/cjs/ui/hooks/useSuggestedItems.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useSuggestedItems = void 0;
 var _react = require("react");
 var _hooks = require("@atlaskit/editor-common/hooks");
+var _selection = require("@atlaskit/editor-common/selection");
 var _utils = require("../../editor-commands/transform-node-utils/utils");
 var _suggestedItemsRank = require("../utils/suggested-items-rank");
 var useSuggestedItems = exports.useSuggestedItems = function useSuggestedItems(api) {
@@ -35,17 +36,23 @@ var useSuggestedItems = exports.useSuggestedItems = function useSuggestedItems(a
     if (menuItemsMap.size === 0 || !currentSelection) {
       return [];
     }
-    var _expandSelectionToBlo = (0, _utils.expandSelectionToBlockRange)(currentSelection, currentSelection.$from.doc.type.schema),
+    var _expandSelectionToBlo = (0, _selection.expandSelectionToBlockRange)(currentSelection),
       range = _expandSelectionToBlo.range;
     if (!range) {
       return [];
     }
     var blockNodes = (0, _utils.getBlockNodesInRange)(range);
-    var singleNode = blockNodes.length === 1 ? blockNodes[0] : undefined;
-    if (!singleNode) {
+    if (blockNodes.length === 0) {
       return [];
     }
-    var nodeTypeName = singleNode.type.name;
+    var firstNodeType = blockNodes[0].type.name;
+    var allSameType = blockNodes.every(function (node) {
+      return node.type.name === firstNodeType;
+    });
+    if (!allSameType) {
+      return [];
+    }
+    var nodeTypeName = firstNodeType;
     var sortedKeys = (0, _suggestedItemsRank.getSortedSuggestedItems)(nodeTypeName);
     return sortedKeys.map(function (key) {
       return menuItemsMap.get(key);

package/dist/cjs/ui/utils/copyLink.js

@@ -10,15 +10,15 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _blockMenu = require("@atlaskit/editor-common/block-menu");
 var _clipboard = require("@atlaskit/editor-common/clipboard");
 var _monitoring = require("@atlaskit/editor-common/monitoring");
-var _utils = require("../../editor-commands/transform-node-utils/utils");
+var _selection = require("@atlaskit/editor-common/selection");
 var copyLink = exports.copyLink = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_ref) {
-    var getLinkPath, _ref$blockLinkHashPre, blockLinkHashPrefix, selection, schema, blockRange, node, path, url, href;
+    var getLinkPath, _ref$blockLinkHashPre, blockLinkHashPrefix, selection, blockRange, node, path, url, href;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          getLinkPath = _ref.getLinkPath, _ref$blockLinkHashPre = _ref.blockLinkHashPrefix, blockLinkHashPrefix = _ref$blockLinkHashPre === void 0 ? _blockMenu.DEFAULT_BLOCK_LINK_HASH_PREFIX : _ref$blockLinkHashPre, selection = _ref.selection, schema = _ref.schema;
-          blockRange = (0, _utils.expandSelectionToBlockRange)(selection, schema);
+          getLinkPath = _ref.getLinkPath, _ref$blockLinkHashPre = _ref.blockLinkHashPrefix, blockLinkHashPrefix = _ref$blockLinkHashPre === void 0 ? _blockMenu.DEFAULT_BLOCK_LINK_HASH_PREFIX : _ref$blockLinkHashPre, selection = _ref.selection;
+          blockRange = (0, _selection.expandSelectionToBlockRange)(selection);
           if (blockRange) {
             _context.next = 4;
             break;

package/dist/cjs/ui/utils/suggested-items-rank.js

@@ -43,7 +43,7 @@ var BLOCK_MENU_NODE_TYPES = exports.BLOCK_MENU_NODE_TYPES = {
   EMBED_CARD: 'embedCard',
   TABLE: 'table'
 };
-var TRANSFORM_SUGGESTED_ITEMS_RANK = exports.TRANSFORM_SUGGESTED_ITEMS_RANK = (_TRANSFORM_SUGGESTED_ = {}, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_TRANSFORM_SUGGESTED_, BLOCK_MENU_NODE_TYPES.PARAGRAPH, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_HEADINGS_H1_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_HEADINGS_H2_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.EXPAND, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.BLOCKQUOTE, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.LAYOUT_SECTION, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.PANEL, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_CODE_BLOCK_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.CODE_BLOCK, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.DECISION, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.BULLET_LIST, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_NUMBERED_LIST_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.ORDERED_LIST, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_TASK_LIST_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_BULLETED_LIST_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.HEADING, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_BULLETED_LIST_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 300)), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_TRANSFORM_SUGGESTED_, BLOCK_MENU_NODE_TYPES.TASK_LIST, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_NUMBERED_LIST_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_BULLETED_LIST_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.MEDIA_SINGLE, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.EXTENSION, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.BODIED_EXTENSION, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 300)));
+var TRANSFORM_SUGGESTED_ITEMS_RANK = exports.TRANSFORM_SUGGESTED_ITEMS_RANK = (_TRANSFORM_SUGGESTED_ = {}, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_TRANSFORM_SUGGESTED_, BLOCK_MENU_NODE_TYPES.PARAGRAPH, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_HEADINGS_H1_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_HEADINGS_H2_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.EXPAND, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.BLOCKQUOTE, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.LAYOUT_SECTION, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.PANEL, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_CODE_BLOCK_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.CODE_BLOCK, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.DECISION, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.BULLET_LIST, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_NUMBERED_LIST_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.ORDERED_LIST, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_TASK_LIST_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_BULLETED_LIST_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.HEADING, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_BULLETED_LIST_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 300)), (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_TRANSFORM_SUGGESTED_, BLOCK_MENU_NODE_TYPES.TASK_LIST, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_NUMBERED_LIST_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_BULLETED_LIST_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.MEDIA_SINGLE, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.EXTENSION, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _blockMenu.TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 100), _blockMenu.TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 200), _blockMenu.TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 300)));
 var getSuggestedItemsForNodeType = exports.getSuggestedItemsForNodeType = function getSuggestedItemsForNodeType(nodeType) {
   return TRANSFORM_SUGGESTED_ITEMS_RANK[nodeType];
 };

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

@@ -128,7 +128,8 @@ const TRANSFORM_STEPS_OVERRIDE = {
   decisionList: {
     bulletList: [decisionListToListStep],
     orderedList: [decisionListToListStep],
-    taskList: [decisionListToListStep]
+    taskList: [decisionListToListStep],
+    layoutSection: [wrapIntoLayoutStep]
   }
 };
 const getTransformStepsForNodeTypes = (selectedNodeTypeName, targetNodeTypeName) => {

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

@@ -1,8 +1,6 @@
-import { expandToBlockRange } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables';
-import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 export const getSelectedNode = selection => {
   if (selection instanceof NodeSelection) {
     return {
@@ -52,58 +50,6 @@ export const getTargetNodeTypeNameInContext = (nodeTypeName, isNested) => {
   }
   return nodeTypeName;
 };
-
-/**
- * Use common expandToBlockRange function to get the correct range for the selection
- * For example, if selection starts in a listItem, go find the bullet list or ordered list, their $from
- * @param selection
- * @param schema
- * @returns
- */
-export const expandSelectionToBlockRange = (selection, schema) => {
-  const {
-    nodes
-  } = schema;
-  const nodesNeedToExpandRange = [nodes.bulletList, nodes.orderedList, nodes.taskList, nodes.listItem, nodes.taskItem];
-
-  // when adding nodes.tableRow, tableHeader, tableCell in nodesNeedToExpandRang,
-  // expandToBlockRange does not return expected table start position, sometimes even freeze editor
-  // so handle table in the below logic
-  if (isTableSelected(selection)) {
-    const table = findTable(selection);
-    if (table) {
-      const $from = selection.$from.doc.resolve(table.pos);
-      const $to = selection.$from.doc.resolve(table.pos + table.node.nodeSize - 1);
-      return {
-        $from,
-        $to,
-        range: $from.blockRange($to)
-      };
-    }
-  }
-
-  // when selecting a file, selection is on media
-  // need to find media group and return its pos
-  if (selection instanceof NodeSelection) {
-    if (selection.node.type === nodes.media) {
-      const mediaGroup = findParentNodeOfType(nodes.mediaGroup)(selection);
-      if (mediaGroup) {
-        const $from = selection.$from.doc.resolve(mediaGroup.pos);
-        const $to = selection.$from.doc.resolve(mediaGroup.pos + mediaGroup.node.nodeSize);
-        return {
-          $from,
-          $to
-        };
-      }
-    }
-  }
-  return expandToBlockRange(selection.$from, selection.$to, node => {
-    if (nodesNeedToExpandRange.includes(node.type)) {
-      return false;
-    }
-    return true;
-  });
-};
 export const isListType = (node, schema) => {
   const lists = [schema.nodes.taskList, schema.nodes.bulletList, schema.nodes.orderedList];
   return lists.some(list => list === node.type);

package/dist/es2019/editor-commands/transformNode.js

@@ -1,8 +1,8 @@
+import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { isNestedNode } from '../ui/utils/isNestedNode';
 import { getOutputNodes } from './transform-node-utils/transform';
-import { expandSelectionToBlockRange } from './transform-node-utils/utils';
 import { isListNode } from './transforms/utils';
 export const transformNode = api =>
 // eslint-disable-next-line no-unused-vars
@@ -22,7 +22,7 @@ export const transformNode = api =>
     const {
       $from,
       $to
-    } = expandSelectionToBlockRange(preservedSelection, schema);
+    } = expandSelectionToBlockRange(preservedSelection);
     const isNested = isNestedNode(preservedSelection, '');
     const selectedParent = $from.parent;
     let fragment = Fragment.empty;

package/dist/es2019/ui/copy-link.js

@@ -29,23 +29,20 @@ const CopyLinkDropdownItemContent = ({
   const {
     preservedSelection,
     defaultSelection,
-    menuTriggerBy,
-    schema
-  } = useSharedPluginStateWithSelector(api, ['blockControls', 'selection', 'core'], ({
+    menuTriggerBy
+  } = useSharedPluginStateWithSelector(api, ['blockControls', 'selection'], ({
     blockControlsState,
-    selectionState,
-    coreState
+    selectionState
   }) => {
     return {
       menuTriggerBy: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.menuTriggerBy,
       preservedSelection: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.preservedSelection,
-      defaultSelection: selectionState === null || selectionState === void 0 ? void 0 : selectionState.selection,
-      schema: coreState === null || coreState === void 0 ? void 0 : coreState.schema
+      defaultSelection: selectionState === null || selectionState === void 0 ? void 0 : selectionState.selection
     };
   });
   const selection = preservedSelection || defaultSelection;
   const handleClick = useCallback(() => {
-    if (!selection || !schema) {
+    if (!selection) {
       return;
     }
     api === null || api === void 0 ? void 0 : api.core.actions.execute(({
@@ -72,8 +69,7 @@ const CopyLinkDropdownItemContent = ({
     copyLink({
       getLinkPath,
       blockLinkHashPrefix,
-      selection,
-      schema
+      selection
     }).then(success => {
       if (success) {
         api === null || api === void 0 ? void 0 : api.core.actions.execute(({
@@ -86,7 +82,7 @@ const CopyLinkDropdownItemContent = ({
         });
       }
     });
-  }, [api, blockLinkHashPrefix, getLinkPath, onDropdownOpenChanged, schema, selection]);
+  }, [api, blockLinkHashPrefix, getLinkPath, onDropdownOpenChanged, selection]);
 
   // Hide copy link when `platform_editor_adf_with_localid` feature flag is off or when the node is nested or on empty line
   if (!fg('platform_editor_adf_with_localid') || !!menuTriggerBy && isNestedNode(selection, menuTriggerBy) || selection !== null && selection !== void 0 && selection.empty) {

package/dist/es2019/ui/hooks/useSuggestedItems.js

@@ -1,6 +1,7 @@
 import { useMemo } from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { getBlockNodesInRange, expandSelectionToBlockRange } from '../../editor-commands/transform-node-utils/utils';
+import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
+import { getBlockNodesInRange } from '../../editor-commands/transform-node-utils/utils';
 import { getSortedSuggestedItems } from '../utils/suggested-items-rank';
 export const useSuggestedItems = api => {
   var _api$blockMenu;
@@ -28,16 +29,20 @@ export const useSuggestedItems = api => {
     }
     const {
       range
-    } = expandSelectionToBlockRange(currentSelection, currentSelection.$from.doc.type.schema);
+    } = expandSelectionToBlockRange(currentSelection);
     if (!range) {
       return [];
     }
     const blockNodes = getBlockNodesInRange(range);
-    const singleNode = blockNodes.length === 1 ? blockNodes[0] : undefined;
-    if (!singleNode) {
+    if (blockNodes.length === 0) {
       return [];
     }
-    const nodeTypeName = singleNode.type.name;
+    const firstNodeType = blockNodes[0].type.name;
+    const allSameType = blockNodes.every(node => node.type.name === firstNodeType);
+    if (!allSameType) {
+      return [];
+    }
+    const nodeTypeName = firstNodeType;
     const sortedKeys = getSortedSuggestedItems(nodeTypeName);
     return sortedKeys.map(key => menuItemsMap.get(key)).filter(item => item !== undefined);
   }, [menuItemsMap, preservedSelection, selection]);

package/dist/es2019/ui/utils/copyLink.js

@@ -1,14 +1,13 @@
 import { createBlockLinkHashValue, DEFAULT_BLOCK_LINK_HASH_PREFIX } from '@atlaskit/editor-common/block-menu';
 import { copyToClipboard } from '@atlaskit/editor-common/clipboard';
 import { logException } from '@atlaskit/editor-common/monitoring';
-import { expandSelectionToBlockRange } from '../../editor-commands/transform-node-utils/utils';
+import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
 export const copyLink = async ({
   getLinkPath,
   blockLinkHashPrefix = DEFAULT_BLOCK_LINK_HASH_PREFIX,
-  selection,
-  schema
+  selection
 }) => {
-  const blockRange = expandSelectionToBlockRange(selection, schema);
+  const blockRange = expandSelectionToBlockRange(selection);
   if (!blockRange) {
     return false;
   }

package/dist/es2019/ui/utils/suggested-items-rank.js

@@ -99,11 +99,6 @@ export const TRANSFORM_SUGGESTED_ITEMS_RANK = {
     [TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]: 100,
     [TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key]: 200,
     [TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key]: 300
-  },
-  [BLOCK_MENU_NODE_TYPES.BODIED_EXTENSION]: {
-    [TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key]: 100,
-    [TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key]: 200,
-    [TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key]: 300
   }
 };
 export const getSuggestedItemsForNodeType = nodeType => {

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

@@ -128,7 +128,8 @@ var TRANSFORM_STEPS_OVERRIDE = {
   decisionList: {
     bulletList: [decisionListToListStep],
     orderedList: [decisionListToListStep],
-    taskList: [decisionListToListStep]
+    taskList: [decisionListToListStep],
+    layoutSection: [wrapIntoLayoutStep]
   }
 };
 var getTransformStepsForNodeTypes = function getTransformStepsForNodeTypes(selectedNodeTypeName, targetNodeTypeName) {

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

@@ -1,8 +1,6 @@
-import { expandToBlockRange } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables';
-import { findTable, isTableSelected } from '@atlaskit/editor-tables/utils';
 export var getSelectedNode = function getSelectedNode(selection) {
   if (selection instanceof NodeSelection) {
     return {
@@ -51,56 +49,6 @@ export var getTargetNodeTypeNameInContext = function getTargetNodeTypeNameInCont
   }
   return nodeTypeName;
 };
-
-/**
- * Use common expandToBlockRange function to get the correct range for the selection
- * For example, if selection starts in a listItem, go find the bullet list or ordered list, their $from
- * @param selection
- * @param schema
- * @returns
- */
-export var expandSelectionToBlockRange = function expandSelectionToBlockRange(selection, schema) {
-  var nodes = schema.nodes;
-  var nodesNeedToExpandRange = [nodes.bulletList, nodes.orderedList, nodes.taskList, nodes.listItem, nodes.taskItem];
-
-  // when adding nodes.tableRow, tableHeader, tableCell in nodesNeedToExpandRang,
-  // expandToBlockRange does not return expected table start position, sometimes even freeze editor
-  // so handle table in the below logic
-  if (isTableSelected(selection)) {
-    var table = findTable(selection);
-    if (table) {
-      var $from = selection.$from.doc.resolve(table.pos);
-      var $to = selection.$from.doc.resolve(table.pos + table.node.nodeSize - 1);
-      return {
-        $from: $from,
-        $to: $to,
-        range: $from.blockRange($to)
-      };
-    }
-  }
-
-  // when selecting a file, selection is on media
-  // need to find media group and return its pos
-  if (selection instanceof NodeSelection) {
-    if (selection.node.type === nodes.media) {
-      var mediaGroup = findParentNodeOfType(nodes.mediaGroup)(selection);
-      if (mediaGroup) {
-        var _$from = selection.$from.doc.resolve(mediaGroup.pos);
-        var _$to = selection.$from.doc.resolve(mediaGroup.pos + mediaGroup.node.nodeSize);
-        return {
-          $from: _$from,
-          $to: _$to
-        };
-      }
-    }
-  }
-  return expandToBlockRange(selection.$from, selection.$to, function (node) {
-    if (nodesNeedToExpandRange.includes(node.type)) {
-      return false;
-    }
-    return true;
-  });
-};
 export var isListType = function isListType(node, schema) {
   var lists = [schema.nodes.taskList, schema.nodes.bulletList, schema.nodes.orderedList];
   return lists.some(function (list) {

package/dist/esm/editor-commands/transformNode.js

@@ -1,8 +1,8 @@
+import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { isNestedNode } from '../ui/utils/isNestedNode';
 import { getOutputNodes } from './transform-node-utils/transform';
-import { expandSelectionToBlockRange } from './transform-node-utils/utils';
 import { isListNode } from './transforms/utils';
 export var transformNode = function transformNode(api) {
   return (
@@ -17,7 +17,7 @@ export var transformNode = function transformNode(api) {
         }
         var schema = tr.doc.type.schema;
         var nodes = schema.nodes;
-        var _expandSelectionToBlo = expandSelectionToBlockRange(preservedSelection, schema),
+        var _expandSelectionToBlo = expandSelectionToBlockRange(preservedSelection),
           $from = _expandSelectionToBlo.$from,
           $to = _expandSelectionToBlo.$to;
         var isNested = isNestedNode(preservedSelection, '');

package/dist/esm/ui/copy-link.js

@@ -22,24 +22,21 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
   var _ref2 = config || {},
     getLinkPath = _ref2.getLinkPath,
     blockLinkHashPrefix = _ref2.blockLinkHashPrefix;
-  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['blockControls', 'selection', 'core'], function (_ref3) {
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['blockControls', 'selection'], function (_ref3) {
       var blockControlsState = _ref3.blockControlsState,
-        selectionState = _ref3.selectionState,
-        coreState = _ref3.coreState;
+        selectionState = _ref3.selectionState;
       return {
         menuTriggerBy: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.menuTriggerBy,
         preservedSelection: blockControlsState === null || blockControlsState === void 0 ? void 0 : blockControlsState.preservedSelection,
-        defaultSelection: selectionState === null || selectionState === void 0 ? void 0 : selectionState.selection,
-        schema: coreState === null || coreState === void 0 ? void 0 : coreState.schema
+        defaultSelection: selectionState === null || selectionState === void 0 ? void 0 : selectionState.selection
       };
     }),
     preservedSelection = _useSharedPluginState.preservedSelection,
     defaultSelection = _useSharedPluginState.defaultSelection,
-    menuTriggerBy = _useSharedPluginState.menuTriggerBy,
-    schema = _useSharedPluginState.schema;
+    menuTriggerBy = _useSharedPluginState.menuTriggerBy;
   var selection = preservedSelection || defaultSelection;
   var handleClick = useCallback(function () {
-    if (!selection || !schema) {
+    if (!selection) {
       return;
     }
     api === null || api === void 0 || api.core.actions.execute(function (_ref4) {
@@ -65,8 +62,7 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
     copyLink({
       getLinkPath: getLinkPath,
       blockLinkHashPrefix: blockLinkHashPrefix,
-      selection: selection,
-      schema: schema
+      selection: selection
     }).then(function (success) {
       if (success) {
         api === null || api === void 0 || api.core.actions.execute(function (_ref5) {
@@ -78,7 +74,7 @@ var CopyLinkDropdownItemContent = function CopyLinkDropdownItemContent(_ref) {
         });
       }
     });
-  }, [api, blockLinkHashPrefix, getLinkPath, onDropdownOpenChanged, schema, selection]);
+  }, [api, blockLinkHashPrefix, getLinkPath, onDropdownOpenChanged, selection]);
 
   // Hide copy link when `platform_editor_adf_with_localid` feature flag is off or when the node is nested or on empty line
   if (!fg('platform_editor_adf_with_localid') || !!menuTriggerBy && isNestedNode(selection, menuTriggerBy) || selection !== null && selection !== void 0 && selection.empty) {

package/dist/esm/ui/hooks/useSuggestedItems.js

@@ -1,6 +1,7 @@
 import { useMemo } from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { getBlockNodesInRange, expandSelectionToBlockRange } from '../../editor-commands/transform-node-utils/utils';
+import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
+import { getBlockNodesInRange } from '../../editor-commands/transform-node-utils/utils';
 import { getSortedSuggestedItems } from '../utils/suggested-items-rank';
 export var useSuggestedItems = function useSuggestedItems(api) {
   var _api$blockMenu;
@@ -29,17 +30,23 @@ export var useSuggestedItems = function useSuggestedItems(api) {
     if (menuItemsMap.size === 0 || !currentSelection) {
       return [];
     }
-    var _expandSelectionToBlo = expandSelectionToBlockRange(currentSelection, currentSelection.$from.doc.type.schema),
+    var _expandSelectionToBlo = expandSelectionToBlockRange(currentSelection),
       range = _expandSelectionToBlo.range;
     if (!range) {
       return [];
     }
     var blockNodes = getBlockNodesInRange(range);
-    var singleNode = blockNodes.length === 1 ? blockNodes[0] : undefined;
-    if (!singleNode) {
+    if (blockNodes.length === 0) {
       return [];
     }
-    var nodeTypeName = singleNode.type.name;
+    var firstNodeType = blockNodes[0].type.name;
+    var allSameType = blockNodes.every(function (node) {
+      return node.type.name === firstNodeType;
+    });
+    if (!allSameType) {
+      return [];
+    }
+    var nodeTypeName = firstNodeType;
     var sortedKeys = getSortedSuggestedItems(nodeTypeName);
     return sortedKeys.map(function (key) {
       return menuItemsMap.get(key);

package/dist/esm/ui/utils/copyLink.js

@@ -3,15 +3,15 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { createBlockLinkHashValue, DEFAULT_BLOCK_LINK_HASH_PREFIX } from '@atlaskit/editor-common/block-menu';
 import { copyToClipboard } from '@atlaskit/editor-common/clipboard';
 import { logException } from '@atlaskit/editor-common/monitoring';
-import { expandSelectionToBlockRange } from '../../editor-commands/transform-node-utils/utils';
+import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
 export var copyLink = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref) {
-    var getLinkPath, _ref$blockLinkHashPre, blockLinkHashPrefix, selection, schema, blockRange, node, path, url, href;
+    var getLinkPath, _ref$blockLinkHashPre, blockLinkHashPrefix, selection, blockRange, node, path, url, href;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          getLinkPath = _ref.getLinkPath, _ref$blockLinkHashPre = _ref.blockLinkHashPrefix, blockLinkHashPrefix = _ref$blockLinkHashPre === void 0 ? DEFAULT_BLOCK_LINK_HASH_PREFIX : _ref$blockLinkHashPre, selection = _ref.selection, schema = _ref.schema;
-          blockRange = expandSelectionToBlockRange(selection, schema);
+          getLinkPath = _ref.getLinkPath, _ref$blockLinkHashPre = _ref.blockLinkHashPrefix, blockLinkHashPrefix = _ref$blockLinkHashPre === void 0 ? DEFAULT_BLOCK_LINK_HASH_PREFIX : _ref$blockLinkHashPre, selection = _ref.selection;
+          blockRange = expandSelectionToBlockRange(selection);
           if (blockRange) {
             _context.next = 4;
             break;

package/dist/esm/ui/utils/suggested-items-rank.js

@@ -37,7 +37,7 @@ export var BLOCK_MENU_NODE_TYPES = {
   EMBED_CARD: 'embedCard',
   TABLE: 'table'
 };
-export var TRANSFORM_SUGGESTED_ITEMS_RANK = (_TRANSFORM_SUGGESTED_ = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_TRANSFORM_SUGGESTED_, BLOCK_MENU_NODE_TYPES.PARAGRAPH, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), TRANSFORM_HEADINGS_H1_MENU_ITEM.key, 200), TRANSFORM_HEADINGS_H2_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.EXPAND, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.BLOCKQUOTE, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.LAYOUT_SECTION, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.PANEL, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_CODE_BLOCK_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.CODE_BLOCK, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.DECISION, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.BULLET_LIST, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_NUMBERED_LIST_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.ORDERED_LIST, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_TASK_LIST_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_BULLETED_LIST_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.HEADING, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_BULLETED_LIST_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 300)), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_TRANSFORM_SUGGESTED_, BLOCK_MENU_NODE_TYPES.TASK_LIST, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_NUMBERED_LIST_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_BULLETED_LIST_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.MEDIA_SINGLE, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.EXTENSION, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.BODIED_EXTENSION, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 300)));
+export var TRANSFORM_SUGGESTED_ITEMS_RANK = (_TRANSFORM_SUGGESTED_ = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_TRANSFORM_SUGGESTED_, BLOCK_MENU_NODE_TYPES.PARAGRAPH, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), TRANSFORM_HEADINGS_H1_MENU_ITEM.key, 200), TRANSFORM_HEADINGS_H2_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.EXPAND, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.BLOCKQUOTE, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.LAYOUT_SECTION, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.PANEL, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_CODE_BLOCK_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.CODE_BLOCK, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.DECISION, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.BULLET_LIST, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_NUMBERED_LIST_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.ORDERED_LIST, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_TASK_LIST_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_BULLETED_LIST_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.HEADING, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_PARAGRAPH_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_BULLETED_LIST_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 300)), _defineProperty(_defineProperty(_defineProperty(_TRANSFORM_SUGGESTED_, BLOCK_MENU_NODE_TYPES.TASK_LIST, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_NUMBERED_LIST_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_BULLETED_LIST_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.MEDIA_SINGLE, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_QUOTE_MENU_ITEM.key, 300)), BLOCK_MENU_NODE_TYPES.EXTENSION, _defineProperty(_defineProperty(_defineProperty({}, TRANSFORM_STRUCTURE_EXPAND_MENU_ITEM.key, 100), TRANSFORM_STRUCTURE_PANEL_MENU_ITEM.key, 200), TRANSFORM_STRUCTURE_LAYOUT_MENU_ITEM.key, 300)));
 export var getSuggestedItemsForNodeType = function getSuggestedItemsForNodeType(nodeType) {
   return TRANSFORM_SUGGESTED_ITEMS_RANK[nodeType];
 };

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

@@ -1,25 +1,9 @@
-import type { Schema, Node as PMNode, NodeRange } from '@atlaskit/editor-prosemirror/model';
+import type { NodeRange, Node as PMNode, Schema } 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';
 export declare const getSelectedNode: (selection: Selection) => ContentNodeWithPos | undefined;
 export declare const getTargetNodeTypeNameInContext: (nodeTypeName: NodeTypeName | null, isNested?: boolean) => NodeTypeName | null;
-/**
- * Use common expandToBlockRange function to get the correct range for the selection
- * For example, if selection starts in a listItem, go find the bullet list or ordered list, their $from
- * @param selection
- * @param schema
- * @returns
- */
-export declare const expandSelectionToBlockRange: (selection: Selection, schema: Schema) => {
-    $from: import("prosemirror-model").ResolvedPos;
-    $to: import("prosemirror-model").ResolvedPos;
-    range: NodeRange | null;
-} | {
-    $from: import("prosemirror-model").ResolvedPos;
-    $to: import("prosemirror-model").ResolvedPos;
-    range?: undefined;
-};
 export declare const isListType: (node: PMNode, schema: Schema) => boolean;
 /**
  * Converts a nestedExpand to a regular expand node.

package/dist/types/ui/utils/copyLink.d.ts

@@ -1,10 +1,8 @@
-import type { Schema } from '@atlaskit/editor-prosemirror/model';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 type CopyLinkOptions = {
     blockLinkHashPrefix?: string;
     getLinkPath?: () => string | null;
-    schema: Schema;
     selection: Selection;
 };
-export declare const copyLink: ({ getLinkPath, blockLinkHashPrefix, selection, schema, }: CopyLinkOptions) => Promise<boolean>;
+export declare const copyLink: ({ getLinkPath, blockLinkHashPrefix, selection, }: CopyLinkOptions) => Promise<boolean>;
 export {};

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

@@ -1,25 +1,9 @@
-import type { Schema, Node as PMNode, NodeRange } from '@atlaskit/editor-prosemirror/model';
+import type { NodeRange, Node as PMNode, Schema } 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';
 export declare const getSelectedNode: (selection: Selection) => ContentNodeWithPos | undefined;
 export declare const getTargetNodeTypeNameInContext: (nodeTypeName: NodeTypeName | null, isNested?: boolean) => NodeTypeName | null;
-/**
- * Use common expandToBlockRange function to get the correct range for the selection
- * For example, if selection starts in a listItem, go find the bullet list or ordered list, their $from
- * @param selection
- * @param schema
- * @returns
- */
-export declare const expandSelectionToBlockRange: (selection: Selection, schema: Schema) => {
-    $from: import("prosemirror-model").ResolvedPos;
-    $to: import("prosemirror-model").ResolvedPos;
-    range: NodeRange | null;
-} | {
-    $from: import("prosemirror-model").ResolvedPos;
-    $to: import("prosemirror-model").ResolvedPos;
-    range?: undefined;
-};
 export declare const isListType: (node: PMNode, schema: Schema) => boolean;
 /**
  * Converts a nestedExpand to a regular expand node.

package/dist/types-ts4.5/ui/utils/copyLink.d.ts

@@ -1,10 +1,8 @@
-import type { Schema } from '@atlaskit/editor-prosemirror/model';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 type CopyLinkOptions = {
     blockLinkHashPrefix?: string;
     getLinkPath?: () => string | null;
-    schema: Schema;
     selection: Selection;
 };
-export declare const copyLink: ({ getLinkPath, blockLinkHashPrefix, selection, schema, }: CopyLinkOptions) => Promise<boolean>;
+export declare const copyLink: ({ getLinkPath, blockLinkHashPrefix, selection, }: CopyLinkOptions) => Promise<boolean>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "5.2.12",
+	"version": "5.2.13",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",