@atlaskit/editor-common 116.4.0 → 116.5.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @atlaskit/editor-common
 
+## 116.5.0
+
+### Minor Changes
+
+- [`8222a13990fce`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8222a13990fce) -
+  Add a `templateType` field (`atlassian` | `user`) to snippets so consumers can distinguish
+  Atlassian out-of-the-box templates from user-created ones. The value is populated from the backend
+  when provided, and otherwise derived from the snippet scope, and is reported on snippet insert
+  analytics events. This behaviour is gated behind the `platform_editor_blocks_patch_2` feature
+  gate; when the gate is disabled `templateType` is left undefined and is not emitted.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 116.4.1
+
+### Patch Changes
+
+- [`6f7b6c498b07c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6f7b6c498b07c) -
+  [EDITOR-7591] Align the no-color highlight palette tile icon with the updated transparent
+  highlight styling for the experiment `platform_editor_lovability_text_bg_color`.
+- [`301be34250b01`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/301be34250b01) -
+  [ux] added order fix so native elements are prioritised over skills (eg /code)
+- Updated dependencies
+
 ## 116.4.0
 
 ### Minor Changes

package/dist/cjs/monitoring/error.js

@@ -28,7 +28,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 = "116.3.2";
+var packageVersion = "116.4.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/quick-insert/boost-native-results-above-skills.js

@@ -0,0 +1,52 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.boostNativeResultsAboveSkills = boostNativeResultsAboveSkills;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+// Items with priority >= this threshold are treated as extension-provided
+// items (e.g. Rovo skills) and demoted below native editor elements.
+// Coupled with priority: 9000 set in
+// platform/packages/ai-mate/rovo-skills/src/services/insert-menu-provider/extension-manifest.tsx
+var SKILL_PRIORITY_THRESHOLD = 1000;
+var SCORE_PROXIMITY_THRESHOLD = 0.2;
+
+/**
+ * Promotes native editor elements above extension-provided items (e.g. Rovo
+ * skills) in search results when their Fuse scores are close.
+ *
+ * Skills set a high priority value (e.g. 9000) while native items have no
+ * priority (undefined / 0). When a skill and a native item have similar scores
+ * (within the proximity threshold), the native item is promoted above the
+ * skill. But when a skill is a significantly better match (e.g. searching
+ * "research" and the skill is "Research Insights" while the native item is
+ * "Live search"), the skill keeps its higher rank.
+ */
+function boostNativeResultsAboveSkills(results) {
+  var isSkill = function isSkill(r) {
+    var _r$item$priority;
+    return ((_r$item$priority = r.item.priority) !== null && _r$item$priority !== void 0 ? _r$item$priority : 0) >= SKILL_PRIORITY_THRESHOLD;
+  };
+  var reordered = results.slice(0);
+  for (var i = 1; i < reordered.length; i++) {
+    if (isSkill(reordered[i])) {
+      continue;
+    }
+    // reordered[i] is a native item — check if there are skills
+    // ranked above it that have a similar score.
+    var insertAt = i;
+    while (insertAt > 0 && isSkill(reordered[insertAt - 1]) && Math.abs(((_reordered$score = reordered[insertAt - 1].score) !== null && _reordered$score !== void 0 ? _reordered$score : 0) - ((_reordered$i$score = reordered[i].score) !== null && _reordered$i$score !== void 0 ? _reordered$i$score : 0)) < SCORE_PROXIMITY_THRESHOLD) {
+      var _reordered$score, _reordered$i$score;
+      insertAt--;
+    }
+    if (insertAt < i) {
+      var _reordered$splice = reordered.splice(i, 1),
+        _reordered$splice2 = (0, _slicedToArray2.default)(_reordered$splice, 1),
+        native = _reordered$splice2[0];
+      reordered.splice(insertAt, 0, native);
+    }
+  }
+  return reordered;
+}

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

@@ -11,6 +11,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _fuse = _interopRequireDefault(require("fuse.js"));
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+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; }
 var processQuickInsertItems = function processQuickInsertItems(items, intl) {
@@ -60,9 +62,9 @@ var options = {
  * This function is used to find and sort QuickInsertItems based on a given query string.
  *
  * @export
- * @param {string} query - The query string to be used in the search.
- * @param {QuickInsertItem[]} items - An array of QuickInsertItems to be searched.
- * @returns {QuickInsertItem[]} - Returns a sorted array of QuickInsertItems based on the priority. If the query string is empty, it will return the array sorted by priority. If a query string is provided, it will return an array of QuickInsertItems that match the query string, sorted by relevance to the query.
+ * @param query - The query string to be used in the search.
+ * @param items - An array of QuickInsertItems to be searched.
+ * @returns Returns a sorted array of QuickInsertItems based on the priority. If the query string is empty, it will return the array sorted by priority. If a query string is provided, it will return an array of QuickInsertItems that match the query string, sorted by relevance to the query.
  */
 // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
 function find(query, items, prioritySortingFn) {
@@ -83,28 +85,31 @@ function find(query, items, prioritySortingFn) {
   }
   var fuse = new _fuse.default(items, fuseOptions);
   var results = fuse.search(query);
+
+  // platform_editor_insert_menu_ai: boost native editor elements above skills
+  var rerankedResults = (0, _expValEquals.expValEquals)('platform_editor_insert_menu_ai', 'isEnabled', true) ? (0, _boostNativeResultsAboveSkills.boostNativeResultsAboveSkills)(results) : results;
   if ((0, _platformFeatureFlags.fg)('jim-lower-ranking-in-jira-macro-search')) {
-    var _results$datasourceIn, _results$legacyIndex$;
+    var _rerankedResults$data, _rerankedResults$lega;
     // searching for jira work items macro first
-    var datasourceIndex = results.findIndex(function (r) {
+    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 = results.findIndex(function (r) {
+    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(((_results$datasourceIn = results[datasourceIndex].score) !== null && _results$datasourceIn !== void 0 ? _results$datasourceIn : 0) - ((_results$legacyIndex$ = results[legacyIndex].score) !== null && _results$legacyIndex$ !== void 0 ? _results$legacyIndex$ : 0)) < 0.2) {
-      var _results$splice = results.splice(datasourceIndex, 1),
-        _results$splice2 = (0, _slicedToArray2.default)(_results$splice, 1),
-        datasource = _results$splice2[0];
-      results.splice(legacyIndex, 0, datasource);
+    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 results.map(function (result) {
+  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 = "116.3.2";
+var packageVersion = "116.4.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/cjs/ui-color/ColorPalette/Palettes/highlightColorPaletteNew.js

@@ -1,19 +1,22 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.highlightColorPaletteNew = void 0;
-var _adfSchema = require("@atlaskit/adf-schema");
+var _backgroundColor = require("@atlaskit/adf-schema/background-color");
+var _getColorMessage = _interopRequireDefault(require("./getColorMessage"));
 var _highlightColorPalette = require("./highlightColorPalette");
 var _mapPaletteColor = require("./mapPaletteColor");
-var removeHighlightColor = _highlightColorPalette.highlightColorPalette.find(function (_ref) {
-  var value = _ref.value;
-  return value === _highlightColorPalette.REMOVE_HIGHLIGHT_COLOR;
-});
-
-// eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
-var highlightColorPaletteNew = exports.highlightColorPaletteNew = removeHighlightColor ? [removeHighlightColor] : [];
-_adfSchema.backgroundColorPaletteNew.forEach(function (label, color) {
+var _paletteMessages = _interopRequireDefault(require("./paletteMessages"));
+var highlightColorPaletteNew = exports.highlightColorPaletteNew = [{
+  value: _highlightColorPalette.REMOVE_HIGHLIGHT_COLOR,
+  label: 'No color',
+  // Mostly informative, only used for analytics
+  border: "var(--ds-border, #0B120E24)",
+  message: (0, _getColorMessage.default)(_paletteMessages.default, 'no-color')
+}];
+_backgroundColor.backgroundColorPaletteNew.forEach(function (label, color) {
   highlightColorPaletteNew.push((0, _mapPaletteColor.mapPaletteColor)(label, color));
 });

package/dist/cjs/ui-color/ColorPalette/Palettes/textColorPaletteNew.js

@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.textColorPaletteNew = void 0;
-var _adfSchema = require("@atlaskit/adf-schema");
+var _textColor = require("@atlaskit/adf-schema/text-color");
 var _mapPaletteColor = require("./mapPaletteColor");
 // new color palette behind platform_editor_lovability_text_bg_color
 var textColorPaletteNew = exports.textColorPaletteNew = [];
-_adfSchema.colorPaletteNew.forEach(function (label, color) {
+_textColor.colorPaletteNew.forEach(function (label, color) {
   textColorPaletteNew.push((0, _mapPaletteColor.mapPaletteColor)(label, color));
 });

package/dist/es2019/monitoring/error.js

@@ -14,7 +14,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 = "116.3.2";
+const packageVersion = "116.4.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/quick-insert/boost-native-results-above-skills.js

@@ -0,0 +1,42 @@
+// Items with priority >= this threshold are treated as extension-provided
+// items (e.g. Rovo skills) and demoted below native editor elements.
+// Coupled with priority: 9000 set in
+// platform/packages/ai-mate/rovo-skills/src/services/insert-menu-provider/extension-manifest.tsx
+const SKILL_PRIORITY_THRESHOLD = 1000;
+const SCORE_PROXIMITY_THRESHOLD = 0.2;
+
+/**
+ * Promotes native editor elements above extension-provided items (e.g. Rovo
+ * skills) in search results when their Fuse scores are close.
+ *
+ * Skills set a high priority value (e.g. 9000) while native items have no
+ * priority (undefined / 0). When a skill and a native item have similar scores
+ * (within the proximity threshold), the native item is promoted above the
+ * skill. But when a skill is a significantly better match (e.g. searching
+ * "research" and the skill is "Research Insights" while the native item is
+ * "Live search"), the skill keeps its higher rank.
+ */
+export function boostNativeResultsAboveSkills(results) {
+  const isSkill = r => {
+    var _r$item$priority;
+    return ((_r$item$priority = r.item.priority) !== null && _r$item$priority !== void 0 ? _r$item$priority : 0) >= SKILL_PRIORITY_THRESHOLD;
+  };
+  const reordered = results.slice(0);
+  for (let i = 1; i < reordered.length; i++) {
+    if (isSkill(reordered[i])) {
+      continue;
+    }
+    // reordered[i] is a native item — check if there are skills
+    // ranked above it that have a similar score.
+    let insertAt = i;
+    while (insertAt > 0 && isSkill(reordered[insertAt - 1]) && Math.abs(((_reordered$score = reordered[insertAt - 1].score) !== null && _reordered$score !== void 0 ? _reordered$score : 0) - ((_reordered$i$score = reordered[i].score) !== null && _reordered$i$score !== void 0 ? _reordered$i$score : 0)) < SCORE_PROXIMITY_THRESHOLD) {
+      var _reordered$score, _reordered$i$score;
+      insertAt--;
+    }
+    if (insertAt < i) {
+      const [native] = reordered.splice(i, 1);
+      reordered.splice(insertAt, 0, native);
+    }
+  }
+  return reordered;
+}

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

@@ -1,6 +1,8 @@
 import Fuse from 'fuse.js';
 import memoizeOne from 'memoize-one';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { boostNativeResultsAboveSkills } from './boost-native-results-above-skills';
 const processQuickInsertItems = (items, intl) => {
   return items.reduce((acc, item) => {
     if (typeof item === 'function' &&
@@ -44,9 +46,9 @@ const options = {
  * This function is used to find and sort QuickInsertItems based on a given query string.
  *
  * @export
- * @param {string} query - The query string to be used in the search.
- * @param {QuickInsertItem[]} items - An array of QuickInsertItems to be searched.
- * @returns {QuickInsertItem[]} - Returns a sorted array of QuickInsertItems based on the priority. If the query string is empty, it will return the array sorted by priority. If a query string is provided, it will return an array of QuickInsertItems that match the query string, sorted by relevance to the query.
+ * @param query - The query string to be used in the search.
+ * @param items - An array of QuickInsertItems to be searched.
+ * @returns Returns a sorted array of QuickInsertItems based on the priority. If the query string is empty, it will return the array sorted by priority. If a query string is provided, it will return an array of QuickInsertItems that match the query string, sorted by relevance to the query.
  */
 // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
 export function find(query, items, prioritySortingFn) {
@@ -67,22 +69,25 @@ export function find(query, items, prioritySortingFn) {
   }
   const fuse = new Fuse(items, fuseOptions);
   const results = fuse.search(query);
+
+  // platform_editor_insert_menu_ai: boost native editor elements above skills
+  const rerankedResults = expValEquals('platform_editor_insert_menu_ai', 'isEnabled', true) ? boostNativeResultsAboveSkills(results) : results;
   if (fg('jim-lower-ranking-in-jira-macro-search')) {
-    var _results$datasourceIn, _results$legacyIndex$;
+    var _rerankedResults$data, _rerankedResults$lega;
     // searching for jira work items macro first
-    const datasourceIndex = results.findIndex(r => {
+    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 = results.findIndex(r => typeof r.item.key === 'string' && r.item.key.endsWith(':jira'));
+    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(((_results$datasourceIn = results[datasourceIndex].score) !== null && _results$datasourceIn !== void 0 ? _results$datasourceIn : 0) - ((_results$legacyIndex$ = results[legacyIndex].score) !== null && _results$legacyIndex$ !== void 0 ? _results$legacyIndex$ : 0)) < 0.2) {
-      const [datasource] = results.splice(datasourceIndex, 1);
-      results.splice(legacyIndex, 0, datasource);
+    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 results.map(result => result.item);
+  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';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "116.3.2";
+const packageVersion = "116.4.1";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/es2019/ui-color/ColorPalette/Palettes/highlightColorPaletteNew.js

@@ -1,12 +1,15 @@
-import { backgroundColorPaletteNew } from '@atlaskit/adf-schema';
-import { REMOVE_HIGHLIGHT_COLOR, highlightColorPalette } from './highlightColorPalette';
+import { backgroundColorPaletteNew } from '@atlaskit/adf-schema/background-color';
+import getColorMessage from './getColorMessage';
+import { REMOVE_HIGHLIGHT_COLOR } from './highlightColorPalette';
 import { mapPaletteColor } from './mapPaletteColor';
-const removeHighlightColor = highlightColorPalette.find(({
-  value
-}) => value === REMOVE_HIGHLIGHT_COLOR);
-
-// eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
-export const highlightColorPaletteNew = removeHighlightColor ? [removeHighlightColor] : [];
+import paletteMessages from './paletteMessages';
+export const highlightColorPaletteNew = [{
+  value: REMOVE_HIGHLIGHT_COLOR,
+  label: 'No color',
+  // Mostly informative, only used for analytics
+  border: "var(--ds-border, #0B120E24)",
+  message: getColorMessage(paletteMessages, 'no-color')
+}];
 backgroundColorPaletteNew.forEach((label, color) => {
   highlightColorPaletteNew.push(mapPaletteColor(label, color));
 });

package/dist/es2019/ui-color/ColorPalette/Palettes/textColorPaletteNew.js

@@ -1,4 +1,4 @@
-import { colorPaletteNew } from '@atlaskit/adf-schema';
+import { colorPaletteNew } from '@atlaskit/adf-schema/text-color';
 import { mapPaletteColor } from './mapPaletteColor';
 // new color palette behind platform_editor_lovability_text_bg_color
 export const textColorPaletteNew = [];

package/dist/esm/monitoring/error.js

@@ -20,7 +20,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 = "116.3.2";
+var packageVersion = "116.4.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/quick-insert/boost-native-results-above-skills.js

@@ -0,0 +1,45 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+// Items with priority >= this threshold are treated as extension-provided
+// items (e.g. Rovo skills) and demoted below native editor elements.
+// Coupled with priority: 9000 set in
+// platform/packages/ai-mate/rovo-skills/src/services/insert-menu-provider/extension-manifest.tsx
+var SKILL_PRIORITY_THRESHOLD = 1000;
+var SCORE_PROXIMITY_THRESHOLD = 0.2;
+
+/**
+ * Promotes native editor elements above extension-provided items (e.g. Rovo
+ * skills) in search results when their Fuse scores are close.
+ *
+ * Skills set a high priority value (e.g. 9000) while native items have no
+ * priority (undefined / 0). When a skill and a native item have similar scores
+ * (within the proximity threshold), the native item is promoted above the
+ * skill. But when a skill is a significantly better match (e.g. searching
+ * "research" and the skill is "Research Insights" while the native item is
+ * "Live search"), the skill keeps its higher rank.
+ */
+export function boostNativeResultsAboveSkills(results) {
+  var isSkill = function isSkill(r) {
+    var _r$item$priority;
+    return ((_r$item$priority = r.item.priority) !== null && _r$item$priority !== void 0 ? _r$item$priority : 0) >= SKILL_PRIORITY_THRESHOLD;
+  };
+  var reordered = results.slice(0);
+  for (var i = 1; i < reordered.length; i++) {
+    if (isSkill(reordered[i])) {
+      continue;
+    }
+    // reordered[i] is a native item — check if there are skills
+    // ranked above it that have a similar score.
+    var insertAt = i;
+    while (insertAt > 0 && isSkill(reordered[insertAt - 1]) && Math.abs(((_reordered$score = reordered[insertAt - 1].score) !== null && _reordered$score !== void 0 ? _reordered$score : 0) - ((_reordered$i$score = reordered[i].score) !== null && _reordered$i$score !== void 0 ? _reordered$i$score : 0)) < SCORE_PROXIMITY_THRESHOLD) {
+      var _reordered$score, _reordered$i$score;
+      insertAt--;
+    }
+    if (insertAt < i) {
+      var _reordered$splice = reordered.splice(i, 1),
+        _reordered$splice2 = _slicedToArray(_reordered$splice, 1),
+        native = _reordered$splice2[0];
+      reordered.splice(insertAt, 0, native);
+    }
+  }
+  return reordered;
+}

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

@@ -5,6 +5,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import Fuse from 'fuse.js';
 import memoizeOne from 'memoize-one';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { boostNativeResultsAboveSkills } from './boost-native-results-above-skills';
 var processQuickInsertItems = function processQuickInsertItems(items, intl) {
   return items.reduce(function (acc, item) {
     if (typeof item === 'function' &&
@@ -52,9 +54,9 @@ var options = {
  * This function is used to find and sort QuickInsertItems based on a given query string.
  *
  * @export
- * @param {string} query - The query string to be used in the search.
- * @param {QuickInsertItem[]} items - An array of QuickInsertItems to be searched.
- * @returns {QuickInsertItem[]} - Returns a sorted array of QuickInsertItems based on the priority. If the query string is empty, it will return the array sorted by priority. If a query string is provided, it will return an array of QuickInsertItems that match the query string, sorted by relevance to the query.
+ * @param query - The query string to be used in the search.
+ * @param items - An array of QuickInsertItems to be searched.
+ * @returns Returns a sorted array of QuickInsertItems based on the priority. If the query string is empty, it will return the array sorted by priority. If a query string is provided, it will return an array of QuickInsertItems that match the query string, sorted by relevance to the query.
  */
 // eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
 export function find(query, items, prioritySortingFn) {
@@ -75,28 +77,31 @@ export function find(query, items, prioritySortingFn) {
   }
   var fuse = new Fuse(items, fuseOptions);
   var results = fuse.search(query);
+
+  // platform_editor_insert_menu_ai: boost native editor elements above skills
+  var rerankedResults = expValEquals('platform_editor_insert_menu_ai', 'isEnabled', true) ? boostNativeResultsAboveSkills(results) : results;
   if (fg('jim-lower-ranking-in-jira-macro-search')) {
-    var _results$datasourceIn, _results$legacyIndex$;
+    var _rerankedResults$data, _rerankedResults$lega;
     // searching for jira work items macro first
-    var datasourceIndex = results.findIndex(function (r) {
+    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 = results.findIndex(function (r) {
+    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(((_results$datasourceIn = results[datasourceIndex].score) !== null && _results$datasourceIn !== void 0 ? _results$datasourceIn : 0) - ((_results$legacyIndex$ = results[legacyIndex].score) !== null && _results$legacyIndex$ !== void 0 ? _results$legacyIndex$ : 0)) < 0.2) {
-      var _results$splice = results.splice(datasourceIndex, 1),
-        _results$splice2 = _slicedToArray(_results$splice, 1),
-        datasource = _results$splice2[0];
-      results.splice(legacyIndex, 0, datasource);
+    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 results.map(function (result) {
+  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';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "116.3.2";
+var packageVersion = "116.4.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

package/dist/esm/ui-color/ColorPalette/Palettes/highlightColorPaletteNew.js

@@ -1,13 +1,15 @@
-import { backgroundColorPaletteNew } from '@atlaskit/adf-schema';
-import { REMOVE_HIGHLIGHT_COLOR, highlightColorPalette } from './highlightColorPalette';
+import { backgroundColorPaletteNew } from '@atlaskit/adf-schema/background-color';
+import getColorMessage from './getColorMessage';
+import { REMOVE_HIGHLIGHT_COLOR } from './highlightColorPalette';
 import { mapPaletteColor } from './mapPaletteColor';
-var removeHighlightColor = highlightColorPalette.find(function (_ref) {
-  var value = _ref.value;
-  return value === REMOVE_HIGHLIGHT_COLOR;
-});
-
-// eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
-export var highlightColorPaletteNew = removeHighlightColor ? [removeHighlightColor] : [];
+import paletteMessages from './paletteMessages';
+export var highlightColorPaletteNew = [{
+  value: REMOVE_HIGHLIGHT_COLOR,
+  label: 'No color',
+  // Mostly informative, only used for analytics
+  border: "var(--ds-border, #0B120E24)",
+  message: getColorMessage(paletteMessages, 'no-color')
+}];
 backgroundColorPaletteNew.forEach(function (label, color) {
   highlightColorPaletteNew.push(mapPaletteColor(label, color));
 });

package/dist/esm/ui-color/ColorPalette/Palettes/textColorPaletteNew.js

@@ -1,4 +1,4 @@
-import { colorPaletteNew } from '@atlaskit/adf-schema';
+import { colorPaletteNew } from '@atlaskit/adf-schema/text-color';
 import { mapPaletteColor } from './mapPaletteColor';
 // new color palette behind platform_editor_lovability_text_bg_color
 export var textColorPaletteNew = [];

package/dist/types/analytics/types/insert-events.d.ts

@@ -166,21 +166,25 @@ type InsertSnippetAEP = InsertAEP<ACTION_SUBJECT_ID.SNIPPET, {
     hadMedia?: boolean;
     inputMethod: INPUT_METHOD.QUICK_INSERT;
     snippetId: string;
+    templateType?: 'atlassian' | 'user';
 }, undefined>;
 type FailedToInsertSnippetAEP = OperationalAEP<ACTION.FAILED_TO_INSERT, ACTION_SUBJECT.DOCUMENT, ACTION_SUBJECT_ID.SNIPPET, {
     reason: 'emptyBody' | 'parseError';
     snippetId: string;
+    templateType?: 'atlassian' | 'user';
 } | {
     numFailedMediaFiles: number;
     numTotalMediaFiles: number;
     reason: 'snippetMediaDirectCopyFailed';
     snippetId: string;
     snippetMediaCopyStatus: 'copied' | 'partial-copy' | 'failed' | 'copy-unavailable';
+    templateType?: 'atlassian' | 'user';
 } | {
     numFailedMediaFiles: number;
     numTotalMediaFiles: number;
     reason: 'snippetMediaDirectCopyUnexpectedError';
     snippetId: string;
+    templateType?: 'atlassian' | 'user';
 }>;
 export type InsertEventPayload = InsertDividerAEP | InsertLineBreakAEP | InsertPanelAEP | InsertCodeBlockAEP | InsertTableAEP | InsertExpandAEP | InsertActionDecisionAEP | InsertEmojiAEP | InsertStatusAEP | InsertMediaSingleAEP | InsertMediaGroupAEP | InsertMediaInlineAEP | InsertLinkAEP | InsertLinkPreviewAEP | InsertMediaLinkAEP | InsertSmartLinkAEP | InsertLayoutAEP | InsertLayoutColumnAEP | InsertExtensionAEP | InsertNodeViaExtensionAPIAEP | InsertDateAEP | InsertPlaceholderTextAEP | InsertNativeEmbedAEP | FailedToInsertMediaPayload | InsertReferenceSyncedBlockPayload | InsertSourceSyncedBlockPayload | InsertSnippetAEP | FailedToInsertSnippetAEP;
 export {};

package/dist/types/quick-insert/boost-native-results-above-skills.d.ts

@@ -0,0 +1,16 @@
+import type { QuickInsertItem } from '../provider-factory';
+/**
+ * Promotes native editor elements above extension-provided items (e.g. Rovo
+ * skills) in search results when their Fuse scores are close.
+ *
+ * Skills set a high priority value (e.g. 9000) while native items have no
+ * priority (undefined / 0). When a skill and a native item have similar scores
+ * (within the proximity threshold), the native item is promoted above the
+ * skill. But when a skill is a significantly better match (e.g. searching
+ * "research" and the skill is "Research Insights" while the native item is
+ * "Live search"), the skill keeps its higher rank.
+ */
+export declare function boostNativeResultsAboveSkills<T extends {
+    item: QuickInsertItem;
+    score?: number;
+}>(results: T[]): T[];

package/dist/types/quick-insert/utils.d.ts

@@ -7,8 +7,8 @@ export declare const memoProcessQuickInsertItems: (items: Array<QuickInsertHandl
  * This function is used to find and sort QuickInsertItems based on a given query string.
  *
  * @export
- * @param {string} query - The query string to be used in the search.
- * @param {QuickInsertItem[]} items - An array of QuickInsertItems to be searched.
- * @returns {QuickInsertItem[]} - Returns a sorted array of QuickInsertItems based on the priority. If the query string is empty, it will return the array sorted by priority. If a query string is provided, it will return an array of QuickInsertItems that match the query string, sorted by relevance to the query.
+ * @param query - The query string to be used in the search.
+ * @param items - An array of QuickInsertItems to be searched.
+ * @returns Returns a sorted array of QuickInsertItems based on the priority. If the query string is empty, it will return the array sorted by priority. If a query string is provided, it will return an array of QuickInsertItems that match the query string, sorted by relevance to the query.
  */
 export declare function find(query: string, items: QuickInsertItem[], prioritySortingFn?: (items: QuickInsertItem[]) => Fuse.FuseSortFunction | undefined): QuickInsertItem[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "116.4.0",
+	"version": "116.5.0",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -49,7 +49,7 @@
 		"@atlaskit/editor-tables": "^3.0.0",
 		"@atlaskit/editor-toolbar": "^2.0.0",
 		"@atlaskit/editor-toolbar-model": "^1.0.0",
-		"@atlaskit/emoji": "^71.2.0",
+		"@atlaskit/emoji": "^71.3.0",
 		"@atlaskit/icon": "^36.0.0",
 		"@atlaskit/link": "^4.0.0",
 		"@atlaskit/link-datasource": "^6.0.0",
@@ -79,7 +79,7 @@
 		"@atlaskit/task-decision": "^21.1.0",
 		"@atlaskit/teams-app-config": "^2.0.0",
 		"@atlaskit/textfield": "^9.0.0",
-		"@atlaskit/tmp-editor-statsig": "^108.3.0",
+		"@atlaskit/tmp-editor-statsig": "^108.4.0",
 		"@atlaskit/tokens": "^14.0.0",
 		"@atlaskit/tooltip": "^23.0.0",
 		"@atlaskit/width-detector": "^6.0.0",