@atlaskit/editor-plugin-toolbar 4.0.5 → 4.0.7

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-toolbar
 
+## 4.0.7
+
+### Patch Changes
+
+- [`e1361a964ccd9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e1361a964ccd9) -
+  Clean up platform_editor_toolbar_aifc_placement_config feature flag
+- Updated dependencies
+
+## 4.0.6
+
+### Patch Changes
+
+- [`c9c11b2544f4e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c9c11b2544f4e) -
+  Remove platform_editor_toolbar_aifc_template_editor feature flag
+- Updated dependencies
+
 ## 4.0.5
 
 ### Patch Changes

package/dist/cjs/toolbarPlugin.js

@@ -83,7 +83,7 @@ var toolbarPlugin = exports.toolbarPlugin = function toolbarPlugin(_ref) {
     contextualFormattingEnabled = _config$contextualFor === void 0 ? 'always-pinned' : _config$contextualFor,
     breakpointPreset = config.breakpointPreset;
   var registry = (0, _editorToolbarModel.createComponentRegistry)();
-  registry.register((0, _toolbarComponents.getToolbarComponents)(contextualFormattingEnabled, api, disableSelectionToolbar, breakpointPreset));
+  registry.register((0, _toolbarComponents.getToolbarComponents)(contextualFormattingEnabled, api, breakpointPreset));
   var cachedCalculateToolbarPosition = (0, _expValEquals.expValEquals)('platform_editor_sel_toolbar_fix', 'isEnabled', true) ? (0, _utils.calculateToolbarPositionTrackHead)(_consts.SELECTION_TOOLBAR_LABEL) : undefined;
   return {
     name: 'toolbar',

package/dist/cjs/ui/Section.js

@@ -12,20 +12,10 @@ var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var shouldShowSection = function shouldShowSection(editMode, toolbar, toolbarDocking, contextualFormattingEnabled, disableSelectionToolbar) {
+var shouldShowSection = function shouldShowSection(editMode, toolbar, toolbarDocking, contextualFormattingEnabled) {
   if (editMode === 'view') {
     return false;
   }
-
-  /**
-   * This check is no longer needed with plugin config changes, the selection toolbar will not be registered and so
-   * no components will render
-   */
-  if (!(0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_placement_config')) {
-    if (disableSelectionToolbar) {
-      return true;
-    }
-  }
   if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_placement_overridden')) {
     if ((toolbar === null || toolbar === void 0 ? void 0 : toolbar.key) === _toolbar.TOOLBARS.INLINE_TEXT_TOOLBAR) {
       return toolbarDocking !== 'top' || contextualFormattingEnabled === 'always-inline';
@@ -74,8 +64,7 @@ var Section = exports.Section = function Section(_ref) {
     testId = _ref.testId,
     showSeparatorInFullPagePrimaryToolbar = _ref.showSeparatorInFullPagePrimaryToolbar,
     _ref$isSharedSection = _ref.isSharedSection,
-    isSharedSection = _ref$isSharedSection === void 0 ? true : _ref$isSharedSection,
-    disableSelectionToolbar = _ref.disableSelectionToolbar;
+    isSharedSection = _ref$isSharedSection === void 0 ? true : _ref$isSharedSection;
   var _usePluginState = usePluginState(api),
     editorViewMode = _usePluginState.editorViewMode,
     editorToolbarDockingPreference = _usePluginState.editorToolbarDockingPreference,
@@ -84,7 +73,7 @@ var Section = exports.Section = function Section(_ref) {
     return parent.type === 'toolbar';
   });
   var contextualFormattingEnabled = (_api$toolbar$actions$ = api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.actions.contextualFormattingMode()) !== null && _api$toolbar$actions$ !== void 0 ? _api$toolbar$actions$ : 'always-pinned';
-  if (isSharedSection && !shouldShowSection(editorViewMode, toolbar, editorToolbarDockingPreference, contextualFormattingEnabled, disableSelectionToolbar)) {
+  if (isSharedSection && !shouldShowSection(editorViewMode, toolbar, editorToolbarDockingPreference, contextualFormattingEnabled)) {
     return null;
   }
   var isFullPage = editorAppearance === 'full-page';

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

@@ -100,8 +100,7 @@ var SelectionToolbar = exports.SelectionToolbar = function SelectionToolbar(_ref
     editorToolbarDockingPreference = _usePluginState.editorToolbarDockingPreference,
     currentUserIntent = _usePluginState.currentUserIntent,
     shouldShowToolbar = _usePluginState.shouldShowToolbar,
-    editorViewMode = _usePluginState.editorViewMode,
-    _selection = _usePluginState.selection;
+    editorViewMode = _usePluginState.editorViewMode;
   var contextualFormattingEnabled = (_api$toolbar$actions$ = api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.actions.contextualFormattingMode()) !== null && _api$toolbar$actions$ !== void 0 ? _api$toolbar$actions$ : 'always-pinned';
   var selectionToolbarConfigEnabled = (0, _toolbar.shouldShowSelectionToolbar)(contextualFormattingEnabled, editorToolbarDockingPreference);
   var intl = (0, _reactIntlNext.useIntl)();
@@ -120,7 +119,7 @@ var SelectionToolbar = exports.SelectionToolbar = function SelectionToolbar(_ref
   var isAllSelection = !editorView.state.selection.empty && editorView.state.selection instanceof _state.AllSelection;
   var isCellSelection = !editorView.state.selection.empty && '$anchorCell' in editorView.state.selection;
   var onPositionCalculated = useOnPositionCalculated(editorView);
-  if ((0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_template_editor', 'isEnabled', true) && selectionToolbarConfigEnabled && disableSelectionToolbarWhenPinned || !components || !toolbar) {
+  if (selectionToolbarConfigEnabled && disableSelectionToolbarWhenPinned || !components || !toolbar) {
     return null;
   }
   if (!(isTextSelection || isCellSelection || isAllSelection) || currentUserIntent === 'dragging' || !shouldShowToolbar || currentUserIntent === 'blockMenuOpen' && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) || ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_user_intent_fix') ?

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

@@ -51,7 +51,7 @@ var getPrimaryToolbarComponents = function getPrimaryToolbarComponents(breakpoin
     }
   }];
 };
-var getToolbarComponents = exports.getToolbarComponents = function getToolbarComponents(contextualFormattingEnabled, api, disableSelectionToolbar, breakpointPreset) {
+var getToolbarComponents = exports.getToolbarComponents = function getToolbarComponents(contextualFormattingEnabled, api, breakpointPreset) {
   var components = [{
     type: _toolbar.TEXT_SECTION.type,
     key: _toolbar.TEXT_SECTION.key,
@@ -69,14 +69,12 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
         }, /*#__PURE__*/_react.default.createElement(_Section.Section, {
           parents: parents,
           api: api,
-          disableSelectionToolbar: disableSelectionToolbar,
           testId: "text-section"
         }, children));
       }
       return /*#__PURE__*/_react.default.createElement(_Section.Section, {
         parents: parents,
         api: api,
-        disableSelectionToolbar: disableSelectionToolbar,
         testId: "text-section"
       }, children);
     }
@@ -97,14 +95,12 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
         }, /*#__PURE__*/_react.default.createElement(_Section.Section, {
           parents: parents,
           api: api,
-          disableSelectionToolbar: disableSelectionToolbar,
           testId: "text-section"
         }, children));
       }
       return /*#__PURE__*/_react.default.createElement(_Section.Section, {
         parents: parents,
         api: api,
-        disableSelectionToolbar: disableSelectionToolbar,
         testId: "text-section"
       }, children);
     }
@@ -128,7 +124,6 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
       }, /*#__PURE__*/_react.default.createElement(_Section.Section, {
         parents: parents,
         api: api,
-        disableSelectionToolbar: disableSelectionToolbar,
         testId: "text-section"
       }, children));
     }
@@ -279,22 +274,17 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
       return /*#__PURE__*/_react.default.createElement(_OverflowMenu.OverflowMenu, null, children);
     }
   });
-  if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_placement_config')) {
-    switch (contextualFormattingEnabled) {
-      case 'always-inline':
-        components.unshift.apply(components, (0, _toConsumableArray2.default)(getInlineTextToolbarComponents()));
-        break;
-      case 'always-pinned':
-        components.unshift.apply(components, (0, _toConsumableArray2.default)(getPrimaryToolbarComponents(breakpointPreset)));
-        break;
-      case 'controlled':
-        components.unshift.apply(components, (0, _toConsumableArray2.default)(getInlineTextToolbarComponents()));
-        components.unshift.apply(components, (0, _toConsumableArray2.default)(getPrimaryToolbarComponents(breakpointPreset)));
-        break;
-    }
-  } else {
-    components.unshift.apply(components, (0, _toConsumableArray2.default)(getInlineTextToolbarComponents()));
-    components.unshift.apply(components, (0, _toConsumableArray2.default)(getPrimaryToolbarComponents(breakpointPreset)));
+  switch (contextualFormattingEnabled) {
+    case 'always-inline':
+      components.unshift.apply(components, (0, _toConsumableArray2.default)(getInlineTextToolbarComponents()));
+      break;
+    case 'always-pinned':
+      components.unshift.apply(components, (0, _toConsumableArray2.default)(getPrimaryToolbarComponents(breakpointPreset)));
+      break;
+    case 'controlled':
+      components.unshift.apply(components, (0, _toConsumableArray2.default)(getInlineTextToolbarComponents()));
+      components.unshift.apply(components, (0, _toConsumableArray2.default)(getPrimaryToolbarComponents(breakpointPreset)));
+      break;
   }
   if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_undo_redo_confluence')) {
     components.push({

package/dist/es2019/toolbarPlugin.js

@@ -69,7 +69,7 @@ export const toolbarPlugin = ({
     breakpointPreset
   } = config;
   const registry = createComponentRegistry();
-  registry.register(getToolbarComponents(contextualFormattingEnabled, api, disableSelectionToolbar, breakpointPreset));
+  registry.register(getToolbarComponents(contextualFormattingEnabled, api, breakpointPreset));
   const cachedCalculateToolbarPosition = expValEquals('platform_editor_sel_toolbar_fix', 'isEnabled', true) ? calculateToolbarPositionTrackHead(SELECTION_TOOLBAR_LABEL) : undefined;
   return {
     name: 'toolbar',

package/dist/es2019/ui/Section.js

@@ -5,20 +5,10 @@ import { ToolbarSection, SeparatorPosition } from '@atlaskit/editor-toolbar';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-const shouldShowSection = (editMode, toolbar, toolbarDocking, contextualFormattingEnabled, disableSelectionToolbar) => {
+const shouldShowSection = (editMode, toolbar, toolbarDocking, contextualFormattingEnabled) => {
   if (editMode === 'view') {
     return false;
   }
-
-  /**
-   * This check is no longer needed with plugin config changes, the selection toolbar will not be registered and so
-   * no components will render
-   */
-  if (!fg('platform_editor_toolbar_aifc_placement_config')) {
-    if (disableSelectionToolbar) {
-      return true;
-    }
-  }
   if (fg('platform_editor_toolbar_aifc_placement_overridden')) {
     if ((toolbar === null || toolbar === void 0 ? void 0 : toolbar.key) === TOOLBARS.INLINE_TEXT_TOOLBAR) {
       return toolbarDocking !== 'top' || contextualFormattingEnabled === 'always-inline';
@@ -65,8 +55,7 @@ export const Section = ({
   api,
   testId,
   showSeparatorInFullPagePrimaryToolbar,
-  isSharedSection = true,
-  disableSelectionToolbar
+  isSharedSection = true
 }) => {
   var _api$toolbar$actions$, _api$toolbar;
   const {
@@ -76,7 +65,7 @@ export const Section = ({
   } = usePluginState(api);
   const toolbar = parents.find(parent => parent.type === 'toolbar');
   const contextualFormattingEnabled = (_api$toolbar$actions$ = api === null || api === void 0 ? void 0 : (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.actions.contextualFormattingMode()) !== null && _api$toolbar$actions$ !== void 0 ? _api$toolbar$actions$ : 'always-pinned';
-  if (isSharedSection && !shouldShowSection(editorViewMode, toolbar, editorToolbarDockingPreference, contextualFormattingEnabled, disableSelectionToolbar)) {
+  if (isSharedSection && !shouldShowSection(editorViewMode, toolbar, editorToolbarDockingPreference, contextualFormattingEnabled)) {
     return null;
   }
   const isFullPage = editorAppearance === 'full-page';

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

@@ -92,9 +92,7 @@ export const SelectionToolbar = ({
     editorToolbarDockingPreference,
     currentUserIntent,
     shouldShowToolbar,
-    editorViewMode,
-    // @ts-ignore
-    selection: _selection
+    editorViewMode
   } = usePluginState(api);
   const contextualFormattingEnabled = (_api$toolbar$actions$ = api === null || api === void 0 ? void 0 : (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.actions.contextualFormattingMode()) !== null && _api$toolbar$actions$ !== void 0 ? _api$toolbar$actions$ : 'always-pinned';
   const selectionToolbarConfigEnabled = shouldShowSelectionToolbar(contextualFormattingEnabled, editorToolbarDockingPreference);
@@ -113,7 +111,7 @@ export const SelectionToolbar = ({
   const isAllSelection = !editorView.state.selection.empty && editorView.state.selection instanceof AllSelection;
   const isCellSelection = !editorView.state.selection.empty && '$anchorCell' in editorView.state.selection;
   const onPositionCalculated = useOnPositionCalculated(editorView);
-  if (expValEquals('platform_editor_toolbar_aifc_template_editor', 'isEnabled', true) && selectionToolbarConfigEnabled && disableSelectionToolbarWhenPinned || !components || !toolbar) {
+  if (selectionToolbarConfigEnabled && disableSelectionToolbarWhenPinned || !components || !toolbar) {
     return null;
   }
   if (!(isTextSelection || isCellSelection || isAllSelection) || currentUserIntent === 'dragging' || !shouldShowToolbar || currentUserIntent === 'blockMenuOpen' && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) || (fg('platform_editor_toolbar_aifc_user_intent_fix') ?

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

@@ -42,7 +42,7 @@ const getPrimaryToolbarComponents = breakpointPreset => {
     }, children)
   }];
 };
-export const getToolbarComponents = (contextualFormattingEnabled, api, disableSelectionToolbar, breakpointPreset) => {
+export const getToolbarComponents = (contextualFormattingEnabled, api, breakpointPreset) => {
   const components = [{
     type: TEXT_SECTION.type,
     key: TEXT_SECTION.key,
@@ -61,14 +61,12 @@ export const getToolbarComponents = (contextualFormattingEnabled, api, disableSe
         }, /*#__PURE__*/React.createElement(Section, {
           parents: parents,
           api: api,
-          disableSelectionToolbar: disableSelectionToolbar,
           testId: "text-section"
         }, children));
       }
       return /*#__PURE__*/React.createElement(Section, {
         parents: parents,
         api: api,
-        disableSelectionToolbar: disableSelectionToolbar,
         testId: "text-section"
       }, children);
     }
@@ -90,14 +88,12 @@ export const getToolbarComponents = (contextualFormattingEnabled, api, disableSe
         }, /*#__PURE__*/React.createElement(Section, {
           parents: parents,
           api: api,
-          disableSelectionToolbar: disableSelectionToolbar,
           testId: "text-section"
         }, children));
       }
       return /*#__PURE__*/React.createElement(Section, {
         parents: parents,
         api: api,
-        disableSelectionToolbar: disableSelectionToolbar,
         testId: "text-section"
       }, children);
     }
@@ -122,7 +118,6 @@ export const getToolbarComponents = (contextualFormattingEnabled, api, disableSe
       }, /*#__PURE__*/React.createElement(Section, {
         parents: parents,
         api: api,
-        disableSelectionToolbar: disableSelectionToolbar,
         testId: "text-section"
       }, children));
     }
@@ -275,22 +270,17 @@ export const getToolbarComponents = (contextualFormattingEnabled, api, disableSe
       return /*#__PURE__*/React.createElement(OverflowMenu, null, children);
     }
   });
-  if (fg('platform_editor_toolbar_aifc_placement_config')) {
-    switch (contextualFormattingEnabled) {
-      case 'always-inline':
-        components.unshift(...getInlineTextToolbarComponents());
-        break;
-      case 'always-pinned':
-        components.unshift(...getPrimaryToolbarComponents(breakpointPreset));
-        break;
-      case 'controlled':
-        components.unshift(...getInlineTextToolbarComponents());
-        components.unshift(...getPrimaryToolbarComponents(breakpointPreset));
-        break;
-    }
-  } else {
-    components.unshift(...getInlineTextToolbarComponents());
-    components.unshift(...getPrimaryToolbarComponents(breakpointPreset));
+  switch (contextualFormattingEnabled) {
+    case 'always-inline':
+      components.unshift(...getInlineTextToolbarComponents());
+      break;
+    case 'always-pinned':
+      components.unshift(...getPrimaryToolbarComponents(breakpointPreset));
+      break;
+    case 'controlled':
+      components.unshift(...getInlineTextToolbarComponents());
+      components.unshift(...getPrimaryToolbarComponents(breakpointPreset));
+      break;
   }
   if (fg('platform_editor_toolbar_aifc_undo_redo_confluence')) {
     components.push({

package/dist/esm/toolbarPlugin.js

@@ -76,7 +76,7 @@ export var toolbarPlugin = function toolbarPlugin(_ref) {
     contextualFormattingEnabled = _config$contextualFor === void 0 ? 'always-pinned' : _config$contextualFor,
     breakpointPreset = config.breakpointPreset;
   var registry = createComponentRegistry();
-  registry.register(getToolbarComponents(contextualFormattingEnabled, api, disableSelectionToolbar, breakpointPreset));
+  registry.register(getToolbarComponents(contextualFormattingEnabled, api, breakpointPreset));
   var cachedCalculateToolbarPosition = expValEquals('platform_editor_sel_toolbar_fix', 'isEnabled', true) ? calculateToolbarPositionTrackHead(SELECTION_TOOLBAR_LABEL) : undefined;
   return {
     name: 'toolbar',

package/dist/esm/ui/Section.js

@@ -5,20 +5,10 @@ import { ToolbarSection, SeparatorPosition } from '@atlaskit/editor-toolbar';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-var shouldShowSection = function shouldShowSection(editMode, toolbar, toolbarDocking, contextualFormattingEnabled, disableSelectionToolbar) {
+var shouldShowSection = function shouldShowSection(editMode, toolbar, toolbarDocking, contextualFormattingEnabled) {
   if (editMode === 'view') {
     return false;
   }
-
-  /**
-   * This check is no longer needed with plugin config changes, the selection toolbar will not be registered and so
-   * no components will render
-   */
-  if (!fg('platform_editor_toolbar_aifc_placement_config')) {
-    if (disableSelectionToolbar) {
-      return true;
-    }
-  }
   if (fg('platform_editor_toolbar_aifc_placement_overridden')) {
     if ((toolbar === null || toolbar === void 0 ? void 0 : toolbar.key) === TOOLBARS.INLINE_TEXT_TOOLBAR) {
       return toolbarDocking !== 'top' || contextualFormattingEnabled === 'always-inline';
@@ -67,8 +57,7 @@ export var Section = function Section(_ref) {
     testId = _ref.testId,
     showSeparatorInFullPagePrimaryToolbar = _ref.showSeparatorInFullPagePrimaryToolbar,
     _ref$isSharedSection = _ref.isSharedSection,
-    isSharedSection = _ref$isSharedSection === void 0 ? true : _ref$isSharedSection,
-    disableSelectionToolbar = _ref.disableSelectionToolbar;
+    isSharedSection = _ref$isSharedSection === void 0 ? true : _ref$isSharedSection;
   var _usePluginState = usePluginState(api),
     editorViewMode = _usePluginState.editorViewMode,
     editorToolbarDockingPreference = _usePluginState.editorToolbarDockingPreference,
@@ -77,7 +66,7 @@ export var Section = function Section(_ref) {
     return parent.type === 'toolbar';
   });
   var contextualFormattingEnabled = (_api$toolbar$actions$ = api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.actions.contextualFormattingMode()) !== null && _api$toolbar$actions$ !== void 0 ? _api$toolbar$actions$ : 'always-pinned';
-  if (isSharedSection && !shouldShowSection(editorViewMode, toolbar, editorToolbarDockingPreference, contextualFormattingEnabled, disableSelectionToolbar)) {
+  if (isSharedSection && !shouldShowSection(editorViewMode, toolbar, editorToolbarDockingPreference, contextualFormattingEnabled)) {
     return null;
   }
   var isFullPage = editorAppearance === 'full-page';

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

@@ -92,8 +92,7 @@ export var SelectionToolbar = function SelectionToolbar(_ref) {
     editorToolbarDockingPreference = _usePluginState.editorToolbarDockingPreference,
     currentUserIntent = _usePluginState.currentUserIntent,
     shouldShowToolbar = _usePluginState.shouldShowToolbar,
-    editorViewMode = _usePluginState.editorViewMode,
-    _selection = _usePluginState.selection;
+    editorViewMode = _usePluginState.editorViewMode;
   var contextualFormattingEnabled = (_api$toolbar$actions$ = api === null || api === void 0 || (_api$toolbar = api.toolbar) === null || _api$toolbar === void 0 ? void 0 : _api$toolbar.actions.contextualFormattingMode()) !== null && _api$toolbar$actions$ !== void 0 ? _api$toolbar$actions$ : 'always-pinned';
   var selectionToolbarConfigEnabled = shouldShowSelectionToolbar(contextualFormattingEnabled, editorToolbarDockingPreference);
   var intl = useIntl();
@@ -112,7 +111,7 @@ export var SelectionToolbar = function SelectionToolbar(_ref) {
   var isAllSelection = !editorView.state.selection.empty && editorView.state.selection instanceof AllSelection;
   var isCellSelection = !editorView.state.selection.empty && '$anchorCell' in editorView.state.selection;
   var onPositionCalculated = useOnPositionCalculated(editorView);
-  if (expValEquals('platform_editor_toolbar_aifc_template_editor', 'isEnabled', true) && selectionToolbarConfigEnabled && disableSelectionToolbarWhenPinned || !components || !toolbar) {
+  if (selectionToolbarConfigEnabled && disableSelectionToolbarWhenPinned || !components || !toolbar) {
     return null;
   }
   if (!(isTextSelection || isCellSelection || isAllSelection) || currentUserIntent === 'dragging' || !shouldShowToolbar || currentUserIntent === 'blockMenuOpen' && expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) || (fg('platform_editor_toolbar_aifc_user_intent_fix') ?

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

@@ -44,7 +44,7 @@ var getPrimaryToolbarComponents = function getPrimaryToolbarComponents(breakpoin
     }
   }];
 };
-export var getToolbarComponents = function getToolbarComponents(contextualFormattingEnabled, api, disableSelectionToolbar, breakpointPreset) {
+export var getToolbarComponents = function getToolbarComponents(contextualFormattingEnabled, api, breakpointPreset) {
   var components = [{
     type: TEXT_SECTION.type,
     key: TEXT_SECTION.key,
@@ -62,14 +62,12 @@ export var getToolbarComponents = function getToolbarComponents(contextualFormat
         }, /*#__PURE__*/React.createElement(Section, {
           parents: parents,
           api: api,
-          disableSelectionToolbar: disableSelectionToolbar,
           testId: "text-section"
         }, children));
       }
       return /*#__PURE__*/React.createElement(Section, {
         parents: parents,
         api: api,
-        disableSelectionToolbar: disableSelectionToolbar,
         testId: "text-section"
       }, children);
     }
@@ -90,14 +88,12 @@ export var getToolbarComponents = function getToolbarComponents(contextualFormat
         }, /*#__PURE__*/React.createElement(Section, {
           parents: parents,
           api: api,
-          disableSelectionToolbar: disableSelectionToolbar,
           testId: "text-section"
         }, children));
       }
       return /*#__PURE__*/React.createElement(Section, {
         parents: parents,
         api: api,
-        disableSelectionToolbar: disableSelectionToolbar,
         testId: "text-section"
       }, children);
     }
@@ -121,7 +117,6 @@ export var getToolbarComponents = function getToolbarComponents(contextualFormat
       }, /*#__PURE__*/React.createElement(Section, {
         parents: parents,
         api: api,
-        disableSelectionToolbar: disableSelectionToolbar,
         testId: "text-section"
       }, children));
     }
@@ -272,22 +267,17 @@ export var getToolbarComponents = function getToolbarComponents(contextualFormat
       return /*#__PURE__*/React.createElement(OverflowMenu, null, children);
     }
   });
-  if (fg('platform_editor_toolbar_aifc_placement_config')) {
-    switch (contextualFormattingEnabled) {
-      case 'always-inline':
-        components.unshift.apply(components, _toConsumableArray(getInlineTextToolbarComponents()));
-        break;
-      case 'always-pinned':
-        components.unshift.apply(components, _toConsumableArray(getPrimaryToolbarComponents(breakpointPreset)));
-        break;
-      case 'controlled':
-        components.unshift.apply(components, _toConsumableArray(getInlineTextToolbarComponents()));
-        components.unshift.apply(components, _toConsumableArray(getPrimaryToolbarComponents(breakpointPreset)));
-        break;
-    }
-  } else {
-    components.unshift.apply(components, _toConsumableArray(getInlineTextToolbarComponents()));
-    components.unshift.apply(components, _toConsumableArray(getPrimaryToolbarComponents(breakpointPreset)));
+  switch (contextualFormattingEnabled) {
+    case 'always-inline':
+      components.unshift.apply(components, _toConsumableArray(getInlineTextToolbarComponents()));
+      break;
+    case 'always-pinned':
+      components.unshift.apply(components, _toConsumableArray(getPrimaryToolbarComponents(breakpointPreset)));
+      break;
+    case 'controlled':
+      components.unshift.apply(components, _toConsumableArray(getInlineTextToolbarComponents()));
+      components.unshift.apply(components, _toConsumableArray(getPrimaryToolbarComponents(breakpointPreset)));
+      break;
   }
   if (fg('platform_editor_toolbar_aifc_undo_redo_confluence')) {
     components.push({

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

@@ -5,11 +5,10 @@ import type { ToolbarPlugin } from '../toolbarPluginType';
 type SectionProps = {
     api?: ExtractInjectionAPI<ToolbarPlugin>;
     children: React.ReactNode;
-    disableSelectionToolbar?: boolean;
     isSharedSection?: boolean;
     parents: ToolbarComponentTypes;
     showSeparatorInFullPagePrimaryToolbar?: boolean;
     testId?: string;
 };
-export declare const Section: ({ children, parents, api, testId, showSeparatorInFullPagePrimaryToolbar, isSharedSection, disableSelectionToolbar, }: SectionProps) => React.JSX.Element | null;
+export declare const Section: ({ children, parents, api, testId, showSeparatorInFullPagePrimaryToolbar, isSharedSection, }: SectionProps) => React.JSX.Element | null;
 export {};

package/dist/types/ui/toolbar-components.d.ts

@@ -3,4 +3,4 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { type BreakpointPreset } from '@atlaskit/editor-toolbar';
 import { type RegisterComponent } from '@atlaskit/editor-toolbar-model';
 import type { ToolbarPlugin } from '../toolbarPluginType';
-export declare const getToolbarComponents: (contextualFormattingEnabled: ContextualFormattingEnabledOptions, api?: ExtractInjectionAPI<ToolbarPlugin>, disableSelectionToolbar?: boolean, breakpointPreset?: BreakpointPreset) => RegisterComponent[];
+export declare const getToolbarComponents: (contextualFormattingEnabled: ContextualFormattingEnabledOptions, api?: ExtractInjectionAPI<ToolbarPlugin>, breakpointPreset?: BreakpointPreset) => RegisterComponent[];

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

@@ -5,11 +5,10 @@ import type { ToolbarPlugin } from '../toolbarPluginType';
 type SectionProps = {
     api?: ExtractInjectionAPI<ToolbarPlugin>;
     children: React.ReactNode;
-    disableSelectionToolbar?: boolean;
     isSharedSection?: boolean;
     parents: ToolbarComponentTypes;
     showSeparatorInFullPagePrimaryToolbar?: boolean;
     testId?: string;
 };
-export declare const Section: ({ children, parents, api, testId, showSeparatorInFullPagePrimaryToolbar, isSharedSection, disableSelectionToolbar, }: SectionProps) => React.JSX.Element | null;
+export declare const Section: ({ children, parents, api, testId, showSeparatorInFullPagePrimaryToolbar, isSharedSection, }: SectionProps) => React.JSX.Element | null;
 export {};

package/dist/types-ts4.5/ui/toolbar-components.d.ts

@@ -3,4 +3,4 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { type BreakpointPreset } from '@atlaskit/editor-toolbar';
 import { type RegisterComponent } from '@atlaskit/editor-toolbar-model';
 import type { ToolbarPlugin } from '../toolbarPluginType';
-export declare const getToolbarComponents: (contextualFormattingEnabled: ContextualFormattingEnabledOptions, api?: ExtractInjectionAPI<ToolbarPlugin>, disableSelectionToolbar?: boolean, breakpointPreset?: BreakpointPreset) => RegisterComponent[];
+export declare const getToolbarComponents: (contextualFormattingEnabled: ContextualFormattingEnabledOptions, api?: ExtractInjectionAPI<ToolbarPlugin>, breakpointPreset?: BreakpointPreset) => RegisterComponent[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-toolbar",
-	"version": "4.0.5",
+	"version": "4.0.7",
 	"description": "Toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -40,7 +40,7 @@
 		"@atlaskit/editor-toolbar-model": "^0.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.4.0",
-		"@atlaskit/tmp-editor-statsig": "^16.19.0",
+		"@atlaskit/tmp-editor-statsig": "^16.23.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -56,9 +56,6 @@
 		"platform_editor_toolbar_aifc_user_intent_fix": {
 			"type": "boolean"
 		},
-		"platform_editor_toolbar_aifc_placement_config": {
-			"type": "boolean"
-		},
 		"platform_editor_toolbar_aifc_placement_overridden": {
 			"type": "boolean"
 		},