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

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

@@ -51,48 +51,70 @@ var getSearchResults = function getSearchResults(matches) {
     var identity = _ref.identity;
     return identity;
   }));
-  var tailMatches = matches.filter(function (_ref2) {
+  return [].concat((0, _toConsumableArray2.default)(topMatches), (0, _toConsumableArray2.default)(matches.filter(function (_ref2) {
     var identity = _ref2.identity;
     return !topMatchIdentities.has(identity);
-  });
-  return [].concat((0, _toConsumableArray2.default)(topMatches), (0, _toConsumableArray2.default)(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((0, _surfaceRenderer.getComponentIdentity)(section))) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : []).filter(function (child) {
-    return child.type === 'menu-item' && (0, _surfaceRenderer.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 (0, _typeAheadIsSectionOverflowItemKey.isSectionOverflowItemKey)(child.key);
-      });
-      var viewMoreItem = overflowItems[overflowItems.length - 1];
-      var items = children.filter(function (child) {
-        return !(0, _typeAheadIsSectionOverflowItemKey.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((0, _toConsumableArray2.default)(selectedItems), [viewMoreItem]));
-      } else {
-        sections.push([section].concat((0, _toConsumableArray2.default)(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 === _keys.RECOMMENDED_SECTION.key) {
+        renderedSections.push({
+          section: section,
+          items: recommendedItems
+        });
+        continue;
+      }
+      var children = (_childrenMap$get = childrenMap.get((0, _surfaceRenderer.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' || !(0, _surfaceRenderer.willComponentRender)(child, childrenMap, surfaceContext)) {
+            continue;
+          }
+          if ((0, _typeAheadIsSectionOverflowItemKey.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) {
@@ -100,53 +122,92 @@ var buildBrowseSections = function buildBrowseSections(_ref4) {
   } finally {
     _iterator.f();
   }
+  return renderedSections;
+};
+var getOwnerSectionKey = function getOwnerSectionKey(item, isRecommendedItem) {
+  var _item$parents$;
+  return isRecommendedItem(item) ? _keys.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((0, _toConsumableArray2.default)(selectedItems), (0, _toConsumableArray2.default)(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 ((0, _typeAheadIsSectionOverflowItemKey.isSectionOverflowItemKey)(item.key)) {
-            continue;
+          var item = _step5.value;
+          if (item.key === _keys.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: (0, _surfaceRenderer.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) {
@@ -154,15 +215,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) {
@@ -176,44 +237,50 @@ var buildSearchSections = function buildSearchSections(_ref5) {
   var orderedSearchResults = [].concat((0, _toConsumableArray2.default)(prioritizedMatches.sort(comparePrioritizedSearchResults).map(function (_ref8) {
     var item = _ref8.item;
     return item;
-  })), (0, _toConsumableArray2.default)(getSearchResults(unprioritizedMatches)));
+  })), (0, _toConsumableArray2.default)(getSearchResults(unprioritizedMatches).map(function (_ref9) {
+    var item = _ref9.item;
+    return item;
+  })));
   if (orderedSearchResults.length > 0) {
     return {
       fallbackItems: [],
       sections: [[SEARCH_RESULTS_HEADING].concat((0, _toConsumableArray2.default)(orderedSearchResults))]
     };
   }
-  var fallbackItem = contentSections.flatMap(function (section) {
-    var _childrenMap$get2;
-    return (_childrenMap$get2 = childrenMap.get((0, _surfaceRenderer.getComponentIdentity)(section))) !== null && _childrenMap$get2 !== void 0 ? _childrenMap$get2 : [];
-  }).find(function (component) {
-    return component.type === _keys.ASK_ROVO_MENU_ITEM.type && component.key === _keys.ASK_ROVO_MENU_ITEM.key && (0, _surfaceRenderer.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.
  */
-var getQuickInsertMenuModel = exports.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;
+var getQuickInsertMenuModel = exports.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 = (0, _itemRank.applyRegisteredItemRanks)(components, getItemRank);
   var _resolveSurface = (0, _surfaceRenderer.resolveSurface)(rankedComponents, rootComponent),
     childrenMap = _resolveSurface.childrenMap,
     root = _resolveSurface.root,
     _resolveSurface$topLe = _resolveSurface.topLevelChildren,
     topLevelChildren = _resolveSurface$topLe === void 0 ? [] : _resolveSurface$topLe;
-  if (!root || !(0, _surfaceRenderer.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,
@@ -221,32 +288,52 @@ var getQuickInsertMenuModel = exports.getQuickInsertMenuModel = function getQuic
       sections: []
     };
   }
-  var renderedSections = topLevelChildren.filter(function (section) {
-    return section.type === 'menu-section' && (0, _surfaceRenderer.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 (0, _typeAheadIsMenuFooterSectionKey.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 (0, _typeAheadIsMenuFooterSectionKey.isMenuFooterSectionKey)(section.key);
   });
-  var contentSections = renderedSections.filter(function (_ref1) {
-    var key = _ref1.key;
-    return !(0, _typeAheadIsMenuFooterSectionKey.isMenuFooterSectionKey)(key);
+  var contentSections = renderedSections.filter(function (_ref10) {
+    var section = _ref10.section;
+    return !(0, _typeAheadIsMenuFooterSectionKey.isMenuFooterSectionKey)(section.key) && (isBrowse || section.key !== _keys.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 === _keys.RECOMMENDED_SECTION.key;
+  })) === null || _contentSections$find === void 0 ? void 0 : _contentSections$find.items.map(_surfaceRenderer.getComponentIdentity));
+  var isRecommendedItem = function isRecommendedItem(item) {
+    return recommendedIdentities.has((0, _surfaceRenderer.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/es2019/quickInsertPlugin.js

@@ -17,6 +17,7 @@ import { pluginKey } from './pm-plugins/plugin-key';
 import { getBlockControlQuickInsertComponents } from './ui/block-control-quick-insert';
 import { getLegacyCompatibleComponents } from './ui/getLegacyCompatibleComponents';
 import { getQuickInsertComponents } from './ui/getQuickInsertComponents';
+import { createRecommendedItemsResolver } from './ui/getRecommendedComponents';
 import ModalElementBrowser from './ui/ModalElementBrowser';
 import { RegistryElementBrowserContainer } from './ui/RegistryElementBrowser';
 import { getQuickInsertSuggestions, withLayoutQuickInsertPrioritySorting } from './ui/search';
@@ -31,6 +32,10 @@ export const quickInsertPlugin = ({
   };
   const typeAheadPrioritySortingFn = withLayoutQuickInsertPrioritySorting(options === null || options === void 0 ? void 0 : options.prioritySortingFn);
   const getItemRank = createQuickInsertRankResolver(options === null || options === void 0 ? void 0 : options.getItemRank);
+  const getRecommendedItems = createRecommendedItemsResolver({
+    isRecommendedItem: options === null || options === void 0 ? void 0 : options.isRecommendedItem,
+    maxRecommendedItems: options === null || options === void 0 ? void 0 : options.maxRecommendedItems
+  });
   const typeAhead = {
     id: TypeAheadAvailableNodes.QUICK_INSERT,
     registeredMenuKey: isExperimentEnabled('platform_editor_slash_command') ? MENU.key : undefined,
@@ -79,8 +84,7 @@ export const quickInsertPlugin = ({
     api === null || api === void 0 ? void 0 : (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 ? void 0 : _api$uiControlRegistr.actions.register(getQuickInsertComponents({
       api,
       getItemRank,
-      isRecommendedItem: options === null || options === void 0 ? void 0 : options.isRecommendedItem,
-      maxRecommendedItems: options === null || options === void 0 ? void 0 : options.maxRecommendedItems,
+      getRecommendedItems,
       emptyStateHandler: options === null || options === void 0 ? void 0 : options.emptyStateHandler,
       fireAnalyticsEvent: api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.fireAnalyticsEvent,
       includeElementBrowserItems: (options === null || options === void 0 ? void 0 : options.enableElementBrowser) === true

package/dist/es2019/ui/getQuickInsertComponents.js

@@ -5,9 +5,7 @@ import { messages } from '@atlaskit/editor-common/quick-insert/messages';
 import { CATEGORY_VIEW_MORE_RANK, QUICK_INSERT_MENU_RANK } from '@atlaskit/editor-common/quick-insert/rank';
 import { getMenuFooterSectionKey } from '@atlaskit/editor-common/type-ahead-get-menu-footer-section-key';
 import { getSectionOverflowItemKey } from '@atlaskit/editor-common/type-ahead-get-section-overflow-item-key';
-import { createRecommendedSnapshotCache, MAX_RECOMMENDED_ITEMS, RECOMMENDED_SLOT_KEY_PREFIX } from './getRecommendedComponents';
 import { QuickInsertMenuFooterItem } from './QuickInsertMenuFooterItem';
-import { QuickInsertRecommendedSlot } from './QuickInsertRecommendedSlot';
 import { QuickInsertSectionOverflowMenuItem } from './QuickInsertSectionOverflowMenuItem';
 import QuickInsertMenuRoot from './registered-menu/QuickInsertMenuRoot';
 import { QuickInsertMenuSection } from './registered-menu/QuickInsertMenuSection';
@@ -58,53 +56,21 @@ const createSectionComponent = message => {
 export const getQuickInsertComponents = ({
   api,
   includeElementBrowserItems,
-  isRecommendedItem,
-  maxRecommendedItems,
   getItemRank,
+  getRecommendedItems,
   emptyStateHandler,
   fireAnalyticsEvent
 }) => {
-  const recommendedSnapshot = createRecommendedSnapshotCache({
-    api,
-    isRecommendedItem,
-    maxRecommendedItems
-  });
-  const recommendedSlots = Array.from({
-    length: MAX_RECOMMENDED_ITEMS
-  }, (_, index) => ({
-    key: `${RECOMMENDED_SLOT_KEY_PREFIX}${index}`,
-    type: 'menu-item',
-    parents: [{
-      key: RECOMMENDED_SECTION.key,
-      type: RECOMMENDED_SECTION.type,
-      rank: index
-    }],
-    match: () => null,
-    isHidden: ({
-      surfaceContext
-    } = {}) => !recommendedSnapshot.getSnapshot(surfaceContext)[index],
-    component: ({
-      children,
-      parents,
-      surfaceContext
-    }) => /*#__PURE__*/React.createElement(QuickInsertRecommendedSlot, {
-      parents: parents,
-      surfaceContext: surfaceContext,
-      index: index,
-      getSnapshot: recommendedSnapshot.getSnapshot
-    }, children)
-  }));
   return [{
     key: MENU.key,
     type: MENU.type,
-    component: ({
-      children
-    }) => /*#__PURE__*/React.createElement(QuickInsertMenuRoot, {
+    component: () => /*#__PURE__*/React.createElement(QuickInsertMenuRoot, {
       getItemRank: getItemRank,
+      getRecommendedItems: getRecommendedItems,
       emptyStateHandler: emptyStateHandler,
       fireAnalyticsEvent: fireAnalyticsEvent
-    }, children)
-  }, ...recommendedSlots, ...categories.flatMap(({
+    })
+  }, ...categories.flatMap(({
     message,
     section
   }) => [{
@@ -115,10 +81,7 @@ export const getQuickInsertComponents = ({
       type: MENU.type,
       rank: QUICK_INSERT_MENU_RANK[section.key]
     }],
-    component: createSectionComponent(message),
-    isHidden: section.key === RECOMMENDED_SECTION.key ? ({
-      surfaceContext
-    } = {}) => recommendedSnapshot.getSnapshot(surfaceContext).length === 0 : undefined
+    component: createSectionComponent(message)
   }, ...(includeElementBrowserItems && section.key !== RECOMMENDED_SECTION.key ? [{
     key: getSectionOverflowItemKey(section.key),
     type: 'menu-item',

package/dist/es2019/ui/getRecommendedComponents.js

@@ -1,22 +1,18 @@
 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 const MAX_RECOMMENDED_ITEMS = 5;
-export const RECOMMENDED_SLOT_KEY_PREFIX = 'quick-insert-recommended-slot-';
-export const isRecommendedSlotKey = key => key.startsWith(RECOMMENDED_SLOT_KEY_PREFIX);
-const isRecommendationCandidate = component => component.type === 'menu-item' && !isRecommendedSlotKey(component.key) && !isSectionOverflowItemKey(component.key) && !component.parents.some(parent => isMenuFooterSectionKey(parent.key));
+const isRecommendationCandidate = component => component.type === 'menu-item' && !isSectionOverflowItemKey(component.key) && !component.parents.some(parent => 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 const 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'
     });
   }
@@ -58,35 +54,19 @@ export const getRecommendedComponents = ({
   }) => component);
 };
 
-/** Keeps only the current menu-open recommendation snapshot. */
-
-export const createRecommendedSnapshotCache = ({
-  api,
+/**
+ * Resolves the Recommended section for a browse-mode menu. Callers memoise per components array,
+ * so the resolver itself keeps no state.
+ */
+export const createRecommendedItemsResolver = ({
   isRecommendedItem,
   maxRecommendedItems
-}) => {
-  let snapshot;
-  const getSnapshot = surfaceContext => {
-    var _surfaceContext$get, _snapshot;
-    const menuOpenId = surfaceContext === null || surfaceContext === void 0 ? 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 ? 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,
-          maxRecommendedItems
-        })
-      };
-    }
-    return snapshot.items;
-  };
-  return {
-    getSnapshot
-  };
-};
+}) => ({
+  components,
+  surfaceContext
+}) => surfaceContext ? getRecommendedComponents({
+  components,
+  context: surfaceContext,
+  isRecommendedItem,
+  maxRecommendedItems
+}) : [];

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

@@ -21,7 +21,8 @@ const isImeEnter = event => event.isComposing || event.keyCode === 229;
 const QuickInsertMenuRoot = ({
   emptyStateHandler,
   fireAnalyticsEvent,
-  getItemRank
+  getItemRank,
+  getRecommendedItems
 }) => {
   var _surfaceContext$get, _registeredMenu$maxHe;
   const registeredMenu = useRegisteredMenuContext();
@@ -46,13 +47,14 @@ const QuickInsertMenuRoot = ({
     components,
     formatMessage,
     getItemRank: runtimeItemRank !== null && runtimeItemRank !== void 0 ? runtimeItemRank : getItemRank,
+    getRecommendedItems,
     query,
     rootComponent,
     selectCategoryItems: components.some(({
       key
     }) => isSectionOverflowItemKey(key)) ? selectQuickInsertCategoryItems : undefined,
     surfaceContext
-  }), [components, formatMessage, getItemRank, query, rootComponent, runtimeItemRank, surfaceContext]);
+  }), [components, formatMessage, getItemRank, getRecommendedItems, query, rootComponent, runtimeItemRank, surfaceContext]);
   const resultCount = useMemo(() => model.sections.reduce((count, [, ...items]) => count + items.filter(({
     key
   }) => !isSectionOverflowItemKey(key)).length, 0), [model.sections]);
@@ -82,6 +84,7 @@ const QuickInsertMenuRoot = ({
     selectableItems,
     selectedItemIndex,
     activeItemKey,
+    selectionSource,
     ...listEvents
   } = useRegisteredMenu({
     model,
@@ -167,7 +170,8 @@ const QuickInsertMenuRoot = ({
     onRenderedItemsChange: setRenderedItems,
     query: query,
     rows: rows,
-    selectedItemIndex: selectedItemIndex
+    selectedItemIndex: selectedItemIndex,
+    selectionSource: selectionSource
   }) : /*#__PURE__*/React.createElement(ToolbarQuickInsertMenu, {
     Item: RegisteredQuickInsertMenuItem,
     activePreviewItemKey: activeItemKey,
@@ -185,7 +189,8 @@ const QuickInsertMenuRoot = ({
     onRenderedItemsChange: setRenderedItems,
     query: query,
     rows: rows,
-    selectedItemIndex: selectedItemIndex
+    selectedItemIndex: selectedItemIndex,
+    selectionSource: selectionSource
   }))));
 };
 export default QuickInsertMenuRoot;

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

@@ -7,7 +7,6 @@ export const RegisteredQuickInsertMenuItem = ({
   isActive,
   registration
 }) => {
-  var _registration$compone;
   const {
     editorView,
     isOffline,
@@ -27,8 +26,11 @@ export const RegisteredQuickInsertMenuItem = ({
     select,
     surfaceContext
   }), [editorView, isOffline, popupsMountPoint, select, surfaceContext, isActive, id, isSelected]);
-  const Component = (_registration$compone = registration.component) !== null && _registration$compone !== void 0 ? _registration$compone : React.Fragment;
+  const 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/es2019/ui/registered-menu/ToolbarQuickInsertMenu.js

@@ -32,7 +32,8 @@ export const ToolbarQuickInsertMenu = ({
   onItemVisibilityChange,
   onRenderedItemsChange,
   query,
-  selectedItemIndex
+  selectedItemIndex,
+  selectionSource
 }) => {
   const footerItemIndex = itemCount - 1;
   const footerItemId = getQuickInsertMenuItemId(listId, footerItemIndex);
@@ -79,6 +80,7 @@ export const ToolbarQuickInsertMenu = ({
     getItemId: getItemId,
     activeItemKey: activePreviewItemKey,
     selectedItemIndex: selectedItemIndex,
+    selectionSource: selectionSource,
     scrollResetKey: query,
     onItemHover: onItemHover,
     onItemFocus: onItemFocus,