@atlaskit/editor-plugin-type-ahead 10.2.2 → 10.3.0

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

@@ -12,8 +12,9 @@ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 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");
+var _buildSectionedResult2 = require("./build-sectioned-result");
 var EMPTY_LIST_ITEM = [];
-var useLoadItems = exports.useLoadItems = function useLoadItems(triggerHandler, editorView, query, showViewMore, api) {
+var useLoadItems = exports.useLoadItems = function useLoadItems(triggerHandler, editorView, query, showViewMore, api, intl) {
   var _useState = (0, _react.useState)(EMPTY_LIST_ITEM),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     items = _useState2[0],
@@ -44,7 +45,14 @@ var useLoadItems = exports.useLoadItems = function useLoadItems(triggerHandler,
       var emptyItem = result.length === 0 && (0, _expValEquals.expValEquals)('platform_editor_insert_menu_ai', 'isEnabled', true) ? (_triggerHandler$getEm = triggerHandler.getEmptyItem) === null || _triggerHandler$getEm === void 0 ? void 0 : _triggerHandler$getEm.call(triggerHandler, {
         editorState: editorView.state
       }) : undefined;
-      var list = result.length > 0 ? result : emptyItem ? [emptyItem] : EMPTY_LIST_ITEM;
+      var rawList = result.length > 0 ? result : emptyItem ? [emptyItem] : EMPTY_LIST_ITEM;
+      var _buildSectionedResult = (0, _buildSectionedResult2.buildSectionedResult)({
+          items: rawList,
+          triggerHandler: triggerHandler,
+          intl: intl !== null && intl !== void 0 ? intl : null
+        }),
+        list = _buildSectionedResult.items,
+        sections = _buildSectionedResult.sections;
       if (componentIsMounted.current) {
         setItems(list);
       }
@@ -54,7 +62,7 @@ var useLoadItems = exports.useLoadItems = function useLoadItems(triggerHandler,
         title: 'View more'
       };
       queueMicrotask(function () {
-        (0, _updateListItems.updateListItem)(showViewMore ? list.concat(viewMoreItem) : list)(view.state, view.dispatch);
+        (0, _updateListItems.updateListItem)(showViewMore ? list.concat(viewMoreItem) : list, sections)(view.state, view.dispatch);
       });
     }).catch(function (e) {
       if ((0, _experiments.editorExperiment)('platform_editor_offline_editing_web', true)) {
@@ -72,7 +80,7 @@ var useLoadItems = exports.useLoadItems = function useLoadItems(triggerHandler,
     // ignore because EditorView is mutable but we don't want to
     // call loadItems when it changes, only when the query changes
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [triggerHandler, query]);
+  }, [triggerHandler, query, intl]);
   (0, _react.useEffect)(function () {
     return function () {
       componentIsMounted.current = false;

package/dist/es2019/pm-plugins/commands/update-list-items.js

@@ -1,12 +1,13 @@
 import { ACTIONS } from '../actions';
 import { pluginKey as typeAheadPluginKey } from '../key';
-export const updateListItem = items => {
+export const updateListItem = (items, sections = []) => {
   return (state, dispatch) => {
     const tr = state.tr;
     tr.setMeta(typeAheadPluginKey, {
       action: ACTIONS.UPDATE_LIST_ITEMS,
       params: {
-        items
+        items,
+        sections
       }
     });
     if (dispatch) {

package/dist/es2019/pm-plugins/main.js

@@ -53,6 +53,7 @@ export function createPlugin({
           decorationSet: DecorationSet.empty,
           decorationElement: null,
           items: [],
+          sections: [],
           errorInfo: null,
           selectedIndex: -1,
           stats: null,

package/dist/es2019/pm-plugins/reducer.js

@@ -66,6 +66,7 @@ export const createReducer = ({
       inputMethod,
       selectedIndex: typeof selectedIndex === 'number' ? selectedIndex : -1,
       items: [],
+      sections: [],
       query: reopenQuery || '',
       removePrefixTriggerOnCancel
     };
@@ -85,6 +86,7 @@ export const createReducer = ({
       stats: null,
       triggerHandler: undefined,
       items: [],
+      sections: [],
       removePrefixTriggerOnCancel: undefined
     };
   };
@@ -140,11 +142,13 @@ export const createReducer = ({
         ...currentPluginState,
         errorInfo,
         items: [],
+        sections: [],
         selectedIndex: -1
       };
     } else if (shouldUpdateListItems) {
       const {
-        items
+        items,
+        sections = []
       } = params;
       const {
         selectedIndex
@@ -152,6 +156,7 @@ export const createReducer = ({
       return {
         ...currentPluginState,
         items,
+        sections,
         selectedIndex: Math.max(selectedIndex >= items.length ? items.length - 1 : selectedIndex, -1)
       };
     } else if (shouldUpdateSelectedIndex) {

package/dist/es2019/typeAheadPlugin.js

@@ -208,7 +208,7 @@ export const typeAheadPlugin = ({
       }];
     },
     getSharedState(editorState) {
-      var _state$decorationSet, _state$decorationElem, _state$items, _state$errorInfo, _state$selectedIndex;
+      var _state$decorationSet, _state$decorationElem, _state$items, _state$sections, _state$errorInfo, _state$selectedIndex;
       if (!editorState) {
         return {
           query: '',
@@ -219,6 +219,7 @@ export const typeAheadPlugin = ({
           decorationElement: null,
           triggerHandler: undefined,
           items: [],
+          sections: [],
           errorInfo: null,
           selectedIndex: 0
         };
@@ -234,6 +235,7 @@ export const typeAheadPlugin = ({
         decorationElement: (_state$decorationElem = state === null || state === void 0 ? void 0 : state.decorationElement) !== null && _state$decorationElem !== void 0 ? _state$decorationElem : null,
         triggerHandler: state === null || state === void 0 ? void 0 : state.triggerHandler,
         items: (_state$items = state === null || state === void 0 ? void 0 : state.items) !== null && _state$items !== void 0 ? _state$items : [],
+        sections: (_state$sections = state === null || state === void 0 ? void 0 : state.sections) !== null && _state$sections !== void 0 ? _state$sections : [],
         errorInfo: (_state$errorInfo = state === null || state === void 0 ? void 0 : state.errorInfo) !== null && _state$errorInfo !== void 0 ? _state$errorInfo : null,
         selectedIndex: (_state$selectedIndex = state === null || state === void 0 ? void 0 : state.selectedIndex) !== null && _state$selectedIndex !== void 0 ? _state$selectedIndex : 0
       };

package/dist/es2019/ui/ContentComponent.js

@@ -9,24 +9,26 @@ export function ContentComponent({
   const {
     triggerHandler,
     items,
+    sections,
     errorInfo,
     decorationElement,
     decorationSet,
     query,
     selectedIndex
   } = useSharedPluginStateWithSelector(api, ['typeAhead'], states => {
-    var _states$typeAheadStat, _states$typeAheadStat2, _states$typeAheadStat3, _states$typeAheadStat4, _states$typeAheadStat5, _states$typeAheadStat6, _states$typeAheadStat7;
+    var _states$typeAheadStat, _states$typeAheadStat2, _states$typeAheadStat3, _states$typeAheadStat4, _states$typeAheadStat5, _states$typeAheadStat6, _states$typeAheadStat7, _states$typeAheadStat8;
     return {
       triggerHandler: (_states$typeAheadStat = states.typeAheadState) === null || _states$typeAheadStat === void 0 ? void 0 : _states$typeAheadStat.triggerHandler,
       items: (_states$typeAheadStat2 = states.typeAheadState) === null || _states$typeAheadStat2 === void 0 ? void 0 : _states$typeAheadStat2.items,
-      errorInfo: (_states$typeAheadStat3 = states.typeAheadState) === null || _states$typeAheadStat3 === void 0 ? void 0 : _states$typeAheadStat3.errorInfo,
-      decorationElement: (_states$typeAheadStat4 = states.typeAheadState) === null || _states$typeAheadStat4 === void 0 ? void 0 : _states$typeAheadStat4.decorationElement,
-      decorationSet: (_states$typeAheadStat5 = states.typeAheadState) === null || _states$typeAheadStat5 === void 0 ? void 0 : _states$typeAheadStat5.decorationSet,
-      query: (_states$typeAheadStat6 = states.typeAheadState) === null || _states$typeAheadStat6 === void 0 ? void 0 : _states$typeAheadStat6.query,
-      selectedIndex: (_states$typeAheadStat7 = states.typeAheadState) === null || _states$typeAheadStat7 === void 0 ? void 0 : _states$typeAheadStat7.selectedIndex
+      sections: (_states$typeAheadStat3 = states.typeAheadState) === null || _states$typeAheadStat3 === void 0 ? void 0 : _states$typeAheadStat3.sections,
+      errorInfo: (_states$typeAheadStat4 = states.typeAheadState) === null || _states$typeAheadStat4 === void 0 ? void 0 : _states$typeAheadStat4.errorInfo,
+      decorationElement: (_states$typeAheadStat5 = states.typeAheadState) === null || _states$typeAheadStat5 === void 0 ? void 0 : _states$typeAheadStat5.decorationElement,
+      decorationSet: (_states$typeAheadStat6 = states.typeAheadState) === null || _states$typeAheadStat6 === void 0 ? void 0 : _states$typeAheadStat6.decorationSet,
+      query: (_states$typeAheadStat7 = states.typeAheadState) === null || _states$typeAheadStat7 === void 0 ? void 0 : _states$typeAheadStat7.query,
+      selectedIndex: (_states$typeAheadStat8 = states.typeAheadState) === null || _states$typeAheadStat8 === void 0 ? void 0 : _states$typeAheadStat8.selectedIndex
     };
   });
-  if (items === undefined || decorationSet === undefined || errorInfo === undefined || decorationElement === undefined || query === undefined || selectedIndex === undefined) {
+  if (items === undefined || sections === undefined || decorationSet === undefined || errorInfo === undefined || decorationElement === undefined || query === undefined || selectedIndex === undefined) {
     return null;
   }
   return /*#__PURE__*/React.createElement(TypeAheadMenu, {
@@ -37,6 +39,7 @@ export function ContentComponent({
     typeAheadState: {
       triggerHandler,
       items,
+      sections,
       errorInfo,
       decorationElement,
       decorationSet,

package/dist/es2019/ui/TypeAheadList.js

@@ -17,6 +17,7 @@ import { AssistiveText } from '@atlaskit/editor-common/ui';
 import { MenuGroup } from '@atlaskit/menu';
 import { Text, Box } from '@atlaskit/primitives/compiled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { closeTypeAhead } from '../pm-plugins/commands/close-type-ahead';
 import { updateSelectedIndex } from '../pm-plugins/commands/update-selected-index';
 import { TYPE_AHEAD_DECORATION_ELEMENT_ID } from '../pm-plugins/constants';
@@ -32,6 +33,36 @@ const list = css({
     padding: `${"var(--ds-space-100, 8px)"} ${"var(--ds-space-150, 12px)"}`
   }
 });
+const buildTypeAheadRows = ({
+  itemsLength,
+  sections
+}) => {
+  if (sections.length === 0) {
+    return Array.from({
+      length: itemsLength
+    }, (_, itemIndex) => ({
+      type: 'item',
+      itemIndex
+    }));
+  }
+  const sortedSections = [...sections].sort((left, right) => left.startIndex - right.startIndex);
+  const sectionsByStartIndex = new Map(sortedSections.map(section => [section.startIndex, section]));
+  const rows = [];
+  for (let itemIndex = 0; itemIndex < itemsLength; itemIndex++) {
+    const section = sectionsByStartIndex.get(itemIndex);
+    if (section) {
+      rows.push({
+        type: 'section',
+        section
+      });
+    }
+    rows.push({
+      type: 'item',
+      itemIndex
+    });
+  }
+  return rows;
+};
 const TypeaheadAssistiveTextPureComponent = /*#__PURE__*/React.memo(({
   numberOfResults
 }) => {
@@ -48,6 +79,7 @@ const TypeaheadAssistiveTextPureComponent = /*#__PURE__*/React.memo(({
 });
 const TypeAheadListComponent = /*#__PURE__*/React.memo(({
   items,
+  sections,
   emptyItem,
   selectedIndex,
   editorView,
@@ -61,7 +93,7 @@ const TypeAheadListComponent = /*#__PURE__*/React.memo(({
   showMoreOptionsButton,
   onMoreOptionsClicked
 }) => {
-  var _triggerHandler$getMo, _decorationElement$qu2;
+  var _itemRowIndexByItemIn, _triggerHandler$getMo, _decorationElement$qu2;
   const listRef = useRef();
   const listContainerRef = useRef(null);
   const lastInputMethodRef = useRef('keyboard');
@@ -82,6 +114,21 @@ const TypeAheadListComponent = /*#__PURE__*/React.memo(({
     fixedWidth: true,
     defaultHeight: LIST_ITEM_ESTIMATED_HEIGHT
   }));
+  const listRows = useMemo(() => buildTypeAheadRows({
+    itemsLength,
+    sections: sections || []
+  }), [itemsLength, sections]);
+  const itemRowIndexByItemIndex = useMemo(() => {
+    const rowIndexByItemIndex = new Map();
+    listRows.forEach((row, rowIndex) => {
+      if (row.type === 'item') {
+        rowIndexByItemIndex.set(row.itemIndex, rowIndex);
+      }
+    });
+    return rowIndexByItemIndex;
+  }, [listRows]);
+  const populatedSectionCount = useMemo(() => listRows.filter(row => row.type === 'section').length, [listRows]);
+  const selectedItemRowIndex = selectedIndex >= 0 ? (_itemRowIndexByItemIn = itemRowIndexByItemIndex.get(selectedIndex)) !== null && _itemRowIndexByItemIn !== void 0 ? _itemRowIndexByItemIn : -1 : -1;
   const onItemsRendered = useCallback(props => {
     lastVisibleIndexes.current = props;
   }, []);
@@ -132,28 +179,32 @@ const TypeAheadListComponent = /*#__PURE__*/React.memo(({
     requestAnimationFrame(() => {
       requestAnimationFrame(() => {
         const isViewMoreSelected = showMoreOptionsButton && selectedIndex === itemsLength;
-        const isSelectedItemVisible = selectedIndex >= lastVisibleStartIndex && selectedIndex <= lastVisibleStopIndex ||
+        const isSelectedItemVisible = selectedItemRowIndex >= lastVisibleStartIndex && selectedItemRowIndex <= lastVisibleStopIndex ||
         // view more is always visible, hence no scrolling
         isViewMoreSelected;
 
         //Should scroll to the list item only when the selectedIndex >= 0 and item is not visible
         if (!isSelectedItemVisible && selectedIndex !== -1) {
-          listRef.current.scrollToRow(selectedIndex);
+          listRef.current.scrollToRow(selectedItemRowIndex);
         } else if (selectedIndex === -1) {
           listRef.current.scrollToRow(0);
         }
       });
     });
-  }, [selectedIndex, lastVisibleStartIndex, lastVisibleStopIndex, itemsLength, showMoreOptionsButton]);
-  const onMouseMove = (event, index) => {
+  }, [selectedIndex, lastVisibleStartIndex, lastVisibleStopIndex, itemsLength, showMoreOptionsButton, selectedItemRowIndex]);
+  const onMouseMove = (event, row) => {
+    if (row.type !== 'item') {
+      return;
+    }
+    const itemIndex = row.itemIndex;
     event.preventDefault();
     event.stopPropagation();
-    if (selectedIndex === index) {
+    if (selectedIndex === itemIndex) {
       return;
     }
     mouseMovedRef.current = true;
     lastInputMethodRef.current = 'mouse';
-    updateSelectedIndex(index, api)(editorView.state, editorView.dispatch);
+    updateSelectedIndex(itemIndex, api)(editorView.state, editorView.dispatch);
   };
   useLayoutEffect(() => {
     if (mouseMovedRef.current) {
@@ -167,17 +218,17 @@ const TypeAheadListComponent = /*#__PURE__*/React.memo(({
       return;
     }
     const isViewMoreSelected = showMoreOptionsButton && selectedIndex === itemsLength;
-    const isSelectedItemVisible = selectedIndex >= lastVisibleStartIndex && selectedIndex <= lastVisibleStopIndex ||
+    const isSelectedItemVisible = selectedItemRowIndex >= lastVisibleStartIndex && selectedItemRowIndex <= lastVisibleStopIndex ||
     // view more is always visible, hence no scrolling
     isViewMoreSelected;
 
     //Should scroll to the list item only when the selectedIndex >= 0 and item is not visible
     if (!isSelectedItemVisible && selectedIndex !== -1) {
-      listRef.current.scrollToRow(selectedIndex);
+      listRef.current.scrollToRow(selectedItemRowIndex);
     } else if (selectedIndex === -1) {
       listRef.current.scrollToRow(0);
     }
-  }, [selectedIndex, lastVisibleStartIndex, lastVisibleStopIndex, itemsLength, showMoreOptionsButton]);
+  }, [selectedIndex, lastVisibleStartIndex, lastVisibleStopIndex, itemsLength, showMoreOptionsButton, selectedItemRowIndex]);
   useLayoutEffect(() => {
     setCache(new CellMeasurerCache({
       fixedWidth: true,
@@ -193,10 +244,10 @@ const TypeAheadListComponent = /*#__PURE__*/React.memo(({
         listContainerRef.current.firstChild.scrollTo(0, 0);
       }
     });
-  }, [items]);
+  }, [items, sections]);
   useLayoutEffect(() => {
     // Exclude view more item from the count
-    const itemsToRender = showMoreOptionsButton ? items.slice(0, -1) : items;
+    const itemsToRender = editorExperiment('platform_editor_agent_mentions', true) ? listRows : showMoreOptionsButton ? items.slice(0, -1) : items;
     const height = Math.min(
     // eslint-disable-next-line @atlassian/perf-linting/no-expensive-computations-in-render -- Ignored via go/ees017 (to be fixed)
     itemsToRender.reduce((prevValue, currentValue, index) => {
@@ -205,7 +256,7 @@ const TypeAheadListComponent = /*#__PURE__*/React.memo(({
       });
     }, 0), fitHeight);
     setHeight(height);
-  }, [items, cache, fitHeight, showMoreOptionsButton]);
+  }, [listRows, items, cache, fitHeight, showMoreOptionsButton]);
   useLayoutEffect(() => {
     if (!listContainerRef.current) {
       return;
@@ -286,7 +337,10 @@ const TypeAheadListComponent = /*#__PURE__*/React.memo(({
     isScrolling,
     isVisible
   }) => {
-    const currentItem = items[index];
+    const currentRow = listRows[index];
+    if (!currentRow) {
+      return null;
+    }
     return jsx(CellMeasurer, {
       key: key,
       cache: cache,
@@ -305,20 +359,28 @@ const TypeAheadListComponent = /*#__PURE__*/React.memo(({
       isScrolling: isScrolling
       // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
       ,
-      onMouseMove: e => onMouseMove(e, index)
-    }, jsx(TypeAheadListItem, {
-      key: items[index].title,
-      item: currentItem,
+      onMouseMove: e => onMouseMove(e, currentRow)
+    }, currentRow.type === 'section' ? populatedSectionCount === 1 ? null : jsx(Box, {
+      paddingInline: "space.150",
+      paddingBlock: "space.050"
+    }, jsx(Text, {
+      as: "span",
+      size: "small",
+      color: "color.text.subtle",
+      weight: "medium"
+    }, currentRow.section.title)) : jsx(TypeAheadListItem, {
+      key: items[currentRow.itemIndex].title,
+      item: items[currentRow.itemIndex],
       firstOnlineSupportedIndex: firstOnlineSupportedRow,
       itemsLength: itemsLength,
-      itemIndex: index,
+      itemIndex: currentRow.itemIndex,
       selectedIndex: selectedIndex
       // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
       ,
-      onItemClick: (mode, index) => {
-        actions.onItemClick(mode, index, INPUT_METHOD.MOUSE);
+      onItemClick: (mode, itemIndex) => {
+        actions.onItemClick(mode, itemIndex, INPUT_METHOD.MOUSE);
       },
-      ariaLabel: getTypeAheadListAriaLabels(triggerHandler === null || triggerHandler === void 0 ? void 0 : triggerHandler.trigger, intl, currentItem).listItemAriaLabel,
+      ariaLabel: getTypeAheadListAriaLabels(triggerHandler === null || triggerHandler === void 0 ? void 0 : triggerHandler.trigger, intl, items[currentRow.itemIndex]).listItemAriaLabel,
       moreElementsInQuickInsertViewEnabled: moreElementsInQuickInsertViewEnabled,
       api: api,
       lastInputMethodRef: lastInputMethodRef
@@ -351,7 +413,7 @@ const TypeAheadListComponent = /*#__PURE__*/React.memo(({
     ref: listRef
     // Skip rendering the view more button in the list
     ,
-    rowCount: itemsLength,
+    rowCount: listRows.length,
     rowHeight: cache.rowHeight,
     onRowsRendered: onItemsRendered,
     width: LIST_WIDTH,

package/dist/es2019/ui/TypeAheadMenu.js

@@ -17,6 +17,7 @@ export const TypeAheadMenu = /*#__PURE__*/React.memo(({
   const {
     triggerHandler,
     items,
+    sections = [],
     errorInfo,
     decorationElement,
     decorationSet,
@@ -94,6 +95,7 @@ export const TypeAheadMenu = /*#__PURE__*/React.memo(({
     anchorElement: decorationElement,
     triggerHandler: triggerHandler,
     items: items,
+    sections: sections,
     emptyItem: emptyItem,
     errorInfo: errorInfo,
     selectedIndex: selectedIndex,

package/dist/es2019/ui/TypeAheadPopup.js

@@ -61,6 +61,7 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
     popupsBoundariesElement,
     popupsScrollableElement,
     items,
+    sections = [],
     emptyItem,
     errorInfo,
     selectedIndex,
@@ -341,6 +342,7 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
     triggerHandler: triggerHandler
   }), jsx(TypeAheadList, {
     items: items,
+    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/WrapperTypeAhead.js

@@ -1,4 +1,5 @@
 import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { useIntl } from 'react-intl';
 import { ACTION, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { SelectItemMode } from '@atlaskit/editor-common/type-ahead';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -31,11 +32,12 @@ export const WrapperTypeAhead = /*#__PURE__*/React.memo(({
   if (editorExperiment('platform_editor_controls', 'variant1')) {
     showMoreOptionsButton = !!(triggerHandler !== null && triggerHandler !== void 0 && triggerHandler.getMoreOptionsButtonConfig);
   }
+  const intl = useIntl();
   const [closed, setClosed] = useState(false);
   const [query, setQuery] = useState(reopenQuery || '');
   const queryRef = useRef(query);
   const editorViewRef = useRef(editorView);
-  const items = useLoadItems(triggerHandler, editorView, query, showMoreOptionsButton, api);
+  const items = useLoadItems(triggerHandler, editorView, query, showMoreOptionsButton, api, intl);
   useEffect(() => {
     if (!closed && fg('platform_editor_ease_of_use_metrics')) {
       var _api$metrics;

package/dist/es2019/ui/hooks/build-sectioned-result.js

@@ -0,0 +1,83 @@
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+export const buildSectionedResult = ({
+  items,
+  triggerHandler,
+  intl
+}) => {
+  var _triggerHandler$getSe;
+  if (!editorExperiment('platform_editor_agent_mentions', true) || !intl) {
+    return {
+      items,
+      sections: []
+    };
+  }
+  const sectionDefinitions = (_triggerHandler$getSe = triggerHandler.getSections) === null || _triggerHandler$getSe === void 0 ? void 0 : _triggerHandler$getSe.call(triggerHandler, {
+    intl
+  });
+  if (!sectionDefinitions || sectionDefinitions.length === 0) {
+    return {
+      items,
+      sections: []
+    };
+  }
+
+  // Track which item indexes have been claimed by a section, or excluded (matched a section but
+  // cut by that section's limit). Items excluded by limit should not appear anywhere in the output.
+  const assignedToSection = new Set();
+  const excludedByLimit = new Set();
+  const groupedBySection = new Map();
+  for (const section of sectionDefinitions) {
+    const matchingIndexes = [];
+    for (let i = 0; i < items.length; i++) {
+      if (assignedToSection.has(i) || excludedByLimit.has(i)) {
+        continue;
+      }
+      if (section.filter(items[i])) {
+        matchingIndexes.push(i);
+      }
+    }
+    const acceptedIndexes = section.limit !== undefined ? matchingIndexes.slice(0, section.limit) : matchingIndexes;
+    const rejectedByLimit = matchingIndexes.slice(acceptedIndexes.length);
+    for (const i of acceptedIndexes) {
+      assignedToSection.add(i);
+    }
+    for (const i of rejectedByLimit) {
+      excludedByLimit.add(i);
+    }
+    if (acceptedIndexes.length === 0) {
+      continue;
+    }
+    groupedBySection.set(section.id, {
+      indexes: acceptedIndexes,
+      section
+    });
+  }
+  const flattenedItems = [];
+  const sections = [];
+  for (const section of sectionDefinitions) {
+    const grouped = groupedBySection.get(section.id);
+    if (!grouped) {
+      continue;
+    }
+    const startIndex = flattenedItems.length;
+    flattenedItems.push(...grouped.indexes.map(i => items[i]));
+    const endIndex = flattenedItems.length - 1;
+    sections.push({
+      endIndex,
+      id: section.id,
+      startIndex,
+      title: section.title
+    });
+  }
+
+  // Append items not claimed by any section and not excluded by a limit
+  for (let i = 0; i < items.length; i++) {
+    if (!assignedToSection.has(i) && !excludedByLimit.has(i)) {
+      flattenedItems.push(items[i]);
+    }
+  }
+  return {
+    items: flattenedItems,
+    sections
+  };
+};

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

@@ -4,8 +4,9 @@ import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 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';
+import { buildSectionedResult } from './build-sectioned-result';
 const EMPTY_LIST_ITEM = [];
-export const useLoadItems = (triggerHandler, editorView, query, showViewMore, api) => {
+export const useLoadItems = (triggerHandler, editorView, query, showViewMore, api, intl) => {
   const [items, setItems] = useState(EMPTY_LIST_ITEM);
   const componentIsMounted = useRef(true);
   const editorViewRef = useRef(editorView);
@@ -35,7 +36,15 @@ export const useLoadItems = (triggerHandler, editorView, query, showViewMore, ap
       const emptyItem = result.length === 0 && expValEquals('platform_editor_insert_menu_ai', 'isEnabled', true) ? (_triggerHandler$getEm = triggerHandler.getEmptyItem) === null || _triggerHandler$getEm === void 0 ? void 0 : _triggerHandler$getEm.call(triggerHandler, {
         editorState: editorView.state
       }) : undefined;
-      const list = result.length > 0 ? result : emptyItem ? [emptyItem] : EMPTY_LIST_ITEM;
+      const rawList = result.length > 0 ? result : emptyItem ? [emptyItem] : EMPTY_LIST_ITEM;
+      const {
+        items: list,
+        sections
+      } = buildSectionedResult({
+        items: rawList,
+        triggerHandler,
+        intl: intl !== null && intl !== void 0 ? intl : null
+      });
       if (componentIsMounted.current) {
         setItems(list);
       }
@@ -45,7 +54,7 @@ export const useLoadItems = (triggerHandler, editorView, query, showViewMore, ap
         title: 'View more'
       };
       queueMicrotask(() => {
-        updateListItem(showViewMore ? list.concat(viewMoreItem) : list)(view.state, view.dispatch);
+        updateListItem(showViewMore ? list.concat(viewMoreItem) : list, sections)(view.state, view.dispatch);
       });
     }).catch(e => {
       if (editorExperiment('platform_editor_offline_editing_web', true)) {
@@ -63,7 +72,7 @@ export const useLoadItems = (triggerHandler, editorView, query, showViewMore, ap
     // ignore because EditorView is mutable but we don't want to
     // call loadItems when it changes, only when the query changes
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [triggerHandler, query]);
+  }, [triggerHandler, query, intl]);
   useEffect(() => {
     return () => {
       componentIsMounted.current = false;

package/dist/esm/pm-plugins/commands/update-list-items.js

@@ -1,12 +1,14 @@
 import { ACTIONS } from '../actions';
 import { pluginKey as typeAheadPluginKey } from '../key';
 export var updateListItem = function updateListItem(items) {
+  var sections = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   return function (state, dispatch) {
     var tr = state.tr;
     tr.setMeta(typeAheadPluginKey, {
       action: ACTIONS.UPDATE_LIST_ITEMS,
       params: {
-        items: items
+        items: items,
+        sections: sections
       }
     });
     if (dispatch) {

package/dist/esm/pm-plugins/main.js

@@ -53,6 +53,7 @@ export function createPlugin(_ref) {
           decorationSet: DecorationSet.empty,
           decorationElement: null,
           items: [],
+          sections: [],
           errorInfo: null,
           selectedIndex: -1,
           stats: null,

package/dist/esm/pm-plugins/reducer.js

@@ -69,6 +69,7 @@ export var createReducer = function createReducer(_ref) {
       inputMethod: inputMethod,
       selectedIndex: typeof selectedIndex === 'number' ? selectedIndex : -1,
       items: [],
+      sections: [],
       query: reopenQuery || '',
       removePrefixTriggerOnCancel: removePrefixTriggerOnCancel
     });
@@ -87,6 +88,7 @@ export var createReducer = function createReducer(_ref) {
       stats: null,
       triggerHandler: undefined,
       items: [],
+      sections: [],
       removePrefixTriggerOnCancel: undefined
     });
   };
@@ -137,13 +139,17 @@ export var createReducer = function createReducer(_ref) {
       return _objectSpread(_objectSpread({}, currentPluginState), {}, {
         errorInfo: errorInfo,
         items: [],
+        sections: [],
         selectedIndex: -1
       });
     } else if (shouldUpdateListItems) {
-      var items = params.items;
+      var items = params.items,
+        _params$sections = params.sections,
+        sections = _params$sections === void 0 ? [] : _params$sections;
       var selectedIndex = currentPluginState.selectedIndex;
       return _objectSpread(_objectSpread({}, currentPluginState), {}, {
         items: items,
+        sections: sections,
         selectedIndex: Math.max(selectedIndex >= items.length ? items.length - 1 : selectedIndex, -1)
       });
     } else if (shouldUpdateSelectedIndex) {