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

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

@@ -9,7 +9,7 @@ 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, getBlockTypesInDropdown } from './block-types';
 import { setHeadingWithAnalytics, setNormalTextWithAnalytics } from './commands/block-type';
 import { HEADING_KEYS } from './consts';
-import { areBlockTypesDisabled } from './utils';
+import { areBlockTypesDisabled, checkFormattingIsPresent, hasBlockQuoteInOptions } from './utils';
 var blockTypeForNode = function blockTypeForNode(node, schema) {
   if (node.type === schema.nodes.heading) {
     var maybeNode = HEADINGS_BY_LEVEL[node.attrs['level']];
@@ -74,7 +74,10 @@ 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, includeBlockQuoteAsTextstyleOption) {
+export var 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;
@@ -101,20 +104,25 @@ export var createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMus
         var availableBlockTypesInDropdown = BLOCK_TYPES_IN_DROPDOWN.filter(function (blockType) {
           return isBlockTypeSchemaSupported(blockType, state);
         });
+        var formattingIsPresent = hasBlockQuoteInOptions(availableBlockTypesInDropdown) ? checkFormattingIsPresent(state) : undefined;
         return {
           currentBlockType: detectBlockType(availableBlockTypesInDropdown, state),
           blockTypesDisabled: 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: areBlockTypesDisabled(newState)
+          blockTypesDisabled: areBlockTypesDisabled(newState),
+          formattingIsPresent: hasBlockQuoteInOptions(oldPluginState.availableBlockTypesInDropdown) ? 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;
@@ -148,6 +156,8 @@ export var createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMus
         }
         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/esm/pm-plugins/ui/FloatingToolbarComponent.js

@@ -20,13 +20,21 @@ export 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(INPUT_METHOD.TOOLBAR));
   }, [api]);
+  var clearFormatting = 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.createElement(ToolbarBlockType, {
     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/esm/pm-plugins/ui/PrimaryToolbarComponent.js

@@ -21,12 +21,20 @@ export 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(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.createElement(ToolbarBlockType, {
     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/esm/pm-plugins/ui/ToolbarBlockType/blocktype-button.js

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

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

@@ -17,13 +17,16 @@ import React from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
-import { findKeymapByDescription, getAriaKeyshortcuts, tooltip } from '@atlaskit/editor-common/keymaps';
+import { findKeymapByDescription, tooltip, clearFormatting } from '@atlaskit/editor-common/keymaps';
+import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { separatorStyles, wrapperStyle } from '@atlaskit/editor-common/styles';
 import { DropdownMenuWithKeyboardNavigation as DropdownMenu } from '@atlaskit/editor-common/ui-menu';
 import { akEditorMenuZIndex } from '@atlaskit/editor-shared-styles';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { ThemeMutationObserver } from '@atlaskit/tokens';
+import { NORMAL_TEXT } from '../../block-types';
 import { BlockTypeButton } from './blocktype-button';
-import { blockTypeMenuItemStyle, keyboardShortcut, keyboardShortcutSelect } from './styled';
+import { blockTypeMenuItemStyle, keyboardShortcut, keyboardShortcutSelect, floatingToolbarWrapperStyle } from './styled';
 // eslint-disable-next-line @repo/internal/react/no-class-components
 var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
   function ToolbarBlockType() {
@@ -65,22 +68,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 = 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
           jsx("div", {
             css: blockTypeMenuItemStyle(tagName, isActive, _this.state.typographyTheme)
           }, jsx(Tag, null, formatMessage(blockType.title))),
           value: blockType,
-          label: formatMessage(blockType.title),
           'aria-label': tooltip(keyMap, formatMessage(blockType.title)),
-          keyShortcuts: 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
@@ -89,7 +91,32 @@ var ToolbarBlockType = /*#__PURE__*/function (_React$PureComponent) {
           }, tooltip(keyMap)),
           isActive: isActive
         };
+        return item;
       });
+      if (availableBlockTypesInDropdown.map(function (blockType) {
+        return blockType.name;
+      }).includes('blockquote')) {
+        var clearFormattingItem = {
+          content: jsx("div", null, jsx("p", null, toolbarMessages.clearFormatting.defaultMessage)),
+          value: {
+            name: 'clearFormatting'
+          },
+          'aria-label': tooltip(clearFormatting, 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
+          jsx("div", {
+            css: [keyboardShortcut]
+          }, tooltip(clearFormatting)),
+          isActive: false,
+          isDisabled: currentBlockType === NORMAL_TEXT && !formattingIsPresent
+        };
+        return [{
+          items: items
+        }, {
+          items: [clearFormattingItem]
+        }];
+      }
       return [{
         items: items
       }];
@@ -102,8 +129,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), {}, {
@@ -169,49 +200,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 jsx("span", {
+          css: 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
+          [wrapperStyle, 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
-          jsx("span", {
-            css: wrapperStyle
-          }, jsx(DropdownMenu, {
-            items: items,
-            onOpenChange: this.onOpenChange,
-            onItemActivated: this.handleSelectBlockType,
-            isOpen: active,
-            mountTo: popupsMountPoint,
-            boundariesElement: popupsBoundariesElement,
-            scrollableElement: popupsScrollableElement,
-            zIndex: 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;
+          wrapperStyle
+        }, jsx(DropdownMenu, {
+          items: items,
+          onOpenChange: this.onOpenChange,
+          onItemActivated: this.handleSelectBlockType,
+          isOpen: active,
+          mountTo: popupsMountPoint,
+          boundariesElement: popupsBoundariesElement,
+          scrollableElement: popupsScrollableElement,
+          zIndex: 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
+              }));
             }
-          }, jsx(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) && 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: separatorStyles
-          }))
-        );
+            return isOpenedByKeyboard;
+          }
+        }, jsx(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) && 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: 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/esm/pm-plugins/ui/ToolbarBlockType/styled.js

@@ -19,6 +19,12 @@ export var blockTypeMenuItemStyle = function blockTypeMenuItemStyle(tagName, sel
         // 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
         }
       }
     },
@@ -47,4 +53,12 @@ export var wrapperSmallStyle = css({
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles -- Ignored via go/DSP-18766
 export var expandIconWrapperStyle = css({
   marginLeft: "var(--ds-space-negative-100, -8px)"
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export var floatingToolbarWrapperStyle = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  "[data-role='droplistContent']": {
+    maxHeight: '90vh'
+  }
 });

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

@@ -1,7 +1,8 @@
+import { anyMarkActive } from '@atlaskit/editor-common/mark';
 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';
+import { WRAPPER_BLOCK_TYPES, FORMATTING_NODE_TYPES, FORMATTING_MARK_TYPES } from './block-types';
 export var isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
   if (!node) {
     return false;
@@ -24,7 +25,10 @@ export var createWrappingTextBlockRule = function createWrappingTextBlockRule(_r
   var match = _ref.match,
     nodeType = _ref.nodeType,
     getAttrs = _ref.getAttrs;
-  var handler = function handler(state, match, start, end) {
+  var handler = function handler(state, match, start, end
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/max-params
+  ) {
     var fixedStart = Math.max(start, 1);
     var $start = state.doc.resolve(fixedStart);
     var attrs = getAttrs instanceof Function ? getAttrs(match) : getAttrs;
@@ -78,21 +82,71 @@ export function areBlockTypesDisabled(state) {
   var nodesTypes = getSelectedWrapperNodes(state);
   var _state$schema$nodes2 = state.schema.nodes,
     panel = _state$schema$nodes2.panel,
-    blockquote = _state$schema$nodes2.blockquote;
+    blockquote = _state$schema$nodes2.blockquote,
+    bulletList = _state$schema$nodes2.bulletList,
+    orderedList = _state$schema$nodes2.orderedList;
   if (editorExperiment('platform_editor_blockquote_in_text_formatting_menu', true)) {
     var hasQuote = false;
+    var hasNestedListInQuote = 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;
+      if (node.type === blockquote) {
+        hasQuote = true;
+        node.descendants(function (child) {
+          if (child.type === bulletList || child.type === orderedList) {
+            hasNestedListInQuote = true;
+            return false;
+          }
+          return true;
+        });
+      }
+      return !hasNestedListInQuote;
     });
     return nodesTypes.filter(function (type) {
       return type !== panel;
-    }).length > 0 || hasQuote;
+    }).length > 0 && (!hasQuote || hasNestedListInQuote);
   }
   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 (FORMATTING_NODE_TYPES.indexOf(node.type.name) !== -1) {
+      isBlockStyling = true;
+      return false;
+    }
+    return true;
+  });
+  return isBlockStyling;
+};
+var marksArePresent = function marksArePresent(state) {
+  var activeMarkTypes = 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 anyMarkActive(state, marks[mark]);
+    }
+    return false;
+  });
+  return activeMarkTypes.length > 0;
+};
+export var checkFormattingIsPresent = function checkFormattingIsPresent(state) {
+  return marksArePresent(state) || blockStylingIsPresent(state);
+};
+export var hasBlockQuoteInOptions = function hasBlockQuoteInOptions(dropdownOptions) {
+  return !!dropdownOptions.find(function (blockType) {
+    return blockType.name === 'blockquote';
+  });
+};

package/dist/types/blockTypePluginType.d.ts

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

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

@@ -12,6 +12,8 @@ export declare const PANEL: BlockType;
 export declare const OTHER: BlockType;
 export declare const TEXT_BLOCK_TYPES: BlockType[];
 export type TextBlockTypes = 'normal' | 'heading1' | 'heading2' | 'heading3' | 'heading4' | 'heading5' | 'heading6';
+export declare const FORMATTING_NODE_TYPES: string[];
+export declare const FORMATTING_MARK_TYPES: string[];
 export declare const WRAPPER_BLOCK_TYPES: BlockType[];
 export declare const ALL_BLOCK_TYPES: BlockType[];
 export declare const getBlockTypesInDropdown: (includeBlockQuoteAsTextstyleOption?: boolean) => BlockType[];

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

@@ -6,6 +6,7 @@ export declare function setBlockType(name: TextBlockTypes): 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 clearFormatting(): 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;
 /**

package/dist/types/pm-plugins/commands/clear-formatting.d.ts

@@ -0,0 +1,8 @@
+import type { Node, NodeType, Schema } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+export declare const FORMATTING_NODE_TYPES: string[];
+export declare const FORMATTING_MARK_TYPES: string[];
+export declare const formatTypes: Record<string, string>;
+export declare const cellSelectionNodesBetween: (selection: CellSelection, doc: Node, f: (node: Node, pos: number, parent: Node | null, index: number) => void | boolean, startPos?: number) => void;
+export declare function clearNodeFormattingOnSelection(schema: Schema, tr: Transaction, formattedNodeType: NodeType, nodeName: string, formattingCleared: string[]): (node: Node, pos: number) => boolean;

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

@@ -11,13 +11,8 @@ export type BlockTypeState = {
     availableBlockTypes: BlockType[];
     availableWrapperBlockTypes: BlockType[];
     availableBlockTypesInDropdown: BlockType[];
+    formattingIsPresent?: boolean;
 };
 export declare const pluginKey: PluginKey<BlockTypeState>;
-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 createPlugin: (editorAPI: ExtractInjectionAPI<BlockTypePlugin> | undefined, dispatch: (eventName: string | PluginKey, data: any) => void, lastNodeMustBeParagraph?: boolean, includeBlockQuoteAsTextstyleOption?: boolean) => SafePlugin<BlockTypeState>;
 export declare const handleBlockQuoteDND: (view: EditorView, event: DragEvent, slice: Slice) => boolean;

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

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

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

@@ -3,3 +3,4 @@ export declare const keyboardShortcut: import("@emotion/react").SerializedStyles
 export declare const keyboardShortcutSelect: import("@emotion/react").SerializedStyles;
 export declare const wrapperSmallStyle: import("@emotion/react").SerializedStyles;
 export declare const expandIconWrapperStyle: import("@emotion/react").SerializedStyles;
+export declare const floatingToolbarWrapperStyle: import("@emotion/react").SerializedStyles;

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

@@ -1,6 +1,7 @@
 import type { InputRuleWrapper } from '@atlaskit/editor-common/types';
 import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { BlockType } from './types';
 export declare const isNodeAWrappingBlockNode: (node?: PMNode | null) => boolean;
 export declare const createJoinNodesRule: (match: RegExp, nodeType: NodeType) => InputRuleWrapper;
 type WrappingTextRuleProps = {
@@ -13,4 +14,6 @@ export declare const createWrappingTextBlockRule: ({ match, nodeType, getAttrs,
  * Function will check if changing block types: Paragraph, Heading is enabled.
  */
 export declare function areBlockTypesDisabled(state: EditorState): boolean;
+export declare const checkFormattingIsPresent: (state: EditorState) => boolean;
+export declare const hasBlockQuoteInOptions: (dropdownOptions: BlockType[]) => boolean;
 export {};

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

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

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

@@ -12,6 +12,8 @@ export declare const PANEL: BlockType;
 export declare const OTHER: BlockType;
 export declare const TEXT_BLOCK_TYPES: BlockType[];
 export type TextBlockTypes = 'normal' | 'heading1' | 'heading2' | 'heading3' | 'heading4' | 'heading5' | 'heading6';
+export declare const FORMATTING_NODE_TYPES: string[];
+export declare const FORMATTING_MARK_TYPES: string[];
 export declare const WRAPPER_BLOCK_TYPES: BlockType[];
 export declare const ALL_BLOCK_TYPES: BlockType[];
 export declare const getBlockTypesInDropdown: (includeBlockQuoteAsTextstyleOption?: boolean) => BlockType[];

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

@@ -6,6 +6,7 @@ export declare function setBlockType(name: TextBlockTypes): 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 clearFormatting(): 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;
 /**

package/dist/types-ts4.5/pm-plugins/commands/clear-formatting.d.ts

@@ -0,0 +1,8 @@
+import type { Node, NodeType, Schema } from '@atlaskit/editor-prosemirror/model';
+import type { Transaction } from '@atlaskit/editor-prosemirror/state';
+import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+export declare const FORMATTING_NODE_TYPES: string[];
+export declare const FORMATTING_MARK_TYPES: string[];
+export declare const formatTypes: Record<string, string>;
+export declare const cellSelectionNodesBetween: (selection: CellSelection, doc: Node, f: (node: Node, pos: number, parent: Node | null, index: number) => void | boolean, startPos?: number) => void;
+export declare function clearNodeFormattingOnSelection(schema: Schema, tr: Transaction, formattedNodeType: NodeType, nodeName: string, formattingCleared: string[]): (node: Node, pos: number) => boolean;

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

@@ -11,13 +11,8 @@ export type BlockTypeState = {
     availableBlockTypes: BlockType[];
     availableWrapperBlockTypes: BlockType[];
     availableBlockTypesInDropdown: BlockType[];
+    formattingIsPresent?: boolean;
 };
 export declare const pluginKey: PluginKey<BlockTypeState>;
-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 createPlugin: (editorAPI: ExtractInjectionAPI<BlockTypePlugin> | undefined, dispatch: (eventName: string | PluginKey, data: any) => void, lastNodeMustBeParagraph?: boolean, includeBlockQuoteAsTextstyleOption?: boolean) => SafePlugin<BlockTypeState>;
 export declare const handleBlockQuoteDND: (view: EditorView, event: DragEvent, slice: Slice) => boolean;

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

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

package/dist/types-ts4.5/pm-plugins/ui/ToolbarBlockType/styled.d.ts

@@ -3,3 +3,4 @@ export declare const keyboardShortcut: import("@emotion/react").SerializedStyles
 export declare const keyboardShortcutSelect: import("@emotion/react").SerializedStyles;
 export declare const wrapperSmallStyle: import("@emotion/react").SerializedStyles;
 export declare const expandIconWrapperStyle: import("@emotion/react").SerializedStyles;
+export declare const floatingToolbarWrapperStyle: import("@emotion/react").SerializedStyles;

package/dist/types-ts4.5/pm-plugins/utils.d.ts

@@ -1,6 +1,7 @@
 import type { InputRuleWrapper } from '@atlaskit/editor-common/types';
 import type { NodeType, Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
+import type { BlockType } from './types';
 export declare const isNodeAWrappingBlockNode: (node?: PMNode | null) => boolean;
 export declare const createJoinNodesRule: (match: RegExp, nodeType: NodeType) => InputRuleWrapper;
 type WrappingTextRuleProps = {
@@ -13,4 +14,6 @@ export declare const createWrappingTextBlockRule: ({ match, nodeType, getAttrs,
  * Function will check if changing block types: Paragraph, Heading is enabled.
  */
 export declare function areBlockTypesDisabled(state: EditorState): boolean;
+export declare const checkFormattingIsPresent: (state: EditorState) => boolean;
+export declare const hasBlockQuoteInOptions: (dropdownOptions: BlockType[]) => boolean;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-type",
-	"version": "4.0.13",
+	"version": "4.1.0",
 	"description": "BlockType plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^97.0.0",
+		"@atlaskit/editor-common": "^97.3.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^2.1.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
@@ -45,7 +45,7 @@
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/prosemirror-input-rules": "^3.2.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.29.0",
+		"@atlaskit/tmp-editor-statsig": "^2.31.0",
 		"@atlaskit/tokens": "^2.5.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"