@atlaskit/editor-plugin-block-type 12.1.2 → 12.1.4

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

@@ -75,7 +75,7 @@ const autoformatHeading = (headingLevel, editorAnalyticsApi) => {
   return setHeadingWithAnalytics(headingLevel, INPUT_METHOD.FORMATTING, editorAnalyticsApi);
 };
 export const pluginKey = new PluginKey('blockTypePlugin');
-export const createPlugin = (editorAPI, dispatch, lastNodeMustBeParagraph, includeBlockQuoteAsTextstyleOption) => {
+export const createPlugin = (editorAPI, dispatch, lastNodeMustBeParagraph, includeBlockQuoteAsTextstyleOption, allowFontSize) => {
   var _editorAPI$analytics;
   const editorAnalyticsApi = editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$analytics = editorAPI.analytics) === null || _editorAPI$analytics === void 0 ? void 0 : _editorAPI$analytics.actions;
   let altKeyLocation = 0;
@@ -105,7 +105,7 @@ export const createPlugin = (editorAPI, dispatch, lastNodeMustBeParagraph, inclu
         const formattingIsPresent = hasBlockQuoteInOptions(availableBlockTypesInDropdown) ? checkFormattingIsPresent(state) : undefined;
         return {
           currentBlockType: detectBlockType(availableBlockTypesInDropdown, state),
-          blockTypesDisabled: areBlockTypesDisabled(state),
+          blockTypesDisabled: areBlockTypesDisabled(state, allowFontSize),
           availableBlockTypes,
           availableWrapperBlockTypes,
           availableBlockTypesInDropdown,
@@ -116,7 +116,7 @@ export const createPlugin = (editorAPI, dispatch, lastNodeMustBeParagraph, inclu
         const newPluginState = {
           ...oldPluginState,
           currentBlockType: detectBlockType(oldPluginState.availableBlockTypesInDropdown, newState),
-          blockTypesDisabled: areBlockTypesDisabled(newState),
+          blockTypesDisabled: areBlockTypesDisabled(newState, allowFontSize),
           formattingIsPresent: hasBlockQuoteInOptions(oldPluginState.availableBlockTypesInDropdown) ? checkFormattingIsPresent(newState) : undefined
         };
         if (newPluginState.currentBlockType !== oldPluginState.currentBlockType || newPluginState.blockTypesDisabled !== oldPluginState.blockTypesDisabled || newPluginState.formattingIsPresent !== oldPluginState.formattingIsPresent) {

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/HeadingButton.js

@@ -7,11 +7,13 @@ import { ax, ix } from "@compiled/react/runtime";
 import { useIntl } from 'react-intl-next';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { formatShortcut, setNormalText, toggleHeading1, toggleHeading2, toggleHeading3, toggleHeading4, toggleHeading5, toggleHeading6 } from '@atlaskit/editor-common/keymaps';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { editorUGCToken } from '@atlaskit/editor-common/ugc-tokens';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
 import { Box } from '@atlaskit/primitives/compiled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { isSelectionInsideListNode } from '../../utils';
 const smallTextStyle = null;
 const normalStyle = null;
 const heading1Style = null;
@@ -108,6 +110,12 @@ const shortcuts = {
   heading5: toggleHeading5,
   heading6: toggleHeading6
 };
+const shouldDisableHeadingButton = (state, blockType) => {
+  if (!state) {
+    return false;
+  }
+  return isSelectionInsideListNode(state) && blockType.name !== 'normal' && blockType.name !== 'smallText';
+};
 export const HeadingButton = ({
   blockType,
   api
@@ -117,12 +125,19 @@ export const HeadingButton = ({
   } = useIntl();
   const currentBlockType = useSharedPluginStateSelector(api, 'blockType.currentBlockType');
   const availableBlockTypesInDropdown = useSharedPluginStateSelector(api, 'blockType.availableBlockTypesInDropdown');
+  const {
+    editorView
+  } = useEditorToolbar();
   if (!(availableBlockTypesInDropdown !== null && availableBlockTypesInDropdown !== void 0 && availableBlockTypesInDropdown.some(availableBlockType => availableBlockType.name === blockType.name))) {
     return null;
   }
+  const isDisabled = expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? shouldDisableHeadingButton(editorView === null || editorView === void 0 ? void 0 : editorView.state, blockType) : false;
   const fromBlockQuote = (currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name) === 'blockquote';
   const onClick = () => {
     var _api$core, _api$blockType, _api$blockType$comman;
+    if (isDisabled) {
+      return;
+    }
     api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockType = api.blockType) === null || _api$blockType === void 0 ? void 0 : (_api$blockType$comman = _api$blockType.commands) === null || _api$blockType$comman === void 0 ? void 0 : _api$blockType$comman.setTextLevel(blockType.name, INPUT_METHOD.TOOLBAR, fromBlockQuote));
   };
   const shortcut = formatShortcut(shortcuts[blockType.name]);
@@ -134,6 +149,7 @@ export const HeadingButton = ({
     }) : undefined,
     onClick: onClick,
     isSelected: isSelected,
+    isDisabled: isDisabled,
     ariaKeyshortcuts: shortcut
   }, expValEquals('platform_editor_toolbar_aifc_use_editor_typography', 'isEnabled', true) ? /*#__PURE__*/React.createElement(HeadingText, {
     headingType: blockType.name

package/dist/es2019/pm-plugins/ui/ToolbarBlockType/QuoteButton.js

@@ -2,8 +2,17 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { formatShortcut, toggleBlockQuote } from '@atlaskit/editor-common/keymaps';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { isSelectionInsideListNode } from '../../utils';
+const shouldDisableQuoteButton = state => {
+  if (!state) {
+    return false;
+  }
+  return isSelectionInsideListNode(state);
+};
 export const QuoteButton = ({
   blockType,
   api
@@ -13,11 +22,18 @@ export const QuoteButton = ({
   } = useIntl();
   const availableBlockTypesInDropdown = useSharedPluginStateSelector(api, 'blockType.availableBlockTypesInDropdown');
   const currentBlockType = useSharedPluginStateSelector(api, 'blockType.currentBlockType');
+  const {
+    editorView
+  } = useEditorToolbar();
   if (!(availableBlockTypesInDropdown !== null && availableBlockTypesInDropdown !== void 0 && availableBlockTypesInDropdown.some(availableBlockType => availableBlockType.name === blockType.name))) {
     return null;
   }
+  const isDisabled = expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? shouldDisableQuoteButton(editorView === null || editorView === void 0 ? void 0 : editorView.state) : false;
   const onClick = () => {
     var _api$core, _api$blockType, _api$blockType$comman;
+    if (isDisabled) {
+      return;
+    }
     api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockType = api.blockType) === null || _api$blockType === void 0 ? void 0 : (_api$blockType$comman = _api$blockType.commands) === null || _api$blockType$comman === void 0 ? void 0 : _api$blockType$comman.insertBlockQuote(INPUT_METHOD.TOOLBAR));
   };
   const shortcut = formatShortcut(toggleBlockQuote);
@@ -28,6 +44,7 @@ export const QuoteButton = ({
     }) : undefined,
     onClick: onClick,
     isSelected: currentBlockType === blockType,
+    isDisabled: isDisabled,
     ariaKeyshortcuts: shortcut
   }, formatMessage(blockType.title));
 };

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

@@ -1,5 +1,6 @@
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
 import { createRule, createWrappingJoinRule } from '@atlaskit/editor-common/utils';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { WRAPPER_BLOCK_TYPES, FORMATTING_NODE_TYPES, FORMATTING_MARK_TYPES } from './block-types';
 export const isNodeAWrappingBlockNode = node => {
@@ -71,14 +72,20 @@ function getSelectedWrapperNodes(state) {
 /**
  * Function will check if changing block types: Paragraph, Heading is enabled.
  */
-export function areBlockTypesDisabled(state) {
+export function areBlockTypesDisabled(state, allowFontSize = false) {
   const nodesTypes = getSelectedWrapperNodes(state);
   const {
     panel,
     blockquote,
     bulletList,
-    orderedList
+    orderedList,
+    listItem
   } = state.schema.nodes;
+
+  // When the small font size experiment is enabled, allow block type changes inside lists
+  // so that users can toggle between Normal text and Small text within list contexts.
+  // Note: taskList/taskItem are not excluded here until blockTaskItem conversion is implemented (WI 4).
+  const excludedTypes = allowFontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? [panel, bulletList, orderedList, listItem] : [panel];
   if (editorExperiment('platform_editor_blockquote_in_text_formatting_menu', true)) {
     let hasQuote = false;
     let hasNestedListInQuote = false;
@@ -99,9 +106,38 @@ export function areBlockTypesDisabled(state) {
       }
       return !hasNestedListInQuote;
     });
-    return nodesTypes.filter(type => type !== panel).length > 0 && (!hasQuote || hasNestedListInQuote);
+    return nodesTypes.filter(type => !excludedTypes.includes(type)).length > 0 && (!hasQuote || hasNestedListInQuote);
+  }
+  return nodesTypes.filter(type => !excludedTypes.includes(type)).length > 0;
+}
+
+/**
+ * Checks if the current selection is inside a list node (bulletList, orderedList, or taskList).
+ * Used to determine which text styles should be enabled when the small font size experiment is active.
+ */
+export function isSelectionInsideListNode(state) {
+  if (!state.selection) {
+    return false;
   }
-  return nodesTypes.filter(type => type !== panel).length > 0;
+  const {
+    $from,
+    $to
+  } = state.selection;
+  const {
+    bulletList,
+    orderedList,
+    taskList
+  } = state.schema.nodes;
+  const listNodeTypes = [bulletList, orderedList, taskList];
+  let insideList = false;
+  state.doc.nodesBetween($from.pos, $to.pos, node => {
+    if (node.isBlock && listNodeTypes.indexOf(node.type) >= 0) {
+      insideList = true;
+      return false;
+    }
+    return true;
+  });
+  return insideList;
 }
 const blockStylingIsPresent = state => {
   const {
@@ -142,4 +178,43 @@ export const checkFormattingIsPresent = state => {
 };
 export const hasBlockQuoteInOptions = dropdownOptions => {
   return !!dropdownOptions.find(blockType => blockType.name === 'blockquote');
-};
+};
+
+/**
+ * Returns a { from, to } range that extends the selection boundaries outward
+ * to include the entirety of any list nodes at either end. If the selection
+ * start is inside a list, `from` is pulled back to the list's start; if the
+ * selection end is inside a list, `to` is pushed forward to the list's end.
+ * Non-list content in the middle is included as-is.
+ */
+export function getSelectionRangeExpandedToLists(tr) {
+  const {
+    selection
+  } = tr;
+  const {
+    bulletList,
+    orderedList,
+    taskList
+  } = tr.doc.type.schema.nodes;
+  const listNodeTypes = [bulletList, orderedList, taskList];
+  let from = selection.from;
+  let to = selection.to;
+  for (let depth = selection.$from.depth; depth > 0; depth--) {
+    const node = selection.$from.node(depth);
+    if (listNodeTypes.indexOf(node.type) >= 0) {
+      from = selection.$from.before(depth);
+      break;
+    }
+  }
+  for (let depth = selection.$to.depth; depth > 0; depth--) {
+    const node = selection.$to.node(depth);
+    if (listNodeTypes.indexOf(node.type) >= 0) {
+      to = selection.$to.after(depth);
+      break;
+    }
+  }
+  return {
+    from,
+    to
+  };
+}

package/dist/esm/blockTypePlugin.js

@@ -171,7 +171,7 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
         name: 'blockType',
         plugin: function plugin(_ref5) {
           var dispatch = _ref5.dispatch;
-          return createPlugin(api, dispatch, options && options.lastNodeMustBeParagraph, options === null || options === void 0 ? void 0 : options.includeBlockQuoteAsTextstyleOption);
+          return createPlugin(api, dispatch, options && options.lastNodeMustBeParagraph, options === null || options === void 0 ? void 0 : options.includeBlockQuoteAsTextstyleOption, options === null || options === void 0 ? void 0 : options.allowFontSize);
         }
       }, {
         name: 'blockTypeInputRule',

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

@@ -2,13 +2,14 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 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; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { toggleBlockMarkNext } from '@atlaskit/editor-common/commands';
+import { createToggleBlockMarkOnRangeNext } from '@atlaskit/editor-common/commands';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { filterChildrenBetween, wrapSelectionIn } from '@atlaskit/editor-common/utils';
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { CellSelection } from '@atlaskit/editor-tables';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { HEADINGS_BY_NAME, NORMAL_TEXT } from '../block-types';
+import { getSelectionRangeExpandedToLists } from '../utils';
 import { FORMATTING_NODE_TYPES, FORMATTING_MARK_TYPES, cellSelectionNodesBetween, formatTypes, clearNodeFormattingOnSelection } from './clear-formatting';
 import { wrapSelectionInBlockType } from './wrapSelectionIn';
 export function setBlockType(name) {
@@ -68,11 +69,25 @@ export function setHeading(level, fromBlockQuote) {
         });
       }
     });
+
+    // Remove fontSize mark from transformed content in range
+    // List content stays as paragraphs (headings aren't allowed in list items),
+    // but non-list content has been converted to headings by setBlockType above.
     var fontSize = schema.marks.fontSize;
     if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
-      toggleBlockMarkNext(fontSize, function () {
-        return false;
-      }, [schema.nodes.heading])(tr);
+      var allowedBlocks = [schema.nodes.paragraph, schema.nodes.heading];
+      if (selection instanceof CellSelection) {
+        selection.forEachCell(function (cell, pos) {
+          createToggleBlockMarkOnRangeNext(fontSize, function () {
+            return false;
+          }, allowedBlocks)(pos, pos + cell.nodeSize, tr);
+        });
+      } else {
+        var expandedRange = getSelectionRangeExpandedToLists(tr);
+        createToggleBlockMarkOnRangeNext(fontSize, function () {
+          return false;
+        }, allowedBlocks)(expandedRange.from, expandedRange.to, tr);
+      }
     }
     return tr;
   };
@@ -80,13 +95,15 @@ export function setHeading(level, fromBlockQuote) {
 export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return function (_ref4) {
     var tr = _ref4.tr;
-    var nodes = tr.doc.type.schema.nodes;
+    var _tr$doc$type$schema = tr.doc.type.schema,
+      nodes = _tr$doc$type$schema.nodes,
+      marks = _tr$doc$type$schema.marks;
     if (name === 'normal' && nodes.paragraph) {
       return setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQuote)({
         tr: tr
       });
     }
-    if (name === 'smallText' && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+    if (name === 'smallText' && marks.fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
       return setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi)({
         tr: tr
       });
@@ -103,31 +120,38 @@ export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi,
 export function setSmallText() {
   return function (_ref5) {
     var tr = _ref5.tr;
-    var _tr$doc$type$schema = tr.doc.type.schema,
-      fontSize = _tr$doc$type$schema.marks.fontSize,
-      paragraph = _tr$doc$type$schema.nodes.paragraph;
+    var _tr$doc$type$schema2 = tr.doc.type.schema,
+      fontSize = _tr$doc$type$schema2.marks.fontSize,
+      paragraph = _tr$doc$type$schema2.nodes.paragraph;
     if (!fontSize) {
       return null;
     }
     var selection = tr.selection;
-    var ranges = selection instanceof CellSelection ? selection.ranges : [selection];
-    ranges.forEach(function (_ref6) {
-      var $from = _ref6.$from,
-        $to = _ref6.$to;
-      tr.setBlockType($from.pos, $to.pos, paragraph);
-    });
-    toggleBlockMarkNext(fontSize, function () {
-      return {
-        fontSize: 'small'
-      };
-    }, [paragraph])(tr);
+    if (selection instanceof CellSelection) {
+      selection.forEachCell(function (cell, pos) {
+        tr.setBlockType(pos, pos + cell.nodeSize, paragraph);
+        createToggleBlockMarkOnRangeNext(fontSize, function () {
+          return {
+            fontSize: 'small'
+          };
+        }, [paragraph])(pos, pos + cell.nodeSize, tr);
+      });
+    } else {
+      tr.setBlockType(selection.from, selection.to, paragraph);
+      var expandedRange = getSelectionRangeExpandedToLists(tr);
+      createToggleBlockMarkOnRangeNext(fontSize, function () {
+        return {
+          fontSize: 'small'
+        };
+      }, [paragraph])(expandedRange.from, expandedRange.to, tr);
+    }
     return tr;
   };
 }
 export function setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return function (_ref7) {
-      var tr = _ref7.tr;
+    return function (_ref6) {
+      var tr = _ref6.tr;
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
         action: ACTION.FORMATTED,
         actionSubject: ACTION_SUBJECT.TEXT,
@@ -145,14 +169,16 @@ export function setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi) {
   });
 }
 export function setNormalText(fromBlockQuote) {
-  return function (_ref8) {
-    var tr = _ref8.tr;
+  return function (_ref7) {
+    var tr = _ref7.tr;
     var selection = tr.selection,
       schema = tr.doc.type.schema;
+
+    // Apply normal text to the selection range (handles non-list content)
     var ranges = selection instanceof CellSelection ? selection.ranges : [selection];
-    ranges.forEach(function (_ref9) {
-      var $from = _ref9.$from,
-        $to = _ref9.$to;
+    ranges.forEach(function (_ref8) {
+      var $from = _ref8.$from,
+        $to = _ref8.$to;
       if (fromBlockQuote) {
         var range = $from.blockRange($to);
         if (!range) {
@@ -172,19 +198,28 @@ export function setNormalText(fromBlockQuote) {
       }
     });
 
-    // Remove fontSize mark if present in schema
+    // Remove fontSize mark from any lists the selection touches
     var fontSize = schema.marks.fontSize;
     if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
-      toggleBlockMarkNext(fontSize, function () {
-        return false;
-      }, [schema.nodes.paragraph])(tr);
+      if (selection instanceof CellSelection) {
+        selection.forEachCell(function (cell, pos) {
+          createToggleBlockMarkOnRangeNext(fontSize, function () {
+            return false;
+          }, [schema.nodes.paragraph])(pos, pos + cell.nodeSize, tr);
+        });
+      } else {
+        var expandedRange = getSelectionRangeExpandedToLists(tr);
+        createToggleBlockMarkOnRangeNext(fontSize, function () {
+          return false;
+        }, [schema.nodes.paragraph])(expandedRange.from, expandedRange.to, tr);
+      }
     }
     return tr;
   };
 }
 export function clearFormatting(inputMethod, editorAnalyticsApi) {
-  return function (_ref0) {
-    var tr = _ref0.tr;
+  return function (_ref9) {
+    var tr = _ref9.tr;
     var formattingCleared = [];
     var schema = tr.doc.type.schema;
     FORMATTING_MARK_TYPES.forEach(function (mark) {
@@ -241,8 +276,8 @@ export function clearFormatting(inputMethod, editorAnalyticsApi) {
   };
 }
 function withCurrentHeadingLevel(fn) {
-  return function (_ref1) {
-    var tr = _ref1.tr;
+  return function (_ref0) {
+    var tr = _ref0.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,
@@ -279,8 +314,8 @@ function withCurrentHeadingLevel(fn) {
 }
 export function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return function (_ref10) {
-      var tr = _ref10.tr;
+    return function (_ref1) {
+      var tr = _ref1.tr;
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
         action: ACTION.FORMATTED,
         actionSubject: ACTION_SUBJECT.TEXT,
@@ -300,8 +335,8 @@ export function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, from
 }
 export var setHeadingWithAnalytics = function setHeadingWithAnalytics(newHeadingLevel, inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
-    return function (_ref11) {
-      var tr = _ref11.tr;
+    return function (_ref10) {
+      var tr = _ref10.tr;
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
         action: ACTION.FORMATTED,
         actionSubject: ACTION_SUBJECT.TEXT,
@@ -350,8 +385,8 @@ export var insertBlockQuoteWithAnalytics = function insertBlockQuoteWithAnalytic
 };
 export function insertBlockQuoteWithAnalyticsCommand(inputMethod, editorAnalyticsApi) {
   return withCurrentHeadingLevel(function () {
-    return function (_ref12) {
-      var tr = _ref12.tr;
+    return function (_ref11) {
+      var tr = _ref11.tr;
       var nodes = tr.doc.type.schema.nodes;
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
         action: ACTION.FORMATTED,
@@ -369,8 +404,8 @@ export function insertBlockQuoteWithAnalyticsCommand(inputMethod, editorAnalytic
   });
 }
 export var cleanUpAtTheStartOfDocument = function cleanUpAtTheStartOfDocument(state, dispatch) {
-  var _ref13 = state.selection,
-    $cursor = _ref13.$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/esm/pm-plugins/main.js

@@ -81,7 +81,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, includeBlockQuoteAsTextstyleOption) {
+export var createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMustBeParagraph, includeBlockQuoteAsTextstyleOption, allowFontSize) {
   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;
@@ -115,7 +115,7 @@ export var createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMus
         var formattingIsPresent = hasBlockQuoteInOptions(availableBlockTypesInDropdown) ? checkFormattingIsPresent(state) : undefined;
         return {
           currentBlockType: detectBlockType(availableBlockTypesInDropdown, state),
-          blockTypesDisabled: areBlockTypesDisabled(state),
+          blockTypesDisabled: areBlockTypesDisabled(state, allowFontSize),
           availableBlockTypes: availableBlockTypes,
           availableWrapperBlockTypes: availableWrapperBlockTypes,
           availableBlockTypesInDropdown: availableBlockTypesInDropdown,
@@ -125,7 +125,7 @@ export var createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMus
       apply: function apply(_tr, oldPluginState, _oldState, newState) {
         var newPluginState = _objectSpread(_objectSpread({}, oldPluginState), {}, {
           currentBlockType: detectBlockType(oldPluginState.availableBlockTypesInDropdown, newState),
-          blockTypesDisabled: areBlockTypesDisabled(newState),
+          blockTypesDisabled: areBlockTypesDisabled(newState, allowFontSize),
           formattingIsPresent: hasBlockQuoteInOptions(oldPluginState.availableBlockTypesInDropdown) ? checkFormattingIsPresent(newState) : undefined
         });
         if (newPluginState.currentBlockType !== oldPluginState.currentBlockType || newPluginState.blockTypesDisabled !== oldPluginState.blockTypesDisabled || newPluginState.formattingIsPresent !== oldPluginState.formattingIsPresent) {

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

@@ -7,11 +7,13 @@ import { ax, ix } from "@compiled/react/runtime";
 import { useIntl } from 'react-intl-next';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { formatShortcut, setNormalText, toggleHeading1, toggleHeading2, toggleHeading3, toggleHeading4, toggleHeading5, toggleHeading6 } from '@atlaskit/editor-common/keymaps';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { editorUGCToken } from '@atlaskit/editor-common/ugc-tokens';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
 import { Box } from '@atlaskit/primitives/compiled';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { isSelectionInsideListNode } from '../../utils';
 var smallTextStyle = null;
 var normalStyle = null;
 var heading1Style = null;
@@ -107,6 +109,12 @@ var shortcuts = {
   heading5: toggleHeading5,
   heading6: toggleHeading6
 };
+var shouldDisableHeadingButton = function shouldDisableHeadingButton(state, blockType) {
+  if (!state) {
+    return false;
+  }
+  return isSelectionInsideListNode(state) && blockType.name !== 'normal' && blockType.name !== 'smallText';
+};
 export var HeadingButton = function HeadingButton(_ref2) {
   var blockType = _ref2.blockType,
     api = _ref2.api;
@@ -114,14 +122,20 @@ export var HeadingButton = function HeadingButton(_ref2) {
     formatMessage = _useIntl.formatMessage;
   var currentBlockType = useSharedPluginStateSelector(api, 'blockType.currentBlockType');
   var availableBlockTypesInDropdown = useSharedPluginStateSelector(api, 'blockType.availableBlockTypesInDropdown');
+  var _useEditorToolbar = useEditorToolbar(),
+    editorView = _useEditorToolbar.editorView;
   if (!(availableBlockTypesInDropdown !== null && availableBlockTypesInDropdown !== void 0 && availableBlockTypesInDropdown.some(function (availableBlockType) {
     return availableBlockType.name === blockType.name;
   }))) {
     return null;
   }
+  var isDisabled = expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? shouldDisableHeadingButton(editorView === null || editorView === void 0 ? void 0 : editorView.state, blockType) : false;
   var fromBlockQuote = (currentBlockType === null || currentBlockType === void 0 ? void 0 : currentBlockType.name) === 'blockquote';
   var onClick = function onClick() {
     var _api$core, _api$blockType;
+    if (isDisabled) {
+      return;
+    }
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === 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(blockType.name, INPUT_METHOD.TOOLBAR, fromBlockQuote));
   };
   var shortcut = formatShortcut(shortcuts[blockType.name]);
@@ -133,6 +147,7 @@ export var HeadingButton = function HeadingButton(_ref2) {
     }) : undefined,
     onClick: onClick,
     isSelected: isSelected,
+    isDisabled: isDisabled,
     ariaKeyshortcuts: shortcut
   }, expValEquals('platform_editor_toolbar_aifc_use_editor_typography', 'isEnabled', true) ? /*#__PURE__*/React.createElement(HeadingText, {
     headingType: blockType.name

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

@@ -2,8 +2,17 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { formatShortcut, toggleBlockQuote } from '@atlaskit/editor-common/keymaps';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { isSelectionInsideListNode } from '../../utils';
+var shouldDisableQuoteButton = function shouldDisableQuoteButton(state) {
+  if (!state) {
+    return false;
+  }
+  return isSelectionInsideListNode(state);
+};
 export var QuoteButton = function QuoteButton(_ref) {
   var blockType = _ref.blockType,
     api = _ref.api;
@@ -11,13 +20,19 @@ export var QuoteButton = function QuoteButton(_ref) {
     formatMessage = _useIntl.formatMessage;
   var availableBlockTypesInDropdown = useSharedPluginStateSelector(api, 'blockType.availableBlockTypesInDropdown');
   var currentBlockType = useSharedPluginStateSelector(api, 'blockType.currentBlockType');
+  var _useEditorToolbar = useEditorToolbar(),
+    editorView = _useEditorToolbar.editorView;
   if (!(availableBlockTypesInDropdown !== null && availableBlockTypesInDropdown !== void 0 && availableBlockTypesInDropdown.some(function (availableBlockType) {
     return availableBlockType.name === blockType.name;
   }))) {
     return null;
   }
+  var isDisabled = expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? shouldDisableQuoteButton(editorView === null || editorView === void 0 ? void 0 : editorView.state) : false;
   var onClick = function onClick() {
     var _api$core, _api$blockType;
+    if (isDisabled) {
+      return;
+    }
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === 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.insertBlockQuote(INPUT_METHOD.TOOLBAR));
   };
   var shortcut = formatShortcut(toggleBlockQuote);
@@ -28,6 +43,7 @@ export var QuoteButton = function QuoteButton(_ref) {
     }) : undefined,
     onClick: onClick,
     isSelected: currentBlockType === blockType,
+    isDisabled: isDisabled,
     ariaKeyshortcuts: shortcut
   }, formatMessage(blockType.title));
 };