@atlaskit/editor-plugin-text-formatting 2.2.4 → 2.2.6

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-text-formatting
 
+## 2.2.6
+
+### Patch Changes
+
+- [#154988](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/154988)
+  [`76019734ff982`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/76019734ff982) -
+  [ED-27560] Adds `isInitialised` state variable to text-formatting plugin and migrates it to
+  useSharedPluginStateSelector
+- Updated dependencies
+
+## 2.2.5
+
+### Patch Changes
+
+- [#152656](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/152656)
+  [`cd915ad2cc130`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cd915ad2cc130) -
+  Disallow keyboard formatting when selection contains text with code mark
+- Updated dependencies
+
 ## 2.2.4
 
 ### Patch Changes

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

@@ -8,7 +8,10 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("./commands");
+var _pluginKey = require("./plugin-key");
 function keymapPlugin(schema, editorAnalyticsAPI) {
   var list = {};
   if (schema.marks.strong) {
@@ -53,11 +56,59 @@ function keymapPlugin(schema, editorAnalyticsAPI) {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     _keymaps.toggleUnderline.common, (0, _commands.toggleUnderlineWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.SHORTCUT), list);
   }
+  var getEnabledKeylist = function getEnabledKeylist(view) {
+    var textFormattingState = _pluginKey.pluginKey.getState(view.state);
+    var list = {};
+    if (schema.marks.strong && !(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.strongDisabled)) {
+      (0, _keymaps.bindKeymapWithEditorCommand)(
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      _keymaps.toggleBold.common, (0, _commands.toggleStrongWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.SHORTCUT), list);
+    }
+    if (schema.marks.em && !(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.emDisabled)) {
+      (0, _keymaps.bindKeymapWithEditorCommand)(
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      _keymaps.toggleItalic.common, (0, _commands.toggleEmWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.SHORTCUT), list);
+    }
+    if (schema.marks.code && !(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.codeDisabled)) {
+      (0, _keymaps.bindKeymapWithEditorCommand)(
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      _keymaps.toggleCode.common, (0, _commands.toggleCodeWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.SHORTCUT), list);
+    }
+    if (schema.marks.strike && !(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.strikeDisabled)) {
+      (0, _keymaps.bindKeymapWithEditorCommand)(
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      _keymaps.toggleStrikethrough.common, (0, _commands.toggleStrikeWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.SHORTCUT), list);
+    }
+    if (schema.marks.subsup && !(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.subscriptDisabled)) {
+      (0, _keymaps.bindKeymapWithEditorCommand)(
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      _keymaps.toggleSubscript.common, (0, _commands.toggleSubscriptWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.SHORTCUT), list);
+    }
+    if (schema.marks.subsup && !(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.superscriptDisabled)) {
+      (0, _keymaps.bindKeymapWithEditorCommand)(
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      _keymaps.toggleSuperscript.common, (0, _commands.toggleSuperscriptWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.SHORTCUT), list);
+    }
+    if (schema.marks.underline && !(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.underlineDisabled)) {
+      (0, _keymaps.bindKeymapWithEditorCommand)(
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      _keymaps.toggleUnderline.common, (0, _commands.toggleUnderlineWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.SHORTCUT), list);
+    }
+    return list;
+  };
   return new _safePlugin.SafePlugin({
     props: {
       handleKeyDown: function handleKeyDown(view, event) {
         var keyboardEvent = (0, _keymaps.isCapsLockOnAndModifyKeyboardEvent)(event);
-        return (0, _keymap.keydownHandler)(list)(view, keyboardEvent);
+        var keymapList = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_8') ? getEnabledKeylist(view) : list;
+        return (0, _keymap.keydownHandler)(keymapList)(view, keyboardEvent);
       }
     }
   });

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

@@ -48,7 +48,9 @@ var getTextFormattingState = function getTextFormattingState(editorState, editor
     strong = _editorState$schema$m.strong,
     subsup = _editorState$schema$m.subsup,
     underline = _editorState$schema$m.underline;
-  var state = {};
+  var state = {
+    isInitialised: true
+  };
   if (code) {
     state.codeActive = (0, _mark.anyMarkActive)(editorState, code.create());
     state.codeDisabled = !checkNodeSelection(code, editorState);

package/dist/cjs/textFormattingPlugin.js

@@ -127,8 +127,10 @@ var textFormattingPlugin = exports.textFormattingPlugin = function textFormattin
       if (!editorState) {
         return undefined;
       }
-      return _objectSpread(_objectSpread({}, _pluginKey.pluginKey.getState(editorState)), {}, {
-        formattingIsPresent: (_clearFormattingPlugi = _clearFormatting.pluginKey.getState(editorState)) === null || _clearFormattingPlugi === void 0 ? void 0 : _clearFormattingPlugi.formattingIsPresent
+      var textFormattingState = _pluginKey.pluginKey.getState(editorState);
+      return _objectSpread(_objectSpread({}, textFormattingState), {}, {
+        formattingIsPresent: (_clearFormattingPlugi = _clearFormatting.pluginKey.getState(editorState)) === null || _clearFormattingPlugi === void 0 ? void 0 : _clearFormattingPlugi.formattingIsPresent,
+        isInitialised: !!(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.isInitialised)
       });
     },
     pluginsOptions: {

package/dist/cjs/ui/FloatingToolbarComponent.js

@@ -1,15 +1,18 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FloatingToolbarTextFormalWithIntl = void 0;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 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 _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
@@ -21,15 +24,14 @@ var _formattingIcons = require("./Toolbar/hooks/formatting-icons");
 var _useIconList2 = require("./Toolbar/hooks/use-icon-list");
 var _singleToolbarButtons = require("./Toolbar/single-toolbar-buttons");
 var _types2 = require("./Toolbar/types");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var _excluded = ["formattingIsPresent"];
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
-
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var FloatingToolbarSettings = {
   disabled: false,
   isReducedSpacing: true,
@@ -39,19 +41,98 @@ var FloatingToolbarSettings = {
   moreButtonLabel: '',
   toolbarType: _types2.ToolbarType.FLOATING
 };
+var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
+  var isInitialised = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.isInitialised');
+  var formattingIsPresent = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.formattingIsPresent');
+  var emActive = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.emActive');
+  var emDisabled = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.emDisabled');
+  var emHidden = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.emHidden');
+  var codeActive = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.codeActive');
+  var codeDisabled = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.codeDisabled');
+  var codeHidden = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.codeHidden');
+  var underlineActive = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.underlineActive');
+  var underlineDisabled = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.underlineDisabled');
+  var underlineHidden = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.underlineHidden');
+  var strikeActive = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.strikeActive');
+  var strikeDisabled = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.strikeDisabled');
+  var strikeHidden = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.strikeHidden');
+  var strongActive = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.strongActive');
+  var strongDisabled = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.strongDisabled');
+  var strongHidden = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.strongHidden');
+  var superscriptActive = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.superscriptActive');
+  var superscriptDisabled = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.superscriptDisabled');
+  var superscriptHidden = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.superscriptHidden');
+  var subscriptActive = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.subscriptActive');
+  var subscriptDisabled = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.subscriptDisabled');
+  var subscriptHidden = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.subscriptHidden');
+  return {
+    isInitialised: Boolean(isInitialised),
+    formattingIsPresent: formattingIsPresent,
+    emActive: emActive,
+    emDisabled: emDisabled,
+    emHidden: emHidden,
+    codeActive: codeActive,
+    codeDisabled: codeDisabled,
+    codeHidden: codeHidden,
+    underlineActive: underlineActive,
+    underlineDisabled: underlineDisabled,
+    underlineHidden: underlineHidden,
+    strikeActive: strikeActive,
+    strikeDisabled: strikeDisabled,
+    strikeHidden: strikeHidden,
+    strongActive: strongActive,
+    strongDisabled: strongDisabled,
+    strongHidden: strongHidden,
+    superscriptActive: superscriptActive,
+    superscriptDisabled: superscriptDisabled,
+    superscriptHidden: superscriptHidden,
+    subscriptActive: subscriptActive,
+    subscriptDisabled: subscriptDisabled,
+    subscriptHidden: subscriptHidden
+  };
+}, function (api) {
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['textFormatting']),
+    textFormattingState = _useSharedPluginState.textFormattingState;
+  return {
+    isInitialised: Boolean(textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.isInitialised),
+    formattingIsPresent: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.formattingIsPresent,
+    emActive: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.emActive,
+    emDisabled: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.emDisabled,
+    emHidden: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.emHidden,
+    codeActive: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.codeActive,
+    codeDisabled: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.codeDisabled,
+    codeHidden: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.codeHidden,
+    underlineActive: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.underlineActive,
+    underlineDisabled: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.underlineDisabled,
+    underlineHidden: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.underlineHidden,
+    strikeActive: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.strikeActive,
+    strikeDisabled: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.strikeDisabled,
+    strikeHidden: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.strikeHidden,
+    strongActive: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.strongActive,
+    strongDisabled: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.strongDisabled,
+    strongHidden: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.strongHidden,
+    superscriptActive: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.superscriptActive,
+    superscriptDisabled: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.superscriptDisabled,
+    superscriptHidden: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.superscriptHidden,
+    subscriptActive: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.subscriptActive,
+    subscriptDisabled: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.subscriptDisabled,
+    subscriptHidden: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.subscriptHidden
+  };
+});
 var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
   var api = _ref.api,
     editorAnalyticsAPI = _ref.editorAnalyticsAPI,
     editorView = _ref.editorView,
     intl = _ref.intl;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['textFormatting']),
-    textFormattingState = _useSharedPluginState.textFormattingState;
+  var textFormattingState = useSharedState(api);
+  var formattingIsPresent = textFormattingState.formattingIsPresent,
+    formattingIconState = (0, _objectWithoutProperties2.default)(textFormattingState, _excluded);
   var defaultIcons = (0, _formattingIcons.useFormattingIcons)({
     schema: editorView.state.schema,
     intl: intl,
     isToolbarDisabled: FloatingToolbarSettings.disabled,
     editorAnalyticsAPI: editorAnalyticsAPI,
-    textFormattingState: textFormattingState,
+    textFormattingState: formattingIconState,
     toolbarType: FloatingToolbarSettings.toolbarType
   });
   var hasMultiplePartsWithFormattingSelected;
@@ -72,7 +153,8 @@ var FloatingToolbarTextFormat = function FloatingToolbarTextFormat(_ref) {
     dropdownItems = _useIconList.dropdownItems,
     singleItems = _useIconList.singleItems;
   var clearIcon = (0, _clearFormattingIcon.useClearIcon)({
-    textFormattingState: textFormattingState,
+    formattingPluginInitialised: textFormattingState.isInitialised,
+    formattingIsPresent: formattingIsPresent,
     intl: intl,
     editorAnalyticsAPI: editorAnalyticsAPI,
     toolbarType: FloatingToolbarSettings.toolbarType

package/dist/cjs/ui/PrimaryToolbarComponent.js

@@ -7,8 +7,87 @@ Object.defineProperty(exports, "__esModule", {
 exports.PrimaryToolbarComponent = PrimaryToolbarComponent;
 var _react = _interopRequireDefault(require("react"));
 var _hooks = require("@atlaskit/editor-common/hooks");
+var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _Toolbar = _interopRequireDefault(require("./Toolbar"));
 var _types = require("./Toolbar/types");
+var useSharedState = (0, _hooks.sharedPluginStateHookMigratorFactory)(function (api) {
+  var isInitialised = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.isInitialised');
+  var formattingIsPresent = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.formattingIsPresent');
+  var emActive = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.emActive');
+  var emDisabled = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.emDisabled');
+  var emHidden = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.emHidden');
+  var codeActive = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.codeActive');
+  var codeDisabled = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.codeDisabled');
+  var codeHidden = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.codeHidden');
+  var underlineActive = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.underlineActive');
+  var underlineDisabled = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.underlineDisabled');
+  var underlineHidden = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.underlineHidden');
+  var strikeActive = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.strikeActive');
+  var strikeDisabled = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.strikeDisabled');
+  var strikeHidden = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.strikeHidden');
+  var strongActive = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.strongActive');
+  var strongDisabled = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.strongDisabled');
+  var strongHidden = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.strongHidden');
+  var superscriptActive = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.superscriptActive');
+  var superscriptDisabled = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.superscriptDisabled');
+  var superscriptHidden = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.superscriptHidden');
+  var subscriptActive = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.subscriptActive');
+  var subscriptDisabled = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.subscriptDisabled');
+  var subscriptHidden = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'textFormatting.subscriptHidden');
+  return {
+    isInitialised: Boolean(isInitialised),
+    formattingIsPresent: formattingIsPresent,
+    emActive: emActive,
+    emDisabled: emDisabled,
+    emHidden: emHidden,
+    codeActive: codeActive,
+    codeDisabled: codeDisabled,
+    codeHidden: codeHidden,
+    underlineActive: underlineActive,
+    underlineDisabled: underlineDisabled,
+    underlineHidden: underlineHidden,
+    strikeActive: strikeActive,
+    strikeDisabled: strikeDisabled,
+    strikeHidden: strikeHidden,
+    strongActive: strongActive,
+    strongDisabled: strongDisabled,
+    strongHidden: strongHidden,
+    superscriptActive: superscriptActive,
+    superscriptDisabled: superscriptDisabled,
+    superscriptHidden: superscriptHidden,
+    subscriptActive: subscriptActive,
+    subscriptDisabled: subscriptDisabled,
+    subscriptHidden: subscriptHidden
+  };
+}, function (api) {
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['textFormatting']),
+    textFormattingState = _useSharedPluginState.textFormattingState;
+  return {
+    isInitialised: Boolean(textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.isInitialised),
+    formattingIsPresent: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.formattingIsPresent,
+    emActive: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.emActive,
+    emDisabled: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.emDisabled,
+    emHidden: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.emHidden,
+    codeActive: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.codeActive,
+    codeDisabled: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.codeDisabled,
+    codeHidden: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.codeHidden,
+    underlineActive: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.underlineActive,
+    underlineDisabled: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.underlineDisabled,
+    underlineHidden: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.underlineHidden,
+    strikeActive: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.strikeActive,
+    strikeDisabled: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.strikeDisabled,
+    strikeHidden: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.strikeHidden,
+    strongActive: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.strongActive,
+    strongDisabled: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.strongDisabled,
+    strongHidden: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.strongHidden,
+    superscriptActive: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.superscriptActive,
+    superscriptDisabled: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.superscriptDisabled,
+    superscriptHidden: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.superscriptHidden,
+    subscriptActive: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.subscriptActive,
+    subscriptDisabled: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.subscriptDisabled,
+    subscriptHidden: textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.subscriptHidden
+  };
+});
 function PrimaryToolbarComponent(_ref) {
   var _api$analytics;
   var api = _ref.api,
@@ -19,8 +98,7 @@ function PrimaryToolbarComponent(_ref) {
     disabled = _ref.disabled,
     isReducedSpacing = _ref.isReducedSpacing,
     shouldUseResponsiveToolbar = _ref.shouldUseResponsiveToolbar;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['textFormatting']),
-    textFormattingState = _useSharedPluginState.textFormattingState;
+  var textFormattingState = useSharedState(api);
   return /*#__PURE__*/_react.default.createElement(_Toolbar.default, {
     textFormattingState: textFormattingState,
     popupsMountPoint: popupsMountPoint,

package/dist/cjs/ui/Toolbar/hooks/clear-formatting-icon.js

@@ -23,11 +23,12 @@ var _inputMethodUtils = require("../input-method-utils");
 
 var useClearIcon = exports.useClearIcon = function useClearIcon(_ref) {
   var intl = _ref.intl,
-    textFormattingState = _ref.textFormattingState,
+    formattingPluginInitialised = _ref.formattingPluginInitialised,
+    formattingPresent = _ref.formattingIsPresent,
     editorAnalyticsAPI = _ref.editorAnalyticsAPI,
     toolbarType = _ref.toolbarType;
-  var isPluginAvailable = Boolean(textFormattingState);
-  var formattingIsPresent = Boolean(textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.formattingIsPresent);
+  var isPluginAvailable = Boolean(formattingPluginInitialised);
+  var formattingIsPresent = Boolean(formattingPresent);
   var clearFormattingLabel = intl.formatMessage(_messages.toolbarMessages.clearFormatting);
   var clearFormattingToolbar = (0, _react.useCallback)(function (state, dispatch) {
     return (0, _clearFormatting.clearFormattingWithAnalytics)((0, _inputMethodUtils.getInputMethod)(toolbarType), editorAnalyticsAPI)(state, dispatch);

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

@@ -176,7 +176,7 @@ var buildMenuIconState = function buildMenuIconState(iconMark) {
   return function (_ref2) {
     var schema = _ref2.schema,
       textFormattingState = _ref2.textFormattingState;
-    var hasPluginState = Boolean(Object.keys(textFormattingState || {}).length);
+    var hasPluginState = Boolean(textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.isInitialised);
     var markSchema = IconsMarkSchema[iconMark];
     var hasSchemaMark = Boolean(schema.marks[markSchema]);
     if (!hasPluginState) {
@@ -266,7 +266,7 @@ var useHasFormattingActived = exports.useHasFormattingActived = function useHasF
   var iconTypeList = _ref5.iconTypeList,
     textFormattingState = _ref5.textFormattingState;
   var hasActiveFormatting = (0, _react.useMemo)(function () {
-    if (!textFormattingState) {
+    if (!(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.isInitialised)) {
       return false;
     }
     return iconTypeList.some(function (iconType) {

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
@@ -23,13 +24,12 @@ var _formattingIcons = require("./hooks/formatting-icons");
 var _responsiveToolbarButtons = require("./hooks/responsive-toolbar-buttons");
 var _moreButton = require("./more-button");
 var _singleToolbarButtons = require("./single-toolbar-buttons");
+var _excluded = ["formattingIsPresent"];
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
-
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-
 var ToolbarFormatting = function ToolbarFormatting(_ref) {
   var _usePreviousState;
   var shouldUseResponsiveToolbar = _ref.shouldUseResponsiveToolbar,
@@ -49,16 +49,19 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     message = _useState2[0],
     setMessage = _useState2[1];
+  var formattingIsPresent = textFormattingState.formattingIsPresent,
+    formattingIconState = (0, _objectWithoutProperties2.default)(textFormattingState, _excluded);
   var defaultIcons = (0, _formattingIcons.useFormattingIcons)({
     schema: editorView.state.schema,
     intl: intl,
     isToolbarDisabled: isToolbarDisabled,
     editorAnalyticsAPI: editorAnalyticsAPI,
-    textFormattingState: textFormattingState,
+    textFormattingState: formattingIconState,
     toolbarType: toolbarType
   });
   var clearIcon = (0, _clearFormattingIcon.useClearIcon)({
-    textFormattingState: textFormattingState,
+    formattingPluginInitialised: textFormattingState.isInitialised,
+    formattingIsPresent: formattingIsPresent,
     intl: intl,
     editorAnalyticsAPI: editorAnalyticsAPI,
     toolbarType: toolbarType

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

@@ -2,7 +2,10 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { bindKeymapWithEditorCommand, isCapsLockOnAndModifyKeyboardEvent, toggleBold, toggleCode, toggleItalic, toggleStrikethrough, toggleSubscript, toggleSuperscript, toggleUnderline } from '@atlaskit/editor-common/keymaps';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { toggleCodeWithAnalytics, toggleEmWithAnalytics, toggleStrikeWithAnalytics, toggleStrongWithAnalytics, toggleSubscriptWithAnalytics, toggleSuperscriptWithAnalytics, toggleUnderlineWithAnalytics } from './commands';
+import { pluginKey } from './plugin-key';
 export default function keymapPlugin(schema, editorAnalyticsAPI) {
   const list = {};
   if (schema.marks.strong) {
@@ -47,11 +50,59 @@ export default function keymapPlugin(schema, editorAnalyticsAPI) {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     toggleUnderline.common, toggleUnderlineWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
   }
+  const getEnabledKeylist = view => {
+    const textFormattingState = pluginKey.getState(view.state);
+    const list = {};
+    if (schema.marks.strong && !(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.strongDisabled)) {
+      bindKeymapWithEditorCommand(
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      toggleBold.common, toggleStrongWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
+    }
+    if (schema.marks.em && !(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.emDisabled)) {
+      bindKeymapWithEditorCommand(
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      toggleItalic.common, toggleEmWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
+    }
+    if (schema.marks.code && !(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.codeDisabled)) {
+      bindKeymapWithEditorCommand(
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      toggleCode.common, toggleCodeWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
+    }
+    if (schema.marks.strike && !(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.strikeDisabled)) {
+      bindKeymapWithEditorCommand(
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      toggleStrikethrough.common, toggleStrikeWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
+    }
+    if (schema.marks.subsup && !(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.subscriptDisabled)) {
+      bindKeymapWithEditorCommand(
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      toggleSubscript.common, toggleSubscriptWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
+    }
+    if (schema.marks.subsup && !(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.superscriptDisabled)) {
+      bindKeymapWithEditorCommand(
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      toggleSuperscript.common, toggleSuperscriptWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
+    }
+    if (schema.marks.underline && !(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.underlineDisabled)) {
+      bindKeymapWithEditorCommand(
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      toggleUnderline.common, toggleUnderlineWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.SHORTCUT), list);
+    }
+    return list;
+  };
   return new SafePlugin({
     props: {
       handleKeyDown(view, event) {
         const keyboardEvent = isCapsLockOnAndModifyKeyboardEvent(event);
-        return keydownHandler(list)(view, keyboardEvent);
+        const keymapList = editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_8') ? getEnabledKeylist(view) : list;
+        return keydownHandler(keymapList)(view, keyboardEvent);
       }
     }
   });

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

@@ -39,7 +39,9 @@ const getTextFormattingState = (editorState, editorAnalyticsAPI) => {
     subsup,
     underline
   } = editorState.schema.marks;
-  const state = {};
+  const state = {
+    isInitialised: true
+  };
   if (code) {
     state.codeActive = anyMarkActive(editorState, code.create());
     state.codeDisabled = !checkNodeSelection(code, editorState);

package/dist/es2019/textFormattingPlugin.js

@@ -120,9 +120,11 @@ export const textFormattingPlugin = ({
       if (!editorState) {
         return undefined;
       }
+      const textFormattingState = textFormattingPluginKey.getState(editorState);
       return {
-        ...textFormattingPluginKey.getState(editorState),
-        formattingIsPresent: (_clearFormattingPlugi = clearFormattingPluginKey.getState(editorState)) === null || _clearFormattingPlugi === void 0 ? void 0 : _clearFormattingPlugi.formattingIsPresent
+        ...textFormattingState,
+        formattingIsPresent: (_clearFormattingPlugi = clearFormattingPluginKey.getState(editorState)) === null || _clearFormattingPlugi === void 0 ? void 0 : _clearFormattingPlugi.formattingIsPresent,
+        isInitialised: !!(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.isInitialised)
       };
     },
     pluginsOptions: {