@atlaskit/editor-plugin-block-type 4.0.14 → 4.1.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-type
 
+## 4.1.0
+
+### Minor Changes
+
+- [#96424](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/96424)
+  [`e14834ad65277`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e14834ad65277) -
+  [ux] Add clear formatting option to text styling menu
+
 ## 4.0.14
 
 ### Patch Changes

package/dist/cjs/blockTypePlugin.js

@@ -191,6 +191,9 @@ var blockTypePlugin = exports.blockTypePlugin = function blockTypePlugin(_ref3)
       insertBlockQuote: function insertBlockQuote(inputMethod) {
         var _api$analytics5;
         return (0, _blockType.insertBlockQuoteWithAnalyticsCommand)(inputMethod, api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
+      },
+      clearFormatting: function clearFormatting() {
+        return (0, _blockType.clearFormatting)();
       }
     },
     getSharedState: function getSharedState(editorState) {

package/dist/cjs/pm-plugins/block-types.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getBlockTypesInDropdown = exports.WRAPPER_BLOCK_TYPES = exports.TEXT_BLOCK_TYPES = exports.PANEL = exports.OTHER = exports.NORMAL_TEXT = exports.HEADING_6 = exports.HEADING_5 = exports.HEADING_4 = exports.HEADING_3 = exports.HEADING_2 = exports.HEADING_1 = exports.HEADINGS_BY_NAME = exports.HEADINGS_BY_LEVEL = exports.CODE_BLOCK = exports.BLOCK_QUOTE = exports.ALL_BLOCK_TYPES = void 0;
+exports.getBlockTypesInDropdown = exports.WRAPPER_BLOCK_TYPES = exports.TEXT_BLOCK_TYPES = exports.PANEL = exports.OTHER = exports.NORMAL_TEXT = exports.HEADING_6 = exports.HEADING_5 = exports.HEADING_4 = exports.HEADING_3 = exports.HEADING_2 = exports.HEADING_1 = exports.HEADINGS_BY_NAME = exports.HEADINGS_BY_LEVEL = exports.FORMATTING_NODE_TYPES = exports.FORMATTING_MARK_TYPES = exports.CODE_BLOCK = exports.BLOCK_QUOTE = exports.ALL_BLOCK_TYPES = void 0;
 var _messages = require("@atlaskit/editor-common/messages");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var NORMAL_TEXT = exports.NORMAL_TEXT = {
@@ -76,6 +76,8 @@ var OTHER = exports.OTHER = {
   nodeName: ''
 };
 var TEXT_BLOCK_TYPES = exports.TEXT_BLOCK_TYPES = [NORMAL_TEXT, HEADING_1, HEADING_2, HEADING_3, HEADING_4, HEADING_5, HEADING_6];
+var FORMATTING_NODE_TYPES = exports.FORMATTING_NODE_TYPES = ['heading', 'blockquote'];
+var FORMATTING_MARK_TYPES = exports.FORMATTING_MARK_TYPES = ['em', 'code', 'strike', 'strong', 'underline', 'textColor', 'subsup', 'backgroundColor'];
 var WRAPPER_BLOCK_TYPES = exports.WRAPPER_BLOCK_TYPES = [BLOCK_QUOTE, CODE_BLOCK, PANEL];
 var ALL_BLOCK_TYPES = exports.ALL_BLOCK_TYPES = TEXT_BLOCK_TYPES.concat(WRAPPER_BLOCK_TYPES);
 var getBlockTypesInDropdown = exports.getBlockTypesInDropdown = function getBlockTypesInDropdown(includeBlockQuoteAsTextstyleOption) {

package/dist/cjs/pm-plugins/commands/block-type.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.insertBlockQuoteWithAnalytics = exports.cleanUpAtTheStartOfDocument = void 0;
+exports.cleanUpAtTheStartOfDocument = void 0;
+exports.clearFormatting = clearFormatting;
+exports.insertBlockQuoteWithAnalytics = void 0;
 exports.insertBlockQuoteWithAnalyticsCommand = insertBlockQuoteWithAnalyticsCommand;
 exports.setBlockType = setBlockType;
 exports.setBlockTypeWithAnalytics = setBlockTypeWithAnalytics;
@@ -17,6 +19,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _editorTables = require("@atlaskit/editor-tables");
 var _blockTypes = require("../block-types");
+var _clearFormatting = require("./clear-formatting");
 var _wrapSelectionIn = require("./wrapSelectionIn");
 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; } }
@@ -111,9 +114,54 @@ function setNormalText(fromBlockQuote) {
     return tr;
   };
 }
-function withCurrentHeadingLevel(fn) {
+function clearFormatting() {
   return function (_ref7) {
     var tr = _ref7.tr;
+    var formattingCleared = [];
+    var schema = tr.doc.type.schema;
+    _clearFormatting.FORMATTING_MARK_TYPES.forEach(function (mark) {
+      var _tr$selection = tr.selection,
+        from = _tr$selection.from,
+        to = _tr$selection.to;
+      var markType = schema.marks[mark];
+      if (!markType) {
+        return;
+      }
+      if (tr.selection instanceof _editorTables.CellSelection) {
+        (0, _clearFormatting.cellSelectionNodesBetween)(tr.selection, tr.doc, function (node, pos) {
+          var isTableCell = node.type === schema.nodes.tableCell || node.type === schema.nodes.tableHeader;
+          if (!isTableCell) {
+            return true;
+          }
+          if (tr.doc.rangeHasMark(pos, pos + node.nodeSize, markType)) {
+            formattingCleared.push(_clearFormatting.formatTypes[mark]);
+            tr.removeMark(pos, pos + node.nodeSize, markType);
+          }
+          return false;
+        });
+      } else if (tr.doc.rangeHasMark(from, to, markType)) {
+        formattingCleared.push(_clearFormatting.formatTypes[mark]);
+        tr.removeMark(from, to, markType);
+      }
+    });
+    _clearFormatting.FORMATTING_NODE_TYPES.forEach(function (nodeName) {
+      var formattedNodeType = schema.nodes[nodeName];
+      var _tr$selection2 = tr.selection,
+        $from = _tr$selection2.$from,
+        $to = _tr$selection2.$to;
+      if (tr.selection instanceof _editorTables.CellSelection) {
+        (0, _clearFormatting.cellSelectionNodesBetween)(tr.selection, tr.doc, (0, _clearFormatting.clearNodeFormattingOnSelection)(schema, tr, formattedNodeType, nodeName, formattingCleared));
+      } else {
+        tr.doc.nodesBetween($from.pos, $to.pos, (0, _clearFormatting.clearNodeFormattingOnSelection)(schema, tr, formattedNodeType, nodeName, formattingCleared));
+      }
+    });
+    tr.setStoredMarks([]);
+    return tr;
+  };
+}
+function withCurrentHeadingLevel(fn) {
+  return function (_ref8) {
+    var tr = _ref8.tr;
     // Find all headings and paragraphs of text
     var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
       heading = _tr$doc$type$schema$n.heading,
@@ -150,8 +198,8 @@ function withCurrentHeadingLevel(fn) {
 }
 function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return function (_ref8) {
-      var tr = _ref8.tr;
+    return function (_ref9) {
+      var tr = _ref9.tr;
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
         action: _analytics.ACTION.FORMATTED,
         actionSubject: _analytics.ACTION_SUBJECT.TEXT,
@@ -174,8 +222,8 @@ var setHeadingWithAnalytics = exports.setHeadingWithAnalytics = function setHead
 // eslint-disable-next-line @typescript-eslint/max-params
 ) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return function (_ref9) {
-      var tr = _ref9.tr;
+    return function (_ref10) {
+      var tr = _ref10.tr;
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
         action: _analytics.ACTION.FORMATTED,
         actionSubject: _analytics.ACTION_SUBJECT.TEXT,
@@ -224,8 +272,8 @@ var insertBlockQuoteWithAnalytics = exports.insertBlockQuoteWithAnalytics = func
 };
 function insertBlockQuoteWithAnalyticsCommand(inputMethod, editorAnalyticsApi) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return function (_ref10) {
-      var tr = _ref10.tr;
+    return function (_ref11) {
+      var tr = _ref11.tr;
       var nodes = tr.doc.type.schema.nodes;
 
       // TODO: analytics event
@@ -247,8 +295,8 @@ function insertBlockQuoteWithAnalyticsCommand(inputMethod, editorAnalyticsApi) {
   });
 }
 var cleanUpAtTheStartOfDocument = exports.cleanUpAtTheStartOfDocument = function cleanUpAtTheStartOfDocument(state, dispatch) {
-  var _ref11 = state.selection,
-    $cursor = _ref11.$cursor;
+  var _ref12 = state.selection,
+    $cursor = _ref12.$cursor;
   if ($cursor && !$cursor.nodeBefore && !$cursor.nodeAfter && $cursor.pos === 1) {
     var tr = state.tr,
       schema = state.schema;

package/dist/cjs/pm-plugins/commands/clear-formatting.js

@@ -0,0 +1,58 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.cellSelectionNodesBetween = exports.FORMATTING_NODE_TYPES = exports.FORMATTING_MARK_TYPES = void 0;
+exports.clearNodeFormattingOnSelection = clearNodeFormattingOnSelection;
+exports.formatTypes = void 0;
+var _analytics = require("@atlaskit/editor-common/analytics");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
+// Functions duplicated from platform/packages/editor/editor-plugin-text-formatting/src/editor-commands/clear-formatting.ts
+// TODO: Refactor to avoid duplication if platform_editor_blockquote_in_text_formatting_menu experiment is productionalised
+var FORMATTING_NODE_TYPES = exports.FORMATTING_NODE_TYPES = ['heading', 'blockquote'];
+var FORMATTING_MARK_TYPES = exports.FORMATTING_MARK_TYPES = ['em', 'code', 'strike', 'strong', 'underline', 'textColor', 'subsup', 'backgroundColor'];
+var formatTypes = exports.formatTypes = {
+  em: _analytics.ACTION_SUBJECT_ID.FORMAT_ITALIC,
+  code: _analytics.ACTION_SUBJECT_ID.FORMAT_CODE,
+  strike: _analytics.ACTION_SUBJECT_ID.FORMAT_STRIKE,
+  strong: _analytics.ACTION_SUBJECT_ID.FORMAT_STRONG,
+  underline: _analytics.ACTION_SUBJECT_ID.FORMAT_UNDERLINE,
+  textColor: _analytics.ACTION_SUBJECT_ID.FORMAT_COLOR,
+  subsup: 'subsup',
+  backgroundColor: _analytics.ACTION_SUBJECT_ID.FORMAT_BACKGROUND_COLOR
+};
+var cellSelectionNodesBetween = exports.cellSelectionNodesBetween = function cellSelectionNodesBetween(selection, doc, f, startPos
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
+  selection.forEachCell(function (cell, cellPos) {
+    doc.nodesBetween(cellPos, cellPos + cell.nodeSize, f, startPos);
+  });
+};
+
+// eslint-disable-next-line @typescript-eslint/max-params
+function clearNodeFormattingOnSelection(schema, tr, formattedNodeType, nodeName, formattingCleared) {
+  return function (node, pos) {
+    if (node.type === formattedNodeType) {
+      if (formattedNodeType.isTextblock) {
+        tr.setNodeMarkup(pos, schema.nodes.paragraph);
+        formattingCleared.push(nodeName);
+        return false;
+      } else {
+        // In case of panel or blockquote
+        var fromPos = tr.doc.resolve(pos + 1);
+        var toPos = tr.doc.resolve(pos + node.nodeSize - 1);
+        var nodeRange = fromPos.blockRange(toPos);
+        if (nodeRange) {
+          var targetLiftDepth = (0, _transform.liftTarget)(nodeRange);
+          if (targetLiftDepth || targetLiftDepth === 0) {
+            formattingCleared.push(nodeName);
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            tr.lift(nodeRange, targetLiftDepth);
+          }
+        }
+      }
+    }
+    return true;
+  };
+}

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

@@ -111,12 +111,14 @@ var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispa
         var availableBlockTypesInDropdown = BLOCK_TYPES_IN_DROPDOWN.filter(function (blockType) {
           return isBlockTypeSchemaSupported(blockType, state);
         });
+        var formattingIsPresent = (0, _utils.hasBlockQuoteInOptions)(availableBlockTypesInDropdown) ? (0, _utils.checkFormattingIsPresent)(state) : undefined;
         return {
           currentBlockType: detectBlockType(availableBlockTypesInDropdown, state),
           blockTypesDisabled: (0, _utils.areBlockTypesDisabled)(state),
           availableBlockTypes: availableBlockTypes,
           availableWrapperBlockTypes: availableWrapperBlockTypes,
-          availableBlockTypesInDropdown: availableBlockTypesInDropdown
+          availableBlockTypesInDropdown: availableBlockTypesInDropdown,
+          formattingIsPresent: formattingIsPresent
         };
       },
       // Ignored via go/ees005
@@ -124,9 +126,10 @@ var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispa
       apply: function apply(_tr, oldPluginState, _oldState, newState) {
         var newPluginState = _objectSpread(_objectSpread({}, oldPluginState), {}, {
           currentBlockType: detectBlockType(oldPluginState.availableBlockTypesInDropdown, newState),
-          blockTypesDisabled: (0, _utils.areBlockTypesDisabled)(newState)
+          blockTypesDisabled: (0, _utils.areBlockTypesDisabled)(newState),
+          formattingIsPresent: (0, _utils.hasBlockQuoteInOptions)(oldPluginState.availableBlockTypesInDropdown) ? (0, _utils.checkFormattingIsPresent)(newState) : undefined
         });
-        if (newPluginState.currentBlockType !== oldPluginState.currentBlockType || newPluginState.blockTypesDisabled !== oldPluginState.blockTypesDisabled) {
+        if (newPluginState.currentBlockType !== oldPluginState.currentBlockType || newPluginState.blockTypesDisabled !== oldPluginState.blockTypesDisabled || newPluginState.formattingIsPresent !== oldPluginState.formattingIsPresent) {
           dispatch(pluginKey, newPluginState);
         }
         return newPluginState;

package/dist/cjs/pm-plugins/ui/FloatingToolbarComponent.js

@@ -30,6 +30,10 @@ function FloatingToolbarComponent(_ref) {
     var _api$core2, _api$blockType2;
     return api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(api === null || api === void 0 || (_api$blockType2 = api.blockType) === null || _api$blockType2 === void 0 || (_api$blockType2 = _api$blockType2.commands) === null || _api$blockType2 === void 0 ? void 0 : _api$blockType2.insertBlockQuote(_analytics.INPUT_METHOD.TOOLBAR));
   }, [api]);
+  var clearFormatting = (0, _react.useCallback)(function () {
+    var _api$core3, _api$blockType3;
+    return api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(api === null || api === void 0 || (_api$blockType3 = api.blockType) === null || _api$blockType3 === void 0 || (_api$blockType3 = _api$blockType3.commands) === null || _api$blockType3 === void 0 ? void 0 : _api$blockType3.clearFormatting());
+  }, [api]);
   return /*#__PURE__*/_react.default.createElement(_ToolbarBlockType.default, {
     isSmall: FloatingToolbarSettings.isSmall,
     isDisabled: FloatingToolbarSettings.disabled,
@@ -40,6 +44,7 @@ function FloatingToolbarComponent(_ref) {
     ,
     pluginState: blockTypeState,
     wrapBlockQuote: wrapBlockQuote,
+    clearFormatting: clearFormatting,
     shouldUseDefaultRole: FloatingToolbarSettings.shouldUseDefaultRole,
     api: api
   });

package/dist/cjs/pm-plugins/ui/PrimaryToolbarComponent.js

@@ -28,12 +28,17 @@ function PrimaryToolbarComponent(_ref) {
     var _api$core2, _api$blockType2;
     return api === null || api === void 0 || (_api$core2 = api.core) === null || _api$core2 === void 0 ? void 0 : _api$core2.actions.execute(api === null || api === void 0 || (_api$blockType2 = api.blockType) === null || _api$blockType2 === void 0 || (_api$blockType2 = _api$blockType2.commands) === null || _api$blockType2 === void 0 ? void 0 : _api$blockType2.insertBlockQuote(_analytics.INPUT_METHOD.TOOLBAR));
   };
+  var clearFormatting = function clearFormatting() {
+    var _api$core3, _api$blockType3;
+    return api === null || api === void 0 || (_api$core3 = api.core) === null || _api$core3 === void 0 ? void 0 : _api$core3.actions.execute(api === null || api === void 0 || (_api$blockType3 = api.blockType) === null || _api$blockType3 === void 0 || (_api$blockType3 = _api$blockType3.commands) === null || _api$blockType3 === void 0 ? void 0 : _api$blockType3.clearFormatting());
+  };
   return /*#__PURE__*/_react.default.createElement(_ToolbarBlockType.default, {
     isSmall: isSmall,
     isDisabled: disabled,
     isReducedSpacing: isToolbarReducedSpacing,
     setTextLevel: boundSetBlockType,
-    wrapBlockQuote: wrapBlockQuote
+    wrapBlockQuote: wrapBlockQuote,
+    clearFormatting: clearFormatting
     // Ignored via go/ees005
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     ,

package/dist/cjs/pm-plugins/ui/ToolbarBlockType/index.js

@@ -15,10 +15,13 @@ var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
+var _messages = require("@atlaskit/editor-common/messages");
 var _styles = require("@atlaskit/editor-common/styles");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _tokens = require("@atlaskit/tokens");
+var _blockTypes = require("../../block-types");
 var _blocktypeButton = require("./blocktype-button");
 var _styled = require("./styled");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -69,22 +72,21 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
       var formatMessage = _this.props.intl.formatMessage;
       var _this$props$pluginSta = _this.props.pluginState,
         currentBlockType = _this$props$pluginSta.currentBlockType,
-        availableBlockTypesInDropdown = _this$props$pluginSta.availableBlockTypesInDropdown;
+        availableBlockTypesInDropdown = _this$props$pluginSta.availableBlockTypesInDropdown,
+        formattingIsPresent = _this$props$pluginSta.formattingIsPresent;
       var items = availableBlockTypesInDropdown.map(function (blockType, index) {
         var isActive = currentBlockType === blockType;
         var tagName = blockType.tagName || 'p';
         var Tag = tagName;
         var keyMap = (0, _keymaps.findKeymapByDescription)(blockType.title.defaultMessage);
-        return {
+        var item = {
           content:
           // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
           (0, _react2.jsx)("div", {
             css: (0, _styled.blockTypeMenuItemStyle)(tagName, isActive, _this.state.typographyTheme)
           }, (0, _react2.jsx)(Tag, null, formatMessage(blockType.title))),
           value: blockType,
-          label: formatMessage(blockType.title),
           'aria-label': (0, _keymaps.tooltip)(keyMap, formatMessage(blockType.title)),
-          keyShortcuts: (0, _keymaps.getAriaKeyshortcuts)(keyMap),
           key: "".concat(blockType.name, "-").concat(index),
           elemAfter:
           // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
@@ -93,7 +95,32 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
           }, (0, _keymaps.tooltip)(keyMap)),
           isActive: isActive
         };
+        return item;
       });
+      if (availableBlockTypesInDropdown.map(function (blockType) {
+        return blockType.name;
+      }).includes('blockquote')) {
+        var clearFormattingItem = {
+          content: (0, _react2.jsx)("div", null, (0, _react2.jsx)("p", null, _messages.toolbarMessages.clearFormatting.defaultMessage)),
+          value: {
+            name: 'clearFormatting'
+          },
+          'aria-label': (0, _keymaps.tooltip)(_keymaps.clearFormatting, _messages.toolbarMessages.clearFormatting.defaultMessage),
+          key: 'clear-formatting',
+          elemAfter:
+          // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+          (0, _react2.jsx)("div", {
+            css: [_styled.keyboardShortcut]
+          }, (0, _keymaps.tooltip)(_keymaps.clearFormatting)),
+          isActive: false,
+          isDisabled: currentBlockType === _blockTypes.NORMAL_TEXT && !formattingIsPresent
+        };
+        return [{
+          items: items
+        }, {
+          items: [clearFormattingItem]
+        }];
+      }
       return [{
         items: items
       }];
@@ -106,8 +133,12 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
       if (blockType.name === 'blockquote') {
         _this.props.wrapBlockQuote(blockType.name);
       } else {
-        var fromBlockQuote = _this.props.pluginState.currentBlockType.name === 'blockquote';
-        _this.props.setTextLevel(blockType.name, fromBlockQuote);
+        if (blockType.name === 'clearFormatting') {
+          _this.props.clearFormatting();
+        } else {
+          var fromBlockQuote = _this.props.pluginState.currentBlockType.name === 'blockquote';
+          _this.props.setTextLevel(blockType.name, fromBlockQuote);
+        }
       }
       if (shouldCloseMenu) {
         _this.setState(_objectSpread(_objectSpread({}, _this.state), {}, {
@@ -175,47 +206,53 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
       });
       if (!this.props.isDisabled && !blockTypesDisabled) {
         var items = this.createItems();
-        return (
+        return (0, _react2.jsx)("span", {
+          css: (0, _experiments.editorExperiment)('platform_editor_blockquote_in_text_formatting_menu', true) ?
+          // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+          [_styles.wrapperStyle, _styled.floatingToolbarWrapperStyle] :
           // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-          (0, _react2.jsx)("span", {
-            css: _styles.wrapperStyle
-          }, (0, _react2.jsx)(_uiMenu.DropdownMenuWithKeyboardNavigation, {
-            items: items,
-            onOpenChange: this.onOpenChange,
-            onItemActivated: this.handleSelectBlockType,
-            isOpen: active,
-            mountTo: popupsMountPoint,
-            boundariesElement: popupsBoundariesElement,
-            scrollableElement: popupsScrollableElement,
-            zIndex: _editorSharedStyles.akEditorMenuZIndex,
-            fitHeight: 360,
-            fitWidth: 106,
-            shouldUseDefaultRole: shouldUseDefaultRole,
-            shouldFocusFirstItem: function shouldFocusFirstItem() {
-              if (isOpenedByKeyboard) {
-                // eslint-disable-next-line @repo/internal/react/no-set-state-inside-render
-                _this3.setState(_objectSpread(_objectSpread({}, _this3.state), {}, {
-                  isOpenedByKeyboard: false
-                }));
-              }
-              return isOpenedByKeyboard;
+          _styles.wrapperStyle
+        }, (0, _react2.jsx)(_uiMenu.DropdownMenuWithKeyboardNavigation, {
+          items: items,
+          onOpenChange: this.onOpenChange,
+          onItemActivated: this.handleSelectBlockType,
+          isOpen: active,
+          mountTo: popupsMountPoint,
+          boundariesElement: popupsBoundariesElement,
+          scrollableElement: popupsScrollableElement,
+          zIndex: _editorSharedStyles.akEditorMenuZIndex,
+          fitHeight: 360,
+          fitWidth: 106,
+          section: {
+            hasSeparator: true
+          },
+          shouldUseDefaultRole: shouldUseDefaultRole
+          // hasSeparator={true}
+          ,
+          shouldFocusFirstItem: function shouldFocusFirstItem() {
+            if (isOpenedByKeyboard) {
+              // eslint-disable-next-line @repo/internal/react/no-set-state-inside-render
+              _this3.setState(_objectSpread(_objectSpread({}, _this3.state), {}, {
+                isOpenedByKeyboard: false
+              }));
             }
-          }, (0, _react2.jsx)(_blocktypeButton.BlockTypeButton, {
-            isSmall: isSmall,
-            isReducedSpacing: isReducedSpacing,
-            selected: active,
-            disabled: false,
-            title: blockTypeTitles[0],
-            onClick: this.handleTriggerClick,
-            onKeyDown: this.handleTriggerByKeyboard,
-            formatMessage: formatMessage,
-            "aria-expanded": active,
-            blockTypeName: currentBlockType.name
-          })), !(api !== null && api !== void 0 && api.primaryToolbar) && (0, _react2.jsx)("span", {
-            // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-            css: _styles.separatorStyles
-          }))
-        );
+            return isOpenedByKeyboard;
+          }
+        }, (0, _react2.jsx)(_blocktypeButton.BlockTypeButton, {
+          isSmall: isSmall,
+          isReducedSpacing: isReducedSpacing,
+          selected: active,
+          disabled: false,
+          title: blockTypeTitles[0],
+          onClick: this.handleTriggerClick,
+          onKeyDown: this.handleTriggerByKeyboard,
+          formatMessage: formatMessage,
+          "aria-expanded": active,
+          blockTypeName: currentBlockType.name
+        })), !(api !== null && api !== void 0 && api.primaryToolbar) && (0, _react2.jsx)("span", {
+          // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+          css: _styles.separatorStyles
+        }));
       }
       return (
         // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766

package/dist/cjs/pm-plugins/ui/ToolbarBlockType/styled.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.wrapperSmallStyle = exports.keyboardShortcutSelect = exports.keyboardShortcut = exports.expandIconWrapperStyle = exports.blockTypeMenuItemStyle = void 0;
+exports.wrapperSmallStyle = exports.keyboardShortcutSelect = exports.keyboardShortcut = exports.floatingToolbarWrapperStyle = exports.expandIconWrapperStyle = exports.blockTypeMenuItemStyle = void 0;
 var _react = require("@emotion/react");
 var _styles = require("@atlaskit/editor-common/styles");
 var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
@@ -26,6 +26,12 @@ var blockTypeMenuItemStyle = exports.blockTypeMenuItemStyle = function blockType
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
         'h1, h2, h3, h4, h5, h6': {
           marginTop: 0
+        },
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
+        blockquote: {
+          paddingTop: 0,
+          paddingBottom: 0,
+          marginTop: 0
         }
       }
     },
@@ -54,4 +60,12 @@ var wrapperSmallStyle = exports.wrapperSmallStyle = (0, _react.css)({
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 var expandIconWrapperStyle = exports.expandIconWrapperStyle = (0, _react.css)({
   marginLeft: "var(--ds-space-negative-100, -8px)"
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+var floatingToolbarWrapperStyle = exports.floatingToolbarWrapperStyle = (0, _react.css)({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  "[data-role='droplistContent']": {
+    maxHeight: '90vh'
+  }
 });

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

@@ -4,7 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.areBlockTypesDisabled = areBlockTypesDisabled;
-exports.isNodeAWrappingBlockNode = exports.createWrappingTextBlockRule = exports.createJoinNodesRule = void 0;
+exports.isNodeAWrappingBlockNode = exports.hasBlockQuoteInOptions = exports.createWrappingTextBlockRule = exports.createJoinNodesRule = exports.checkFormattingIsPresent = void 0;
+var _mark = require("@atlaskit/editor-common/mark");
 var _utils = require("@atlaskit/editor-common/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
@@ -117,4 +118,42 @@ function areBlockTypesDisabled(state) {
   return nodesTypes.filter(function (type) {
     return type !== panel;
   }).length > 0;
-}
+}
+var blockStylingIsPresent = function blockStylingIsPresent(state) {
+  var _state$selection3 = state.selection,
+    from = _state$selection3.from,
+    to = _state$selection3.to;
+  var isBlockStyling = false;
+  state.doc.nodesBetween(from, to, function (node) {
+    if (_blockTypes.FORMATTING_NODE_TYPES.indexOf(node.type.name) !== -1) {
+      isBlockStyling = true;
+      return false;
+    }
+    return true;
+  });
+  return isBlockStyling;
+};
+var marksArePresent = function marksArePresent(state) {
+  var activeMarkTypes = _blockTypes.FORMATTING_MARK_TYPES.filter(function (mark) {
+    if (!!state.schema.marks[mark]) {
+      var _state$selection4 = state.selection,
+        $from = _state$selection4.$from,
+        empty = _state$selection4.empty;
+      var marks = state.schema.marks;
+      if (empty) {
+        return !!marks[mark].isInSet(state.storedMarks || $from.marks());
+      }
+      return (0, _mark.anyMarkActive)(state, marks[mark]);
+    }
+    return false;
+  });
+  return activeMarkTypes.length > 0;
+};
+var checkFormattingIsPresent = exports.checkFormattingIsPresent = function checkFormattingIsPresent(state) {
+  return marksArePresent(state) || blockStylingIsPresent(state);
+};
+var hasBlockQuoteInOptions = exports.hasBlockQuoteInOptions = function hasBlockQuoteInOptions(dropdownOptions) {
+  return !!dropdownOptions.find(function (blockType) {
+    return blockType.name === 'blockquote';
+  });
+};

package/dist/es2019/blockTypePlugin.js

@@ -7,7 +7,7 @@ import { IconHeading, IconQuote } from '@atlaskit/editor-common/quick-insert';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { setBlockTypeWithAnalytics, insertBlockQuoteWithAnalytics, insertBlockQuoteWithAnalyticsCommand } from './pm-plugins/commands/block-type';
+import { setBlockTypeWithAnalytics, insertBlockQuoteWithAnalytics, insertBlockQuoteWithAnalyticsCommand, clearFormatting } from './pm-plugins/commands/block-type';
 import inputRulePlugin from './pm-plugins/input-rule';
 import keymapPlugin from './pm-plugins/keymap';
 import { createPlugin, pluginKey } from './pm-plugins/main';
@@ -181,6 +181,9 @@ const blockTypePlugin = ({
       insertBlockQuote(inputMethod) {
         var _api$analytics5;
         return insertBlockQuoteWithAnalyticsCommand(inputMethod, api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions);
+      },
+      clearFormatting() {
+        return clearFormatting();
       }
     },
     getSharedState(editorState) {

package/dist/es2019/pm-plugins/block-types.js

@@ -70,6 +70,8 @@ export const OTHER = {
   nodeName: ''
 };
 export const TEXT_BLOCK_TYPES = [NORMAL_TEXT, HEADING_1, HEADING_2, HEADING_3, HEADING_4, HEADING_5, HEADING_6];
+export const FORMATTING_NODE_TYPES = ['heading', 'blockquote'];
+export const FORMATTING_MARK_TYPES = ['em', 'code', 'strike', 'strong', 'underline', 'textColor', 'subsup', 'backgroundColor'];
 export const WRAPPER_BLOCK_TYPES = [BLOCK_QUOTE, CODE_BLOCK, PANEL];
 export const ALL_BLOCK_TYPES = TEXT_BLOCK_TYPES.concat(WRAPPER_BLOCK_TYPES);
 export const getBlockTypesInDropdown = includeBlockQuoteAsTextstyleOption => {