@atlaskit/editor-plugin-block-menu 6.0.10 → 6.0.12

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 6.0.12
+
+### Patch Changes
+
+- [`b909e5f47ea91`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b909e5f47ea91) -
+  EDITOR-4159 Make sure block-menu-item type component return null when tranform disabled
+- Updated dependencies
+
+## 6.0.11
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 6.0.10
 
 ### Patch Changes

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

@@ -155,18 +155,7 @@ var wrapMixedContentStep = exports.wrapMixedContentStep = function wrapMixedCont
     (_currentContainerCont = currentContainerContent).push.apply(_currentContainerCont, (0, _toConsumableArray2.default)((0, _marks.removeDisallowedMarks)([node], validationType)));
   };
   var handleCodeblockTextNode = function handleCodeblockTextNode(node) {
-    // Split the text node into text parts and incompatible inline nodes
-    var parts = (0, _utils.splitTextNodeForCodeBlock)(node, schema);
-    parts.forEach(function (part) {
-      if (typeof part === 'string') {
-        // Text content - add to current codeBlock
-        currentContainerContent.push(part);
-      } else {
-        // Incompatible inline node wrapped in paragraph - break it out
-        flushCurrentContainer();
-        result.push(part);
-      }
-    });
+    currentContainerContent.push((0, _utils.createTextContent)(node));
   };
   var handleConvertibleTextNode = function handleConvertibleTextNode(node) {
     var paragraph = (0, _utils.convertTextNodeToParagraph)(node, schema);

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.splitTextNodeForCodeBlock = exports.isTextNode = exports.getTargetNodeTypeNameInContext = exports.getSelectedNode = exports.getBlockNodesInRange = exports.convertTextNodeToParagraph = exports.convertNestedExpandToExpand = exports.convertExpandToNestedExpand = void 0;
+exports.isTextNode = exports.getTargetNodeTypeNameInContext = exports.getSelectedNode = exports.getBlockNodesInRange = exports.createTextContent = exports.convertTextNodeToParagraph = 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");
@@ -131,42 +131,20 @@ var getBlockNodesInRange = exports.getBlockNodesInRange = function getBlockNodes
 };
 
 /**
- * Splits a text node (paragraph/heading) into parts for codeBlock conversion.
- * Returns an array of:
- * - strings (text content that can go into codeBlock)
- * - PMNodes (incompatible inline nodes wrapped in paragraphs that need to break out)
+ * Iterates over a nodes children and extracting text content, removing all other inline content and converting
+ * hardbreaks to newlines.
  *
- * This preserves inline nodes (like status, inlineExtension) that cannot be represented as plain text.
- *
- * @param node - The text node (paragraph or heading) to split
- * @param schema - The schema to use for creating paragraph nodes
- * @returns Array of strings (for codeBlock) and PMNodes (to break out)
+ * @param node - The node to create text content from (should be paragraph)
+ * @returns The text content string.
  */
-var splitTextNodeForCodeBlock = exports.splitTextNodeForCodeBlock = function splitTextNodeForCodeBlock(node, schema) {
-  var result = [];
-  var currentText = '';
-  node.content.forEach(function (child) {
+var createTextContent = exports.createTextContent = function createTextContent(node) {
+  var textContent = node.children.map(function (child) {
     if (child.isText) {
-      currentText += child.text || '';
+      return child.text;
     } else if (child.type.name === 'hardBreak') {
-      currentText += '\n';
-    } else {
-      // Incompatible inline node (status, inlineExtension, etc.)
-      // Flush accumulated text if any
-      if (currentText) {
-        result.push(currentText);
-        currentText = '';
-      }
-      // Wrap the inline node in a paragraph and add it to break out
-      var paragraph = schema.nodes.paragraph.create({}, child);
-      result.push(paragraph);
+      return '\n';
     }
+    return '';
   });
-
-  // Don't forget remaining text (or empty string for empty nodes)
-  // Always push at least an empty string so empty paragraphs create empty codeBlocks
-  if (currentText || result.length === 0) {
-    result.push(currentText);
-  }
-  return result;
+  return textContent.join('');
 };

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

@@ -19,6 +19,8 @@ var _moveDown = require("./move-down");
 var _moveUp = require("./move-up");
 var _suggestedItemsMenuSection = require("./suggested-items-menu-section");
 var _suggestedMenuItems = require("./suggested-menu-items");
+var _createMenuItemsMap = require("./utils/createMenuItemsMap");
+var _getSuggestedItemsFromSelection = require("./utils/getSuggestedItemsFromSelection");
 var getMoveUpMoveDownMenuComponents = function getMoveUpMoveDownMenuComponents(api) {
   return [{
     type: 'block-menu-item',
@@ -95,6 +97,16 @@ var getTurnIntoMenuComponents = function getTurnIntoMenuComponents(api) {
       return /*#__PURE__*/_react.default.createElement(_suggestedMenuItems.SuggestedMenuItems, {
         api: api
       });
+    },
+    isHidden: function isHidden() {
+      var _api$blockMenu, _api$selection, _api$blockControls;
+      var blockMenuComponents = api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.actions.getBlockMenuComponents();
+      var menuItemsMap = (0, _createMenuItemsMap.createMenuItemsMap)(blockMenuComponents);
+      var selection = api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.sharedState.currentState()) === null || _api$selection === void 0 ? void 0 : _api$selection.selection;
+      var preservedSelection = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.sharedState.currentState()) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.preservedSelection;
+      var currentSelection = preservedSelection || selection;
+      var suggestedItems = (0, _getSuggestedItemsFromSelection.getSuggestedItemsFromSelection)(menuItemsMap, currentSelection);
+      return suggestedItems.length === 0;
     }
   }, {
     type: 'block-menu-section',

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

@@ -15,15 +15,15 @@ var BlockMenuComponent = exports.BlockMenuComponent = function BlockMenuComponen
   var registeredComponent = _ref.registeredComponent,
     childrenMap = _ref.childrenMap,
     fallbacks = _ref.fallbacks;
+  if (!(0, _utils.willComponentRender)(registeredComponent, childrenMap)) {
+    return null;
+  }
   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);

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

@@ -106,21 +106,18 @@ var buildChildrenMap = exports.buildChildrenMap = function buildChildrenMap(comp
  * 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
+ * - An item will not render if it has isHidden that returns true OR if its component returns null (fallback)
+ * - A nested menu will render if at least one section, that has at least one registered child
  * - 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 _registeredComponent$;
+    return !(registeredComponent !== null && registeredComponent !== void 0 && (_registeredComponent$ = registeredComponent.isHidden) !== null && _registeredComponent$ !== void 0 && _registeredComponent$.call(registeredComponent));
   }
   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/hooks/useSuggestedItems.js

@@ -6,9 +6,8 @@ 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 _createMenuItemsMap = require("../utils/createMenuItemsMap");
+var _getSuggestedItemsFromSelection = require("../utils/getSuggestedItemsFromSelection");
 var useSuggestedItems = exports.useSuggestedItems = function useSuggestedItems(api) {
   var _api$blockMenu;
   var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['blockControls', 'selection'], function (states) {
@@ -22,43 +21,11 @@ var useSuggestedItems = exports.useSuggestedItems = function useSuggestedItems(a
     selection = _useSharedPluginState.selection;
   var blockMenuComponents = api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.actions.getBlockMenuComponents();
   var menuItemsMap = (0, _react.useMemo)(function () {
-    if (!blockMenuComponents) {
-      return new Map();
-    }
-    return new Map(blockMenuComponents.filter(function (c) {
-      return c.type === 'block-menu-item';
-    }).map(function (item) {
-      return [item.key, item];
-    }));
+    return (0, _createMenuItemsMap.createMenuItemsMap)(blockMenuComponents);
   }, [blockMenuComponents]);
   var suggestedItems = (0, _react.useMemo)(function () {
     var currentSelection = preservedSelection || selection;
-    if (menuItemsMap.size === 0 || !currentSelection) {
-      return [];
-    }
-    var _expandSelectionToBlo = (0, _selection.expandSelectionToBlockRange)(currentSelection),
-      range = _expandSelectionToBlo.range;
-    if (!range) {
-      return [];
-    }
-    var blockNodes = (0, _utils.getBlockNodesInRange)(range);
-    if (blockNodes.length === 0) {
-      return [];
-    }
-    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);
-    }).filter(function (item) {
-      return item !== undefined;
-    });
+    return (0, _getSuggestedItemsFromSelection.getSuggestedItemsFromSelection)(menuItemsMap, currentSelection);
   }, [menuItemsMap, preservedSelection, selection]);
   return suggestedItems;
 };

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

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createMenuItemsMap = void 0;
+/**
+ * Helper function to create menu items map from block menu components.
+ */
+var createMenuItemsMap = exports.createMenuItemsMap = function createMenuItemsMap(blockMenuComponents) {
+  if (!blockMenuComponents) {
+    return new Map();
+  }
+  return new Map(blockMenuComponents.filter(function (c) {
+    return c.type === 'block-menu-item';
+  }).map(function (item) {
+    return [item.key, item];
+  }));
+};

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

@@ -0,0 +1,40 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getSuggestedItemsFromSelection = void 0;
+var _selection = require("@atlaskit/editor-common/selection");
+var _utils = require("../../editor-commands/transform-node-utils/utils");
+var _suggestedItemsRank = require("../utils/suggested-items-rank");
+/**
+ * Pure function to calculate suggested items based on selection and menu components.
+ */
+var getSuggestedItemsFromSelection = exports.getSuggestedItemsFromSelection = function getSuggestedItemsFromSelection(menuItemsMap, currentSelection) {
+  if (menuItemsMap.size === 0 || !currentSelection) {
+    return [];
+  }
+  var _expandSelectionToBlo = (0, _selection.expandSelectionToBlockRange)(currentSelection),
+    range = _expandSelectionToBlo.range;
+  if (!range) {
+    return [];
+  }
+  var blockNodes = (0, _utils.getBlockNodesInRange)(range);
+  if (blockNodes.length === 0) {
+    return [];
+  }
+  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);
+  }).filter(function (item) {
+    return item !== undefined;
+  });
+};

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

@@ -1,7 +1,7 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { removeDisallowedMarks } from '../marks';
 import { NODE_CATEGORY_BY_TYPE } from '../types';
-import { convertTextNodeToParagraph, isTextNode, splitTextNodeForCodeBlock } from '../utils';
+import { convertTextNodeToParagraph, createTextContent, isTextNode } from '../utils';
 
 /**
  * Creates a layout section with two columns, where the first column contains the provided content.
@@ -150,18 +150,7 @@ export const wrapMixedContentStep = (nodes, context) => {
     currentContainerContent.push(...removeDisallowedMarks([node], validationType));
   };
   const handleCodeblockTextNode = node => {
-    // Split the text node into text parts and incompatible inline nodes
-    const parts = splitTextNodeForCodeBlock(node, schema);
-    parts.forEach(part => {
-      if (typeof part === 'string') {
-        // Text content - add to current codeBlock
-        currentContainerContent.push(part);
-      } else {
-        // Incompatible inline node wrapped in paragraph - break it out
-        flushCurrentContainer();
-        result.push(part);
-      }
-    });
+    currentContainerContent.push(createTextContent(node));
   };
   const handleConvertibleTextNode = node => {
     const paragraph = convertTextNodeToParagraph(node, schema);

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

@@ -127,42 +127,20 @@ export const getBlockNodesInRange = range => {
 };
 
 /**
- * Splits a text node (paragraph/heading) into parts for codeBlock conversion.
- * Returns an array of:
- * - strings (text content that can go into codeBlock)
- * - PMNodes (incompatible inline nodes wrapped in paragraphs that need to break out)
+ * Iterates over a nodes children and extracting text content, removing all other inline content and converting
+ * hardbreaks to newlines.
  *
- * This preserves inline nodes (like status, inlineExtension) that cannot be represented as plain text.
- *
- * @param node - The text node (paragraph or heading) to split
- * @param schema - The schema to use for creating paragraph nodes
- * @returns Array of strings (for codeBlock) and PMNodes (to break out)
+ * @param node - The node to create text content from (should be paragraph)
+ * @returns The text content string.
  */
-export const splitTextNodeForCodeBlock = (node, schema) => {
-  const result = [];
-  let currentText = '';
-  node.content.forEach(child => {
+export const createTextContent = node => {
+  const textContent = node.children.map(child => {
     if (child.isText) {
-      currentText += child.text || '';
+      return child.text;
     } else if (child.type.name === 'hardBreak') {
-      currentText += '\n';
-    } else {
-      // Incompatible inline node (status, inlineExtension, etc.)
-      // Flush accumulated text if any
-      if (currentText) {
-        result.push(currentText);
-        currentText = '';
-      }
-      // Wrap the inline node in a paragraph and add it to break out
-      const paragraph = schema.nodes.paragraph.create({}, child);
-      result.push(paragraph);
+      return '\n';
     }
+    return '';
   });
-
-  // Don't forget remaining text (or empty string for empty nodes)
-  // Always push at least an empty string so empty paragraphs create empty codeBlocks
-  if (currentText || result.length === 0) {
-    result.push(currentText);
-  }
-  return result;
+  return textContent.join('');
 };

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

@@ -11,6 +11,8 @@ import { MoveDownDropdownItem } from './move-down';
 import { MoveUpDropdownItem } from './move-up';
 import { SuggestedItemsMenuSection } from './suggested-items-menu-section';
 import { SuggestedMenuItems } from './suggested-menu-items';
+import { createMenuItemsMap } from './utils/createMenuItemsMap';
+import { getSuggestedItemsFromSelection } from './utils/getSuggestedItemsFromSelection';
 const getMoveUpMoveDownMenuComponents = api => {
   return [{
     type: 'block-menu-item',
@@ -79,7 +81,17 @@ const getTurnIntoMenuComponents = api => {
     },
     component: () => /*#__PURE__*/React.createElement(SuggestedMenuItems, {
       api: api
-    })
+    }),
+    isHidden: () => {
+      var _api$blockMenu, _api$selection, _api$selection$shared, _api$blockControls, _api$blockControls$sh;
+      const blockMenuComponents = api === null || api === void 0 ? void 0 : (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.actions.getBlockMenuComponents();
+      const menuItemsMap = createMenuItemsMap(blockMenuComponents);
+      const selection = api === null || api === void 0 ? void 0 : (_api$selection = api.selection) === null || _api$selection === void 0 ? void 0 : (_api$selection$shared = _api$selection.sharedState.currentState()) === null || _api$selection$shared === void 0 ? void 0 : _api$selection$shared.selection;
+      const preservedSelection = api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : (_api$blockControls$sh = _api$blockControls.sharedState.currentState()) === null || _api$blockControls$sh === void 0 ? void 0 : _api$blockControls$sh.preservedSelection;
+      const currentSelection = preservedSelection || selection;
+      const suggestedItems = getSuggestedItemsFromSelection(menuItemsMap, currentSelection);
+      return suggestedItems.length === 0;
+    }
   }, {
     type: 'block-menu-section',
     key: TRANSFORM_CREATE_MENU_SECTION.key,

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

@@ -9,15 +9,15 @@ export const BlockMenuComponent = ({
   childrenMap,
   fallbacks
 }) => {
+  if (!willComponentRender(registeredComponent, childrenMap)) {
+    return null;
+  }
   if (registeredComponent.type === 'block-menu-item') {
     const ItemComponent = registeredComponent.component || fallbacks['block-menu-item'];
     return /*#__PURE__*/React.createElement(ItemComponent, {
       key: registeredComponent.key
     });
   }
-  if (!willComponentRender(registeredComponent, childrenMap)) {
-    return null;
-  }
   const ParentComponent = registeredComponent.component || fallbacks[registeredComponent.type];
   const childrenMapKey = getChildrenMapKey(registeredComponent.key, registeredComponent.type);
   const registeredComponents = childrenMap.get(childrenMapKey);

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

@@ -74,20 +74,17 @@ export const buildChildrenMap = components => {
  * 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
+ * - An item will not render if it has isHidden that returns true OR if its component returns null (fallback)
+ * - A nested menu will render if at least one section, that has at least one registered child
  * - 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
  */
 export const willComponentRender = (registeredComponent, childrenMap) => {
   if (registeredComponent.type === 'block-menu-item') {
-    return registeredComponent.component ? registeredComponent.component() !== null : true;
+    var _registeredComponent$;
+    return !(registeredComponent !== null && registeredComponent !== void 0 && (_registeredComponent$ = registeredComponent.isHidden) !== null && _registeredComponent$ !== void 0 && _registeredComponent$.call(registeredComponent));
   }
   const childrenMapKey = getChildrenMapKey(registeredComponent.key, registeredComponent.type);
   const registeredComponents = childrenMap.get(childrenMapKey) || [];
-  if (registeredComponent.type === 'block-menu-nested') {
-    return registeredComponents.length > 0;
-  }
   return registeredComponents.some(childComponent => willComponentRender(childComponent, childrenMap));
 };

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

@@ -1,8 +1,7 @@
 import { useMemo } from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
-import { getBlockNodesInRange } from '../../editor-commands/transform-node-utils/utils';
-import { getSortedSuggestedItems } from '../utils/suggested-items-rank';
+import { createMenuItemsMap } from '../utils/createMenuItemsMap';
+import { getSuggestedItemsFromSelection } from '../utils/getSuggestedItemsFromSelection';
 export const useSuggestedItems = api => {
   var _api$blockMenu;
   const {
@@ -17,34 +16,11 @@ export const useSuggestedItems = api => {
   });
   const blockMenuComponents = api === null || api === void 0 ? void 0 : (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.actions.getBlockMenuComponents();
   const menuItemsMap = useMemo(() => {
-    if (!blockMenuComponents) {
-      return new Map();
-    }
-    return new Map(blockMenuComponents.filter(c => c.type === 'block-menu-item').map(item => [item.key, item]));
+    return createMenuItemsMap(blockMenuComponents);
   }, [blockMenuComponents]);
   const suggestedItems = useMemo(() => {
     const currentSelection = preservedSelection || selection;
-    if (menuItemsMap.size === 0 || !currentSelection) {
-      return [];
-    }
-    const {
-      range
-    } = expandSelectionToBlockRange(currentSelection);
-    if (!range) {
-      return [];
-    }
-    const blockNodes = getBlockNodesInRange(range);
-    if (blockNodes.length === 0) {
-      return [];
-    }
-    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);
+    return getSuggestedItemsFromSelection(menuItemsMap, currentSelection);
   }, [menuItemsMap, preservedSelection, selection]);
   return suggestedItems;
 };

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

@@ -0,0 +1,9 @@
+/**
+ * Helper function to create menu items map from block menu components.
+ */
+export const createMenuItemsMap = blockMenuComponents => {
+  if (!blockMenuComponents) {
+    return new Map();
+  }
+  return new Map(blockMenuComponents.filter(c => c.type === 'block-menu-item').map(item => [item.key, item]));
+};

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

@@ -0,0 +1,30 @@
+import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
+import { getBlockNodesInRange } from '../../editor-commands/transform-node-utils/utils';
+import { getSortedSuggestedItems } from '../utils/suggested-items-rank';
+
+/**
+ * Pure function to calculate suggested items based on selection and menu components.
+ */
+export const getSuggestedItemsFromSelection = (menuItemsMap, currentSelection) => {
+  if (menuItemsMap.size === 0 || !currentSelection) {
+    return [];
+  }
+  const {
+    range
+  } = expandSelectionToBlockRange(currentSelection);
+  if (!range) {
+    return [];
+  }
+  const blockNodes = getBlockNodesInRange(range);
+  if (blockNodes.length === 0) {
+    return [];
+  }
+  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);
+};

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

@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { removeDisallowedMarks } from '../marks';
 import { NODE_CATEGORY_BY_TYPE } from '../types';
-import { convertTextNodeToParagraph, isTextNode, splitTextNodeForCodeBlock } from '../utils';
+import { convertTextNodeToParagraph, createTextContent, isTextNode } from '../utils';
 
 /**
  * Creates a layout section with two columns, where the first column contains the provided content.
@@ -149,18 +149,7 @@ export var wrapMixedContentStep = function wrapMixedContentStep(nodes, context)
     (_currentContainerCont = currentContainerContent).push.apply(_currentContainerCont, _toConsumableArray(removeDisallowedMarks([node], validationType)));
   };
   var handleCodeblockTextNode = function handleCodeblockTextNode(node) {
-    // Split the text node into text parts and incompatible inline nodes
-    var parts = splitTextNodeForCodeBlock(node, schema);
-    parts.forEach(function (part) {
-      if (typeof part === 'string') {
-        // Text content - add to current codeBlock
-        currentContainerContent.push(part);
-      } else {
-        // Incompatible inline node wrapped in paragraph - break it out
-        flushCurrentContainer();
-        result.push(part);
-      }
-    });
+    currentContainerContent.push(createTextContent(node));
   };
   var handleConvertibleTextNode = function handleConvertibleTextNode(node) {
     var paragraph = convertTextNodeToParagraph(node, schema);

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

@@ -126,42 +126,20 @@ export var getBlockNodesInRange = function getBlockNodesInRange(range) {
 };
 
 /**
- * Splits a text node (paragraph/heading) into parts for codeBlock conversion.
- * Returns an array of:
- * - strings (text content that can go into codeBlock)
- * - PMNodes (incompatible inline nodes wrapped in paragraphs that need to break out)
+ * Iterates over a nodes children and extracting text content, removing all other inline content and converting
+ * hardbreaks to newlines.
  *
- * This preserves inline nodes (like status, inlineExtension) that cannot be represented as plain text.
- *
- * @param node - The text node (paragraph or heading) to split
- * @param schema - The schema to use for creating paragraph nodes
- * @returns Array of strings (for codeBlock) and PMNodes (to break out)
+ * @param node - The node to create text content from (should be paragraph)
+ * @returns The text content string.
  */
-export var splitTextNodeForCodeBlock = function splitTextNodeForCodeBlock(node, schema) {
-  var result = [];
-  var currentText = '';
-  node.content.forEach(function (child) {
+export var createTextContent = function createTextContent(node) {
+  var textContent = node.children.map(function (child) {
     if (child.isText) {
-      currentText += child.text || '';
+      return child.text;
     } else if (child.type.name === 'hardBreak') {
-      currentText += '\n';
-    } else {
-      // Incompatible inline node (status, inlineExtension, etc.)
-      // Flush accumulated text if any
-      if (currentText) {
-        result.push(currentText);
-        currentText = '';
-      }
-      // Wrap the inline node in a paragraph and add it to break out
-      var paragraph = schema.nodes.paragraph.create({}, child);
-      result.push(paragraph);
+      return '\n';
     }
+    return '';
   });
-
-  // Don't forget remaining text (or empty string for empty nodes)
-  // Always push at least an empty string so empty paragraphs create empty codeBlocks
-  if (currentText || result.length === 0) {
-    result.push(currentText);
-  }
-  return result;
+  return textContent.join('');
 };

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

@@ -12,6 +12,8 @@ import { MoveDownDropdownItem } from './move-down';
 import { MoveUpDropdownItem } from './move-up';
 import { SuggestedItemsMenuSection } from './suggested-items-menu-section';
 import { SuggestedMenuItems } from './suggested-menu-items';
+import { createMenuItemsMap } from './utils/createMenuItemsMap';
+import { getSuggestedItemsFromSelection } from './utils/getSuggestedItemsFromSelection';
 var getMoveUpMoveDownMenuComponents = function getMoveUpMoveDownMenuComponents(api) {
   return [{
     type: 'block-menu-item',
@@ -88,6 +90,16 @@ var getTurnIntoMenuComponents = function getTurnIntoMenuComponents(api) {
       return /*#__PURE__*/React.createElement(SuggestedMenuItems, {
         api: api
       });
+    },
+    isHidden: function isHidden() {
+      var _api$blockMenu, _api$selection, _api$blockControls;
+      var blockMenuComponents = api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.actions.getBlockMenuComponents();
+      var menuItemsMap = createMenuItemsMap(blockMenuComponents);
+      var selection = api === null || api === void 0 || (_api$selection = api.selection) === null || _api$selection === void 0 || (_api$selection = _api$selection.sharedState.currentState()) === null || _api$selection === void 0 ? void 0 : _api$selection.selection;
+      var preservedSelection = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || (_api$blockControls = _api$blockControls.sharedState.currentState()) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.preservedSelection;
+      var currentSelection = preservedSelection || selection;
+      var suggestedItems = getSuggestedItemsFromSelection(menuItemsMap, currentSelection);
+      return suggestedItems.length === 0;
     }
   }, {
     type: 'block-menu-section',

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

@@ -8,15 +8,15 @@ export var BlockMenuComponent = function BlockMenuComponent(_ref) {
   var registeredComponent = _ref.registeredComponent,
     childrenMap = _ref.childrenMap,
     fallbacks = _ref.fallbacks;
+  if (!willComponentRender(registeredComponent, childrenMap)) {
+    return null;
+  }
   if (registeredComponent.type === 'block-menu-item') {
     var ItemComponent = registeredComponent.component || fallbacks['block-menu-item'];
     return /*#__PURE__*/React.createElement(ItemComponent, {
       key: registeredComponent.key
     });
   }
-  if (!willComponentRender(registeredComponent, childrenMap)) {
-    return null;
-  }
   var ParentComponent = registeredComponent.component || fallbacks[registeredComponent.type];
   var childrenMapKey = getChildrenMapKey(registeredComponent.key, registeredComponent.type);
   var registeredComponents = childrenMap.get(childrenMapKey);

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

@@ -99,21 +99,18 @@ export var buildChildrenMap = function buildChildrenMap(components) {
  * 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
+ * - An item will not render if it has isHidden that returns true OR if its component returns null (fallback)
+ * - A nested menu will render if at least one section, that has at least one registered child
  * - 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 = function willComponentRender(registeredComponent, childrenMap) {
   if (registeredComponent.type === 'block-menu-item') {
-    return registeredComponent.component ? registeredComponent.component() !== null : true;
+    var _registeredComponent$;
+    return !(registeredComponent !== null && registeredComponent !== void 0 && (_registeredComponent$ = registeredComponent.isHidden) !== null && _registeredComponent$ !== void 0 && _registeredComponent$.call(registeredComponent));
   }
   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/esm/ui/hooks/useSuggestedItems.js

@@ -1,8 +1,7 @@
 import { useMemo } from 'react';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
-import { getBlockNodesInRange } from '../../editor-commands/transform-node-utils/utils';
-import { getSortedSuggestedItems } from '../utils/suggested-items-rank';
+import { createMenuItemsMap } from '../utils/createMenuItemsMap';
+import { getSuggestedItemsFromSelection } from '../utils/getSuggestedItemsFromSelection';
 export var useSuggestedItems = function useSuggestedItems(api) {
   var _api$blockMenu;
   var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['blockControls', 'selection'], function (states) {
@@ -16,43 +15,11 @@ export var useSuggestedItems = function useSuggestedItems(api) {
     selection = _useSharedPluginState.selection;
   var blockMenuComponents = api === null || api === void 0 || (_api$blockMenu = api.blockMenu) === null || _api$blockMenu === void 0 ? void 0 : _api$blockMenu.actions.getBlockMenuComponents();
   var menuItemsMap = useMemo(function () {
-    if (!blockMenuComponents) {
-      return new Map();
-    }
-    return new Map(blockMenuComponents.filter(function (c) {
-      return c.type === 'block-menu-item';
-    }).map(function (item) {
-      return [item.key, item];
-    }));
+    return createMenuItemsMap(blockMenuComponents);
   }, [blockMenuComponents]);
   var suggestedItems = useMemo(function () {
     var currentSelection = preservedSelection || selection;
-    if (menuItemsMap.size === 0 || !currentSelection) {
-      return [];
-    }
-    var _expandSelectionToBlo = expandSelectionToBlockRange(currentSelection),
-      range = _expandSelectionToBlo.range;
-    if (!range) {
-      return [];
-    }
-    var blockNodes = getBlockNodesInRange(range);
-    if (blockNodes.length === 0) {
-      return [];
-    }
-    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);
-    }).filter(function (item) {
-      return item !== undefined;
-    });
+    return getSuggestedItemsFromSelection(menuItemsMap, currentSelection);
   }, [menuItemsMap, preservedSelection, selection]);
   return suggestedItems;
 };

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

@@ -0,0 +1,13 @@
+/**
+ * Helper function to create menu items map from block menu components.
+ */
+export var createMenuItemsMap = function createMenuItemsMap(blockMenuComponents) {
+  if (!blockMenuComponents) {
+    return new Map();
+  }
+  return new Map(blockMenuComponents.filter(function (c) {
+    return c.type === 'block-menu-item';
+  }).map(function (item) {
+    return [item.key, item];
+  }));
+};

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

@@ -0,0 +1,35 @@
+import { expandSelectionToBlockRange } from '@atlaskit/editor-common/selection';
+import { getBlockNodesInRange } from '../../editor-commands/transform-node-utils/utils';
+import { getSortedSuggestedItems } from '../utils/suggested-items-rank';
+
+/**
+ * Pure function to calculate suggested items based on selection and menu components.
+ */
+export var getSuggestedItemsFromSelection = function getSuggestedItemsFromSelection(menuItemsMap, currentSelection) {
+  if (menuItemsMap.size === 0 || !currentSelection) {
+    return [];
+  }
+  var _expandSelectionToBlo = expandSelectionToBlockRange(currentSelection),
+    range = _expandSelectionToBlo.range;
+  if (!range) {
+    return [];
+  }
+  var blockNodes = getBlockNodesInRange(range);
+  if (blockNodes.length === 0) {
+    return [];
+  }
+  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);
+  }).filter(function (item) {
+    return item !== undefined;
+  });
+};

package/dist/types/blockMenuPluginType.d.ts

@@ -106,6 +106,7 @@ export type RegisterBlockMenuSection = BlockMenuSection & {
 };
 export type RegisterBlockMenuItem = BlockMenuItem & {
     component?: BlockMenuItemComponent;
+    isHidden?: () => boolean;
     parent: Parent<BlockMenuSection>;
 };
 export type RegisterBlockMenuComponent = RegisterBlockMenuNested | RegisterBlockMenuSection | RegisterBlockMenuItem;

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

@@ -29,15 +29,10 @@ export declare const convertExpandToNestedExpand: (node: PMNode, schema: Schema)
 export declare const convertTextNodeToParagraph: (node: PMNode, schema: Schema) => PMNode | null;
 export declare const getBlockNodesInRange: (range: NodeRange) => PMNode[];
 /**
- * Splits a text node (paragraph/heading) into parts for codeBlock conversion.
- * Returns an array of:
- * - strings (text content that can go into codeBlock)
- * - PMNodes (incompatible inline nodes wrapped in paragraphs that need to break out)
+ * Iterates over a nodes children and extracting text content, removing all other inline content and converting
+ * hardbreaks to newlines.
  *
- * This preserves inline nodes (like status, inlineExtension) that cannot be represented as plain text.
- *
- * @param node - The text node (paragraph or heading) to split
- * @param schema - The schema to use for creating paragraph nodes
- * @returns Array of strings (for codeBlock) and PMNodes (to break out)
+ * @param node - The node to create text content from (should be paragraph)
+ * @returns The text content string.
  */
-export declare const splitTextNodeForCodeBlock: (node: PMNode, schema: Schema) => Array<string | PMNode>;
+export declare const createTextContent: (node: PMNode) => string;

package/dist/types/ui/block-menu-renderer/utils.d.ts

@@ -28,10 +28,9 @@ export declare const buildChildrenMap: (components: RegisterBlockMenuComponent[]
  * 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
+ * - An item will not render if it has isHidden that returns true OR if its component returns null (fallback)
+ * - A nested menu will render if at least one section, that has at least one registered child
  * - 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
  */
 export declare const willComponentRender: (registeredComponent: RegisterBlockMenuComponent, childrenMap: ChildrenMap) => boolean;

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

@@ -0,0 +1,6 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { BlockMenuPlugin, RegisterBlockMenuItem } from '../../blockMenuPluginType';
+/**
+ * Helper function to create menu items map from block menu components.
+ */
+export declare const createMenuItemsMap: (blockMenuComponents: ReturnType<ExtractInjectionAPI<BlockMenuPlugin>["blockMenu"]["actions"]["getBlockMenuComponents"]> | undefined) => Map<string, RegisterBlockMenuItem>;

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

@@ -0,0 +1,6 @@
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
+import type { RegisterBlockMenuItem } from '../../blockMenuPluginType';
+/**
+ * Pure function to calculate suggested items based on selection and menu components.
+ */
+export declare const getSuggestedItemsFromSelection: (menuItemsMap: Map<string, RegisterBlockMenuItem>, currentSelection: Selection | null | undefined) => RegisterBlockMenuItem[];

package/dist/types-ts4.5/blockMenuPluginType.d.ts

@@ -106,6 +106,7 @@ export type RegisterBlockMenuSection = BlockMenuSection & {
 };
 export type RegisterBlockMenuItem = BlockMenuItem & {
     component?: BlockMenuItemComponent;
+    isHidden?: () => boolean;
     parent: Parent<BlockMenuSection>;
 };
 export type RegisterBlockMenuComponent = RegisterBlockMenuNested | RegisterBlockMenuSection | RegisterBlockMenuItem;

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

@@ -29,15 +29,10 @@ export declare const convertExpandToNestedExpand: (node: PMNode, schema: Schema)
 export declare const convertTextNodeToParagraph: (node: PMNode, schema: Schema) => PMNode | null;
 export declare const getBlockNodesInRange: (range: NodeRange) => PMNode[];
 /**
- * Splits a text node (paragraph/heading) into parts for codeBlock conversion.
- * Returns an array of:
- * - strings (text content that can go into codeBlock)
- * - PMNodes (incompatible inline nodes wrapped in paragraphs that need to break out)
+ * Iterates over a nodes children and extracting text content, removing all other inline content and converting
+ * hardbreaks to newlines.
  *
- * This preserves inline nodes (like status, inlineExtension) that cannot be represented as plain text.
- *
- * @param node - The text node (paragraph or heading) to split
- * @param schema - The schema to use for creating paragraph nodes
- * @returns Array of strings (for codeBlock) and PMNodes (to break out)
+ * @param node - The node to create text content from (should be paragraph)
+ * @returns The text content string.
  */
-export declare const splitTextNodeForCodeBlock: (node: PMNode, schema: Schema) => Array<string | PMNode>;
+export declare const createTextContent: (node: PMNode) => string;

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

@@ -28,10 +28,9 @@ export declare const buildChildrenMap: (components: RegisterBlockMenuComponent[]
  * 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
+ * - An item will not render if it has isHidden that returns true OR if its component returns null (fallback)
+ * - A nested menu will render if at least one section, that has at least one registered child
  * - 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
  */
 export declare const willComponentRender: (registeredComponent: RegisterBlockMenuComponent, childrenMap: ChildrenMap) => boolean;

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

@@ -0,0 +1,6 @@
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { BlockMenuPlugin, RegisterBlockMenuItem } from '../../blockMenuPluginType';
+/**
+ * Helper function to create menu items map from block menu components.
+ */
+export declare const createMenuItemsMap: (blockMenuComponents: ReturnType<ExtractInjectionAPI<BlockMenuPlugin>["blockMenu"]["actions"]["getBlockMenuComponents"]> | undefined) => Map<string, RegisterBlockMenuItem>;

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

@@ -0,0 +1,6 @@
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
+import type { RegisterBlockMenuItem } from '../../blockMenuPluginType';
+/**
+ * Pure function to calculate suggested items based on selection and menu components.
+ */
+export declare const getSuggestedItemsFromSelection: (menuItemsMap: Map<string, RegisterBlockMenuItem>, currentSelection: Selection | null | undefined) => RegisterBlockMenuItem[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "6.0.10",
+	"version": "6.0.12",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,18 +38,18 @@
 		"@atlaskit/editor-prosemirror": "^7.2.0",
 		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/editor-toolbar": "^0.18.0",
-		"@atlaskit/flag": "^17.7.0",
+		"@atlaskit/editor-toolbar": "^0.19.0",
+		"@atlaskit/flag": "^17.8.0",
 		"@atlaskit/icon": "^29.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
 		"@atlaskit/primitives": "^17.0.0",
-		"@atlaskit/tmp-editor-statsig": "^16.8.0",
+		"@atlaskit/tmp-editor-statsig": "^16.11.0",
 		"@atlaskit/tokens": "^9.1.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.6.0",
+		"@atlaskit/editor-common": "^111.7.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},