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

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @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
+
+- [#99053](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/99053)
+  [`a850374dfb10a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a850374dfb10a) -
+  [ux] ED-26049 Disable text styles menu button if lists are nested inside blockquot
+
 ## 4.0.13
 
 ### 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; } }
@@ -68,6 +71,9 @@ function setHeading(level, fromBlockQuote) {
     return tr;
   };
 }
+
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
 function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return function (_ref4) {
     var tr = _ref4.tr;
@@ -108,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,
@@ -147,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,
@@ -166,10 +217,13 @@ function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQu
     };
   });
 }
-var setHeadingWithAnalytics = exports.setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi, fromBlockQuote) {
+var setHeadingWithAnalytics = exports.setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi, fromBlockQuote
+// Ignored via go/ees005
+// 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,
@@ -218,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
@@ -241,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/input-rule.js

@@ -20,12 +20,16 @@ function getHeadingLevel(match) {
 }
 function headingRule(nodeType, maxLevel) {
   return (0, _utils2.createWrappingTextBlockRule)({
+    // Ignored via go/ees005
+    // eslint-disable-next-line require-unicode-regexp
     match: new RegExp('^(#{1,' + maxLevel + '})\\s$'),
     nodeType: nodeType,
     getAttrs: getHeadingLevel
   });
 }
 function blockQuoteRule(nodeType) {
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
   return (0, _utils2.createJoinNodesRule)(/^\s*>\s$/, nodeType);
 }
 
@@ -38,7 +42,13 @@ function blockQuoteRule(nodeType) {
 function getHeadingRules(editorAnalyticsAPI, schema) {
   // '# ' for h1, '## ' for h2 and etc
   var hashRule = headingRule(schema.nodes.heading, MAX_HEADING_LEVEL);
-  var leftNodeReplacementHashRule = (0, _utils.createRule)(new RegExp("".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, "(#{1,6})\\s$")), function (state, match, start, end) {
+  var leftNodeReplacementHashRule = (0, _utils.createRule)(
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  new RegExp("".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, "(#{1,6})\\s$")),
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/max-params
+  function (state, match, start, end) {
     var level = match[1].length;
     return (0, _commands.insertBlock)(state, schema.nodes.heading, start, end, {
       level: level
@@ -70,7 +80,13 @@ function getHeadingRules(editorAnalyticsAPI, schema) {
 function getBlockQuoteRules(editorAnalyticsAPI, schema) {
   // '> ' for blockquote
   var greatherThanRule = blockQuoteRule(schema.nodes.blockquote);
-  var leftNodeReplacementGreatherRule = (0, _utils.createRule)(new RegExp("".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, "\\s*>\\s$")), function (state, _match, start, end) {
+  var leftNodeReplacementGreatherRule = (0, _utils.createRule)(
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  new RegExp("".concat(_prosemirrorInputRules.leafNodeReplacementCharacter, "\\s*>\\s$")),
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/max-params
+  function (state, _match, start, end) {
     return (0, _commands.insertBlock)(state, schema.nodes.blockquote, start, end);
   });
 

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

@@ -17,20 +17,44 @@ var _deleteBlockContent = require("./commands/delete-block-content");
 var _utils2 = require("./utils");
 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; }
+// Ignored via go/ees005
+// eslint-disable-next-line import/no-namespace
+
 var backspaceCommand = (0, _commands.chainCommands)(_blockType.cleanUpAtTheStartOfDocument, (0, _deleteBlockContent.deleteBlockContent)(_utils2.isNodeAWrappingBlockNode), _deleteAndMoveCursor.deleteAndMoveCursor);
 var del = (0, _commands.chainCommands)((0, _utils.deleteEmptyParagraphAndMoveBlockUp)(_utils2.isNodeAWrappingBlockNode), (0, _deleteBlockContent.deleteBlockContent)(_utils2.isNodeAWrappingBlockNode), _deleteAndMoveCursor.deleteAndMoveCursor);
 function keymapPlugin(editorAnalyticsApi, schema, _featureFlags) {
   var list = {};
-  (0, _keymaps.bindKeymapWithCommand)(_keymaps.insertNewLine.common, (0, _utils.insertNewLineWithAnalytics)(editorAnalyticsApi), list);
+  (0, _keymaps.bindKeymapWithCommand)(
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  _keymaps.insertNewLine.common, (0, _utils.insertNewLineWithAnalytics)(editorAnalyticsApi), list);
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveUp.common, _utils.createNewParagraphAbove, list);
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveDown.common, _utils.createNewParagraphBelow, list);
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   (0, _keymaps.bindKeymapWithCommand)((0, _keymaps.findKeyMapForBrowser)(_keymaps.redo), _history.redo, list);
+
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.undo.common, _history.undo, list);
+
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.backspace.common, backspaceCommand, list);
+
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.deleteKey.common, del, list);
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.forwardDelete.mac, del, list);
   if (schema.nodes[blockTypes.BLOCK_QUOTE.nodeName]) {
-    (0, _keymaps.bindKeymapWithCommand)((0, _keymaps.findShortcutByKeymap)(_keymaps.toggleBlockQuote), (0, _blockType.insertBlockQuoteWithAnalytics)(_analytics.INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
+    (0, _keymaps.bindKeymapWithCommand)(
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    (0, _keymaps.findShortcutByKeymap)(_keymaps.toggleBlockQuote), (0, _blockType.insertBlockQuoteWithAnalytics)(_analytics.INPUT_METHOD.KEYBOARD, editorAnalyticsApi), list);
   }
   return (0, _keymaps.keymap)(list);
 }

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

@@ -81,7 +81,10 @@ var autoformatHeading = function autoformatHeading(headingLevel, editorAnalytics
   return (0, _blockType.setHeadingWithAnalytics)(headingLevel, _analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi);
 };
 var pluginKey = exports.pluginKey = new _state.PluginKey('blockTypePlugin');
-var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMustBeParagraph, includeBlockQuoteAsTextstyleOption) {
+var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMustBeParagraph, includeBlockQuoteAsTextstyleOption
+// Ignored via go/ees005
+// eslint-disable-next-line @typescript-eslint/max-params
+) {
   var _editorAPI$analytics;
   var editorAnalyticsApi = editorAPI === null || editorAPI === void 0 || (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions;
   var altKeyLocation = 0;
@@ -108,20 +111,25 @@ 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
+      // eslint-disable-next-line @typescript-eslint/max-params
       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;
@@ -155,6 +163,8 @@ var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispa
         }
         return false;
       },
+      // Ignored via go/ees005
+      // eslint-disable-next-line @typescript-eslint/max-params
       handleDrop: function handleDrop(view, event, slice, moved) {
         return handleBlockQuoteDND(view, event, slice);
       }

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

@@ -30,13 +30,21 @@ 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,
     isReducedSpacing: FloatingToolbarSettings.isToolbarReducedSpacing,
-    setTextLevel: boundSetBlockType,
+    setTextLevel: boundSetBlockType
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    ,
     pluginState: blockTypeState,
     wrapBlockQuote: wrapBlockQuote,
+    clearFormatting: clearFormatting,
     shouldUseDefaultRole: FloatingToolbarSettings.shouldUseDefaultRole,
     api: api
   });

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

@@ -28,12 +28,20 @@ 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,
+    clearFormatting: clearFormatting
+    // Ignored via go/ees005
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    ,
     pluginState: blockTypeState,
     popupsMountPoint: popupsMountPoint,
     popupsBoundariesElement: popupsBoundariesElement,

package/dist/cjs/pm-plugins/ui/ToolbarBlockType/blocktype-button.js

@@ -71,5 +71,8 @@ var BlockTypeButton = exports.BlockTypeButton = function BlockTypeButton(props)
     }))))
   }, !props.isSmall && (0, _react2.jsx)(_primitives.Box, {
     xcss: [buttonContentStyle, props.isReducedSpacing && buttonContentReducedSpacingStyle]
-  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, props.title || _blockTypes.NORMAL_TEXT.title)));
+  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
+  // Ignored via go/ees005
+  // eslint-disable-next-line react/jsx-props-no-spreading
+  , props.title || _blockTypes.NORMAL_TEXT.title)));
 };

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), {}, {
@@ -173,49 +204,55 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
       }).map(function (blockType) {
         return blockType.title;
       });
-      if (!this.props.isDisabled && (!blockTypesDisabled || currentBlockType.name === 'blockquote')) {
+      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