@atlaskit/editor-plugin-block-type 4.0.10 → 4.0.12

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

@@ -4,8 +4,10 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { filterChildrenBetween, wrapSelectionIn } from '@atlaskit/editor-common/utils';
+import { Slice, Fragment } from '@atlaskit/editor-prosemirror/model';
 import { CellSelection } from '@atlaskit/editor-tables';
 import { HEADINGS_BY_NAME, NORMAL_TEXT } from '../block-types';
+import { wrapSelectionInBlockType } from './wrapSelectionIn';
 export function setBlockType(name) {
   return function (_ref) {
     var tr = _ref.tr;
@@ -24,7 +26,7 @@ export function setBlockType(name) {
     return null;
   };
 }
-export function setHeading(level) {
+export function setHeading(level, fromBlockQuote) {
   return function (_ref2) {
     var tr = _ref2.tr;
     var selection = tr.selection,
@@ -33,32 +35,45 @@ export function setHeading(level) {
     ranges.forEach(function (_ref3) {
       var $from = _ref3.$from,
         $to = _ref3.$to;
-      tr.setBlockType($from.pos, $to.pos, schema.nodes.heading, {
-        level: level
-      });
+      if (fromBlockQuote) {
+        var range = $from.blockRange($to);
+        if (!range) {
+          return;
+        }
+        var content = $from.node().content;
+        var headingNode = schema.nodes.heading.createChecked({
+          level: level
+        }, content);
+        var slice = new Slice(Fragment.from(headingNode), 0, 0);
+        tr.replaceRange(range.start, range.end, slice);
+      } else {
+        tr.setBlockType($from.pos, $to.pos, schema.nodes.heading, {
+          level: level
+        });
+      }
     });
     return tr;
   };
 }
-export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi) {
+export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return function (_ref4) {
     var tr = _ref4.tr;
     var nodes = tr.doc.type.schema.nodes;
     if (name === 'normal' && nodes.paragraph) {
-      return setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi)({
+      return setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQuote)({
         tr: tr
       });
     }
     var headingBlockType = HEADINGS_BY_NAME[name];
     if (headingBlockType && nodes.heading && headingBlockType.level) {
-      return setHeadingWithAnalytics(headingBlockType.level, inputMethod, editorAnalyticsApi)({
+      return setHeadingWithAnalytics(headingBlockType.level, inputMethod, editorAnalyticsApi, fromBlockQuote)({
         tr: tr
       });
     }
     return null;
   };
 }
-export function setNormalText() {
+export function setNormalText(fromBlockQuote) {
   return function (_ref5) {
     var tr = _ref5.tr;
     var selection = tr.selection,
@@ -67,7 +82,15 @@ export function setNormalText() {
     ranges.forEach(function (_ref6) {
       var $from = _ref6.$from,
         $to = _ref6.$to;
-      tr.setBlockType($from.pos, $to.pos, schema.nodes.paragraph);
+      if (fromBlockQuote) {
+        var range = $from.blockRange($to);
+        if (!range) {
+          return;
+        }
+        tr.lift(range, 0);
+      } else {
+        tr.setBlockType($from.pos, $to.pos, schema.nodes.paragraph);
+      }
     });
     return tr;
   };
@@ -109,7 +132,7 @@ function withCurrentHeadingLevel(fn) {
     });
   };
 }
-export function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi) {
+export function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
     return function (_ref8) {
       var tr = _ref8.tr;
@@ -124,13 +147,13 @@ export function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi) {
           previousHeadingLevel: previousHeadingLevel
         }
       })(tr);
-      return setNormalText()({
+      return setNormalText(fromBlockQuote)({
         tr: tr
       });
     };
   });
 }
-export var setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi) {
+export var setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
     return function (_ref9) {
       var tr = _ref9.tr;
@@ -145,7 +168,7 @@ export var setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeading
           previousHeadingLevel: previousHeadingLevel
         }
       })(tr);
-      return setHeading(newHeadingLevel)({
+      return setHeading(newHeadingLevel, fromBlockQuote)({
         tr: tr
       });
     };
@@ -180,9 +203,33 @@ export var insertBlockQuoteWithAnalytics = function insertBlockQuoteWithAnalytic
     }
   })(insertBlockQuote());
 };
+export function insertBlockQuoteWithAnalyticsCommand(inputMethod, editorAnalyticsApi) {
+  return withCurrentHeadingLevel(function (previousHeadingLevel) {
+    return function (_ref10) {
+      var tr = _ref10.tr;
+      var nodes = tr.doc.type.schema.nodes;
+
+      // TODO: analytics event
+
+      // editorAnalyticsApi?.attachAnalyticsEvent({
+      // 	action: ACTION.FORMATTED,
+      // 	actionSubject: ACTION_SUBJECT.TEXT,
+      // 	eventType: EVENT_TYPE.TRACK,
+      // 	actionSubjectId: ACTION_SUBJECT_ID.FORMAT_BLOCK_QUOTE,
+      // 	attributes: {
+      // 		inputMethod: inputMethod,
+      // 	},
+      // })(tr);
+
+      return wrapSelectionInBlockType(nodes.blockquote)({
+        tr: tr
+      });
+    };
+  });
+}
 export var cleanUpAtTheStartOfDocument = function cleanUpAtTheStartOfDocument(state, dispatch) {
-  var _ref10 = state.selection,
-    $cursor = _ref10.$cursor;
+  var _ref11 = state.selection,
+    $cursor = _ref11.$cursor;
   if ($cursor && !$cursor.nodeBefore && !$cursor.nodeAfter && $cursor.pos === 1) {
     var tr = state.tr,
       schema = state.schema;

package/dist/esm/pm-plugins/commands/wrapSelectionIn.js

@@ -0,0 +1,55 @@
+import { Slice, Fragment } from '@atlaskit/editor-prosemirror/model';
+import { findWrapping } from '@atlaskit/editor-prosemirror/transform';
+export function wrapSelectionInBlockType(nodeType) {
+  return function (_ref) {
+    var tr = _ref.tr;
+    var nodes = tr.doc.type.schema.nodes;
+    var _tr$doc$type$schema$m = tr.doc.type.schema.marks,
+      alignment = _tr$doc$type$schema$m.alignment,
+      indentation = _tr$doc$type$schema$m.indentation;
+    if (nodes.paragraph && nodes.blockquote) {
+      /**Remove alignment and indentation marks from the selection */
+      var marksToRemove = [alignment, indentation];
+      var hasMark = function hasMark(mark) {
+        return marksToRemove.indexOf(mark.type) > -1;
+      };
+      var not = function not(fn) {
+        return function (arg) {
+          return !fn(arg);
+        };
+      };
+
+      /**
+       * When you need to toggle the selection
+       * when another type which does not allow alignment is applied
+       */
+      tr.doc.nodesBetween(tr.selection.from, tr.selection.to, function (node, pos) {
+        if (node.type === nodes.paragraph && node.marks.some(hasMark)) {
+          var resolvedPos = tr.doc.resolve(pos);
+          var withoutBlockMarks = node.marks.filter(not(hasMark));
+          tr = tr.setNodeMarkup(resolvedPos.pos, undefined, node.attrs, withoutBlockMarks);
+        }
+      });
+
+      /** Get range and wrapping needed for the selection */
+      var _tr$selection = tr.selection,
+        $from = _tr$selection.$from,
+        $to = _tr$selection.$to;
+      var range = $from.blockRange($to);
+      var wrapping = range && findWrapping(range, nodes.blockquote);
+      if (wrapping) {
+        /** Wrap the selection */
+        tr.wrap(range, wrapping).scrollIntoView();
+      } else {
+        /** If wrapping is not possible, replace with a blockquote */
+        var start = $from.start();
+        var end = $to.end();
+        var content = $from.node().content;
+        var blockquote = nodes.blockquote.create({}, nodes.paragraph.create({}, content));
+        var slice = new Slice(Fragment.from(blockquote), 0, 0);
+        tr.replaceRange(start, end, slice).scrollIntoView();
+      }
+    }
+    return tr;
+  };
+}

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

@@ -4,7 +4,9 @@ import { createNewParagraphAbove, createNewParagraphBelow, deleteEmptyParagraphA
 import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { redo, undo } from '@atlaskit/editor-prosemirror/history';
 import * as blockTypes from './block-types';
-import { cleanUpAtTheStartOfDocument, deleteAndMoveCursor, deleteBlockContent, insertBlockQuoteWithAnalytics } from './commands';
+import { cleanUpAtTheStartOfDocument, insertBlockQuoteWithAnalytics } from './commands/block-type';
+import { deleteAndMoveCursor } from './commands/delete-and-move-cursor';
+import { deleteBlockContent } from './commands/delete-block-content';
 import { isNodeAWrappingBlockNode } from './utils';
 var backspaceCommand = chainCommands(cleanUpAtTheStartOfDocument, deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);
 var del = chainCommands(deleteEmptyParagraphAndMoveBlockUp(isNodeAWrappingBlockNode), deleteBlockContent(isNodeAWrappingBlockNode), deleteAndMoveCursor);

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

@@ -6,8 +6,8 @@ import { browser } from '@atlaskit/editor-common/browser';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { BLOCK_QUOTE, CODE_BLOCK, HEADING_1, HEADING_2, HEADING_3, HEADING_4, HEADING_5, HEADING_6, HEADINGS_BY_LEVEL, NORMAL_TEXT, OTHER, PANEL, TEXT_BLOCK_TYPES, WRAPPER_BLOCK_TYPES } from './block-types';
-import { setHeadingWithAnalytics, setNormalTextWithAnalytics } from './commands';
+import { BLOCK_QUOTE, CODE_BLOCK, HEADING_1, HEADING_2, HEADING_3, HEADING_4, HEADING_5, HEADING_6, HEADINGS_BY_LEVEL, NORMAL_TEXT, OTHER, PANEL, TEXT_BLOCK_TYPES, WRAPPER_BLOCK_TYPES, getBlockTypesInDropdown } from './block-types';
+import { setHeadingWithAnalytics, setNormalTextWithAnalytics } from './commands/block-type';
 import { HEADING_KEYS } from './consts';
 import { areBlockTypesDisabled } from './utils';
 var blockTypeForNode = function blockTypeForNode(node, schema) {
@@ -18,6 +18,8 @@ var blockTypeForNode = function blockTypeForNode(node, schema) {
     }
   } else if (node.type === schema.nodes.paragraph) {
     return NORMAL_TEXT;
+  } else if (node.type === schema.nodes.blockquote) {
+    return BLOCK_QUOTE;
   }
   return OTHER;
 };
@@ -60,6 +62,7 @@ var detectBlockType = function detectBlockType(availableBlockTypes, state) {
       } else if (blockType !== OTHER && blockType !== nodeBlockType[0]) {
         blockType = OTHER;
       }
+      return false;
     }
   });
   return blockType || OTHER;
@@ -71,7 +74,7 @@ var autoformatHeading = function autoformatHeading(headingLevel, editorAnalytics
   return setHeadingWithAnalytics(headingLevel, INPUT_METHOD.FORMATTING, editorAnalyticsApi);
 };
 export var pluginKey = new PluginKey('blockTypePlugin');
-export var createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMustBeParagraph) {
+export var createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMustBeParagraph, includeBlockQuoteAsTextstyleOption) {
   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;
@@ -94,16 +97,21 @@ export var createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMus
         var availableWrapperBlockTypes = WRAPPER_BLOCK_TYPES.filter(function (blockType) {
           return isBlockTypeSchemaSupported(blockType, state);
         });
+        var BLOCK_TYPES_IN_DROPDOWN = getBlockTypesInDropdown(includeBlockQuoteAsTextstyleOption);
+        var availableBlockTypesInDropdown = BLOCK_TYPES_IN_DROPDOWN.filter(function (blockType) {
+          return isBlockTypeSchemaSupported(blockType, state);
+        });
         return {
-          currentBlockType: detectBlockType(availableBlockTypes, state),
+          currentBlockType: detectBlockType(availableBlockTypesInDropdown, state),
           blockTypesDisabled: areBlockTypesDisabled(state),
           availableBlockTypes: availableBlockTypes,
-          availableWrapperBlockTypes: availableWrapperBlockTypes
+          availableWrapperBlockTypes: availableWrapperBlockTypes,
+          availableBlockTypesInDropdown: availableBlockTypesInDropdown
         };
       },
       apply: function apply(_tr, oldPluginState, _oldState, newState) {
         var newPluginState = _objectSpread(_objectSpread({}, oldPluginState), {}, {
-          currentBlockType: detectBlockType(oldPluginState.availableBlockTypes, newState),
+          currentBlockType: detectBlockType(oldPluginState.availableBlockTypesInDropdown, newState),
           blockTypesDisabled: areBlockTypesDisabled(newState)
         });
         if (newPluginState.currentBlockType !== oldPluginState.currentBlockType || newPluginState.blockTypesDisabled !== oldPluginState.blockTypesDisabled) {

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

@@ -16,12 +16,17 @@ export function FloatingToolbarComponent(_ref) {
     var _api$core, _api$blockType;
     return api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.setTextLevel(name, INPUT_METHOD.FLOATING_TB));
   }, [api]);
+  var wrapBlockQuote = useCallback(function () {
+    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(INPUT_METHOD.TOOLBAR));
+  }, [api]);
   return /*#__PURE__*/React.createElement(ToolbarBlockType, {
     isSmall: FloatingToolbarSettings.isSmall,
     isDisabled: FloatingToolbarSettings.disabled,
     isReducedSpacing: FloatingToolbarSettings.isToolbarReducedSpacing,
     setTextLevel: boundSetBlockType,
     pluginState: blockTypeState,
+    wrapBlockQuote: wrapBlockQuote,
     shouldUseDefaultRole: FloatingToolbarSettings.shouldUseDefaultRole,
     api: api
   });

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

@@ -13,15 +13,20 @@ export function PrimaryToolbarComponent(_ref) {
     shouldUseDefaultRole = _ref.shouldUseDefaultRole;
   var _useSharedPluginState = useSharedPluginState(api, ['blockType']),
     blockTypeState = _useSharedPluginState.blockTypeState;
-  var boundSetBlockType = function boundSetBlockType(name) {
+  var boundSetBlockType = function boundSetBlockType(name, fromBlockQuote) {
     var _api$core, _api$blockType;
-    return api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.setTextLevel(name, INPUT_METHOD.TOOLBAR));
+    return api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.setTextLevel(name, INPUT_METHOD.TOOLBAR, fromBlockQuote));
+  };
+  var wrapBlockQuote = function wrapBlockQuote() {
+    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(INPUT_METHOD.TOOLBAR));
   };
   return /*#__PURE__*/React.createElement(ToolbarBlockType, {
     isSmall: isSmall,
     isDisabled: disabled,
     isReducedSpacing: isToolbarReducedSpacing,
     setTextLevel: boundSetBlockType,
+    wrapBlockQuote: wrapBlockQuote,
     pluginState: blockTypeState,
     popupsMountPoint: popupsMountPoint,
     popupsBoundariesElement: popupsBoundariesElement,

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

@@ -1,13 +1,12 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _inherits from "@babel/runtime/helpers/inherits";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 /**
  * @jsxRuntime classic
@@ -27,35 +26,33 @@ import { BlockTypeButton } from './blocktype-button';
 import { blockTypeMenuItemStyle, keyboardShortcut, keyboardShortcutSelect } from './styled';
 // eslint-disable-next-line @repo/internal/react/no-class-components
 var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
-  _inherits(ToolbarBlockType, _React$PureComponent);
-  var _super = _createSuper(ToolbarBlockType);
   function ToolbarBlockType() {
     var _this;
     _classCallCheck(this, ToolbarBlockType);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    _this = _super.call.apply(_super, [this].concat(args));
-    _defineProperty(_assertThisInitialized(_this), "state", {
+    _this = _callSuper(this, ToolbarBlockType, [].concat(args));
+    _defineProperty(_this, "state", {
       active: false,
       isOpenedByKeyboard: false,
       typographyTheme: undefined,
       observer: null
     });
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    _defineProperty(_assertThisInitialized(_this), "onOpenChange", function (attrs) {
+    _defineProperty(_this, "onOpenChange", function (attrs) {
       _this.setState(_objectSpread(_objectSpread({}, _this.state), {}, {
         active: attrs.isOpen,
         isOpenedByKeyboard: attrs.isOpenedByKeyboard
       }));
     });
-    _defineProperty(_assertThisInitialized(_this), "handleTriggerClick", function () {
+    _defineProperty(_this, "handleTriggerClick", function () {
       _this.onOpenChange({
         isOpen: !_this.state.active,
         isOpenedByKeyboard: false
       });
     });
-    _defineProperty(_assertThisInitialized(_this), "handleTriggerByKeyboard", function (event) {
+    _defineProperty(_this, "handleTriggerByKeyboard", function (event) {
       if (event.key === 'Enter' || event.key === ' ') {
         event.preventDefault();
         _this.onOpenChange({
@@ -64,12 +61,12 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
         });
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "createItems", function () {
+    _defineProperty(_this, "createItems", function () {
       var formatMessage = _this.props.intl.formatMessage;
       var _this$props$pluginSta = _this.props.pluginState,
         currentBlockType = _this$props$pluginSta.currentBlockType,
-        availableBlockTypes = _this$props$pluginSta.availableBlockTypes;
-      var items = availableBlockTypes.map(function (blockType, index) {
+        availableBlockTypesInDropdown = _this$props$pluginSta.availableBlockTypesInDropdown;
+      var items = availableBlockTypesInDropdown.map(function (blockType, index) {
         var isActive = currentBlockType === blockType;
         var tagName = blockType.tagName || 'p';
         var Tag = tagName;
@@ -97,12 +94,17 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
         items: items
       }];
     });
-    _defineProperty(_assertThisInitialized(_this), "handleSelectBlockType", function (_ref) {
+    _defineProperty(_this, "handleSelectBlockType", function (_ref) {
       var item = _ref.item,
         _ref$shouldCloseMenu = _ref.shouldCloseMenu,
         shouldCloseMenu = _ref$shouldCloseMenu === void 0 ? true : _ref$shouldCloseMenu;
       var blockType = item.value;
-      _this.props.setTextLevel(blockType.name);
+      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 (shouldCloseMenu) {
         _this.setState(_objectSpread(_objectSpread({}, _this.state), {}, {
           active: false
@@ -111,7 +113,8 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
     });
     return _this;
   }
-  _createClass(ToolbarBlockType, [{
+  _inherits(ToolbarBlockType, _React$PureComponent);
+  return _createClass(ToolbarBlockType, [{
     key: "componentDidMount",
     value: function componentDidMount() {
       var _this2 = this;
@@ -151,6 +154,7 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
         currentBlockType = _this$props$pluginSta2.currentBlockType,
         blockTypesDisabled = _this$props$pluginSta2.blockTypesDisabled,
         availableBlockTypes = _this$props$pluginSta2.availableBlockTypes,
+        availableBlockTypesInDropdown = _this$props$pluginSta2.availableBlockTypesInDropdown,
         shouldUseDefaultRole = _this$props.shouldUseDefaultRole,
         formatMessage = _this$props.intl.formatMessage,
         api = _this$props.api;
@@ -160,12 +164,12 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
       if (isHeadingDisabled) {
         return null;
       }
-      var blockTypeTitles = availableBlockTypes.filter(function (blockType) {
+      var blockTypeTitles = availableBlockTypesInDropdown.filter(function (blockType) {
         return blockType.name === currentBlockType.name;
       }).map(function (blockType) {
         return blockType.title;
       });
-      if (!this.props.isDisabled && !blockTypesDisabled) {
+      if (!this.props.isDisabled && (!blockTypesDisabled || currentBlockType.name === 'blockquote')) {
         var items = this.createItems();
         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
@@ -231,6 +235,5 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
       );
     }
   }]);
-  return ToolbarBlockType;
 }(React.PureComponent);
 export default injectIntl(ToolbarBlockType);

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

@@ -4,7 +4,7 @@
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
-import { headingsSharedStyles } from '@atlaskit/editor-common/styles';
+import { headingsSharedStyles, blockquoteSharedStyles } from '@atlaskit/editor-common/styles';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
 import { N400 } from '@atlaskit/theme/colors';
 export var blockTypeMenuItemStyle = function blockTypeMenuItemStyle(tagName, selected, typographyTheme) {
@@ -13,7 +13,7 @@ export var blockTypeMenuItemStyle = function blockTypeMenuItemStyle(tagName, sel
   return function () {
     return css(
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-    headingsSharedStyles(typographyTheme), {
+    tagName === 'blockquote' ? blockquoteSharedStyles : headingsSharedStyles(typographyTheme), {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
       '>': {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766

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

@@ -1,5 +1,6 @@
 import { createRule, createWrappingJoinRule } from '@atlaskit/editor-common/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { WRAPPER_BLOCK_TYPES } from './block-types';
 export var isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
   if (!node) {
@@ -75,7 +76,22 @@ function getSelectedWrapperNodes(state) {
  */
 export function areBlockTypesDisabled(state) {
   var nodesTypes = getSelectedWrapperNodes(state);
-  var panel = state.schema.nodes.panel;
+  var _state$schema$nodes2 = state.schema.nodes,
+    panel = _state$schema$nodes2.panel,
+    blockquote = _state$schema$nodes2.blockquote;
+  if (editorExperiment('platform_editor_blockquote_in_text_formatting_menu', true)) {
+    var hasQuote = false;
+    var _state$selection2 = state.selection,
+      $from = _state$selection2.$from,
+      $to = _state$selection2.$to;
+    state.doc.nodesBetween($from.pos, $to.pos, function (node) {
+      hasQuote = node.type === blockquote;
+      return !hasQuote;
+    });
+    return nodesTypes.filter(function (type) {
+      return type !== panel;
+    }).length > 0 || hasQuote;
+  }
   return nodesTypes.filter(function (type) {
     return type !== panel;
   }).length > 0;

package/dist/esm/ui/consts.js

@@ -1 +1,4 @@
+// Disable no-re-export rule for entry point files
+/* eslint-disable @atlaskit/editor/no-re-export */
+
 export { BLOCK_QUOTE, CODE_BLOCK, HEADING_1, HEADING_2, HEADING_3, HEADING_4, HEADING_5, HEADING_6, NORMAL_TEXT, PANEL } from '../pm-plugins/block-types';

package/dist/types/blockTypePlugin.d.ts

@@ -1,5 +1,3 @@
 import { type BlockTypePlugin } from './blockTypePluginType';
 declare const blockTypePlugin: BlockTypePlugin;
 export { blockTypePlugin };
-export { pluginKey } from './pm-plugins/main';
-export type { BlockTypeState } from './pm-plugins/main';

package/dist/types/blockTypePluginType.d.ts

@@ -13,6 +13,7 @@ export type BlockTypePlugin = NextEditorPlugin<'blockType', {
         insertBlockQuote: (inputMethod: InputMethod) => Command;
     };
     commands: {
-        setTextLevel: (level: TextBlockTypes, inputMethod: InputMethod) => EditorCommand;
+        setTextLevel: (level: TextBlockTypes, inputMethod: InputMethod, fromBlockQuote?: boolean) => EditorCommand;
+        insertBlockQuote: (inputMethod: InputMethod) => EditorCommand;
     };
 }>;

package/dist/types/index.d.ts

@@ -2,6 +2,6 @@ export { blockTypePlugin } from './blockTypePlugin';
 export type { BlockTypePlugin } from './blockTypePluginType';
 export type { BlockTypePluginOptions, BlockType } from './pm-plugins/types';
 export type { BlockTypeState } from './pm-plugins/main';
-export type { InputMethod } from './pm-plugins/commands';
+export type { InputMethod } from './pm-plugins/commands/block-type';
 export type { DropdownItem } from './pm-plugins/ui/ToolbarBlockType';
 export type { TextBlockTypes } from './pm-plugins/block-types';

package/dist/types/pm-plugins/block-types.d.ts

@@ -14,6 +14,7 @@ export declare const TEXT_BLOCK_TYPES: BlockType[];
 export type TextBlockTypes = 'normal' | 'heading1' | 'heading2' | 'heading3' | 'heading4' | 'heading5' | 'heading6';
 export declare const WRAPPER_BLOCK_TYPES: BlockType[];
 export declare const ALL_BLOCK_TYPES: BlockType[];
+export declare const getBlockTypesInDropdown: (includeBlockQuoteAsTextstyleOption?: boolean) => BlockType[];
 export declare const HEADINGS_BY_LEVEL: Record<number, BlockType>;
 export declare const HEADINGS_BY_NAME: {
     [blockType: string]: BlockType;

package/dist/types/pm-plugins/commands/block-type.d.ts

@@ -3,11 +3,11 @@ import type { Command, EditorCommand, HeadingLevelsAndNormalText } from '@atlask
 import type { TextBlockTypes } from '../block-types';
 export type InputMethod = INPUT_METHOD.TOOLBAR | INPUT_METHOD.INSERT_MENU | INPUT_METHOD.SHORTCUT | INPUT_METHOD.FORMATTING | INPUT_METHOD.KEYBOARD | INPUT_METHOD.FLOATING_TB;
 export declare function setBlockType(name: TextBlockTypes): EditorCommand;
-export declare function setHeading(level: HeadingLevelsAndNormalText): EditorCommand;
-export declare function setBlockTypeWithAnalytics(name: TextBlockTypes, inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined): EditorCommand;
-export declare function setNormalText(): EditorCommand;
-export declare function setNormalTextWithAnalytics(inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined): EditorCommand;
-export declare const setHeadingWithAnalytics: (newHeadingLevel: HeadingLevelsAndNormalText, inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => EditorCommand;
+export declare function setHeading(level: HeadingLevelsAndNormalText, fromBlockQuote?: boolean): EditorCommand;
+export declare function setBlockTypeWithAnalytics(name: TextBlockTypes, inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined, fromBlockQuote?: boolean): EditorCommand;
+export declare function setNormalText(fromBlockQuote?: boolean): EditorCommand;
+export declare function setNormalTextWithAnalytics(inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined, fromBlockQuote?: boolean): EditorCommand;
+export declare const setHeadingWithAnalytics: (newHeadingLevel: HeadingLevelsAndNormalText, inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined, fromBlockQuote?: boolean) => EditorCommand;
 /**
  *
  * @param name - block type name
@@ -17,4 +17,5 @@ export declare const setHeadingWithAnalytics: (newHeadingLevel: HeadingLevelsAnd
  * @returns - command that inserts block type
  */
 export declare const insertBlockQuoteWithAnalytics: (inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
+export declare function insertBlockQuoteWithAnalyticsCommand(inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined): EditorCommand;
 export declare const cleanUpAtTheStartOfDocument: Command;

package/dist/types/pm-plugins/commands/wrapSelectionIn.d.ts

@@ -0,0 +1,3 @@
+import { type EditorCommand } from '@atlaskit/editor-common/types';
+import type { NodeType } from '@atlaskit/editor-prosemirror/model';
+export declare function wrapSelectionInBlockType(nodeType: NodeType): EditorCommand;

package/dist/types/pm-plugins/main.d.ts

@@ -10,12 +10,14 @@ export type BlockTypeState = {
     blockTypesDisabled: boolean;
     availableBlockTypes: BlockType[];
     availableWrapperBlockTypes: BlockType[];
+    availableBlockTypesInDropdown: BlockType[];
 };
 export declare const pluginKey: PluginKey<BlockTypeState>;
-export declare const createPlugin: (editorAPI: ExtractInjectionAPI<BlockTypePlugin> | undefined, dispatch: (eventName: string | PluginKey, data: any) => void, lastNodeMustBeParagraph?: boolean) => SafePlugin<{
+export declare const createPlugin: (editorAPI: ExtractInjectionAPI<BlockTypePlugin> | undefined, dispatch: (eventName: string | PluginKey, data: any) => void, lastNodeMustBeParagraph?: boolean, includeBlockQuoteAsTextstyleOption?: boolean) => SafePlugin<{
     currentBlockType: BlockType;
     blockTypesDisabled: boolean;
     availableBlockTypes: BlockType[];
     availableWrapperBlockTypes: BlockType[];
+    availableBlockTypesInDropdown: BlockType[];
 }>;
 export declare const handleBlockQuoteDND: (view: EditorView, event: DragEvent, slice: Slice) => boolean;

package/dist/types/pm-plugins/types.d.ts

@@ -19,4 +19,5 @@ export interface BlockTypePluginOptions {
         exclude?: Array<AllowedBlockTypes>;
     };
     isUndoRedoButtonsEnabled?: boolean;
+    includeBlockQuoteAsTextstyleOption?: boolean;
 }

package/dist/types/pm-plugins/ui/ToolbarBlockType/index.d.ts

@@ -24,7 +24,8 @@ export interface Props {
     popupsBoundariesElement?: HTMLElement;
     popupsScrollableElement?: HTMLElement;
     editorView?: EditorView;
-    setTextLevel: (type: TextBlockTypes) => void;
+    setTextLevel: (type: TextBlockTypes, fromBlockQuote?: boolean) => void;
+    wrapBlockQuote: (type: TextBlockTypes) => void;
     shouldUseDefaultRole?: boolean;
     api: ExtractInjectionAPI<BlockTypePlugin> | undefined;
 }

package/dist/types-ts4.5/blockTypePlugin.d.ts

@@ -1,5 +1,3 @@
 import { type BlockTypePlugin } from './blockTypePluginType';
 declare const blockTypePlugin: BlockTypePlugin;
 export { blockTypePlugin };
-export { pluginKey } from './pm-plugins/main';
-export type { BlockTypeState } from './pm-plugins/main';

package/dist/types-ts4.5/blockTypePluginType.d.ts

@@ -16,6 +16,7 @@ export type BlockTypePlugin = NextEditorPlugin<'blockType', {
         insertBlockQuote: (inputMethod: InputMethod) => Command;
     };
     commands: {
-        setTextLevel: (level: TextBlockTypes, inputMethod: InputMethod) => EditorCommand;
+        setTextLevel: (level: TextBlockTypes, inputMethod: InputMethod, fromBlockQuote?: boolean) => EditorCommand;
+        insertBlockQuote: (inputMethod: InputMethod) => EditorCommand;
     };
 }>;