@atlaskit/editor-plugin-text-formatting 3.0.12 → 3.0.14

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-text-formatting
 
+## 3.0.14
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.0.13
+
+### Patch Changes
+
+- [`9a547b35d41b0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9a547b35d41b0) -
+  Cleanup platform_editor_common_marks
+- Updated dependencies
+
 ## 3.0.12
 
 ### Patch Changes

package/dist/cjs/pm-plugins/main.js

@@ -14,7 +14,6 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _commands = require("@atlaskit/editor-prosemirror/commands");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _textFormatting = _interopRequireWildcard(require("../editor-commands/text-formatting"));
@@ -53,7 +52,7 @@ var getTextFormattingState = function getTextFormattingState(editorState, editor
   var state = {
     isInitialised: true
   };
-  var showOnlyCommonMarks = (0, _expValEquals.expValEquals)('platform_editor_controls', 'cohort', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_common_marks');
+  var showOnlyCommonMarks = (0, _expValEquals.expValEquals)('platform_editor_controls', 'cohort', 'variant1');
   if (showOnlyCommonMarks) {
     // Code marks will disable all other formatting options when they are included in a
     // selection but (for now) we do not want to make it behave differently in regards to which

package/dist/cjs/ui/FloatingToolbarComponent.js

@@ -12,12 +12,9 @@ var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _types = require("@atlaskit/editor-common/types");
-var _state = require("@atlaskit/editor-prosemirror/state");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _constants = require("./Toolbar/constants");
 var _dropdownMenu = require("./Toolbar/dropdown-menu");
-var _formattingInSelectionUtils = require("./Toolbar/formatting-in-selection-utils");
 var _clearFormattingIcon = require("./Toolbar/hooks/clear-formatting-icon");
 var _formattingIcons = require("./Toolbar/hooks/formatting-icons");
 var _useIconList2 = require("./Toolbar/hooks/use-icon-list");
@@ -153,31 +150,13 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
   var textFormattingState = useSharedState(api);
   var formattingIsPresent = textFormattingState.formattingIsPresent,
     formattingIconState = (0, _objectWithoutProperties2.default)(textFormattingState, _excluded);
-  var hasMultiplePartsWithFormattingSelected;
-  var commonActiveMarks;
-  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
-    var selection = editorView.state.selection;
-    var from = selection.from,
-      to = selection.to;
-    var selectedContent = selection instanceof _state.TextSelection ? editorView.state.doc.slice(from, to).content.content.slice() : undefined;
-    hasMultiplePartsWithFormattingSelected = (0, _platformFeatureFlags.fg)('platform_editor_common_marks') ? false : (0, _formattingInSelectionUtils.hasMultiplePartsWithFormattingInSelection)({
-      selectedContent: selectedContent
-    });
-    if (!(0, _platformFeatureFlags.fg)('platform_editor_common_marks')) {
-      commonActiveMarks = (0, _formattingInSelectionUtils.getCommonActiveMarks)({
-        selectedContent: selectedContent
-      });
-    }
-  }
   var defaultIcons = (0, _formattingIcons.useFormattingIcons)({
     schema: editorView.state.schema,
     intl: intl,
     isToolbarDisabled: FloatingToolbarSettings.disabled,
     editorAnalyticsAPI: editorAnalyticsAPI,
     textFormattingState: formattingIconState,
-    toolbarType: FloatingToolbarSettings.toolbarType,
-    hasMultiplePartsWithFormattingSelected: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? hasMultiplePartsWithFormattingSelected : undefined,
-    commonActiveMarks: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? commonActiveMarks : undefined
+    toolbarType: FloatingToolbarSettings.toolbarType
   });
   var _useIconList = (0, _useIconList2.useIconList)({
       icons: defaultIcons,
@@ -207,8 +186,7 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
   return (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_singleToolbarButtons.SingleToolbarButtons, {
     items: singleItems,
     editorView: editorView,
-    isReducedSpacing: false,
-    hasMultiplePartsWithFormattingSelected: hasMultiplePartsWithFormattingSelected
+    isReducedSpacing: false
   }), (0, _react2.jsx)(_dropdownMenu.FormattingTextDropdownMenu, {
     editorView: editorView,
     items: items,
@@ -217,8 +195,7 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
     hasFormattingActive: FloatingToolbarSettings.hasMoreButton,
     hasMoreButton: FloatingToolbarSettings.hasMoreButton,
     intl: intl,
-    toolbarType: FloatingToolbarSettings.toolbarType,
-    hasMultiplePartsWithFormattingSelected: hasMultiplePartsWithFormattingSelected
+    toolbarType: FloatingToolbarSettings.toolbarType
   }));
 };
 var FloatingToolbarTextFormalWithIntl = exports.FloatingToolbarTextFormalWithIntl = (0, _reactIntlNext.injectIntl)(FloatingToolbarTextFormat);

package/dist/cjs/ui/Toolbar/dropdown-menu.js

@@ -29,7 +29,6 @@ var FormattingTextDropdownMenu = exports.FormattingTextDropdownMenu = /*#__PURE_
     hasMoreButton = _ref.hasMoreButton,
     intl = _ref.intl,
     toolbarType = _ref.toolbarType,
-    hasMultiplePartsWithFormattingSelected = _ref.hasMultiplePartsWithFormattingSelected,
     isDisabled = _ref.isDisabled;
   var _useMenuState = (0, _menuState.useMenuState)(),
     _useMenuState2 = (0, _slicedToArray2.default)(_useMenuState, 3),
@@ -56,14 +55,8 @@ var FormattingTextDropdownMenu = exports.FormattingTextDropdownMenu = /*#__PURE_
   });
   var defaultIcon = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? (_items$0$items$ = items[0].items[0]) === null || _items$0$items$ === void 0 ? void 0 : _items$0$items$.elemBefore : undefined;
   var defaultIconName = (_items$0$items$2 = items[0].items[0]) === null || _items$0$items$2 === void 0 ? void 0 : _items$0$items$2.value.name;
-  var iconBefore;
-  var activeIconName = defaultIconName;
-  if (hasMultiplePartsWithFormattingSelected && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
-    iconBefore = defaultIcon;
-  } else {
-    iconBefore = activeItem ? activeItem === null || activeItem === void 0 ? void 0 : activeItem.elemBefore : defaultIcon;
-    activeIconName = (activeItem === null || activeItem === void 0 ? void 0 : activeItem.value.name) || defaultIconName;
-  }
+  var iconBefore = activeItem ? activeItem === null || activeItem === void 0 ? void 0 : activeItem.elemBefore : defaultIcon;
+  var activeIconName = (activeItem === null || activeItem === void 0 ? void 0 : activeItem.value.name) || defaultIconName;
   return /*#__PURE__*/_react.default.createElement(_uiMenu.DropdownMenuWithKeyboardNavigation, {
     mountTo: popupsMountPoint,
     onOpenChange: closeMenu,

package/dist/cjs/ui/Toolbar/hooks/formatting-icons.js

@@ -175,7 +175,7 @@ var getIcon = function getIcon(_ref) {
   };
 };
 var IconsMarkSchema = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _types.IconTypes.strong, 'strong'), _types.IconTypes.em, 'em'), _types.IconTypes.strike, 'strike'), _types.IconTypes.code, 'code'), _types.IconTypes.underline, 'underline'), _types.IconTypes.superscript, 'subsup'), _types.IconTypes.subscript, 'subsup');
-var buildMenuIconState = function buildMenuIconState(iconMark, hasMultiplePartsWithFormattingSelected, commonActiveMarks) {
+var buildMenuIconState = function buildMenuIconState(iconMark) {
   return function (_ref2) {
     var schema = _ref2.schema,
       textFormattingState = _ref2.textFormattingState;
@@ -190,7 +190,7 @@ var buildMenuIconState = function buildMenuIconState(iconMark, hasMultiplePartsW
         hasSchemaMark: hasSchemaMark
       };
     }
-    var isActive = hasMultiplePartsWithFormattingSelected && !(commonActiveMarks !== null && commonActiveMarks !== void 0 && commonActiveMarks.includes(iconMark)) && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? false : textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Active")];
+    var isActive = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Active")];
     var isDisabled = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Disabled")];
     var isHidden = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Hidden")];
     return {
@@ -201,8 +201,8 @@ var buildMenuIconState = function buildMenuIconState(iconMark, hasMultiplePartsW
     };
   };
 };
-var buildIcon = function buildIcon(iconMark, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks) {
-  var getState = buildMenuIconState(iconMark, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
+var buildIcon = function buildIcon(iconMark, editorAnalyticsAPI, toolbarType) {
+  var getState = buildMenuIconState(iconMark);
   return function (_ref3) {
     var schema = _ref3.schema,
       textFormattingState = _ref3.textFormattingState,
@@ -238,25 +238,21 @@ var useFormattingIcons = exports.useFormattingIcons = function useFormattingIcon
     schema = _ref4.schema,
     intl = _ref4.intl,
     editorAnalyticsAPI = _ref4.editorAnalyticsAPI,
-    toolbarType = _ref4.toolbarType,
-    hasMultiplePartsWithFormattingSelected = _ref4.hasMultiplePartsWithFormattingSelected,
-    commonActiveMarks = _ref4.commonActiveMarks;
+    toolbarType = _ref4.toolbarType;
   var props = {
     schema: schema,
     textFormattingState: textFormattingState,
     intl: intl,
     isToolbarDisabled: Boolean(isToolbarDisabled),
-    toolbarType: toolbarType,
-    hasMultiplePartsWithFormattingSelected: hasMultiplePartsWithFormattingSelected,
-    commonActiveMarks: commonActiveMarks
+    toolbarType: toolbarType
   };
-  var buildStrongIcon = buildIcon(_types.IconTypes.strong, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  var buildEmIcon = buildIcon(_types.IconTypes.em, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  var buildUnderlineIcon = buildIcon(_types.IconTypes.underline, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  var buildStrikeIcon = buildIcon(_types.IconTypes.strike, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  var buildCodeIcon = buildIcon(_types.IconTypes.code, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  var buildSubscriptIcon = buildIcon(_types.IconTypes.subscript, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  var buildSuperscriptIcon = buildIcon(_types.IconTypes.superscript, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
+  var buildStrongIcon = buildIcon(_types.IconTypes.strong, editorAnalyticsAPI, toolbarType);
+  var buildEmIcon = buildIcon(_types.IconTypes.em, editorAnalyticsAPI, toolbarType);
+  var buildUnderlineIcon = buildIcon(_types.IconTypes.underline, editorAnalyticsAPI, toolbarType);
+  var buildStrikeIcon = buildIcon(_types.IconTypes.strike, editorAnalyticsAPI, toolbarType);
+  var buildCodeIcon = buildIcon(_types.IconTypes.code, editorAnalyticsAPI, toolbarType);
+  var buildSubscriptIcon = buildIcon(_types.IconTypes.subscript, editorAnalyticsAPI, toolbarType);
+  var buildSuperscriptIcon = buildIcon(_types.IconTypes.superscript, editorAnalyticsAPI, toolbarType);
   var strongIcon = buildStrongIcon(props);
   var emIcon = buildEmIcon(props);
   var underlineIcon = buildUnderlineIcon(props);

package/dist/cjs/ui/Toolbar/single-toolbar-buttons.js

@@ -21,8 +21,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 var SingleToolbarButtons = exports.SingleToolbarButtons = /*#__PURE__*/_react.default.memo(function (_ref) {
   var items = _ref.items,
     isReducedSpacing = _ref.isReducedSpacing,
-    editorView = _ref.editorView,
-    hasMultiplePartsWithFormattingSelected = _ref.hasMultiplePartsWithFormattingSelected;
+    editorView = _ref.editorView;
   var onClick = (0, _react.useCallback)(function (command) {
     return function () {
       command(editorView.state, editorView.dispatch);

package/dist/es2019/pm-plugins/main.js

@@ -8,7 +8,6 @@ import { shallowEqual } from '@atlaskit/editor-common/utils';
 import { toggleMark } from '@atlaskit/editor-prosemirror/commands';
 import { MarkType } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createInlineCodeFromTextInputWithAnalytics } from '../editor-commands/text-formatting';
@@ -43,7 +42,7 @@ const getTextFormattingState = (editorState, editorAnalyticsAPI) => {
   const state = {
     isInitialised: true
   };
-  const showOnlyCommonMarks = expValEquals('platform_editor_controls', 'cohort', 'variant1') && fg('platform_editor_common_marks');
+  const showOnlyCommonMarks = expValEquals('platform_editor_controls', 'cohort', 'variant1');
   if (showOnlyCommonMarks) {
     // Code marks will disable all other formatting options when they are included in a
     // selection but (for now) we do not want to make it behave differently in regards to which

package/dist/es2019/ui/FloatingToolbarComponent.js

@@ -9,12 +9,9 @@ import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import { useSharedPluginState, sharedPluginStateHookMigratorFactory, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
-import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 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';
 import { useFormattingIcons } from './Toolbar/hooks/formatting-icons';
 import { useIconList } from './Toolbar/hooks/use-icon-list';
@@ -148,35 +145,13 @@ const FloatingToolbarTextFormat = ({
     formattingIsPresent,
     ...formattingIconState
   } = textFormattingState;
-  let hasMultiplePartsWithFormattingSelected;
-  let commonActiveMarks;
-  if (editorExperiment('platform_editor_controls', 'variant1')) {
-    const {
-      selection
-    } = editorView.state;
-    const {
-      from,
-      to
-    } = selection;
-    const selectedContent = selection instanceof TextSelection ? editorView.state.doc.slice(from, to).content.content.slice() : undefined;
-    hasMultiplePartsWithFormattingSelected = fg('platform_editor_common_marks') ? false : hasMultiplePartsWithFormattingInSelection({
-      selectedContent
-    });
-    if (!fg('platform_editor_common_marks')) {
-      commonActiveMarks = getCommonActiveMarks({
-        selectedContent
-      });
-    }
-  }
   const defaultIcons = useFormattingIcons({
     schema: editorView.state.schema,
     intl,
     isToolbarDisabled: FloatingToolbarSettings.disabled,
     editorAnalyticsAPI,
     textFormattingState: formattingIconState,
-    toolbarType: FloatingToolbarSettings.toolbarType,
-    hasMultiplePartsWithFormattingSelected: editorExperiment('platform_editor_controls', 'variant1') ? hasMultiplePartsWithFormattingSelected : undefined,
-    commonActiveMarks: editorExperiment('platform_editor_controls', 'variant1') ? commonActiveMarks : undefined
+    toolbarType: FloatingToolbarSettings.toolbarType
   });
   const {
     dropdownItems,
@@ -207,8 +182,7 @@ const FloatingToolbarTextFormat = ({
   return jsx(React.Fragment, null, jsx(SingleToolbarButtons, {
     items: singleItems,
     editorView: editorView,
-    isReducedSpacing: false,
-    hasMultiplePartsWithFormattingSelected: hasMultiplePartsWithFormattingSelected
+    isReducedSpacing: false
   }), jsx(FormattingTextDropdownMenu, {
     editorView: editorView,
     items: items,
@@ -217,8 +191,7 @@ const FloatingToolbarTextFormat = ({
     hasFormattingActive: FloatingToolbarSettings.hasMoreButton,
     hasMoreButton: FloatingToolbarSettings.hasMoreButton,
     intl: intl,
-    toolbarType: FloatingToolbarSettings.toolbarType,
-    hasMultiplePartsWithFormattingSelected: hasMultiplePartsWithFormattingSelected
+    toolbarType: FloatingToolbarSettings.toolbarType
   }));
 };
 export const FloatingToolbarTextFormalWithIntl = injectIntl(FloatingToolbarTextFormat);

package/dist/es2019/ui/Toolbar/dropdown-menu.js

@@ -18,7 +18,6 @@ export const FormattingTextDropdownMenu = /*#__PURE__*/React.memo(({
   hasMoreButton,
   intl,
   toolbarType,
-  hasMultiplePartsWithFormattingSelected,
   isDisabled
 }) => {
   var _items$0$items$, _items$0$items$2;
@@ -38,14 +37,8 @@ export const FormattingTextDropdownMenu = /*#__PURE__*/React.memo(({
   const activeItem = items[0].items.find(item => item.isActive);
   const defaultIcon = editorExperiment('platform_editor_controls', 'variant1') ? (_items$0$items$ = items[0].items[0]) === null || _items$0$items$ === void 0 ? void 0 : _items$0$items$.elemBefore : undefined;
   const defaultIconName = (_items$0$items$2 = items[0].items[0]) === null || _items$0$items$2 === void 0 ? void 0 : _items$0$items$2.value.name;
-  let iconBefore;
-  let activeIconName = defaultIconName;
-  if (hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1')) {
-    iconBefore = defaultIcon;
-  } else {
-    iconBefore = activeItem ? activeItem === null || activeItem === void 0 ? void 0 : activeItem.elemBefore : defaultIcon;
-    activeIconName = (activeItem === null || activeItem === void 0 ? void 0 : activeItem.value.name) || defaultIconName;
-  }
+  const iconBefore = activeItem ? activeItem === null || activeItem === void 0 ? void 0 : activeItem.elemBefore : defaultIcon;
+  const activeIconName = (activeItem === null || activeItem === void 0 ? void 0 : activeItem.value.name) || defaultIconName;
   return /*#__PURE__*/React.createElement(DropdownMenu, {
     mountTo: popupsMountPoint,
     onOpenChange: closeMenu,

package/dist/es2019/ui/Toolbar/hooks/formatting-icons.js

@@ -167,7 +167,7 @@ const IconsMarkSchema = {
   [IconTypes.superscript]: 'subsup',
   [IconTypes.subscript]: 'subsup'
 };
-const buildMenuIconState = (iconMark, hasMultiplePartsWithFormattingSelected, commonActiveMarks) => ({
+const buildMenuIconState = iconMark => ({
   schema,
   textFormattingState
 }) => {
@@ -182,7 +182,7 @@ const buildMenuIconState = (iconMark, hasMultiplePartsWithFormattingSelected, co
       hasSchemaMark
     };
   }
-  const isActive = hasMultiplePartsWithFormattingSelected && !(commonActiveMarks !== null && commonActiveMarks !== void 0 && commonActiveMarks.includes(iconMark)) && editorExperiment('platform_editor_controls', 'variant1') ? false : textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState[`${iconMark}Active`];
+  const isActive = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState[`${iconMark}Active`];
   const isDisabled = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState[`${iconMark}Disabled`];
   const isHidden = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState[`${iconMark}Hidden`];
   return {
@@ -192,8 +192,8 @@ const buildMenuIconState = (iconMark, hasMultiplePartsWithFormattingSelected, co
     hasSchemaMark
   };
 };
-const buildIcon = (iconMark, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks) => {
-  const getState = buildMenuIconState(iconMark, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
+const buildIcon = (iconMark, editorAnalyticsAPI, toolbarType) => {
+  const getState = buildMenuIconState(iconMark);
   return ({
     schema,
     textFormattingState,
@@ -228,26 +228,22 @@ export const useFormattingIcons = ({
   schema,
   intl,
   editorAnalyticsAPI,
-  toolbarType,
-  hasMultiplePartsWithFormattingSelected,
-  commonActiveMarks
+  toolbarType
 }) => {
   const props = {
     schema,
     textFormattingState,
     intl,
     isToolbarDisabled: Boolean(isToolbarDisabled),
-    toolbarType,
-    hasMultiplePartsWithFormattingSelected,
-    commonActiveMarks
+    toolbarType
   };
-  const buildStrongIcon = buildIcon(IconTypes.strong, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  const buildEmIcon = buildIcon(IconTypes.em, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  const buildUnderlineIcon = buildIcon(IconTypes.underline, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  const buildStrikeIcon = buildIcon(IconTypes.strike, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  const buildCodeIcon = buildIcon(IconTypes.code, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  const buildSubscriptIcon = buildIcon(IconTypes.subscript, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  const buildSuperscriptIcon = buildIcon(IconTypes.superscript, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
+  const buildStrongIcon = buildIcon(IconTypes.strong, editorAnalyticsAPI, toolbarType);
+  const buildEmIcon = buildIcon(IconTypes.em, editorAnalyticsAPI, toolbarType);
+  const buildUnderlineIcon = buildIcon(IconTypes.underline, editorAnalyticsAPI, toolbarType);
+  const buildStrikeIcon = buildIcon(IconTypes.strike, editorAnalyticsAPI, toolbarType);
+  const buildCodeIcon = buildIcon(IconTypes.code, editorAnalyticsAPI, toolbarType);
+  const buildSubscriptIcon = buildIcon(IconTypes.subscript, editorAnalyticsAPI, toolbarType);
+  const buildSuperscriptIcon = buildIcon(IconTypes.superscript, editorAnalyticsAPI, toolbarType);
   const strongIcon = buildStrongIcon(props);
   const emIcon = buildEmIcon(props);
   const underlineIcon = buildUnderlineIcon(props);

package/dist/es2019/ui/Toolbar/single-toolbar-buttons.js

@@ -12,8 +12,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 export const SingleToolbarButtons = /*#__PURE__*/React.memo(({
   items,
   isReducedSpacing,
-  editorView,
-  hasMultiplePartsWithFormattingSelected
+  editorView
 }) => {
   const onClick = useCallback(command => {
     return () => {

package/dist/esm/pm-plugins/main.js

@@ -12,7 +12,6 @@ import { shallowEqual } from '@atlaskit/editor-common/utils';
 import { toggleMark } from '@atlaskit/editor-prosemirror/commands';
 import { MarkType } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { createInlineCodeFromTextInputWithAnalytics } from '../editor-commands/text-formatting';
@@ -46,7 +45,7 @@ var getTextFormattingState = function getTextFormattingState(editorState, editor
   var state = {
     isInitialised: true
   };
-  var showOnlyCommonMarks = expValEquals('platform_editor_controls', 'cohort', 'variant1') && fg('platform_editor_common_marks');
+  var showOnlyCommonMarks = expValEquals('platform_editor_controls', 'cohort', 'variant1');
   if (showOnlyCommonMarks) {
     // Code marks will disable all other formatting options when they are included in a
     // selection but (for now) we do not want to make it behave differently in regards to which

package/dist/esm/ui/FloatingToolbarComponent.js

@@ -11,12 +11,9 @@ import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import { useSharedPluginState, sharedPluginStateHookMigratorFactory, useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
-import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 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';
 import { useFormattingIcons } from './Toolbar/hooks/formatting-icons';
 import { useIconList } from './Toolbar/hooks/use-icon-list';
@@ -145,31 +142,13 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
   var textFormattingState = useSharedState(api);
   var formattingIsPresent = textFormattingState.formattingIsPresent,
     formattingIconState = _objectWithoutProperties(textFormattingState, _excluded);
-  var hasMultiplePartsWithFormattingSelected;
-  var commonActiveMarks;
-  if (editorExperiment('platform_editor_controls', 'variant1')) {
-    var selection = editorView.state.selection;
-    var from = selection.from,
-      to = selection.to;
-    var selectedContent = selection instanceof TextSelection ? editorView.state.doc.slice(from, to).content.content.slice() : undefined;
-    hasMultiplePartsWithFormattingSelected = fg('platform_editor_common_marks') ? false : hasMultiplePartsWithFormattingInSelection({
-      selectedContent: selectedContent
-    });
-    if (!fg('platform_editor_common_marks')) {
-      commonActiveMarks = getCommonActiveMarks({
-        selectedContent: selectedContent
-      });
-    }
-  }
   var defaultIcons = useFormattingIcons({
     schema: editorView.state.schema,
     intl: intl,
     isToolbarDisabled: FloatingToolbarSettings.disabled,
     editorAnalyticsAPI: editorAnalyticsAPI,
     textFormattingState: formattingIconState,
-    toolbarType: FloatingToolbarSettings.toolbarType,
-    hasMultiplePartsWithFormattingSelected: editorExperiment('platform_editor_controls', 'variant1') ? hasMultiplePartsWithFormattingSelected : undefined,
-    commonActiveMarks: editorExperiment('platform_editor_controls', 'variant1') ? commonActiveMarks : undefined
+    toolbarType: FloatingToolbarSettings.toolbarType
   });
   var _useIconList = useIconList({
       icons: defaultIcons,
@@ -199,8 +178,7 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
   return jsx(React.Fragment, null, jsx(SingleToolbarButtons, {
     items: singleItems,
     editorView: editorView,
-    isReducedSpacing: false,
-    hasMultiplePartsWithFormattingSelected: hasMultiplePartsWithFormattingSelected
+    isReducedSpacing: false
   }), jsx(FormattingTextDropdownMenu, {
     editorView: editorView,
     items: items,
@@ -209,8 +187,7 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
     hasFormattingActive: FloatingToolbarSettings.hasMoreButton,
     hasMoreButton: FloatingToolbarSettings.hasMoreButton,
     intl: intl,
-    toolbarType: FloatingToolbarSettings.toolbarType,
-    hasMultiplePartsWithFormattingSelected: hasMultiplePartsWithFormattingSelected
+    toolbarType: FloatingToolbarSettings.toolbarType
   }));
 };
 export var FloatingToolbarTextFormalWithIntl = injectIntl(FloatingToolbarTextFormat);

package/dist/esm/ui/Toolbar/dropdown-menu.js

@@ -20,7 +20,6 @@ export var FormattingTextDropdownMenu = /*#__PURE__*/React.memo(function (_ref)
     hasMoreButton = _ref.hasMoreButton,
     intl = _ref.intl,
     toolbarType = _ref.toolbarType,
-    hasMultiplePartsWithFormattingSelected = _ref.hasMultiplePartsWithFormattingSelected,
     isDisabled = _ref.isDisabled;
   var _useMenuState = useMenuState(),
     _useMenuState2 = _slicedToArray(_useMenuState, 3),
@@ -47,14 +46,8 @@ export var FormattingTextDropdownMenu = /*#__PURE__*/React.memo(function (_ref)
   });
   var defaultIcon = editorExperiment('platform_editor_controls', 'variant1') ? (_items$0$items$ = items[0].items[0]) === null || _items$0$items$ === void 0 ? void 0 : _items$0$items$.elemBefore : undefined;
   var defaultIconName = (_items$0$items$2 = items[0].items[0]) === null || _items$0$items$2 === void 0 ? void 0 : _items$0$items$2.value.name;
-  var iconBefore;
-  var activeIconName = defaultIconName;
-  if (hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1')) {
-    iconBefore = defaultIcon;
-  } else {
-    iconBefore = activeItem ? activeItem === null || activeItem === void 0 ? void 0 : activeItem.elemBefore : defaultIcon;
-    activeIconName = (activeItem === null || activeItem === void 0 ? void 0 : activeItem.value.name) || defaultIconName;
-  }
+  var iconBefore = activeItem ? activeItem === null || activeItem === void 0 ? void 0 : activeItem.elemBefore : defaultIcon;
+  var activeIconName = (activeItem === null || activeItem === void 0 ? void 0 : activeItem.value.name) || defaultIconName;
   return /*#__PURE__*/React.createElement(DropdownMenu, {
     mountTo: popupsMountPoint,
     onOpenChange: closeMenu,

package/dist/esm/ui/Toolbar/hooks/formatting-icons.js

@@ -167,7 +167,7 @@ var getIcon = function getIcon(_ref) {
   };
 };
 var IconsMarkSchema = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, IconTypes.strong, 'strong'), IconTypes.em, 'em'), IconTypes.strike, 'strike'), IconTypes.code, 'code'), IconTypes.underline, 'underline'), IconTypes.superscript, 'subsup'), IconTypes.subscript, 'subsup');
-var buildMenuIconState = function buildMenuIconState(iconMark, hasMultiplePartsWithFormattingSelected, commonActiveMarks) {
+var buildMenuIconState = function buildMenuIconState(iconMark) {
   return function (_ref2) {
     var schema = _ref2.schema,
       textFormattingState = _ref2.textFormattingState;
@@ -182,7 +182,7 @@ var buildMenuIconState = function buildMenuIconState(iconMark, hasMultiplePartsW
         hasSchemaMark: hasSchemaMark
       };
     }
-    var isActive = hasMultiplePartsWithFormattingSelected && !(commonActiveMarks !== null && commonActiveMarks !== void 0 && commonActiveMarks.includes(iconMark)) && editorExperiment('platform_editor_controls', 'variant1') ? false : textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Active")];
+    var isActive = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Active")];
     var isDisabled = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Disabled")];
     var isHidden = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Hidden")];
     return {
@@ -193,8 +193,8 @@ var buildMenuIconState = function buildMenuIconState(iconMark, hasMultiplePartsW
     };
   };
 };
-var buildIcon = function buildIcon(iconMark, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks) {
-  var getState = buildMenuIconState(iconMark, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
+var buildIcon = function buildIcon(iconMark, editorAnalyticsAPI, toolbarType) {
+  var getState = buildMenuIconState(iconMark);
   return function (_ref3) {
     var schema = _ref3.schema,
       textFormattingState = _ref3.textFormattingState,
@@ -230,25 +230,21 @@ export var useFormattingIcons = function useFormattingIcons(_ref4) {
     schema = _ref4.schema,
     intl = _ref4.intl,
     editorAnalyticsAPI = _ref4.editorAnalyticsAPI,
-    toolbarType = _ref4.toolbarType,
-    hasMultiplePartsWithFormattingSelected = _ref4.hasMultiplePartsWithFormattingSelected,
-    commonActiveMarks = _ref4.commonActiveMarks;
+    toolbarType = _ref4.toolbarType;
   var props = {
     schema: schema,
     textFormattingState: textFormattingState,
     intl: intl,
     isToolbarDisabled: Boolean(isToolbarDisabled),
-    toolbarType: toolbarType,
-    hasMultiplePartsWithFormattingSelected: hasMultiplePartsWithFormattingSelected,
-    commonActiveMarks: commonActiveMarks
+    toolbarType: toolbarType
   };
-  var buildStrongIcon = buildIcon(IconTypes.strong, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  var buildEmIcon = buildIcon(IconTypes.em, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  var buildUnderlineIcon = buildIcon(IconTypes.underline, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  var buildStrikeIcon = buildIcon(IconTypes.strike, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  var buildCodeIcon = buildIcon(IconTypes.code, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  var buildSubscriptIcon = buildIcon(IconTypes.subscript, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
-  var buildSuperscriptIcon = buildIcon(IconTypes.superscript, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks);
+  var buildStrongIcon = buildIcon(IconTypes.strong, editorAnalyticsAPI, toolbarType);
+  var buildEmIcon = buildIcon(IconTypes.em, editorAnalyticsAPI, toolbarType);
+  var buildUnderlineIcon = buildIcon(IconTypes.underline, editorAnalyticsAPI, toolbarType);
+  var buildStrikeIcon = buildIcon(IconTypes.strike, editorAnalyticsAPI, toolbarType);
+  var buildCodeIcon = buildIcon(IconTypes.code, editorAnalyticsAPI, toolbarType);
+  var buildSubscriptIcon = buildIcon(IconTypes.subscript, editorAnalyticsAPI, toolbarType);
+  var buildSuperscriptIcon = buildIcon(IconTypes.superscript, editorAnalyticsAPI, toolbarType);
   var strongIcon = buildStrongIcon(props);
   var emIcon = buildEmIcon(props);
   var underlineIcon = buildUnderlineIcon(props);

package/dist/esm/ui/Toolbar/single-toolbar-buttons.js

@@ -12,8 +12,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 export var SingleToolbarButtons = /*#__PURE__*/React.memo(function (_ref) {
   var items = _ref.items,
     isReducedSpacing = _ref.isReducedSpacing,
-    editorView = _ref.editorView,
-    hasMultiplePartsWithFormattingSelected = _ref.hasMultiplePartsWithFormattingSelected;
+    editorView = _ref.editorView;
   var onClick = useCallback(function (command) {
     return function () {
       command(editorView.state, editorView.dispatch);

package/dist/types/ui/Toolbar/dropdown-menu.d.ts

@@ -15,8 +15,7 @@ type DropdownMenuProps = {
     popupsScrollableElement?: HTMLElement;
     hasMoreButton: boolean;
     toolbarType: ToolbarType;
-    hasMultiplePartsWithFormattingSelected?: boolean;
     isDisabled?: boolean;
 } & WrappedComponentProps;
-export declare const FormattingTextDropdownMenu: React.MemoExoticComponent<({ editorView, moreButtonLabel, isReducedSpacing, items, hasFormattingActive, popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, hasMoreButton, intl, toolbarType, hasMultiplePartsWithFormattingSelected, isDisabled, }: DropdownMenuProps) => React.JSX.Element>;
+export declare const FormattingTextDropdownMenu: React.MemoExoticComponent<({ editorView, moreButtonLabel, isReducedSpacing, items, hasFormattingActive, popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, hasMoreButton, intl, toolbarType, isDisabled, }: DropdownMenuProps) => React.JSX.Element>;
 export {};

package/dist/types/ui/Toolbar/dropdown-toolbar-button.d.ts

@@ -2,7 +2,7 @@
  * @jsxRuntime classic
  * @jsx jsx
  */
-import React, { type ReactElement } from 'react';
+import React from 'react';
 import { jsx } from '@emotion/react';
 import { ToolbarType } from './types';
 type DropdownButtonProps = {
@@ -14,7 +14,7 @@ type DropdownButtonProps = {
     onClick?: (event: React.MouseEvent<HTMLElement>) => void;
     onKeyDown?: (event: React.KeyboardEvent) => void;
     toolbarType: ToolbarType;
-    iconBefore?: ReactElement;
+    iconBefore?: React.ReactElement;
     activeIconName?: string;
 };
 export declare const DropdownToolbarButton: ({ label, isReducedSpacing, isDisabled, isSelected, "aria-expanded": ariaExpanded, onClick, onKeyDown, toolbarType, iconBefore, activeIconName, }: DropdownButtonProps) => jsx.JSX.Element;

package/dist/types/ui/Toolbar/hooks/formatting-icons.d.ts

@@ -8,10 +8,8 @@ interface FormattingIconHookProps extends IconHookProps {
     textFormattingState: TextFormattingState | undefined;
     schema: Schema;
     toolbarType: ToolbarType;
-    hasMultiplePartsWithFormattingSelected?: boolean;
-    commonActiveMarks?: string[];
 }
-export declare const useFormattingIcons: ({ isToolbarDisabled, textFormattingState, schema, intl, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks, }: FormattingIconHookProps) => Array<MenuIconItem | null>;
+export declare const useFormattingIcons: ({ isToolbarDisabled, textFormattingState, schema, intl, editorAnalyticsAPI, toolbarType, }: FormattingIconHookProps) => Array<MenuIconItem | null>;
 type Props = {
     textFormattingState: TextFormattingState | undefined;
     iconTypeList: IconTypes[];

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

@@ -6,9 +6,8 @@ import React from 'react';
 import { jsx } from '@emotion/react';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { MenuIconItem } from './types';
-export declare const SingleToolbarButtons: React.MemoExoticComponent<({ items, isReducedSpacing, editorView, hasMultiplePartsWithFormattingSelected, }: {
+export declare const SingleToolbarButtons: React.MemoExoticComponent<({ items, isReducedSpacing, editorView, }: {
     items: MenuIconItem[];
     isReducedSpacing: boolean;
     editorView: EditorView;
-    hasMultiplePartsWithFormattingSelected?: boolean;
 }) => jsx.JSX.Element>;

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

@@ -15,8 +15,7 @@ type DropdownMenuProps = {
     popupsScrollableElement?: HTMLElement;
     hasMoreButton: boolean;
     toolbarType: ToolbarType;
-    hasMultiplePartsWithFormattingSelected?: boolean;
     isDisabled?: boolean;
 } & WrappedComponentProps;
-export declare const FormattingTextDropdownMenu: React.MemoExoticComponent<({ editorView, moreButtonLabel, isReducedSpacing, items, hasFormattingActive, popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, hasMoreButton, intl, toolbarType, hasMultiplePartsWithFormattingSelected, isDisabled, }: DropdownMenuProps) => React.JSX.Element>;
+export declare const FormattingTextDropdownMenu: React.MemoExoticComponent<({ editorView, moreButtonLabel, isReducedSpacing, items, hasFormattingActive, popupsBoundariesElement, popupsMountPoint, popupsScrollableElement, hasMoreButton, intl, toolbarType, isDisabled, }: DropdownMenuProps) => React.JSX.Element>;
 export {};

package/dist/types-ts4.5/ui/Toolbar/dropdown-toolbar-button.d.ts

@@ -2,7 +2,7 @@
  * @jsxRuntime classic
  * @jsx jsx
  */
-import React, { type ReactElement } from 'react';
+import React from 'react';
 import { jsx } from '@emotion/react';
 import { ToolbarType } from './types';
 type DropdownButtonProps = {
@@ -14,7 +14,7 @@ type DropdownButtonProps = {
     onClick?: (event: React.MouseEvent<HTMLElement>) => void;
     onKeyDown?: (event: React.KeyboardEvent) => void;
     toolbarType: ToolbarType;
-    iconBefore?: ReactElement;
+    iconBefore?: React.ReactElement;
     activeIconName?: string;
 };
 export declare const DropdownToolbarButton: ({ label, isReducedSpacing, isDisabled, isSelected, "aria-expanded": ariaExpanded, onClick, onKeyDown, toolbarType, iconBefore, activeIconName, }: DropdownButtonProps) => jsx.JSX.Element;

package/dist/types-ts4.5/ui/Toolbar/hooks/formatting-icons.d.ts

@@ -8,10 +8,8 @@ interface FormattingIconHookProps extends IconHookProps {
     textFormattingState: TextFormattingState | undefined;
     schema: Schema;
     toolbarType: ToolbarType;
-    hasMultiplePartsWithFormattingSelected?: boolean;
-    commonActiveMarks?: string[];
 }
-export declare const useFormattingIcons: ({ isToolbarDisabled, textFormattingState, schema, intl, editorAnalyticsAPI, toolbarType, hasMultiplePartsWithFormattingSelected, commonActiveMarks, }: FormattingIconHookProps) => Array<MenuIconItem | null>;
+export declare const useFormattingIcons: ({ isToolbarDisabled, textFormattingState, schema, intl, editorAnalyticsAPI, toolbarType, }: FormattingIconHookProps) => Array<MenuIconItem | null>;
 type Props = {
     textFormattingState: TextFormattingState | undefined;
     iconTypeList: IconTypes[];

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

@@ -6,9 +6,8 @@ import React from 'react';
 import { jsx } from '@emotion/react';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { MenuIconItem } from './types';
-export declare const SingleToolbarButtons: React.MemoExoticComponent<({ items, isReducedSpacing, editorView, hasMultiplePartsWithFormattingSelected, }: {
+export declare const SingleToolbarButtons: React.MemoExoticComponent<({ items, isReducedSpacing, editorView, }: {
     items: MenuIconItem[];
     isReducedSpacing: boolean;
     editorView: EditorView;
-    hasMultiplePartsWithFormattingSelected?: boolean;
 }) => jsx.JSX.Element>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-text-formatting",
-	"version": "3.0.12",
+	"version": "3.0.14",
 	"description": "Text-formatting plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -41,19 +41,19 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.6.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/editor-toolbar": "^0.2.0",
+		"@atlaskit/editor-toolbar": "^0.3.0",
 		"@atlaskit/editor-toolbar-model": "^0.1.0",
-		"@atlaskit/icon": "^27.11.0",
+		"@atlaskit/icon": "^27.12.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.4.0",
-		"@atlaskit/tmp-editor-statsig": "^9.27.0",
+		"@atlaskit/tmp-editor-statsig": "^9.28.0",
 		"@atlaskit/tokens": "^6.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.21.0",
+		"@atlaskit/editor-common": "^107.23.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -113,9 +113,6 @@
 		},
 		"platform_editor_use_preferences_plugin": {
 			"type": "boolean"
-		},
-		"platform_editor_common_marks": {
-			"type": "boolean"
 		}
 	}
 }

package/dist/cjs/ui/Toolbar/formatting-in-selection-utils.js

@@ -1,52 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.hasMultiplePartsWithFormattingInSelection = exports.getCommonActiveMarks = void 0;
-var _types = require("./types");
-var isMarkInIconTypes = function isMarkInIconTypes(node) {
-  return node.marks.some(function (mark) {
-    return Object.values(_types.IconTypes).includes(mark.type.name);
-  });
-};
-var hasMultiplePartsWithFormattingInSelection = exports.hasMultiplePartsWithFormattingInSelection = function hasMultiplePartsWithFormattingInSelection(_ref) {
-  var selectedContent = _ref.selectedContent;
-  if (!selectedContent) {
-    return false;
-  }
-
-  // Check if there are multiple parts with formatting or if only one part has formatting and the rest have none
-  var contentWithMarks = selectedContent.filter(function (child) {
-    return isMarkInIconTypes(child);
-  });
-  var hasFormatting = contentWithMarks.length > 0;
-  var allPartsHaveFormatting = contentWithMarks.length === selectedContent.length;
-  return hasFormatting && (!allPartsHaveFormatting || contentWithMarks.length > 1);
-};
-
-// Clean up when platform_editor_common_marks is removed
-var getCommonActiveMarks = exports.getCommonActiveMarks = function getCommonActiveMarks(_ref2) {
-  var selectedContent = _ref2.selectedContent;
-  if (!selectedContent || selectedContent.length === 0) {
-    return [];
-  }
-  // filter out fragment node contains only spaces
-  var filteredSelectedContent = selectedContent.filter(function (child) {
-    var _child$text;
-    return ((_child$text = child.text) === null || _child$text === void 0 ? void 0 : _child$text.trim()) !== '';
-  });
-  // find the active mark type in first part
-  var firstPartMarks = selectedContent[0].marks.map(function (mark) {
-    return mark.type.name;
-  });
-  // check if all other parts have the same mark type as the first part and return the common mark types
-  var commonMarkTypes = firstPartMarks.filter(function (mark) {
-    return filteredSelectedContent.every(function (child) {
-      return child.marks.some(function (m) {
-        return m.type.name === mark;
-      });
-    });
-  });
-  return commonMarkTypes;
-};

package/dist/es2019/ui/Toolbar/formatting-in-selection-utils.js

@@ -1,34 +0,0 @@
-import { IconTypes } from './types';
-const isMarkInIconTypes = node => node.marks.some(mark => Object.values(IconTypes).includes(mark.type.name));
-export const hasMultiplePartsWithFormattingInSelection = ({
-  selectedContent
-}) => {
-  if (!selectedContent) {
-    return false;
-  }
-
-  // Check if there are multiple parts with formatting or if only one part has formatting and the rest have none
-  const contentWithMarks = selectedContent.filter(child => isMarkInIconTypes(child));
-  const hasFormatting = contentWithMarks.length > 0;
-  const allPartsHaveFormatting = contentWithMarks.length === selectedContent.length;
-  return hasFormatting && (!allPartsHaveFormatting || contentWithMarks.length > 1);
-};
-
-// Clean up when platform_editor_common_marks is removed
-export const getCommonActiveMarks = ({
-  selectedContent
-}) => {
-  if (!selectedContent || selectedContent.length === 0) {
-    return [];
-  }
-  // filter out fragment node contains only spaces
-  const filteredSelectedContent = selectedContent.filter(child => {
-    var _child$text;
-    return ((_child$text = child.text) === null || _child$text === void 0 ? void 0 : _child$text.trim()) !== '';
-  });
-  // find the active mark type in first part
-  const firstPartMarks = selectedContent[0].marks.map(mark => mark.type.name);
-  // check if all other parts have the same mark type as the first part and return the common mark types
-  const commonMarkTypes = firstPartMarks.filter(mark => filteredSelectedContent.every(child => child.marks.some(m => m.type.name === mark)));
-  return commonMarkTypes;
-};

package/dist/esm/ui/Toolbar/formatting-in-selection-utils.js

@@ -1,46 +0,0 @@
-import { IconTypes } from './types';
-var isMarkInIconTypes = function isMarkInIconTypes(node) {
-  return node.marks.some(function (mark) {
-    return Object.values(IconTypes).includes(mark.type.name);
-  });
-};
-export var hasMultiplePartsWithFormattingInSelection = function hasMultiplePartsWithFormattingInSelection(_ref) {
-  var selectedContent = _ref.selectedContent;
-  if (!selectedContent) {
-    return false;
-  }
-
-  // Check if there are multiple parts with formatting or if only one part has formatting and the rest have none
-  var contentWithMarks = selectedContent.filter(function (child) {
-    return isMarkInIconTypes(child);
-  });
-  var hasFormatting = contentWithMarks.length > 0;
-  var allPartsHaveFormatting = contentWithMarks.length === selectedContent.length;
-  return hasFormatting && (!allPartsHaveFormatting || contentWithMarks.length > 1);
-};
-
-// Clean up when platform_editor_common_marks is removed
-export var getCommonActiveMarks = function getCommonActiveMarks(_ref2) {
-  var selectedContent = _ref2.selectedContent;
-  if (!selectedContent || selectedContent.length === 0) {
-    return [];
-  }
-  // filter out fragment node contains only spaces
-  var filteredSelectedContent = selectedContent.filter(function (child) {
-    var _child$text;
-    return ((_child$text = child.text) === null || _child$text === void 0 ? void 0 : _child$text.trim()) !== '';
-  });
-  // find the active mark type in first part
-  var firstPartMarks = selectedContent[0].marks.map(function (mark) {
-    return mark.type.name;
-  });
-  // check if all other parts have the same mark type as the first part and return the common mark types
-  var commonMarkTypes = firstPartMarks.filter(function (mark) {
-    return filteredSelectedContent.every(function (child) {
-      return child.marks.some(function (m) {
-        return m.type.name === mark;
-      });
-    });
-  });
-  return commonMarkTypes;
-};

package/dist/types/ui/Toolbar/formatting-in-selection-utils.d.ts

@@ -1,7 +0,0 @@
-import { type Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-export declare const hasMultiplePartsWithFormattingInSelection: ({ selectedContent, }: {
-    selectedContent?: PMNode[];
-}) => boolean;
-export declare const getCommonActiveMarks: ({ selectedContent }: {
-    selectedContent?: PMNode[];
-}) => string[];

package/dist/types-ts4.5/ui/Toolbar/formatting-in-selection-utils.d.ts

@@ -1,7 +0,0 @@
-import { type Node as PMNode } from '@atlaskit/editor-prosemirror/model';
-export declare const hasMultiplePartsWithFormattingInSelection: ({ selectedContent, }: {
-    selectedContent?: PMNode[];
-}) => boolean;
-export declare const getCommonActiveMarks: ({ selectedContent }: {
-    selectedContent?: PMNode[];
-}) => string[];