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

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$isDisable2, _this$props$pluginInj7;
     const {
       buttons,
       dropdownItems,
@@ -740,6 +738,7 @@ export class ToolbarInsertBlock extends React.PureComponent {
         toolbarButtons.push(btn);
       }
     }
+    const isFullPageAppearance = ['full-page', 'full-width'].includes(editorAppearance !== null && editorAppearance !== void 0 ? editorAppearance : '');
     return (
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       jsx("span", {
@@ -803,13 +802,14 @@ export class ToolbarInsertBlock extends React.PureComponent {
         onKeyDown: this.handleTableSelectorOpenByKeyboard
       })), jsx("span", {
         css: wrapperStyle
-      }, this.renderPopup(), this.renderTableSelectorPopup(), editorExperiment('insert-menu-in-right-rail', true) && ['full-page', 'full-width'].includes(editorAppearance !== null && editorAppearance !== void 0 ? editorAppearance : '') ? jsx(RightRailIcon, {
-        onClick: this.handleClick
+      }, this.renderPopup(), this.renderTableSelectorPopup(), isFullPageAppearance && editorExperiment('insert-menu-in-right-rail', true) ? jsx(RightRailIcon, {
+        onClick: this.handleClick,
+        isDisabled: (_this$props$isDisable = this.props.isDisabled) !== null && _this$props$isDisable !== void 0 ? _this$props$isDisable : false
       }) : jsx(BlockInsertMenu, {
         popupsMountPoint: this.props.popupsMountPoint,
         popupsBoundariesElement: this.props.popupsBoundariesElement,
         popupsScrollableElement: this.props.popupsScrollableElement,
-        disabled: (_this$props$isDisable = this.props.isDisabled) !== null && _this$props$isDisable !== void 0 ? _this$props$isDisable : false,
+        disabled: (_this$props$isDisable2 = this.props.isDisabled) !== null && _this$props$isDisable2 !== void 0 ? _this$props$isDisable2 : false,
         editorView: this.props.editorView,
         spacing: this.props.isReducedSpacing ? 'none' : 'default',
         label: this.props.intl.formatMessage(messages.insertMenu),
@@ -824,9 +824,9 @@ 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
+        pluginInjectionApi: this.props.pluginInjectionApi,
+        isFullPageAppearance: isFullPageAppearance
       })), !((_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 */
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
       jsx("span", {

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/ElementBrowser/InsertMenu.js

@@ -28,7 +28,8 @@ var InsertMenu = function InsertMenu(_ref) {
     showElementBrowserLink = _ref.showElementBrowserLink,
     onInsert = _ref.onInsert,
     toggleVisiblity = _ref.toggleVisiblity,
-    pluginInjectionApi = _ref.pluginInjectionApi;
+    pluginInjectionApi = _ref.pluginInjectionApi,
+    isFullPageAppearance = _ref.isFullPageAppearance;
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     itemCount = _useState2[0],
@@ -64,7 +65,7 @@ var InsertMenu = function InsertMenu(_ref) {
     if (!editorView.hasFocus()) {
       editorView.focus();
     }
-    if (editorExperiment('insert-menu-in-right-rail', true)) {
+    if (isFullPageAppearance && editorExperiment('insert-menu-in-right-rail', true)) {
       var _pluginInjectionApi$q;
       pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$q = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q === void 0 || _pluginInjectionApi$q.actions.insertItem(item,
       // @ts-expect-error
@@ -73,7 +74,7 @@ var InsertMenu = function InsertMenu(_ref) {
       var _pluginInjectionApi$q2;
       pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$q2 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q2 === void 0 || _pluginInjectionApi$q2.actions.insertItem(item, INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
     }
-  }, [editorView, toggleVisiblity, pluginInjectionApi]);
+  }, [editorView, toggleVisiblity, pluginInjectionApi, isFullPageAppearance]);
   var getItems = useCallback(function (query, category) {
     var result;
     /**
@@ -94,9 +95,9 @@ var InsertMenu = function InsertMenu(_ref) {
         category: category,
         featuredItems: true,
         // @ts-ignore
-        templateItems: editorExperiment('element-level-templates', true)
+        templateItems: isFullPageAppearance && editorExperiment('element-level-templates', true)
       })) !== null && _pluginInjectionApi$q5 !== void 0 ? _pluginInjectionApi$q5 : [];
-      if (editorExperiment('element-level-templates', true)) {
+      if (isFullPageAppearance && editorExperiment('element-level-templates', true)) {
         // Make sure template options appear as top 5 items
         featuredQuickInsertSuggestions.sort(function (a, b) {
           var _b$priority, _a$priority;
@@ -110,12 +111,12 @@ var InsertMenu = function InsertMenu(_ref) {
     }
     setItemCount(result.length);
     return result;
-  }, [pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$q7 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q7 === void 0 ? void 0 : _pluginInjectionApi$q7.actions, quickInsertDropdownItems]);
+  }, [pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$q7 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q7 === void 0 ? void 0 : _pluginInjectionApi$q7.actions, quickInsertDropdownItems, isFullPageAppearance]);
   var emptyStateHandler = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$q8 = pluginInjectionApi.quickInsert) === null || _pluginInjectionApi$q8 === void 0 || (_pluginInjectionApi$q8 = _pluginInjectionApi$q8.sharedState.currentState()) === null || _pluginInjectionApi$q8 === void 0 ? void 0 : _pluginInjectionApi$q8.emptyStateHandler;
   return (
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
     jsx("div", {
-      css: insertMenuWrapper(itemCount)
+      css: insertMenuWrapper(itemCount, isFullPageAppearance)
     }, jsx(ElementBrowserWrapper, {
       handleClickOutside: toggleVisiblity,
       handleEscapeKeydown: toggleVisiblity,
@@ -159,8 +160,8 @@ var getInsertMenuHeight = function getInsertMenuHeight(_ref3) {
   }
   return 560; // For showing 6 Elements.
 };
-var insertMenuWrapper = function insertMenuWrapper(itemCount) {
-  if (editorExperiment('insert-menu-in-right-rail', true)) {
+var insertMenuWrapper = function insertMenuWrapper(itemCount, isFullPageAppearance) {
+  if (isFullPageAppearance && editorExperiment('insert-menu-in-right-rail', true)) {
     return css({
       display: 'flex',
       flexDirection: 'column',

package/dist/esm/ui/ElementRail/MainToolBarIcon.js

@@ -37,8 +37,19 @@ var buttonStyles = xcss({
     outline: "2px solid ".concat("var(--ds-border-focused, #388BFF)")
   }
 });
+var disabledStyles = xcss({
+  color: 'color.text.disabled',
+  backgroundColor: 'color.background.neutral',
+  ':hover': {
+    backgroundColor: 'color.background.neutral'
+  },
+  ':active': {
+    backgroundColor: 'color.background.neutral'
+  }
+});
 export var RightRailIcon = function RightRailIcon(_ref) {
-  var onClick = _ref.onClick;
+  var onClick = _ref.onClick,
+    isDisabled = _ref.isDisabled;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   return /*#__PURE__*/React.createElement(Box, {
@@ -53,8 +64,9 @@ export var RightRailIcon = function RightRailIcon(_ref) {
   }, /*#__PURE__*/React.createElement(Pressable, {
     type: "button",
     "aria-label": formatMessage(toolbarInsertBlockMessages.insertMenu),
-    xcss: [buttonStyles],
-    onClick: onClick
+    xcss: [buttonStyles, isDisabled ? disabledStyles : undefined],
+    onClick: onClick,
+    isDisabled: isDisabled
   }, /*#__PURE__*/React.createElement(EditorAddIcon, {
     label: formatMessage(toolbarInsertBlockMessages.insertMenu),
     size: "medium"

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

@@ -219,6 +219,7 @@ export var InsertMenuRail = function InsertMenuRail(_ref) {
     onInsert: onInsert,
     toggleVisiblity: function toggleVisiblity() {},
     showElementBrowserLink: true,
-    pluginInjectionApi: api
+    pluginInjectionApi: api,
+    isFullPageAppearance: true
   }));
 };

package/dist/esm/ui/ToolbarInsertBlock/block-insert-element-browser.js

@@ -19,7 +19,8 @@ export var BlockInsertElementBrowser = function BlockInsertElementBrowser(props)
     onInsert: props.onInsert,
     toggleVisiblity: props.togglePlusMenuVisibility,
     showElementBrowserLink: props.showElementBrowserLink,
-    pluginInjectionApi: props.pluginInjectionApi
+    pluginInjectionApi: props.pluginInjectionApi,
+    isFullPageAppearance: props.isFullPageAppearance
   })), /*#__PURE__*/React.createElement(DropDownButton, {
     "aria-expanded": props.open,
     "aria-haspopup": true,

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,24 @@ 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,
+    isFullPageAppearance: props.isFullPageAppearance
   });
 };

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,7 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
         _tableSelectorButton5,
         _tableSelectorButton6,
         _this$props$isDisable,
-        _this$props$replacePl,
+        _this$props$isDisable2,
         _this$props$pluginInj3;
       var _this$state2 = this.state,
         buttons = _this$state2.buttons,
@@ -696,6 +695,7 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
       } finally {
         _iterator.f();
       }
+      var isFullPageAppearance = ['full-page', 'full-width'].includes(editorAppearance !== null && editorAppearance !== void 0 ? editorAppearance : '');
       return (
         // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
         jsx("span", {
@@ -759,13 +759,14 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
           onKeyDown: this.handleTableSelectorOpenByKeyboard
         })), jsx("span", {
           css: wrapperStyle
-        }, this.renderPopup(), this.renderTableSelectorPopup(), editorExperiment('insert-menu-in-right-rail', true) && ['full-page', 'full-width'].includes(editorAppearance !== null && editorAppearance !== void 0 ? editorAppearance : '') ? jsx(RightRailIcon, {
-          onClick: this.handleClick
+        }, this.renderPopup(), this.renderTableSelectorPopup(), isFullPageAppearance && editorExperiment('insert-menu-in-right-rail', true) ? jsx(RightRailIcon, {
+          onClick: this.handleClick,
+          isDisabled: (_this$props$isDisable = this.props.isDisabled) !== null && _this$props$isDisable !== void 0 ? _this$props$isDisable : false
         }) : jsx(BlockInsertMenu, {
           popupsMountPoint: this.props.popupsMountPoint,
           popupsBoundariesElement: this.props.popupsBoundariesElement,
           popupsScrollableElement: this.props.popupsScrollableElement,
-          disabled: (_this$props$isDisable = this.props.isDisabled) !== null && _this$props$isDisable !== void 0 ? _this$props$isDisable : false,
+          disabled: (_this$props$isDisable2 = this.props.isDisabled) !== null && _this$props$isDisable2 !== void 0 ? _this$props$isDisable2 : false,
           editorView: this.props.editorView,
           spacing: this.props.isReducedSpacing ? 'none' : 'default',
           label: this.props.intl.formatMessage(messages.insertMenu),
@@ -780,9 +781,9 @@ 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
+          pluginInjectionApi: this.props.pluginInjectionApi,
+          isFullPageAppearance: isFullPageAppearance
         })), !((_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 */
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
         jsx("span", {
@@ -820,8 +821,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/ElementBrowser/InsertMenu.d.ts

@@ -1,4 +1,4 @@
 import { jsx } from '@emotion/react';
 import type { InsertMenuProps } from './types';
-declare const InsertMenu: ({ editorView, dropdownItems, showElementBrowserLink, onInsert, toggleVisiblity, pluginInjectionApi, }: InsertMenuProps) => jsx.JSX.Element;
+declare const InsertMenu: ({ editorView, dropdownItems, showElementBrowserLink, onInsert, toggleVisiblity, pluginInjectionApi, isFullPageAppearance, }: InsertMenuProps) => jsx.JSX.Element;
 export default InsertMenu;

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

@@ -12,6 +12,7 @@ export interface InsertMenuProps {
     toggleVisiblity: SimpleEventHandler<MouseEvent | KeyboardEvent>;
     onInsert: OnInsert;
     pluginInjectionApi: ExtractInjectionAPI<InsertBlockPlugin> | undefined;
+    isFullPageAppearance?: boolean;
 }
 export type SvgGetterParams = {
     name: string;

package/dist/types/ui/ElementRail/MainToolBarIcon.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 type Props = {
     onClick: () => void;
+    isDisabled: boolean;
 };
-export declare const RightRailIcon: ({ onClick }: Props) => JSX.Element;
+export declare const RightRailIcon: ({ onClick, isDisabled }: Props) => JSX.Element;
 export {};

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

@@ -23,6 +23,7 @@ export interface BlockInsertElementBrowserProps {
     onInsert: OnInsert;
     togglePlusMenuVisibility: SimpleEventHandler<MouseEvent | KeyboardEvent>;
     pluginInjectionApi: ExtractInjectionAPI<InsertBlockPlugin> | undefined;
+    isFullPageAppearance?: boolean;
 }
 export declare const BlockInsertElementBrowser: (props: BlockInsertElementBrowserProps) => JSX.Element;
 export {};

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;
@@ -29,5 +28,6 @@ export interface BlockInsertMenuProps {
     togglePlusMenuVisibility(): void;
     onKeyDown?: React.KeyboardEventHandler;
     pluginInjectionApi: ExtractInjectionAPI<InsertBlockPlugin> | undefined;
+    isFullPageAppearance?: boolean;
 }
 export declare const BlockInsertMenu: (props: BlockInsertMenuProps) => JSX.Element | null;

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/ElementBrowser/InsertMenu.d.ts

@@ -1,4 +1,4 @@
 import { jsx } from '@emotion/react';
 import type { InsertMenuProps } from './types';
-declare const InsertMenu: ({ editorView, dropdownItems, showElementBrowserLink, onInsert, toggleVisiblity, pluginInjectionApi, }: InsertMenuProps) => jsx.JSX.Element;
+declare const InsertMenu: ({ editorView, dropdownItems, showElementBrowserLink, onInsert, toggleVisiblity, pluginInjectionApi, isFullPageAppearance, }: InsertMenuProps) => jsx.JSX.Element;
 export default InsertMenu;

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

@@ -12,6 +12,7 @@ export interface InsertMenuProps {
     toggleVisiblity: SimpleEventHandler<MouseEvent | KeyboardEvent>;
     onInsert: OnInsert;
     pluginInjectionApi: ExtractInjectionAPI<InsertBlockPlugin> | undefined;
+    isFullPageAppearance?: boolean;
 }
 export type SvgGetterParams = {
     name: string;

package/dist/types-ts4.5/ui/ElementRail/MainToolBarIcon.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 type Props = {
     onClick: () => void;
+    isDisabled: boolean;
 };
-export declare const RightRailIcon: ({ onClick }: Props) => JSX.Element;
+export declare const RightRailIcon: ({ onClick, isDisabled }: Props) => JSX.Element;
 export {};

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

@@ -23,6 +23,7 @@ export interface BlockInsertElementBrowserProps {
     onInsert: OnInsert;
     togglePlusMenuVisibility: SimpleEventHandler<MouseEvent | KeyboardEvent>;
     pluginInjectionApi: ExtractInjectionAPI<InsertBlockPlugin> | undefined;
+    isFullPageAppearance?: boolean;
 }
 export declare const BlockInsertElementBrowser: (props: BlockInsertElementBrowserProps) => JSX.Element;
 export {};

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;
@@ -29,5 +28,6 @@ export interface BlockInsertMenuProps {
     togglePlusMenuVisibility(): void;
     onKeyDown?: React.KeyboardEventHandler;
     pluginInjectionApi: ExtractInjectionAPI<InsertBlockPlugin> | undefined;
+    isFullPageAppearance?: boolean;
 }
 export declare const BlockInsertMenu: (props: BlockInsertMenuProps) => JSX.Element | null;