@atlaskit/editor-plugin-insert-block 1.14.6 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-insert-block
 
+## 2.0.0
+
+### Major Changes
+
+- [#141573](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/141573)
+  [`2360742cbceac`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2360742cbceac) -
+  [ux] Removing replacePlusMenuWithElementBrowser option from insert-block plugin. This is to ensure
+  consistent UI and reduce unnecessary code bundled with the editor. If you are currently using this
+  option you must remove it and it will use the new approach only now.
+
+### Minor Changes
+
+- [#140915](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/140915)
+  [`eaccad51157d6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/eaccad51157d6) -
+  [ux] Migrate new icons including color, highlight and task on Editor primary toolbar
+
 ## 1.14.6
 
 ### Patch Changes

package/dist/cjs/plugin.js

@@ -332,7 +332,6 @@ function ToolbarInsertBlockWithInjectionApi(_ref3) {
     insertMenuItems: options.insertMenuItems,
     editorActions: editorActions,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-    replacePlusMenuWithElementBrowser: options.replacePlusMenuWithElementBrowser,
     showElementBrowserLink: options.showElementBrowserLink,
     showSeparator: !isLastItem && toolbarSize <= _types.ToolbarSize.S,
     registerToggleDropdownMenuOptions: registerToggleDropdownMenuOptions

package/dist/cjs/ui/ToolbarInsertBlock/block-insert-menu.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.BlockInsertMenu = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _blockInsertElementBrowser = require("./block-insert-element-browser");
-var _blockInsertMenuLegacy = require("./block-insert-menu-legacy");
 var _dropdownButton = require("./dropdown-button");
 var BlockInsertMenu = exports.BlockInsertMenu = function BlockInsertMenu(props) {
   if (props.items.length === 0) {
@@ -27,40 +26,23 @@ var BlockInsertMenu = exports.BlockInsertMenu = function BlockInsertMenu(props)
       "aria-keyshortcuts": "/"
     }));
   }
-  if (props.replacePlusMenuWithElementBrowser) {
-    return /*#__PURE__*/_react.default.createElement(_blockInsertElementBrowser.BlockInsertElementBrowser, {
-      disabled: props.disabled,
-      editorView: props.editorView,
-      items: props.items,
-      label: props.label,
-      onClick: props.onClick,
-      onKeyDown: props.onKeyDown,
-      onInsert: props.onInsert,
-      onRef: props.onPlusButtonRef,
-      open: props.open,
-      plusButtonRef: props.plusButtonRef,
-      popupsBoundariesElement: props.popupsBoundariesElement,
-      popupsMountPoint: props.popupsMountPoint,
-      popupsScrollableElement: props.popupsScrollableElement,
-      spacing: props.spacing,
-      togglePlusMenuVisibility: props.togglePlusMenuVisibility,
-      showElementBrowserLink: props.showElementBrowserLink,
-      pluginInjectionApi: props.pluginInjectionApi
-    });
-  }
-  return /*#__PURE__*/_react.default.createElement(_blockInsertMenuLegacy.BlockInsertMenuLegacy, {
+  return /*#__PURE__*/_react.default.createElement(_blockInsertElementBrowser.BlockInsertElementBrowser, {
     disabled: props.disabled,
+    editorView: props.editorView,
     items: props.items,
     label: props.label,
     onClick: props.onClick,
     onKeyDown: props.onKeyDown,
-    onItemActivated: props.onItemActivated,
-    onOpenChange: props.onOpenChange,
-    onRef: props.onRef,
+    onInsert: props.onInsert,
+    onRef: props.onPlusButtonRef,
     open: props.open,
+    plusButtonRef: props.plusButtonRef,
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,
     popupsScrollableElement: props.popupsScrollableElement,
-    spacing: props.spacing
+    spacing: props.spacing,
+    togglePlusMenuVisibility: props.togglePlusMenuVisibility,
+    showElementBrowserLink: props.showElementBrowserLink,
+    pluginInjectionApi: props.pluginInjectionApi
   });
 };

package/dist/cjs/ui/ToolbarInsertBlock/create-items.js

@@ -15,7 +15,6 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _item = require("./item");
 var _messages2 = require("./messages");
 var _shallowEquals = require("./shallow-equals");
-var _sortItems = require("./sort-items");
 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 buttonToItem = (0, _memoize.default)(function (button) {
@@ -63,8 +62,7 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
     expandEnabled = config.expandEnabled,
     numberOfButtons = config.numberOfButtons,
     schema = config.schema,
-    formatMessage = config.formatMessage,
-    isNewMenuEnabled = config.isNewMenuEnabled;
+    formatMessage = config.formatMessage;
   var items = [];
   if (actionSupported) {
     items.push((0, _item.action)({
@@ -223,7 +221,7 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
     var name = _ref.value.name;
     return name !== 'table selector';
   });
-  var dropdownItems = (!isNewMenuEnabled ? (0, _sortItems.sortItems)(remainingItems) : remainingItems).map(buttonToDropdownItem(formatMessage(_messages2.messages.insertMenu)));
+  var dropdownItems = remainingItems.map(buttonToDropdownItem(formatMessage(_messages2.messages.insertMenu)));
   return [buttonItems, dropdownItems];
 };
 var createItems = exports.createItems = (0, _memoizeOne.default)(createInsertBlockItems, _shallowEquals.shallowEquals);

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

@@ -569,13 +569,12 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
         popupsMountPoint = _this$props11.popupsMountPoint,
         popupsBoundariesElement = _this$props11.popupsBoundariesElement,
         popupsScrollableElement = _this$props11.popupsScrollableElement,
-        emojiProvider = _this$props11.emojiProvider,
-        replacePlusMenuWithElementBrowser = _this$props11.replacePlusMenuWithElementBrowser;
+        emojiProvider = _this$props11.emojiProvider;
       var dropdownEmoji = this.state.dropdownItems.some(function (_ref7) {
         var name = _ref7.value.name;
         return name === 'emoji';
       });
-      var dropDownButtonRef = replacePlusMenuWithElementBrowser ? this.plusButtonRef : this.dropdownButtonRef;
+      var dropDownButtonRef = this.plusButtonRef;
       var ref = dropdownEmoji ? dropDownButtonRef : this.emojiButtonRef;
       if (!emojiPickerOpen || !ref || !emojiProvider) {
         return null;
@@ -660,7 +659,6 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
         _tableSelectorButton5,
         _tableSelectorButton6,
         _this$props$isDisable,
-        _this$props$replacePl,
         _this$props$pluginInj3;
       var _this$state2 = this.state,
         buttons = _this$state2.buttons,
@@ -789,7 +787,6 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
           onInsert: this.insertInsertMenuItem,
           onOpenChange: this.onOpenChange,
           togglePlusMenuVisibility: this.togglePlusMenuVisibility,
-          replacePlusMenuWithElementBrowser: (_this$props$replacePl = this.props.replacePlusMenuWithElementBrowser) !== null && _this$props$replacePl !== void 0 ? _this$props$replacePl : false,
           showElementBrowserLink: this.props.showElementBrowserLink || false,
           pluginInjectionApi: this.props.pluginInjectionApi
         })), !((_this$props$pluginInj3 = this.props.pluginInjectionApi) !== null && _this$props$pluginInj3 !== void 0 && _this$props$pluginInj3.primaryToolbar) && this.props.showSeparator && /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage */
@@ -829,8 +826,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
           insertMenuItems: props.insertMenuItems,
           schema: props.editorView.state.schema,
           numberOfButtons: props.buttons,
-          formatMessage: props.intl.formatMessage,
-          isNewMenuEnabled: props.replacePlusMenuWithElementBrowser
+          formatMessage: props.intl.formatMessage
         }),
         _createItems2 = (0, _slicedToArray2.default)(_createItems, 2),
         buttons = _createItems2[0],

package/dist/cjs/ui/ToolbarInsertBlock/item.js

@@ -10,9 +10,10 @@ var _react2 = require("@emotion/react");
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
+var _fieldText = _interopRequireDefault(require("@atlaskit/icon-lab/core/field-text"));
+var _status = _interopRequireDefault(require("@atlaskit/icon-lab/core/status"));
 var _angleBracketsEditorCode = _interopRequireDefault(require("@atlaskit/icon/core/migration/angle-brackets--editor-code"));
 var _calendarEditorDate = _interopRequireDefault(require("@atlaskit/icon/core/migration/calendar--editor-date"));
-var _checkboxCheckedEditorTask = _interopRequireDefault(require("@atlaskit/icon/core/migration/checkbox-checked--editor-task"));
 var _decisionEditorDecision = _interopRequireDefault(require("@atlaskit/icon/core/migration/decision--editor-decision"));
 var _emojiEditorEmoji = _interopRequireDefault(require("@atlaskit/icon/core/migration/emoji--editor-emoji"));
 var _gridEditorTable = _interopRequireDefault(require("@atlaskit/icon/core/migration/grid--editor-table"));
@@ -24,8 +25,10 @@ var _mentionEditorMention = _interopRequireDefault(require("@atlaskit/icon/core/
 var _minusEditorHorizontalRule = _interopRequireDefault(require("@atlaskit/icon/core/migration/minus--editor-horizontal-rule"));
 var _quotationMarkQuote = _interopRequireDefault(require("@atlaskit/icon/core/migration/quotation-mark--quote"));
 var _showMoreHorizontalEditorMore = _interopRequireDefault(require("@atlaskit/icon/core/migration/show-more-horizontal--editor-more"));
+var _task = _interopRequireDefault(require("@atlaskit/icon/core/task"));
+var _task2 = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/task"));
 var _text = _interopRequireDefault(require("@atlaskit/icon/glyph/media-services/text"));
-var _status = _interopRequireDefault(require("@atlaskit/icon/glyph/status"));
+var _status2 = _interopRequireDefault(require("@atlaskit/icon/glyph/status"));
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
 var _chevronRightChevronRightCircle = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-right--chevron-right-circle"));
 var _shallowEquals = require("./shallow-equals");
@@ -70,7 +73,14 @@ var action = exports.action = mem(function (init) {
     disabled: init.disabled,
     name: 'action',
     shortcut: '[]',
-    Icon: _checkboxCheckedEditorTask.default,
+    Icon: function Icon() {
+      return (0, _react2.jsx)(_task.default, {
+        label: "",
+        color: "currentColor",
+        spacing: "spacious",
+        LEGACY_fallbackIcon: _task2.default
+      });
+    },
     'aria-keyshortcuts': '[ ] Space'
   });
 });
@@ -244,8 +254,11 @@ var placeholder = exports.placeholder = mem(function (init) {
     disabled: init.disabled,
     name: 'placeholder text',
     Icon: function Icon() {
-      return (0, _react2.jsx)(_text.default, {
-        label: ""
+      return (0, _react2.jsx)(_fieldText.default, {
+        label: "",
+        spacing: "spacious",
+        color: "currentColor",
+        LEGACY_fallbackIcon: _text.default
       });
     }
   });
@@ -256,7 +269,14 @@ var status = exports.status = mem(function (init) {
     tooltipDescription: init.tooltipDescription,
     disabled: init.disabled,
     name: 'status',
-    Icon: _status.default
+    Icon: function Icon() {
+      return (0, _react2.jsx)(_status.default, {
+        label: "",
+        color: "currentColor",
+        spacing: "spacious",
+        LEGACY_fallbackIcon: _status2.default
+      });
+    }
   });
 });
 var more = exports.more = mem(function (init) {

package/dist/es2019/plugin.js

@@ -327,7 +327,6 @@ function ToolbarInsertBlockWithInjectionApi({
     insertMenuItems: options.insertMenuItems,
     editorActions: editorActions,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-    replacePlusMenuWithElementBrowser: options.replacePlusMenuWithElementBrowser,
     showElementBrowserLink: options.showElementBrowserLink,
     showSeparator: !isLastItem && toolbarSize <= ToolbarSize.S,
     registerToggleDropdownMenuOptions: registerToggleDropdownMenuOptions

package/dist/es2019/ui/ToolbarInsertBlock/block-insert-menu.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import { BlockInsertElementBrowser } from './block-insert-element-browser';
-import { BlockInsertMenuLegacy } from './block-insert-menu-legacy';
 import { DropDownButton } from './dropdown-button';
 export const BlockInsertMenu = props => {
   if (props.items.length === 0) {
@@ -20,40 +19,23 @@ export const BlockInsertMenu = props => {
       "aria-keyshortcuts": "/"
     }));
   }
-  if (props.replacePlusMenuWithElementBrowser) {
-    return /*#__PURE__*/React.createElement(BlockInsertElementBrowser, {
-      disabled: props.disabled,
-      editorView: props.editorView,
-      items: props.items,
-      label: props.label,
-      onClick: props.onClick,
-      onKeyDown: props.onKeyDown,
-      onInsert: props.onInsert,
-      onRef: props.onPlusButtonRef,
-      open: props.open,
-      plusButtonRef: props.plusButtonRef,
-      popupsBoundariesElement: props.popupsBoundariesElement,
-      popupsMountPoint: props.popupsMountPoint,
-      popupsScrollableElement: props.popupsScrollableElement,
-      spacing: props.spacing,
-      togglePlusMenuVisibility: props.togglePlusMenuVisibility,
-      showElementBrowserLink: props.showElementBrowserLink,
-      pluginInjectionApi: props.pluginInjectionApi
-    });
-  }
-  return /*#__PURE__*/React.createElement(BlockInsertMenuLegacy, {
+  return /*#__PURE__*/React.createElement(BlockInsertElementBrowser, {
     disabled: props.disabled,
+    editorView: props.editorView,
     items: props.items,
     label: props.label,
     onClick: props.onClick,
     onKeyDown: props.onKeyDown,
-    onItemActivated: props.onItemActivated,
-    onOpenChange: props.onOpenChange,
-    onRef: props.onRef,
+    onInsert: props.onInsert,
+    onRef: props.onPlusButtonRef,
     open: props.open,
+    plusButtonRef: props.plusButtonRef,
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,
     popupsScrollableElement: props.popupsScrollableElement,
-    spacing: props.spacing
+    spacing: props.spacing,
+    togglePlusMenuVisibility: props.togglePlusMenuVisibility,
+    showElementBrowserLink: props.showElementBrowserLink,
+    pluginInjectionApi: props.pluginInjectionApi
   });
 };

package/dist/es2019/ui/ToolbarInsertBlock/create-items.js

@@ -6,7 +6,6 @@ import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { action, blockquote, codeblock, date, decision, emoji, expand, horizontalrule, imageUpload, layout, link, media, mention, more, panel, placeholder, status, table, tableSelector } from './item';
 import { messages } from './messages';
 import { shallowEquals } from './shallow-equals';
-import { sortItems } from './sort-items';
 const buttonToItem = memoize(button => ({
   ...button,
   title: /*#__PURE__*/React.createElement(ToolTipContent, {
@@ -49,8 +48,7 @@ const createInsertBlockItems = config => {
     expandEnabled,
     numberOfButtons,
     schema,
-    formatMessage,
-    isNewMenuEnabled
+    formatMessage
   } = config;
   const items = [];
   if (actionSupported) {
@@ -205,7 +203,7 @@ const createInsertBlockItems = config => {
       name
     }
   }) => name !== 'table selector');
-  const dropdownItems = (!isNewMenuEnabled ? sortItems(remainingItems) : remainingItems).map(buttonToDropdownItem(formatMessage(messages.insertMenu)));
+  const dropdownItems = remainingItems.map(buttonToDropdownItem(formatMessage(messages.insertMenu)));
   return [buttonItems, dropdownItems];
 };
 export const createItems = memoizeOne(createInsertBlockItems, shallowEquals);

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

@@ -586,8 +586,7 @@ export class ToolbarInsertBlock extends React.PureComponent {
       insertMenuItems: props.insertMenuItems,
       schema: props.editorView.state.schema,
       numberOfButtons: props.buttons,
-      formatMessage: props.intl.formatMessage,
-      isNewMenuEnabled: props.replacePlusMenuWithElementBrowser
+      formatMessage: props.intl.formatMessage
     });
     return {
       ...state,
@@ -629,15 +628,14 @@ export class ToolbarInsertBlock extends React.PureComponent {
       popupsMountPoint,
       popupsBoundariesElement,
       popupsScrollableElement,
-      emojiProvider,
-      replacePlusMenuWithElementBrowser
+      emojiProvider
     } = this.props;
     const dropdownEmoji = this.state.dropdownItems.some(({
       value: {
         name
       }
     }) => name === 'emoji');
-    const dropDownButtonRef = replacePlusMenuWithElementBrowser ? this.plusButtonRef : this.dropdownButtonRef;
+    const dropDownButtonRef = this.plusButtonRef;
     const ref = dropdownEmoji ? dropDownButtonRef : this.emojiButtonRef;
     if (!emojiPickerOpen || !ref || !emojiProvider) {
       return null;
@@ -705,7 +703,7 @@ export class ToolbarInsertBlock extends React.PureComponent {
     });
   }
   render() {
-    var _tableButton, _tableButton2, _tableButton3, _tableButton4, _tableButton5, _tableButton6, _tableButton7, _tableSelectorButton, _tableSelectorButton2, _tableSelectorButton3, _tableSelectorButton4, _tableSelectorButton5, _tableSelectorButton6, _this$props$isDisable, _this$props$replacePl, _this$props$pluginInj7;
+    var _tableButton, _tableButton2, _tableButton3, _tableButton4, _tableButton5, _tableButton6, _tableButton7, _tableSelectorButton, _tableSelectorButton2, _tableSelectorButton3, _tableSelectorButton4, _tableSelectorButton5, _tableSelectorButton6, _this$props$isDisable, _this$props$pluginInj7;
     const {
       buttons,
       dropdownItems,
@@ -824,7 +822,6 @@ export class ToolbarInsertBlock extends React.PureComponent {
         onInsert: this.insertInsertMenuItem,
         onOpenChange: this.onOpenChange,
         togglePlusMenuVisibility: this.togglePlusMenuVisibility,
-        replacePlusMenuWithElementBrowser: (_this$props$replacePl = this.props.replacePlusMenuWithElementBrowser) !== null && _this$props$replacePl !== void 0 ? _this$props$replacePl : false,
         showElementBrowserLink: this.props.showElementBrowserLink || false,
         pluginInjectionApi: this.props.pluginInjectionApi
       })), !((_this$props$pluginInj7 = this.props.pluginInjectionApi) !== null && _this$props$pluginInj7 !== void 0 && _this$props$pluginInj7.primaryToolbar) && this.props.showSeparator && /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage */

package/dist/es2019/ui/ToolbarInsertBlock/item.js

@@ -9,9 +9,10 @@ import { jsx } from '@emotion/react';
 import memoizeOne from 'memoize-one';
 import { addLink, getAriaKeyshortcuts, toggleTable, tooltip } from '@atlaskit/editor-common/keymaps';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
+import FieldTextIcon from '@atlaskit/icon-lab/core/field-text';
+import StatusIcon from '@atlaskit/icon-lab/core/status';
 import AngleBracketsIcon from '@atlaskit/icon/core/migration/angle-brackets--editor-code';
 import CalendarIcon from '@atlaskit/icon/core/migration/calendar--editor-date';
-import CheckboxCheckedIcon from '@atlaskit/icon/core/migration/checkbox-checked--editor-task';
 import DecisionIcon from '@atlaskit/icon/core/migration/decision--editor-decision';
 import EmojiIcon from '@atlaskit/icon/core/migration/emoji--editor-emoji';
 import GridIcon from '@atlaskit/icon/core/migration/grid--editor-table';
@@ -23,8 +24,10 @@ import MentionIcon from '@atlaskit/icon/core/migration/mention--editor-mention';
 import HorizontalRuleIcon from '@atlaskit/icon/core/migration/minus--editor-horizontal-rule';
 import QuotationMarkIcon from '@atlaskit/icon/core/migration/quotation-mark--quote';
 import ShowMoreHorizontalIcon from '@atlaskit/icon/core/migration/show-more-horizontal--editor-more';
+import TaskIcon from '@atlaskit/icon/core/task';
+import CheckboxCheckedIconLegacy from '@atlaskit/icon/glyph/editor/task';
 import PlaceholderTextIcon from '@atlaskit/icon/glyph/media-services/text';
-import StatusIcon from '@atlaskit/icon/glyph/status';
+import StatusIconLegacy from '@atlaskit/icon/glyph/status';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
 import ExpandNodeIcon from '@atlaskit/icon/utility/migration/chevron-right--chevron-right-circle';
 import { shallowEquals } from './shallow-equals';
@@ -58,7 +61,12 @@ export const action = mem(init => {
     disabled: init.disabled,
     name: 'action',
     shortcut: '[]',
-    Icon: CheckboxCheckedIcon,
+    Icon: () => jsx(TaskIcon, {
+      label: "",
+      color: "currentColor",
+      spacing: "spacious",
+      LEGACY_fallbackIcon: CheckboxCheckedIconLegacy
+    }),
     'aria-keyshortcuts': '[ ] Space'
   });
 });
@@ -198,8 +206,11 @@ export const placeholder = mem(init => from({
   tooltipDescription: init.tooltipDescription,
   disabled: init.disabled,
   name: 'placeholder text',
-  Icon: () => jsx(PlaceholderTextIcon, {
-    label: ""
+  Icon: () => jsx(FieldTextIcon, {
+    label: "",
+    spacing: "spacious",
+    color: "currentColor",
+    LEGACY_fallbackIcon: PlaceholderTextIcon
   })
 }));
 export const status = mem(init => from({
@@ -207,7 +218,12 @@ export const status = mem(init => from({
   tooltipDescription: init.tooltipDescription,
   disabled: init.disabled,
   name: 'status',
-  Icon: StatusIcon
+  Icon: () => jsx(StatusIcon, {
+    label: "",
+    color: "currentColor",
+    spacing: "spacious",
+    LEGACY_fallbackIcon: StatusIconLegacy
+  })
 }));
 export const more = mem(init => from({
   content: init.content,

package/dist/esm/plugin.js

@@ -322,7 +322,6 @@ function ToolbarInsertBlockWithInjectionApi(_ref3) {
     insertMenuItems: options.insertMenuItems,
     editorActions: editorActions,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-    replacePlusMenuWithElementBrowser: options.replacePlusMenuWithElementBrowser,
     showElementBrowserLink: options.showElementBrowserLink,
     showSeparator: !isLastItem && toolbarSize <= ToolbarSize.S,
     registerToggleDropdownMenuOptions: registerToggleDropdownMenuOptions

package/dist/esm/ui/ToolbarInsertBlock/block-insert-menu.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import { BlockInsertElementBrowser } from './block-insert-element-browser';
-import { BlockInsertMenuLegacy } from './block-insert-menu-legacy';
 import { DropDownButton } from './dropdown-button';
 export var BlockInsertMenu = function BlockInsertMenu(props) {
   if (props.items.length === 0) {
@@ -20,40 +19,23 @@ export var BlockInsertMenu = function BlockInsertMenu(props) {
       "aria-keyshortcuts": "/"
     }));
   }
-  if (props.replacePlusMenuWithElementBrowser) {
-    return /*#__PURE__*/React.createElement(BlockInsertElementBrowser, {
-      disabled: props.disabled,
-      editorView: props.editorView,
-      items: props.items,
-      label: props.label,
-      onClick: props.onClick,
-      onKeyDown: props.onKeyDown,
-      onInsert: props.onInsert,
-      onRef: props.onPlusButtonRef,
-      open: props.open,
-      plusButtonRef: props.plusButtonRef,
-      popupsBoundariesElement: props.popupsBoundariesElement,
-      popupsMountPoint: props.popupsMountPoint,
-      popupsScrollableElement: props.popupsScrollableElement,
-      spacing: props.spacing,
-      togglePlusMenuVisibility: props.togglePlusMenuVisibility,
-      showElementBrowserLink: props.showElementBrowserLink,
-      pluginInjectionApi: props.pluginInjectionApi
-    });
-  }
-  return /*#__PURE__*/React.createElement(BlockInsertMenuLegacy, {
+  return /*#__PURE__*/React.createElement(BlockInsertElementBrowser, {
     disabled: props.disabled,
+    editorView: props.editorView,
     items: props.items,
     label: props.label,
     onClick: props.onClick,
     onKeyDown: props.onKeyDown,
-    onItemActivated: props.onItemActivated,
-    onOpenChange: props.onOpenChange,
-    onRef: props.onRef,
+    onInsert: props.onInsert,
+    onRef: props.onPlusButtonRef,
     open: props.open,
+    plusButtonRef: props.plusButtonRef,
     popupsBoundariesElement: props.popupsBoundariesElement,
     popupsMountPoint: props.popupsMountPoint,
     popupsScrollableElement: props.popupsScrollableElement,
-    spacing: props.spacing
+    spacing: props.spacing,
+    togglePlusMenuVisibility: props.togglePlusMenuVisibility,
+    showElementBrowserLink: props.showElementBrowserLink,
+    pluginInjectionApi: props.pluginInjectionApi
   });
 };

package/dist/esm/ui/ToolbarInsertBlock/create-items.js

@@ -10,7 +10,6 @@ import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { action, blockquote, codeblock, date, decision, emoji, expand, horizontalrule, imageUpload, layout, link, media, mention, more, panel, placeholder, status, table, tableSelector } from './item';
 import { messages } from './messages';
 import { shallowEquals } from './shallow-equals';
-import { sortItems } from './sort-items';
 var buttonToItem = memoize(function (button) {
   return _objectSpread(_objectSpread({}, button), {}, {
     title: /*#__PURE__*/React.createElement(ToolTipContent, {
@@ -56,8 +55,7 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
     expandEnabled = config.expandEnabled,
     numberOfButtons = config.numberOfButtons,
     schema = config.schema,
-    formatMessage = config.formatMessage,
-    isNewMenuEnabled = config.isNewMenuEnabled;
+    formatMessage = config.formatMessage;
   var items = [];
   if (actionSupported) {
     items.push(action({
@@ -216,7 +214,7 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
     var name = _ref.value.name;
     return name !== 'table selector';
   });
-  var dropdownItems = (!isNewMenuEnabled ? sortItems(remainingItems) : remainingItems).map(buttonToDropdownItem(formatMessage(messages.insertMenu)));
+  var dropdownItems = remainingItems.map(buttonToDropdownItem(formatMessage(messages.insertMenu)));
   return [buttonItems, dropdownItems];
 };
 export var createItems = memoizeOne(createInsertBlockItems, shallowEquals);

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

@@ -560,13 +560,12 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
         popupsMountPoint = _this$props11.popupsMountPoint,
         popupsBoundariesElement = _this$props11.popupsBoundariesElement,
         popupsScrollableElement = _this$props11.popupsScrollableElement,
-        emojiProvider = _this$props11.emojiProvider,
-        replacePlusMenuWithElementBrowser = _this$props11.replacePlusMenuWithElementBrowser;
+        emojiProvider = _this$props11.emojiProvider;
       var dropdownEmoji = this.state.dropdownItems.some(function (_ref7) {
         var name = _ref7.value.name;
         return name === 'emoji';
       });
-      var dropDownButtonRef = replacePlusMenuWithElementBrowser ? this.plusButtonRef : this.dropdownButtonRef;
+      var dropDownButtonRef = this.plusButtonRef;
       var ref = dropdownEmoji ? dropDownButtonRef : this.emojiButtonRef;
       if (!emojiPickerOpen || !ref || !emojiProvider) {
         return null;
@@ -651,7 +650,6 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
         _tableSelectorButton5,
         _tableSelectorButton6,
         _this$props$isDisable,
-        _this$props$replacePl,
         _this$props$pluginInj3;
       var _this$state2 = this.state,
         buttons = _this$state2.buttons,
@@ -780,7 +778,6 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
           onInsert: this.insertInsertMenuItem,
           onOpenChange: this.onOpenChange,
           togglePlusMenuVisibility: this.togglePlusMenuVisibility,
-          replacePlusMenuWithElementBrowser: (_this$props$replacePl = this.props.replacePlusMenuWithElementBrowser) !== null && _this$props$replacePl !== void 0 ? _this$props$replacePl : false,
           showElementBrowserLink: this.props.showElementBrowserLink || false,
           pluginInjectionApi: this.props.pluginInjectionApi
         })), !((_this$props$pluginInj3 = this.props.pluginInjectionApi) !== null && _this$props$pluginInj3 !== void 0 && _this$props$pluginInj3.primaryToolbar) && this.props.showSeparator && /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage */
@@ -820,8 +817,7 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
           insertMenuItems: props.insertMenuItems,
           schema: props.editorView.state.schema,
           numberOfButtons: props.buttons,
-          formatMessage: props.intl.formatMessage,
-          isNewMenuEnabled: props.replacePlusMenuWithElementBrowser
+          formatMessage: props.intl.formatMessage
         }),
         _createItems2 = _slicedToArray(_createItems, 2),
         buttons = _createItems2[0],

package/dist/esm/ui/ToolbarInsertBlock/item.js

@@ -9,9 +9,10 @@ import { jsx } from '@emotion/react';
 import memoizeOne from 'memoize-one';
 import { addLink, getAriaKeyshortcuts, toggleTable, tooltip } from '@atlaskit/editor-common/keymaps';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
+import FieldTextIcon from '@atlaskit/icon-lab/core/field-text';
+import StatusIcon from '@atlaskit/icon-lab/core/status';
 import AngleBracketsIcon from '@atlaskit/icon/core/migration/angle-brackets--editor-code';
 import CalendarIcon from '@atlaskit/icon/core/migration/calendar--editor-date';
-import CheckboxCheckedIcon from '@atlaskit/icon/core/migration/checkbox-checked--editor-task';
 import DecisionIcon from '@atlaskit/icon/core/migration/decision--editor-decision';
 import EmojiIcon from '@atlaskit/icon/core/migration/emoji--editor-emoji';
 import GridIcon from '@atlaskit/icon/core/migration/grid--editor-table';
@@ -23,8 +24,10 @@ import MentionIcon from '@atlaskit/icon/core/migration/mention--editor-mention';
 import HorizontalRuleIcon from '@atlaskit/icon/core/migration/minus--editor-horizontal-rule';
 import QuotationMarkIcon from '@atlaskit/icon/core/migration/quotation-mark--quote';
 import ShowMoreHorizontalIcon from '@atlaskit/icon/core/migration/show-more-horizontal--editor-more';
+import TaskIcon from '@atlaskit/icon/core/task';
+import CheckboxCheckedIconLegacy from '@atlaskit/icon/glyph/editor/task';
 import PlaceholderTextIcon from '@atlaskit/icon/glyph/media-services/text';
-import StatusIcon from '@atlaskit/icon/glyph/status';
+import StatusIconLegacy from '@atlaskit/icon/glyph/status';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
 import ExpandNodeIcon from '@atlaskit/icon/utility/migration/chevron-right--chevron-right-circle';
 import { shallowEquals } from './shallow-equals';
@@ -62,7 +65,14 @@ export var action = mem(function (init) {
     disabled: init.disabled,
     name: 'action',
     shortcut: '[]',
-    Icon: CheckboxCheckedIcon,
+    Icon: function Icon() {
+      return jsx(TaskIcon, {
+        label: "",
+        color: "currentColor",
+        spacing: "spacious",
+        LEGACY_fallbackIcon: CheckboxCheckedIconLegacy
+      });
+    },
     'aria-keyshortcuts': '[ ] Space'
   });
 });
@@ -236,8 +246,11 @@ export var placeholder = mem(function (init) {
     disabled: init.disabled,
     name: 'placeholder text',
     Icon: function Icon() {
-      return jsx(PlaceholderTextIcon, {
-        label: ""
+      return jsx(FieldTextIcon, {
+        label: "",
+        spacing: "spacious",
+        color: "currentColor",
+        LEGACY_fallbackIcon: PlaceholderTextIcon
       });
     }
   });
@@ -248,7 +261,14 @@ export var status = mem(function (init) {
     tooltipDescription: init.tooltipDescription,
     disabled: init.disabled,
     name: 'status',
-    Icon: StatusIcon
+    Icon: function Icon() {
+      return jsx(StatusIcon, {
+        label: "",
+        color: "currentColor",
+        spacing: "spacious",
+        LEGACY_fallbackIcon: StatusIconLegacy
+      });
+    }
   });
 });
 export var more = mem(function (init) {

package/dist/types/plugin.d.ts

@@ -6,7 +6,6 @@ export interface InsertBlockOptions {
     insertMenuItems?: any;
     horizontalRuleEnabled?: boolean;
     nativeStatusSupported?: boolean;
-    replacePlusMenuWithElementBrowser?: boolean;
     showElementBrowserLink?: boolean;
     tableSelectorSupported?: boolean;
 }

package/dist/types/ui/ToolbarInsertBlock/block-insert-menu.d.ts

@@ -15,7 +15,6 @@ export interface BlockInsertMenuProps {
     popupsBoundariesElement?: HTMLElement;
     popupsMountPoint?: HTMLElement;
     popupsScrollableElement?: HTMLElement;
-    replacePlusMenuWithElementBrowser: boolean;
     spacing: 'none' | 'default';
     showElementBrowserLink: boolean;
     onRef(el: HTMLElement): void;

package/dist/types/ui/ToolbarInsertBlock/types.d.ts

@@ -42,12 +42,11 @@ export interface Props {
     insertMenuItems?: MenuItem[];
     showElementBrowserLink?: boolean;
     showSeparator?: boolean;
-    replacePlusMenuWithElementBrowser?: boolean;
     onShowMediaPicker?: () => void;
     onInsertBlockType?: (name: string) => Command;
     onInsertMacroFromMacroBrowser?: (macroProvider: MacroProvider, node?: PMNode, isEditing?: boolean) => (view: EditorView) => void;
     dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
-    pluginInjectionApi?: ExtractInjectionAPI<InsertBlockPlugin>;
+    pluginInjectionApi: ExtractInjectionAPI<InsertBlockPlugin> | undefined;
     mentionsDisabled?: boolean;
     editorAppearance?: EditorAppearance;
 }

package/dist/types-ts4.5/plugin.d.ts

@@ -6,7 +6,6 @@ export interface InsertBlockOptions {
     insertMenuItems?: any;
     horizontalRuleEnabled?: boolean;
     nativeStatusSupported?: boolean;
-    replacePlusMenuWithElementBrowser?: boolean;
     showElementBrowserLink?: boolean;
     tableSelectorSupported?: boolean;
 }

package/dist/types-ts4.5/ui/ToolbarInsertBlock/block-insert-menu.d.ts

@@ -15,7 +15,6 @@ export interface BlockInsertMenuProps {
     popupsBoundariesElement?: HTMLElement;
     popupsMountPoint?: HTMLElement;
     popupsScrollableElement?: HTMLElement;
-    replacePlusMenuWithElementBrowser: boolean;
     spacing: 'none' | 'default';
     showElementBrowserLink: boolean;
     onRef(el: HTMLElement): void;

package/dist/types-ts4.5/ui/ToolbarInsertBlock/types.d.ts

@@ -42,12 +42,11 @@ export interface Props {
     insertMenuItems?: MenuItem[];
     showElementBrowserLink?: boolean;
     showSeparator?: boolean;
-    replacePlusMenuWithElementBrowser?: boolean;
     onShowMediaPicker?: () => void;
     onInsertBlockType?: (name: string) => Command;
     onInsertMacroFromMacroBrowser?: (macroProvider: MacroProvider, node?: PMNode, isEditing?: boolean) => (view: EditorView) => void;
     dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
-    pluginInjectionApi?: ExtractInjectionAPI<InsertBlockPlugin>;
+    pluginInjectionApi: ExtractInjectionAPI<InsertBlockPlugin> | undefined;
     mentionsDisabled?: boolean;
     editorAppearance?: EditorAppearance;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-insert-block",
-	"version": "1.14.6",
+	"version": "2.0.0",
 	"description": "Insert block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -32,12 +32,12 @@
 	},
 	"dependencies": {
 		"@atlaskit/button": "^20.1.0",
-		"@atlaskit/editor-common": "^89.1.0",
+		"@atlaskit/editor-common": "^89.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-block-type": "^3.14.0",
 		"@atlaskit/editor-plugin-code-block": "^3.3.0",
 		"@atlaskit/editor-plugin-date": "^2.3.0",
-		"@atlaskit/editor-plugin-emoji": "^2.5.0",
+		"@atlaskit/editor-plugin-emoji": "^2.6.0",
 		"@atlaskit/editor-plugin-expand": "^2.6.0",
 		"@atlaskit/editor-plugin-extension": "^1.14.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.2.0",
@@ -46,7 +46,7 @@
 		"@atlaskit/editor-plugin-layout": "^1.7.0",
 		"@atlaskit/editor-plugin-media": "^1.31.0",
 		"@atlaskit/editor-plugin-mentions": "^2.6.0",
-		"@atlaskit/editor-plugin-panel": "^2.3.0",
+		"@atlaskit/editor-plugin-panel": "^2.4.0",
 		"@atlaskit/editor-plugin-placeholder-text": "^1.7.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",
 		"@atlaskit/editor-plugin-quick-insert": "^1.3.0",
@@ -60,6 +60,7 @@
 		"@atlaskit/emoji": "^67.7.0",
 		"@atlaskit/heading": "2.4.5",
 		"@atlaskit/icon": "^22.18.0",
+		"@atlaskit/icon-lab": "^0.2.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^12.1.0",
 		"@atlaskit/theme": "^13.0.0",

package/dist/cjs/ui/ToolbarInsertBlock/block-insert-menu-legacy.js

@@ -1,42 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.BlockInsertMenuLegacy = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _uiMenu = require("@atlaskit/editor-common/ui-menu");
-var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _dropdownButton = require("./dropdown-button");
-var BlockInsertMenuLegacy = exports.BlockInsertMenuLegacy = function BlockInsertMenuLegacy(props) {
-  var items = props.items;
-  var dropdownItems = _react.default.useMemo(function () {
-    return [{
-      items: items
-    }];
-  }, [items]);
-  return /*#__PURE__*/_react.default.createElement(_uiMenu.DropdownMenuWithKeyboardNavigation, {
-    items: dropdownItems,
-    onItemActivated: props.onItemActivated,
-    onOpenChange: props.onOpenChange,
-    mountTo: props.popupsMountPoint,
-    boundariesElement: props.popupsBoundariesElement,
-    scrollableElement: props.popupsScrollableElement,
-    isOpen: props.open,
-    fitHeight: 188,
-    fitWidth: 175,
-    zIndex: _editorSharedStyles.akEditorMenuZIndex
-  }, /*#__PURE__*/_react.default.createElement(_dropdownButton.DropDownButton, {
-    "aria-expanded": props.open,
-    "aria-haspopup": true,
-    handleRef: props.onRef,
-    selected: props.open,
-    disabled: props.disabled,
-    onClick: props.onClick,
-    onKeyDown: props.onKeyDown,
-    spacing: props.spacing,
-    label: props.label,
-    "aria-keyshortcuts": "/"
-  }));
-};

package/dist/cjs/ui/ToolbarInsertBlock/sort-items.js

@@ -1,30 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.sortItems = void 0;
-var endPositionNames = ['macro-browser', 'slash-onboarding'];
-var isMacro = function isMacro(item) {
-  return typeof item.content === 'string' && item.content.includes('macro');
-};
-var sortItems = exports.sortItems = function sortItems(items) {
-  return items.sort(function (a, b) {
-    if (endPositionNames.includes(a.value.name) && endPositionNames.includes(b.value.name)) {
-      return endPositionNames.indexOf(a.value.name) - endPositionNames.indexOf(b.value.name);
-    }
-    if (endPositionNames.includes(b.value.name)) {
-      return -1;
-    }
-    if (endPositionNames.includes(a.value.name)) {
-      return 1;
-    }
-    if (isMacro(a) && !isMacro(b)) {
-      return 1;
-    }
-    if (isMacro(b) && !isMacro(a)) {
-      return -1;
-    }
-    return a.content < b.content ? -1 : 1;
-  });
-};

package/dist/es2019/ui/ToolbarInsertBlock/block-insert-menu-legacy.js

@@ -1,35 +0,0 @@
-import React from 'react';
-import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu';
-import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
-import { DropDownButton } from './dropdown-button';
-export const BlockInsertMenuLegacy = props => {
-  const {
-    items
-  } = props;
-  const dropdownItems = React.useMemo(() => [{
-    items
-  }], [items]);
-  return /*#__PURE__*/React.createElement(DropdownMenu, {
-    items: dropdownItems,
-    onItemActivated: props.onItemActivated,
-    onOpenChange: props.onOpenChange,
-    mountTo: props.popupsMountPoint,
-    boundariesElement: props.popupsBoundariesElement,
-    scrollableElement: props.popupsScrollableElement,
-    isOpen: props.open,
-    fitHeight: 188,
-    fitWidth: 175,
-    zIndex: akEditorMenuZIndex
-  }, /*#__PURE__*/React.createElement(DropDownButton, {
-    "aria-expanded": props.open,
-    "aria-haspopup": true,
-    handleRef: props.onRef,
-    selected: props.open,
-    disabled: props.disabled,
-    onClick: props.onClick,
-    onKeyDown: props.onKeyDown,
-    spacing: props.spacing,
-    label: props.label,
-    "aria-keyshortcuts": "/"
-  }));
-};

package/dist/es2019/ui/ToolbarInsertBlock/sort-items.js

@@ -1,22 +0,0 @@
-const endPositionNames = ['macro-browser', 'slash-onboarding'];
-const isMacro = item => typeof item.content === 'string' && item.content.includes('macro');
-export const sortItems = items => {
-  return items.sort((a, b) => {
-    if (endPositionNames.includes(a.value.name) && endPositionNames.includes(b.value.name)) {
-      return endPositionNames.indexOf(a.value.name) - endPositionNames.indexOf(b.value.name);
-    }
-    if (endPositionNames.includes(b.value.name)) {
-      return -1;
-    }
-    if (endPositionNames.includes(a.value.name)) {
-      return 1;
-    }
-    if (isMacro(a) && !isMacro(b)) {
-      return 1;
-    }
-    if (isMacro(b) && !isMacro(a)) {
-      return -1;
-    }
-    return a.content < b.content ? -1 : 1;
-  });
-};

package/dist/esm/ui/ToolbarInsertBlock/block-insert-menu-legacy.js

@@ -1,35 +0,0 @@
-import React from 'react';
-import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu';
-import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
-import { DropDownButton } from './dropdown-button';
-export var BlockInsertMenuLegacy = function BlockInsertMenuLegacy(props) {
-  var items = props.items;
-  var dropdownItems = React.useMemo(function () {
-    return [{
-      items: items
-    }];
-  }, [items]);
-  return /*#__PURE__*/React.createElement(DropdownMenu, {
-    items: dropdownItems,
-    onItemActivated: props.onItemActivated,
-    onOpenChange: props.onOpenChange,
-    mountTo: props.popupsMountPoint,
-    boundariesElement: props.popupsBoundariesElement,
-    scrollableElement: props.popupsScrollableElement,
-    isOpen: props.open,
-    fitHeight: 188,
-    fitWidth: 175,
-    zIndex: akEditorMenuZIndex
-  }, /*#__PURE__*/React.createElement(DropDownButton, {
-    "aria-expanded": props.open,
-    "aria-haspopup": true,
-    handleRef: props.onRef,
-    selected: props.open,
-    disabled: props.disabled,
-    onClick: props.onClick,
-    onKeyDown: props.onKeyDown,
-    spacing: props.spacing,
-    label: props.label,
-    "aria-keyshortcuts": "/"
-  }));
-};

package/dist/esm/ui/ToolbarInsertBlock/sort-items.js

@@ -1,24 +0,0 @@
-var endPositionNames = ['macro-browser', 'slash-onboarding'];
-var isMacro = function isMacro(item) {
-  return typeof item.content === 'string' && item.content.includes('macro');
-};
-export var sortItems = function sortItems(items) {
-  return items.sort(function (a, b) {
-    if (endPositionNames.includes(a.value.name) && endPositionNames.includes(b.value.name)) {
-      return endPositionNames.indexOf(a.value.name) - endPositionNames.indexOf(b.value.name);
-    }
-    if (endPositionNames.includes(b.value.name)) {
-      return -1;
-    }
-    if (endPositionNames.includes(a.value.name)) {
-      return 1;
-    }
-    if (isMacro(a) && !isMacro(b)) {
-      return 1;
-    }
-    if (isMacro(b) && !isMacro(a)) {
-      return -1;
-    }
-    return a.content < b.content ? -1 : 1;
-  });
-};

package/dist/types/ui/ToolbarInsertBlock/block-insert-menu-legacy.d.ts

@@ -1,21 +0,0 @@
-import React from 'react';
-import type { MenuItem } from '@atlaskit/editor-common/ui-menu';
-import type { BlockMenuItem } from './create-items';
-export interface BlockInsertMenuLegacyProps {
-    disabled: boolean;
-    spacing: 'none' | 'default';
-    label: string;
-    open: boolean;
-    items: BlockMenuItem[];
-    popupsMountPoint?: HTMLElement;
-    popupsBoundariesElement?: HTMLElement;
-    popupsScrollableElement?: HTMLElement;
-    onClick: React.MouseEventHandler;
-    onKeyDown?: React.KeyboardEventHandler;
-    onRef(el: HTMLElement): void;
-    onItemActivated(attrs: {
-        item: MenuItem;
-    }): void;
-    onOpenChange(attrs: any): void;
-}
-export declare const BlockInsertMenuLegacy: (props: BlockInsertMenuLegacyProps) => JSX.Element;

package/dist/types/ui/ToolbarInsertBlock/sort-items.d.ts

@@ -1,2 +0,0 @@
-import type { MenuItem } from '@atlaskit/editor-common/ui-menu';
-export declare const sortItems: (items: MenuItem[]) => MenuItem[];

package/dist/types-ts4.5/ui/ToolbarInsertBlock/block-insert-menu-legacy.d.ts

@@ -1,21 +0,0 @@
-import React from 'react';
-import type { MenuItem } from '@atlaskit/editor-common/ui-menu';
-import type { BlockMenuItem } from './create-items';
-export interface BlockInsertMenuLegacyProps {
-    disabled: boolean;
-    spacing: 'none' | 'default';
-    label: string;
-    open: boolean;
-    items: BlockMenuItem[];
-    popupsMountPoint?: HTMLElement;
-    popupsBoundariesElement?: HTMLElement;
-    popupsScrollableElement?: HTMLElement;
-    onClick: React.MouseEventHandler;
-    onKeyDown?: React.KeyboardEventHandler;
-    onRef(el: HTMLElement): void;
-    onItemActivated(attrs: {
-        item: MenuItem;
-    }): void;
-    onOpenChange(attrs: any): void;
-}
-export declare const BlockInsertMenuLegacy: (props: BlockInsertMenuLegacyProps) => JSX.Element;

package/dist/types-ts4.5/ui/ToolbarInsertBlock/sort-items.d.ts

@@ -1,2 +0,0 @@
-import type { MenuItem } from '@atlaskit/editor-common/ui-menu';
-export declare const sortItems: (items: MenuItem[]) => MenuItem[];