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

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @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
+
+- [`b3c4249a34e4b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b3c4249a34e4b) -
+  EDITOR-3880 Improve block menu rendering to support infinite nesting
+
 ## 5.2.11
 
 ### 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/block-menu-renderer/BlockMenuComponent.js

@@ -0,0 +1,37 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BlockMenuComponent = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _BlockMenuComponents = require("./BlockMenuComponents");
+var _utils = require("./utils");
+/**
+ * Renders the given registered component based on its type
+ */
+var BlockMenuComponent = exports.BlockMenuComponent = function BlockMenuComponent(_ref) {
+  var registeredComponent = _ref.registeredComponent,
+    childrenMap = _ref.childrenMap,
+    fallbacks = _ref.fallbacks;
+  if (registeredComponent.type === 'block-menu-item') {
+    var ItemComponent = registeredComponent.component || fallbacks['block-menu-item'];
+    return /*#__PURE__*/_react.default.createElement(ItemComponent, {
+      key: registeredComponent.key
+    });
+  }
+  if (!(0, _utils.willComponentRender)(registeredComponent, childrenMap)) {
+    return null;
+  }
+  var ParentComponent = registeredComponent.component || fallbacks[registeredComponent.type];
+  var childrenMapKey = (0, _utils.getChildrenMapKey)(registeredComponent.key, registeredComponent.type);
+  var registeredComponents = childrenMap.get(childrenMapKey);
+  return /*#__PURE__*/_react.default.createElement(ParentComponent, {
+    key: registeredComponent.key
+  }, /*#__PURE__*/_react.default.createElement(_BlockMenuComponents.BlockMenuComponents, {
+    registeredComponents: registeredComponents,
+    childrenMap: childrenMap,
+    fallbacks: fallbacks
+  }));
+};

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

@@ -0,0 +1,29 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BlockMenuComponents = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _BlockMenuComponent = require("./BlockMenuComponent");
+/**
+ * Renders the given registered components
+ * Returns null if no components are rendered
+ */
+var BlockMenuComponents = exports.BlockMenuComponents = function BlockMenuComponents(_ref) {
+  var registeredComponents = _ref.registeredComponents,
+    childrenMap = _ref.childrenMap,
+    fallbacks = _ref.fallbacks;
+  if (!(registeredComponents !== null && registeredComponents !== void 0 && registeredComponents.length)) {
+    return null;
+  }
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, registeredComponents.map(function (registeredComponent) {
+    return /*#__PURE__*/_react.default.createElement(_BlockMenuComponent.BlockMenuComponent, {
+      key: registeredComponent.key,
+      registeredComponent: registeredComponent,
+      childrenMap: childrenMap,
+      fallbacks: fallbacks
+    });
+  }));
+};

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

@@ -0,0 +1,33 @@
+"use strict";
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BlockMenuRenderer = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _BlockMenuComponents = require("./BlockMenuComponents");
+var _fallbacks = require("./fallbacks");
+var _utils = require("./utils");
+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); }
+/**
+ * BlockMenuRenderer orchestrates the rendering of the entire block menu hierarchy
+ */
+var BlockMenuRenderer = exports.BlockMenuRenderer = function BlockMenuRenderer(_ref) {
+  var allRegisteredComponents = _ref.allRegisteredComponents,
+    _ref$fallbacks = _ref.fallbacks,
+    fallbacks = _ref$fallbacks === void 0 ? _fallbacks.BLOCK_MENU_FALLBACKS : _ref$fallbacks;
+  var _useMemo = (0, _react.useMemo)(function () {
+      return {
+        childrenMap: (0, _utils.buildChildrenMap)(allRegisteredComponents),
+        topLevelSections: (0, _utils.getSortedTopLevelSections)(allRegisteredComponents)
+      };
+    }, [allRegisteredComponents]),
+    childrenMap = _useMemo.childrenMap,
+    topLevelSections = _useMemo.topLevelSections;
+  return /*#__PURE__*/_react.default.createElement(_BlockMenuComponents.BlockMenuComponents, {
+    registeredComponents: topLevelSections,
+    childrenMap: childrenMap,
+    fallbacks: fallbacks
+  });
+};

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

@@ -0,0 +1,32 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BLOCK_MENU_FALLBACKS = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/core/chevron-right"));
+var BLOCK_MENU_FALLBACKS = exports.BLOCK_MENU_FALLBACKS = {
+  'block-menu-nested': function blockMenuNested(_ref) {
+    var children = _ref.children;
+    return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarNestedDropdownMenu, {
+      elemBefore: undefined,
+      elemAfter: /*#__PURE__*/_react.default.createElement(_chevronRight.default, {
+        label: ""
+      }),
+      text: "Nested Menu",
+      enableMaxHeight: true,
+      shouldFitContainer: true
+    }, children);
+  },
+  'block-menu-section': function blockMenuSection(_ref2) {
+    var children = _ref2.children;
+    return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, null, children);
+  },
+  // eslint-disable-next-line @atlassian/i18n/no-literal-string-in-jsx
+  'block-menu-item': function blockMenuItem() {
+    return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, null, "Block Menu Item");
+  }
+};

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

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -0,0 +1,127 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.willComponentRender = exports.getSortedTopLevelSections = exports.getChildrenMapKey = exports.buildChildrenMap = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+/**
+ * Type guard to check if a component has a parent
+ *
+ * @param component The block menu component to check
+ * @returns True if the component has a parent, false otherwise
+ */
+var hasParent = function hasParent(component) {
+  return 'parent' in component && !!component.parent;
+};
+
+/**
+ * Type guard to identify top-level sections (sections without a parent)
+ *
+ * @param component The block menu component to check
+ * @returns True if the component is a top-level section, false otherwise
+ */
+var isTopLevelSection = function isTopLevelSection(component) {
+  return component.type === 'block-menu-section' && !hasParent(component);
+};
+
+/**
+ * Gets all top-level sections (those without a parent) sorted by rank
+ *
+ * @param components All registered block menu components
+ * @returns Sorted array of top-level sections
+ */
+var getSortedTopLevelSections = exports.getSortedTopLevelSections = function getSortedTopLevelSections(components) {
+  return components.filter(isTopLevelSection).sort(function (a, b) {
+    return (a.rank || 0) - (b.rank || 0);
+  });
+};
+
+/**
+ * Generates a unique key from a key and type
+ * Used to lookup children in the childrenMap
+ *
+ * @param key The component's key
+ * @param type The component's type
+ * @returns A unique string key combining type and key
+ */
+var getChildrenMapKey = exports.getChildrenMapKey = function getChildrenMapKey(key, type) {
+  return "".concat(type, ":").concat(key);
+};
+
+/**
+ * Builds a map of parent keys to their sorted children
+ * This enables efficient hierarchical rendering of the menu structure
+ *
+ * @param components All registered block menu components
+ * @returns Map where keys are parent identifiers and values are sorted child components
+ */
+var buildChildrenMap = exports.buildChildrenMap = function buildChildrenMap(components) {
+  var childrenMap = new Map();
+  var _iterator = _createForOfIteratorHelper(components),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var component = _step.value;
+      // Only components with parents can be children
+      if ('parent' in component && !!component.parent) {
+        var childrenMapKey = getChildrenMapKey(component.parent.key, component.parent.type);
+        var existing = childrenMap.get(childrenMapKey) || [];
+        existing.push(component);
+        childrenMap.set(childrenMapKey, existing);
+      }
+    }
+
+    // Sort children by their rank within their parent
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  var _iterator2 = _createForOfIteratorHelper(childrenMap.entries()),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var _step2$value = (0, _slicedToArray2.default)(_step2.value, 2),
+        children = _step2$value[1];
+      children.sort(function (a, b) {
+        var rankA = hasParent(a) ? a.parent.rank || 0 : 0;
+        var rankB = hasParent(b) ? b.parent.rank || 0 : 0;
+        return rankA - rankB;
+      });
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  return childrenMap;
+};
+
+/**
+ * Determines whether a component will render based on its type and children
+ *
+ * Rules:
+ * - An item will not render if has a component that returns null
+ * - A nested menu will render if it has at least one registered child component
+ * - A section will render if it has at least one registered child component that will render
+ *
+ * NOTE: This requires invoking each item's component function to check for null return
+ */
+var _willComponentRender = exports.willComponentRender = function willComponentRender(registeredComponent, childrenMap) {
+  if (registeredComponent.type === 'block-menu-item') {
+    return registeredComponent.component ? registeredComponent.component() !== null : true;
+  }
+  var childrenMapKey = getChildrenMapKey(registeredComponent.key, registeredComponent.type);
+  var registeredComponents = childrenMap.get(childrenMapKey) || [];
+  if (registeredComponent.type === 'block-menu-nested') {
+    return registeredComponents.length > 0;
+  }
+  return registeredComponents.some(function (childComponent) {
+    return _willComponentRender(childComponent, childrenMap);
+  });
+};

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

@@ -19,15 +19,15 @@ 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");
 var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _blockMenuProvider = require("./block-menu-provider");
-var _blockMenuRenderer = require("./block-menu-renderer");
+var _BlockMenuRenderer = require("./block-menu-renderer/BlockMenuRenderer");
 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 styles = {
   base: "_2rko12b0 _bfhk1bhr _16qs130s",
@@ -120,24 +120,11 @@ var BlockMenuContent = function BlockMenuContent(_ref3) {
     testId: "editor-block-menu",
     ref: ref,
     xcss: (0, _css.cx)(styles.base, (0, _experiments.editorExperiment)('platform_synced_block', true) && styles.emptyMenuSectionStyles)
-  }, /*#__PURE__*/_react.default.createElement(_blockMenuRenderer.BlockMenuRenderer, {
-    components: blockMenuComponents || [],
-    fallbacks: {
-      nestedMenu: function nestedMenu() {
-        return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarNestedDropdownMenu, {
-          elemBefore: undefined,
-          elemAfter: undefined
-        }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, null, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, null, "Block Menu Item")));
-      },
-      section: function section() {
-        return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, null, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, null, "Block Menu Item"));
-      },
-      // eslint-disable-next-line @atlassian/i18n/no-literal-string-in-jsx
-      item: function item() {
-        return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, null, "Block Menu Item");
-      }
-    }
-  }));
+  }, /*#__PURE__*/_react.default.createElement(_uiMenu.ArrowKeyNavigationProvider, {
+    type: _uiMenu.ArrowKeyNavigationType.MENU
+  }, /*#__PURE__*/_react.default.createElement(_BlockMenuRenderer.BlockMenuRenderer, {
+    allRegisteredComponents: blockMenuComponents || []
+  })));
 };
 var BlockMenu = function BlockMenu(_ref4) {
   var _editorView$dom, _ref5;

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) => {