@atlaskit/editor-common 123.6.0 → 123.7.1

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @atlaskit/editor-common
 
+## 123.7.1
+
+### Patch Changes
+
+- [`6d07b4f04155f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6d07b4f04155f) -
+  Cleanup `feature gate` `jim-lower-ranking-in-jira-macro-search`. Quick insert search now always
+  ranks the Jira work items (datasource) item above the legacy Jira macro when their scores are
+  close, and the Jira work items quick insert item always has a priority of 500.
+- Updated dependencies
+
+## 123.7.0
+
+### Minor Changes
+
+- [`a1df9dd2d8f02`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a1df9dd2d8f02) -
+  Add the optional `showNoResultsMessage` empty-state handler parameter and
+  `platform_editor_slash_command`-gated Ask Rovo and View more recovery for registered quick insert
+  searches with no matches. Respect registry visibility and keep Marketplace content separate from
+  listbox navigation while preserving its native keyboard controls.
+
+  Show the registered Ask Rovo action alongside Marketplace suggestions in the element browser's
+  no-match state, with a divider separating the fallback action from Marketplace content. Keep the
+  toolbar's View more footer visible while Marketplace content scrolls and preserve native Tab
+  navigation.
+
+  Respect `data-keyboard-navigation-independent` containers in both toolbar keyboard navigation
+  providers. Apply the attribute to the registered insert menu, whose rendering is gated by
+  `platform_editor_slash_command`, so its controls retain their own key handling and native tab
+  stops.
+
+### Patch Changes
+
+- [`f11db7a4b4188`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f11db7a4b4188) -
+  Fix comment renderer agent mention profile cards, behind experiment
+  `platform_editor_comment_mention_card_fixes`
+- Updated dependencies
+
 ## 123.6.0
 
 ### Minor Changes

package/dist/cjs/monitoring/error.js

@@ -27,7 +27,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
 var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "123.5.1";
+var packageVersion = "123.7.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/quick-insert/get-matching-quick-insert-components.js

@@ -7,6 +7,7 @@ exports.getMatchingQuickInsertComponents = void 0;
 var _surfaceRenderer = require("@atlaskit/editor-ui-control-model/surface-renderer");
 var _isMenuFooterSectionKey = require("../type-ahead/isMenuFooterSectionKey");
 var _isSectionOverflowItemKey = require("../type-ahead/isSectionOverflowItemKey");
+var _keys = require("./keys");
 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; }
@@ -25,6 +26,7 @@ var compareMatchedItems = function compareMatchedItems(a, b) {
  * no empty-query path so browse behavior remains owned by buildQuickInsertMenuModel.
  */
 var getMatchingQuickInsertComponents = exports.getMatchingQuickInsertComponents = function getMatchingQuickInsertComponents(_ref) {
+  var _childrenMap$get2;
   var components = _ref.components,
     rootComponent = _ref.rootComponent,
     query = _ref.query,
@@ -46,12 +48,12 @@ var getMatchingQuickInsertComponents = exports.getMatchingQuickInsertComponents
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var _childrenMap$get;
+      var _childrenMap$get3;
       var section = _step.value;
       if (section.type !== 'menu-section' || (0, _isMenuFooterSectionKey.isMenuFooterSectionKey)(section.key) || !(0, _surfaceRenderer.willComponentRender)(section, childrenMap, surfaceContext)) {
         continue;
       }
-      var _iterator3 = _createForOfIteratorHelper((_childrenMap$get = childrenMap.get((0, _surfaceRenderer.getComponentIdentity)(section))) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : []),
+      var _iterator3 = _createForOfIteratorHelper((_childrenMap$get3 = childrenMap.get((0, _surfaceRenderer.getComponentIdentity)(section))) !== null && _childrenMap$get3 !== void 0 ? _childrenMap$get3 : []),
         _step3;
       try {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -109,9 +111,33 @@ var getMatchingQuickInsertComponents = exports.getMatchingQuickInsertComponents
   } finally {
     _iterator2.f();
   }
+  var sections = Array.from(sectionsByKey.values());
+  if (sections.length > 0 || query === '') {
+    return {
+      footer: undefined,
+      root: root,
+      sections: sections
+    };
+  }
+  var fallbackItem = topLevelChildren.filter(function (section) {
+    return section.type === 'menu-section' && !(0, _isMenuFooterSectionKey.isMenuFooterSectionKey)(section.key) && (0, _surfaceRenderer.willComponentRender)(section, childrenMap, surfaceContext);
+  }).flatMap(function (section) {
+    var _childrenMap$get;
+    return (_childrenMap$get = childrenMap.get((0, _surfaceRenderer.getComponentIdentity)(section))) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : [];
+  }).find(function (component) {
+    return component.type === _keys.ASK_ROVO_MENU_ITEM.type && component.key === _keys.ASK_ROVO_MENU_ITEM.key && (0, _surfaceRenderer.willComponentRender)(component, childrenMap, surfaceContext);
+  });
+  var fallbackItems = fallbackItem ? [fallbackItem] : [];
+  var footerSection = topLevelChildren.find(function (section) {
+    return section.type === 'menu-section' && (0, _isMenuFooterSectionKey.isMenuFooterSectionKey)(section.key) && (0, _surfaceRenderer.willComponentRender)(section, childrenMap, surfaceContext);
+  });
+  var footer = footerSection ? ((_childrenMap$get2 = childrenMap.get((0, _surfaceRenderer.getComponentIdentity)(footerSection))) !== null && _childrenMap$get2 !== void 0 ? _childrenMap$get2 : []).find(function (child) {
+    return child.type === 'menu-item' && (0, _surfaceRenderer.willComponentRender)(child, childrenMap, surfaceContext);
+  }) : undefined;
   return {
-    footer: undefined,
+    fallbackItems: fallbackItems,
+    footer: footer,
     root: root,
-    sections: Array.from(sectionsByKey.values())
+    sections: sections
   };
 };

package/dist/cjs/quick-insert/utils.js

@@ -11,7 +11,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _fuse = _interopRequireDefault(require("fuse.js"));
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
-var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _boostNativeResultsAboveSkills = require("./boost-native-results-above-skills");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -68,6 +67,7 @@ var options = {
  */
 // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
 function find(query, items, prioritySortingFn) {
+  var _rerankedResults$data, _rerankedResults$lega;
   if (query === '') {
     // Copy and sort list by priority
     return items.slice(0).sort(function (a, b) {
@@ -88,26 +88,24 @@ function find(query, items, prioritySortingFn) {
 
   // platform_editor_insert_menu_ai: boost native editor elements above skills
   var rerankedResults = (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_insert_menu_ai') ? (0, _boostNativeResultsAboveSkills.boostNativeResultsAboveSkills)(results) : results;
-  if ((0, _fg.fg)('jim-lower-ranking-in-jira-macro-search')) {
-    var _rerankedResults$data, _rerankedResults$lega;
-    // searching for jira work items macro first
-    var datasourceIndex = rerankedResults.findIndex(function (r) {
-      var _r$item$keywords;
-      return r.item.id === 'datasource' && ((_r$item$keywords = r.item.keywords) === null || _r$item$keywords === void 0 ? void 0 : _r$item$keywords.includes('jira'));
-    });
 
-    //  then searching for the legacy jira macro
-    var legacyIndex = rerankedResults.findIndex(function (r) {
-      return typeof r.item.key === 'string' && r.item.key.endsWith(':jira');
-    });
+  // searching for jira work items macro first
+  var datasourceIndex = rerankedResults.findIndex(function (r) {
+    var _r$item$keywords;
+    return r.item.id === 'datasource' && ((_r$item$keywords = r.item.keywords) === null || _r$item$keywords === void 0 ? void 0 : _r$item$keywords.includes('jira'));
+  });
 
-    // the jira legcy macro is found before the jira work items macro then swap the two
-    if (datasourceIndex > 0 && legacyIndex >= 0 && legacyIndex < datasourceIndex && Math.abs(((_rerankedResults$data = rerankedResults[datasourceIndex].score) !== null && _rerankedResults$data !== void 0 ? _rerankedResults$data : 0) - ((_rerankedResults$lega = rerankedResults[legacyIndex].score) !== null && _rerankedResults$lega !== void 0 ? _rerankedResults$lega : 0)) < 0.2) {
-      var _rerankedResults$spli = rerankedResults.splice(datasourceIndex, 1),
-        _rerankedResults$spli2 = (0, _slicedToArray2.default)(_rerankedResults$spli, 1),
-        datasource = _rerankedResults$spli2[0];
-      rerankedResults.splice(legacyIndex, 0, datasource);
-    }
+  //  then searching for the legacy jira macro
+  var legacyIndex = rerankedResults.findIndex(function (r) {
+    return typeof r.item.key === 'string' && r.item.key.endsWith(':jira');
+  });
+
+  // the jira legcy macro is found before the jira work items macro then swap the two
+  if (datasourceIndex > 0 && legacyIndex >= 0 && legacyIndex < datasourceIndex && Math.abs(((_rerankedResults$data = rerankedResults[datasourceIndex].score) !== null && _rerankedResults$data !== void 0 ? _rerankedResults$data : 0) - ((_rerankedResults$lega = rerankedResults[legacyIndex].score) !== null && _rerankedResults$lega !== void 0 ? _rerankedResults$lega : 0)) < 0.2) {
+    var _rerankedResults$spli = rerankedResults.splice(datasourceIndex, 1),
+      _rerankedResults$spli2 = (0, _slicedToArray2.default)(_rerankedResults$spli, 1),
+      datasource = _rerankedResults$spli2[0];
+    rerankedResults.splice(legacyIndex, 0, datasource);
   }
   return rerankedResults.map(function (result) {
     return result.item;

package/dist/cjs/ui/DropList/index.js

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "123.5.1";
+var packageVersion = "123.7.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/cjs/ui/Mention/mention-with-profilecard.js

@@ -87,6 +87,7 @@ function MentionWithProfileCard(_ref) {
   if (userType === 'APP' && cloudId && (0, _isExperimentEnabled.isExperimentEnabled)('rovo_chat_mention_agents')) {
     return /*#__PURE__*/_react.default.createElement(AgentProfileCardTrigger, {
       agentId: id,
+      agentIdType: (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_comment_mention_card_fixes') ? 'identity' : undefined,
       cloudId: cloudId,
       resourceClient: resourceClient,
       trigger: "click"

package/dist/cjs/ui-menu/ToolbarArrowKeyNavigationProvider/index.js

@@ -133,7 +133,7 @@ var ToolbarArrowKeyNavigationProvider = exports.ToolbarArrowKeyNavigationProvide
       if (targetElement instanceof HTMLElement && !targetElement.closest("".concat(childComponentSelector))) {
         return;
       }
-      if (targetElement instanceof HTMLElement && (_document$querySelect = document.querySelector('[data-role="droplistContent"], [data-test-id="color-picker-menu"], [data-emoji-picker-container="true"]')) !== null && _document$querySelect !== void 0 && _document$querySelect.contains(targetElement) || targetElement instanceof HTMLElement && (_document$querySelect2 = document.querySelector('[data-test-id="color-picker-menu"]')) !== null && _document$querySelect2 !== void 0 && _document$querySelect2.contains(targetElement) || event.key === 'ArrowUp' || event.key === 'ArrowDown' || disableArrowKeyNavigation) {
+      if (targetElement instanceof HTMLElement && (_document$querySelect = document.querySelector('[data-role="droplistContent"], [data-test-id="color-picker-menu"], [data-emoji-picker-container="true"]')) !== null && _document$querySelect !== void 0 && _document$querySelect.contains(targetElement) || targetElement instanceof HTMLElement && (_document$querySelect2 = document.querySelector('[data-test-id="color-picker-menu"]')) !== null && _document$querySelect2 !== void 0 && _document$querySelect2.contains(targetElement) || targetElement instanceof HTMLElement && targetElement.closest('[data-keyboard-navigation-independent]') || event.key === 'ArrowUp' || event.key === 'ArrowDown' || disableArrowKeyNavigation) {
         return;
       }
       var menuWrapper = document.querySelector('.menu-key-handler-wrapper');
@@ -270,10 +270,10 @@ function isElementOrAncestorHiddenOrDisabled(element, rootNode) {
   return false;
 }
 function getFilteredFocusableElements(rootNode) {
-  // The focusable elements from child components such as dropdown menus / popups are ignored
+  // Independent containers and child popups own their key handling and tab stops.
   return getFocusableElements(rootNode).filter(function (elm) {
     // Check if element or any ancestor is hidden or disabled
     var isHiddenOrDisabled = isElementOrAncestorHiddenOrDisabled(elm, rootNode);
-    return !elm.closest('[data-role="droplistContent"]') && !elm.closest('[data-emoji-picker-container="true"]') && !elm.closest('[data-test-id="color-picker-menu"]') && !elm.closest('.scroll-buttons') && !isHiddenOrDisabled;
+    return !elm.closest('[data-role="droplistContent"]') && !elm.closest('[data-emoji-picker-container="true"]') && !elm.closest('[data-test-id="color-picker-menu"]') && !elm.closest('[data-keyboard-navigation-independent]') && !elm.closest('.scroll-buttons') && !isHiddenOrDisabled;
   });
 }

package/dist/es2019/monitoring/error.js

@@ -13,7 +13,7 @@ const NETWORK_FAILURE_REGEX = /^network failure/i;
 const RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "123.5.1";
+const packageVersion = "123.7.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/quick-insert/get-matching-quick-insert-components.js

@@ -1,6 +1,7 @@
 import { getComponentIdentity, resolveSurface, willComponentRender } from '@atlaskit/editor-ui-control-model/surface-renderer';
 import { isMenuFooterSectionKey } from '../type-ahead/isMenuFooterSectionKey';
 import { isSectionOverflowItemKey } from '../type-ahead/isSectionOverflowItemKey';
+import { ASK_ROVO_MENU_ITEM } from './keys';
 const getRank = (component, parentKey) => {
   var _component$parents$fi, _component$parents, _component$parents$fi2;
   return (_component$parents$fi = (_component$parents = component.parents) === null || _component$parents === void 0 ? void 0 : (_component$parents$fi2 = _component$parents.find(parent => parent.key === parentKey)) === null || _component$parents$fi2 === void 0 ? void 0 : _component$parents$fi2.rank) !== null && _component$parents$fi !== void 0 ? _component$parents$fi : Number.MAX_SAFE_INTEGER;
@@ -18,6 +19,7 @@ export const getMatchingQuickInsertComponents = ({
   formatMessage,
   surfaceContext
 }) => {
+  var _childrenMap$get3;
   const {
     childrenMap,
     root,
@@ -70,9 +72,25 @@ export const getMatchingQuickInsertComponents = ({
       sectionsByKey.set(match.section.key, [match.section, match.item]);
     }
   }
+  const sections = Array.from(sectionsByKey.values());
+  if (sections.length > 0 || query === '') {
+    return {
+      footer: undefined,
+      root,
+      sections
+    };
+  }
+  const fallbackItem = topLevelChildren.filter(section => section.type === 'menu-section' && !isMenuFooterSectionKey(section.key) && willComponentRender(section, childrenMap, surfaceContext)).flatMap(section => {
+    var _childrenMap$get2;
+    return (_childrenMap$get2 = childrenMap.get(getComponentIdentity(section))) !== null && _childrenMap$get2 !== void 0 ? _childrenMap$get2 : [];
+  }).find(component => component.type === ASK_ROVO_MENU_ITEM.type && component.key === ASK_ROVO_MENU_ITEM.key && willComponentRender(component, childrenMap, surfaceContext));
+  const fallbackItems = fallbackItem ? [fallbackItem] : [];
+  const footerSection = topLevelChildren.find(section => section.type === 'menu-section' && isMenuFooterSectionKey(section.key) && willComponentRender(section, childrenMap, surfaceContext));
+  const footer = footerSection ? ((_childrenMap$get3 = childrenMap.get(getComponentIdentity(footerSection))) !== null && _childrenMap$get3 !== void 0 ? _childrenMap$get3 : []).find(child => child.type === 'menu-item' && willComponentRender(child, childrenMap, surfaceContext)) : undefined;
   return {
-    footer: undefined,
+    fallbackItems,
+    footer,
     root,
-    sections: Array.from(sectionsByKey.values())
+    sections
   };
 };

package/dist/es2019/quick-insert/utils.js

@@ -1,7 +1,6 @@
 import Fuse from 'fuse.js';
 import memoizeOne from 'memoize-one';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { boostNativeResultsAboveSkills } from './boost-native-results-above-skills';
 const processQuickInsertItems = (items, intl) => {
   return items.reduce((acc, item) => {
@@ -52,6 +51,7 @@ const options = {
  */
 // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
 export function find(query, items, prioritySortingFn) {
+  var _rerankedResults$data, _rerankedResults$lega;
   if (query === '') {
     // Copy and sort list by priority
     return items.slice(0).sort((a, b) => (a.priority || Number.POSITIVE_INFINITY) - (b.priority || Number.POSITIVE_INFINITY));
@@ -72,22 +72,20 @@ export function find(query, items, prioritySortingFn) {
 
   // platform_editor_insert_menu_ai: boost native editor elements above skills
   const rerankedResults = isExperimentEnabled('platform_editor_insert_menu_ai') ? boostNativeResultsAboveSkills(results) : results;
-  if (fg('jim-lower-ranking-in-jira-macro-search')) {
-    var _rerankedResults$data, _rerankedResults$lega;
-    // searching for jira work items macro first
-    const datasourceIndex = rerankedResults.findIndex(r => {
-      var _r$item$keywords;
-      return r.item.id === 'datasource' && ((_r$item$keywords = r.item.keywords) === null || _r$item$keywords === void 0 ? void 0 : _r$item$keywords.includes('jira'));
-    });
 
-    //  then searching for the legacy jira macro
-    const legacyIndex = rerankedResults.findIndex(r => typeof r.item.key === 'string' && r.item.key.endsWith(':jira'));
+  // searching for jira work items macro first
+  const datasourceIndex = rerankedResults.findIndex(r => {
+    var _r$item$keywords;
+    return r.item.id === 'datasource' && ((_r$item$keywords = r.item.keywords) === null || _r$item$keywords === void 0 ? void 0 : _r$item$keywords.includes('jira'));
+  });
 
-    // the jira legcy macro is found before the jira work items macro then swap the two
-    if (datasourceIndex > 0 && legacyIndex >= 0 && legacyIndex < datasourceIndex && Math.abs(((_rerankedResults$data = rerankedResults[datasourceIndex].score) !== null && _rerankedResults$data !== void 0 ? _rerankedResults$data : 0) - ((_rerankedResults$lega = rerankedResults[legacyIndex].score) !== null && _rerankedResults$lega !== void 0 ? _rerankedResults$lega : 0)) < 0.2) {
-      const [datasource] = rerankedResults.splice(datasourceIndex, 1);
-      rerankedResults.splice(legacyIndex, 0, datasource);
-    }
+  //  then searching for the legacy jira macro
+  const legacyIndex = rerankedResults.findIndex(r => typeof r.item.key === 'string' && r.item.key.endsWith(':jira'));
+
+  // the jira legcy macro is found before the jira work items macro then swap the two
+  if (datasourceIndex > 0 && legacyIndex >= 0 && legacyIndex < datasourceIndex && Math.abs(((_rerankedResults$data = rerankedResults[datasourceIndex].score) !== null && _rerankedResults$data !== void 0 ? _rerankedResults$data : 0) - ((_rerankedResults$lega = rerankedResults[legacyIndex].score) !== null && _rerankedResults$lega !== void 0 ? _rerankedResults$lega : 0)) < 0.2) {
+    const [datasource] = rerankedResults.splice(datasourceIndex, 1);
+    rerankedResults.splice(legacyIndex, 0, datasource);
   }
   return rerankedResults.map(result => result.item);
 }

package/dist/es2019/ui/DropList/index.js

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "123.5.1";
+const packageVersion = "123.7.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/es2019/ui/Mention/mention-with-profilecard.js

@@ -72,6 +72,7 @@ export default function MentionWithProfileCard({
   if (userType === 'APP' && cloudId && isExperimentEnabled('rovo_chat_mention_agents')) {
     return /*#__PURE__*/React.createElement(AgentProfileCardTrigger, {
       agentId: id,
+      agentIdType: isExperimentEnabled('platform_editor_comment_mention_card_fixes') ? 'identity' : undefined,
       cloudId: cloudId,
       resourceClient: resourceClient,
       trigger: "click"

package/dist/es2019/ui-menu/ToolbarArrowKeyNavigationProvider/index.js

@@ -125,7 +125,7 @@ export const ToolbarArrowKeyNavigationProvider = ({
       if (targetElement instanceof HTMLElement && !targetElement.closest(`${childComponentSelector}`)) {
         return;
       }
-      if (targetElement instanceof HTMLElement && (_document$querySelect = document.querySelector('[data-role="droplistContent"], [data-test-id="color-picker-menu"], [data-emoji-picker-container="true"]')) !== null && _document$querySelect !== void 0 && _document$querySelect.contains(targetElement) || targetElement instanceof HTMLElement && (_document$querySelect2 = document.querySelector('[data-test-id="color-picker-menu"]')) !== null && _document$querySelect2 !== void 0 && _document$querySelect2.contains(targetElement) || event.key === 'ArrowUp' || event.key === 'ArrowDown' || disableArrowKeyNavigation) {
+      if (targetElement instanceof HTMLElement && (_document$querySelect = document.querySelector('[data-role="droplistContent"], [data-test-id="color-picker-menu"], [data-emoji-picker-container="true"]')) !== null && _document$querySelect !== void 0 && _document$querySelect.contains(targetElement) || targetElement instanceof HTMLElement && (_document$querySelect2 = document.querySelector('[data-test-id="color-picker-menu"]')) !== null && _document$querySelect2 !== void 0 && _document$querySelect2.contains(targetElement) || targetElement instanceof HTMLElement && targetElement.closest('[data-keyboard-navigation-independent]') || event.key === 'ArrowUp' || event.key === 'ArrowDown' || disableArrowKeyNavigation) {
         return;
       }
       const menuWrapper = document.querySelector('.menu-key-handler-wrapper');
@@ -262,10 +262,10 @@ function isElementOrAncestorHiddenOrDisabled(element, rootNode) {
   return false;
 }
 function getFilteredFocusableElements(rootNode) {
-  // The focusable elements from child components such as dropdown menus / popups are ignored
+  // Independent containers and child popups own their key handling and tab stops.
   return getFocusableElements(rootNode).filter(elm => {
     // Check if element or any ancestor is hidden or disabled
     const isHiddenOrDisabled = isElementOrAncestorHiddenOrDisabled(elm, rootNode);
-    return !elm.closest('[data-role="droplistContent"]') && !elm.closest('[data-emoji-picker-container="true"]') && !elm.closest('[data-test-id="color-picker-menu"]') && !elm.closest('.scroll-buttons') && !isHiddenOrDisabled;
+    return !elm.closest('[data-role="droplistContent"]') && !elm.closest('[data-emoji-picker-container="true"]') && !elm.closest('[data-test-id="color-picker-menu"]') && !elm.closest('[data-keyboard-navigation-independent]') && !elm.closest('.scroll-buttons') && !isHiddenOrDisabled;
   });
 }

package/dist/esm/monitoring/error.js

@@ -19,7 +19,7 @@ var NETWORK_FAILURE_REGEX = /^network failure/i;
 var RESIZE_OBSERVER_LOOP_REGEX = /ResizeObserver loop completed with undelivered notifications/;
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "123.5.1";
+var packageVersion = "123.7.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/quick-insert/get-matching-quick-insert-components.js

@@ -4,6 +4,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 import { getComponentIdentity, resolveSurface, willComponentRender } from '@atlaskit/editor-ui-control-model/surface-renderer';
 import { isMenuFooterSectionKey } from '../type-ahead/isMenuFooterSectionKey';
 import { isSectionOverflowItemKey } from '../type-ahead/isSectionOverflowItemKey';
+import { ASK_ROVO_MENU_ITEM } from './keys';
 var getRank = function getRank(component, parentKey) {
   var _component$parents$fi, _component$parents;
   return (_component$parents$fi = (_component$parents = component.parents) === null || _component$parents === void 0 || (_component$parents = _component$parents.find(function (parent) {
@@ -19,6 +20,7 @@ var compareMatchedItems = function compareMatchedItems(a, b) {
  * no empty-query path so browse behavior remains owned by buildQuickInsertMenuModel.
  */
 export var getMatchingQuickInsertComponents = function getMatchingQuickInsertComponents(_ref) {
+  var _childrenMap$get2;
   var components = _ref.components,
     rootComponent = _ref.rootComponent,
     query = _ref.query,
@@ -40,12 +42,12 @@ export var getMatchingQuickInsertComponents = function getMatchingQuickInsertCom
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var _childrenMap$get;
+      var _childrenMap$get3;
       var section = _step.value;
       if (section.type !== 'menu-section' || isMenuFooterSectionKey(section.key) || !willComponentRender(section, childrenMap, surfaceContext)) {
         continue;
       }
-      var _iterator3 = _createForOfIteratorHelper((_childrenMap$get = childrenMap.get(getComponentIdentity(section))) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : []),
+      var _iterator3 = _createForOfIteratorHelper((_childrenMap$get3 = childrenMap.get(getComponentIdentity(section))) !== null && _childrenMap$get3 !== void 0 ? _childrenMap$get3 : []),
         _step3;
       try {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -103,9 +105,33 @@ export var getMatchingQuickInsertComponents = function getMatchingQuickInsertCom
   } finally {
     _iterator2.f();
   }
+  var sections = Array.from(sectionsByKey.values());
+  if (sections.length > 0 || query === '') {
+    return {
+      footer: undefined,
+      root: root,
+      sections: sections
+    };
+  }
+  var fallbackItem = topLevelChildren.filter(function (section) {
+    return section.type === 'menu-section' && !isMenuFooterSectionKey(section.key) && willComponentRender(section, childrenMap, surfaceContext);
+  }).flatMap(function (section) {
+    var _childrenMap$get;
+    return (_childrenMap$get = childrenMap.get(getComponentIdentity(section))) !== null && _childrenMap$get !== void 0 ? _childrenMap$get : [];
+  }).find(function (component) {
+    return component.type === ASK_ROVO_MENU_ITEM.type && component.key === ASK_ROVO_MENU_ITEM.key && willComponentRender(component, childrenMap, surfaceContext);
+  });
+  var fallbackItems = fallbackItem ? [fallbackItem] : [];
+  var footerSection = topLevelChildren.find(function (section) {
+    return section.type === 'menu-section' && isMenuFooterSectionKey(section.key) && willComponentRender(section, childrenMap, surfaceContext);
+  });
+  var footer = footerSection ? ((_childrenMap$get2 = childrenMap.get(getComponentIdentity(footerSection))) !== null && _childrenMap$get2 !== void 0 ? _childrenMap$get2 : []).find(function (child) {
+    return child.type === 'menu-item' && willComponentRender(child, childrenMap, surfaceContext);
+  }) : undefined;
   return {
-    footer: undefined,
+    fallbackItems: fallbackItems,
+    footer: footer,
     root: root,
-    sections: Array.from(sectionsByKey.values())
+    sections: sections
   };
 };

package/dist/esm/quick-insert/utils.js

@@ -5,7 +5,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import Fuse from 'fuse.js';
 import memoizeOne from 'memoize-one';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { boostNativeResultsAboveSkills } from './boost-native-results-above-skills';
 var processQuickInsertItems = function processQuickInsertItems(items, intl) {
   return items.reduce(function (acc, item) {
@@ -60,6 +59,7 @@ var options = {
  */
 // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
 export function find(query, items, prioritySortingFn) {
+  var _rerankedResults$data, _rerankedResults$lega;
   if (query === '') {
     // Copy and sort list by priority
     return items.slice(0).sort(function (a, b) {
@@ -80,26 +80,24 @@ export function find(query, items, prioritySortingFn) {
 
   // platform_editor_insert_menu_ai: boost native editor elements above skills
   var rerankedResults = isExperimentEnabled('platform_editor_insert_menu_ai') ? boostNativeResultsAboveSkills(results) : results;
-  if (fg('jim-lower-ranking-in-jira-macro-search')) {
-    var _rerankedResults$data, _rerankedResults$lega;
-    // searching for jira work items macro first
-    var datasourceIndex = rerankedResults.findIndex(function (r) {
-      var _r$item$keywords;
-      return r.item.id === 'datasource' && ((_r$item$keywords = r.item.keywords) === null || _r$item$keywords === void 0 ? void 0 : _r$item$keywords.includes('jira'));
-    });
 
-    //  then searching for the legacy jira macro
-    var legacyIndex = rerankedResults.findIndex(function (r) {
-      return typeof r.item.key === 'string' && r.item.key.endsWith(':jira');
-    });
+  // searching for jira work items macro first
+  var datasourceIndex = rerankedResults.findIndex(function (r) {
+    var _r$item$keywords;
+    return r.item.id === 'datasource' && ((_r$item$keywords = r.item.keywords) === null || _r$item$keywords === void 0 ? void 0 : _r$item$keywords.includes('jira'));
+  });
 
-    // the jira legcy macro is found before the jira work items macro then swap the two
-    if (datasourceIndex > 0 && legacyIndex >= 0 && legacyIndex < datasourceIndex && Math.abs(((_rerankedResults$data = rerankedResults[datasourceIndex].score) !== null && _rerankedResults$data !== void 0 ? _rerankedResults$data : 0) - ((_rerankedResults$lega = rerankedResults[legacyIndex].score) !== null && _rerankedResults$lega !== void 0 ? _rerankedResults$lega : 0)) < 0.2) {
-      var _rerankedResults$spli = rerankedResults.splice(datasourceIndex, 1),
-        _rerankedResults$spli2 = _slicedToArray(_rerankedResults$spli, 1),
-        datasource = _rerankedResults$spli2[0];
-      rerankedResults.splice(legacyIndex, 0, datasource);
-    }
+  //  then searching for the legacy jira macro
+  var legacyIndex = rerankedResults.findIndex(function (r) {
+    return typeof r.item.key === 'string' && r.item.key.endsWith(':jira');
+  });
+
+  // the jira legcy macro is found before the jira work items macro then swap the two
+  if (datasourceIndex > 0 && legacyIndex >= 0 && legacyIndex < datasourceIndex && Math.abs(((_rerankedResults$data = rerankedResults[datasourceIndex].score) !== null && _rerankedResults$data !== void 0 ? _rerankedResults$data : 0) - ((_rerankedResults$lega = rerankedResults[legacyIndex].score) !== null && _rerankedResults$lega !== void 0 ? _rerankedResults$lega : 0)) < 0.2) {
+    var _rerankedResults$spli = rerankedResults.splice(datasourceIndex, 1),
+      _rerankedResults$spli2 = _slicedToArray(_rerankedResults$spli, 1),
+      datasource = _rerankedResults$spli2[0];
+    rerankedResults.splice(legacyIndex, 0, datasource);
   }
   return rerankedResults.map(function (result) {
     return result.item;

package/dist/esm/ui/DropList/index.js

@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "123.5.1";
+var packageVersion = "123.7.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

package/dist/esm/ui/Mention/mention-with-profilecard.js

@@ -77,6 +77,7 @@ export default function MentionWithProfileCard(_ref) {
   if (userType === 'APP' && cloudId && isExperimentEnabled('rovo_chat_mention_agents')) {
     return /*#__PURE__*/React.createElement(AgentProfileCardTrigger, {
       agentId: id,
+      agentIdType: isExperimentEnabled('platform_editor_comment_mention_card_fixes') ? 'identity' : undefined,
       cloudId: cloudId,
       resourceClient: resourceClient,
       trigger: "click"

package/dist/esm/ui-menu/ToolbarArrowKeyNavigationProvider/index.js

@@ -125,7 +125,7 @@ export var ToolbarArrowKeyNavigationProvider = function ToolbarArrowKeyNavigatio
       if (targetElement instanceof HTMLElement && !targetElement.closest("".concat(childComponentSelector))) {
         return;
       }
-      if (targetElement instanceof HTMLElement && (_document$querySelect = document.querySelector('[data-role="droplistContent"], [data-test-id="color-picker-menu"], [data-emoji-picker-container="true"]')) !== null && _document$querySelect !== void 0 && _document$querySelect.contains(targetElement) || targetElement instanceof HTMLElement && (_document$querySelect2 = document.querySelector('[data-test-id="color-picker-menu"]')) !== null && _document$querySelect2 !== void 0 && _document$querySelect2.contains(targetElement) || event.key === 'ArrowUp' || event.key === 'ArrowDown' || disableArrowKeyNavigation) {
+      if (targetElement instanceof HTMLElement && (_document$querySelect = document.querySelector('[data-role="droplistContent"], [data-test-id="color-picker-menu"], [data-emoji-picker-container="true"]')) !== null && _document$querySelect !== void 0 && _document$querySelect.contains(targetElement) || targetElement instanceof HTMLElement && (_document$querySelect2 = document.querySelector('[data-test-id="color-picker-menu"]')) !== null && _document$querySelect2 !== void 0 && _document$querySelect2.contains(targetElement) || targetElement instanceof HTMLElement && targetElement.closest('[data-keyboard-navigation-independent]') || event.key === 'ArrowUp' || event.key === 'ArrowDown' || disableArrowKeyNavigation) {
         return;
       }
       var menuWrapper = document.querySelector('.menu-key-handler-wrapper');
@@ -262,10 +262,10 @@ function isElementOrAncestorHiddenOrDisabled(element, rootNode) {
   return false;
 }
 function getFilteredFocusableElements(rootNode) {
-  // The focusable elements from child components such as dropdown menus / popups are ignored
+  // Independent containers and child popups own their key handling and tab stops.
   return getFocusableElements(rootNode).filter(function (elm) {
     // Check if element or any ancestor is hidden or disabled
     var isHiddenOrDisabled = isElementOrAncestorHiddenOrDisabled(elm, rootNode);
-    return !elm.closest('[data-role="droplistContent"]') && !elm.closest('[data-emoji-picker-container="true"]') && !elm.closest('[data-test-id="color-picker-menu"]') && !elm.closest('.scroll-buttons') && !isHiddenOrDisabled;
+    return !elm.closest('[data-role="droplistContent"]') && !elm.closest('[data-emoji-picker-container="true"]') && !elm.closest('[data-test-id="color-picker-menu"]') && !elm.closest('[data-keyboard-navigation-independent]') && !elm.closest('.scroll-buttons') && !isHiddenOrDisabled;
   });
 }

package/dist/types/quick-insert/build-quick-insert-menu-model.d.ts

@@ -3,6 +3,7 @@ import type { RegisterComponent, RegisterMenuItem, RegisterMenuSection, SurfaceC
 import type { QuickInsertCategoryItemSelectionPolicy } from './selectQuickInsertCategoryItems';
 export type QuickInsertMenuSection = [RegisterMenuSection, ...RegisterMenuItem[]];
 export type QuickInsertMenuModel = {
+    fallbackItems?: RegisterMenuItem[];
     footer: RegisterMenuItem | undefined;
     root: RegisterComponent | undefined;
     sections: QuickInsertMenuSection[];

package/dist/types/types/empty-state-handler.d.ts

@@ -3,4 +3,5 @@ export type EmptyStateHandlerParams = {
     mode: string;
     searchTerm?: string;
     selectedCategory?: string;
+    showNoResultsMessage?: boolean;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "123.6.0",
+	"version": "123.7.1",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -54,8 +54,8 @@
 		"@atlaskit/feature-gate-js-client": "^6.0.0",
 		"@atlaskit/icon": "^37.7.0",
 		"@atlaskit/link": "^5.1.0",
-		"@atlaskit/link-datasource": "^6.13.0",
-		"@atlaskit/link-picker": "^6.8.0",
+		"@atlaskit/link-datasource": "^6.14.0",
+		"@atlaskit/link-picker": "^6.9.0",
 		"@atlaskit/media-card": "^81.12.0",
 		"@atlaskit/media-client": "^38.1.0",
 		"@atlaskit/media-client-react": "^6.4.0",
@@ -78,14 +78,14 @@
 		"@atlaskit/react-compiler-gating": "^0.2.0",
 		"@atlaskit/react-ufo": "^7.13.0",
 		"@atlaskit/section-message": "^10.2.0",
-		"@atlaskit/smart-card": "^45.25.0",
-		"@atlaskit/smart-user-picker": "^11.8.0",
+		"@atlaskit/smart-card": "^45.28.0",
+		"@atlaskit/smart-user-picker": "^11.9.0",
 		"@atlaskit/spinner": "^20.4.0",
 		"@atlaskit/task-decision": "^21.10.0",
 		"@atlaskit/teams-app-config": "^3.1.0",
 		"@atlaskit/textfield": "^10.2.0",
 		"@atlaskit/tmp-editor-statsig": "^202.0.0",
-		"@atlaskit/tokens": "^18.2.0",
+		"@atlaskit/tokens": "^18.3.0",
 		"@atlaskit/tooltip": "^24.3.0",
 		"@atlaskit/width-detector": "^7.2.0",
 		"@babel/runtime": "^7.0.0",
@@ -216,9 +216,6 @@
 		"platform_editor_content_mode_button_mvp": {
 			"type": "boolean"
 		},
-		"jim-lower-ranking-in-jira-macro-search": {
-			"type": "boolean"
-		},
 		"people-teams_migrate-user-profile-card": {
 			"type": "boolean"
 		},