@atlaskit/editor-plugin-insert-block 16.0.13 → 16.0.15

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-insert-block
 
+## 16.0.15
+
+### Patch Changes
+
+- [`b4c4cd8f205e4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b4c4cd8f205e4) -
+  Clean up experiment `platform_editor_prevent_toolbar_layout_shifts` and keep the enabled toolbar
+  layout behavior.
+- Updated dependencies
+
+## 16.0.14
+
+### Patch Changes
+
+- [`656801b9e097c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/656801b9e097c) -
+  VOLTC-331 - Migrate updated package usage in platform/editor: rewrite barrel imports of
+  voltCompliant provider packages to deep/subpath imports (consumer-side debarrel). No public API
+  changes.
+- Updated dependencies
+
 ## 16.0.13
 
 ### Patch Changes

package/dist/cjs/insertBlockPlugin.js

@@ -10,13 +10,11 @@ var _react = _interopRequireWildcard(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _elementBrowser = require("@atlaskit/editor-common/element-browser");
 var _hooks = require("@atlaskit/editor-common/hooks");
-var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _types = require("@atlaskit/editor-common/types");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _consts = require("@atlaskit/editor-plugin-block-type/consts");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _toolbarActionExperiences = require("./pm-plugins/experiences/toolbar-action-experiences");
 var _toggleInsertBlock = require("./pm-plugins/toggleInsertBlock");
 var _toolbarComponents = require("./ui/toolbar-components");
@@ -27,7 +25,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 
 var toolbarSizeToButtons = exports.toolbarSizeToButtons = function toolbarSizeToButtons(toolbarSize, appearance) {
   // Different button numbers for full-page to better match full page toolbar breakpoints
-  if (appearance === 'full-page' && (0, _platformFeatureFlags.fg)('platform_editor_toolbar_responsive_fixes')) {
+  if (appearance === 'full-page' && (0, _fg.fg)('platform_editor_toolbar_responsive_fixes')) {
     switch (toolbarSize) {
       case _types.ToolbarSize.XXL:
       case _types.ToolbarSize.XL:
@@ -39,7 +37,7 @@ var toolbarSizeToButtons = exports.toolbarSizeToButtons = function toolbarSizeTo
         return 0;
     }
   }
-  if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_responsive_fixes')) {
+  if ((0, _fg.fg)('platform_editor_toolbar_responsive_fixes')) {
     switch (toolbarSize) {
       case _types.ToolbarSize.XXL:
       case _types.ToolbarSize.XL:
@@ -123,55 +121,24 @@ var insertBlockPlugin = exports.insertBlockPlugin = function insertBlockPlugin(_
       isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
       isLastItem = _ref2.isLastItem;
     refs.popupsMountPoint = popupsMountPoint || undefined;
-    var renderNode = function renderNode(providers) {
-      if (!editorView) {
-        return null;
-      }
-      return /*#__PURE__*/_react.default.createElement(ToolbarInsertBlockWithInjectionApi, {
-        pluginInjectionApi: api,
-        editorView: editorView,
-        editorActions: editorActions,
-        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        providerFactory: providerFactory,
-        popupsMountPoint: popupsMountPoint,
-        popupsBoundariesElement: popupsBoundariesElement,
-        popupsScrollableElement: popupsScrollableElement,
-        toolbarSize: toolbarSize,
-        disabled: disabled,
-        isToolbarReducedSpacing: isToolbarReducedSpacing,
-        isLastItem: isLastItem,
-        providers: providers,
-        options: options,
-        appearance: options.appearance
-      });
-    };
-    if ((0, _experiments.editorExperiment)('platform_editor_prevent_toolbar_layout_shifts', true)) {
-      if (!editorView) {
-        return null;
-      }
-      return /*#__PURE__*/_react.default.createElement(ToolbarInsertBlockWithInjectionApi, {
-        pluginInjectionApi: api,
-        editorView: editorView,
-        editorActions: editorActions,
-        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        providerFactory: providerFactory,
-        popupsMountPoint: popupsMountPoint,
-        popupsBoundariesElement: popupsBoundariesElement,
-        popupsScrollableElement: popupsScrollableElement,
-        toolbarSize: toolbarSize,
-        disabled: disabled,
-        isToolbarReducedSpacing: isToolbarReducedSpacing,
-        isLastItem: isLastItem,
-        options: options,
-        appearance: options.appearance
-      });
+    if (!editorView) {
+      return null;
     }
-    return /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
-      providerFactory: providerFactory
-      // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
-      ,
-      providers: ['emojiProvider'],
-      renderNode: renderNode
+    return /*#__PURE__*/_react.default.createElement(ToolbarInsertBlockWithInjectionApi, {
+      pluginInjectionApi: api,
+      editorView: editorView,
+      editorActions: editorActions,
+      dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+      providerFactory: providerFactory,
+      popupsMountPoint: popupsMountPoint,
+      popupsBoundariesElement: popupsBoundariesElement,
+      popupsScrollableElement: popupsScrollableElement,
+      toolbarSize: toolbarSize,
+      disabled: disabled,
+      isToolbarReducedSpacing: isToolbarReducedSpacing,
+      isLastItem: isLastItem,
+      options: options,
+      appearance: options.appearance
     });
   };
   if (isToolbarAIFCEnabled) {
@@ -231,7 +198,7 @@ var insertBlockPlugin = exports.insertBlockPlugin = function insertBlockPlugin(_
           return (0, _toggleInsertBlock.toggleInsertBlockPmPlugin)();
         }
       });
-      if ((0, _platformFeatureFlags.fg)('platform_editor_experience_tracking_toolbar_button')) {
+      if ((0, _fg.fg)('platform_editor_experience_tracking_toolbar_button')) {
         plugins.push({
           name: 'toolbarActionExperiences',
           plugin: function plugin() {
@@ -252,9 +219,8 @@ var insertBlockPlugin = exports.insertBlockPlugin = function insertBlockPlugin(_
   return plugin;
 };
 var selector = function selector(states) {
-  var _states$emojiState, _states$mediaState, _states$mediaState2, _states$insertBlockSt, _states$typeAheadStat, _states$mentionState, _states$mentionState2, _states$dateState, _states$placeholderTe, _states$connectivityS, _states$imageUploadSt, _states$blockTypeStat, _states$hyperlinkStat, _states$hyperlinkStat2;
+  var _states$mediaState, _states$mediaState2, _states$insertBlockSt, _states$typeAheadStat, _states$mentionState, _states$mentionState2, _states$dateState, _states$placeholderTe, _states$connectivityS, _states$imageUploadSt, _states$blockTypeStat, _states$hyperlinkStat, _states$hyperlinkStat2;
   return {
-    emojiProviderSelector: (_states$emojiState = states.emojiState) === null || _states$emojiState === void 0 ? void 0 : _states$emojiState.emojiProvider,
     showMediaPicker: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.showMediaPicker,
     mediaAllowsUploads: (_states$mediaState2 = states.mediaState) === null || _states$mediaState2 === void 0 ? void 0 : _states$mediaState2.allowsUploads,
     showElementBrowser: (_states$insertBlockSt = states.insertBlockState) === null || _states$insertBlockSt === void 0 ? void 0 : _states$insertBlockSt.showElementBrowser,
@@ -287,7 +253,6 @@ function ToolbarInsertBlockWithInjectionApi(_ref4) {
     appearance = _ref4.appearance;
   var buttons = toolbarSizeToButtons(toolbarSize, appearance);
   var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention', 'emoji', 'blockType', 'media', 'typeAhead', 'placeholderText', 'insertBlock', 'connectivity'], selector),
-    emojiProviderSelector = _useSharedPluginState.emojiProviderSelector,
     showMediaPicker = _useSharedPluginState.showMediaPicker,
     mediaAllowsUploads = _useSharedPluginState.mediaAllowsUploads,
     showElementBrowser = _useSharedPluginState.showElementBrowser,
@@ -301,17 +266,7 @@ function ToolbarInsertBlockWithInjectionApi(_ref4) {
     availableWrapperBlockTypes = _useSharedPluginState.availableWrapperBlockTypes,
     canInsertLink = _useSharedPluginState.canInsertLink,
     activeLinkMark = _useSharedPluginState.activeLinkMark;
-  var emojiProviderPromise = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'emoji.emojiProviderPromise', {
-    disabled: !(0, _experiments.editorExperiment)('platform_editor_prevent_toolbar_layout_shifts', true)
-  });
-  var getEmojiProvider = function getEmojiProvider() {
-    if (emojiProviderSelector) {
-      return Promise.resolve(emojiProviderSelector);
-    }
-  };
-  var emojiProvider = (0, _experiments.editorExperiment)('platform_editor_prevent_toolbar_layout_shifts', true, {
-    exposure: true
-  }) ? emojiProviderPromise : getEmojiProvider();
+  var emojiProvider = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(pluginInjectionApi, 'emoji.emojiProviderPromise');
   var onShowMediaPicker = function onShowMediaPicker(mountInfo) {
     var _pluginInjectionApi$m, _pluginInjectionApi$c, _pluginInjectionApi$m2;
     if (!showMediaPicker) {

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

@@ -12,8 +12,7 @@ var _memoize = _interopRequireDefault(require("lodash/memoize"));
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _item = require("./item");
 var _shallowEquals = require("./shallow-equals");
 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; }
@@ -85,65 +84,33 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
       'aria-haspopup': 'dialog'
     }));
   }
-  if ((0, _experiments.editorExperiment)('platform_editor_prevent_toolbar_layout_shifts', true)) {
-    if (imageUploadSupported) {
-      items.push((0, _item.imageUpload)({
-        content: formatMessage(_messages.toolbarInsertBlockMessages.image),
-        disabled: !imageUploadEnabled || isOffline
-      }));
-    } else if (hasMediaPlugin) {
-      items.push((0, _item.media)({
-        content: formatMessage(_messages.toolbarInsertBlockMessages.addMediaFiles),
-        tooltipDescription: formatMessage(_messages.toolbarInsertBlockMessages.mediaFilesDescription),
-        disabled: isOffline || !mediaSupported || !mediaUploadsEnabled
-      }));
-    }
-    if (hasMentionsPlugin) {
-      items.push((0, _item.mention)({
-        content: formatMessage(_messages.toolbarInsertBlockMessages.mention),
-        tooltipDescription: formatMessage(_messages.toolbarInsertBlockMessages.mentionDescription),
-        disabled: !isTypeAheadAllowed || !!mentionsDisabled || !mentionsSupported,
-        'aria-haspopup': 'listbox'
-      }));
-    }
-    if (hasEmojiPlugin) {
-      items.push((0, _item.emoji)({
-        content: formatMessage(_messages.toolbarInsertBlockMessages.emoji),
-        tooltipDescription: formatMessage(_messages.toolbarInsertBlockMessages.emojiDescription),
-        disabled: emojiDisabled || !isTypeAheadAllowed || !emojiProvider,
-        'aria-haspopup': 'dialog'
-      }));
-    }
-  } else {
-    if (mediaSupported && mediaUploadsEnabled) {
-      items.push((0, _item.media)({
-        content: formatMessage(_messages.toolbarInsertBlockMessages.addMediaFiles),
-        tooltipDescription: formatMessage(_messages.toolbarInsertBlockMessages.mediaFilesDescription),
-        disabled: isOffline
-      }));
-    }
-    if (imageUploadSupported) {
-      items.push((0, _item.imageUpload)({
-        content: formatMessage(_messages.toolbarInsertBlockMessages.image),
-        disabled: !imageUploadEnabled || isOffline
-      }));
-    }
-    if (mentionsSupported) {
-      items.push((0, _item.mention)({
-        content: formatMessage(_messages.toolbarInsertBlockMessages.mention),
-        tooltipDescription: formatMessage(_messages.toolbarInsertBlockMessages.mentionDescription),
-        disabled: !isTypeAheadAllowed || !!mentionsDisabled,
-        'aria-haspopup': 'listbox'
-      }));
-    }
-    if (emojiProvider) {
-      items.push((0, _item.emoji)({
-        content: formatMessage(_messages.toolbarInsertBlockMessages.emoji),
-        tooltipDescription: formatMessage(_messages.toolbarInsertBlockMessages.emojiDescription),
-        disabled: emojiDisabled || !isTypeAheadAllowed,
-        'aria-haspopup': 'dialog'
-      }));
-    }
+  if (imageUploadSupported) {
+    items.push((0, _item.imageUpload)({
+      content: formatMessage(_messages.toolbarInsertBlockMessages.image),
+      disabled: !imageUploadEnabled || isOffline
+    }));
+  } else if (hasMediaPlugin) {
+    items.push((0, _item.media)({
+      content: formatMessage(_messages.toolbarInsertBlockMessages.addMediaFiles),
+      tooltipDescription: formatMessage(_messages.toolbarInsertBlockMessages.mediaFilesDescription),
+      disabled: isOffline || !mediaSupported || !mediaUploadsEnabled
+    }));
+  }
+  if (hasMentionsPlugin) {
+    items.push((0, _item.mention)({
+      content: formatMessage(_messages.toolbarInsertBlockMessages.mention),
+      tooltipDescription: formatMessage(_messages.toolbarInsertBlockMessages.mentionDescription),
+      disabled: !isTypeAheadAllowed || !!mentionsDisabled || !mentionsSupported,
+      'aria-haspopup': 'listbox'
+    }));
+  }
+  if (hasEmojiPlugin) {
+    items.push((0, _item.emoji)({
+      content: formatMessage(_messages.toolbarInsertBlockMessages.emoji),
+      tooltipDescription: formatMessage(_messages.toolbarInsertBlockMessages.emojiDescription),
+      disabled: emojiDisabled || !isTypeAheadAllowed || !emojiProvider,
+      'aria-haspopup': 'dialog'
+    }));
   }
   if (tableSupported) {
     items.push((0, _item.table)({
@@ -252,7 +219,7 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
   // correct downstream.
   var filteredItems = itemFilter ? items.filter(itemFilter) : items;
   var numButtonsAdjusted = numberOfButtons;
-  if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_responsive_fixes')) {
+  if ((0, _fg.fg)('platform_editor_toolbar_responsive_fixes')) {
     if (filteredItems.slice(0, numButtonsAdjusted).some(function (item) {
       return item.value.name === 'table selector';
     })) {

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

@@ -25,7 +25,7 @@ var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _picker = require("@atlaskit/emoji/picker");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _filterDropdownItems = require("../toolbar-components/hooks/filterDropdownItems");
 var _blockInsertMenu = require("./block-insert-menu");
@@ -130,7 +130,7 @@ var ToolbarInsertBlock = exports.ToolbarInsertBlock = /*#__PURE__*/function (_Re
     (0, _defineProperty2.default)(_this, "togglePlusMenuVisibility", function (event) {
       var isPlusMenuOpen = _this.state.isPlusMenuOpen;
       var pluginInjectionApi = _this.props.pluginInjectionApi;
-      if (pluginInjectionApi && (0, _platformFeatureFlags.fg)('platform_editor_ease_of_use_metrics')) {
+      if (pluginInjectionApi && (0, _fg.fg)('platform_editor_ease_of_use_metrics')) {
         pluginInjectionApi.core.actions.execute(function (_ref2) {
           var tr = _ref2.tr;
           if (isPlusMenuOpen) {

package/dist/cjs/ui/toolbar-components/EmojiButton.js

@@ -12,7 +12,6 @@ var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _useEmojiPickerPopup = require("./hooks/useEmojiPickerPopup");
 var _EmojiPickerPopup = require("./popups/EmojiPickerPopup");
 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); }
@@ -26,14 +25,12 @@ var EmojiButton = exports.EmojiButton = function EmojiButton(_ref) {
     popupsBoundariesElement = _useToolbarUI.popupsBoundariesElement,
     popupsScrollableElement = _useToolbarUI.popupsScrollableElement;
   var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['emoji', 'typeAhead'], function (states) {
-      var _states$emojiState, _states$emojiState2, _states$typeAheadStat;
+      var _states$emojiState, _states$typeAheadStat;
       return {
-        emojiProviderSelector: (_states$emojiState = states.emojiState) === null || _states$emojiState === void 0 ? void 0 : _states$emojiState.emojiProvider,
-        emojiProviderPromise: (_states$emojiState2 = states.emojiState) === null || _states$emojiState2 === void 0 ? void 0 : _states$emojiState2.emojiProviderPromise,
+        emojiProviderPromise: (_states$emojiState = states.emojiState) === null || _states$emojiState === void 0 ? void 0 : _states$emojiState.emojiProviderPromise,
         isTypeAheadAllowed: (_states$typeAheadStat = states.typeAheadState) === null || _states$typeAheadStat === void 0 ? void 0 : _states$typeAheadStat.isAllowed
       };
     }),
-    emojiProviderSelector = _useSharedPluginState.emojiProviderSelector,
     emojiProviderPromise = _useSharedPluginState.emojiProviderPromise,
     isTypeAheadAllowed = _useSharedPluginState.isTypeAheadAllowed;
   var emojiPickerPopup = (0, _useEmojiPickerPopup.useEmojiPickerPopup)({
@@ -43,16 +40,10 @@ var EmojiButton = exports.EmojiButton = function EmojiButton(_ref) {
   if (!(api !== null && api !== void 0 && api.emoji)) {
     return null;
   }
-  var getEmojiProvider = function getEmojiProvider() {
-    if (emojiProviderSelector) {
-      return Promise.resolve(emojiProviderSelector);
-    }
-  };
-  var emojiProvider = (0, _expValEquals.expValEquals)('platform_editor_prevent_toolbar_layout_shifts', 'isEnabled', true) ? emojiProviderPromise : getEmojiProvider();
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_EmojiPickerPopup.EmojiPickerPopup, {
     isOpen: emojiPickerPopup.isOpen,
     targetRef: emojiButtonRef,
-    emojiProvider: emojiProvider,
+    emojiProvider: emojiProviderPromise,
     onSelection: emojiPickerPopup.handleSelectedEmoji,
     onClickOutside: emojiPickerPopup.handleClickOutside,
     onEscapeKeydown: emojiPickerPopup.handleEscapeKeydown,
@@ -78,7 +69,7 @@ var EmojiButton = exports.EmojiButton = function EmojiButton(_ref) {
       return emojiPickerPopup.toggle();
     },
     isSelected: emojiPickerPopup.isOpen,
-    isDisabled: !isTypeAheadAllowed || !emojiProvider,
+    isDisabled: !isTypeAheadAllowed || !emojiProviderPromise,
     testId: _toolbar.TOOLBAR_BUTTON_TEST_ID.EMOJI
   })));
 };

package/dist/es2019/insertBlockPlugin.js

@@ -2,13 +2,11 @@ import React, { useEffect } from 'react';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { ElementBrowser } from '@atlaskit/editor-common/element-browser';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { BLOCK_QUOTE, CODE_BLOCK, PANEL } from '@atlaskit/editor-plugin-block-type/consts';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { getToolbarActionExperiencesPlugin } from './pm-plugins/experiences/toolbar-action-experiences';
 import { toggleInsertBlockPmKey, toggleInsertBlockPmPlugin } from './pm-plugins/toggleInsertBlock';
 import { getToolbarComponents } from './ui/toolbar-components';
@@ -108,55 +106,24 @@ export const insertBlockPlugin = ({
     isLastItem
   }) => {
     refs.popupsMountPoint = popupsMountPoint || undefined;
-    const renderNode = providers => {
-      if (!editorView) {
-        return null;
-      }
-      return /*#__PURE__*/React.createElement(ToolbarInsertBlockWithInjectionApi, {
-        pluginInjectionApi: api,
-        editorView: editorView,
-        editorActions: editorActions,
-        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        providerFactory: providerFactory,
-        popupsMountPoint: popupsMountPoint,
-        popupsBoundariesElement: popupsBoundariesElement,
-        popupsScrollableElement: popupsScrollableElement,
-        toolbarSize: toolbarSize,
-        disabled: disabled,
-        isToolbarReducedSpacing: isToolbarReducedSpacing,
-        isLastItem: isLastItem,
-        providers: providers,
-        options: options,
-        appearance: options.appearance
-      });
-    };
-    if (editorExperiment('platform_editor_prevent_toolbar_layout_shifts', true)) {
-      if (!editorView) {
-        return null;
-      }
-      return /*#__PURE__*/React.createElement(ToolbarInsertBlockWithInjectionApi, {
-        pluginInjectionApi: api,
-        editorView: editorView,
-        editorActions: editorActions,
-        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        providerFactory: providerFactory,
-        popupsMountPoint: popupsMountPoint,
-        popupsBoundariesElement: popupsBoundariesElement,
-        popupsScrollableElement: popupsScrollableElement,
-        toolbarSize: toolbarSize,
-        disabled: disabled,
-        isToolbarReducedSpacing: isToolbarReducedSpacing,
-        isLastItem: isLastItem,
-        options: options,
-        appearance: options.appearance
-      });
+    if (!editorView) {
+      return null;
     }
-    return /*#__PURE__*/React.createElement(WithProviders, {
-      providerFactory: providerFactory
-      // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
-      ,
-      providers: ['emojiProvider'],
-      renderNode: renderNode
+    return /*#__PURE__*/React.createElement(ToolbarInsertBlockWithInjectionApi, {
+      pluginInjectionApi: api,
+      editorView: editorView,
+      editorActions: editorActions,
+      dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+      providerFactory: providerFactory,
+      popupsMountPoint: popupsMountPoint,
+      popupsBoundariesElement: popupsBoundariesElement,
+      popupsScrollableElement: popupsScrollableElement,
+      toolbarSize: toolbarSize,
+      disabled: disabled,
+      isToolbarReducedSpacing: isToolbarReducedSpacing,
+      isLastItem: isLastItem,
+      options: options,
+      appearance: options.appearance
     });
   };
   if (isToolbarAIFCEnabled) {
@@ -234,9 +201,8 @@ export const insertBlockPlugin = ({
   return plugin;
 };
 const selector = states => {
-  var _states$emojiState, _states$mediaState, _states$mediaState2, _states$insertBlockSt, _states$typeAheadStat, _states$mentionState, _states$mentionState2, _states$dateState, _states$placeholderTe, _states$connectivityS, _states$imageUploadSt, _states$blockTypeStat, _states$hyperlinkStat, _states$hyperlinkStat2;
+  var _states$mediaState, _states$mediaState2, _states$insertBlockSt, _states$typeAheadStat, _states$mentionState, _states$mentionState2, _states$dateState, _states$placeholderTe, _states$connectivityS, _states$imageUploadSt, _states$blockTypeStat, _states$hyperlinkStat, _states$hyperlinkStat2;
   return {
-    emojiProviderSelector: (_states$emojiState = states.emojiState) === null || _states$emojiState === void 0 ? void 0 : _states$emojiState.emojiProvider,
     showMediaPicker: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.showMediaPicker,
     mediaAllowsUploads: (_states$mediaState2 = states.mediaState) === null || _states$mediaState2 === void 0 ? void 0 : _states$mediaState2.allowsUploads,
     showElementBrowser: (_states$insertBlockSt = states.insertBlockState) === null || _states$insertBlockSt === void 0 ? void 0 : _states$insertBlockSt.showElementBrowser,
@@ -270,7 +236,6 @@ function ToolbarInsertBlockWithInjectionApi({
   var _pluginInjectionApi$i, _pluginInjectionApi$c2, _pluginInjectionApi$p, _pluginInjectionApi$b, _pluginInjectionApi$e;
   const buttons = toolbarSizeToButtons(toolbarSize, appearance);
   const {
-    emojiProviderSelector,
     showMediaPicker,
     mediaAllowsUploads,
     showElementBrowser,
@@ -285,17 +250,7 @@ function ToolbarInsertBlockWithInjectionApi({
     canInsertLink,
     activeLinkMark
   } = useSharedPluginStateWithSelector(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention', 'emoji', 'blockType', 'media', 'typeAhead', 'placeholderText', 'insertBlock', 'connectivity'], selector);
-  const emojiProviderPromise = useSharedPluginStateSelector(pluginInjectionApi, 'emoji.emojiProviderPromise', {
-    disabled: !editorExperiment('platform_editor_prevent_toolbar_layout_shifts', true)
-  });
-  const getEmojiProvider = () => {
-    if (emojiProviderSelector) {
-      return Promise.resolve(emojiProviderSelector);
-    }
-  };
-  const emojiProvider = editorExperiment('platform_editor_prevent_toolbar_layout_shifts', true, {
-    exposure: true
-  }) ? emojiProviderPromise : getEmojiProvider();
+  const emojiProvider = useSharedPluginStateSelector(pluginInjectionApi, 'emoji.emojiProviderPromise');
   const onShowMediaPicker = mountInfo => {
     var _pluginInjectionApi$m, _pluginInjectionApi$c, _pluginInjectionApi$m2;
     if (!showMediaPicker) {

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

@@ -3,8 +3,7 @@ import memoize from 'lodash/memoize';
 import memoizeOne from 'memoize-one';
 import { ToolTipContent } from '@atlaskit/editor-common/keymaps';
 import { blockTypeMessages, toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { action, blockquote, codeblock, date, decision, emoji, expand, horizontalrule, imageUpload, layout, link, media, mention, panel, placeholder, status, table, tableSelector } from './item';
 import { shallowEquals } from './shallow-equals';
 const buttonToItem = memoize(button => ({
@@ -72,65 +71,33 @@ const createInsertBlockItems = config => {
       'aria-haspopup': 'dialog'
     }));
   }
-  if (editorExperiment('platform_editor_prevent_toolbar_layout_shifts', true)) {
-    if (imageUploadSupported) {
-      items.push(imageUpload({
-        content: formatMessage(messages.image),
-        disabled: !imageUploadEnabled || isOffline
-      }));
-    } else if (hasMediaPlugin) {
-      items.push(media({
-        content: formatMessage(messages.addMediaFiles),
-        tooltipDescription: formatMessage(messages.mediaFilesDescription),
-        disabled: isOffline || !mediaSupported || !mediaUploadsEnabled
-      }));
-    }
-    if (hasMentionsPlugin) {
-      items.push(mention({
-        content: formatMessage(messages.mention),
-        tooltipDescription: formatMessage(messages.mentionDescription),
-        disabled: !isTypeAheadAllowed || !!mentionsDisabled || !mentionsSupported,
-        'aria-haspopup': 'listbox'
-      }));
-    }
-    if (hasEmojiPlugin) {
-      items.push(emoji({
-        content: formatMessage(messages.emoji),
-        tooltipDescription: formatMessage(messages.emojiDescription),
-        disabled: emojiDisabled || !isTypeAheadAllowed || !emojiProvider,
-        'aria-haspopup': 'dialog'
-      }));
-    }
-  } else {
-    if (mediaSupported && mediaUploadsEnabled) {
-      items.push(media({
-        content: formatMessage(messages.addMediaFiles),
-        tooltipDescription: formatMessage(messages.mediaFilesDescription),
-        disabled: isOffline
-      }));
-    }
-    if (imageUploadSupported) {
-      items.push(imageUpload({
-        content: formatMessage(messages.image),
-        disabled: !imageUploadEnabled || isOffline
-      }));
-    }
-    if (mentionsSupported) {
-      items.push(mention({
-        content: formatMessage(messages.mention),
-        tooltipDescription: formatMessage(messages.mentionDescription),
-        disabled: !isTypeAheadAllowed || !!mentionsDisabled,
-        'aria-haspopup': 'listbox'
-      }));
-    }
-    if (emojiProvider) {
-      items.push(emoji({
-        content: formatMessage(messages.emoji),
-        tooltipDescription: formatMessage(messages.emojiDescription),
-        disabled: emojiDisabled || !isTypeAheadAllowed,
-        'aria-haspopup': 'dialog'
-      }));
-    }
+  if (imageUploadSupported) {
+    items.push(imageUpload({
+      content: formatMessage(messages.image),
+      disabled: !imageUploadEnabled || isOffline
+    }));
+  } else if (hasMediaPlugin) {
+    items.push(media({
+      content: formatMessage(messages.addMediaFiles),
+      tooltipDescription: formatMessage(messages.mediaFilesDescription),
+      disabled: isOffline || !mediaSupported || !mediaUploadsEnabled
+    }));
+  }
+  if (hasMentionsPlugin) {
+    items.push(mention({
+      content: formatMessage(messages.mention),
+      tooltipDescription: formatMessage(messages.mentionDescription),
+      disabled: !isTypeAheadAllowed || !!mentionsDisabled || !mentionsSupported,
+      'aria-haspopup': 'listbox'
+    }));
+  }
+  if (hasEmojiPlugin) {
+    items.push(emoji({
+      content: formatMessage(messages.emoji),
+      tooltipDescription: formatMessage(messages.emojiDescription),
+      disabled: emojiDisabled || !isTypeAheadAllowed || !emojiProvider,
+      'aria-haspopup': 'dialog'
+    }));
   }
   if (tableSupported) {
     items.push(table({

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

@@ -20,7 +20,7 @@ import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
 import { EmojiPicker as AkEmojiPicker } from '@atlaskit/emoji/picker';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
-import { fg } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { LINK_BUTTON_KEY } from '../toolbar-components/hooks/filterDropdownItems';
 import { BlockInsertMenu } from './block-insert-menu';

package/dist/es2019/ui/toolbar-components/EmojiButton.js

@@ -5,7 +5,6 @@ import { ToolTipContent, insertEmoji } from '@atlaskit/editor-common/keymaps';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar';
 import { ToolbarButton, ToolbarTooltip, EmojiIcon, useToolbarUI } from '@atlaskit/editor-toolbar';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { useEmojiPickerPopup } from './hooks/useEmojiPickerPopup';
 import { EmojiPickerPopup } from './popups/EmojiPickerPopup';
 export const EmojiButton = ({
@@ -21,14 +20,12 @@ export const EmojiButton = ({
     popupsScrollableElement
   } = useToolbarUI();
   const {
-    emojiProviderSelector,
     emojiProviderPromise,
     isTypeAheadAllowed
   } = useSharedPluginStateWithSelector(api, ['emoji', 'typeAhead'], states => {
-    var _states$emojiState, _states$emojiState2, _states$typeAheadStat;
+    var _states$emojiState, _states$typeAheadStat;
     return {
-      emojiProviderSelector: (_states$emojiState = states.emojiState) === null || _states$emojiState === void 0 ? void 0 : _states$emojiState.emojiProvider,
-      emojiProviderPromise: (_states$emojiState2 = states.emojiState) === null || _states$emojiState2 === void 0 ? void 0 : _states$emojiState2.emojiProviderPromise,
+      emojiProviderPromise: (_states$emojiState = states.emojiState) === null || _states$emojiState === void 0 ? void 0 : _states$emojiState.emojiProviderPromise,
       isTypeAheadAllowed: (_states$typeAheadStat = states.typeAheadState) === null || _states$typeAheadStat === void 0 ? void 0 : _states$typeAheadStat.isAllowed
     };
   });
@@ -39,16 +36,10 @@ export const EmojiButton = ({
   if (!(api !== null && api !== void 0 && api.emoji)) {
     return null;
   }
-  const getEmojiProvider = () => {
-    if (emojiProviderSelector) {
-      return Promise.resolve(emojiProviderSelector);
-    }
-  };
-  const emojiProvider = expValEquals('platform_editor_prevent_toolbar_layout_shifts', 'isEnabled', true) ? emojiProviderPromise : getEmojiProvider();
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EmojiPickerPopup, {
     isOpen: emojiPickerPopup.isOpen,
     targetRef: emojiButtonRef,
-    emojiProvider: emojiProvider,
+    emojiProvider: emojiProviderPromise,
     onSelection: emojiPickerPopup.handleSelectedEmoji,
     onClickOutside: emojiPickerPopup.handleClickOutside,
     onEscapeKeydown: emojiPickerPopup.handleEscapeKeydown,
@@ -72,7 +63,7 @@ export const EmojiButton = ({
     ,
     onClick: () => emojiPickerPopup.toggle(),
     isSelected: emojiPickerPopup.isOpen,
-    isDisabled: !isTypeAheadAllowed || !emojiProvider,
+    isDisabled: !isTypeAheadAllowed || !emojiProviderPromise,
     testId: TOOLBAR_BUTTON_TEST_ID.EMOJI
   })));
 };

package/dist/esm/insertBlockPlugin.js

@@ -2,13 +2,11 @@ import React, { useEffect } from 'react';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { ElementBrowser } from '@atlaskit/editor-common/element-browser';
 import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
-import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { BLOCK_QUOTE, CODE_BLOCK, PANEL } from '@atlaskit/editor-plugin-block-type/consts';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { getToolbarActionExperiencesPlugin } from './pm-plugins/experiences/toolbar-action-experiences';
 import { toggleInsertBlockPmKey, toggleInsertBlockPmPlugin } from './pm-plugins/toggleInsertBlock';
 import { getToolbarComponents } from './ui/toolbar-components';
@@ -113,55 +111,24 @@ export var insertBlockPlugin = function insertBlockPlugin(_ref) {
       isToolbarReducedSpacing = _ref2.isToolbarReducedSpacing,
       isLastItem = _ref2.isLastItem;
     refs.popupsMountPoint = popupsMountPoint || undefined;
-    var renderNode = function renderNode(providers) {
-      if (!editorView) {
-        return null;
-      }
-      return /*#__PURE__*/React.createElement(ToolbarInsertBlockWithInjectionApi, {
-        pluginInjectionApi: api,
-        editorView: editorView,
-        editorActions: editorActions,
-        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        providerFactory: providerFactory,
-        popupsMountPoint: popupsMountPoint,
-        popupsBoundariesElement: popupsBoundariesElement,
-        popupsScrollableElement: popupsScrollableElement,
-        toolbarSize: toolbarSize,
-        disabled: disabled,
-        isToolbarReducedSpacing: isToolbarReducedSpacing,
-        isLastItem: isLastItem,
-        providers: providers,
-        options: options,
-        appearance: options.appearance
-      });
-    };
-    if (editorExperiment('platform_editor_prevent_toolbar_layout_shifts', true)) {
-      if (!editorView) {
-        return null;
-      }
-      return /*#__PURE__*/React.createElement(ToolbarInsertBlockWithInjectionApi, {
-        pluginInjectionApi: api,
-        editorView: editorView,
-        editorActions: editorActions,
-        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-        providerFactory: providerFactory,
-        popupsMountPoint: popupsMountPoint,
-        popupsBoundariesElement: popupsBoundariesElement,
-        popupsScrollableElement: popupsScrollableElement,
-        toolbarSize: toolbarSize,
-        disabled: disabled,
-        isToolbarReducedSpacing: isToolbarReducedSpacing,
-        isLastItem: isLastItem,
-        options: options,
-        appearance: options.appearance
-      });
+    if (!editorView) {
+      return null;
     }
-    return /*#__PURE__*/React.createElement(WithProviders, {
-      providerFactory: providerFactory
-      // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
-      ,
-      providers: ['emojiProvider'],
-      renderNode: renderNode
+    return /*#__PURE__*/React.createElement(ToolbarInsertBlockWithInjectionApi, {
+      pluginInjectionApi: api,
+      editorView: editorView,
+      editorActions: editorActions,
+      dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+      providerFactory: providerFactory,
+      popupsMountPoint: popupsMountPoint,
+      popupsBoundariesElement: popupsBoundariesElement,
+      popupsScrollableElement: popupsScrollableElement,
+      toolbarSize: toolbarSize,
+      disabled: disabled,
+      isToolbarReducedSpacing: isToolbarReducedSpacing,
+      isLastItem: isLastItem,
+      options: options,
+      appearance: options.appearance
     });
   };
   if (isToolbarAIFCEnabled) {
@@ -242,9 +209,8 @@ export var insertBlockPlugin = function insertBlockPlugin(_ref) {
   return plugin;
 };
 var selector = function selector(states) {
-  var _states$emojiState, _states$mediaState, _states$mediaState2, _states$insertBlockSt, _states$typeAheadStat, _states$mentionState, _states$mentionState2, _states$dateState, _states$placeholderTe, _states$connectivityS, _states$imageUploadSt, _states$blockTypeStat, _states$hyperlinkStat, _states$hyperlinkStat2;
+  var _states$mediaState, _states$mediaState2, _states$insertBlockSt, _states$typeAheadStat, _states$mentionState, _states$mentionState2, _states$dateState, _states$placeholderTe, _states$connectivityS, _states$imageUploadSt, _states$blockTypeStat, _states$hyperlinkStat, _states$hyperlinkStat2;
   return {
-    emojiProviderSelector: (_states$emojiState = states.emojiState) === null || _states$emojiState === void 0 ? void 0 : _states$emojiState.emojiProvider,
     showMediaPicker: (_states$mediaState = states.mediaState) === null || _states$mediaState === void 0 ? void 0 : _states$mediaState.showMediaPicker,
     mediaAllowsUploads: (_states$mediaState2 = states.mediaState) === null || _states$mediaState2 === void 0 ? void 0 : _states$mediaState2.allowsUploads,
     showElementBrowser: (_states$insertBlockSt = states.insertBlockState) === null || _states$insertBlockSt === void 0 ? void 0 : _states$insertBlockSt.showElementBrowser,
@@ -277,7 +243,6 @@ function ToolbarInsertBlockWithInjectionApi(_ref4) {
     appearance = _ref4.appearance;
   var buttons = toolbarSizeToButtons(toolbarSize, appearance);
   var _useSharedPluginState = useSharedPluginStateWithSelector(pluginInjectionApi, ['hyperlink', 'date', 'imageUpload', 'mention', 'emoji', 'blockType', 'media', 'typeAhead', 'placeholderText', 'insertBlock', 'connectivity'], selector),
-    emojiProviderSelector = _useSharedPluginState.emojiProviderSelector,
     showMediaPicker = _useSharedPluginState.showMediaPicker,
     mediaAllowsUploads = _useSharedPluginState.mediaAllowsUploads,
     showElementBrowser = _useSharedPluginState.showElementBrowser,
@@ -291,17 +256,7 @@ function ToolbarInsertBlockWithInjectionApi(_ref4) {
     availableWrapperBlockTypes = _useSharedPluginState.availableWrapperBlockTypes,
     canInsertLink = _useSharedPluginState.canInsertLink,
     activeLinkMark = _useSharedPluginState.activeLinkMark;
-  var emojiProviderPromise = useSharedPluginStateSelector(pluginInjectionApi, 'emoji.emojiProviderPromise', {
-    disabled: !editorExperiment('platform_editor_prevent_toolbar_layout_shifts', true)
-  });
-  var getEmojiProvider = function getEmojiProvider() {
-    if (emojiProviderSelector) {
-      return Promise.resolve(emojiProviderSelector);
-    }
-  };
-  var emojiProvider = editorExperiment('platform_editor_prevent_toolbar_layout_shifts', true, {
-    exposure: true
-  }) ? emojiProviderPromise : getEmojiProvider();
+  var emojiProvider = useSharedPluginStateSelector(pluginInjectionApi, 'emoji.emojiProviderPromise');
   var onShowMediaPicker = function onShowMediaPicker(mountInfo) {
     var _pluginInjectionApi$m, _pluginInjectionApi$c, _pluginInjectionApi$m2;
     if (!showMediaPicker) {

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

@@ -7,8 +7,7 @@ import memoize from 'lodash/memoize';
 import memoizeOne from 'memoize-one';
 import { ToolTipContent } from '@atlaskit/editor-common/keymaps';
 import { blockTypeMessages, toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { action, blockquote, codeblock, date, decision, emoji, expand, horizontalrule, imageUpload, layout, link, media, mention, panel, placeholder, status, table, tableSelector } from './item';
 import { shallowEquals } from './shallow-equals';
 var buttonToItem = memoize(function (button) {
@@ -78,65 +77,33 @@ var createInsertBlockItems = function createInsertBlockItems(config) {
       'aria-haspopup': 'dialog'
     }));
   }
-  if (editorExperiment('platform_editor_prevent_toolbar_layout_shifts', true)) {
-    if (imageUploadSupported) {
-      items.push(imageUpload({
-        content: formatMessage(messages.image),
-        disabled: !imageUploadEnabled || isOffline
-      }));
-    } else if (hasMediaPlugin) {
-      items.push(media({
-        content: formatMessage(messages.addMediaFiles),
-        tooltipDescription: formatMessage(messages.mediaFilesDescription),
-        disabled: isOffline || !mediaSupported || !mediaUploadsEnabled
-      }));
-    }
-    if (hasMentionsPlugin) {
-      items.push(mention({
-        content: formatMessage(messages.mention),
-        tooltipDescription: formatMessage(messages.mentionDescription),
-        disabled: !isTypeAheadAllowed || !!mentionsDisabled || !mentionsSupported,
-        'aria-haspopup': 'listbox'
-      }));
-    }
-    if (hasEmojiPlugin) {
-      items.push(emoji({
-        content: formatMessage(messages.emoji),
-        tooltipDescription: formatMessage(messages.emojiDescription),
-        disabled: emojiDisabled || !isTypeAheadAllowed || !emojiProvider,
-        'aria-haspopup': 'dialog'
-      }));
-    }
-  } else {
-    if (mediaSupported && mediaUploadsEnabled) {
-      items.push(media({
-        content: formatMessage(messages.addMediaFiles),
-        tooltipDescription: formatMessage(messages.mediaFilesDescription),
-        disabled: isOffline
-      }));
-    }
-    if (imageUploadSupported) {
-      items.push(imageUpload({
-        content: formatMessage(messages.image),
-        disabled: !imageUploadEnabled || isOffline
-      }));
-    }
-    if (mentionsSupported) {
-      items.push(mention({
-        content: formatMessage(messages.mention),
-        tooltipDescription: formatMessage(messages.mentionDescription),
-        disabled: !isTypeAheadAllowed || !!mentionsDisabled,
-        'aria-haspopup': 'listbox'
-      }));
-    }
-    if (emojiProvider) {
-      items.push(emoji({
-        content: formatMessage(messages.emoji),
-        tooltipDescription: formatMessage(messages.emojiDescription),
-        disabled: emojiDisabled || !isTypeAheadAllowed,
-        'aria-haspopup': 'dialog'
-      }));
-    }
+  if (imageUploadSupported) {
+    items.push(imageUpload({
+      content: formatMessage(messages.image),
+      disabled: !imageUploadEnabled || isOffline
+    }));
+  } else if (hasMediaPlugin) {
+    items.push(media({
+      content: formatMessage(messages.addMediaFiles),
+      tooltipDescription: formatMessage(messages.mediaFilesDescription),
+      disabled: isOffline || !mediaSupported || !mediaUploadsEnabled
+    }));
+  }
+  if (hasMentionsPlugin) {
+    items.push(mention({
+      content: formatMessage(messages.mention),
+      tooltipDescription: formatMessage(messages.mentionDescription),
+      disabled: !isTypeAheadAllowed || !!mentionsDisabled || !mentionsSupported,
+      'aria-haspopup': 'listbox'
+    }));
+  }
+  if (hasEmojiPlugin) {
+    items.push(emoji({
+      content: formatMessage(messages.emoji),
+      tooltipDescription: formatMessage(messages.emojiDescription),
+      disabled: emojiDisabled || !isTypeAheadAllowed || !emojiProvider,
+      'aria-haspopup': 'dialog'
+    }));
   }
   if (tableSupported) {
     items.push(table({

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

@@ -35,7 +35,7 @@ import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
 import { EmojiPicker as AkEmojiPicker } from '@atlaskit/emoji/picker';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
-import { fg } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { LINK_BUTTON_KEY } from '../toolbar-components/hooks/filterDropdownItems';
 import { BlockInsertMenu } from './block-insert-menu';

package/dist/esm/ui/toolbar-components/EmojiButton.js

@@ -5,7 +5,6 @@ import { ToolTipContent, insertEmoji } from '@atlaskit/editor-common/keymaps';
 import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
 import { TOOLBAR_BUTTON_TEST_ID } from '@atlaskit/editor-common/toolbar';
 import { ToolbarButton, ToolbarTooltip, EmojiIcon, useToolbarUI } from '@atlaskit/editor-toolbar';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { useEmojiPickerPopup } from './hooks/useEmojiPickerPopup';
 import { EmojiPickerPopup } from './popups/EmojiPickerPopup';
 export var EmojiButton = function EmojiButton(_ref) {
@@ -18,14 +17,12 @@ export var EmojiButton = function EmojiButton(_ref) {
     popupsBoundariesElement = _useToolbarUI.popupsBoundariesElement,
     popupsScrollableElement = _useToolbarUI.popupsScrollableElement;
   var _useSharedPluginState = useSharedPluginStateWithSelector(api, ['emoji', 'typeAhead'], function (states) {
-      var _states$emojiState, _states$emojiState2, _states$typeAheadStat;
+      var _states$emojiState, _states$typeAheadStat;
       return {
-        emojiProviderSelector: (_states$emojiState = states.emojiState) === null || _states$emojiState === void 0 ? void 0 : _states$emojiState.emojiProvider,
-        emojiProviderPromise: (_states$emojiState2 = states.emojiState) === null || _states$emojiState2 === void 0 ? void 0 : _states$emojiState2.emojiProviderPromise,
+        emojiProviderPromise: (_states$emojiState = states.emojiState) === null || _states$emojiState === void 0 ? void 0 : _states$emojiState.emojiProviderPromise,
         isTypeAheadAllowed: (_states$typeAheadStat = states.typeAheadState) === null || _states$typeAheadStat === void 0 ? void 0 : _states$typeAheadStat.isAllowed
       };
     }),
-    emojiProviderSelector = _useSharedPluginState.emojiProviderSelector,
     emojiProviderPromise = _useSharedPluginState.emojiProviderPromise,
     isTypeAheadAllowed = _useSharedPluginState.isTypeAheadAllowed;
   var emojiPickerPopup = useEmojiPickerPopup({
@@ -35,16 +32,10 @@ export var EmojiButton = function EmojiButton(_ref) {
   if (!(api !== null && api !== void 0 && api.emoji)) {
     return null;
   }
-  var getEmojiProvider = function getEmojiProvider() {
-    if (emojiProviderSelector) {
-      return Promise.resolve(emojiProviderSelector);
-    }
-  };
-  var emojiProvider = expValEquals('platform_editor_prevent_toolbar_layout_shifts', 'isEnabled', true) ? emojiProviderPromise : getEmojiProvider();
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EmojiPickerPopup, {
     isOpen: emojiPickerPopup.isOpen,
     targetRef: emojiButtonRef,
-    emojiProvider: emojiProvider,
+    emojiProvider: emojiProviderPromise,
     onSelection: emojiPickerPopup.handleSelectedEmoji,
     onClickOutside: emojiPickerPopup.handleClickOutside,
     onEscapeKeydown: emojiPickerPopup.handleEscapeKeydown,
@@ -70,7 +61,7 @@ export var EmojiButton = function EmojiButton(_ref) {
       return emojiPickerPopup.toggle();
     },
     isSelected: emojiPickerPopup.isOpen,
-    isDisabled: !isTypeAheadAllowed || !emojiProvider,
+    isDisabled: !isTypeAheadAllowed || !emojiProviderPromise,
     testId: TOOLBAR_BUTTON_TEST_ID.EMOJI
   })));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-insert-block",
-	"version": "16.0.13",
+	"version": "16.0.15",
 	"description": "Insert block plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -56,7 +56,7 @@
 		"@atlaskit/icon": "^37.5.0",
 		"@atlaskit/icon-lab": "^7.7.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^159.0.0",
+		"@atlaskit/tmp-editor-statsig": "^160.0.0",
 		"@atlaskit/tokens": "^16.8.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",