@atlaskit/editor-plugin-text-formatting 2.2.18 → 2.3.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-text-formatting
 
+## 2.3.0
+
+### Minor Changes
+
+- [#158546](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/158546)
+  [`b7fe4e6f226f3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b7fe4e6f226f3) -
+  ED-27284 use user preferences plugin in editor preset.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.2.19
+
+### Patch Changes
+
+- [#169224](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/169224)
+  [`95aee735823c6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/95aee735823c6) -
+  [ux] ED-27798: Show T icon for block type plugin toolbar, and show only bold as single button,
+  italic as dropdown in text formatting toolbar
+
 ## 2.2.18
 
 ### Patch Changes

package/dist/cjs/textFormattingPlugin.js

@@ -8,6 +8,7 @@ exports.textFormattingPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _clearFormatting = require("./pm-plugins/clear-formatting");
 var _clearFormattingKeymap = _interopRequireDefault(require("./pm-plugins/clear-formatting-keymap"));
@@ -149,8 +150,9 @@ var textFormattingPlugin = exports.textFormattingPlugin = function textFormattin
     },
     pluginsOptions: {
       selectionToolbar: function selectionToolbar() {
-        var _api$selectionToolbar;
-        if ((api === null || api === void 0 || (_api$selectionToolbar = api.selectionToolbar) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.sharedState) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.currentState()) === null || _api$selectionToolbar === void 0 ? void 0 : _api$selectionToolbar.toolbarDocking) === 'none' && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1', {
+        var _api$userPreferences, _api$selectionToolbar;
+        var toolbarDocking = (0, _platformFeatureFlags.fg)('platform_editor_use_preferences_plugin') ? api === null || api === void 0 || (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.sharedState.currentState()) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.preferences) === null || _api$userPreferences === void 0 ? void 0 : _api$userPreferences.toolbarDockingPosition : api === null || api === void 0 || (_api$selectionToolbar = api.selectionToolbar) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.sharedState) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.currentState()) === null || _api$selectionToolbar === void 0 ? void 0 : _api$selectionToolbar.toolbarDocking;
+        if (toolbarDocking === 'none' && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1', {
           exposure: true
         })) {
           var toolbarCustom = {

package/dist/cjs/ui/FloatingToolbarComponent.js

@@ -154,7 +154,7 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
   });
   var _useIconList = (0, _useIconList2.useIconList)({
       icons: defaultIcons,
-      iconTypeList: _constants.DefaultFloatingToolbarButtonsNext,
+      iconTypeList: _constants.ToolbarButtonsStrong,
       shouldUnselect: hasMultiplePartsWithFormattingSelected
     }),
     dropdownItems = _useIconList.dropdownItems,

package/dist/cjs/ui/Toolbar/constants.js

@@ -4,28 +4,43 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ResponsiveCustomMenuNext = exports.ResponsiveCustomMenu = exports.ResponsiveCustomButtonToolbarNext = exports.ResponsiveCustomButtonToolbar = exports.DefaultFloatingToolbarButtonsNext = exports.DefaultButtonsToolbarNext = exports.DefaultButtonsToolbar = exports.DefaultButtonsMenuNext = exports.DefaultButtonsMenu = void 0;
+exports.ToolbarButtonsStrongItalicUnderline = exports.ToolbarButtonsStrongItalic = exports.ToolbarButtonsStrong = exports.ResponsiveCustomMenuSpacious = exports.ResponsiveCustomMenuMinimal = exports.ResponsiveCustomMenuCompact = exports.ResponsiveCustomButtonToolbarSpacious = exports.ResponsiveCustomButtonToolbarMinimal = exports.ResponsiveCustomButtonToolbarCompact = exports.ButtonsMenuSpacious = exports.ButtonsMenuMinimal = exports.ButtonsMenuCompact = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _types = require("@atlaskit/editor-common/types");
 var _types2 = require("./types");
-var DefaultButtonsToolbar = exports.DefaultButtonsToolbar = [_types2.IconTypes.strong, _types2.IconTypes.em];
-var DefaultFloatingToolbarButtonsNext = exports.DefaultFloatingToolbarButtonsNext = [_types2.IconTypes.strong];
-var DefaultButtonsToolbarNext = exports.DefaultButtonsToolbarNext = [_types2.IconTypes.strong, _types2.IconTypes.em, _types2.IconTypes.underline];
-var DefaultButtonsMenu = exports.DefaultButtonsMenu = [_types2.IconTypes.underline, _types2.IconTypes.strike, _types2.IconTypes.code, _types2.IconTypes.subscript, _types2.IconTypes.superscript];
-var DefaultButtonsMenuNext = exports.DefaultButtonsMenuNext = [_types2.IconTypes.strike, _types2.IconTypes.code, _types2.IconTypes.subscript, _types2.IconTypes.superscript];
+var ToolbarButtonsStrongItalic = exports.ToolbarButtonsStrongItalic = [_types2.IconTypes.strong, _types2.IconTypes.em];
+var ToolbarButtonsStrong = exports.ToolbarButtonsStrong = [_types2.IconTypes.strong];
+var ToolbarButtonsStrongItalicUnderline = exports.ToolbarButtonsStrongItalicUnderline = [_types2.IconTypes.strong, _types2.IconTypes.em, _types2.IconTypes.underline];
+var ButtonsMenuMinimal = exports.ButtonsMenuMinimal = [_types2.IconTypes.em, _types2.IconTypes.underline, _types2.IconTypes.strike, _types2.IconTypes.code, _types2.IconTypes.subscript, _types2.IconTypes.superscript];
+var ButtonsMenuCompact = exports.ButtonsMenuCompact = [_types2.IconTypes.underline, _types2.IconTypes.strike, _types2.IconTypes.code, _types2.IconTypes.subscript, _types2.IconTypes.superscript];
+var ButtonsMenuSpacious = exports.ButtonsMenuSpacious = [_types2.IconTypes.strike, _types2.IconTypes.code, _types2.IconTypes.subscript, _types2.IconTypes.superscript];
 
-// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required -- Ignored via go/ED-25883
-/** @deprecated
- * When tidying platform_editor_controls this is to be removed in favor of ResponsiveCustomButtonToolbarNext
- * along with references to platform_editor_controls gate
+/**
+ * Minimal toolbar is with Bold as single button, and Italic as a dropdown button.
  */
-var ResponsiveCustomButtonToolbar = exports.ResponsiveCustomButtonToolbar = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarSize.XXL, DefaultButtonsToolbar), _types.ToolbarSize.XL, DefaultButtonsToolbar), _types.ToolbarSize.L, DefaultButtonsToolbar), _types.ToolbarSize.M, DefaultButtonsToolbar), _types.ToolbarSize.S, DefaultButtonsToolbar), _types.ToolbarSize.XXXS, []);
-var ResponsiveCustomButtonToolbarNext = exports.ResponsiveCustomButtonToolbarNext = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarSize.XXL, DefaultButtonsToolbarNext), _types.ToolbarSize.XL, DefaultButtonsToolbarNext), _types.ToolbarSize.L, DefaultButtonsToolbarNext), _types.ToolbarSize.M, [_types2.IconTypes.strong, _types2.IconTypes.em]), _types.ToolbarSize.S, [_types2.IconTypes.strong, _types2.IconTypes.em]), _types.ToolbarSize.XXXS, [_types2.IconTypes.strong]);
+var ResponsiveCustomButtonToolbarMinimal = exports.ResponsiveCustomButtonToolbarMinimal = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarSize.XXL, ToolbarButtonsStrong), _types.ToolbarSize.XL, ToolbarButtonsStrong), _types.ToolbarSize.L, ToolbarButtonsStrong), _types.ToolbarSize.M, ToolbarButtonsStrong), _types.ToolbarSize.S, ToolbarButtonsStrong), _types.ToolbarSize.XXXS, []);
 
-// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required -- Ignored via go/ED-25883
-/** @deprecated
- * When tidying platform_editor_controls this is to be removed in favor of ResponsiveCustomMenuNext
- * along with references to platform_editor_controls gate
+/**
+ * Compact toolbar is with Bold, Italic as single buttons, and underline as a dropdown button.
  */
-var ResponsiveCustomMenu = exports.ResponsiveCustomMenu = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarSize.XXL, DefaultButtonsMenu), _types.ToolbarSize.XL, DefaultButtonsMenu), _types.ToolbarSize.L, DefaultButtonsMenu), _types.ToolbarSize.M, DefaultButtonsMenu), _types.ToolbarSize.S, DefaultButtonsMenu), _types.ToolbarSize.XXXS, [_types2.IconTypes.strong, _types2.IconTypes.em].concat(DefaultButtonsMenu));
-var ResponsiveCustomMenuNext = exports.ResponsiveCustomMenuNext = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarSize.XXL, DefaultButtonsMenuNext), _types.ToolbarSize.XL, DefaultButtonsMenuNext), _types.ToolbarSize.L, DefaultButtonsMenuNext), _types.ToolbarSize.M, [_types2.IconTypes.underline].concat(DefaultButtonsMenuNext)), _types.ToolbarSize.S, [_types2.IconTypes.underline].concat(DefaultButtonsMenuNext)), _types.ToolbarSize.XXXS, [_types2.IconTypes.em, _types2.IconTypes.underline].concat(DefaultButtonsMenuNext));
+var ResponsiveCustomButtonToolbarCompact = exports.ResponsiveCustomButtonToolbarCompact = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarSize.XXL, ToolbarButtonsStrongItalic), _types.ToolbarSize.XL, ToolbarButtonsStrongItalic), _types.ToolbarSize.L, ToolbarButtonsStrongItalic), _types.ToolbarSize.M, ToolbarButtonsStrongItalic), _types.ToolbarSize.S, ToolbarButtonsStrongItalic), _types.ToolbarSize.XXXS, []);
+
+/**
+ * Spacious toolbar is with Bold, italic, underline as single buttons, and strike as a dropdown button.
+ */
+var ResponsiveCustomButtonToolbarSpacious = exports.ResponsiveCustomButtonToolbarSpacious = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarSize.XXL, ToolbarButtonsStrongItalicUnderline), _types.ToolbarSize.XL, ToolbarButtonsStrongItalicUnderline), _types.ToolbarSize.L, ToolbarButtonsStrongItalicUnderline), _types.ToolbarSize.M, ToolbarButtonsStrongItalic), _types.ToolbarSize.S, ToolbarButtonsStrongItalic), _types.ToolbarSize.XXXS, ToolbarButtonsStrong);
+
+/**
+ * Corresponding dropdown menu for the ResponsiveCustomButtonToolbarMinimal
+ */
+var ResponsiveCustomMenuMinimal = exports.ResponsiveCustomMenuMinimal = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarSize.XXL, ButtonsMenuMinimal), _types.ToolbarSize.XL, ButtonsMenuMinimal), _types.ToolbarSize.L, ButtonsMenuMinimal), _types.ToolbarSize.M, ButtonsMenuMinimal), _types.ToolbarSize.S, ButtonsMenuMinimal), _types.ToolbarSize.XXXS, [_types2.IconTypes.strong, _types2.IconTypes.em].concat(ButtonsMenuMinimal));
+
+/**
+ * Corresponding dropdown menu for the ResponsiveCustomButtonToolbarCompact
+ */
+var ResponsiveCustomMenuCompact = exports.ResponsiveCustomMenuCompact = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarSize.XXL, ButtonsMenuCompact), _types.ToolbarSize.XL, ButtonsMenuCompact), _types.ToolbarSize.L, ButtonsMenuCompact), _types.ToolbarSize.M, ButtonsMenuCompact), _types.ToolbarSize.S, ButtonsMenuCompact), _types.ToolbarSize.XXXS, [_types2.IconTypes.strong, _types2.IconTypes.em].concat(ButtonsMenuCompact));
+
+/**
+ * Corresponding dropdown menu for the ResponsiveCustomButtonToolbarSpacious
+ */
+var ResponsiveCustomMenuSpacious = exports.ResponsiveCustomMenuSpacious = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.ToolbarSize.XXL, ButtonsMenuSpacious), _types.ToolbarSize.XL, ButtonsMenuSpacious), _types.ToolbarSize.L, ButtonsMenuSpacious), _types.ToolbarSize.M, [_types2.IconTypes.underline].concat(ButtonsMenuSpacious)), _types.ToolbarSize.S, [_types2.IconTypes.underline].concat(ButtonsMenuSpacious)), _types.ToolbarSize.XXXS, [_types2.IconTypes.em, _types2.IconTypes.underline].concat(ButtonsMenuSpacious));

package/dist/cjs/ui/Toolbar/hooks/responsive-toolbar-buttons.js

@@ -6,32 +6,62 @@ Object.defineProperty(exports, "__esModule", {
 exports.useResponsiveToolbarButtons = exports.useResponsiveIconTypeMenu = exports.useResponsiveIconTypeButtons = void 0;
 var _react = require("react");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
+var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _constants = require("../constants");
 var _useIconList = require("./use-icon-list");
 var useResponsiveIconTypeButtons = exports.useResponsiveIconTypeButtons = function useResponsiveIconTypeButtons(_ref) {
   var toolbarSize = _ref.toolbarSize,
     responsivenessEnabled = _ref.responsivenessEnabled;
-  var ResponsiveCustomButtonToolbar = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_4') ? _constants.ResponsiveCustomButtonToolbarNext : _constants.ResponsiveCustomButtonToolbar;
+  var ResponsiveCustomButtonToolbar = _constants.ResponsiveCustomButtonToolbarCompact;
+  if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_controls', 'cohort', 'variant1')) {
+    if ((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_13')) {
+      ResponsiveCustomButtonToolbar = _constants.ResponsiveCustomButtonToolbarMinimal;
+    } else {
+      ResponsiveCustomButtonToolbar = !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_4') ? _constants.ResponsiveCustomButtonToolbarSpacious : _constants.ResponsiveCustomButtonToolbarCompact;
+    }
+  }
   var iconTypeList = (0, _react.useMemo)(function () {
     return ResponsiveCustomButtonToolbar[toolbarSize];
   }, [toolbarSize, ResponsiveCustomButtonToolbar]);
   if (responsivenessEnabled) {
     return iconTypeList;
   }
-  return (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_4') ? _constants.DefaultButtonsToolbarNext : _constants.DefaultButtonsToolbar;
+  if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_controls', 'cohort', 'variant1')) {
+    if ((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_13')) {
+      return _constants.ToolbarButtonsStrong;
+    } else {
+      return !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_4') ? _constants.ToolbarButtonsStrongItalicUnderline : _constants.ToolbarButtonsStrongItalic;
+    }
+  } else {
+    return _constants.ToolbarButtonsStrongItalic;
+  }
 };
 var useResponsiveIconTypeMenu = exports.useResponsiveIconTypeMenu = function useResponsiveIconTypeMenu(_ref2) {
   var toolbarSize = _ref2.toolbarSize,
     responsivenessEnabled = _ref2.responsivenessEnabled;
-  var ResponsiveCustomMenu = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_4') ? _constants.ResponsiveCustomMenuNext : _constants.ResponsiveCustomMenu;
+  var ResponsiveCustomMenu = _constants.ResponsiveCustomMenuCompact;
+  if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_controls', 'cohort', 'variant1')) {
+    if ((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_13')) {
+      ResponsiveCustomMenu = _constants.ResponsiveCustomMenuMinimal;
+    } else {
+      ResponsiveCustomMenu = !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_4') ? _constants.ResponsiveCustomMenuSpacious : _constants.ResponsiveCustomMenuCompact;
+    }
+  }
   var iconTypeList = (0, _react.useMemo)(function () {
     return ResponsiveCustomMenu[toolbarSize];
   }, [toolbarSize, ResponsiveCustomMenu]);
   if (responsivenessEnabled) {
     return iconTypeList;
   }
-  return (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_4') ? _constants.DefaultButtonsMenuNext : _constants.DefaultButtonsMenu;
+  if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_controls', 'cohort', 'variant1')) {
+    if ((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_13')) {
+      return _constants.ButtonsMenuMinimal;
+    } else {
+      return !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_4') ? _constants.ButtonsMenuSpacious : _constants.ButtonsMenuCompact;
+    }
+  } else {
+    return _constants.ToolbarButtonsStrongItalic;
+  }
 };
 var useResponsiveToolbarButtons = exports.useResponsiveToolbarButtons = function useResponsiveToolbarButtons(_ref3) {
   var icons = _ref3.icons,

package/dist/es2019/textFormattingPlugin.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { code, em, strike, strong, subsup, underline } from '@atlaskit/adf-schema';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { plugin as clearFormattingPlugin, pluginKey as clearFormattingPluginKey } from './pm-plugins/clear-formatting';
 import clearFormattingKeymapPlugin from './pm-plugins/clear-formatting-keymap';
@@ -143,8 +144,9 @@ export const textFormattingPlugin = ({
     },
     pluginsOptions: {
       selectionToolbar: () => {
-        var _api$selectionToolbar, _api$selectionToolbar2, _api$selectionToolbar3;
-        if ((api === null || api === void 0 ? void 0 : (_api$selectionToolbar = api.selectionToolbar) === null || _api$selectionToolbar === void 0 ? void 0 : (_api$selectionToolbar2 = _api$selectionToolbar.sharedState) === null || _api$selectionToolbar2 === void 0 ? void 0 : (_api$selectionToolbar3 = _api$selectionToolbar2.currentState()) === null || _api$selectionToolbar3 === void 0 ? void 0 : _api$selectionToolbar3.toolbarDocking) === 'none' && editorExperiment('platform_editor_controls', 'variant1', {
+        var _api$userPreferences, _api$userPreferences$, _api$userPreferences$2, _api$selectionToolbar, _api$selectionToolbar2, _api$selectionToolbar3;
+        const toolbarDocking = fg('platform_editor_use_preferences_plugin') ? api === null || api === void 0 ? void 0 : (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 ? void 0 : (_api$userPreferences$ = _api$userPreferences.sharedState.currentState()) === null || _api$userPreferences$ === void 0 ? void 0 : (_api$userPreferences$2 = _api$userPreferences$.preferences) === null || _api$userPreferences$2 === void 0 ? void 0 : _api$userPreferences$2.toolbarDockingPosition : api === null || api === void 0 ? void 0 : (_api$selectionToolbar = api.selectionToolbar) === null || _api$selectionToolbar === void 0 ? void 0 : (_api$selectionToolbar2 = _api$selectionToolbar.sharedState) === null || _api$selectionToolbar2 === void 0 ? void 0 : (_api$selectionToolbar3 = _api$selectionToolbar2.currentState()) === null || _api$selectionToolbar3 === void 0 ? void 0 : _api$selectionToolbar3.toolbarDocking;
+        if (toolbarDocking === 'none' && editorExperiment('platform_editor_controls', 'variant1', {
           exposure: true
         })) {
           const toolbarCustom = {

package/dist/es2019/ui/FloatingToolbarComponent.js

@@ -13,7 +13,7 @@ import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { DefaultFloatingToolbarButtonsNext } from './Toolbar/constants';
+import { ToolbarButtonsStrong } from './Toolbar/constants';
 import { FormattingTextDropdownMenu } from './Toolbar/dropdown-menu';
 import { getCommonActiveMarks, hasMultiplePartsWithFormattingInSelection } from './Toolbar/formatting-in-selection-utils';
 import { useClearIcon } from './Toolbar/hooks/clear-formatting-icon';
@@ -155,7 +155,7 @@ const FloatingToolbarTextFormat = ({
     singleItems
   } = useIconList({
     icons: defaultIcons,
-    iconTypeList: DefaultFloatingToolbarButtonsNext,
+    iconTypeList: ToolbarButtonsStrong,
     shouldUnselect: hasMultiplePartsWithFormattingSelected
   });
   const clearIcon = useClearIcon({

package/dist/es2019/ui/Toolbar/constants.js

@@ -1,51 +1,80 @@
 import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { IconTypes } from './types';
-export const DefaultButtonsToolbar = [IconTypes.strong, IconTypes.em];
-export const DefaultFloatingToolbarButtonsNext = [IconTypes.strong];
-export const DefaultButtonsToolbarNext = [IconTypes.strong, IconTypes.em, IconTypes.underline];
-export const DefaultButtonsMenu = [IconTypes.underline, IconTypes.strike, IconTypes.code, IconTypes.subscript, IconTypes.superscript];
-export const DefaultButtonsMenuNext = [IconTypes.strike, IconTypes.code, IconTypes.subscript, IconTypes.superscript];
+export const ToolbarButtonsStrongItalic = [IconTypes.strong, IconTypes.em];
+export const ToolbarButtonsStrong = [IconTypes.strong];
+export const ToolbarButtonsStrongItalicUnderline = [IconTypes.strong, IconTypes.em, IconTypes.underline];
+export const ButtonsMenuMinimal = [IconTypes.em, IconTypes.underline, IconTypes.strike, IconTypes.code, IconTypes.subscript, IconTypes.superscript];
+export const ButtonsMenuCompact = [IconTypes.underline, IconTypes.strike, IconTypes.code, IconTypes.subscript, IconTypes.superscript];
+export const ButtonsMenuSpacious = [IconTypes.strike, IconTypes.code, IconTypes.subscript, IconTypes.superscript];
 
-// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required -- Ignored via go/ED-25883
-/** @deprecated
- * When tidying platform_editor_controls this is to be removed in favor of ResponsiveCustomButtonToolbarNext
- * along with references to platform_editor_controls gate
+/**
+ * Minimal toolbar is with Bold as single button, and Italic as a dropdown button.
  */
-export const ResponsiveCustomButtonToolbar = {
-  [ToolbarSize.XXL]: DefaultButtonsToolbar,
-  [ToolbarSize.XL]: DefaultButtonsToolbar,
-  [ToolbarSize.L]: DefaultButtonsToolbar,
-  [ToolbarSize.M]: DefaultButtonsToolbar,
-  [ToolbarSize.S]: DefaultButtonsToolbar,
+export const ResponsiveCustomButtonToolbarMinimal = {
+  [ToolbarSize.XXL]: ToolbarButtonsStrong,
+  [ToolbarSize.XL]: ToolbarButtonsStrong,
+  [ToolbarSize.L]: ToolbarButtonsStrong,
+  [ToolbarSize.M]: ToolbarButtonsStrong,
+  [ToolbarSize.S]: ToolbarButtonsStrong,
   [ToolbarSize.XXXS]: []
 };
-export const ResponsiveCustomButtonToolbarNext = {
-  [ToolbarSize.XXL]: DefaultButtonsToolbarNext,
-  [ToolbarSize.XL]: DefaultButtonsToolbarNext,
-  [ToolbarSize.L]: DefaultButtonsToolbarNext,
-  [ToolbarSize.M]: [IconTypes.strong, IconTypes.em],
-  [ToolbarSize.S]: [IconTypes.strong, IconTypes.em],
-  [ToolbarSize.XXXS]: [IconTypes.strong]
+
+/**
+ * Compact toolbar is with Bold, Italic as single buttons, and underline as a dropdown button.
+ */
+export const ResponsiveCustomButtonToolbarCompact = {
+  [ToolbarSize.XXL]: ToolbarButtonsStrongItalic,
+  [ToolbarSize.XL]: ToolbarButtonsStrongItalic,
+  [ToolbarSize.L]: ToolbarButtonsStrongItalic,
+  [ToolbarSize.M]: ToolbarButtonsStrongItalic,
+  [ToolbarSize.S]: ToolbarButtonsStrongItalic,
+  [ToolbarSize.XXXS]: []
+};
+
+/**
+ * Spacious toolbar is with Bold, italic, underline as single buttons, and strike as a dropdown button.
+ */
+export const ResponsiveCustomButtonToolbarSpacious = {
+  [ToolbarSize.XXL]: ToolbarButtonsStrongItalicUnderline,
+  [ToolbarSize.XL]: ToolbarButtonsStrongItalicUnderline,
+  [ToolbarSize.L]: ToolbarButtonsStrongItalicUnderline,
+  [ToolbarSize.M]: ToolbarButtonsStrongItalic,
+  [ToolbarSize.S]: ToolbarButtonsStrongItalic,
+  [ToolbarSize.XXXS]: ToolbarButtonsStrong
 };
 
-// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required -- Ignored via go/ED-25883
-/** @deprecated
- * When tidying platform_editor_controls this is to be removed in favor of ResponsiveCustomMenuNext
- * along with references to platform_editor_controls gate
+/**
+ * Corresponding dropdown menu for the ResponsiveCustomButtonToolbarMinimal
  */
-export const ResponsiveCustomMenu = {
-  [ToolbarSize.XXL]: DefaultButtonsMenu,
-  [ToolbarSize.XL]: DefaultButtonsMenu,
-  [ToolbarSize.L]: DefaultButtonsMenu,
-  [ToolbarSize.M]: DefaultButtonsMenu,
-  [ToolbarSize.S]: DefaultButtonsMenu,
-  [ToolbarSize.XXXS]: [IconTypes.strong, IconTypes.em, ...DefaultButtonsMenu]
+export const ResponsiveCustomMenuMinimal = {
+  [ToolbarSize.XXL]: ButtonsMenuMinimal,
+  [ToolbarSize.XL]: ButtonsMenuMinimal,
+  [ToolbarSize.L]: ButtonsMenuMinimal,
+  [ToolbarSize.M]: ButtonsMenuMinimal,
+  [ToolbarSize.S]: ButtonsMenuMinimal,
+  [ToolbarSize.XXXS]: [IconTypes.strong, IconTypes.em, ...ButtonsMenuMinimal]
 };
-export const ResponsiveCustomMenuNext = {
-  [ToolbarSize.XXL]: DefaultButtonsMenuNext,
-  [ToolbarSize.XL]: DefaultButtonsMenuNext,
-  [ToolbarSize.L]: DefaultButtonsMenuNext,
-  [ToolbarSize.M]: [IconTypes.underline, ...DefaultButtonsMenuNext],
-  [ToolbarSize.S]: [IconTypes.underline, ...DefaultButtonsMenuNext],
-  [ToolbarSize.XXXS]: [IconTypes.em, IconTypes.underline, ...DefaultButtonsMenuNext]
+
+/**
+ * Corresponding dropdown menu for the ResponsiveCustomButtonToolbarCompact
+ */
+export const ResponsiveCustomMenuCompact = {
+  [ToolbarSize.XXL]: ButtonsMenuCompact,
+  [ToolbarSize.XL]: ButtonsMenuCompact,
+  [ToolbarSize.L]: ButtonsMenuCompact,
+  [ToolbarSize.M]: ButtonsMenuCompact,
+  [ToolbarSize.S]: ButtonsMenuCompact,
+  [ToolbarSize.XXXS]: [IconTypes.strong, IconTypes.em, ...ButtonsMenuCompact]
+};
+
+/**
+ * Corresponding dropdown menu for the ResponsiveCustomButtonToolbarSpacious
+ */
+export const ResponsiveCustomMenuSpacious = {
+  [ToolbarSize.XXL]: ButtonsMenuSpacious,
+  [ToolbarSize.XL]: ButtonsMenuSpacious,
+  [ToolbarSize.L]: ButtonsMenuSpacious,
+  [ToolbarSize.M]: [IconTypes.underline, ...ButtonsMenuSpacious],
+  [ToolbarSize.S]: [IconTypes.underline, ...ButtonsMenuSpacious],
+  [ToolbarSize.XXXS]: [IconTypes.em, IconTypes.underline, ...ButtonsMenuSpacious]
 };

package/dist/es2019/ui/Toolbar/hooks/responsive-toolbar-buttons.js

@@ -1,29 +1,59 @@
 import { useMemo } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { DefaultButtonsMenu, DefaultButtonsMenuNext, DefaultButtonsToolbar, DefaultButtonsToolbarNext, ResponsiveCustomButtonToolbar as ResponsiveCustomButtonToolbarLegacy, ResponsiveCustomButtonToolbarNext, ResponsiveCustomMenu as ResponsiveCustomMenuLegacy, ResponsiveCustomMenuNext } from '../constants';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { ButtonsMenuMinimal, ButtonsMenuCompact, ButtonsMenuSpacious, ToolbarButtonsStrong, ToolbarButtonsStrongItalic, ToolbarButtonsStrongItalicUnderline, ResponsiveCustomButtonToolbarMinimal, ResponsiveCustomButtonToolbarCompact, ResponsiveCustomButtonToolbarSpacious, ResponsiveCustomMenuMinimal, ResponsiveCustomMenuCompact, ResponsiveCustomMenuSpacious } from '../constants';
 import { useIconList } from './use-icon-list';
 export const useResponsiveIconTypeButtons = ({
   toolbarSize,
   responsivenessEnabled
 }) => {
-  const ResponsiveCustomButtonToolbar = editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_4') ? ResponsiveCustomButtonToolbarNext : ResponsiveCustomButtonToolbarLegacy;
+  let ResponsiveCustomButtonToolbar = ResponsiveCustomButtonToolbarCompact;
+  if (expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1')) {
+    if (fg('platform_editor_controls_patch_13')) {
+      ResponsiveCustomButtonToolbar = ResponsiveCustomButtonToolbarMinimal;
+    } else {
+      ResponsiveCustomButtonToolbar = !fg('platform_editor_controls_patch_4') ? ResponsiveCustomButtonToolbarSpacious : ResponsiveCustomButtonToolbarCompact;
+    }
+  }
   const iconTypeList = useMemo(() => ResponsiveCustomButtonToolbar[toolbarSize], [toolbarSize, ResponsiveCustomButtonToolbar]);
   if (responsivenessEnabled) {
     return iconTypeList;
   }
-  return editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_4') ? DefaultButtonsToolbarNext : DefaultButtonsToolbar;
+  if (expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1')) {
+    if (fg('platform_editor_controls_patch_13')) {
+      return ToolbarButtonsStrong;
+    } else {
+      return !fg('platform_editor_controls_patch_4') ? ToolbarButtonsStrongItalicUnderline : ToolbarButtonsStrongItalic;
+    }
+  } else {
+    return ToolbarButtonsStrongItalic;
+  }
 };
 export const useResponsiveIconTypeMenu = ({
   toolbarSize,
   responsivenessEnabled
 }) => {
-  const ResponsiveCustomMenu = editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_4') ? ResponsiveCustomMenuNext : ResponsiveCustomMenuLegacy;
+  let ResponsiveCustomMenu = ResponsiveCustomMenuCompact;
+  if (expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1')) {
+    if (fg('platform_editor_controls_patch_13')) {
+      ResponsiveCustomMenu = ResponsiveCustomMenuMinimal;
+    } else {
+      ResponsiveCustomMenu = !fg('platform_editor_controls_patch_4') ? ResponsiveCustomMenuSpacious : ResponsiveCustomMenuCompact;
+    }
+  }
   const iconTypeList = useMemo(() => ResponsiveCustomMenu[toolbarSize], [toolbarSize, ResponsiveCustomMenu]);
   if (responsivenessEnabled) {
     return iconTypeList;
   }
-  return editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_4') ? DefaultButtonsMenuNext : DefaultButtonsMenu;
+  if (expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1')) {
+    if (fg('platform_editor_controls_patch_13')) {
+      return ButtonsMenuMinimal;
+    } else {
+      return !fg('platform_editor_controls_patch_4') ? ButtonsMenuSpacious : ButtonsMenuCompact;
+    }
+  } else {
+    return ToolbarButtonsStrongItalic;
+  }
 };
 export const useResponsiveToolbarButtons = ({
   icons,

package/dist/esm/textFormattingPlugin.js

@@ -3,6 +3,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React from 'react';
 import { code, em, strike, strong, subsup, underline } from '@atlaskit/adf-schema';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { plugin as clearFormattingPlugin, pluginKey as clearFormattingPluginKey } from './pm-plugins/clear-formatting';
 import clearFormattingKeymapPlugin from './pm-plugins/clear-formatting-keymap';
@@ -143,8 +144,9 @@ export var textFormattingPlugin = function textFormattingPlugin(_ref) {
     },
     pluginsOptions: {
       selectionToolbar: function selectionToolbar() {
-        var _api$selectionToolbar;
-        if ((api === null || api === void 0 || (_api$selectionToolbar = api.selectionToolbar) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.sharedState) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.currentState()) === null || _api$selectionToolbar === void 0 ? void 0 : _api$selectionToolbar.toolbarDocking) === 'none' && editorExperiment('platform_editor_controls', 'variant1', {
+        var _api$userPreferences, _api$selectionToolbar;
+        var toolbarDocking = fg('platform_editor_use_preferences_plugin') ? api === null || api === void 0 || (_api$userPreferences = api.userPreferences) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.sharedState.currentState()) === null || _api$userPreferences === void 0 || (_api$userPreferences = _api$userPreferences.preferences) === null || _api$userPreferences === void 0 ? void 0 : _api$userPreferences.toolbarDockingPosition : api === null || api === void 0 || (_api$selectionToolbar = api.selectionToolbar) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.sharedState) === null || _api$selectionToolbar === void 0 || (_api$selectionToolbar = _api$selectionToolbar.currentState()) === null || _api$selectionToolbar === void 0 ? void 0 : _api$selectionToolbar.toolbarDocking;
+        if (toolbarDocking === 'none' && editorExperiment('platform_editor_controls', 'variant1', {
           exposure: true
         })) {
           var toolbarCustom = {

package/dist/esm/ui/FloatingToolbarComponent.js

@@ -15,7 +15,7 @@ import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { DefaultFloatingToolbarButtonsNext } from './Toolbar/constants';
+import { ToolbarButtonsStrong } from './Toolbar/constants';
 import { FormattingTextDropdownMenu } from './Toolbar/dropdown-menu';
 import { getCommonActiveMarks, hasMultiplePartsWithFormattingInSelection } from './Toolbar/formatting-in-selection-utils';
 import { useClearIcon } from './Toolbar/hooks/clear-formatting-icon';
@@ -146,7 +146,7 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
   });
   var _useIconList = useIconList({
       icons: defaultIcons,
-      iconTypeList: DefaultFloatingToolbarButtonsNext,
+      iconTypeList: ToolbarButtonsStrong,
       shouldUnselect: hasMultiplePartsWithFormattingSelected
     }),
     dropdownItems = _useIconList.dropdownItems,

package/dist/esm/ui/Toolbar/constants.js

@@ -1,24 +1,39 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { IconTypes } from './types';
-export var DefaultButtonsToolbar = [IconTypes.strong, IconTypes.em];
-export var DefaultFloatingToolbarButtonsNext = [IconTypes.strong];
-export var DefaultButtonsToolbarNext = [IconTypes.strong, IconTypes.em, IconTypes.underline];
-export var DefaultButtonsMenu = [IconTypes.underline, IconTypes.strike, IconTypes.code, IconTypes.subscript, IconTypes.superscript];
-export var DefaultButtonsMenuNext = [IconTypes.strike, IconTypes.code, IconTypes.subscript, IconTypes.superscript];
+export var ToolbarButtonsStrongItalic = [IconTypes.strong, IconTypes.em];
+export var ToolbarButtonsStrong = [IconTypes.strong];
+export var ToolbarButtonsStrongItalicUnderline = [IconTypes.strong, IconTypes.em, IconTypes.underline];
+export var ButtonsMenuMinimal = [IconTypes.em, IconTypes.underline, IconTypes.strike, IconTypes.code, IconTypes.subscript, IconTypes.superscript];
+export var ButtonsMenuCompact = [IconTypes.underline, IconTypes.strike, IconTypes.code, IconTypes.subscript, IconTypes.superscript];
+export var ButtonsMenuSpacious = [IconTypes.strike, IconTypes.code, IconTypes.subscript, IconTypes.superscript];
 
-// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required -- Ignored via go/ED-25883
-/** @deprecated
- * When tidying platform_editor_controls this is to be removed in favor of ResponsiveCustomButtonToolbarNext
- * along with references to platform_editor_controls gate
+/**
+ * Minimal toolbar is with Bold as single button, and Italic as a dropdown button.
  */
-export var ResponsiveCustomButtonToolbar = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ToolbarSize.XXL, DefaultButtonsToolbar), ToolbarSize.XL, DefaultButtonsToolbar), ToolbarSize.L, DefaultButtonsToolbar), ToolbarSize.M, DefaultButtonsToolbar), ToolbarSize.S, DefaultButtonsToolbar), ToolbarSize.XXXS, []);
-export var ResponsiveCustomButtonToolbarNext = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ToolbarSize.XXL, DefaultButtonsToolbarNext), ToolbarSize.XL, DefaultButtonsToolbarNext), ToolbarSize.L, DefaultButtonsToolbarNext), ToolbarSize.M, [IconTypes.strong, IconTypes.em]), ToolbarSize.S, [IconTypes.strong, IconTypes.em]), ToolbarSize.XXXS, [IconTypes.strong]);
+export var ResponsiveCustomButtonToolbarMinimal = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ToolbarSize.XXL, ToolbarButtonsStrong), ToolbarSize.XL, ToolbarButtonsStrong), ToolbarSize.L, ToolbarButtonsStrong), ToolbarSize.M, ToolbarButtonsStrong), ToolbarSize.S, ToolbarButtonsStrong), ToolbarSize.XXXS, []);
 
-// eslint-disable-next-line @repo/internal/deprecations/deprecation-ticket-required -- Ignored via go/ED-25883
-/** @deprecated
- * When tidying platform_editor_controls this is to be removed in favor of ResponsiveCustomMenuNext
- * along with references to platform_editor_controls gate
+/**
+ * Compact toolbar is with Bold, Italic as single buttons, and underline as a dropdown button.
  */
-export var ResponsiveCustomMenu = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ToolbarSize.XXL, DefaultButtonsMenu), ToolbarSize.XL, DefaultButtonsMenu), ToolbarSize.L, DefaultButtonsMenu), ToolbarSize.M, DefaultButtonsMenu), ToolbarSize.S, DefaultButtonsMenu), ToolbarSize.XXXS, [IconTypes.strong, IconTypes.em].concat(DefaultButtonsMenu));
-export var ResponsiveCustomMenuNext = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ToolbarSize.XXL, DefaultButtonsMenuNext), ToolbarSize.XL, DefaultButtonsMenuNext), ToolbarSize.L, DefaultButtonsMenuNext), ToolbarSize.M, [IconTypes.underline].concat(DefaultButtonsMenuNext)), ToolbarSize.S, [IconTypes.underline].concat(DefaultButtonsMenuNext)), ToolbarSize.XXXS, [IconTypes.em, IconTypes.underline].concat(DefaultButtonsMenuNext));
+export var ResponsiveCustomButtonToolbarCompact = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ToolbarSize.XXL, ToolbarButtonsStrongItalic), ToolbarSize.XL, ToolbarButtonsStrongItalic), ToolbarSize.L, ToolbarButtonsStrongItalic), ToolbarSize.M, ToolbarButtonsStrongItalic), ToolbarSize.S, ToolbarButtonsStrongItalic), ToolbarSize.XXXS, []);
+
+/**
+ * Spacious toolbar is with Bold, italic, underline as single buttons, and strike as a dropdown button.
+ */
+export var ResponsiveCustomButtonToolbarSpacious = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ToolbarSize.XXL, ToolbarButtonsStrongItalicUnderline), ToolbarSize.XL, ToolbarButtonsStrongItalicUnderline), ToolbarSize.L, ToolbarButtonsStrongItalicUnderline), ToolbarSize.M, ToolbarButtonsStrongItalic), ToolbarSize.S, ToolbarButtonsStrongItalic), ToolbarSize.XXXS, ToolbarButtonsStrong);
+
+/**
+ * Corresponding dropdown menu for the ResponsiveCustomButtonToolbarMinimal
+ */
+export var ResponsiveCustomMenuMinimal = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ToolbarSize.XXL, ButtonsMenuMinimal), ToolbarSize.XL, ButtonsMenuMinimal), ToolbarSize.L, ButtonsMenuMinimal), ToolbarSize.M, ButtonsMenuMinimal), ToolbarSize.S, ButtonsMenuMinimal), ToolbarSize.XXXS, [IconTypes.strong, IconTypes.em].concat(ButtonsMenuMinimal));
+
+/**
+ * Corresponding dropdown menu for the ResponsiveCustomButtonToolbarCompact
+ */
+export var ResponsiveCustomMenuCompact = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ToolbarSize.XXL, ButtonsMenuCompact), ToolbarSize.XL, ButtonsMenuCompact), ToolbarSize.L, ButtonsMenuCompact), ToolbarSize.M, ButtonsMenuCompact), ToolbarSize.S, ButtonsMenuCompact), ToolbarSize.XXXS, [IconTypes.strong, IconTypes.em].concat(ButtonsMenuCompact));
+
+/**
+ * Corresponding dropdown menu for the ResponsiveCustomButtonToolbarSpacious
+ */
+export var ResponsiveCustomMenuSpacious = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ToolbarSize.XXL, ButtonsMenuSpacious), ToolbarSize.XL, ButtonsMenuSpacious), ToolbarSize.L, ButtonsMenuSpacious), ToolbarSize.M, [IconTypes.underline].concat(ButtonsMenuSpacious)), ToolbarSize.S, [IconTypes.underline].concat(ButtonsMenuSpacious)), ToolbarSize.XXXS, [IconTypes.em, IconTypes.underline].concat(ButtonsMenuSpacious));

package/dist/esm/ui/Toolbar/hooks/responsive-toolbar-buttons.js

@@ -1,31 +1,61 @@
 import { useMemo } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { DefaultButtonsMenu, DefaultButtonsMenuNext, DefaultButtonsToolbar, DefaultButtonsToolbarNext, ResponsiveCustomButtonToolbar as ResponsiveCustomButtonToolbarLegacy, ResponsiveCustomButtonToolbarNext, ResponsiveCustomMenu as ResponsiveCustomMenuLegacy, ResponsiveCustomMenuNext } from '../constants';
+import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
+import { ButtonsMenuMinimal, ButtonsMenuCompact, ButtonsMenuSpacious, ToolbarButtonsStrong, ToolbarButtonsStrongItalic, ToolbarButtonsStrongItalicUnderline, ResponsiveCustomButtonToolbarMinimal, ResponsiveCustomButtonToolbarCompact, ResponsiveCustomButtonToolbarSpacious, ResponsiveCustomMenuMinimal, ResponsiveCustomMenuCompact, ResponsiveCustomMenuSpacious } from '../constants';
 import { useIconList } from './use-icon-list';
 export var useResponsiveIconTypeButtons = function useResponsiveIconTypeButtons(_ref) {
   var toolbarSize = _ref.toolbarSize,
     responsivenessEnabled = _ref.responsivenessEnabled;
-  var ResponsiveCustomButtonToolbar = editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_4') ? ResponsiveCustomButtonToolbarNext : ResponsiveCustomButtonToolbarLegacy;
+  var ResponsiveCustomButtonToolbar = ResponsiveCustomButtonToolbarCompact;
+  if (expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1')) {
+    if (fg('platform_editor_controls_patch_13')) {
+      ResponsiveCustomButtonToolbar = ResponsiveCustomButtonToolbarMinimal;
+    } else {
+      ResponsiveCustomButtonToolbar = !fg('platform_editor_controls_patch_4') ? ResponsiveCustomButtonToolbarSpacious : ResponsiveCustomButtonToolbarCompact;
+    }
+  }
   var iconTypeList = useMemo(function () {
     return ResponsiveCustomButtonToolbar[toolbarSize];
   }, [toolbarSize, ResponsiveCustomButtonToolbar]);
   if (responsivenessEnabled) {
     return iconTypeList;
   }
-  return editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_4') ? DefaultButtonsToolbarNext : DefaultButtonsToolbar;
+  if (expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1')) {
+    if (fg('platform_editor_controls_patch_13')) {
+      return ToolbarButtonsStrong;
+    } else {
+      return !fg('platform_editor_controls_patch_4') ? ToolbarButtonsStrongItalicUnderline : ToolbarButtonsStrongItalic;
+    }
+  } else {
+    return ToolbarButtonsStrongItalic;
+  }
 };
 export var useResponsiveIconTypeMenu = function useResponsiveIconTypeMenu(_ref2) {
   var toolbarSize = _ref2.toolbarSize,
     responsivenessEnabled = _ref2.responsivenessEnabled;
-  var ResponsiveCustomMenu = editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_4') ? ResponsiveCustomMenuNext : ResponsiveCustomMenuLegacy;
+  var ResponsiveCustomMenu = ResponsiveCustomMenuCompact;
+  if (expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1')) {
+    if (fg('platform_editor_controls_patch_13')) {
+      ResponsiveCustomMenu = ResponsiveCustomMenuMinimal;
+    } else {
+      ResponsiveCustomMenu = !fg('platform_editor_controls_patch_4') ? ResponsiveCustomMenuSpacious : ResponsiveCustomMenuCompact;
+    }
+  }
   var iconTypeList = useMemo(function () {
     return ResponsiveCustomMenu[toolbarSize];
   }, [toolbarSize, ResponsiveCustomMenu]);
   if (responsivenessEnabled) {
     return iconTypeList;
   }
-  return editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_4') ? DefaultButtonsMenuNext : DefaultButtonsMenu;
+  if (expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1')) {
+    if (fg('platform_editor_controls_patch_13')) {
+      return ButtonsMenuMinimal;
+    } else {
+      return !fg('platform_editor_controls_patch_4') ? ButtonsMenuSpacious : ButtonsMenuCompact;
+    }
+  } else {
+    return ToolbarButtonsStrongItalic;
+  }
 };
 export var useResponsiveToolbarButtons = function useResponsiveToolbarButtons(_ref3) {
   var icons = _ref3.icons,

package/dist/types/textFormattingPluginType.d.ts

@@ -3,6 +3,7 @@ import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { BasePlugin } from '@atlaskit/editor-plugin-base';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugin-selection-toolbar';
+import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences';
 import type { ToggleMarkEditorCommand } from './pm-plugins/commands';
 export type TextFormattingPluginOptions = CommonTextFormattingOptions;
 export type TextFormattingPlugin = NextEditorPlugin<'textFormatting', {
@@ -11,7 +12,8 @@ export type TextFormattingPlugin = NextEditorPlugin<'textFormatting', {
         OptionalPlugin<AnalyticsPlugin>,
         OptionalPlugin<PrimaryToolbarPlugin>,
         OptionalPlugin<BasePlugin>,
-        OptionalPlugin<SelectionToolbarPlugin>
+        OptionalPlugin<SelectionToolbarPlugin>,
+        OptionalPlugin<UserPreferencesPlugin>
     ];
     commands: {
         toggleSuperscript: ToggleMarkEditorCommand;

package/dist/types/ui/Toolbar/constants.d.ts

@@ -1,19 +1,32 @@
 import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { IconTypes } from './types';
-export declare const DefaultButtonsToolbar: IconTypes[];
-export declare const DefaultFloatingToolbarButtonsNext: IconTypes[];
-export declare const DefaultButtonsToolbarNext: IconTypes[];
-export declare const DefaultButtonsMenu: IconTypes[];
-export declare const DefaultButtonsMenuNext: IconTypes[];
-/** @deprecated
- * When tidying platform_editor_controls this is to be removed in favor of ResponsiveCustomButtonToolbarNext
- * along with references to platform_editor_controls gate
+export declare const ToolbarButtonsStrongItalic: IconTypes[];
+export declare const ToolbarButtonsStrong: IconTypes[];
+export declare const ToolbarButtonsStrongItalicUnderline: IconTypes[];
+export declare const ButtonsMenuMinimal: IconTypes[];
+export declare const ButtonsMenuCompact: IconTypes[];
+export declare const ButtonsMenuSpacious: IconTypes[];
+/**
+ * Minimal toolbar is with Bold as single button, and Italic as a dropdown button.
  */
-export declare const ResponsiveCustomButtonToolbar: Record<ToolbarSize, IconTypes[]>;
-export declare const ResponsiveCustomButtonToolbarNext: Record<ToolbarSize, IconTypes[]>;
-/** @deprecated
- * When tidying platform_editor_controls this is to be removed in favor of ResponsiveCustomMenuNext
- * along with references to platform_editor_controls gate
+export declare const ResponsiveCustomButtonToolbarMinimal: Record<ToolbarSize, IconTypes[]>;
+/**
+ * Compact toolbar is with Bold, Italic as single buttons, and underline as a dropdown button.
  */
-export declare const ResponsiveCustomMenu: Record<ToolbarSize, IconTypes[]>;
-export declare const ResponsiveCustomMenuNext: Record<ToolbarSize, IconTypes[]>;
+export declare const ResponsiveCustomButtonToolbarCompact: Record<ToolbarSize, IconTypes[]>;
+/**
+ * Spacious toolbar is with Bold, italic, underline as single buttons, and strike as a dropdown button.
+ */
+export declare const ResponsiveCustomButtonToolbarSpacious: Record<ToolbarSize, IconTypes[]>;
+/**
+ * Corresponding dropdown menu for the ResponsiveCustomButtonToolbarMinimal
+ */
+export declare const ResponsiveCustomMenuMinimal: Record<ToolbarSize, IconTypes[]>;
+/**
+ * Corresponding dropdown menu for the ResponsiveCustomButtonToolbarCompact
+ */
+export declare const ResponsiveCustomMenuCompact: Record<ToolbarSize, IconTypes[]>;
+/**
+ * Corresponding dropdown menu for the ResponsiveCustomButtonToolbarSpacious
+ */
+export declare const ResponsiveCustomMenuSpacious: Record<ToolbarSize, IconTypes[]>;

package/dist/types/ui/Toolbar/hooks/responsive-toolbar-buttons.d.ts

@@ -1,14 +1,14 @@
 import type { ToolbarSize } from '@atlaskit/editor-common/types';
-import type { MenuIconItem } from '../types';
+import type { IconTypes, MenuIconItem } from '../types';
 import { type IconsPositions } from './use-icon-list';
 export declare const useResponsiveIconTypeButtons: ({ toolbarSize, responsivenessEnabled, }: {
     toolbarSize: ToolbarSize;
     responsivenessEnabled: boolean;
-}) => import("../types").IconTypes[];
+}) => IconTypes[];
 export declare const useResponsiveIconTypeMenu: ({ toolbarSize, responsivenessEnabled, }: {
     toolbarSize: ToolbarSize;
     responsivenessEnabled: boolean;
-}) => import("../types").IconTypes[];
+}) => IconTypes[];
 export declare const useResponsiveToolbarButtons: ({ icons, toolbarSize, responsivenessEnabled, }: {
     responsivenessEnabled: boolean;
     toolbarSize: ToolbarSize;

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

@@ -3,6 +3,7 @@ import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { BasePlugin } from '@atlaskit/editor-plugin-base';
 import type { PrimaryToolbarPlugin } from '@atlaskit/editor-plugin-primary-toolbar';
 import type { SelectionToolbarPlugin } from '@atlaskit/editor-plugin-selection-toolbar';
+import type { UserPreferencesPlugin } from '@atlaskit/editor-plugin-user-preferences';
 import type { ToggleMarkEditorCommand } from './pm-plugins/commands';
 export type TextFormattingPluginOptions = CommonTextFormattingOptions;
 export type TextFormattingPlugin = NextEditorPlugin<'textFormatting', {
@@ -11,7 +12,8 @@ export type TextFormattingPlugin = NextEditorPlugin<'textFormatting', {
         OptionalPlugin<AnalyticsPlugin>,
         OptionalPlugin<PrimaryToolbarPlugin>,
         OptionalPlugin<BasePlugin>,
-        OptionalPlugin<SelectionToolbarPlugin>
+        OptionalPlugin<SelectionToolbarPlugin>,
+        OptionalPlugin<UserPreferencesPlugin>
     ];
     commands: {
         toggleSuperscript: ToggleMarkEditorCommand;

package/dist/types-ts4.5/ui/Toolbar/constants.d.ts

@@ -1,19 +1,32 @@
 import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { IconTypes } from './types';
-export declare const DefaultButtonsToolbar: IconTypes[];
-export declare const DefaultFloatingToolbarButtonsNext: IconTypes[];
-export declare const DefaultButtonsToolbarNext: IconTypes[];
-export declare const DefaultButtonsMenu: IconTypes[];
-export declare const DefaultButtonsMenuNext: IconTypes[];
-/** @deprecated
- * When tidying platform_editor_controls this is to be removed in favor of ResponsiveCustomButtonToolbarNext
- * along with references to platform_editor_controls gate
+export declare const ToolbarButtonsStrongItalic: IconTypes[];
+export declare const ToolbarButtonsStrong: IconTypes[];
+export declare const ToolbarButtonsStrongItalicUnderline: IconTypes[];
+export declare const ButtonsMenuMinimal: IconTypes[];
+export declare const ButtonsMenuCompact: IconTypes[];
+export declare const ButtonsMenuSpacious: IconTypes[];
+/**
+ * Minimal toolbar is with Bold as single button, and Italic as a dropdown button.
  */
-export declare const ResponsiveCustomButtonToolbar: Record<ToolbarSize, IconTypes[]>;
-export declare const ResponsiveCustomButtonToolbarNext: Record<ToolbarSize, IconTypes[]>;
-/** @deprecated
- * When tidying platform_editor_controls this is to be removed in favor of ResponsiveCustomMenuNext
- * along with references to platform_editor_controls gate
+export declare const ResponsiveCustomButtonToolbarMinimal: Record<ToolbarSize, IconTypes[]>;
+/**
+ * Compact toolbar is with Bold, Italic as single buttons, and underline as a dropdown button.
  */
-export declare const ResponsiveCustomMenu: Record<ToolbarSize, IconTypes[]>;
-export declare const ResponsiveCustomMenuNext: Record<ToolbarSize, IconTypes[]>;
+export declare const ResponsiveCustomButtonToolbarCompact: Record<ToolbarSize, IconTypes[]>;
+/**
+ * Spacious toolbar is with Bold, italic, underline as single buttons, and strike as a dropdown button.
+ */
+export declare const ResponsiveCustomButtonToolbarSpacious: Record<ToolbarSize, IconTypes[]>;
+/**
+ * Corresponding dropdown menu for the ResponsiveCustomButtonToolbarMinimal
+ */
+export declare const ResponsiveCustomMenuMinimal: Record<ToolbarSize, IconTypes[]>;
+/**
+ * Corresponding dropdown menu for the ResponsiveCustomButtonToolbarCompact
+ */
+export declare const ResponsiveCustomMenuCompact: Record<ToolbarSize, IconTypes[]>;
+/**
+ * Corresponding dropdown menu for the ResponsiveCustomButtonToolbarSpacious
+ */
+export declare const ResponsiveCustomMenuSpacious: Record<ToolbarSize, IconTypes[]>;

package/dist/types-ts4.5/ui/Toolbar/hooks/responsive-toolbar-buttons.d.ts

@@ -1,14 +1,14 @@
 import type { ToolbarSize } from '@atlaskit/editor-common/types';
-import type { MenuIconItem } from '../types';
+import type { IconTypes, MenuIconItem } from '../types';
 import { type IconsPositions } from './use-icon-list';
 export declare const useResponsiveIconTypeButtons: ({ toolbarSize, responsivenessEnabled, }: {
     toolbarSize: ToolbarSize;
     responsivenessEnabled: boolean;
-}) => import("../types").IconTypes[];
+}) => IconTypes[];
 export declare const useResponsiveIconTypeMenu: ({ toolbarSize, responsivenessEnabled, }: {
     toolbarSize: ToolbarSize;
     responsivenessEnabled: boolean;
-}) => import("../types").IconTypes[];
+}) => IconTypes[];
 export declare const useResponsiveToolbarButtons: ({ icons, toolbarSize, responsivenessEnabled, }: {
     responsivenessEnabled: boolean;
     toolbarSize: ToolbarSize;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-text-formatting",
-	"version": "2.2.18",
+	"version": "2.3.0",
 	"description": "Text-formatting plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,11 +34,11 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^106.6.0",
+		"@atlaskit/editor-common": "^106.7.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-base": "^3.0.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^3.2.0",
-		"@atlaskit/editor-plugin-selection-toolbar": "^3.6.0",
+		"@atlaskit/editor-plugin-selection-toolbar": "^3.7.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/editor-tables": "^2.9.0",
@@ -46,7 +46,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.3.0",
 		"@atlaskit/tmp-editor-statsig": "^7.0.0",
-		"@atlaskit/tokens": "^5.1.0",
+		"@atlaskit/tokens": "^5.2.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -116,12 +116,18 @@
 		"platform_editor_controls_patch_10": {
 			"type": "boolean"
 		},
+		"platform_editor_controls_patch_13": {
+			"type": "boolean"
+		},
 		"editor_inline_comments_on_inline_nodes": {
 			"type": "boolean"
 		},
 		"platform_editor_controls_patch_4": {
 			"type": "boolean"
 		},
+		"platform_editor_use_preferences_plugin": {
+			"type": "boolean"
+		},
 		"platform_editor_controls_patch_7": {
 			"type": "boolean"
 		}