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

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-text-formatting
 
+## 2.4.0
+
+### Minor Changes
+
+- [#173138](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/173138)
+  [`62d4e3ae11127`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/62d4e3ae11127) -
+  [ux] [ED-27997] Change text formatting state to only consider whole selections active for marks
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.3.3
 
 ### Patch Changes

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

@@ -1,28 +1,32 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.plugin = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _mark = require("@atlaskit/editor-common/mark");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 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"));
 var commands = _textFormatting;
 var _pluginKey = require("./plugin-key");
 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); }
-// TODO: ED-26962 - Ideally this should use the custom toggleMark function from @atlaskit/editor-common so we also disable the options when selecting inline nodes but it disables the marks when the selection is empty at this point in time which is undesirable
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; } // TODO: ED-26962 - Ideally this should use the custom toggleMark function from @atlaskit/editor-common so we also disable the options when selecting inline nodes but it disables the marks when the selection is empty at this point in time which is undesirable
 // import { toggleMark } from '@atlaskit/editor-common/mark';
-
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
-
 var isSelectionInlineCursor = function isSelectionInlineCursor(selection) {
   if (selection instanceof _state.NodeSelection) {
     return true;
@@ -34,12 +38,9 @@ var checkNodeSelection = function checkNodeSelection(mark, editorState, type) {
   if (isSelectionInlineCursor(selection)) {
     return false;
   }
-  if (type !== null || type !== undefined) {
-    return (0, _commands.toggleMark)(mark, {
-      type: type
-    })(editorState);
-  }
-  return (0, _commands.toggleMark)(mark)(editorState);
+  return (0, _commands.toggleMark)(mark, {
+    type: type
+  })(editorState);
 };
 var getTextFormattingState = function getTextFormattingState(editorState, editorAnalyticsAPI) {
   var _editorState$schema$m = editorState.schema.marks,
@@ -52,6 +53,49 @@ 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');
+  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
+    // toolbar items are highlighted on selection. We need to track code in selection seperately
+    // to ensure all other formatting options are disabled appropriately.
+    if (code) {
+      state.codeInSelection = (0, _mark.anyMarkActive)(editorState, code.create());
+    }
+    var marks = [[code, 'code'], [em, 'em'], [strike, 'strike'], [strong, 'strong'], [underline, 'underline'], [subsup === null || subsup === void 0 ? void 0 : subsup.create({
+      type: 'sub'
+    }), 'subscript'], [subsup === null || subsup === void 0 ? void 0 : subsup.create({
+      type: 'sup'
+    }), 'superscript']].filter(function (_ref) {
+      var _ref2 = (0, _slicedToArray2.default)(_ref, 1),
+        mark = _ref2[0];
+      return mark;
+    });
+    var marksToName = new Map(marks);
+    var activeMarks = (0, _mark.wholeSelectionHasMarks)(editorState, Array.from(marksToName.keys()));
+    var _iterator = _createForOfIteratorHelper(marks),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _step$value = (0, _slicedToArray2.default)(_step.value, 2),
+          mark = _step$value[0],
+          markName = _step$value[1];
+        var active = activeMarks.get(mark);
+        if (active !== undefined) {
+          state["".concat(markName, "Active")] = active;
+        }
+        state["".concat(markName, "Disabled")] =
+        // Disable when code is active, except for code itself which should not be disabled
+        // when code is in selection 😅
+        state.codeInSelection && markName !== 'code' ? true : !checkNodeSelection(mark instanceof _model.MarkType ? mark : mark.type, editorState);
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return state;
+  }
   if (code) {
     state.codeActive = (0, _mark.anyMarkActive)(editorState, code.create());
     state.codeDisabled = !checkNodeSelection(code, editorState);
@@ -76,8 +120,8 @@ var getTextFormattingState = function getTextFormattingState(editorState, editor
       type: 'sup'
     });
     state.subscriptActive = (0, _mark.anyMarkActive)(editorState, subMark);
-    state.subscriptDisabled = state.codeActive ? true : !checkNodeSelection(subsup, editorState, 'sub');
     state.superscriptActive = (0, _mark.anyMarkActive)(editorState, supMark);
+    state.subscriptDisabled = state.codeActive ? true : !checkNodeSelection(subsup, editorState, 'sub');
     state.superscriptDisabled = state.codeActive ? true : !checkNodeSelection(subsup, editorState, 'sup');
   }
   if (underline) {

package/dist/cjs/ui/FloatingToolbarComponent.js

@@ -127,16 +127,16 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
   var formattingIsPresent = textFormattingState.formattingIsPresent,
     formattingIconState = (0, _objectWithoutProperties2.default)(textFormattingState, _excluded);
   var hasMultiplePartsWithFormattingSelected;
-  var commonActiveMarks = [];
+  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, _formattingInSelectionUtils.hasMultiplePartsWithFormattingInSelection)({
+    hasMultiplePartsWithFormattingSelected = (0, _platformFeatureFlags.fg)('platform_editor_common_marks') ? false : (0, _formattingInSelectionUtils.hasMultiplePartsWithFormattingInSelection)({
       selectedContent: selectedContent
     });
-    if ((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10')) {
+    if (!(0, _platformFeatureFlags.fg)('platform_editor_common_marks')) {
       commonActiveMarks = (0, _formattingInSelectionUtils.getCommonActiveMarks)({
         selectedContent: selectedContent
       });
@@ -149,8 +149,8 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
     editorAnalyticsAPI: editorAnalyticsAPI,
     textFormattingState: formattingIconState,
     toolbarType: FloatingToolbarSettings.toolbarType,
-    hasMultiplePartsWithFormattingSelected: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10') ? hasMultiplePartsWithFormattingSelected : undefined,
-    commonActiveMarks: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_10') ? commonActiveMarks : undefined
+    hasMultiplePartsWithFormattingSelected: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? hasMultiplePartsWithFormattingSelected : undefined,
+    commonActiveMarks: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? commonActiveMarks : undefined
   });
   var _useIconList = (0, _useIconList2.useIconList)({
       icons: defaultIcons,

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

@@ -24,6 +24,8 @@ var hasMultiplePartsWithFormattingInSelection = exports.hasMultiplePartsWithForm
   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) {
@@ -34,12 +36,10 @@ var getCommonActiveMarks = exports.getCommonActiveMarks = function getCommonActi
     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) {

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

@@ -2,12 +2,14 @@
 // import { toggleMark } from '@atlaskit/editor-common/mark';
 
 import { moveLeft as keymapMoveLeft, moveRight as keymapMoveRight } from '@atlaskit/editor-common/keymaps';
-import { anyMarkActive } from '@atlaskit/editor-common/mark';
+import { anyMarkActive, wholeSelectionHasMarks } from '@atlaskit/editor-common/mark';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 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';
 // Ignored via go/ees005
@@ -25,12 +27,9 @@ const checkNodeSelection = (mark, editorState, type) => {
   if (isSelectionInlineCursor(selection)) {
     return false;
   }
-  if (type !== null || type !== undefined) {
-    return toggleMark(mark, {
-      type: type
-    })(editorState);
-  }
-  return toggleMark(mark)(editorState);
+  return toggleMark(mark, {
+    type: type
+  })(editorState);
 };
 const getTextFormattingState = (editorState, editorAnalyticsAPI) => {
   const {
@@ -44,6 +43,34 @@ const getTextFormattingState = (editorState, editorAnalyticsAPI) => {
   const state = {
     isInitialised: true
   };
+  const showOnlyCommonMarks = expValEquals('platform_editor_controls', 'cohort', 'variant1') && fg('platform_editor_common_marks');
+  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
+    // toolbar items are highlighted on selection. We need to track code in selection seperately
+    // to ensure all other formatting options are disabled appropriately.
+    if (code) {
+      state.codeInSelection = anyMarkActive(editorState, code.create());
+    }
+    const marks = [[code, 'code'], [em, 'em'], [strike, 'strike'], [strong, 'strong'], [underline, 'underline'], [subsup === null || subsup === void 0 ? void 0 : subsup.create({
+      type: 'sub'
+    }), 'subscript'], [subsup === null || subsup === void 0 ? void 0 : subsup.create({
+      type: 'sup'
+    }), 'superscript']].filter(([mark]) => mark);
+    const marksToName = new Map(marks);
+    const activeMarks = wholeSelectionHasMarks(editorState, Array.from(marksToName.keys()));
+    for (const [mark, markName] of marks) {
+      const active = activeMarks.get(mark);
+      if (active !== undefined) {
+        state[`${markName}Active`] = active;
+      }
+      state[`${markName}Disabled`] =
+      // Disable when code is active, except for code itself which should not be disabled
+      // when code is in selection 😅
+      state.codeInSelection && markName !== 'code' ? true : !checkNodeSelection(mark instanceof MarkType ? mark : mark.type, editorState);
+    }
+    return state;
+  }
   if (code) {
     state.codeActive = anyMarkActive(editorState, code.create());
     state.codeDisabled = !checkNodeSelection(code, editorState);
@@ -68,8 +95,8 @@ const getTextFormattingState = (editorState, editorAnalyticsAPI) => {
       type: 'sup'
     });
     state.subscriptActive = anyMarkActive(editorState, subMark);
-    state.subscriptDisabled = state.codeActive ? true : !checkNodeSelection(subsup, editorState, 'sub');
     state.superscriptActive = anyMarkActive(editorState, supMark);
+    state.subscriptDisabled = state.codeActive ? true : !checkNodeSelection(subsup, editorState, 'sub');
     state.superscriptDisabled = state.codeActive ? true : !checkNodeSelection(subsup, editorState, 'sup');
   }
   if (underline) {

package/dist/es2019/ui/FloatingToolbarComponent.js

@@ -121,7 +121,7 @@ const FloatingToolbarTextFormat = ({
     ...formattingIconState
   } = textFormattingState;
   let hasMultiplePartsWithFormattingSelected;
-  let commonActiveMarks = [];
+  let commonActiveMarks;
   if (editorExperiment('platform_editor_controls', 'variant1')) {
     const {
       selection
@@ -131,10 +131,10 @@ const FloatingToolbarTextFormat = ({
       to
     } = selection;
     const selectedContent = selection instanceof TextSelection ? editorView.state.doc.slice(from, to).content.content.slice() : undefined;
-    hasMultiplePartsWithFormattingSelected = hasMultiplePartsWithFormattingInSelection({
+    hasMultiplePartsWithFormattingSelected = fg('platform_editor_common_marks') ? false : hasMultiplePartsWithFormattingInSelection({
       selectedContent
     });
-    if (fg('platform_editor_controls_patch_10')) {
+    if (!fg('platform_editor_common_marks')) {
       commonActiveMarks = getCommonActiveMarks({
         selectedContent
       });
@@ -147,8 +147,8 @@ const FloatingToolbarTextFormat = ({
     editorAnalyticsAPI,
     textFormattingState: formattingIconState,
     toolbarType: FloatingToolbarSettings.toolbarType,
-    hasMultiplePartsWithFormattingSelected: editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_10') ? hasMultiplePartsWithFormattingSelected : undefined,
-    commonActiveMarks: editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_10') ? commonActiveMarks : undefined
+    hasMultiplePartsWithFormattingSelected: editorExperiment('platform_editor_controls', 'variant1') ? hasMultiplePartsWithFormattingSelected : undefined,
+    commonActiveMarks: editorExperiment('platform_editor_controls', 'variant1') ? commonActiveMarks : undefined
   });
   const {
     dropdownItems,

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

@@ -13,6 +13,8 @@ export const hasMultiplePartsWithFormattingInSelection = ({
   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
 }) => {
@@ -24,10 +26,8 @@ export const getCommonActiveMarks = ({
     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/pm-plugins/main.js

@@ -1,13 +1,19 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 // TODO: ED-26962 - Ideally this should use the custom toggleMark function from @atlaskit/editor-common so we also disable the options when selecting inline nodes but it disables the marks when the selection is empty at this point in time which is undesirable
 // import { toggleMark } from '@atlaskit/editor-common/mark';
 
 import { moveLeft as keymapMoveLeft, moveRight as keymapMoveRight } from '@atlaskit/editor-common/keymaps';
-import { anyMarkActive } from '@atlaskit/editor-common/mark';
+import { anyMarkActive, wholeSelectionHasMarks } from '@atlaskit/editor-common/mark';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 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';
 // Ignored via go/ees005
@@ -25,12 +31,9 @@ var checkNodeSelection = function checkNodeSelection(mark, editorState, type) {
   if (isSelectionInlineCursor(selection)) {
     return false;
   }
-  if (type !== null || type !== undefined) {
-    return toggleMark(mark, {
-      type: type
-    })(editorState);
-  }
-  return toggleMark(mark)(editorState);
+  return toggleMark(mark, {
+    type: type
+  })(editorState);
 };
 var getTextFormattingState = function getTextFormattingState(editorState, editorAnalyticsAPI) {
   var _editorState$schema$m = editorState.schema.marks,
@@ -43,6 +46,49 @@ var getTextFormattingState = function getTextFormattingState(editorState, editor
   var state = {
     isInitialised: true
   };
+  var showOnlyCommonMarks = expValEquals('platform_editor_controls', 'cohort', 'variant1') && fg('platform_editor_common_marks');
+  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
+    // toolbar items are highlighted on selection. We need to track code in selection seperately
+    // to ensure all other formatting options are disabled appropriately.
+    if (code) {
+      state.codeInSelection = anyMarkActive(editorState, code.create());
+    }
+    var marks = [[code, 'code'], [em, 'em'], [strike, 'strike'], [strong, 'strong'], [underline, 'underline'], [subsup === null || subsup === void 0 ? void 0 : subsup.create({
+      type: 'sub'
+    }), 'subscript'], [subsup === null || subsup === void 0 ? void 0 : subsup.create({
+      type: 'sup'
+    }), 'superscript']].filter(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 1),
+        mark = _ref2[0];
+      return mark;
+    });
+    var marksToName = new Map(marks);
+    var activeMarks = wholeSelectionHasMarks(editorState, Array.from(marksToName.keys()));
+    var _iterator = _createForOfIteratorHelper(marks),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _step$value = _slicedToArray(_step.value, 2),
+          mark = _step$value[0],
+          markName = _step$value[1];
+        var active = activeMarks.get(mark);
+        if (active !== undefined) {
+          state["".concat(markName, "Active")] = active;
+        }
+        state["".concat(markName, "Disabled")] =
+        // Disable when code is active, except for code itself which should not be disabled
+        // when code is in selection 😅
+        state.codeInSelection && markName !== 'code' ? true : !checkNodeSelection(mark instanceof MarkType ? mark : mark.type, editorState);
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return state;
+  }
   if (code) {
     state.codeActive = anyMarkActive(editorState, code.create());
     state.codeDisabled = !checkNodeSelection(code, editorState);
@@ -67,8 +113,8 @@ var getTextFormattingState = function getTextFormattingState(editorState, editor
       type: 'sup'
     });
     state.subscriptActive = anyMarkActive(editorState, subMark);
-    state.subscriptDisabled = state.codeActive ? true : !checkNodeSelection(subsup, editorState, 'sub');
     state.superscriptActive = anyMarkActive(editorState, supMark);
+    state.subscriptDisabled = state.codeActive ? true : !checkNodeSelection(subsup, editorState, 'sub');
     state.superscriptDisabled = state.codeActive ? true : !checkNodeSelection(subsup, editorState, 'sup');
   }
   if (underline) {

package/dist/esm/ui/FloatingToolbarComponent.js

@@ -119,16 +119,16 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
   var formattingIsPresent = textFormattingState.formattingIsPresent,
     formattingIconState = _objectWithoutProperties(textFormattingState, _excluded);
   var hasMultiplePartsWithFormattingSelected;
-  var commonActiveMarks = [];
+  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 = hasMultiplePartsWithFormattingInSelection({
+    hasMultiplePartsWithFormattingSelected = fg('platform_editor_common_marks') ? false : hasMultiplePartsWithFormattingInSelection({
       selectedContent: selectedContent
     });
-    if (fg('platform_editor_controls_patch_10')) {
+    if (!fg('platform_editor_common_marks')) {
       commonActiveMarks = getCommonActiveMarks({
         selectedContent: selectedContent
       });
@@ -141,8 +141,8 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
     editorAnalyticsAPI: editorAnalyticsAPI,
     textFormattingState: formattingIconState,
     toolbarType: FloatingToolbarSettings.toolbarType,
-    hasMultiplePartsWithFormattingSelected: editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_10') ? hasMultiplePartsWithFormattingSelected : undefined,
-    commonActiveMarks: editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_10') ? commonActiveMarks : undefined
+    hasMultiplePartsWithFormattingSelected: editorExperiment('platform_editor_controls', 'variant1') ? hasMultiplePartsWithFormattingSelected : undefined,
+    commonActiveMarks: editorExperiment('platform_editor_controls', 'variant1') ? commonActiveMarks : undefined
   });
   var _useIconList = useIconList({
       icons: defaultIcons,

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

@@ -18,6 +18,8 @@ export var hasMultiplePartsWithFormattingInSelection = function hasMultipleParts
   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) {
@@ -28,12 +30,10 @@ export var getCommonActiveMarks = function getCommonActiveMarks(_ref2) {
     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) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-text-formatting",
-	"version": "2.3.3",
+	"version": "2.4.0",
 	"description": "Text-formatting plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^107.0.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",
@@ -46,7 +46,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.3.0",
 		"@atlaskit/tmp-editor-statsig": "^8.0.0",
-		"@atlaskit/tokens": "^5.3.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"
@@ -124,6 +124,9 @@
 		},
 		"platform_editor_use_preferences_plugin": {
 			"type": "boolean"
+		},
+		"platform_editor_common_marks": {
+			"type": "boolean"
 		}
 	}
 }