@atlaskit/editor-plugin-text-formatting 2.4.0 → 3.0.0

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # @atlaskit/editor-plugin-text-formatting
 
+## 3.0.0
+
+### Major Changes
+
+- [#181024](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/181024)
+  [`8e80c487ca307`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8e80c487ca307) - ##
+  Make `@atlaskit/editor-common` a peer dependency
+
+  **WHAT:** `@atlaskit/editor-common` has been moved from `dependencies` to `peerDependencies` in
+  all editor plugin packages.
+
+  **WHY:** This change ensures that only a single version of `@atlaskit/editor-common` is used in
+  consuming applications, preventing issues caused by multiple versions of singleton libraries (such
+  as context mismatches or duplicated state). This is especially important for packages that rely on
+  shared context or singletons.
+
+  **HOW TO ADJUST:**
+
+  - Consumers must now explicitly install `@atlaskit/editor-common` in their own project if they use
+    any of these editor plugins.
+  - Ensure the version you install matches the version required by the plugins.
+  - You can use the
+    [`check-peer-dependencies`](https://www.npmjs.com/package/check-peer-dependencies) package to
+    verify that all required peer dependencies are installed and compatible.
+  - Example install command:
+    ```
+    npm install @atlaskit/editor-common
+    ```
+    or
+    ```
+    yarn add @atlaskit/editor-common
+    ```
+
+  **Note:** This is a breaking change. If `@atlaskit/editor-common` is not installed at the
+  application level, you may see errors or unexpected behavior.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.4.1
+
+### Patch Changes
+
+- [#173846](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/173846)
+  [`852a3c0aec64b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/852a3c0aec64b) -
+  Clean up platform_editor_controls_patch_10
+
 ## 2.4.0
 
 ### Minor Changes

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

@@ -155,7 +155,7 @@ var plugin = exports.plugin = function plugin(dispatch, editorAnalyticsAPI) {
           return commands.moveRight()(state, dispatch);
         } else if (event.key === _keymaps.moveLeft.common && !event.metaKey) {
           return commands.moveLeft()(state, dispatch);
-        } else if (event.key === 'u' && event.metaKey && (_pluginKey$getState = _pluginKey.pluginKey.getState(state)) !== null && _pluginKey$getState !== void 0 && _pluginKey$getState.underlineDisabled && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_9')) {
+        } else if (event.key === 'u' && event.metaKey && (_pluginKey$getState = _pluginKey.pluginKey.getState(state)) !== null && _pluginKey$getState !== void 0 && _pluginKey$getState.underlineDisabled && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
           // This is a workaround for browser behaviour with cmd+u (in Chrome only) where the underline mark being applied around the selection
           event.preventDefault();
         }

package/dist/cjs/ui/FloatingToolbarComponent.js

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

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

@@ -11,7 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _messages = require("@atlaskit/editor-common/messages");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _dropdownToolbarButton = require("./dropdown-toolbar-button");
 var _menuState = require("./hooks/menu-state");
@@ -55,7 +54,7 @@ var FormattingTextDropdownMenu = exports.FormattingTextDropdownMenu = /*#__PURE_
   var activeItem = items[0].items.find(function (item) {
     return item.isActive;
   });
-  var defaultIcon = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_4') ? (_items$0$items$ = items[0].items[0]) === null || _items$0$items$ === void 0 ? void 0 : _items$0$items$.elemBefore : undefined;
+  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;

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

@@ -18,7 +18,6 @@ var _textBoldEditorBold = _interopRequireDefault(require("@atlaskit/icon/core/mi
 var _textItalicEditorItalic = _interopRequireDefault(require("@atlaskit/icon/core/migration/text-italic--editor-italic"));
 var _textStrikethrough = _interopRequireDefault(require("@atlaskit/icon/core/text-strikethrough"));
 var _textUnderline = _interopRequireDefault(require("@atlaskit/icon/core/text-underline"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("../../../pm-plugins/commands");
 var _icons = require("../icons");
@@ -191,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') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10') ? false : textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Active")];
+    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 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 {

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

@@ -17,7 +17,7 @@ var useResponsiveIconTypeButtons = exports.useResponsiveIconTypeButtons = functi
     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;
+      ResponsiveCustomButtonToolbar = _constants.ResponsiveCustomButtonToolbarCompact;
     }
   }
   var iconTypeList = (0, _react.useMemo)(function () {
@@ -30,7 +30,7 @@ var useResponsiveIconTypeButtons = exports.useResponsiveIconTypeButtons = functi
     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;
+      return _constants.ToolbarButtonsStrongItalic;
     }
   } else {
     return _constants.ToolbarButtonsStrongItalic;
@@ -44,7 +44,7 @@ var useResponsiveIconTypeMenu = exports.useResponsiveIconTypeMenu = function use
     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;
+      ResponsiveCustomMenu = _constants.ResponsiveCustomMenuCompact;
     }
   }
   var iconTypeList = (0, _react.useMemo)(function () {
@@ -57,7 +57,7 @@ var useResponsiveIconTypeMenu = exports.useResponsiveIconTypeMenu = function use
     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;
+      return _constants.ButtonsMenuCompact;
     }
   } else {
     return _constants.ToolbarButtonsStrongItalic;

package/dist/cjs/ui/Toolbar/hooks/use-icon-list.js

@@ -7,22 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.useIconList = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = require("react");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var useIconList = exports.useIconList = function useIconList(_ref) {
   var icons = _ref.icons,
-    iconTypeList = _ref.iconTypeList,
-    shouldUnselect = _ref.shouldUnselect;
+    iconTypeList = _ref.iconTypeList;
   return (0, _react.useMemo)(function () {
     return icons.reduce(function (acc, icon) {
       if (!icon || !icon.iconMark) {
         return acc;
       }
-      if (
-      // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-      shouldUnselect && icon.isActive && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10')) {
-        icon.isActive = false;
-      }
       var isIconSingleButton = iconTypeList.includes(icon.iconMark);
       if (isIconSingleButton) {
         return {
@@ -38,5 +30,5 @@ var useIconList = exports.useIconList = function useIconList(_ref) {
       dropdownItems: [],
       singleItems: []
     });
-  }, [icons, shouldUnselect, iconTypeList]);
+  }, [icons, iconTypeList]);
 };

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

@@ -169,7 +169,7 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
     }), (0, _react2.jsx)("span", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage
       css: _styles.wrapperStyle
-    }, isToolbarDisabled && !((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10')) ? (0, _react2.jsx)("div", null, (0, _react2.jsx)(_moreButton.MoreButton, {
+    }, isToolbarDisabled && !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? (0, _react2.jsx)("div", null, (0, _react2.jsx)(_moreButton.MoreButton, {
       label: moreFormattingButtonLabel,
       isReducedSpacing: isReducedSpacing,
       isDisabled: true,
@@ -184,11 +184,11 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
       isReducedSpacing: isReducedSpacing,
       moreButtonLabel: moreFormattingButtonLabel,
       hasFormattingActive: hasFormattingActive,
-      hasMoreButton: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_4') ? false : true,
+      hasMoreButton: !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1'),
       items: items,
       intl: intl,
       toolbarType: toolbarType,
-      isDisabled: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10') ? isToolbarDisabled : false
+      isDisabled: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? isToolbarDisabled : false
     }))), !(api !== null && api !== void 0 && api.primaryToolbar) && /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage */
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     (0, _react2.jsx)("span", {

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

@@ -10,7 +10,6 @@ var _react2 = require("@emotion/react");
 var _styles = require("@atlaskit/editor-common/styles");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 /**
  * @jsxRuntime classic
@@ -48,15 +47,11 @@ var SingleToolbarButtons = exports.SingleToolbarButtons = /*#__PURE__*/_react.de
         buttonId: item.buttonId,
         spacing: isReducedSpacing ? 'none' : 'default',
         onClick: onClick(item.command),
-        selected:
-        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        hasMultiplePartsWithFormattingSelected && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10') ? false : item.isActive,
+        selected: item.isActive,
         disabled: item.isDisabled,
         title: item.tooltipElement,
         iconBefore: item.iconElement,
-        "aria-pressed":
-        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        hasMultiplePartsWithFormattingSelected && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10') ? false : item.isActive,
+        "aria-pressed": item.isActive,
         "aria-label": (_item$ariaLabel = item['aria-label']) !== null && _item$ariaLabel !== void 0 ? _item$ariaLabel : String(item.content),
         "aria-keyshortcuts": item['aria-keyshortcuts']
       });

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

@@ -131,7 +131,7 @@ export const plugin = (dispatch, editorAnalyticsAPI) => new SafePlugin({
         return commands.moveRight()(state, dispatch);
       } else if (event.key === keymapMoveLeft.common && !event.metaKey) {
         return commands.moveLeft()(state, dispatch);
-      } else if (event.key === 'u' && event.metaKey && (_pluginKey$getState = pluginKey.getState(state)) !== null && _pluginKey$getState !== void 0 && _pluginKey$getState.underlineDisabled && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_9')) {
+      } else if (event.key === 'u' && event.metaKey && (_pluginKey$getState = pluginKey.getState(state)) !== null && _pluginKey$getState !== void 0 && _pluginKey$getState.underlineDisabled && editorExperiment('platform_editor_controls', 'variant1')) {
         // This is a workaround for browser behaviour with cmd+u (in Chrome only) where the underline mark being applied around the selection
         event.preventDefault();
       }

package/dist/es2019/ui/FloatingToolbarComponent.js

@@ -155,8 +155,7 @@ const FloatingToolbarTextFormat = ({
     singleItems
   } = useIconList({
     icons: defaultIcons,
-    iconTypeList: ToolbarButtonsStrong,
-    shouldUnselect: hasMultiplePartsWithFormattingSelected
+    iconTypeList: ToolbarButtonsStrong
   });
   const clearIcon = useClearIcon({
     formattingPluginInitialised: textFormattingState.isInitialised,

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

@@ -2,7 +2,6 @@ import React, { useCallback, useState } from 'react';
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DropdownToolbarButton } from './dropdown-toolbar-button';
 import { useMenuState } from './hooks/menu-state';
@@ -37,7 +36,7 @@ export const FormattingTextDropdownMenu = /*#__PURE__*/React.memo(({
     }
   }, [editorView.state, editorView.dispatch, closeMenu]);
   const activeItem = items[0].items.find(item => item.isActive);
-  const defaultIcon = editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_4') ? (_items$0$items$ = items[0].items[0]) === null || _items$0$items$ === void 0 ? void 0 : _items$0$items$.elemBefore : undefined;
+  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;

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

@@ -16,7 +16,6 @@ import BoldIcon from '@atlaskit/icon/core/migration/text-bold--editor-bold';
 import ItalicIcon from '@atlaskit/icon/core/migration/text-italic--editor-italic';
 import TextStrikethroughIcon from '@atlaskit/icon/core/text-strikethrough';
 import UnderlineIcon from '@atlaskit/icon/core/text-underline';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from '../../../pm-plugins/commands';
 import { Subscript, Superscript } from '../icons';
@@ -183,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') && fg('platform_editor_controls_patch_10') ? false : textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState[`${iconMark}Active`];
+  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 isDisabled = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState[`${iconMark}Disabled`];
   const isHidden = textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState[`${iconMark}Hidden`];
   return {

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

@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
 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 { ButtonsMenuMinimal, ButtonsMenuCompact, ToolbarButtonsStrong, ToolbarButtonsStrongItalic, ResponsiveCustomButtonToolbarMinimal, ResponsiveCustomButtonToolbarCompact, ResponsiveCustomMenuMinimal, ResponsiveCustomMenuCompact } from '../constants';
 import { useIconList } from './use-icon-list';
 export const useResponsiveIconTypeButtons = ({
   toolbarSize,
@@ -12,7 +12,7 @@ export const useResponsiveIconTypeButtons = ({
     if (fg('platform_editor_controls_patch_13')) {
       ResponsiveCustomButtonToolbar = ResponsiveCustomButtonToolbarMinimal;
     } else {
-      ResponsiveCustomButtonToolbar = !fg('platform_editor_controls_patch_4') ? ResponsiveCustomButtonToolbarSpacious : ResponsiveCustomButtonToolbarCompact;
+      ResponsiveCustomButtonToolbar = ResponsiveCustomButtonToolbarCompact;
     }
   }
   const iconTypeList = useMemo(() => ResponsiveCustomButtonToolbar[toolbarSize], [toolbarSize, ResponsiveCustomButtonToolbar]);
@@ -23,7 +23,7 @@ export const useResponsiveIconTypeButtons = ({
     if (fg('platform_editor_controls_patch_13')) {
       return ToolbarButtonsStrong;
     } else {
-      return !fg('platform_editor_controls_patch_4') ? ToolbarButtonsStrongItalicUnderline : ToolbarButtonsStrongItalic;
+      return ToolbarButtonsStrongItalic;
     }
   } else {
     return ToolbarButtonsStrongItalic;
@@ -38,7 +38,7 @@ export const useResponsiveIconTypeMenu = ({
     if (fg('platform_editor_controls_patch_13')) {
       ResponsiveCustomMenu = ResponsiveCustomMenuMinimal;
     } else {
-      ResponsiveCustomMenu = !fg('platform_editor_controls_patch_4') ? ResponsiveCustomMenuSpacious : ResponsiveCustomMenuCompact;
+      ResponsiveCustomMenu = ResponsiveCustomMenuCompact;
     }
   }
   const iconTypeList = useMemo(() => ResponsiveCustomMenu[toolbarSize], [toolbarSize, ResponsiveCustomMenu]);
@@ -49,7 +49,7 @@ export const useResponsiveIconTypeMenu = ({
     if (fg('platform_editor_controls_patch_13')) {
       return ButtonsMenuMinimal;
     } else {
-      return !fg('platform_editor_controls_patch_4') ? ButtonsMenuSpacious : ButtonsMenuCompact;
+      return ButtonsMenuCompact;
     }
   } else {
     return ToolbarButtonsStrongItalic;

package/dist/es2019/ui/Toolbar/hooks/use-icon-list.js

@@ -1,21 +1,13 @@
 import { useMemo } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export const useIconList = ({
   icons,
-  iconTypeList,
-  shouldUnselect
+  iconTypeList
 }) => {
   return useMemo(() => {
     return icons.reduce((acc, icon) => {
       if (!icon || !icon.iconMark) {
         return acc;
       }
-      if (
-      // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-      shouldUnselect && icon.isActive && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10')) {
-        icon.isActive = false;
-      }
       const isIconSingleButton = iconTypeList.includes(icon.iconMark);
       if (isIconSingleButton) {
         return {
@@ -31,5 +23,5 @@ export const useIconList = ({
       dropdownItems: [],
       singleItems: []
     });
-  }, [icons, shouldUnselect, iconTypeList]);
+  }, [icons, iconTypeList]);
 };

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

@@ -158,7 +158,7 @@ const ToolbarFormatting = ({
     }), jsx("span", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage
       css: wrapperStyle
-    }, isToolbarDisabled && !(editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_10')) ? jsx("div", null, jsx(MoreButton, {
+    }, isToolbarDisabled && !editorExperiment('platform_editor_controls', 'variant1') ? jsx("div", null, jsx(MoreButton, {
       label: moreFormattingButtonLabel,
       isReducedSpacing: isReducedSpacing,
       isDisabled: true,
@@ -173,11 +173,11 @@ const ToolbarFormatting = ({
       isReducedSpacing: isReducedSpacing,
       moreButtonLabel: moreFormattingButtonLabel,
       hasFormattingActive: hasFormattingActive,
-      hasMoreButton: editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_4') ? false : true,
+      hasMoreButton: !editorExperiment('platform_editor_controls', 'variant1'),
       items: items,
       intl: intl,
       toolbarType: toolbarType,
-      isDisabled: editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_10') ? isToolbarDisabled : false
+      isDisabled: editorExperiment('platform_editor_controls', 'variant1') ? isToolbarDisabled : false
     }))), !(api !== null && api !== void 0 && api.primaryToolbar) && /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage */
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     jsx("span", {

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

@@ -9,7 +9,6 @@ import { jsx } from '@emotion/react';
 import { buttonGroupStyle, buttonGroupStyleBeforeVisualRefresh } from '@atlaskit/editor-common/styles';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export const SingleToolbarButtons = /*#__PURE__*/React.memo(({
   items,
   isReducedSpacing,
@@ -40,15 +39,11 @@ export const SingleToolbarButtons = /*#__PURE__*/React.memo(({
         buttonId: item.buttonId,
         spacing: isReducedSpacing ? 'none' : 'default',
         onClick: onClick(item.command),
-        selected:
-        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10') ? false : item.isActive,
+        selected: item.isActive,
         disabled: item.isDisabled,
         title: item.tooltipElement,
         iconBefore: item.iconElement,
-        "aria-pressed":
-        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10') ? false : item.isActive,
+        "aria-pressed": item.isActive,
         "aria-label": (_item$ariaLabel = item['aria-label']) !== null && _item$ariaLabel !== void 0 ? _item$ariaLabel : String(item.content),
         "aria-keyshortcuts": item['aria-keyshortcuts']
       });

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

@@ -148,7 +148,7 @@ export var plugin = function plugin(dispatch, editorAnalyticsAPI) {
           return commands.moveRight()(state, dispatch);
         } else if (event.key === keymapMoveLeft.common && !event.metaKey) {
           return commands.moveLeft()(state, dispatch);
-        } else if (event.key === 'u' && event.metaKey && (_pluginKey$getState = pluginKey.getState(state)) !== null && _pluginKey$getState !== void 0 && _pluginKey$getState.underlineDisabled && editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_9')) {
+        } else if (event.key === 'u' && event.metaKey && (_pluginKey$getState = pluginKey.getState(state)) !== null && _pluginKey$getState !== void 0 && _pluginKey$getState.underlineDisabled && editorExperiment('platform_editor_controls', 'variant1')) {
           // This is a workaround for browser behaviour with cmd+u (in Chrome only) where the underline mark being applied around the selection
           event.preventDefault();
         }

package/dist/esm/ui/FloatingToolbarComponent.js

@@ -146,8 +146,7 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
   });
   var _useIconList = useIconList({
       icons: defaultIcons,
-      iconTypeList: ToolbarButtonsStrong,
-      shouldUnselect: hasMultiplePartsWithFormattingSelected
+      iconTypeList: ToolbarButtonsStrong
     }),
     dropdownItems = _useIconList.dropdownItems,
     singleItems = _useIconList.singleItems;

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

@@ -3,7 +3,6 @@ import React, { useCallback, useState } from 'react';
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { DropdownToolbarButton } from './dropdown-toolbar-button';
 import { useMenuState } from './hooks/menu-state';
@@ -46,7 +45,7 @@ export var FormattingTextDropdownMenu = /*#__PURE__*/React.memo(function (_ref)
   var activeItem = items[0].items.find(function (item) {
     return item.isActive;
   });
-  var defaultIcon = editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_4') ? (_items$0$items$ = items[0].items[0]) === null || _items$0$items$ === void 0 ? void 0 : _items$0$items$.elemBefore : undefined;
+  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;

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

@@ -17,7 +17,6 @@ import BoldIcon from '@atlaskit/icon/core/migration/text-bold--editor-bold';
 import ItalicIcon from '@atlaskit/icon/core/migration/text-italic--editor-italic';
 import TextStrikethroughIcon from '@atlaskit/icon/core/text-strikethrough';
 import UnderlineIcon from '@atlaskit/icon/core/text-underline';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from '../../../pm-plugins/commands';
 import { Subscript, Superscript } from '../icons';
@@ -183,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') && fg('platform_editor_controls_patch_10') ? false : textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState["".concat(iconMark, "Active")];
+    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 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 {

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

@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
 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 { ButtonsMenuMinimal, ButtonsMenuCompact, ToolbarButtonsStrong, ToolbarButtonsStrongItalic, ResponsiveCustomButtonToolbarMinimal, ResponsiveCustomButtonToolbarCompact, ResponsiveCustomMenuMinimal, ResponsiveCustomMenuCompact } from '../constants';
 import { useIconList } from './use-icon-list';
 export var useResponsiveIconTypeButtons = function useResponsiveIconTypeButtons(_ref) {
   var toolbarSize = _ref.toolbarSize,
@@ -11,7 +11,7 @@ export var useResponsiveIconTypeButtons = function useResponsiveIconTypeButtons(
     if (fg('platform_editor_controls_patch_13')) {
       ResponsiveCustomButtonToolbar = ResponsiveCustomButtonToolbarMinimal;
     } else {
-      ResponsiveCustomButtonToolbar = !fg('platform_editor_controls_patch_4') ? ResponsiveCustomButtonToolbarSpacious : ResponsiveCustomButtonToolbarCompact;
+      ResponsiveCustomButtonToolbar = ResponsiveCustomButtonToolbarCompact;
     }
   }
   var iconTypeList = useMemo(function () {
@@ -24,7 +24,7 @@ export var useResponsiveIconTypeButtons = function useResponsiveIconTypeButtons(
     if (fg('platform_editor_controls_patch_13')) {
       return ToolbarButtonsStrong;
     } else {
-      return !fg('platform_editor_controls_patch_4') ? ToolbarButtonsStrongItalicUnderline : ToolbarButtonsStrongItalic;
+      return ToolbarButtonsStrongItalic;
     }
   } else {
     return ToolbarButtonsStrongItalic;
@@ -38,7 +38,7 @@ export var useResponsiveIconTypeMenu = function useResponsiveIconTypeMenu(_ref2)
     if (fg('platform_editor_controls_patch_13')) {
       ResponsiveCustomMenu = ResponsiveCustomMenuMinimal;
     } else {
-      ResponsiveCustomMenu = !fg('platform_editor_controls_patch_4') ? ResponsiveCustomMenuSpacious : ResponsiveCustomMenuCompact;
+      ResponsiveCustomMenu = ResponsiveCustomMenuCompact;
     }
   }
   var iconTypeList = useMemo(function () {
@@ -51,7 +51,7 @@ export var useResponsiveIconTypeMenu = function useResponsiveIconTypeMenu(_ref2)
     if (fg('platform_editor_controls_patch_13')) {
       return ButtonsMenuMinimal;
     } else {
-      return !fg('platform_editor_controls_patch_4') ? ButtonsMenuSpacious : ButtonsMenuCompact;
+      return ButtonsMenuCompact;
     }
   } else {
     return ToolbarButtonsStrongItalic;

package/dist/esm/ui/Toolbar/hooks/use-icon-list.js

@@ -1,21 +1,13 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { useMemo } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export var useIconList = function useIconList(_ref) {
   var icons = _ref.icons,
-    iconTypeList = _ref.iconTypeList,
-    shouldUnselect = _ref.shouldUnselect;
+    iconTypeList = _ref.iconTypeList;
   return useMemo(function () {
     return icons.reduce(function (acc, icon) {
       if (!icon || !icon.iconMark) {
         return acc;
       }
-      if (
-      // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-      shouldUnselect && icon.isActive && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10')) {
-        icon.isActive = false;
-      }
       var isIconSingleButton = iconTypeList.includes(icon.iconMark);
       if (isIconSingleButton) {
         return {
@@ -31,5 +23,5 @@ export var useIconList = function useIconList(_ref) {
       dropdownItems: [],
       singleItems: []
     });
-  }, [icons, shouldUnselect, iconTypeList]);
+  }, [icons, iconTypeList]);
 };

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

@@ -163,7 +163,7 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
     }), jsx("span", {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage
       css: wrapperStyle
-    }, isToolbarDisabled && !(editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_10')) ? jsx("div", null, jsx(MoreButton, {
+    }, isToolbarDisabled && !editorExperiment('platform_editor_controls', 'variant1') ? jsx("div", null, jsx(MoreButton, {
       label: moreFormattingButtonLabel,
       isReducedSpacing: isReducedSpacing,
       isDisabled: true,
@@ -178,11 +178,11 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
       isReducedSpacing: isReducedSpacing,
       moreButtonLabel: moreFormattingButtonLabel,
       hasFormattingActive: hasFormattingActive,
-      hasMoreButton: editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_4') ? false : true,
+      hasMoreButton: !editorExperiment('platform_editor_controls', 'variant1'),
       items: items,
       intl: intl,
       toolbarType: toolbarType,
-      isDisabled: editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_10') ? isToolbarDisabled : false
+      isDisabled: editorExperiment('platform_editor_controls', 'variant1') ? isToolbarDisabled : false
     }))), !(api !== null && api !== void 0 && api.primaryToolbar) && /* eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage */
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
     jsx("span", {

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

@@ -9,7 +9,6 @@ import { jsx } from '@emotion/react';
 import { buttonGroupStyle, buttonGroupStyleBeforeVisualRefresh } from '@atlaskit/editor-common/styles';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export var SingleToolbarButtons = /*#__PURE__*/React.memo(function (_ref) {
   var items = _ref.items,
     isReducedSpacing = _ref.isReducedSpacing,
@@ -39,15 +38,11 @@ export var SingleToolbarButtons = /*#__PURE__*/React.memo(function (_ref) {
         buttonId: item.buttonId,
         spacing: isReducedSpacing ? 'none' : 'default',
         onClick: onClick(item.command),
-        selected:
-        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10') ? false : item.isActive,
+        selected: item.isActive,
         disabled: item.isDisabled,
         title: item.tooltipElement,
         iconBefore: item.iconElement,
-        "aria-pressed":
-        // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-        hasMultiplePartsWithFormattingSelected && editorExperiment('platform_editor_controls', 'variant1') && !fg('platform_editor_controls_patch_10') ? false : item.isActive,
+        "aria-pressed": item.isActive,
         "aria-label": (_item$ariaLabel = item['aria-label']) !== null && _item$ariaLabel !== void 0 ? _item$ariaLabel : String(item.content),
         "aria-keyshortcuts": item['aria-keyshortcuts']
       });

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import { type MenuIconItem, ToolbarType } from './types';
+import { type MenuIconItem, type ToolbarType } from './types';
 type DropdownMenuProps = {
     editorView: EditorView;
     isReducedSpacing: boolean;

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

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

package/dist/types/ui/Toolbar/hooks/use-icon-list.d.ts

@@ -2,11 +2,10 @@ import type { IconTypes, MenuIconItem } from '../types';
 interface UseIconsParams {
     icons: Array<MenuIconItem | null>;
     iconTypeList: IconTypes[];
-    shouldUnselect?: boolean;
 }
 export type IconsPositions = {
     dropdownItems: Array<MenuIconItem>;
     singleItems: Array<MenuIconItem>;
 };
-export declare const useIconList: ({ icons, iconTypeList, shouldUnselect }: UseIconsParams) => IconsPositions;
+export declare const useIconList: ({ icons, iconTypeList }: UseIconsParams) => IconsPositions;
 export {};

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import { type MenuIconItem, ToolbarType } from './types';
+import { type MenuIconItem, type ToolbarType } from './types';
 type DropdownMenuProps = {
     editorView: EditorView;
     isReducedSpacing: boolean;

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

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

package/dist/types-ts4.5/ui/Toolbar/hooks/use-icon-list.d.ts

@@ -2,11 +2,10 @@ import type { IconTypes, MenuIconItem } from '../types';
 interface UseIconsParams {
     icons: Array<MenuIconItem | null>;
     iconTypeList: IconTypes[];
-    shouldUnselect?: boolean;
 }
 export type IconsPositions = {
     dropdownItems: Array<MenuIconItem>;
     singleItems: Array<MenuIconItem>;
 };
-export declare const useIconList: ({ icons, iconTypeList, shouldUnselect }: UseIconsParams) => IconsPositions;
+export declare const useIconList: ({ icons, iconTypeList }: UseIconsParams) => IconsPositions;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-text-formatting",
-	"version": "2.4.0",
+	"version": "3.0.0",
 	"description": "Text-formatting plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -9,8 +9,7 @@
 	},
 	"atlassian": {
 		"team": "Editor: Core Experiences",
-		"singleton": true,
-		"runReact18": true
+		"singleton": true
 	},
 	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
 	"main": "dist/cjs/index.js",
@@ -34,30 +33,30 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^107.1.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.7.0",
+		"@atlaskit/editor-plugin-analytics": "^3.0.0",
+		"@atlaskit/editor-plugin-base": "^4.0.0",
+		"@atlaskit/editor-plugin-primary-toolbar": "^4.0.0",
+		"@atlaskit/editor-plugin-selection-toolbar": "^4.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/icon": "^27.0.0",
+		"@atlaskit/icon": "^27.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.3.0",
-		"@atlaskit/tmp-editor-statsig": "^8.0.0",
+		"@atlaskit/tmp-editor-statsig": "^8.7.0",
 		"@atlaskit/tokens": "^5.4.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.6.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
-		"@atlaskit/editor-plugin-composition": "^1.3.0",
-		"@atlaskit/editor-plugin-decorations": "^2.0.0",
-		"@atlaskit/editor-plugin-feature-flags": "^1.4.0",
+		"@atlaskit/editor-plugin-composition": "^2.0.0",
+		"@atlaskit/editor-plugin-decorations": "^3.0.0",
+		"@atlaskit/editor-plugin-feature-flags": "^2.0.0",
 		"@testing-library/react": "^13.4.0",
 		"typescript": "~5.4.2"
 	},
@@ -107,21 +106,12 @@
 		"platform_editor_resolve_marks": {
 			"type": "boolean"
 		},
-		"platform_editor_controls_patch_9": {
-			"type": "boolean"
-		},
-		"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"
 		},