@atlaskit/editor-plugin-quick-insert 30.0.2 → 30.0.3

package/dist/esm/ui/getRecommendedComponents.js

@@ -1,28 +1,22 @@
 import { logException } from '@atlaskit/editor-common/monitoring/error';
 import { quickInsertProviderMenuItemKey } from '@atlaskit/editor-common/quick-insert/get-provider-menu-item-key';
 import { defaultIsRecommendedItem } from '@atlaskit/editor-common/quick-insert/is-recommended-item';
-import { MENU } from '@atlaskit/editor-common/quick-insert/keys';
-import { REGISTERED_MENU_SURFACE_CONTEXT } from '@atlaskit/editor-common/registered-menu/surface-context';
 import { isMenuFooterSectionKey } from '@atlaskit/editor-common/type-ahead-is-menu-footer-section-key';
 import { isSectionOverflowItemKey } from '@atlaskit/editor-common/type-ahead-is-section-overflow-item-key';
 export var MAX_RECOMMENDED_ITEMS = 5;
-export var RECOMMENDED_SLOT_KEY_PREFIX = 'quick-insert-recommended-slot-';
-export var isRecommendedSlotKey = function isRecommendedSlotKey(key) {
-  return key.startsWith(RECOMMENDED_SLOT_KEY_PREFIX);
-};
 var isRecommendationCandidate = function isRecommendationCandidate(component) {
-  return component.type === 'menu-item' && !isRecommendedSlotKey(component.key) && !isSectionOverflowItemKey(component.key) && !component.parents.some(function (parent) {
+  return component.type === 'menu-item' && !isSectionOverflowItemKey(component.key) && !component.parents.some(function (parent) {
     return isMenuFooterSectionKey(parent.key);
   });
 };
 
-/** Normalises a consumer-supplied limit to the number of available recommended slots. */
+/** Normalises a consumer-supplied limit to the supported number of recommended items. */
 export var resolveMaxRecommendedItems = function resolveMaxRecommendedItems(maxRecommendedItems) {
   if (maxRecommendedItems === undefined || !Number.isFinite(maxRecommendedItems)) {
     return MAX_RECOMMENDED_ITEMS;
   }
   if (maxRecommendedItems > MAX_RECOMMENDED_ITEMS) {
-    void logException(new Error('Quick Insert maxRecommendedItems exceeds the available slots'), {
+    void logException(new Error('Quick Insert maxRecommendedItems exceeds the supported maximum'), {
       location: 'editor-plugin-quick-insert/getRecommendedComponents'
     });
   }
@@ -67,34 +61,21 @@ export var getRecommendedComponents = function getRecommendedComponents(_ref) {
   });
 };
 
-/** Keeps only the current menu-open recommendation snapshot. */
-
-export var createRecommendedSnapshotCache = function createRecommendedSnapshotCache(_ref3) {
-  var api = _ref3.api,
-    isRecommendedItem = _ref3.isRecommendedItem,
+/**
+ * Resolves the Recommended section for a browse-mode menu. Callers memoise per components array,
+ * so the resolver itself keeps no state.
+ */
+export var createRecommendedItemsResolver = function createRecommendedItemsResolver(_ref3) {
+  var isRecommendedItem = _ref3.isRecommendedItem,
     maxRecommendedItems = _ref3.maxRecommendedItems;
-  var snapshot;
-  var getSnapshot = function getSnapshot(surfaceContext) {
-    var _surfaceContext$get, _snapshot;
-    var menuOpenId = surfaceContext === null || surfaceContext === void 0 || (_surfaceContext$get = surfaceContext.get(REGISTERED_MENU_SURFACE_CONTEXT)) === null || _surfaceContext$get === void 0 ? void 0 : _surfaceContext$get.menuOpenId;
-    if (!surfaceContext || !menuOpenId) {
-      return [];
-    }
-    if (((_snapshot = snapshot) === null || _snapshot === void 0 ? void 0 : _snapshot.id) !== menuOpenId) {
-      var _api$uiControlRegistr, _api$uiControlRegistr2;
-      snapshot = {
-        id: menuOpenId,
-        items: getRecommendedComponents({
-          components: (_api$uiControlRegistr = api === null || api === void 0 || (_api$uiControlRegistr2 = api.uiControlRegistry) === null || _api$uiControlRegistr2 === void 0 ? void 0 : _api$uiControlRegistr2.actions.getComponents(MENU.key)) !== null && _api$uiControlRegistr !== void 0 ? _api$uiControlRegistr : [],
-          context: surfaceContext,
-          isRecommendedItem: isRecommendedItem,
-          maxRecommendedItems: maxRecommendedItems
-        })
-      };
-    }
-    return snapshot.items;
-  };
-  return {
-    getSnapshot: getSnapshot
+  return function (_ref4) {
+    var components = _ref4.components,
+      surfaceContext = _ref4.surfaceContext;
+    return surfaceContext ? getRecommendedComponents({
+      components: components,
+      context: surfaceContext,
+      isRecommendedItem: isRecommendedItem,
+      maxRecommendedItems: maxRecommendedItems
+    }) : [];
   };
 };

package/dist/esm/ui/registered-menu/QuickInsertMenuRoot.js

@@ -29,7 +29,8 @@ var QuickInsertMenuRoot = function QuickInsertMenuRoot(_ref) {
   var _surfaceContext$get, _registeredMenu$maxHe;
   var emptyStateHandler = _ref.emptyStateHandler,
     fireAnalyticsEvent = _ref.fireAnalyticsEvent,
-    getItemRank = _ref.getItemRank;
+    getItemRank = _ref.getItemRank,
+    getRecommendedItems = _ref.getRecommendedItems;
   var registeredMenu = useRegisteredMenuContext();
   var _registeredMenu$query = registeredMenu.query,
     query = _registeredMenu$query === void 0 ? '' : _registeredMenu$query,
@@ -49,6 +50,7 @@ var QuickInsertMenuRoot = function QuickInsertMenuRoot(_ref) {
       components: components,
       formatMessage: formatMessage,
       getItemRank: runtimeItemRank !== null && runtimeItemRank !== void 0 ? runtimeItemRank : getItemRank,
+      getRecommendedItems: getRecommendedItems,
       query: query,
       rootComponent: rootComponent,
       selectCategoryItems: components.some(function (_ref2) {
@@ -57,7 +59,7 @@ var QuickInsertMenuRoot = function QuickInsertMenuRoot(_ref) {
       }) ? selectQuickInsertCategoryItems : undefined,
       surfaceContext: surfaceContext
     });
-  }, [components, formatMessage, getItemRank, query, rootComponent, runtimeItemRank, surfaceContext]);
+  }, [components, formatMessage, getItemRank, getRecommendedItems, query, rootComponent, runtimeItemRank, surfaceContext]);
   var resultCount = useMemo(function () {
     return model.sections.reduce(function (count, _ref3) {
       var _ref4 = _toArray(_ref3),

package/dist/esm/ui/registered-menu/RegisteredQuickInsertMenuItem.js

@@ -2,7 +2,6 @@ import React, { useMemo } from 'react';
 import { QuickInsertProvider } from '@atlaskit/editor-common/quick-insert/provider';
 import { useQuickInsertContext } from '@atlaskit/editor-common/quick-insert/use-quick-insert-context';
 export var RegisteredQuickInsertMenuItem = function RegisteredQuickInsertMenuItem(_ref) {
-  var _registration$compone;
   var id = _ref.id,
     isSelected = _ref.isSelected,
     isActive = _ref.isActive,
@@ -27,8 +26,11 @@ export var RegisteredQuickInsertMenuItem = function RegisteredQuickInsertMenuIte
       surfaceContext: surfaceContext
     };
   }, [editorView, isOffline, popupsMountPoint, select, surfaceContext, isActive, id, isSelected]);
-  var Component = (_registration$compone = registration.component) !== null && _registration$compone !== void 0 ? _registration$compone : React.Fragment;
+  var Component = registration.component;
   return /*#__PURE__*/React.createElement(QuickInsertProvider, {
     value: value
-  }, /*#__PURE__*/React.createElement(Component, null, null));
+  }, Component ? /*#__PURE__*/React.createElement(Component, {
+    parents: registration.parents,
+    surfaceContext: surfaceContext
+  }, null) : null);
 };

package/dist/esm/ui/registered-menu/get-quick-insert-menu-model.js

@@ -5,7 +5,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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; }
-import { ASK_ROVO_MENU_ITEM, MENU, SEARCH_RESULTS_SECTION } from '@atlaskit/editor-common/quick-insert/keys';
+import { ASK_ROVO_MENU_ITEM, MENU, RECOMMENDED_SECTION, SEARCH_RESULTS_SECTION } from '@atlaskit/editor-common/quick-insert/keys';
 import { applyRegisteredItemRanks } from '@atlaskit/editor-common/registered-menu/item-rank';
 import { isMenuFooterSectionKey } from '@atlaskit/editor-common/type-ahead-is-menu-footer-section-key';
 import { isSectionOverflowItemKey } from '@atlaskit/editor-common/type-ahead-is-section-overflow-item-key';
@@ -44,48 +44,70 @@ var getSearchResults = function getSearchResults(matches) {
     var identity = _ref.identity;
     return identity;
   }));
-  var tailMatches = matches.filter(function (_ref2) {
+  return [].concat(_toConsumableArray(topMatches), _toConsumableArray(matches.filter(function (_ref2) {
     var identity = _ref2.identity;
     return !topMatchIdentities.has(identity);
-  });
-  return [].concat(_toConsumableArray(topMatches), _toConsumableArray(tailMatches)).map(function (_ref3) {
-    var item = _ref3.item;
-    return item;
-  });
-};
-var getRenderedMenuItems = function getRenderedMenuItems(section, childrenMap, surfaceContext) {
-  var _childrenMap$get;
-  return ((_childrenMap$get = childrenMap.get(getComponentIdentity(section))) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : []).filter(function (child) {
-    return child.type === 'menu-item' && willComponentRender(child, childrenMap, surfaceContext);
-  });
+  })));
 };
-var buildBrowseSections = function buildBrowseSections(_ref4) {
-  var childrenMap = _ref4.childrenMap,
-    contentSections = _ref4.contentSections,
-    selectCategoryItems = _ref4.selectCategoryItems,
-    surfaceContext = _ref4.surfaceContext;
-  var sections = [];
-  var _iterator = _createForOfIteratorHelper(contentSections),
+
+/** Recommended uses resolved items rather than registered children. */
+var readMenuSections = function readMenuSections(_ref3) {
+  var childrenMap = _ref3.childrenMap,
+    _ref3$recommendedItem = _ref3.recommendedItems,
+    recommendedItems = _ref3$recommendedItem === void 0 ? [] : _ref3$recommendedItem,
+    sections = _ref3.sections,
+    surfaceContext = _ref3.surfaceContext;
+  var renderedSections = [];
+  var _iterator = _createForOfIteratorHelper(sections),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var _section$isHidden, _section$isHidden2, _childrenMap$get;
       var section = _step.value;
-      var children = getRenderedMenuItems(section, childrenMap, surfaceContext);
-      var overflowItems = children.filter(function (child) {
-        return isSectionOverflowItemKey(child.key);
-      });
-      var viewMoreItem = overflowItems[overflowItems.length - 1];
-      var items = children.filter(function (child) {
-        return !isSectionOverflowItemKey(child.key);
-      });
-      if (items.length === 0) {
+      if (section.type !== 'menu-section') {
         continue;
       }
-      var selectedItems = viewMoreItem !== undefined && selectCategoryItems !== undefined ? selectCategoryItems(items) : items;
-      if (selectedItems.length < items.length && viewMoreItem !== undefined) {
-        sections.push([section].concat(_toConsumableArray(selectedItems), [viewMoreItem]));
-      } else {
-        sections.push([section].concat(_toConsumableArray(selectedItems)));
+      if (surfaceContext ? (_section$isHidden = section.isHidden) === null || _section$isHidden === void 0 ? void 0 : _section$isHidden.call(section, {
+        surfaceContext: surfaceContext
+      }) : (_section$isHidden2 = section.isHidden) === null || _section$isHidden2 === void 0 ? void 0 : _section$isHidden2.call(section)) {
+        continue;
+      }
+      if (section.key === RECOMMENDED_SECTION.key) {
+        renderedSections.push({
+          section: section,
+          items: recommendedItems
+        });
+        continue;
+      }
+      var children = (_childrenMap$get = childrenMap.get(getComponentIdentity(section))) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : [];
+      var items = [];
+      var viewMoreItem = void 0;
+      var _iterator2 = _createForOfIteratorHelper(children),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var child = _step2.value;
+          if (child.type !== 'menu-item' || !willComponentRender(child, childrenMap, surfaceContext)) {
+            continue;
+          }
+          if (isSectionOverflowItemKey(child.key)) {
+            viewMoreItem !== null && viewMoreItem !== void 0 ? viewMoreItem : viewMoreItem = child;
+          } else {
+            items.push(child);
+          }
+        }
+        // Empty registrations are visible leaves; containers need a visible child.
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+      if (children.length === 0 || items.length > 0 || viewMoreItem) {
+        renderedSections.push({
+          section: section,
+          items: items,
+          viewMoreItem: viewMoreItem
+        });
       }
     }
   } catch (err) {
@@ -93,53 +115,92 @@ var buildBrowseSections = function buildBrowseSections(_ref4) {
   } finally {
     _iterator.f();
   }
+  return renderedSections;
+};
+var getOwnerSectionKey = function getOwnerSectionKey(item, isRecommendedItem) {
+  var _item$parents$;
+  return isRecommendedItem(item) ? RECOMMENDED_SECTION.key : (_item$parents$ = item.parents[0]) === null || _item$parents$ === void 0 ? void 0 : _item$parents$.key;
+};
+var buildBrowseSections = function buildBrowseSections(_ref4) {
+  var contentSections = _ref4.contentSections,
+    isRecommendedItem = _ref4.isRecommendedItem,
+    selectCategoryItems = _ref4.selectCategoryItems;
+  var sections = [];
+  var _iterator3 = _createForOfIteratorHelper(contentSections),
+    _step3;
+  try {
+    var _loop = function _loop() {
+      var _step3$value = _step3.value,
+        items = _step3$value.items,
+        section = _step3$value.section,
+        viewMoreItem = _step3$value.viewMoreItem;
+      var ownedItems = items.filter(function (item) {
+        return getOwnerSectionKey(item, isRecommendedItem) === section.key;
+      });
+      if (ownedItems.length === 0) {
+        return 1; // continue
+      }
+      var selectedItems = viewMoreItem && selectCategoryItems ? selectCategoryItems(ownedItems) : ownedItems;
+      sections.push([section].concat(_toConsumableArray(selectedItems), _toConsumableArray(viewMoreItem && selectedItems.length < ownedItems.length ? [viewMoreItem] : [])));
+    };
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      if (_loop()) continue;
+    }
+  } catch (err) {
+    _iterator3.e(err);
+  } finally {
+    _iterator3.f();
+  }
   return {
     fallbackItems: [],
     sections: sections
   };
 };
 var buildSearchSections = function buildSearchSections(_ref5) {
-  var childrenMap = _ref5.childrenMap,
-    components = _ref5.components,
+  var components = _ref5.components,
     contentSections = _ref5.contentSections,
     formatMessage = _ref5.formatMessage,
+    isRecommendedItem = _ref5.isRecommendedItem,
     query = _ref5.query,
-    root = _ref5.root,
-    surfaceContext = _ref5.surfaceContext;
-  var matches = new Map();
+    root = _ref5.root;
   var sourceIndexByComponent = new Map(components.map(function (component, index) {
     return [component, index];
   }));
-  var _iterator2 = _createForOfIteratorHelper(contentSections),
-    _step2;
+  var matches = new Map();
+  var fallbackItem;
+  var _iterator4 = _createForOfIteratorHelper(contentSections),
+    _step4;
   try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var section = _step2.value;
-      var _iterator3 = _createForOfIteratorHelper(getRenderedMenuItems(section, childrenMap, surfaceContext)),
-        _step3;
+    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+      var _step4$value = _step4.value,
+        items = _step4$value.items,
+        section = _step4$value.section;
+      var sectionRank = getParentRank(section, root.key);
+      var _iterator5 = _createForOfIteratorHelper(items),
+        _step5;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
           var _item$match, _match$score, _sourceIndexByCompone;
-          var item = _step3.value;
-          if (isSectionOverflowItemKey(item.key)) {
-            continue;
+          var item = _step5.value;
+          if (item.key === ASK_ROVO_MENU_ITEM.key) {
+            fallbackItem !== null && fallbackItem !== void 0 ? fallbackItem : fallbackItem = item;
           }
           var match = (_item$match = item.match) === null || _item$match === void 0 ? void 0 : _item$match.call(item, {
             formatMessage: formatMessage,
             itemKey: item.key,
             query: query
           });
-          if (item.match && match === null) {
+          if (item.match && match === null || getOwnerSectionKey(item, isRecommendedItem) !== section.key) {
             continue;
           }
           var candidate = {
-            identity: "".concat(item.type, ":").concat(item.key),
+            identity: getComponentIdentity(item),
             item: item,
             itemRank: getParentRank(item, section.key),
             priorityGroup: (match === null || match === void 0 ? void 0 : match.priorityGroup) !== undefined && Number.isFinite(match.priorityGroup) ? match.priorityGroup : undefined,
             score: Math.min(1, Math.max(0, (_match$score = match === null || match === void 0 ? void 0 : match.score) !== null && _match$score !== void 0 ? _match$score : 0)),
-            sourceIndex: (_sourceIndexByCompone = sourceIndexByComponent.get(item)) !== null && _sourceIndexByCompone !== void 0 ? _sourceIndexByCompone : Number.MAX_SAFE_INTEGER,
-            sectionRank: getParentRank(section, root.key)
+            sectionRank: sectionRank,
+            sourceIndex: (_sourceIndexByCompone = sourceIndexByComponent.get(item)) !== null && _sourceIndexByCompone !== void 0 ? _sourceIndexByCompone : Number.MAX_SAFE_INTEGER
           };
           var existing = matches.get(candidate.identity);
           if (!existing || compareMatchedItems(candidate, existing) < 0) {
@@ -147,15 +208,15 @@ var buildSearchSections = function buildSearchSections(_ref5) {
           }
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator3.f();
+        _iterator5.f();
       }
     }
   } catch (err) {
-    _iterator2.e(err);
+    _iterator4.e(err);
   } finally {
-    _iterator2.f();
+    _iterator4.f();
   }
   var uniqueMatches = Array.from(matches.values()).sort(compareMatchedItems);
   var prioritizedMatches = uniqueMatches.filter(function (_ref6) {
@@ -169,44 +230,50 @@ var buildSearchSections = function buildSearchSections(_ref5) {
   var orderedSearchResults = [].concat(_toConsumableArray(prioritizedMatches.sort(comparePrioritizedSearchResults).map(function (_ref8) {
     var item = _ref8.item;
     return item;
-  })), _toConsumableArray(getSearchResults(unprioritizedMatches)));
+  })), _toConsumableArray(getSearchResults(unprioritizedMatches).map(function (_ref9) {
+    var item = _ref9.item;
+    return item;
+  })));
   if (orderedSearchResults.length > 0) {
     return {
       fallbackItems: [],
       sections: [[SEARCH_RESULTS_HEADING].concat(_toConsumableArray(orderedSearchResults))]
     };
   }
-  var fallbackItem = contentSections.flatMap(function (section) {
-    var _childrenMap$get2;
-    return (_childrenMap$get2 = childrenMap.get(getComponentIdentity(section))) !== null && _childrenMap$get2 !== void 0 ? _childrenMap$get2 : [];
-  }).find(function (component) {
-    return component.type === ASK_ROVO_MENU_ITEM.type && component.key === ASK_ROVO_MENU_ITEM.key && willComponentRender(component, childrenMap, surfaceContext);
-  });
   return {
     fallbackItems: fallbackItem ? [fallbackItem] : [],
     sections: []
   };
 };
 
+/**
+ * Resolves the Recommended items for a browse. Receives the unranked components so a resolver
+ * can look recommendations up by their registered keys.
+ */
+
 /**
  * Builds the registered quick-insert menu model. An empty query browses every
  * category; a non-empty query returns ranked matches. The footer is shared by both.
  */
-export var getQuickInsertMenuModel = function getQuickInsertMenuModel(_ref9) {
-  var components = _ref9.components,
-    formatMessage = _ref9.formatMessage,
-    getItemRank = _ref9.getItemRank,
-    query = _ref9.query,
-    rootComponent = _ref9.rootComponent,
-    selectCategoryItems = _ref9.selectCategoryItems,
-    surfaceContext = _ref9.surfaceContext;
+export var getQuickInsertMenuModel = function getQuickInsertMenuModel(_ref0) {
+  var _root$isHidden, _root$isHidden2, _contentSections$find;
+  var components = _ref0.components,
+    formatMessage = _ref0.formatMessage,
+    getItemRank = _ref0.getItemRank,
+    getRecommendedItems = _ref0.getRecommendedItems,
+    query = _ref0.query,
+    rootComponent = _ref0.rootComponent,
+    selectCategoryItems = _ref0.selectCategoryItems,
+    surfaceContext = _ref0.surfaceContext;
   var rankedComponents = applyRegisteredItemRanks(components, getItemRank);
   var _resolveSurface = resolveSurface(rankedComponents, rootComponent),
     childrenMap = _resolveSurface.childrenMap,
     root = _resolveSurface.root,
     _resolveSurface$topLe = _resolveSurface.topLevelChildren,
     topLevelChildren = _resolveSurface$topLe === void 0 ? [] : _resolveSurface$topLe;
-  if (!root || !willComponentRender(root, childrenMap, surfaceContext)) {
+  if (!root || (surfaceContext ? (_root$isHidden = root.isHidden) === null || _root$isHidden === void 0 ? void 0 : _root$isHidden.call(root, {
+    surfaceContext: surfaceContext
+  }) : (_root$isHidden2 = root.isHidden) === null || _root$isHidden2 === void 0 ? void 0 : _root$isHidden2.call(root))) {
     return {
       fallbackItems: [],
       footer: undefined,
@@ -214,32 +281,52 @@ export var getQuickInsertMenuModel = function getQuickInsertMenuModel(_ref9) {
       sections: []
     };
   }
-  var renderedSections = topLevelChildren.filter(function (section) {
-    return section.type === 'menu-section' && willComponentRender(section, childrenMap, surfaceContext);
+  var isBrowse = query === '';
+  var renderedSections = readMenuSections({
+    sections: topLevelChildren,
+    childrenMap: childrenMap,
+    surfaceContext: surfaceContext,
+    recommendedItems: isBrowse ? getRecommendedItems === null || getRecommendedItems === void 0 ? void 0 : getRecommendedItems({
+      components: components,
+      surfaceContext: surfaceContext
+    }) : undefined
   });
-  var footerSection = renderedSections.find(function (_ref0) {
-    var key = _ref0.key;
-    return isMenuFooterSectionKey(key);
+  if (topLevelChildren.length > 0 && renderedSections.length === 0) {
+    return {
+      fallbackItems: [],
+      footer: undefined,
+      root: undefined,
+      sections: []
+    };
+  }
+  var footerSection = renderedSections.find(function (_ref1) {
+    var section = _ref1.section;
+    return isMenuFooterSectionKey(section.key);
   });
-  var contentSections = renderedSections.filter(function (_ref1) {
-    var key = _ref1.key;
-    return !isMenuFooterSectionKey(key);
+  var contentSections = renderedSections.filter(function (_ref10) {
+    var section = _ref10.section;
+    return !isMenuFooterSectionKey(section.key) && (isBrowse || section.key !== RECOMMENDED_SECTION.key);
   });
-  var content = query === '' ? buildBrowseSections({
-    childrenMap: childrenMap,
+  var recommendedIdentities = new Set((_contentSections$find = contentSections.find(function (_ref11) {
+    var section = _ref11.section;
+    return section.key === RECOMMENDED_SECTION.key;
+  })) === null || _contentSections$find === void 0 ? void 0 : _contentSections$find.items.map(getComponentIdentity));
+  var isRecommendedItem = function isRecommendedItem(item) {
+    return recommendedIdentities.has(getComponentIdentity(item));
+  };
+  var content = isBrowse ? buildBrowseSections({
     contentSections: contentSections,
-    selectCategoryItems: selectCategoryItems,
-    surfaceContext: surfaceContext
+    isRecommendedItem: isRecommendedItem,
+    selectCategoryItems: selectCategoryItems
   }) : buildSearchSections({
-    childrenMap: childrenMap,
     components: rankedComponents,
     contentSections: contentSections,
     formatMessage: formatMessage,
+    isRecommendedItem: isRecommendedItem,
     query: query,
-    root: root,
-    surfaceContext: surfaceContext
+    root: root
   });
-  var footer = footerSection ? getRenderedMenuItems(footerSection, childrenMap, surfaceContext)[0] : undefined;
+  var footer = footerSection === null || footerSection === void 0 ? void 0 : footerSection.items[0];
   return _objectSpread(_objectSpread({}, content), {}, {
     footer: footer,
     root: root

package/dist/types/ui/getQuickInsertComponents.d.ts

@@ -1,18 +1,17 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics/api';
-import type { IsRecommendedItem } from '@atlaskit/editor-common/quick-insert/is-recommended-item';
 import type { RegisteredItemRankResolver } from '@atlaskit/editor-common/registered-menu/item-rank';
 import type { EmptyStateHandler } from '@atlaskit/editor-common/types/empty-state-handler';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { RegisterComponent } from '@atlaskit/editor-ui-control-model/types';
 import type { QuickInsertPlugin } from '../quickInsertPluginType';
+import type { RecommendedItemsResolver } from './registered-menu/get-quick-insert-menu-model';
 type Params = {
     api: ExtractInjectionAPI<QuickInsertPlugin> | undefined;
     emptyStateHandler?: EmptyStateHandler;
     fireAnalyticsEvent?: EditorAnalyticsAPI['fireAnalyticsEvent'];
     getItemRank?: RegisteredItemRankResolver;
+    getRecommendedItems?: RecommendedItemsResolver;
     includeElementBrowserItems: boolean;
-    isRecommendedItem?: IsRecommendedItem;
-    maxRecommendedItems?: number;
 };
-export declare const getQuickInsertComponents: ({ api, includeElementBrowserItems, isRecommendedItem, maxRecommendedItems, getItemRank, emptyStateHandler, fireAnalyticsEvent, }: Params) => RegisterComponent[];
+export declare const getQuickInsertComponents: ({ api, includeElementBrowserItems, getItemRank, getRecommendedItems, emptyStateHandler, fireAnalyticsEvent, }: Params) => RegisterComponent[];
 export {};

package/dist/types/ui/getRecommendedComponents.d.ts

@@ -1,11 +1,8 @@
 import { type IsRecommendedItem } from '@atlaskit/editor-common/quick-insert/is-recommended-item';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { RegisterComponent, RegisterMenuItem, SurfaceContext } from '@atlaskit/editor-ui-control-model/types';
-import type { QuickInsertPlugin } from '../quickInsertPluginType';
+import type { RecommendedItemsResolver } from './registered-menu/get-quick-insert-menu-model';
 export declare const MAX_RECOMMENDED_ITEMS = 5;
-export declare const RECOMMENDED_SLOT_KEY_PREFIX = "quick-insert-recommended-slot-";
-export declare const isRecommendedSlotKey: (key: string) => boolean;
-/** Normalises a consumer-supplied limit to the number of available recommended slots. */
+/** Normalises a consumer-supplied limit to the supported number of recommended items. */
 export declare const resolveMaxRecommendedItems: (maxRecommendedItems?: number) => number;
 export declare const getRecommendedComponents: ({ components, context, isRecommendedItem, maxRecommendedItems, }: {
     components: RegisterComponent[];
@@ -13,13 +10,11 @@ export declare const getRecommendedComponents: ({ components, context, isRecomme
     isRecommendedItem?: IsRecommendedItem;
     maxRecommendedItems?: number;
 }) => RegisterMenuItem[];
-/** Keeps only the current menu-open recommendation snapshot. */
-type RecommendedSnapshotCache = {
-    getSnapshot: (surfaceContext?: SurfaceContext) => RegisterMenuItem[];
-};
-export declare const createRecommendedSnapshotCache: ({ api, isRecommendedItem, maxRecommendedItems, }: {
-    api: ExtractInjectionAPI<QuickInsertPlugin> | undefined;
+/**
+ * Resolves the Recommended section for a browse-mode menu. Callers memoise per components array,
+ * so the resolver itself keeps no state.
+ */
+export declare const createRecommendedItemsResolver: ({ isRecommendedItem, maxRecommendedItems, }: {
     isRecommendedItem?: IsRecommendedItem;
     maxRecommendedItems?: number;
-}) => RecommendedSnapshotCache;
-export {};
+}) => RecommendedItemsResolver;

package/dist/types/ui/registered-menu/QuickInsertMenuRoot.d.ts

@@ -2,10 +2,12 @@ import React from 'react';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics/api';
 import type { RegisteredItemRankResolver } from '@atlaskit/editor-common/registered-menu/item-rank';
 import type { EmptyStateHandler } from '@atlaskit/editor-common/types/empty-state-handler';
+import { type RecommendedItemsResolver } from './get-quick-insert-menu-model';
 type Props = {
     emptyStateHandler?: EmptyStateHandler;
     fireAnalyticsEvent?: EditorAnalyticsAPI['fireAnalyticsEvent'];
     getItemRank?: RegisteredItemRankResolver;
+    getRecommendedItems?: RecommendedItemsResolver;
 };
-declare const QuickInsertMenuRoot: ({ emptyStateHandler, fireAnalyticsEvent, getItemRank, }: React.PropsWithChildren<Props>) => React.JSX.Element | null;
+declare const QuickInsertMenuRoot: ({ emptyStateHandler, fireAnalyticsEvent, getItemRank, getRecommendedItems, }: React.PropsWithChildren<Props>) => React.JSX.Element | null;
 export default QuickInsertMenuRoot;

package/dist/types/ui/registered-menu/get-quick-insert-menu-model.d.ts

@@ -2,16 +2,26 @@ import type { IntlShape } from 'react-intl';
 import type { RegisteredMenuModel } from '@atlaskit/editor-common/registered-menu';
 import { type RegisteredItemRankResolver } from '@atlaskit/editor-common/registered-menu/item-rank';
 import type { SurfaceIdentifier } from '@atlaskit/editor-ui-control-model/surface-renderer/types';
-import type { RegisterComponent, SurfaceContext } from '@atlaskit/editor-ui-control-model/types';
+import type { RegisterComponent, RegisterMenuItem, SurfaceContext } from '@atlaskit/editor-ui-control-model/types';
 import type { QuickInsertCategoryItemSelectionPolicy } from './selectQuickInsertCategoryItems';
+/**
+ * Resolves the Recommended items for a browse. Receives the unranked components so a resolver
+ * can look recommendations up by their registered keys.
+ */
+export type RecommendedItemsResolver = (params: {
+    components: RegisterComponent[];
+    surfaceContext?: SurfaceContext;
+}) => RegisterMenuItem[];
 /**
  * Builds the registered quick-insert menu model. An empty query browses every
  * category; a non-empty query returns ranked matches. The footer is shared by both.
  */
-export declare const getQuickInsertMenuModel: ({ components, formatMessage, getItemRank, query, rootComponent, selectCategoryItems, surfaceContext, }: {
+export declare const getQuickInsertMenuModel: ({ components, formatMessage, getItemRank, getRecommendedItems, query, rootComponent, selectCategoryItems, surfaceContext, }: {
     components: RegisterComponent[];
     formatMessage: IntlShape['formatMessage'];
     getItemRank?: RegisteredItemRankResolver;
+    /** Fills Recommended when browsing. Search never shows Recommended. */
+    getRecommendedItems?: RecommendedItemsResolver;
     query: string;
     rootComponent: SurfaceIdentifier;
     selectCategoryItems?: QuickInsertCategoryItemSelectionPolicy;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-quick-insert",
-	"version": "30.0.2",
+	"version": "30.0.3",
 	"description": "Quick insert plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -46,7 +46,7 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.6.0",
-		"@atlaskit/textfield": "^10.2.0",
+		"@atlaskit/textfield": "^10.3.0",
 		"@atlaskit/tmp-editor-statsig": "^248.0.0",
 		"@atlaskit/tokens": "^20.8.0",
 		"@atlaskit/tooltip": "^24.4.0",