@atlaskit/editor-plugin-type-ahead 25.0.6 → 26.0.1

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-plugin-type-ahead
 
+## 26.0.1
+
+### Patch Changes
+
+- [`5351e01090c9c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5351e01090c9c) -
+  Show the five strongest matches first, then remaining matches in category order without category
+  titles, in slash-command and toolbar insert search. Share the row projection across rendering and
+  keyboard selection under the platform_editor_slash_command experiment.
+- Updated dependencies
+
+## 26.0.0
+
+### Patch Changes
+
+- [`1cb97ba88fb58`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1cb97ba88fb58) -
+  Clean up experiment `platform_editor_insert_menu_ai` (keep control).
+
+  Breaking changes (`@atlaskit/editor-common`): removed `getEmptyItem` from `TypeAheadHandler`, and
+  removed the unused messages `typeAheadListMessages.emptySearchResultsSuggestionNew`,
+  `typeAheadListMessages.emptySearchResultsSuggestionAskRovoOnly` and
+  `toolbarInsertBlockMessages.askRovo`.
+
+- Updated dependencies
+
 ## 25.0.6
 
 ### Patch Changes

package/dist/cjs/ui/TypeAheadList.js

@@ -18,7 +18,6 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 var _ui = require("@atlaskit/editor-common/ui");
 var _menuGroup = _interopRequireDefault(require("@atlaskit/menu/menu-group"));
-var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
@@ -127,7 +126,6 @@ var TypeAheadListComponent = /*#__PURE__*/_react.default.memo(function (_ref4) {
   var _itemRowIndexByItemIn, _triggerHandler$getMo, _decorationElement$qu2;
   var items = _ref4.items,
     sections = _ref4.sections,
-    emptyItem = _ref4.emptyItem,
     selectedIndex = _ref4.selectedIndex,
     _ref4$isEmptyQuery = _ref4.isEmptyQuery,
     isEmptyQuery = _ref4$isEmptyQuery === void 0 ? true : _ref4$isEmptyQuery,
@@ -154,7 +152,6 @@ var TypeAheadListComponent = /*#__PURE__*/_react.default.memo(function (_ref4) {
 
   // Exclude view more item from the count
   var itemsLength = showMoreOptionsButton ? Math.max(items.length - 1, 0) : items.length;
-  var isEmptyStateActive = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_insert_menu_ai') && !!emptyItem && itemsLength === 1 && items[0] === emptyItem;
   var estimatedHeight = itemsLength * LIST_ITEM_ESTIMATED_HEIGHT;
   var _useState = (0, _react.useState)(Math.min(estimatedHeight, fitHeight)),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -494,10 +491,7 @@ var TypeAheadListComponent = /*#__PURE__*/_react.default.memo(function (_ref4) {
   }, intl.formatMessage(_typeAhead.typeAheadListMessages.emptySearchResults)), (0, _react2.jsx)(_compiled.Text, {
     align: "center",
     as: "p"
-  }, intl.formatMessage((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_insert_menu_ai') ? showMoreOptionsButton ? _typeAhead.typeAheadListMessages.emptySearchResultsSuggestionNew : _typeAhead.typeAheadListMessages.emptySearchResultsSuggestionAskRovoOnly : _typeAhead.typeAheadListMessages.emptySearchResultsSuggestion, {
-    askRovoName: (0, _react2.jsx)(_compiled.Text, {
-      weight: "medium"
-    }, intl.formatMessage(_messages.toolbarInsertBlockMessages.askRovo)),
+  }, intl.formatMessage(_typeAhead.typeAheadListMessages.emptySearchResultsSuggestion, {
     buttonName: (0, _react2.jsx)(_compiled.Text, {
       weight: "medium"
     }, intl.formatMessage(_messages.toolbarInsertBlockMessages.viewMore))
@@ -538,7 +532,7 @@ var TypeAheadListComponent = /*#__PURE__*/_react.default.memo(function (_ref4) {
   }, (0, _react2.jsx)("div", {
     id: menuGroupId,
     ref: listContainerRef
-  }, isEmptyStateActive && EmptyResultView, isEmptyStateActive ? ListContent : !showMoreOptionsButton || itemsLength ? ListContent : EmptyResultView, showMoreOptionsButton && config && (0, _react2.jsx)(_MoreOptions.MoreOptions, {
+  }, !showMoreOptionsButton || itemsLength ? ListContent : EmptyResultView, showMoreOptionsButton && config && (0, _react2.jsx)(_MoreOptions.MoreOptions, {
     title: config.title,
     ariaLabel: config.ariaLabel,
     onClick: handleClick,

package/dist/cjs/ui/TypeAheadMenu.js

@@ -8,7 +8,6 @@ exports.TypeAheadMenu = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireDefault(require("react"));
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
-var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _updateSelectedIndex = require("../pm-plugins/commands/update-selected-index");
 var _useItemInsert3 = require("./hooks/use-item-insert");
@@ -88,13 +87,7 @@ var TypeAheadMenu = exports.TypeAheadMenu = /*#__PURE__*/_react.default.memo(fun
   if ((0, _editorExperiment.editorExperiment)('platform_editor_controls', 'variant1')) {
     showMoreOptionsButton = !!(triggerHandler !== null && triggerHandler !== void 0 && triggerHandler.getMoreOptionsButtonConfig);
   }
-  var emptyItem = _react.default.useMemo(function () {
-    var _triggerHandler$getEm;
-    return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_insert_menu_ai') ? triggerHandler === null || triggerHandler === void 0 || (_triggerHandler$getEm = triggerHandler.getEmptyItem) === null || _triggerHandler$getEm === void 0 ? void 0 : _triggerHandler$getEm.call(triggerHandler, {
-      editorState: editorView.state
-    }) : undefined;
-  }, [triggerHandler, editorView.state]);
-  if (!isOpen || !triggerHandler || !(decorationElement instanceof HTMLElement) || !openElementBrowserModal && items.length === 0 && !errorInfo && !emptyItem) {
+  if (!isOpen || !triggerHandler || !(decorationElement instanceof HTMLElement) || !openElementBrowserModal && items.length === 0 && !errorInfo) {
     return null;
   }
   return /*#__PURE__*/_react.default.createElement(_TypeAheadPopup.TypeAheadPopup, {
@@ -106,7 +99,6 @@ var TypeAheadMenu = exports.TypeAheadMenu = /*#__PURE__*/_react.default.memo(fun
     triggerHandler: triggerHandler,
     items: items,
     sections: sections,
-    emptyItem: emptyItem,
     errorInfo: errorInfo,
     selectedIndex: selectedIndex,
     setSelectedItem: setSelectedItem,

package/dist/cjs/ui/TypeAheadPopup.js

@@ -75,7 +75,6 @@ var TypeAheadPopup = exports.TypeAheadPopup = /*#__PURE__*/_react.default.memo(f
     items = props.items,
     _props$sections = props.sections,
     sections = _props$sections === void 0 ? [] : _props$sections,
-    emptyItem = props.emptyItem,
     errorInfo = props.errorInfo,
     selectedIndex = props.selectedIndex,
     onItemInsert = props.onItemInsert,
@@ -349,7 +348,6 @@ var TypeAheadPopup = exports.TypeAheadPopup = /*#__PURE__*/_react.default.memo(f
     items: items,
     isEmptyQuery: isEmptyQuery,
     sections: sections,
-    emptyItem: emptyItem,
     selectedIndex: selectedIndex
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     ,

package/dist/cjs/ui/hooks/use-load-items.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.useLoadItems = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
-var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 var _clearListError = require("../../pm-plugins/commands/clear-list-error");
 var _updateListError = require("../../pm-plugins/commands/update-list-error");
 var _updateListItems = require("../../pm-plugins/commands/update-list-items");
@@ -48,19 +47,14 @@ var useLoadItems = exports.useLoadItems = function useLoadItems(triggerHandler,
      * Promise path and the opt-in multi-emit `subscribeToItemsUpdates`
      * path. Renders the dropdown with whatever items it is given.
      *
-     * Both paths share the empty-state injection, section-building
-     * and "View more" placeholder logic — extracting this helper
+     * Both paths share the section-building and "View more"
+     * placeholder logic — extracting this helper
      * avoids any chance the two paths drift in subtle rendering
      * behaviour.
      */
     var renderResult = function renderResult(result) {
-      var _triggerHandler$getEm;
-      var emptyItem = result.length === 0 && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_insert_menu_ai') ? (_triggerHandler$getEm = triggerHandler.getEmptyItem) === null || _triggerHandler$getEm === void 0 ? void 0 : _triggerHandler$getEm.call(triggerHandler, {
-        editorState: editorView.state
-      }) : undefined;
-      var rawList = result.length > 0 ? result : emptyItem ? [emptyItem] : EMPTY_LIST_ITEM;
       var _buildSectionedResult = (0, _buildSectionedResult2.buildSectionedResult)({
-          items: rawList,
+          items: result.length > 0 ? result : EMPTY_LIST_ITEM,
           triggerHandler: triggerHandler,
           intl: intl !== null && intl !== void 0 ? intl : null
         }),

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

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.RegisteredTypeAheadMenu = void 0;
 require("./RegisteredTypeAheadMenu.compiled.css");
 var _runtime = require("@compiled/react/runtime");
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
@@ -107,9 +106,8 @@ var RegisteredTypeAheadMenu = exports.RegisteredTypeAheadMenu = function Registe
     });
   }, [components, formatMessage, hasSectionOverflowItems, isSlashCommandEnabled, query, surfaceContext, surface.root]);
   var rows = (0, _react.useMemo)(function () {
-    var _menuModel$fallbackIt;
-    return [].concat((0, _toConsumableArray2.default)(menuModel.sections.flat()), (0, _toConsumableArray2.default)((_menuModel$fallbackIt = menuModel.fallbackItems) !== null && _menuModel$fallbackIt !== void 0 ? _menuModel$fallbackIt : []));
-  }, [menuModel.fallbackItems, menuModel.sections]);
+    return (0, _registeredMenuModel.getQuickInsertMenuRows)(menuModel);
+  }, [menuModel]);
   var _useState5 = (0, _react.useState)(),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     previewActivation = _useState6[0],

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

@@ -7,11 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.TypeAheadMenuRenderer = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _CellMeasurer = require("react-virtualized/dist/commonjs/CellMeasurer");
 var _List = require("react-virtualized/dist/commonjs/List");
+var _registeredMenuModel = require("@atlaskit/editor-common/quick-insert/registered-menu-model");
 var _useMenuListHeight2 = require("@atlaskit/editor-common/quick-insert/use-menu-list-height");
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 var _compiled = require("@atlaskit/primitives/compiled");
@@ -41,9 +41,8 @@ var TypeAheadMenuRenderer = exports.TypeAheadMenuRenderer = function TypeAheadMe
   var intl = (0, _reactIntl.useIntl)();
   var listRef = (0, _react.useRef)(null);
   var rows = (0, _react.useMemo)(function () {
-    var _model$fallbackItems;
-    return [].concat((0, _toConsumableArray2.default)(model.sections.flat()), (0, _toConsumableArray2.default)((_model$fallbackItems = model.fallbackItems) !== null && _model$fallbackItems !== void 0 ? _model$fallbackItems : []));
-  }, [model.fallbackItems, model.sections]);
+    return (0, _registeredMenuModel.getQuickInsertMenuRows)(model);
+  }, [model]);
   var cache = (0, _react.useMemo)(function () {
     return new _CellMeasurer.CellMeasurerCache({
       defaultHeight: ESTIMATED_ROW_HEIGHT,

package/dist/es2019/ui/TypeAheadList.js

@@ -15,7 +15,6 @@ import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/
 import { SelectItemMode, typeAheadListMessages } from '@atlaskit/editor-common/type-ahead';
 import { AssistiveText } from '@atlaskit/editor-common/ui';
 import MenuGroup from '@atlaskit/menu/menu-group';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Box, Inline, Text } from '@atlaskit/primitives/compiled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -112,7 +111,6 @@ const TypeaheadAssistiveTextPureComponent = /*#__PURE__*/React.memo(({
 const TypeAheadListComponent = /*#__PURE__*/React.memo(({
   items,
   sections,
-  emptyItem,
   selectedIndex,
   isEmptyQuery = true,
   editorView,
@@ -140,7 +138,6 @@ const TypeAheadListComponent = /*#__PURE__*/React.memo(({
 
   // Exclude view more item from the count
   const itemsLength = showMoreOptionsButton ? Math.max(items.length - 1, 0) : items.length;
-  const isEmptyStateActive = isExperimentEnabled('platform_editor_insert_menu_ai') && !!emptyItem && itemsLength === 1 && items[0] === emptyItem;
   const estimatedHeight = itemsLength * LIST_ITEM_ESTIMATED_HEIGHT;
   const [height, setHeight] = useState(Math.min(estimatedHeight, fitHeight));
   const [cache, setCache] = useState(new CellMeasurerCache({
@@ -466,10 +463,7 @@ const TypeAheadListComponent = /*#__PURE__*/React.memo(({
   }, intl.formatMessage(typeAheadListMessages.emptySearchResults)), jsx(Text, {
     align: "center",
     as: "p"
-  }, intl.formatMessage(isExperimentEnabled('platform_editor_insert_menu_ai') ? showMoreOptionsButton ? typeAheadListMessages.emptySearchResultsSuggestionNew : typeAheadListMessages.emptySearchResultsSuggestionAskRovoOnly : typeAheadListMessages.emptySearchResultsSuggestion, {
-    askRovoName: jsx(Text, {
-      weight: "medium"
-    }, intl.formatMessage(messages.askRovo)),
+  }, intl.formatMessage(typeAheadListMessages.emptySearchResultsSuggestion, {
     buttonName: jsx(Text, {
       weight: "medium"
     }, intl.formatMessage(messages.viewMore))
@@ -510,7 +504,7 @@ const TypeAheadListComponent = /*#__PURE__*/React.memo(({
   }, jsx("div", {
     id: menuGroupId,
     ref: listContainerRef
-  }, isEmptyStateActive && EmptyResultView, isEmptyStateActive ? ListContent : !showMoreOptionsButton || itemsLength ? ListContent : EmptyResultView, showMoreOptionsButton && config && jsx(MoreOptions, {
+  }, !showMoreOptionsButton || itemsLength ? ListContent : EmptyResultView, showMoreOptionsButton && config && jsx(MoreOptions, {
     title: config.title,
     ariaLabel: config.ariaLabel,
     onClick: handleClick,

package/dist/es2019/ui/TypeAheadMenu.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import { SelectItemMode } from '@atlaskit/editor-common/type-ahead';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { updateSelectedIndex } from '../pm-plugins/commands/update-selected-index';
 import { useItemInsert } from './hooks/use-item-insert';
@@ -78,13 +77,7 @@ export const TypeAheadMenu = /*#__PURE__*/React.memo(({
   if (editorExperiment('platform_editor_controls', 'variant1')) {
     showMoreOptionsButton = !!(triggerHandler !== null && triggerHandler !== void 0 && triggerHandler.getMoreOptionsButtonConfig);
   }
-  const emptyItem = React.useMemo(() => {
-    var _triggerHandler$getEm;
-    return isExperimentEnabled('platform_editor_insert_menu_ai') ? triggerHandler === null || triggerHandler === void 0 ? void 0 : (_triggerHandler$getEm = triggerHandler.getEmptyItem) === null || _triggerHandler$getEm === void 0 ? void 0 : _triggerHandler$getEm.call(triggerHandler, {
-      editorState: editorView.state
-    }) : undefined;
-  }, [triggerHandler, editorView.state]);
-  if (!isOpen || !triggerHandler || !(decorationElement instanceof HTMLElement) || !openElementBrowserModal && items.length === 0 && !errorInfo && !emptyItem) {
+  if (!isOpen || !triggerHandler || !(decorationElement instanceof HTMLElement) || !openElementBrowserModal && items.length === 0 && !errorInfo) {
     return null;
   }
   return /*#__PURE__*/React.createElement(TypeAheadPopup, {
@@ -96,7 +89,6 @@ export const TypeAheadMenu = /*#__PURE__*/React.memo(({
     triggerHandler: triggerHandler,
     items: items,
     sections: sections,
-    emptyItem: emptyItem,
     errorInfo: errorInfo,
     selectedIndex: selectedIndex,
     setSelectedItem: setSelectedItem,

package/dist/es2019/ui/TypeAheadPopup.js

@@ -65,7 +65,6 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
     popupsScrollableElement,
     items,
     sections = [],
-    emptyItem,
     errorInfo,
     selectedIndex,
     onItemInsert,
@@ -344,7 +343,6 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
     items: items,
     isEmptyQuery: isEmptyQuery,
     sections: sections,
-    emptyItem: emptyItem,
     selectedIndex: selectedIndex
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     ,

package/dist/es2019/ui/hooks/use-load-items.js

@@ -1,5 +1,4 @@
 import { useEffect, useRef, useState } from 'react';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { clearListError } from '../../pm-plugins/commands/clear-list-error';
 import { updateListError } from '../../pm-plugins/commands/update-list-error';
 import { updateListItem } from '../../pm-plugins/commands/update-list-items';
@@ -36,22 +35,17 @@ export const useLoadItems = (triggerHandler, editorView, query, showViewMore, ap
      * Promise path and the opt-in multi-emit `subscribeToItemsUpdates`
      * path. Renders the dropdown with whatever items it is given.
      *
-     * Both paths share the empty-state injection, section-building
-     * and "View more" placeholder logic — extracting this helper
+     * Both paths share the section-building and "View more"
+     * placeholder logic — extracting this helper
      * avoids any chance the two paths drift in subtle rendering
      * behaviour.
      */
     const renderResult = result => {
-      var _triggerHandler$getEm;
-      const emptyItem = result.length === 0 && isExperimentEnabled('platform_editor_insert_menu_ai') ? (_triggerHandler$getEm = triggerHandler.getEmptyItem) === null || _triggerHandler$getEm === void 0 ? void 0 : _triggerHandler$getEm.call(triggerHandler, {
-        editorState: editorView.state
-      }) : undefined;
-      const rawList = result.length > 0 ? result : emptyItem ? [emptyItem] : EMPTY_LIST_ITEM;
       const {
         items: list,
         sections
       } = buildSectionedResult({
-        items: rawList,
+        items: result.length > 0 ? result : EMPTY_LIST_ITEM,
         triggerHandler,
         intl: intl !== null && intl !== void 0 ? intl : null
       });

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

@@ -3,7 +3,7 @@ import "./RegisteredTypeAheadMenu.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useId, useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';
 import { useIntl } from 'react-intl';
-import { buildQuickInsertMenuModel, getMatchingQuickInsertComponents, selectQuickInsertCategoryItems } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
+import { buildQuickInsertMenuModel, getMatchingQuickInsertComponents, getQuickInsertMenuRows, selectQuickInsertCategoryItems } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
 import { useMenuPopupSizing } from '@atlaskit/editor-common/quick-insert/use-menu-popup-sizing';
 import { isSectionOverflowItemKey } from '@atlaskit/editor-common/type-ahead-is-section-overflow-item-key';
 import { TYPE_AHEAD_SURFACE_CONTEXT } from '@atlaskit/editor-common/type-ahead-surface-context';
@@ -80,10 +80,7 @@ export const RegisteredTypeAheadMenu = ({
     formatMessage,
     surfaceContext
   }), [components, formatMessage, hasSectionOverflowItems, isSlashCommandEnabled, query, surfaceContext, surface.root]);
-  const rows = useMemo(() => {
-    var _menuModel$fallbackIt;
-    return [...menuModel.sections.flat(), ...((_menuModel$fallbackIt = menuModel.fallbackItems) !== null && _menuModel$fallbackIt !== void 0 ? _menuModel$fallbackIt : [])];
-  }, [menuModel.fallbackItems, menuModel.sections]);
+  const rows = useMemo(() => getQuickInsertMenuRows(menuModel), [menuModel]);
   const [previewActivation, setPreviewActivation] = useState();
   const activePreviewItemKey = (previewActivation === null || previewActivation === void 0 ? void 0 : previewActivation.menuModel) === menuModel ? previewActivation.itemKey : undefined;
   const selectableRowIndexes = useMemo(() => rows.flatMap((registration, rowIndex) => registration.type === 'menu-item' ? [rowIndex] : []), [rows]);

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

@@ -2,6 +2,7 @@ import React, { useCallback, useLayoutEffect, useMemo, useRef } from 'react';
 import { useIntl } from 'react-intl';
 import { CellMeasurerCache } from 'react-virtualized/dist/commonjs/CellMeasurer';
 import { List } from 'react-virtualized/dist/commonjs/List';
+import { getQuickInsertMenuRows } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
 import { useMenuListHeight } from '@atlaskit/editor-common/quick-insert/use-menu-list-height';
 import { typeAheadListMessages } from '@atlaskit/editor-common/type-ahead';
 import { Box, Text } from '@atlaskit/primitives/compiled';
@@ -27,10 +28,7 @@ export const TypeAheadMenuRenderer = ({
   var _model$root$component;
   const intl = useIntl();
   const listRef = useRef(null);
-  const rows = useMemo(() => {
-    var _model$fallbackItems;
-    return [...model.sections.flat(), ...((_model$fallbackItems = model.fallbackItems) !== null && _model$fallbackItems !== void 0 ? _model$fallbackItems : [])];
-  }, [model.fallbackItems, model.sections]);
+  const rows = useMemo(() => getQuickInsertMenuRows(model), [model]);
   const cache = useMemo(() => new CellMeasurerCache({
     defaultHeight: ESTIMATED_ROW_HEIGHT,
     fixedWidth: true

package/dist/esm/ui/TypeAheadList.js

@@ -17,7 +17,6 @@ import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/
 import { SelectItemMode, typeAheadListMessages } from '@atlaskit/editor-common/type-ahead';
 import { AssistiveText } from '@atlaskit/editor-common/ui';
 import MenuGroup from '@atlaskit/menu/menu-group';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Box, Inline, Text } from '@atlaskit/primitives/compiled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
@@ -118,7 +117,6 @@ var TypeAheadListComponent = /*#__PURE__*/React.memo(function (_ref4) {
   var _itemRowIndexByItemIn, _triggerHandler$getMo, _decorationElement$qu2;
   var items = _ref4.items,
     sections = _ref4.sections,
-    emptyItem = _ref4.emptyItem,
     selectedIndex = _ref4.selectedIndex,
     _ref4$isEmptyQuery = _ref4.isEmptyQuery,
     isEmptyQuery = _ref4$isEmptyQuery === void 0 ? true : _ref4$isEmptyQuery,
@@ -145,7 +143,6 @@ var TypeAheadListComponent = /*#__PURE__*/React.memo(function (_ref4) {
 
   // Exclude view more item from the count
   var itemsLength = showMoreOptionsButton ? Math.max(items.length - 1, 0) : items.length;
-  var isEmptyStateActive = isExperimentEnabled('platform_editor_insert_menu_ai') && !!emptyItem && itemsLength === 1 && items[0] === emptyItem;
   var estimatedHeight = itemsLength * LIST_ITEM_ESTIMATED_HEIGHT;
   var _useState = useState(Math.min(estimatedHeight, fitHeight)),
     _useState2 = _slicedToArray(_useState, 2),
@@ -485,10 +482,7 @@ var TypeAheadListComponent = /*#__PURE__*/React.memo(function (_ref4) {
   }, intl.formatMessage(typeAheadListMessages.emptySearchResults)), jsx(Text, {
     align: "center",
     as: "p"
-  }, intl.formatMessage(isExperimentEnabled('platform_editor_insert_menu_ai') ? showMoreOptionsButton ? typeAheadListMessages.emptySearchResultsSuggestionNew : typeAheadListMessages.emptySearchResultsSuggestionAskRovoOnly : typeAheadListMessages.emptySearchResultsSuggestion, {
-    askRovoName: jsx(Text, {
-      weight: "medium"
-    }, intl.formatMessage(messages.askRovo)),
+  }, intl.formatMessage(typeAheadListMessages.emptySearchResultsSuggestion, {
     buttonName: jsx(Text, {
       weight: "medium"
     }, intl.formatMessage(messages.viewMore))
@@ -529,7 +523,7 @@ var TypeAheadListComponent = /*#__PURE__*/React.memo(function (_ref4) {
   }, jsx("div", {
     id: menuGroupId,
     ref: listContainerRef
-  }, isEmptyStateActive && EmptyResultView, isEmptyStateActive ? ListContent : !showMoreOptionsButton || itemsLength ? ListContent : EmptyResultView, showMoreOptionsButton && config && jsx(MoreOptions, {
+  }, !showMoreOptionsButton || itemsLength ? ListContent : EmptyResultView, showMoreOptionsButton && config && jsx(MoreOptions, {
     title: config.title,
     ariaLabel: config.ariaLabel,
     onClick: handleClick,

package/dist/esm/ui/TypeAheadMenu.js

@@ -1,7 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React from 'react';
 import { SelectItemMode } from '@atlaskit/editor-common/type-ahead';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 import { updateSelectedIndex } from '../pm-plugins/commands/update-selected-index';
 import { useItemInsert } from './hooks/use-item-insert';
@@ -81,13 +80,7 @@ export var TypeAheadMenu = /*#__PURE__*/React.memo(function (_ref) {
   if (editorExperiment('platform_editor_controls', 'variant1')) {
     showMoreOptionsButton = !!(triggerHandler !== null && triggerHandler !== void 0 && triggerHandler.getMoreOptionsButtonConfig);
   }
-  var emptyItem = React.useMemo(function () {
-    var _triggerHandler$getEm;
-    return isExperimentEnabled('platform_editor_insert_menu_ai') ? triggerHandler === null || triggerHandler === void 0 || (_triggerHandler$getEm = triggerHandler.getEmptyItem) === null || _triggerHandler$getEm === void 0 ? void 0 : _triggerHandler$getEm.call(triggerHandler, {
-      editorState: editorView.state
-    }) : undefined;
-  }, [triggerHandler, editorView.state]);
-  if (!isOpen || !triggerHandler || !(decorationElement instanceof HTMLElement) || !openElementBrowserModal && items.length === 0 && !errorInfo && !emptyItem) {
+  if (!isOpen || !triggerHandler || !(decorationElement instanceof HTMLElement) || !openElementBrowserModal && items.length === 0 && !errorInfo) {
     return null;
   }
   return /*#__PURE__*/React.createElement(TypeAheadPopup, {
@@ -99,7 +92,6 @@ export var TypeAheadMenu = /*#__PURE__*/React.memo(function (_ref) {
     triggerHandler: triggerHandler,
     items: items,
     sections: sections,
-    emptyItem: emptyItem,
     errorInfo: errorInfo,
     selectedIndex: selectedIndex,
     setSelectedItem: setSelectedItem,

package/dist/esm/ui/TypeAheadPopup.js

@@ -65,7 +65,6 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
     items = props.items,
     _props$sections = props.sections,
     sections = _props$sections === void 0 ? [] : _props$sections,
-    emptyItem = props.emptyItem,
     errorInfo = props.errorInfo,
     selectedIndex = props.selectedIndex,
     onItemInsert = props.onItemInsert,
@@ -339,7 +338,6 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
     items: items,
     isEmptyQuery: isEmptyQuery,
     sections: sections,
-    emptyItem: emptyItem,
     selectedIndex: selectedIndex
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     ,

package/dist/esm/ui/hooks/use-load-items.js

@@ -1,6 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { useEffect, useRef, useState } from 'react';
-import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 import { clearListError } from '../../pm-plugins/commands/clear-list-error';
 import { updateListError } from '../../pm-plugins/commands/update-list-error';
 import { updateListItem } from '../../pm-plugins/commands/update-list-items';
@@ -41,19 +40,14 @@ export var useLoadItems = function useLoadItems(triggerHandler, editorView, quer
      * Promise path and the opt-in multi-emit `subscribeToItemsUpdates`
      * path. Renders the dropdown with whatever items it is given.
      *
-     * Both paths share the empty-state injection, section-building
-     * and "View more" placeholder logic — extracting this helper
+     * Both paths share the section-building and "View more"
+     * placeholder logic — extracting this helper
      * avoids any chance the two paths drift in subtle rendering
      * behaviour.
      */
     var renderResult = function renderResult(result) {
-      var _triggerHandler$getEm;
-      var emptyItem = result.length === 0 && isExperimentEnabled('platform_editor_insert_menu_ai') ? (_triggerHandler$getEm = triggerHandler.getEmptyItem) === null || _triggerHandler$getEm === void 0 ? void 0 : _triggerHandler$getEm.call(triggerHandler, {
-        editorState: editorView.state
-      }) : undefined;
-      var rawList = result.length > 0 ? result : emptyItem ? [emptyItem] : EMPTY_LIST_ITEM;
       var _buildSectionedResult = buildSectionedResult({
-          items: rawList,
+          items: result.length > 0 ? result : EMPTY_LIST_ITEM,
           triggerHandler: triggerHandler,
           intl: intl !== null && intl !== void 0 ? intl : null
         }),

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

@@ -1,11 +1,10 @@
 /* RegisteredTypeAheadMenu.tsx generated by @compiled/babel-plugin v3.0.2 */
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import "./RegisteredTypeAheadMenu.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useId, useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';
 import { useIntl } from 'react-intl';
-import { buildQuickInsertMenuModel, getMatchingQuickInsertComponents, selectQuickInsertCategoryItems } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
+import { buildQuickInsertMenuModel, getMatchingQuickInsertComponents, getQuickInsertMenuRows, selectQuickInsertCategoryItems } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
 import { useMenuPopupSizing } from '@atlaskit/editor-common/quick-insert/use-menu-popup-sizing';
 import { isSectionOverflowItemKey } from '@atlaskit/editor-common/type-ahead-is-section-overflow-item-key';
 import { TYPE_AHEAD_SURFACE_CONTEXT } from '@atlaskit/editor-common/type-ahead-surface-context';
@@ -98,9 +97,8 @@ export var RegisteredTypeAheadMenu = function RegisteredTypeAheadMenu(_ref) {
     });
   }, [components, formatMessage, hasSectionOverflowItems, isSlashCommandEnabled, query, surfaceContext, surface.root]);
   var rows = useMemo(function () {
-    var _menuModel$fallbackIt;
-    return [].concat(_toConsumableArray(menuModel.sections.flat()), _toConsumableArray((_menuModel$fallbackIt = menuModel.fallbackItems) !== null && _menuModel$fallbackIt !== void 0 ? _menuModel$fallbackIt : []));
-  }, [menuModel.fallbackItems, menuModel.sections]);
+    return getQuickInsertMenuRows(menuModel);
+  }, [menuModel]);
   var _useState5 = useState(),
     _useState6 = _slicedToArray(_useState5, 2),
     previewActivation = _useState6[0],

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

@@ -1,5 +1,4 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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; }
@@ -7,6 +6,7 @@ import React, { useCallback, useLayoutEffect, useMemo, useRef } from 'react';
 import { useIntl } from 'react-intl';
 import { CellMeasurerCache } from 'react-virtualized/dist/commonjs/CellMeasurer';
 import { List } from 'react-virtualized/dist/commonjs/List';
+import { getQuickInsertMenuRows } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
 import { useMenuListHeight } from '@atlaskit/editor-common/quick-insert/use-menu-list-height';
 import { typeAheadListMessages } from '@atlaskit/editor-common/type-ahead';
 import { Box, Text } from '@atlaskit/primitives/compiled';
@@ -32,9 +32,8 @@ export var TypeAheadMenuRenderer = function TypeAheadMenuRenderer(_ref) {
   var intl = useIntl();
   var listRef = useRef(null);
   var rows = useMemo(function () {
-    var _model$fallbackItems;
-    return [].concat(_toConsumableArray(model.sections.flat()), _toConsumableArray((_model$fallbackItems = model.fallbackItems) !== null && _model$fallbackItems !== void 0 ? _model$fallbackItems : []));
-  }, [model.fallbackItems, model.sections]);
+    return getQuickInsertMenuRows(model);
+  }, [model]);
   var cache = useMemo(function () {
     return new CellMeasurerCache({
       defaultHeight: ESTIMATED_ROW_HEIGHT,

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

@@ -26,7 +26,6 @@ export declare const TypeAheadList: React.FC<WithIntlProps<{
     api: ExtractInjectionAPI<TypeAheadPlugin> | undefined;
     decorationElement: HTMLElement;
     editorView: EditorView;
-    emptyItem?: TypeAheadItem;
     fitHeight: number;
     isEmptyQuery?: boolean;
     items: Array<TypeAheadItem>;
@@ -42,7 +41,6 @@ export declare const TypeAheadList: React.FC<WithIntlProps<{
         api: ExtractInjectionAPI<TypeAheadPlugin> | undefined;
         decorationElement: HTMLElement;
         editorView: EditorView;
-        emptyItem?: TypeAheadItem;
         fitHeight: number;
         isEmptyQuery?: boolean;
         items: Array<TypeAheadItem>;

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

@@ -20,7 +20,6 @@ type TypeAheadPopupProps = {
     }) => void;
     decorationSet: DecorationSet;
     editorView: EditorView;
-    emptyItem?: TypeAheadItem;
     errorInfo: TypeAheadErrorInfo;
     isEmptyQuery: boolean;
     items: Array<TypeAheadItem>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-type-ahead",
-	"version": "25.0.6",
+	"version": "26.0.1",
 	"description": "Type-ahead plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -21,13 +21,13 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^57.6.0",
+		"@atlaskit/adf-schema": "^57.7.0",
 		"@atlaskit/css": "^1.1.0",
-		"@atlaskit/editor-plugin-analytics": "^24.0.0",
-		"@atlaskit/editor-plugin-connectivity": "^24.0.0",
-		"@atlaskit/editor-plugin-context-panel": "^26.0.0",
-		"@atlaskit/editor-plugin-metrics": "^25.0.0",
-		"@atlaskit/editor-plugin-ui-control-registry": "^18.0.0",
+		"@atlaskit/editor-plugin-analytics": "^25.0.0",
+		"@atlaskit/editor-plugin-connectivity": "^25.0.0",
+		"@atlaskit/editor-plugin-context-panel": "^27.0.0",
+		"@atlaskit/editor-plugin-metrics": "^26.0.0",
+		"@atlaskit/editor-plugin-ui-control-registry": "^19.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
 		"@atlaskit/editor-shared-styles": "^4.3.0",
 		"@atlaskit/editor-ui-control-model": "^2.10.0",
@@ -42,7 +42,7 @@
 		"@atlaskit/primitives": "^22.5.0",
 		"@atlaskit/prosemirror-history": "^1.3.0",
 		"@atlaskit/prosemirror-input-rules": "^4.1.0",
-		"@atlaskit/tmp-editor-statsig": "^224.0.0",
+		"@atlaskit/tmp-editor-statsig": "^225.0.0",
 		"@atlaskit/tokens": "^20.3.0",
 		"@atlaskit/visually-hidden": "^4.4.0",
 		"@babel/runtime": "^7.0.0",
@@ -54,7 +54,7 @@
 		"w3c-keyname": "^2.1.8"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^128.4.0",
+		"@atlaskit/editor-common": "^129.1.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"