@atlaskit/editor-plugin-mentions 17.1.5 → 17.1.7

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-mentions
 
+## 17.1.7
+
+### Patch Changes
+
+- Updated dependencies
+
+## 17.1.6
+
+### Patch Changes
+
+- [`73f8a70eba228`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/73f8a70eba228) -
+  [ux] Behind platform_editor_mention_search_order, identify agents during mention search and move
+  them above bots and teams without adding a new typeahead section.
+
 ## 17.1.5
 
 ### Patch Changes

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

@@ -67,7 +67,7 @@ var AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
 var AGENT_MENTION_INACTIVITY_MS = 3000;
 var MAX_PENDING_TYPED_AGENT_MENTION_FOCUS_DEFERS = 20;
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "17.1.4";
+var PACKAGE_VERSION = "17.1.6";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {

package/dist/cjs/ui/type-ahead/index.js

@@ -41,6 +41,15 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var isAgentTypeAheadItem = function isAgentTypeAheadItem(item) {
   return item.mention ? (0, _utils3.isAgentMention)(item.mention) : false;
 };
+var isSearchOrderedAgentTypeAheadItem = function isSearchOrderedAgentTypeAheadItem(item) {
+  return !!item.mention && (0, _utils3.isExplicitAgentMention)(item.mention);
+};
+var isSearchOrderedPersonTypeAheadItem = function isSearchOrderedPersonTypeAheadItem(item) {
+  return !!item.mention && !(0, _utils3.isInviteItem)(item.mention) && !(0, _utils3.isExplicitAgentMention)(item.mention) && !(0, _utils3.isBotOrTeamMention)(item.mention);
+};
+var shouldApplyMentionSearchOrder = function shouldApplyMentionSearchOrder(query) {
+  return (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_mention_search_order') && query.trim().length > 0;
+};
 
 // A non-selectable loading placeholder injected by the provider (e.g.
 // `RovoChatMentionResource`) while the slower agent source resolves. It
@@ -288,13 +297,14 @@ var makeTransformMentionsToTypeAheadItems = function makeTransformMentionsToType
       mentionProvider = _ref8.mentionProvider,
       contextIdentifierProvider = _ref8.contextIdentifierProvider,
       sessionId = _ref8.sessionId;
-    var mentionItems = mentions.map(function (mention) {
+    var displayMentions = shouldApplyMentionSearchOrder(query) ? (0, _utils3.orderMentionsForDisplay)(mentions) : mentions;
+    var mentionItems = displayMentions.map(function (mention) {
       return toItem(mention);
     });
     // The loading placeholder is a rendered-only row — keep it in
     // `mentionItems` so the shimmer shows, but exclude it from analytics
     // and no-results bookkeeping so it isn't counted as a real result.
-    var realMentions = mentions.filter(function (mention) {
+    var realMentions = displayMentions.filter(function (mention) {
       return !isLoadingPlaceholder(mention);
     });
     var agentCount = realMentions.filter(_utils3.isAgentMention).length;
@@ -349,6 +359,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   var sessionId = (0, _uuid.default)();
   var firstQueryWithoutResults = null;
+  var lastTypeAheadQuery = '';
   var subscriptionKeys = new Set();
   var transformMentionsToTypeAheadItems = makeTransformMentionsToTypeAheadItems({
     enableAgentSectioning: enableAgentSectioning,
@@ -381,6 +392,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       var _api$contextIdentifie, _api$contextIdentifie2;
       var query = _ref0.query,
         editorState = _ref0.editorState;
+      lastTypeAheadQuery = query || '';
       var pluginState = (0, _utils2.getMentionPluginState)(editorState);
       if (!(pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider)) {
         return Promise.resolve([]);
@@ -427,10 +439,11 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       if (!enableAgentSectioning) {
         return [];
       }
+      var applySearchOrder = shouldApplyMentionSearchOrder(lastTypeAheadQuery);
       return [{
         id: 'people',
         title: intl.formatMessage(_messages.mentionMessages.typeAheadSectionPeople),
-        filter: function filter(item) {
+        filter: applySearchOrder ? isSearchOrderedPersonTypeAheadItem : function (item) {
           if (isAgentTypeAheadItem(item)) {
             return false;
           }
@@ -451,9 +464,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
       }, {
         id: 'agents',
         title: intl.formatMessage(_messages.mentionMessages.typeAheadSectionAgents),
-        filter: function filter(item) {
-          return isAgentTypeAheadItem(item);
-        },
+        filter: applySearchOrder ? isSearchOrderedAgentTypeAheadItem : isAgentTypeAheadItem,
         limit: 5,
         sectionTitleDisplay: {
           showWhenQueryPresent: false,
@@ -466,6 +477,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
     },
     onOpen: function onOpen() {
       firstQueryWithoutResults = null;
+      lastTypeAheadQuery = '';
     },
     selectItem: function selectItem(state, item, insert, _ref11) {
       var _api$contextIdentifie3, _api$contextIdentifie4;
@@ -669,6 +681,7 @@ var createTypeAheadConfig = exports.createTypeAheadConfig = function createTypeA
     var _api$contextIdentifie5, _api$contextIdentifie6;
     var query = _ref14.query,
       editorState = _ref14.editorState;
+    lastTypeAheadQuery = query || '';
     var pluginState = (0, _utils2.getMentionPluginState)(editorState);
     if (!(pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider)) {
       return {

package/dist/cjs/ui/type-ahead/utils.js

@@ -3,8 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.shouldKeepInviteItem = exports.isTeamType = exports.isTeamStats = exports.isInviteItem = exports.isAgentUserType = exports.isAgentMention = void 0;
+exports.shouldKeepInviteItem = exports.orderMentionsForDisplay = exports.isTeamType = exports.isTeamStats = exports.isInviteItem = exports.isExplicitAgentMention = exports.isBotOrTeamMention = exports.isAgentUserType = exports.isAgentMention = exports.getMentionDisplayGroup = void 0;
 var _InviteItem = require("../InviteItem");
+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; }
 // Ignored via go/ees005
 // eslint-disable-next-line require-unicode-regexp
 var SUFFIX_WITH_EXTRA_WORDS_REGEX = /\s[^\s]+\s/;
@@ -30,6 +33,66 @@ var isAgentMention = exports.isAgentMention = function isAgentMention(mention) {
   return isAgentUserType(mention.userType) || mention.appType === 'agent';
 };
 
+/**
+ * True when the mention is explicitly an agent, not a generic APP/bot.
+ * Prefer this over {@link isAgentMention} when ordering the search display
+ * list behind `platform_editor_mention_search_order` — bare `userType: 'APP'`
+ * is a bot unless `appType === 'agent'`.
+ */
+var isExplicitAgentMention = exports.isExplicitAgentMention = function isExplicitAgentMention(mention) {
+  return mention.appType === 'agent' || mention.userType === 'AGENT';
+};
+
+/**
+ * Connect/app bots and teams. Explicit agents are excluded so they can be
+ * lifted above this group in the hardcoded display order.
+ */
+var isBotOrTeamMention = exports.isBotOrTeamMention = function isBotOrTeamMention(mention) {
+  if (isExplicitAgentMention(mention)) {
+    return false;
+  }
+  return mention.userType === 'TEAM' || mention.userType === 'APP';
+};
+var getMentionDisplayGroup = exports.getMentionDisplayGroup = function getMentionDisplayGroup(mention) {
+  if (isExplicitAgentMention(mention)) {
+    return 'agents';
+  }
+  if (isBotOrTeamMention(mention)) {
+    return 'bots-teams';
+  }
+  return 'people';
+};
+
+/**
+ * Hardcoded mention display order: people, then agents, then bots/teams.
+ * Stable within each group so provider ranking is preserved.
+ */
+var orderMentionsForDisplay = exports.orderMentionsForDisplay = function orderMentionsForDisplay(mentions) {
+  var people = [];
+  var agents = [];
+  var botsAndTeams = [];
+  var _iterator = _createForOfIteratorHelper(mentions),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var mention = _step.value;
+      var group = getMentionDisplayGroup(mention);
+      if (group === 'agents') {
+        agents.push(mention);
+      } else if (group === 'bots-teams') {
+        botsAndTeams.push(mention);
+      } else {
+        people.push(mention);
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return [].concat(people, agents, botsAndTeams);
+};
+
 /**
  * Actions
  */

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

@@ -51,7 +51,7 @@ const AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
 const AGENT_MENTION_INACTIVITY_MS = 3000;
 const MAX_PENDING_TYPED_AGENT_MENTION_FOCUS_DEFERS = 20;
 const PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-const PACKAGE_VERSION = "17.1.4";
+const PACKAGE_VERSION = "17.1.6";
 const setProvider = provider => (state, dispatch) => {
   if (dispatch) {
     dispatch(state.tr.setMeta(mentionPluginKey, {

package/dist/es2019/ui/type-ahead/index.js

@@ -21,8 +21,11 @@ import InviteItem, { INVITE_ITEM_DESCRIPTION } from '../InviteItem';
 import InviteItemWithEmailDomain from '../InviteItem/InviteItemWithEmailDomain';
 import { buildTypeAheadCancelPayload, buildTypeAheadInsertedPayload, buildTypeAheadInviteItemClickedPayload, buildTypeAheadInviteItemViewedPayload, buildTypeAheadRenderedPayload } from './analytics';
 import { MentionItemWithProfileCard } from './MentionItemWithProfileCard';
-import { isAgentMention, isInviteItem, isTeamStats, isTeamType, shouldKeepInviteItem } from './utils';
+import { isAgentMention, isBotOrTeamMention, isExplicitAgentMention, isInviteItem, isTeamStats, isTeamType, orderMentionsForDisplay, shouldKeepInviteItem } from './utils';
 const isAgentTypeAheadItem = item => item.mention ? isAgentMention(item.mention) : false;
+const isSearchOrderedAgentTypeAheadItem = item => !!item.mention && isExplicitAgentMention(item.mention);
+const isSearchOrderedPersonTypeAheadItem = item => !!item.mention && !isInviteItem(item.mention) && !isExplicitAgentMention(item.mention) && !isBotOrTeamMention(item.mention);
+const shouldApplyMentionSearchOrder = query => isExperimentEnabled('platform_editor_mention_search_order') && query.trim().length > 0;
 
 // A non-selectable loading placeholder injected by the provider (e.g.
 // `RovoChatMentionResource`) while the slower agent source resolves. It
@@ -262,11 +265,12 @@ const makeTransformMentionsToTypeAheadItems = ({
     contextIdentifierProvider,
     sessionId
   }) => {
-    const mentionItems = mentions.map(mention => toItem(mention));
+    const displayMentions = shouldApplyMentionSearchOrder(query) ? orderMentionsForDisplay(mentions) : mentions;
+    const mentionItems = displayMentions.map(mention => toItem(mention));
     // The loading placeholder is a rendered-only row — keep it in
     // `mentionItems` so the shimmer shows, but exclude it from analytics
     // and no-results bookkeeping so it isn't counted as a real result.
-    const realMentions = mentions.filter(mention => !isLoadingPlaceholder(mention));
+    const realMentions = displayMentions.filter(mention => !isLoadingPlaceholder(mention));
     const agentCount = realMentions.filter(isAgentMention).length;
     const agentAnalytics = {
       agentCount,
@@ -318,6 +322,7 @@ export const createTypeAheadConfig = ({
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   let sessionId = uuid();
   let firstQueryWithoutResults = null;
+  let lastTypeAheadQuery = '';
   const subscriptionKeys = new Set();
   const transformMentionsToTypeAheadItems = makeTransformMentionsToTypeAheadItems({
     enableAgentSectioning,
@@ -349,6 +354,7 @@ export const createTypeAheadConfig = ({
       editorState
     }) {
       var _api$contextIdentifie, _api$contextIdentifie2;
+      lastTypeAheadQuery = query || '';
       const pluginState = getMentionPluginState(editorState);
       if (!(pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider)) {
         return Promise.resolve([]);
@@ -398,10 +404,11 @@ export const createTypeAheadConfig = ({
       if (!enableAgentSectioning) {
         return [];
       }
+      const applySearchOrder = shouldApplyMentionSearchOrder(lastTypeAheadQuery);
       return [{
         id: 'people',
         title: intl.formatMessage(mentionMessages.typeAheadSectionPeople),
-        filter: item => {
+        filter: applySearchOrder ? isSearchOrderedPersonTypeAheadItem : item => {
           if (isAgentTypeAheadItem(item)) {
             return false;
           }
@@ -422,7 +429,7 @@ export const createTypeAheadConfig = ({
       }, {
         id: 'agents',
         title: intl.formatMessage(mentionMessages.typeAheadSectionAgents),
-        filter: item => isAgentTypeAheadItem(item),
+        filter: applySearchOrder ? isSearchOrderedAgentTypeAheadItem : isAgentTypeAheadItem,
         limit: 5,
         sectionTitleDisplay: {
           showWhenQueryPresent: false,
@@ -435,6 +442,7 @@ export const createTypeAheadConfig = ({
     },
     onOpen: () => {
       firstQueryWithoutResults = null;
+      lastTypeAheadQuery = '';
     },
     selectItem(state, item, insert, {
       mode,
@@ -639,6 +647,7 @@ export const createTypeAheadConfig = ({
     editorState
   }) => {
     var _api$contextIdentifie5, _api$contextIdentifie6;
+    lastTypeAheadQuery = query || '';
     const pluginState = getMentionPluginState(editorState);
     if (!(pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider)) {
       return {

package/dist/es2019/ui/type-ahead/utils.js

@@ -15,6 +15,55 @@ export const isInviteItem = mention => mention && mention.id === INVITE_ITEM_DES
 export const isAgentUserType = userType => userType === 'APP' || userType === 'AGENT';
 export const isAgentMention = mention => isAgentUserType(mention.userType) || mention.appType === 'agent';
 
+/**
+ * True when the mention is explicitly an agent, not a generic APP/bot.
+ * Prefer this over {@link isAgentMention} when ordering the search display
+ * list behind `platform_editor_mention_search_order` — bare `userType: 'APP'`
+ * is a bot unless `appType === 'agent'`.
+ */
+export const isExplicitAgentMention = mention => mention.appType === 'agent' || mention.userType === 'AGENT';
+
+/**
+ * Connect/app bots and teams. Explicit agents are excluded so they can be
+ * lifted above this group in the hardcoded display order.
+ */
+export const isBotOrTeamMention = mention => {
+  if (isExplicitAgentMention(mention)) {
+    return false;
+  }
+  return mention.userType === 'TEAM' || mention.userType === 'APP';
+};
+export const getMentionDisplayGroup = mention => {
+  if (isExplicitAgentMention(mention)) {
+    return 'agents';
+  }
+  if (isBotOrTeamMention(mention)) {
+    return 'bots-teams';
+  }
+  return 'people';
+};
+
+/**
+ * Hardcoded mention display order: people, then agents, then bots/teams.
+ * Stable within each group so provider ranking is preserved.
+ */
+export const orderMentionsForDisplay = mentions => {
+  const people = [];
+  const agents = [];
+  const botsAndTeams = [];
+  for (const mention of mentions) {
+    const group = getMentionDisplayGroup(mention);
+    if (group === 'agents') {
+      agents.push(mention);
+    } else if (group === 'bots-teams') {
+      botsAndTeams.push(mention);
+    } else {
+      people.push(mention);
+    }
+  }
+  return [...people, ...agents, ...botsAndTeams];
+};
+
 /**
  * Actions
  */

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

@@ -58,7 +58,7 @@ var AI_STREAMING_TRANSFORMATION_META_KEY = 'isAIStreamingTransformation';
 var AGENT_MENTION_INACTIVITY_MS = 3000;
 var MAX_PENDING_TYPED_AGENT_MENTION_FOCUS_DEFERS = 20;
 var PACKAGE_NAME = "@atlaskit/editor-plugin-mentions";
-var PACKAGE_VERSION = "17.1.4";
+var PACKAGE_VERSION = "17.1.6";
 var setProvider = function setProvider(provider) {
   return function (state, dispatch) {
     if (dispatch) {

package/dist/esm/ui/type-ahead/index.js

@@ -28,10 +28,19 @@ import InviteItem, { INVITE_ITEM_DESCRIPTION } from '../InviteItem';
 import InviteItemWithEmailDomain from '../InviteItem/InviteItemWithEmailDomain';
 import { buildTypeAheadCancelPayload, buildTypeAheadInsertedPayload, buildTypeAheadInviteItemClickedPayload, buildTypeAheadInviteItemViewedPayload, buildTypeAheadRenderedPayload } from './analytics';
 import { MentionItemWithProfileCard } from './MentionItemWithProfileCard';
-import { isAgentMention, isInviteItem, isTeamStats, isTeamType, shouldKeepInviteItem } from './utils';
+import { isAgentMention, isBotOrTeamMention, isExplicitAgentMention, isInviteItem, isTeamStats, isTeamType, orderMentionsForDisplay, shouldKeepInviteItem } from './utils';
 var isAgentTypeAheadItem = function isAgentTypeAheadItem(item) {
   return item.mention ? isAgentMention(item.mention) : false;
 };
+var isSearchOrderedAgentTypeAheadItem = function isSearchOrderedAgentTypeAheadItem(item) {
+  return !!item.mention && isExplicitAgentMention(item.mention);
+};
+var isSearchOrderedPersonTypeAheadItem = function isSearchOrderedPersonTypeAheadItem(item) {
+  return !!item.mention && !isInviteItem(item.mention) && !isExplicitAgentMention(item.mention) && !isBotOrTeamMention(item.mention);
+};
+var shouldApplyMentionSearchOrder = function shouldApplyMentionSearchOrder(query) {
+  return isExperimentEnabled('platform_editor_mention_search_order') && query.trim().length > 0;
+};
 
 // A non-selectable loading placeholder injected by the provider (e.g.
 // `RovoChatMentionResource`) while the slower agent source resolves. It
@@ -279,13 +288,14 @@ var makeTransformMentionsToTypeAheadItems = function makeTransformMentionsToType
       mentionProvider = _ref8.mentionProvider,
       contextIdentifierProvider = _ref8.contextIdentifierProvider,
       sessionId = _ref8.sessionId;
-    var mentionItems = mentions.map(function (mention) {
+    var displayMentions = shouldApplyMentionSearchOrder(query) ? orderMentionsForDisplay(mentions) : mentions;
+    var mentionItems = displayMentions.map(function (mention) {
       return toItem(mention);
     });
     // The loading placeholder is a rendered-only row — keep it in
     // `mentionItems` so the shimmer shows, but exclude it from analytics
     // and no-results bookkeeping so it isn't counted as a real result.
-    var realMentions = mentions.filter(function (mention) {
+    var realMentions = displayMentions.filter(function (mention) {
       return !isLoadingPlaceholder(mention);
     });
     var agentCount = realMentions.filter(isAgentMention).length;
@@ -340,6 +350,7 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref9) {
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   var sessionId = uuid();
   var firstQueryWithoutResults = null;
+  var lastTypeAheadQuery = '';
   var subscriptionKeys = new Set();
   var transformMentionsToTypeAheadItems = makeTransformMentionsToTypeAheadItems({
     enableAgentSectioning: enableAgentSectioning,
@@ -372,6 +383,7 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref9) {
       var _api$contextIdentifie, _api$contextIdentifie2;
       var query = _ref0.query,
         editorState = _ref0.editorState;
+      lastTypeAheadQuery = query || '';
       var pluginState = getMentionPluginState(editorState);
       if (!(pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider)) {
         return Promise.resolve([]);
@@ -418,10 +430,11 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref9) {
       if (!enableAgentSectioning) {
         return [];
       }
+      var applySearchOrder = shouldApplyMentionSearchOrder(lastTypeAheadQuery);
       return [{
         id: 'people',
         title: intl.formatMessage(mentionMessages.typeAheadSectionPeople),
-        filter: function filter(item) {
+        filter: applySearchOrder ? isSearchOrderedPersonTypeAheadItem : function (item) {
           if (isAgentTypeAheadItem(item)) {
             return false;
           }
@@ -442,9 +455,7 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref9) {
       }, {
         id: 'agents',
         title: intl.formatMessage(mentionMessages.typeAheadSectionAgents),
-        filter: function filter(item) {
-          return isAgentTypeAheadItem(item);
-        },
+        filter: applySearchOrder ? isSearchOrderedAgentTypeAheadItem : isAgentTypeAheadItem,
         limit: 5,
         sectionTitleDisplay: {
           showWhenQueryPresent: false,
@@ -457,6 +468,7 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref9) {
     },
     onOpen: function onOpen() {
       firstQueryWithoutResults = null;
+      lastTypeAheadQuery = '';
     },
     selectItem: function selectItem(state, item, insert, _ref11) {
       var _api$contextIdentifie3, _api$contextIdentifie4;
@@ -660,6 +672,7 @@ export var createTypeAheadConfig = function createTypeAheadConfig(_ref9) {
     var _api$contextIdentifie5, _api$contextIdentifie6;
     var query = _ref14.query,
       editorState = _ref14.editorState;
+    lastTypeAheadQuery = query || '';
     var pluginState = getMentionPluginState(editorState);
     if (!(pluginState !== null && pluginState !== void 0 && pluginState.mentionProvider)) {
       return {

package/dist/esm/ui/type-ahead/utils.js

@@ -1,3 +1,6 @@
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { INVITE_ITEM_DESCRIPTION } from '../InviteItem';
 
 // Ignored via go/ees005
@@ -25,6 +28,66 @@ export var isAgentMention = function isAgentMention(mention) {
   return isAgentUserType(mention.userType) || mention.appType === 'agent';
 };
 
+/**
+ * True when the mention is explicitly an agent, not a generic APP/bot.
+ * Prefer this over {@link isAgentMention} when ordering the search display
+ * list behind `platform_editor_mention_search_order` — bare `userType: 'APP'`
+ * is a bot unless `appType === 'agent'`.
+ */
+export var isExplicitAgentMention = function isExplicitAgentMention(mention) {
+  return mention.appType === 'agent' || mention.userType === 'AGENT';
+};
+
+/**
+ * Connect/app bots and teams. Explicit agents are excluded so they can be
+ * lifted above this group in the hardcoded display order.
+ */
+export var isBotOrTeamMention = function isBotOrTeamMention(mention) {
+  if (isExplicitAgentMention(mention)) {
+    return false;
+  }
+  return mention.userType === 'TEAM' || mention.userType === 'APP';
+};
+export var getMentionDisplayGroup = function getMentionDisplayGroup(mention) {
+  if (isExplicitAgentMention(mention)) {
+    return 'agents';
+  }
+  if (isBotOrTeamMention(mention)) {
+    return 'bots-teams';
+  }
+  return 'people';
+};
+
+/**
+ * Hardcoded mention display order: people, then agents, then bots/teams.
+ * Stable within each group so provider ranking is preserved.
+ */
+export var orderMentionsForDisplay = function orderMentionsForDisplay(mentions) {
+  var people = [];
+  var agents = [];
+  var botsAndTeams = [];
+  var _iterator = _createForOfIteratorHelper(mentions),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var mention = _step.value;
+      var group = getMentionDisplayGroup(mention);
+      if (group === 'agents') {
+        agents.push(mention);
+      } else if (group === 'bots-teams') {
+        botsAndTeams.push(mention);
+      } else {
+        people.push(mention);
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return [].concat(people, agents, botsAndTeams);
+};
+
 /**
  * Actions
  */

package/dist/types/types/index.d.ts

@@ -40,6 +40,8 @@ export interface MentionsPluginOptions extends MentionPluginConfig {
      *
      * Consumers own the rollout decision for their editor surface; the shared
      * mentions plugin only applies the resulting presentation option.
+     * Search-time ordering of agents above bots/teams is gated by
+     * `platform_editor_mention_search_order`.
      */
     enableAgentSectioning?: boolean;
     /**

package/dist/types/ui/type-ahead/utils.d.ts

@@ -4,6 +4,25 @@ export declare const isTeamStats: (stat: any) => boolean;
 export declare const isInviteItem: (mention: MentionDescription) => boolean;
 export declare const isAgentUserType: (userType: string | undefined) => boolean;
 export declare const isAgentMention: (mention: Pick<MentionDescription, 'appType' | 'userType'>) => boolean;
+/**
+ * True when the mention is explicitly an agent, not a generic APP/bot.
+ * Prefer this over {@link isAgentMention} when ordering the search display
+ * list behind `platform_editor_mention_search_order` — bare `userType: 'APP'`
+ * is a bot unless `appType === 'agent'`.
+ */
+export declare const isExplicitAgentMention: (mention: Pick<MentionDescription, 'appType' | 'userType'>) => boolean;
+/**
+ * Connect/app bots and teams. Explicit agents are excluded so they can be
+ * lifted above this group in the hardcoded display order.
+ */
+export declare const isBotOrTeamMention: (mention: Pick<MentionDescription, 'appType' | 'userType'>) => boolean;
+export type MentionDisplayGroup = 'people' | 'agents' | 'bots-teams';
+export declare const getMentionDisplayGroup: (mention: Pick<MentionDescription, 'appType' | 'userType'>) => MentionDisplayGroup;
+/**
+ * Hardcoded mention display order: people, then agents, then bots/teams.
+ * Stable within each group so provider ranking is preserved.
+ */
+export declare const orderMentionsForDisplay: <T extends Pick<MentionDescription, 'appType' | 'userType'>>(mentions: readonly T[]) => T[];
 /**
  * Actions
  */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-mentions",
-	"version": "17.1.5",
+	"version": "17.1.7",
 	"description": "Mentions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		"@atlaskit/editor-plugin-type-ahead": "^16.1.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/feature-gate-js-client": "^6.0.0",
-		"@atlaskit/icon": "^37.3.0",
+		"@atlaskit/icon": "^37.4.0",
 		"@atlaskit/insm": "^2.0.0",
 		"@atlaskit/link": "^5.0.0",
 		"@atlaskit/lozenge": "^15.1.0",
@@ -46,7 +46,7 @@
 		"@atlaskit/profilecard": "^26.18.0",
 		"@atlaskit/teams-app-config": "^2.2.0",
 		"@atlaskit/theme": "^28.0.0",
-		"@atlaskit/tmp-editor-statsig": "^150.0.0",
+		"@atlaskit/tmp-editor-statsig": "^151.0.0",
 		"@atlaskit/tokens": "^16.7.0",
 		"@atlaskit/tooltip": "^24.0.0",
 		"@atlaskit/user-picker": "^13.9.0",