@atlaskit/editor-plugin-insert-block 26.0.0 → 26.0.2

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @atlaskit/editor-plugin-insert-block
 
+## 26.0.2
+
+### Patch Changes
+
+- [`685643d223f9d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/685643d223f9d) -
+  Complete cleanup of the `cc_fd_db_top_editor_toolbar` experiment. Always sort featured toolbar
+  insert items by provider priority across platforms, matching quick insert ordering. Remove
+  hardcoded whiteboard pinning and preserve provider descriptions, retaining the shipped
+  `new-description` behavior without product checks, preset options, or experiment setup.
+
+  Breaking change in `@atlaskit/tmp-editor-statsig`: remove `cc_fd_db_top_editor_toolbar` from
+  `editorExperimentsConfig` and `testMultivariateOverrides`. Consumers referencing
+  `editorExperimentsConfig.cc_fd_db_top_editor_toolbar` or calling
+  `expVal('cc_fd_db_top_editor_toolbar', ...)` (or other typed experiment helpers) will receive
+  TypeScript errors after upgrading. To migrate, remove those experiment queries and test overrides,
+  and retain the shipped `new-description` behavior instead of branching on the removed experiment.
+
+- Updated dependencies
+
+## 26.0.1
+
+### Patch Changes
+
+- [`5351e01090c9c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5351e01090c9c) -
+  Show the five strongest matches first, then remaining matches in category order without category
+  titles, in slash-command and toolbar insert search. Share the row projection across rendering and
+  keyboard selection under the platform_editor_slash_command experiment.
+- Updated dependencies
+
 ## 26.0.0
 
 ### Patch Changes

package/dist/cjs/ui/ElementBrowser/InsertMenu.js

@@ -7,12 +7,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.sortFeaturedItems = exports.default = exports.DEFAULT_HEIGHT = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
-var _reactIntl = require("react-intl");
 var _CellMeasurer = require("react-virtualized/dist/commonjs/CellMeasurer");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _elementBrowser = require("@atlaskit/editor-common/element-browser");
@@ -20,7 +19,6 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
-var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 var _excluded = ["children"];
 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; } /**
@@ -30,45 +28,13 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var DEFAULT_HEIGHT = exports.DEFAULT_HEIGHT = 560;
 
 /**
- * Exported helper to allow testing of InsertMenu pinning logic.
- *
- * The `cc_fd_db_top_editor_toolbar` experiment adds new logic to sort elements by `priority`.
- * This newer implementation matches how the quick insert menu sorts elements.
+ * Sort featured elements by priority, matching the quick insert menu.
  */
-var sortFeaturedItems = exports.sortFeaturedItems = function sortFeaturedItems(featuredItems, formatMessage) {
-  if (['new-description', 'orig-description'].includes((0, _expVal.expVal)('cc_fd_db_top_editor_toolbar', 'cohort', 'control')) || (0, _expVal.expValNoExposure)('cc_fd_wb_jira_quick_insert_experiment', 'isEnabled', false)) {
-    // Sort by priority (lower first) on the concatenated list so items
-    // with "priority" are at the top (e.g. Whiteboard before Database)
-    return featuredItems.slice(0).sort(function (a, b) {
-      return (a.priority || Number.POSITIVE_INFINITY) - (b.priority || Number.POSITIVE_INFINITY);
-    });
-  }
-
-  // NOTE: this is *not* the ideal way to approach this. Old logic sort whiteboards to top
-  var DIAGRAM_KEY = 'whiteboard-extension:create-diagram';
-  var isDiagram = function isDiagram(item) {
-    return item.key === DIAGRAM_KEY;
-  };
-  var featuredWhiteboardsPresent = featuredItems.some(isDiagram);
-  if (featuredWhiteboardsPresent) {
-    var pin = function pin(key) {
-      var idx = featuredItems.findIndex(function (item) {
-        return item.key === key;
-      });
-      var filtered = featuredItems.filter(function (item) {
-        return !isDiagram(item);
-      });
-      if (idx === -1) {
-        return filtered;
-      }
-      var picked = _objectSpread(_objectSpread({}, featuredItems[idx]), {}, {
-        description: formatMessage(_quickInsert.messages.featuredWhiteboardDescription)
-      });
-      return [picked].concat((0, _toConsumableArray2.default)(filtered));
-    };
-    return pin(DIAGRAM_KEY);
-  }
-  return featuredItems;
+var sortFeaturedItems = exports.sortFeaturedItems = function sortFeaturedItems(featuredItems) {
+  return featuredItems.slice(0).sort(function (a, b) {
+    var _a$priority, _b$priority;
+    return ((_a$priority = a.priority) !== null && _a$priority !== void 0 ? _a$priority : Number.POSITIVE_INFINITY) - ((_b$priority = b.priority) !== null && _b$priority !== void 0 ? _b$priority : Number.POSITIVE_INFINITY);
+  });
 };
 var selector = function selector(states) {
   var _states$connectivityS;
@@ -92,8 +58,6 @@ var InsertMenu = function InsertMenu(_ref) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     height = _useState4[0],
     setHeight = _useState4[1];
-  var _useIntl = (0, _reactIntl.useIntl)(),
-    formatMessage = _useIntl.formatMessage;
   var cache = (0, _react.useMemo)(function () {
     return new _CellMeasurer.CellMeasurerCache({
       fixedWidth: true,
@@ -182,11 +146,11 @@ var InsertMenu = function InsertMenu(_ref) {
       })) !== null && _pluginInjectionApi$q4 !== void 0 ? _pluginInjectionApi$q4 : [];
       var unfilteredResult = quickInsertDropdownItems.concat(featuredQuickInsertSuggestions);
       // need to sort on the concatenated list so desired elements are at the top
-      result = sortFeaturedItems(unfilteredResult, formatMessage);
+      result = sortFeaturedItems(unfilteredResult);
     }
     setItemCount(result.length);
     return result;
-  }, [pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$q6 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q6 === void 0 ? void 0 : _pluginInjectionApi$q6.actions, quickInsertDropdownItems, connectivityMode, formatMessage]);
+  }, [pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$q6 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q6 === void 0 ? void 0 : _pluginInjectionApi$q6.actions, quickInsertDropdownItems, connectivityMode]);
   var emptyStateHandler = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$q7 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q7 === void 0 || (_pluginInjectionApi$q7 = _pluginInjectionApi$q7.sharedState.currentState()) === null || _pluginInjectionApi$q7 === void 0 ? void 0 : _pluginInjectionApi$q7.emptyStateHandler;
   var onViewMore = (0, _react.useCallback)(function () {
     var _pluginInjectionApi$c, _pluginInjectionApi$q8;

package/dist/cjs/ui/registered-insert-menu/RegisteredInsertMenu.js

@@ -10,7 +10,6 @@ exports.RegisteredInsertMenu = void 0;
 require("./RegisteredInsertMenu.compiled.css");
 var _runtime = require("@compiled/react/runtime");
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
@@ -25,7 +24,6 @@ var _compiled = require("@atlaskit/primitives/compiled");
 var _textField = _interopRequireDefault(require("@atlaskit/textfield/text-field"));
 var _RegisteredInsertMenuList = require("./RegisteredInsertMenuList");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
-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; }
 var DEFAULT_MENU_MAX_HEIGHT = 520;
 var styles = {
   menu: "_2rko1mok _1reo15vq _18m915vq _bfhk1bhr _16qs130s _1e0c1txw _2lx21bp4 _1bsb1edt",
@@ -94,27 +92,18 @@ var RegisteredInsertMenu = exports.RegisteredInsertMenu = function RegisteredIns
       surfaceContext: surfaceContext
     });
   }, [components, formatMessage, hasSectionOverflowItems, query, surfaceContext]);
-  var itemCount = (0, _react.useMemo)(function () {
-    var _model$fallbackItems$, _model$fallbackItems;
-    return model.sections.reduce(function (count, _ref3) {
-      var _ref4 = (0, _toArray2.default)(_ref3),
-        items = _arrayLikeToArray(_ref4).slice(1);
-      return count + items.length;
-    }, 0) + ((_model$fallbackItems$ = (_model$fallbackItems = model.fallbackItems) === null || _model$fallbackItems === void 0 ? void 0 : _model$fallbackItems.length) !== null && _model$fallbackItems$ !== void 0 ? _model$fallbackItems$ : 0) + (model.footer ? 1 : 0);
-  }, [model.fallbackItems, model.footer, model.sections]);
+  var selectableItems = (0, _react.useMemo)(function () {
+    return (0, _registeredMenuModel.getQuickInsertMenuRows)(model).filter(function (row) {
+      return row.type === 'menu-item';
+    });
+  }, [model]);
+  var itemCount = selectableItems.length + (model.footer ? 1 : 0);
   var selectableItemKeys = (0, _react.useMemo)(function () {
-    var _model$fallbackItems2;
-    return [].concat((0, _toConsumableArray2.default)(model.sections.flatMap(function (_ref5) {
-      var _ref6 = (0, _toArray2.default)(_ref5),
-        items = _arrayLikeToArray(_ref6).slice(1);
-      return items;
-    })), (0, _toConsumableArray2.default)((_model$fallbackItems2 = model.fallbackItems) !== null && _model$fallbackItems2 !== void 0 ? _model$fallbackItems2 : []), [model.footer]).filter(function (item) {
-      return Boolean(item);
-    }).map(function (_ref7) {
-      var key = _ref7.key;
+    return [].concat((0, _toConsumableArray2.default)(selectableItems), (0, _toConsumableArray2.default)(model.footer ? [model.footer] : [])).map(function (_ref3) {
+      var key = _ref3.key;
       return key;
     }).join(',');
-  }, [model.fallbackItems, model.footer, model.sections]);
+  }, [model.footer, selectableItems]);
   (0, _react.useLayoutEffect)(function () {
     setSelectedItemIndex(itemCount > 0 ? 0 : -1);
   }, [itemCount, query, selectableItemKeys]);

package/dist/cjs/ui/registered-insert-menu/RegisteredInsertMenuList.js

@@ -10,11 +10,12 @@ exports.RegisteredInsertMenuList = void 0;
 require("./RegisteredInsertMenuList.compiled.css");
 var _runtime = require("@compiled/react/runtime");
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _CellMeasurer = require("react-virtualized/dist/commonjs/CellMeasurer");
 var _List = require("react-virtualized/dist/commonjs/List");
+var _registeredMenuModel = require("@atlaskit/editor-common/quick-insert/registered-menu-model");
 var _useMenuListHeight2 = require("@atlaskit/editor-common/quick-insert/use-menu-list-height");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _RegisteredInsertMenuItem = require("./RegisteredInsertMenuItem");
@@ -58,9 +59,8 @@ var RegisteredInsertMenuList = exports.RegisteredInsertMenuList = function Regis
     listRef.current = list;
   }, []);
   var rows = (0, _react.useMemo)(function () {
-    var _model$fallbackItems;
-    return [].concat((0, _toConsumableArray2.default)(model.sections.flat()), (0, _toConsumableArray2.default)((_model$fallbackItems = model.fallbackItems) !== null && _model$fallbackItems !== void 0 ? _model$fallbackItems : []));
-  }, [model.fallbackItems, model.sections]);
+    return (0, _registeredMenuModel.getQuickInsertMenuRows)(model);
+  }, [model]);
   var cache = (0, _react.useMemo)(function () {
     return new _CellMeasurer.CellMeasurerCache({
       defaultHeight: ESTIMATED_ROW_HEIGHT,

package/dist/es2019/ui/ElementBrowser/InsertMenu.js

@@ -8,50 +8,23 @@ import { useCallback, useContext, useLayoutEffect, useMemo, useState } from 'rea
 
 /* eslint-disable @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports, jsdoc/require-description -- Ignored via go/DSP-18766; jsdoc debt surfaced by this mechanical PR */
 import { css, jsx } from '@emotion/react';
-import { useIntl } from 'react-intl';
 import { CellMeasurerCache } from 'react-virtualized/dist/commonjs/CellMeasurer';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { ELEMENT_ITEM_HEIGHT, ElementBrowser } from '@atlaskit/editor-common/element-browser';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { messages, IconCode, IconDate, IconDecision, IconDivider, IconExpand, IconPanel, IconQuote, IconStatus } from '@atlaskit/editor-common/quick-insert';
+import { IconCode, IconDate, IconDecision, IconDivider, IconExpand, IconPanel, IconQuote, IconStatus } from '@atlaskit/editor-common/quick-insert';
 import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners as withOuterListeners } from '@atlaskit/editor-common/ui-react';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
-import { expVal, expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
 export const DEFAULT_HEIGHT = 560;
 
 /**
- * Exported helper to allow testing of InsertMenu pinning logic.
- *
- * The `cc_fd_db_top_editor_toolbar` experiment adds new logic to sort elements by `priority`.
- * This newer implementation matches how the quick insert menu sorts elements.
+ * Sort featured elements by priority, matching the quick insert menu.
  */
-export const sortFeaturedItems = (featuredItems, formatMessage) => {
-  if (['new-description', 'orig-description'].includes(expVal('cc_fd_db_top_editor_toolbar', 'cohort', 'control')) || expValNoExposure('cc_fd_wb_jira_quick_insert_experiment', 'isEnabled', false)) {
-    // Sort by priority (lower first) on the concatenated list so items
-    // with "priority" are at the top (e.g. Whiteboard before Database)
-    return featuredItems.slice(0).sort((a, b) => (a.priority || Number.POSITIVE_INFINITY) - (b.priority || Number.POSITIVE_INFINITY));
-  }
-
-  // NOTE: this is *not* the ideal way to approach this. Old logic sort whiteboards to top
-  const DIAGRAM_KEY = 'whiteboard-extension:create-diagram';
-  const isDiagram = item => item.key === DIAGRAM_KEY;
-  const featuredWhiteboardsPresent = featuredItems.some(isDiagram);
-  if (featuredWhiteboardsPresent) {
-    const pin = key => {
-      const idx = featuredItems.findIndex(item => item.key === key);
-      const filtered = featuredItems.filter(item => !isDiagram(item));
-      if (idx === -1) {
-        return filtered;
-      }
-      const picked = {
-        ...featuredItems[idx],
-        description: formatMessage(messages.featuredWhiteboardDescription)
-      };
-      return [picked, ...filtered];
-    };
-    return pin(DIAGRAM_KEY);
-  }
-  return featuredItems;
+export const sortFeaturedItems = featuredItems => {
+  return featuredItems.slice(0).sort((a, b) => {
+    var _a$priority, _b$priority;
+    return ((_a$priority = a.priority) !== null && _a$priority !== void 0 ? _a$priority : Number.POSITIVE_INFINITY) - ((_b$priority = b.priority) !== null && _b$priority !== void 0 ? _b$priority : Number.POSITIVE_INFINITY);
+  });
 };
 const selector = states => {
   var _states$connectivityS;
@@ -70,9 +43,6 @@ const InsertMenu = ({
   var _pluginInjectionApi$q8, _pluginInjectionApi$q9, _pluginInjectionApi$q0;
   const [itemCount, setItemCount] = useState(0);
   const [height, setHeight] = useState(DEFAULT_HEIGHT);
-  const {
-    formatMessage
-  } = useIntl();
   const cache = useMemo(() => {
     return new CellMeasurerCache({
       fixedWidth: true,
@@ -152,11 +122,11 @@ const InsertMenu = ({
       } : item)) !== null && _pluginInjectionApi$q5 !== void 0 ? _pluginInjectionApi$q5 : [];
       const unfilteredResult = quickInsertDropdownItems.concat(featuredQuickInsertSuggestions);
       // need to sort on the concatenated list so desired elements are at the top
-      result = sortFeaturedItems(unfilteredResult, formatMessage);
+      result = sortFeaturedItems(unfilteredResult);
     }
     setItemCount(result.length);
     return result;
-  }, [pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$q8 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q8 === void 0 ? void 0 : _pluginInjectionApi$q8.actions, quickInsertDropdownItems, connectivityMode, formatMessage]);
+  }, [pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$q8 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q8 === void 0 ? void 0 : _pluginInjectionApi$q8.actions, quickInsertDropdownItems, connectivityMode]);
   const emptyStateHandler = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$q9 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q9 === void 0 ? void 0 : (_pluginInjectionApi$q0 = _pluginInjectionApi$q9.sharedState.currentState()) === null || _pluginInjectionApi$q0 === void 0 ? void 0 : _pluginInjectionApi$q0.emptyStateHandler;
   const onViewMore = useCallback(() => {
     var _pluginInjectionApi$c, _pluginInjectionApi$q1;

package/dist/es2019/ui/registered-insert-menu/RegisteredInsertMenu.js

@@ -6,7 +6,7 @@ import { useIntl } from 'react-intl';
 import { getDocument } from '@atlaskit/browser-apis';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { MENU } from '@atlaskit/editor-common/quick-insert/keys';
-import { buildQuickInsertMenuModel, getMatchingQuickInsertComponents, selectQuickInsertCategoryItems } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
+import { buildQuickInsertMenuModel, getMatchingQuickInsertComponents, getQuickInsertMenuRows, selectQuickInsertCategoryItems } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
 import { isSectionOverflowItemKey } from '@atlaskit/editor-common/type-ahead-is-section-overflow-item-key';
 import { TYPE_AHEAD_SURFACE_CONTEXT } from '@atlaskit/editor-common/type-ahead-surface-context';
 import { createSurfaceContext } from '@atlaskit/editor-ui-control-model/create-surface-context';
@@ -62,16 +62,11 @@ export const RegisteredInsertMenu = ({
     rootComponent: MENU,
     surfaceContext
   }), [components, formatMessage, hasSectionOverflowItems, query, surfaceContext]);
-  const itemCount = useMemo(() => {
-    var _model$fallbackItems$, _model$fallbackItems;
-    return model.sections.reduce((count, [, ...items]) => count + items.length, 0) + ((_model$fallbackItems$ = (_model$fallbackItems = model.fallbackItems) === null || _model$fallbackItems === void 0 ? void 0 : _model$fallbackItems.length) !== null && _model$fallbackItems$ !== void 0 ? _model$fallbackItems$ : 0) + (model.footer ? 1 : 0);
-  }, [model.fallbackItems, model.footer, model.sections]);
-  const selectableItemKeys = useMemo(() => {
-    var _model$fallbackItems2;
-    return [...model.sections.flatMap(([, ...items]) => items), ...((_model$fallbackItems2 = model.fallbackItems) !== null && _model$fallbackItems2 !== void 0 ? _model$fallbackItems2 : []), model.footer].filter(item => Boolean(item)).map(({
-      key
-    }) => key).join(',');
-  }, [model.fallbackItems, model.footer, model.sections]);
+  const selectableItems = useMemo(() => getQuickInsertMenuRows(model).filter(row => row.type === 'menu-item'), [model]);
+  const itemCount = selectableItems.length + (model.footer ? 1 : 0);
+  const selectableItemKeys = useMemo(() => [...selectableItems, ...(model.footer ? [model.footer] : [])].map(({
+    key
+  }) => key).join(','), [model.footer, selectableItems]);
   useLayoutEffect(() => {
     setSelectedItemIndex(itemCount > 0 ? 0 : -1);
   }, [itemCount, query, selectableItemKeys]);

package/dist/es2019/ui/registered-insert-menu/RegisteredInsertMenuList.js

@@ -5,6 +5,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useLayoutEffect, useMemo, useRef } from 'react';
 import { CellMeasurer, CellMeasurerCache } from 'react-virtualized/dist/commonjs/CellMeasurer';
 import { List } from 'react-virtualized/dist/commonjs/List';
+import { getQuickInsertMenuRows } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
 import { useMenuListHeight } from '@atlaskit/editor-common/quick-insert/use-menu-list-height';
 import { Box } from '@atlaskit/primitives/compiled';
 import { RegisteredInsertMenuItem } from './RegisteredInsertMenuItem';
@@ -44,10 +45,7 @@ export const RegisteredInsertMenuList = ({
   const setListRef = useCallback(list => {
     listRef.current = list;
   }, []);
-  const rows = useMemo(() => {
-    var _model$fallbackItems;
-    return [...model.sections.flat(), ...((_model$fallbackItems = model.fallbackItems) !== null && _model$fallbackItems !== void 0 ? _model$fallbackItems : [])];
-  }, [model.fallbackItems, model.sections]);
+  const rows = useMemo(() => getQuickInsertMenuRows(model), [model]);
   const cache = useMemo(() => new CellMeasurerCache({
     defaultHeight: ESTIMATED_ROW_HEIGHT,
     fixedWidth: true

package/dist/esm/ui/ElementBrowser/InsertMenu.js

@@ -1,8 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 var _excluded = ["children"];
 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) { _defineProperty(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; }
@@ -15,57 +15,23 @@ import { useCallback, useContext, useLayoutEffect, useMemo, useState } from 'rea
 
 /* eslint-disable @atlaskit/ui-styling-standard/use-compiled, @typescript-eslint/consistent-type-imports, jsdoc/require-description -- Ignored via go/DSP-18766; jsdoc debt surfaced by this mechanical PR */
 import { css, jsx } from '@emotion/react';
-import { useIntl } from 'react-intl';
 import { CellMeasurerCache } from 'react-virtualized/dist/commonjs/CellMeasurer';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { ELEMENT_ITEM_HEIGHT, ElementBrowser } from '@atlaskit/editor-common/element-browser';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { messages, IconCode, IconDate, IconDecision, IconDivider, IconExpand, IconPanel, IconQuote, IconStatus } from '@atlaskit/editor-common/quick-insert';
+import { IconCode, IconDate, IconDecision, IconDivider, IconExpand, IconPanel, IconQuote, IconStatus } from '@atlaskit/editor-common/quick-insert';
 import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners as withOuterListeners } from '@atlaskit/editor-common/ui-react';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
-import { expVal, expValNoExposure } from '@atlaskit/tmp-editor-statsig/expVal';
 export var DEFAULT_HEIGHT = 560;
 
 /**
- * Exported helper to allow testing of InsertMenu pinning logic.
- *
- * The `cc_fd_db_top_editor_toolbar` experiment adds new logic to sort elements by `priority`.
- * This newer implementation matches how the quick insert menu sorts elements.
+ * Sort featured elements by priority, matching the quick insert menu.
  */
-export var sortFeaturedItems = function sortFeaturedItems(featuredItems, formatMessage) {
-  if (['new-description', 'orig-description'].includes(expVal('cc_fd_db_top_editor_toolbar', 'cohort', 'control')) || expValNoExposure('cc_fd_wb_jira_quick_insert_experiment', 'isEnabled', false)) {
-    // Sort by priority (lower first) on the concatenated list so items
-    // with "priority" are at the top (e.g. Whiteboard before Database)
-    return featuredItems.slice(0).sort(function (a, b) {
-      return (a.priority || Number.POSITIVE_INFINITY) - (b.priority || Number.POSITIVE_INFINITY);
-    });
-  }
-
-  // NOTE: this is *not* the ideal way to approach this. Old logic sort whiteboards to top
-  var DIAGRAM_KEY = 'whiteboard-extension:create-diagram';
-  var isDiagram = function isDiagram(item) {
-    return item.key === DIAGRAM_KEY;
-  };
-  var featuredWhiteboardsPresent = featuredItems.some(isDiagram);
-  if (featuredWhiteboardsPresent) {
-    var pin = function pin(key) {
-      var idx = featuredItems.findIndex(function (item) {
-        return item.key === key;
-      });
-      var filtered = featuredItems.filter(function (item) {
-        return !isDiagram(item);
-      });
-      if (idx === -1) {
-        return filtered;
-      }
-      var picked = _objectSpread(_objectSpread({}, featuredItems[idx]), {}, {
-        description: formatMessage(messages.featuredWhiteboardDescription)
-      });
-      return [picked].concat(_toConsumableArray(filtered));
-    };
-    return pin(DIAGRAM_KEY);
-  }
-  return featuredItems;
+export var sortFeaturedItems = function sortFeaturedItems(featuredItems) {
+  return featuredItems.slice(0).sort(function (a, b) {
+    var _a$priority, _b$priority;
+    return ((_a$priority = a.priority) !== null && _a$priority !== void 0 ? _a$priority : Number.POSITIVE_INFINITY) - ((_b$priority = b.priority) !== null && _b$priority !== void 0 ? _b$priority : Number.POSITIVE_INFINITY);
+  });
 };
 var selector = function selector(states) {
   var _states$connectivityS;
@@ -89,8 +55,6 @@ var InsertMenu = function InsertMenu(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     height = _useState4[0],
     setHeight = _useState4[1];
-  var _useIntl = useIntl(),
-    formatMessage = _useIntl.formatMessage;
   var cache = useMemo(function () {
     return new CellMeasurerCache({
       fixedWidth: true,
@@ -179,11 +143,11 @@ var InsertMenu = function InsertMenu(_ref) {
       })) !== null && _pluginInjectionApi$q4 !== void 0 ? _pluginInjectionApi$q4 : [];
       var unfilteredResult = quickInsertDropdownItems.concat(featuredQuickInsertSuggestions);
       // need to sort on the concatenated list so desired elements are at the top
-      result = sortFeaturedItems(unfilteredResult, formatMessage);
+      result = sortFeaturedItems(unfilteredResult);
     }
     setItemCount(result.length);
     return result;
-  }, [pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$q6 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q6 === void 0 ? void 0 : _pluginInjectionApi$q6.actions, quickInsertDropdownItems, connectivityMode, formatMessage]);
+  }, [pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$q6 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q6 === void 0 ? void 0 : _pluginInjectionApi$q6.actions, quickInsertDropdownItems, connectivityMode]);
   var emptyStateHandler = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$q7 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q7 === void 0 || (_pluginInjectionApi$q7 = _pluginInjectionApi$q7.sharedState.currentState()) === null || _pluginInjectionApi$q7 === void 0 ? void 0 : _pluginInjectionApi$q7.emptyStateHandler;
   var onViewMore = useCallback(function () {
     var _pluginInjectionApi$c, _pluginInjectionApi$q8;

package/dist/esm/ui/registered-insert-menu/RegisteredInsertMenu.js

@@ -1,16 +1,14 @@
 /* RegisteredInsertMenu.tsx generated by @compiled/babel-plugin v3.0.2 */
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _toArray from "@babel/runtime/helpers/toArray";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import "./RegisteredInsertMenu.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
-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 React, { useCallback, useId, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { getDocument } from '@atlaskit/browser-apis';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { MENU } from '@atlaskit/editor-common/quick-insert/keys';
-import { buildQuickInsertMenuModel, getMatchingQuickInsertComponents, selectQuickInsertCategoryItems } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
+import { buildQuickInsertMenuModel, getMatchingQuickInsertComponents, getQuickInsertMenuRows, selectQuickInsertCategoryItems } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
 import { isSectionOverflowItemKey } from '@atlaskit/editor-common/type-ahead-is-section-overflow-item-key';
 import { TYPE_AHEAD_SURFACE_CONTEXT } from '@atlaskit/editor-common/type-ahead-surface-context';
 import { createSurfaceContext } from '@atlaskit/editor-ui-control-model/create-surface-context';
@@ -85,27 +83,18 @@ export var RegisteredInsertMenu = function RegisteredInsertMenu(_ref) {
       surfaceContext: surfaceContext
     });
   }, [components, formatMessage, hasSectionOverflowItems, query, surfaceContext]);
-  var itemCount = useMemo(function () {
-    var _model$fallbackItems$, _model$fallbackItems;
-    return model.sections.reduce(function (count, _ref3) {
-      var _ref4 = _toArray(_ref3),
-        items = _arrayLikeToArray(_ref4).slice(1);
-      return count + items.length;
-    }, 0) + ((_model$fallbackItems$ = (_model$fallbackItems = model.fallbackItems) === null || _model$fallbackItems === void 0 ? void 0 : _model$fallbackItems.length) !== null && _model$fallbackItems$ !== void 0 ? _model$fallbackItems$ : 0) + (model.footer ? 1 : 0);
-  }, [model.fallbackItems, model.footer, model.sections]);
+  var selectableItems = useMemo(function () {
+    return getQuickInsertMenuRows(model).filter(function (row) {
+      return row.type === 'menu-item';
+    });
+  }, [model]);
+  var itemCount = selectableItems.length + (model.footer ? 1 : 0);
   var selectableItemKeys = useMemo(function () {
-    var _model$fallbackItems2;
-    return [].concat(_toConsumableArray(model.sections.flatMap(function (_ref5) {
-      var _ref6 = _toArray(_ref5),
-        items = _arrayLikeToArray(_ref6).slice(1);
-      return items;
-    })), _toConsumableArray((_model$fallbackItems2 = model.fallbackItems) !== null && _model$fallbackItems2 !== void 0 ? _model$fallbackItems2 : []), [model.footer]).filter(function (item) {
-      return Boolean(item);
-    }).map(function (_ref7) {
-      var key = _ref7.key;
+    return [].concat(_toConsumableArray(selectableItems), _toConsumableArray(model.footer ? [model.footer] : [])).map(function (_ref3) {
+      var key = _ref3.key;
       return key;
     }).join(',');
-  }, [model.fallbackItems, model.footer, model.sections]);
+  }, [model.footer, selectableItems]);
   useLayoutEffect(function () {
     setSelectedItemIndex(itemCount > 0 ? 0 : -1);
   }, [itemCount, query, selectableItemKeys]);

package/dist/esm/ui/registered-insert-menu/RegisteredInsertMenuList.js

@@ -1,7 +1,7 @@
 /* RegisteredInsertMenuList.tsx generated by @compiled/babel-plugin v3.0.2 */
 import _extends from "@babel/runtime/helpers/extends";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import "./RegisteredInsertMenuList.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 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; } } }; }
@@ -10,6 +10,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 import React, { useCallback, useLayoutEffect, useMemo, useRef } from 'react';
 import { CellMeasurer, CellMeasurerCache } from 'react-virtualized/dist/commonjs/CellMeasurer';
 import { List } from 'react-virtualized/dist/commonjs/List';
+import { getQuickInsertMenuRows } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
 import { useMenuListHeight } from '@atlaskit/editor-common/quick-insert/use-menu-list-height';
 import { Box } from '@atlaskit/primitives/compiled';
 import { RegisteredInsertMenuItem } from './RegisteredInsertMenuItem';
@@ -49,9 +50,8 @@ export var RegisteredInsertMenuList = function RegisteredInsertMenuList(_ref) {
     listRef.current = list;
   }, []);
   var rows = useMemo(function () {
-    var _model$fallbackItems;
-    return [].concat(_toConsumableArray(model.sections.flat()), _toConsumableArray((_model$fallbackItems = model.fallbackItems) !== null && _model$fallbackItems !== void 0 ? _model$fallbackItems : []));
-  }, [model.fallbackItems, model.sections]);
+    return getQuickInsertMenuRows(model);
+  }, [model]);
   var cache = useMemo(function () {
     return new CellMeasurerCache({
       defaultHeight: ESTIMATED_ROW_HEIGHT,

package/dist/types/ui/ElementBrowser/InsertMenu.d.ts

@@ -1,14 +1,10 @@
 import { jsx } from '@emotion/react';
-import type { MessageDescriptor } from 'react-intl';
 import type { QuickInsertItem } from '@atlaskit/editor-common/provider-factory';
 import type { InsertMenuProps } from './types';
 export declare const DEFAULT_HEIGHT = 560;
 /**
- * Exported helper to allow testing of InsertMenu pinning logic.
- *
- * The `cc_fd_db_top_editor_toolbar` experiment adds new logic to sort elements by `priority`.
- * This newer implementation matches how the quick insert menu sorts elements.
+ * Sort featured elements by priority, matching the quick insert menu.
  */
-export declare const sortFeaturedItems: (featuredItems: QuickInsertItem[], formatMessage: (msg: MessageDescriptor) => string) => QuickInsertItem[];
+export declare const sortFeaturedItems: (featuredItems: QuickInsertItem[]) => QuickInsertItem[];
 declare const InsertMenu: ({ editorView, dropdownItems, showElementBrowserLink, onInsert, toggleVisiblity, pluginInjectionApi, }: InsertMenuProps) => jsx.JSX.Element;
 export default InsertMenu;

package/dist/types/ui/registered-insert-menu/RegisteredInsertMenuList.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { QuickInsertMenuModel } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
+import { type QuickInsertMenuModel } from '@atlaskit/editor-common/quick-insert/registered-menu-model';
 import type { EmptyStateHandler } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { SurfaceContext } from '@atlaskit/editor-ui-control-model/types';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-insert-block",
-	"version": "26.0.0",
+	"version": "26.0.2",
 	"description": "Insert block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -62,7 +62,7 @@
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
 		"@atlaskit/textfield": "^10.2.0",
-		"@atlaskit/tmp-editor-statsig": "^224.0.0",
+		"@atlaskit/tmp-editor-statsig": "^226.0.0",
 		"@atlaskit/tokens": "^20.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -72,7 +72,7 @@
 		"react-virtualized": "^9.22.6"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^129.0.0",
+		"@atlaskit/editor-common": "^129.1.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"