@atlaskit/editor-plugin-text-formatting 1.2.2 → 1.2.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-text-formatting
 
+## 1.2.4
+
+### Patch Changes
+
+- [#78492](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/78492) [`3b0b93acfd19`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3b0b93acfd19) - [ux] [CAMPTASKS-123] faulty formatting state for inline nodes
+
+## 1.2.3
+
+### Patch Changes
+
+- [#80679](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/80679) [`104eb9443b7e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/104eb9443b7e) - ED-22553 Updating adf-schema version to 35.6.0
+
 ## 1.2.2
 
 ### Patch Changes

package/dist/cjs/pm-plugins/input-rule.js

@@ -23,7 +23,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _ValidCombinations;
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var ValidAutoformatChars = /*#__PURE__*/function (ValidAutoformatChars) {
   ValidAutoformatChars["STRONG"] = "__";
   ValidAutoformatChars["STRIKE"] = "~~";

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

@@ -16,14 +16,33 @@ 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 _state = require("@atlaskit/editor-prosemirror/state");
 var _textFormatting = _interopRequireWildcard(require("../commands/text-formatting"));
 var commands = _textFormatting;
 var _pluginKey = require("./plugin-key");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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 && Object.prototype.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; }
 // TODO: 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';
 
+var isSelectionInlineCursor = function isSelectionInlineCursor(selection) {
+  if (selection instanceof _state.NodeSelection) {
+    return true;
+  }
+  return false;
+};
+var checkNodeSelection = function checkNodeSelection(mark, editorState, type) {
+  var selection = editorState.selection;
+  if (isSelectionInlineCursor(selection)) {
+    return false;
+  }
+  if (type !== null || type !== undefined) {
+    return (0, _commands.toggleMark)(mark, {
+      type: type
+    })(editorState);
+  }
+  return (0, _commands.toggleMark)(mark)(editorState);
+};
 var getTextFormattingState = function getTextFormattingState(editorState, editorAnalyticsAPI) {
   var _editorState$schema$m = editorState.schema.marks,
     em = _editorState$schema$m.em,
@@ -35,19 +54,19 @@ var getTextFormattingState = function getTextFormattingState(editorState, editor
   var state = {};
   if (code) {
     state.codeActive = (0, _mark.anyMarkActive)(editorState, code.create());
-    state.codeDisabled = !(0, _commands.toggleMark)(code)(editorState);
+    state.codeDisabled = !checkNodeSelection(code, editorState);
   }
   if (em) {
     state.emActive = (0, _mark.anyMarkActive)(editorState, em);
-    state.emDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(em)(editorState);
+    state.emDisabled = state.codeActive ? true : !checkNodeSelection(em, editorState);
   }
   if (strike) {
     state.strikeActive = (0, _mark.anyMarkActive)(editorState, strike);
-    state.strikeDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(strike)(editorState);
+    state.strikeDisabled = state.codeActive ? true : !checkNodeSelection(strike, editorState);
   }
   if (strong) {
     state.strongActive = (0, _mark.anyMarkActive)(editorState, strong);
-    state.strongDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(strong)(editorState);
+    state.strongDisabled = state.codeActive ? true : !checkNodeSelection(strong, editorState);
   }
   if (subsup) {
     var subMark = subsup.create({
@@ -57,17 +76,13 @@ var getTextFormattingState = function getTextFormattingState(editorState, editor
       type: 'sup'
     });
     state.subscriptActive = (0, _mark.anyMarkActive)(editorState, subMark);
-    state.subscriptDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(subsup, {
-      type: 'sub'
-    })(editorState);
+    state.subscriptDisabled = state.codeActive ? true : !checkNodeSelection(subsup, editorState, 'sub');
     state.superscriptActive = (0, _mark.anyMarkActive)(editorState, supMark);
-    state.superscriptDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(subsup, {
-      type: 'sup'
-    })(editorState);
+    state.superscriptDisabled = state.codeActive ? true : !checkNodeSelection(subsup, editorState, 'sup');
   }
   if (underline) {
     state.underlineActive = (0, _mark.anyMarkActive)(editorState, underline);
-    state.underlineDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(underline)(editorState);
+    state.underlineDisabled = state.codeActive ? true : !checkNodeSelection(underline, editorState);
   }
   return state;
 };

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

@@ -12,8 +12,8 @@ var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _menuState = require("./hooks/menu-state");
 var _moreButton = require("./more-button");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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 && Object.prototype.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 FormattingTextDropdownMenu = exports.FormattingTextDropdownMenu = /*#__PURE__*/_react.default.memo(function (_ref) {
   var editorView = _ref.editorView,
     moreButtonLabel = _ref.moreButtonLabel,

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

@@ -20,8 +20,8 @@ var _commands = require("../../../commands");
 var _types = require("../types");
 var _IconsMarkSchema;
 /** @jsx jsx */
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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 && Object.prototype.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 withToolbarInputMethod = function withToolbarInputMethod(func) {
   return (0, _preset.editorCommandToPMCommand)(func(_analytics.INPUT_METHOD.TOOLBAR));
 };

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

@@ -9,8 +9,8 @@ var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _styles = require("@atlaskit/editor-common/styles");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+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 && Object.prototype.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; }
 /** @jsx jsx */
 
 var SingleToolbarButtons = exports.SingleToolbarButtons = /*#__PURE__*/_react.default.memo(function (_ref) {

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

@@ -6,10 +6,29 @@ import { anyMarkActive } 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 { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { createInlineCodeFromTextInputWithAnalytics } from '../commands/text-formatting';
 import * as commands from '../commands/text-formatting';
 import { pluginKey } from './plugin-key';
 export { pluginKey };
+const isSelectionInlineCursor = selection => {
+  if (selection instanceof NodeSelection) {
+    return true;
+  }
+  return false;
+};
+const checkNodeSelection = (mark, editorState, type) => {
+  const selection = editorState.selection;
+  if (isSelectionInlineCursor(selection)) {
+    return false;
+  }
+  if (type !== null || type !== undefined) {
+    return toggleMark(mark, {
+      type: type
+    })(editorState);
+  }
+  return toggleMark(mark)(editorState);
+};
 const getTextFormattingState = (editorState, editorAnalyticsAPI) => {
   const {
     em,
@@ -22,19 +41,19 @@ const getTextFormattingState = (editorState, editorAnalyticsAPI) => {
   const state = {};
   if (code) {
     state.codeActive = anyMarkActive(editorState, code.create());
-    state.codeDisabled = !toggleMark(code)(editorState);
+    state.codeDisabled = !checkNodeSelection(code, editorState);
   }
   if (em) {
     state.emActive = anyMarkActive(editorState, em);
-    state.emDisabled = state.codeActive ? true : !toggleMark(em)(editorState);
+    state.emDisabled = state.codeActive ? true : !checkNodeSelection(em, editorState);
   }
   if (strike) {
     state.strikeActive = anyMarkActive(editorState, strike);
-    state.strikeDisabled = state.codeActive ? true : !toggleMark(strike)(editorState);
+    state.strikeDisabled = state.codeActive ? true : !checkNodeSelection(strike, editorState);
   }
   if (strong) {
     state.strongActive = anyMarkActive(editorState, strong);
-    state.strongDisabled = state.codeActive ? true : !toggleMark(strong)(editorState);
+    state.strongDisabled = state.codeActive ? true : !checkNodeSelection(strong, editorState);
   }
   if (subsup) {
     const subMark = subsup.create({
@@ -44,17 +63,13 @@ const getTextFormattingState = (editorState, editorAnalyticsAPI) => {
       type: 'sup'
     });
     state.subscriptActive = anyMarkActive(editorState, subMark);
-    state.subscriptDisabled = state.codeActive ? true : !toggleMark(subsup, {
-      type: 'sub'
-    })(editorState);
+    state.subscriptDisabled = state.codeActive ? true : !checkNodeSelection(subsup, editorState, 'sub');
     state.superscriptActive = anyMarkActive(editorState, supMark);
-    state.superscriptDisabled = state.codeActive ? true : !toggleMark(subsup, {
-      type: 'sup'
-    })(editorState);
+    state.superscriptDisabled = state.codeActive ? true : !checkNodeSelection(subsup, editorState, 'sup');
   }
   if (underline) {
     state.underlineActive = anyMarkActive(editorState, underline);
-    state.underlineDisabled = state.codeActive ? true : !toggleMark(underline)(editorState);
+    state.underlineDisabled = state.codeActive ? true : !checkNodeSelection(underline, editorState);
   }
   return state;
 };

package/dist/esm/pm-plugins/input-rule.js

@@ -9,7 +9,7 @@ import _wrapNativeSuper from "@babel/runtime/helpers/wrapNativeSuper";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _ValidCombinations;
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { transformSmartCharsMentionsAndEmojis } from '@atlaskit/editor-common/mark';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';

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

@@ -6,10 +6,29 @@ import { anyMarkActive } 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 { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { createInlineCodeFromTextInputWithAnalytics } from '../commands/text-formatting';
 import * as commands from '../commands/text-formatting';
 import { pluginKey } from './plugin-key';
 export { pluginKey };
+var isSelectionInlineCursor = function isSelectionInlineCursor(selection) {
+  if (selection instanceof NodeSelection) {
+    return true;
+  }
+  return false;
+};
+var checkNodeSelection = function checkNodeSelection(mark, editorState, type) {
+  var selection = editorState.selection;
+  if (isSelectionInlineCursor(selection)) {
+    return false;
+  }
+  if (type !== null || type !== undefined) {
+    return toggleMark(mark, {
+      type: type
+    })(editorState);
+  }
+  return toggleMark(mark)(editorState);
+};
 var getTextFormattingState = function getTextFormattingState(editorState, editorAnalyticsAPI) {
   var _editorState$schema$m = editorState.schema.marks,
     em = _editorState$schema$m.em,
@@ -21,19 +40,19 @@ var getTextFormattingState = function getTextFormattingState(editorState, editor
   var state = {};
   if (code) {
     state.codeActive = anyMarkActive(editorState, code.create());
-    state.codeDisabled = !toggleMark(code)(editorState);
+    state.codeDisabled = !checkNodeSelection(code, editorState);
   }
   if (em) {
     state.emActive = anyMarkActive(editorState, em);
-    state.emDisabled = state.codeActive ? true : !toggleMark(em)(editorState);
+    state.emDisabled = state.codeActive ? true : !checkNodeSelection(em, editorState);
   }
   if (strike) {
     state.strikeActive = anyMarkActive(editorState, strike);
-    state.strikeDisabled = state.codeActive ? true : !toggleMark(strike)(editorState);
+    state.strikeDisabled = state.codeActive ? true : !checkNodeSelection(strike, editorState);
   }
   if (strong) {
     state.strongActive = anyMarkActive(editorState, strong);
-    state.strongDisabled = state.codeActive ? true : !toggleMark(strong)(editorState);
+    state.strongDisabled = state.codeActive ? true : !checkNodeSelection(strong, editorState);
   }
   if (subsup) {
     var subMark = subsup.create({
@@ -43,17 +62,13 @@ var getTextFormattingState = function getTextFormattingState(editorState, editor
       type: 'sup'
     });
     state.subscriptActive = anyMarkActive(editorState, subMark);
-    state.subscriptDisabled = state.codeActive ? true : !toggleMark(subsup, {
-      type: 'sub'
-    })(editorState);
+    state.subscriptDisabled = state.codeActive ? true : !checkNodeSelection(subsup, editorState, 'sub');
     state.superscriptActive = anyMarkActive(editorState, supMark);
-    state.superscriptDisabled = state.codeActive ? true : !toggleMark(subsup, {
-      type: 'sup'
-    })(editorState);
+    state.superscriptDisabled = state.codeActive ? true : !checkNodeSelection(subsup, editorState, 'sup');
   }
   if (underline) {
     state.underlineActive = anyMarkActive(editorState, underline);
-    state.underlineDisabled = state.codeActive ? true : !toggleMark(underline)(editorState);
+    state.underlineDisabled = state.codeActive ? true : !checkNodeSelection(underline, editorState);
   }
   return state;
 };

package/docs/0-intro.tsx

@@ -1,7 +1,8 @@
 import React from 'react';
 
 import { AtlassianInternalWarning, code, md } from '@atlaskit/docs';
-import { createEditorUseOnlyNotice } from '@atlaskit/editor-core/docs/editor-use-only';
+// eslint-disable-next-line @atlassian/tangerine/import/entry-points
+import { createEditorUseOnlyNotice } from '@atlaskit/editor-common/doc-utils';
 import { token } from '@atlaskit/tokens';
 
 export default md`
@@ -23,7 +24,7 @@ ${createEditorUseOnlyNotice('Editor Plugin Text Formatting', [
 ---
 
 The \`dependencies\`, \`configuration\`, \`state\`, \`actions\`, and \`commands\` of the plugin are defined
-below:  
+below:
 
 ${code`
 type TextFormattingPlugin = NextEditorPlugin<

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-text-formatting",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Text-formatting plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -32,8 +32,8 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^35.5.2",
-    "@atlaskit/editor-common": "^78.10.0",
+    "@atlaskit/adf-schema": "^35.6.0",
+    "@atlaskit/editor-common": "^78.14.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/editor-shared-styles": "^2.9.0",
@@ -78,11 +78,9 @@
       "ui-components": [
         "lite-mode"
       ],
-      "deprecation": [
-        "no-deprecated-imports"
-      ],
+      "deprecation": "no-deprecated-imports",
       "styling": [
-        "static",
+        "emotion",
         "emotion"
       ],
       "imports": [
@@ -91,4 +89,4 @@
     }
   },
   "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0"
-}
+}