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

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-quick-insert
 
+## 30.0.3
+
+### Patch Changes
+
+- [`9e0f075939161`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9e0f075939161) -
+  Deduplicate registered Quick Insert items across recommended, search, and browse views, while
+  preserving selection identity and registration context when `platform_editor_slash_command` is
+  enabled.
+- Updated dependencies
+
+## 30.0.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 30.0.1
 
 ### Patch Changes

package/dist/cjs/quickInsertPlugin.js

@@ -28,6 +28,7 @@ var _pluginKey = require("./pm-plugins/plugin-key");
 var _blockControlQuickInsert = require("./ui/block-control-quick-insert");
 var _getLegacyCompatibleComponents = require("./ui/getLegacyCompatibleComponents");
 var _getQuickInsertComponents = require("./ui/getQuickInsertComponents");
+var _getRecommendedComponents = require("./ui/getRecommendedComponents");
 var _ModalElementBrowser = _interopRequireDefault(require("./ui/ModalElementBrowser"));
 var _RegistryElementBrowser = require("./ui/RegistryElementBrowser");
 var _search = require("./ui/search");
@@ -43,6 +44,10 @@ var quickInsertPlugin = exports.quickInsertPlugin = function quickInsertPlugin(_
   };
   var typeAheadPrioritySortingFn = (0, _search.withLayoutQuickInsertPrioritySorting)(options === null || options === void 0 ? void 0 : options.prioritySortingFn);
   var getItemRank = (0, _quickInsertRank.createQuickInsertRankResolver)(options === null || options === void 0 ? void 0 : options.getItemRank);
+  var getRecommendedItems = (0, _getRecommendedComponents.createRecommendedItemsResolver)({
+    isRecommendedItem: options === null || options === void 0 ? void 0 : options.isRecommendedItem,
+    maxRecommendedItems: options === null || options === void 0 ? void 0 : options.maxRecommendedItems
+  });
   var typeAhead = {
     id: _typeAhead.TypeAheadAvailableNodes.QUICK_INSERT,
     registeredMenuKey: (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_slash_command') ? _keys.MENU.key : undefined,
@@ -91,8 +96,7 @@ var quickInsertPlugin = exports.quickInsertPlugin = function quickInsertPlugin(_
     api === null || api === void 0 || (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 || _api$uiControlRegistr.actions.register((0, _getQuickInsertComponents.getQuickInsertComponents)({
       api: api,
       getItemRank: getItemRank,
-      isRecommendedItem: options === null || options === void 0 ? void 0 : options.isRecommendedItem,
-      maxRecommendedItems: options === null || options === void 0 ? void 0 : options.maxRecommendedItems,
+      getRecommendedItems: getRecommendedItems,
       emptyStateHandler: options === null || options === void 0 ? void 0 : options.emptyStateHandler,
       fireAnalyticsEvent: api === null || api === 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/cjs/ui/getQuickInsertComponents.js

@@ -13,9 +13,7 @@ var _messages = require("@atlaskit/editor-common/quick-insert/messages");
 var _rank = require("@atlaskit/editor-common/quick-insert/rank");
 var _typeAheadGetMenuFooterSectionKey = require("@atlaskit/editor-common/type-ahead-get-menu-footer-section-key");
 var _typeAheadGetSectionOverflowItemKey = require("@atlaskit/editor-common/type-ahead-get-section-overflow-item-key");
-var _getRecommendedComponents = require("./getRecommendedComponents");
 var _QuickInsertMenuFooterItem = require("./QuickInsertMenuFooterItem");
-var _QuickInsertRecommendedSlot = require("./QuickInsertRecommendedSlot");
 var _QuickInsertSectionOverflowMenuItem = require("./QuickInsertSectionOverflowMenuItem");
 var _QuickInsertMenuRoot = _interopRequireDefault(require("./registered-menu/QuickInsertMenuRoot"));
 var _QuickInsertMenuSection = require("./registered-menu/QuickInsertMenuSection");
@@ -64,62 +62,24 @@ var createSectionComponent = function createSectionComponent(message) {
 var getQuickInsertComponents = exports.getQuickInsertComponents = function getQuickInsertComponents(_ref2) {
   var api = _ref2.api,
     includeElementBrowserItems = _ref2.includeElementBrowserItems,
-    isRecommendedItem = _ref2.isRecommendedItem,
-    maxRecommendedItems = _ref2.maxRecommendedItems,
     getItemRank = _ref2.getItemRank,
+    getRecommendedItems = _ref2.getRecommendedItems,
     emptyStateHandler = _ref2.emptyStateHandler,
     fireAnalyticsEvent = _ref2.fireAnalyticsEvent;
-  var recommendedSnapshot = (0, _getRecommendedComponents.createRecommendedSnapshotCache)({
-    api: api,
-    isRecommendedItem: isRecommendedItem,
-    maxRecommendedItems: maxRecommendedItems
-  });
-  var recommendedSlots = Array.from({
-    length: _getRecommendedComponents.MAX_RECOMMENDED_ITEMS
-  }, function (_, index) {
-    return {
-      key: "".concat(_getRecommendedComponents.RECOMMENDED_SLOT_KEY_PREFIX).concat(index),
-      type: 'menu-item',
-      parents: [{
-        key: _keys.RECOMMENDED_SECTION.key,
-        type: _keys.RECOMMENDED_SECTION.type,
-        rank: index
-      }],
-      match: function match() {
-        return null;
-      },
-      isHidden: function isHidden() {
-        var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-          surfaceContext = _ref3.surfaceContext;
-        return !recommendedSnapshot.getSnapshot(surfaceContext)[index];
-      },
-      component: function component(_ref4) {
-        var children = _ref4.children,
-          parents = _ref4.parents,
-          surfaceContext = _ref4.surfaceContext;
-        return /*#__PURE__*/_react.default.createElement(_QuickInsertRecommendedSlot.QuickInsertRecommendedSlot, {
-          parents: parents,
-          surfaceContext: surfaceContext,
-          index: index,
-          getSnapshot: recommendedSnapshot.getSnapshot
-        }, children);
-      }
-    };
-  });
   return [{
     key: _keys.MENU.key,
     type: _keys.MENU.type,
-    component: function component(_ref5) {
-      var children = _ref5.children;
+    component: function component() {
       return /*#__PURE__*/_react.default.createElement(_QuickInsertMenuRoot.default, {
         getItemRank: getItemRank,
+        getRecommendedItems: getRecommendedItems,
         emptyStateHandler: emptyStateHandler,
         fireAnalyticsEvent: fireAnalyticsEvent
-      }, children);
+      });
     }
-  }].concat(recommendedSlots, (0, _toConsumableArray2.default)(categories.flatMap(function (_ref6) {
-    var message = _ref6.message,
-      section = _ref6.section;
+  }].concat((0, _toConsumableArray2.default)(categories.flatMap(function (_ref3) {
+    var message = _ref3.message,
+      section = _ref3.section;
     return [{
       key: section.key,
       type: section.type,
@@ -128,12 +88,7 @@ var getQuickInsertComponents = exports.getQuickInsertComponents = function getQu
         type: _keys.MENU.type,
         rank: _rank.QUICK_INSERT_MENU_RANK[section.key]
       }],
-      component: createSectionComponent(message),
-      isHidden: section.key === _keys.RECOMMENDED_SECTION.key ? function () {
-        var _ref7 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-          surfaceContext = _ref7.surfaceContext;
-        return recommendedSnapshot.getSnapshot(surfaceContext).length === 0;
-      } : undefined
+      component: createSectionComponent(message)
     }].concat((0, _toConsumableArray2.default)(includeElementBrowserItems && section.key !== _keys.RECOMMENDED_SECTION.key ? [{
       key: (0, _typeAheadGetSectionOverflowItemKey.getSectionOverflowItemKey)(section.key),
       type: 'menu-item',

package/dist/cjs/ui/getRecommendedComponents.js

@@ -3,32 +3,26 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.resolveMaxRecommendedItems = exports.isRecommendedSlotKey = exports.getRecommendedComponents = exports.createRecommendedSnapshotCache = exports.RECOMMENDED_SLOT_KEY_PREFIX = exports.MAX_RECOMMENDED_ITEMS = void 0;
+exports.resolveMaxRecommendedItems = exports.getRecommendedComponents = exports.createRecommendedItemsResolver = exports.MAX_RECOMMENDED_ITEMS = void 0;
 var _error = require("@atlaskit/editor-common/monitoring/error");
 var _getProviderMenuItemKey = require("@atlaskit/editor-common/quick-insert/get-provider-menu-item-key");
 var _isRecommendedItem = require("@atlaskit/editor-common/quick-insert/is-recommended-item");
-var _keys = require("@atlaskit/editor-common/quick-insert/keys");
-var _surfaceContext = require("@atlaskit/editor-common/registered-menu/surface-context");
 var _typeAheadIsMenuFooterSectionKey = require("@atlaskit/editor-common/type-ahead-is-menu-footer-section-key");
 var _typeAheadIsSectionOverflowItemKey = require("@atlaskit/editor-common/type-ahead-is-section-overflow-item-key");
 var MAX_RECOMMENDED_ITEMS = exports.MAX_RECOMMENDED_ITEMS = 5;
-var RECOMMENDED_SLOT_KEY_PREFIX = exports.RECOMMENDED_SLOT_KEY_PREFIX = 'quick-insert-recommended-slot-';
-var isRecommendedSlotKey = exports.isRecommendedSlotKey = function isRecommendedSlotKey(key) {
-  return key.startsWith(RECOMMENDED_SLOT_KEY_PREFIX);
-};
 var isRecommendationCandidate = function isRecommendationCandidate(component) {
-  return component.type === 'menu-item' && !isRecommendedSlotKey(component.key) && !(0, _typeAheadIsSectionOverflowItemKey.isSectionOverflowItemKey)(component.key) && !component.parents.some(function (parent) {
+  return component.type === 'menu-item' && !(0, _typeAheadIsSectionOverflowItemKey.isSectionOverflowItemKey)(component.key) && !component.parents.some(function (parent) {
     return (0, _typeAheadIsMenuFooterSectionKey.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. */
 var resolveMaxRecommendedItems = exports.resolveMaxRecommendedItems = function resolveMaxRecommendedItems(maxRecommendedItems) {
   if (maxRecommendedItems === undefined || !Number.isFinite(maxRecommendedItems)) {
     return MAX_RECOMMENDED_ITEMS;
   }
   if (maxRecommendedItems > MAX_RECOMMENDED_ITEMS) {
-    void (0, _error.logException)(new Error('Quick Insert maxRecommendedItems exceeds the available slots'), {
+    void (0, _error.logException)(new Error('Quick Insert maxRecommendedItems exceeds the supported maximum'), {
       location: 'editor-plugin-quick-insert/getRecommendedComponents'
     });
   }
@@ -73,34 +67,21 @@ var getRecommendedComponents = exports.getRecommendedComponents = function getRe
   });
 };
 
-/** Keeps only the current menu-open recommendation snapshot. */
-
-var createRecommendedSnapshotCache = exports.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.
+ */
+var createRecommendedItemsResolver = exports.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(_surfaceContext.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(_keys.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/cjs/ui/registered-menu/QuickInsertMenuRoot.js

@@ -38,7 +38,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 = (0, _context.useRegisteredMenuContext)();
   var _registeredMenu$query = registeredMenu.query,
     query = _registeredMenu$query === void 0 ? '' : _registeredMenu$query,
@@ -58,6 +59,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) {
@@ -66,7 +68,7 @@ var QuickInsertMenuRoot = function QuickInsertMenuRoot(_ref) {
       }) ? _selectQuickInsertCategoryItems.selectQuickInsertCategoryItems : undefined,
       surfaceContext: surfaceContext
     });
-  }, [components, formatMessage, getItemRank, query, rootComponent, runtimeItemRank, surfaceContext]);
+  }, [components, formatMessage, getItemRank, getRecommendedItems, query, rootComponent, runtimeItemRank, surfaceContext]);
   var resultCount = (0, _react.useMemo)(function () {
     return model.sections.reduce(function (count, _ref3) {
       var _ref4 = (0, _toArray2.default)(_ref3),

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

@@ -10,7 +10,6 @@ var _provider = require("@atlaskit/editor-common/quick-insert/provider");
 var _useQuickInsertContext = require("@atlaskit/editor-common/quick-insert/use-quick-insert-context");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var RegisteredQuickInsertMenuItem = exports.RegisteredQuickInsertMenuItem = function RegisteredQuickInsertMenuItem(_ref) {
-  var _registration$compone;
   var id = _ref.id,
     isSelected = _ref.isSelected,
     isActive = _ref.isActive,
@@ -35,8 +34,11 @@ var RegisteredQuickInsertMenuItem = exports.RegisteredQuickInsertMenuItem = func
       surfaceContext: surfaceContext
     };
   }, [editorView, isOffline, popupsMountPoint, select, surfaceContext, isActive, id, isSelected]);
-  var Component = (_registration$compone = registration.component) !== null && _registration$compone !== void 0 ? _registration$compone : _react.default.Fragment;
+  var Component = registration.component;
   return /*#__PURE__*/_react.default.createElement(_provider.QuickInsertProvider, {
     value: value
-  }, /*#__PURE__*/_react.default.createElement(Component, null, null));
+  }, Component ? /*#__PURE__*/_react.default.createElement(Component, {
+    parents: registration.parents,
+    surfaceContext: surfaceContext
+  }, null) : null);
 };

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