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

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-block-type
 
+## 12.1.4
+
+### Patch Changes
+
+- Updated dependencies
+
+## 12.1.3
+
+### Patch Changes
+
+- [`4cac24cfac09d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4cac24cfac09d) -
+  Add support for text styles menu inside lists (bullet, ordered) when
+  platform_editor_small_font_size experiment is enabled. Enables Normal text and Small text options
+  while disabling other items (headings, quote). Applies fontSize mark to entire list when toggling
+  small/normal text.
+- Updated dependencies
+
 ## 12.1.2
 
 ### Patch Changes

package/dist/cjs/blockTypePlugin.js

@@ -178,7 +178,7 @@ var blockTypePlugin = exports.blockTypePlugin = function blockTypePlugin(_ref3)
         name: 'blockType',
         plugin: function plugin(_ref5) {
           var dispatch = _ref5.dispatch;
-          return (0, _main.createPlugin)(api, dispatch, options && options.lastNodeMustBeParagraph, options === null || options === void 0 ? void 0 : options.includeBlockQuoteAsTextstyleOption);
+          return (0, _main.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/cjs/pm-plugins/commands/block-type.js

@@ -23,6 +23,7 @@ var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _editorTables = require("@atlaskit/editor-tables");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _blockTypes = require("../block-types");
+var _utils2 = require("../utils");
 var _clearFormatting = require("./clear-formatting");
 var _wrapSelectionIn = require("./wrapSelectionIn");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
@@ -85,11 +86,25 @@ 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 && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
-      (0, _commands.toggleBlockMarkNext)(fontSize, function () {
-        return false;
-      }, [schema.nodes.heading])(tr);
+      var allowedBlocks = [schema.nodes.paragraph, schema.nodes.heading];
+      if (selection instanceof _editorTables.CellSelection) {
+        selection.forEachCell(function (cell, pos) {
+          (0, _commands.createToggleBlockMarkOnRangeNext)(fontSize, function () {
+            return false;
+          }, allowedBlocks)(pos, pos + cell.nodeSize, tr);
+        });
+      } else {
+        var expandedRange = (0, _utils2.getSelectionRangeExpandedToLists)(tr);
+        (0, _commands.createToggleBlockMarkOnRangeNext)(fontSize, function () {
+          return false;
+        }, allowedBlocks)(expandedRange.from, expandedRange.to, tr);
+      }
     }
     return tr;
   };
@@ -97,13 +112,15 @@ function setHeading(level, fromBlockQuote) {
 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' && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
+    if (name === 'smallText' && marks.fontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
       return setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi)({
         tr: tr
       });
@@ -120,31 +137,38 @@ function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi, fromBl
 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 _editorTables.CellSelection ? selection.ranges : [selection];
-    ranges.forEach(function (_ref6) {
-      var $from = _ref6.$from,
-        $to = _ref6.$to;
-      tr.setBlockType($from.pos, $to.pos, paragraph);
-    });
-    (0, _commands.toggleBlockMarkNext)(fontSize, function () {
-      return {
-        fontSize: 'small'
-      };
-    }, [paragraph])(tr);
+    if (selection instanceof _editorTables.CellSelection) {
+      selection.forEachCell(function (cell, pos) {
+        tr.setBlockType(pos, pos + cell.nodeSize, paragraph);
+        (0, _commands.createToggleBlockMarkOnRangeNext)(fontSize, function () {
+          return {
+            fontSize: 'small'
+          };
+        }, [paragraph])(pos, pos + cell.nodeSize, tr);
+      });
+    } else {
+      tr.setBlockType(selection.from, selection.to, paragraph);
+      var expandedRange = (0, _utils2.getSelectionRangeExpandedToLists)(tr);
+      (0, _commands.createToggleBlockMarkOnRangeNext)(fontSize, function () {
+        return {
+          fontSize: 'small'
+        };
+      }, [paragraph])(expandedRange.from, expandedRange.to, tr);
+    }
     return tr;
   };
 }
 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: _analytics.ACTION.FORMATTED,
         actionSubject: _analytics.ACTION_SUBJECT.TEXT,
@@ -162,14 +186,16 @@ function setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi) {
   });
 }
 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 _editorTables.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) {
@@ -189,19 +215,28 @@ 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 && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
-      (0, _commands.toggleBlockMarkNext)(fontSize, function () {
-        return false;
-      }, [schema.nodes.paragraph])(tr);
+      if (selection instanceof _editorTables.CellSelection) {
+        selection.forEachCell(function (cell, pos) {
+          (0, _commands.createToggleBlockMarkOnRangeNext)(fontSize, function () {
+            return false;
+          }, [schema.nodes.paragraph])(pos, pos + cell.nodeSize, tr);
+        });
+      } else {
+        var expandedRange = (0, _utils2.getSelectionRangeExpandedToLists)(tr);
+        (0, _commands.createToggleBlockMarkOnRangeNext)(fontSize, function () {
+          return false;
+        }, [schema.nodes.paragraph])(expandedRange.from, expandedRange.to, tr);
+      }
     }
     return tr;
   };
 }
 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;
     _clearFormatting.FORMATTING_MARK_TYPES.forEach(function (mark) {
@@ -258,8 +293,8 @@ 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,
@@ -296,8 +331,8 @@ function withCurrentHeadingLevel(fn) {
 }
 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: _analytics.ACTION.FORMATTED,
         actionSubject: _analytics.ACTION_SUBJECT.TEXT,
@@ -317,8 +352,8 @@ function setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQu
 }
 var setHeadingWithAnalytics = exports.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: _analytics.ACTION.FORMATTED,
         actionSubject: _analytics.ACTION_SUBJECT.TEXT,
@@ -367,8 +402,8 @@ var insertBlockQuoteWithAnalytics = exports.insertBlockQuoteWithAnalytics = func
 };
 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: _analytics.ACTION.FORMATTED,
@@ -386,8 +421,8 @@ function insertBlockQuoteWithAnalyticsCommand(inputMethod, editorAnalyticsApi) {
   });
 }
 var cleanUpAtTheStartOfDocument = exports.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/cjs/pm-plugins/main.js

@@ -88,7 +88,7 @@ var autoformatHeading = function autoformatHeading(headingLevel, editorAnalytics
   return (0, _blockType.setHeadingWithAnalytics)(headingLevel, _analytics.INPUT_METHOD.FORMATTING, editorAnalyticsApi);
 };
 var pluginKey = exports.pluginKey = new _state.PluginKey('blockTypePlugin');
-var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMustBeParagraph, includeBlockQuoteAsTextstyleOption) {
+var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMustBeParagraph, includeBlockQuoteAsTextstyleOption, 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;
@@ -122,7 +122,7 @@ var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispa
         var formattingIsPresent = (0, _utils.hasBlockQuoteInOptions)(availableBlockTypesInDropdown) ? (0, _utils.checkFormattingIsPresent)(state) : undefined;
         return {
           currentBlockType: detectBlockType(availableBlockTypesInDropdown, state),
-          blockTypesDisabled: (0, _utils.areBlockTypesDisabled)(state),
+          blockTypesDisabled: (0, _utils.areBlockTypesDisabled)(state, allowFontSize),
           availableBlockTypes: availableBlockTypes,
           availableWrapperBlockTypes: availableWrapperBlockTypes,
           availableBlockTypesInDropdown: availableBlockTypesInDropdown,
@@ -132,7 +132,7 @@ var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispa
       apply: function apply(_tr, oldPluginState, _oldState, newState) {
         var newPluginState = _objectSpread(_objectSpread({}, oldPluginState), {}, {
           currentBlockType: detectBlockType(oldPluginState.availableBlockTypesInDropdown, newState),
-          blockTypesDisabled: (0, _utils.areBlockTypesDisabled)(newState),
+          blockTypesDisabled: (0, _utils.areBlockTypesDisabled)(newState, allowFontSize),
           formattingIsPresent: (0, _utils.hasBlockQuoteInOptions)(oldPluginState.availableBlockTypesInDropdown) ? (0, _utils.checkFormattingIsPresent)(newState) : undefined
         });
         if (newPluginState.currentBlockType !== oldPluginState.currentBlockType || newPluginState.blockTypesDisabled !== oldPluginState.blockTypesDisabled || newPluginState.formattingIsPresent !== oldPluginState.formattingIsPresent) {

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

@@ -14,11 +14,13 @@ var _runtime = require("@compiled/react/runtime");
 var _reactIntlNext = require("react-intl-next");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
+var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _ugcTokens = require("@atlaskit/editor-common/ugc-tokens");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _utils = require("../../utils");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var smallTextStyle = null;
 var normalStyle = null;
@@ -115,6 +117,12 @@ var shortcuts = {
   heading5: _keymaps.toggleHeading5,
   heading6: _keymaps.toggleHeading6
 };
+var shouldDisableHeadingButton = function shouldDisableHeadingButton(state, blockType) {
+  if (!state) {
+    return false;
+  }
+  return (0, _utils.isSelectionInsideListNode)(state) && blockType.name !== 'normal' && blockType.name !== 'smallText';
+};
 var HeadingButton = exports.HeadingButton = function HeadingButton(_ref2) {
   var blockType = _ref2.blockType,
     api = _ref2.api;
@@ -122,14 +130,20 @@ var HeadingButton = exports.HeadingButton = function HeadingButton(_ref2) {
     formatMessage = _useIntl.formatMessage;
   var currentBlockType = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockType.currentBlockType');
   var availableBlockTypesInDropdown = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockType.availableBlockTypesInDropdown');
+  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+    editorView = _useEditorToolbar.editorView;
   if (!(availableBlockTypesInDropdown !== null && availableBlockTypesInDropdown !== void 0 && availableBlockTypesInDropdown.some(function (availableBlockType) {
     return availableBlockType.name === blockType.name;
   }))) {
     return null;
   }
+  var isDisabled = (0, _expValEquals.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, _analytics.INPUT_METHOD.TOOLBAR, fromBlockQuote));
   };
   var shortcut = (0, _keymaps.formatShortcut)(shortcuts[blockType.name]);
@@ -141,6 +155,7 @@ var HeadingButton = exports.HeadingButton = function HeadingButton(_ref2) {
     }) : undefined,
     onClick: onClick,
     isSelected: isSelected,
+    isDisabled: isDisabled,
     ariaKeyshortcuts: shortcut
   }, (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_use_editor_typography', 'isEnabled', true) ? /*#__PURE__*/React.createElement(HeadingText, {
     headingType: blockType.name

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

@@ -9,8 +9,17 @@ var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
+var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _utils = require("../../utils");
+var shouldDisableQuoteButton = function shouldDisableQuoteButton(state) {
+  if (!state) {
+    return false;
+  }
+  return (0, _utils.isSelectionInsideListNode)(state);
+};
 var QuoteButton = exports.QuoteButton = function QuoteButton(_ref) {
   var blockType = _ref.blockType,
     api = _ref.api;
@@ -18,13 +27,19 @@ var QuoteButton = exports.QuoteButton = function QuoteButton(_ref) {
     formatMessage = _useIntl.formatMessage;
   var availableBlockTypesInDropdown = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockType.availableBlockTypesInDropdown');
   var currentBlockType = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'blockType.currentBlockType');
+  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+    editorView = _useEditorToolbar.editorView;
   if (!(availableBlockTypesInDropdown !== null && availableBlockTypesInDropdown !== void 0 && availableBlockTypesInDropdown.some(function (availableBlockType) {
     return availableBlockType.name === blockType.name;
   }))) {
     return null;
   }
+  var isDisabled = (0, _expValEquals.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(_analytics.INPUT_METHOD.TOOLBAR));
   };
   var shortcut = (0, _keymaps.formatShortcut)(_keymaps.toggleBlockQuote);
@@ -35,6 +50,7 @@ var QuoteButton = exports.QuoteButton = function QuoteButton(_ref) {
     }) : undefined,
     onClick: onClick,
     isSelected: currentBlockType === blockType,
+    isDisabled: isDisabled,
     ariaKeyshortcuts: shortcut
   }, formatMessage(blockType.title));
 };

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

@@ -4,9 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.areBlockTypesDisabled = areBlockTypesDisabled;
-exports.isNodeAWrappingBlockNode = exports.hasBlockQuoteInOptions = exports.createWrappingTextBlockRule = exports.createJoinNodesRule = exports.checkFormattingIsPresent = void 0;
+exports.createWrappingTextBlockRule = exports.createJoinNodesRule = exports.checkFormattingIsPresent = void 0;
+exports.getSelectionRangeExpandedToLists = getSelectionRangeExpandedToLists;
+exports.isNodeAWrappingBlockNode = exports.hasBlockQuoteInOptions = void 0;
+exports.isSelectionInsideListNode = isSelectionInsideListNode;
 var _mark = require("@atlaskit/editor-common/mark");
 var _utils = require("@atlaskit/editor-common/utils");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _blockTypes = require("./block-types");
 var isNodeAWrappingBlockNode = exports.isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
@@ -80,12 +84,19 @@ function getSelectedWrapperNodes(state) {
  * Function will check if changing block types: Paragraph, Heading is enabled.
  */
 function areBlockTypesDisabled(state) {
+  var allowFontSize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var nodesTypes = getSelectedWrapperNodes(state);
   var _state$schema$nodes2 = state.schema.nodes,
     panel = _state$schema$nodes2.panel,
     blockquote = _state$schema$nodes2.blockquote,
     bulletList = _state$schema$nodes2.bulletList,
-    orderedList = _state$schema$nodes2.orderedList;
+    orderedList = _state$schema$nodes2.orderedList,
+    listItem = _state$schema$nodes2.listItem;
+
+  // 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).
+  var excludedTypes = allowFontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? [panel, bulletList, orderedList, listItem] : [panel];
   if ((0, _experiments.editorExperiment)('platform_editor_blockquote_in_text_formatting_menu', true)) {
     var hasQuote = false;
     var hasNestedListInQuote = false;
@@ -106,17 +117,44 @@ function areBlockTypesDisabled(state) {
       return !hasNestedListInQuote;
     });
     return nodesTypes.filter(function (type) {
-      return type !== panel;
+      return !excludedTypes.includes(type);
     }).length > 0 && (!hasQuote || hasNestedListInQuote);
   }
   return nodesTypes.filter(function (type) {
-    return type !== panel;
+    return !excludedTypes.includes(type);
   }).length > 0;
 }
-var blockStylingIsPresent = function blockStylingIsPresent(state) {
+
+/**
+ * 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.
+ */
+function isSelectionInsideListNode(state) {
+  if (!state.selection) {
+    return false;
+  }
   var _state$selection3 = state.selection,
-    from = _state$selection3.from,
-    to = _state$selection3.to;
+    $from = _state$selection3.$from,
+    $to = _state$selection3.$to;
+  var _state$schema$nodes3 = state.schema.nodes,
+    bulletList = _state$schema$nodes3.bulletList,
+    orderedList = _state$schema$nodes3.orderedList,
+    taskList = _state$schema$nodes3.taskList;
+  var listNodeTypes = [bulletList, orderedList, taskList];
+  var insideList = false;
+  state.doc.nodesBetween($from.pos, $to.pos, function (node) {
+    if (node.isBlock && listNodeTypes.indexOf(node.type) >= 0) {
+      insideList = true;
+      return false;
+    }
+    return true;
+  });
+  return insideList;
+}
+var blockStylingIsPresent = function blockStylingIsPresent(state) {
+  var _state$selection4 = state.selection,
+    from = _state$selection4.from,
+    to = _state$selection4.to;
   var isBlockStyling = false;
   state.doc.nodesBetween(from, to, function (node) {
     if (_blockTypes.FORMATTING_NODE_TYPES.indexOf(node.type.name) !== -1) {
@@ -130,9 +168,9 @@ var blockStylingIsPresent = function blockStylingIsPresent(state) {
 var marksArePresent = function marksArePresent(state) {
   var activeMarkTypes = _blockTypes.FORMATTING_MARK_TYPES.filter(function (mark) {
     if (!!state.schema.marks[mark]) {
-      var _state$selection4 = state.selection,
-        $from = _state$selection4.$from,
-        empty = _state$selection4.empty;
+      var _state$selection5 = state.selection,
+        $from = _state$selection5.$from,
+        empty = _state$selection5.empty;
       var marks = state.schema.marks;
       if (empty) {
         return !!marks[mark].isInSet(state.storedMarks || $from.marks());
@@ -150,4 +188,40 @@ var hasBlockQuoteInOptions = exports.hasBlockQuoteInOptions = function hasBlockQ
   return !!dropdownOptions.find(function (blockType) {
     return 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.
+ */
+function getSelectionRangeExpandedToLists(tr) {
+  var selection = tr.selection;
+  var _tr$doc$type$schema$n = tr.doc.type.schema.nodes,
+    bulletList = _tr$doc$type$schema$n.bulletList,
+    orderedList = _tr$doc$type$schema$n.orderedList,
+    taskList = _tr$doc$type$schema$n.taskList;
+  var listNodeTypes = [bulletList, orderedList, taskList];
+  var from = selection.from;
+  var to = selection.to;
+  for (var depth = selection.$from.depth; depth > 0; depth--) {
+    var node = selection.$from.node(depth);
+    if (listNodeTypes.indexOf(node.type) >= 0) {
+      from = selection.$from.before(depth);
+      break;
+    }
+  }
+  for (var _depth = selection.$to.depth; _depth > 0; _depth--) {
+    var _node = selection.$to.node(_depth);
+    if (listNodeTypes.indexOf(_node.type) >= 0) {
+      to = selection.$to.after(_depth);
+      break;
+    }
+  }
+  return {
+    from: from,
+    to: to
+  };
+}

package/dist/es2019/blockTypePlugin.js

@@ -165,7 +165,7 @@ const blockTypePlugin = ({
         name: 'blockType',
         plugin: ({
           dispatch
-        }) => createPlugin(api, dispatch, options && options.lastNodeMustBeParagraph, options === null || options === void 0 ? void 0 : options.includeBlockQuoteAsTextstyleOption)
+        }) => 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',
         plugin: ({

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

@@ -1,11 +1,12 @@
 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) {
@@ -76,11 +77,23 @@ 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.
     const {
       fontSize
     } = schema.marks;
     if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
-      toggleBlockMarkNext(fontSize, () => false, [schema.nodes.heading])(tr);
+      const allowedBlocks = [schema.nodes.paragraph, schema.nodes.heading];
+      if (selection instanceof CellSelection) {
+        selection.forEachCell((cell, pos) => {
+          createToggleBlockMarkOnRangeNext(fontSize, () => false, allowedBlocks)(pos, pos + cell.nodeSize, tr);
+        });
+      } else {
+        const expandedRange = getSelectionRangeExpandedToLists(tr);
+        createToggleBlockMarkOnRangeNext(fontSize, () => false, allowedBlocks)(expandedRange.from, expandedRange.to, tr);
+      }
     }
     return tr;
   };
@@ -90,14 +103,15 @@ export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi,
     tr
   }) => {
     const {
-      nodes
+      nodes,
+      marks
     } = tr.doc.type.schema;
     if (name === 'normal' && nodes.paragraph) {
       return setNormalTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQuote)({
         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
       });
@@ -129,16 +143,20 @@ export function setSmallText() {
     const {
       selection
     } = tr;
-    const ranges = selection instanceof CellSelection ? selection.ranges : [selection];
-    ranges.forEach(({
-      $from,
-      $to
-    }) => {
-      tr.setBlockType($from.pos, $to.pos, paragraph);
-    });
-    toggleBlockMarkNext(fontSize, () => ({
-      fontSize: 'small'
-    }), [paragraph])(tr);
+    if (selection instanceof CellSelection) {
+      selection.forEachCell((cell, pos) => {
+        tr.setBlockType(pos, pos + cell.nodeSize, paragraph);
+        createToggleBlockMarkOnRangeNext(fontSize, () => ({
+          fontSize: 'small'
+        }), [paragraph])(pos, pos + cell.nodeSize, tr);
+      });
+    } else {
+      tr.setBlockType(selection.from, selection.to, paragraph);
+      const expandedRange = getSelectionRangeExpandedToLists(tr);
+      createToggleBlockMarkOnRangeNext(fontSize, () => ({
+        fontSize: 'small'
+      }), [paragraph])(expandedRange.from, expandedRange.to, tr);
+    }
     return tr;
   };
 }
@@ -173,6 +191,8 @@ export function setNormalText(fromBlockQuote) {
         }
       }
     } = tr;
+
+    // Apply normal text to the selection range (handles non-list content)
     const ranges = selection instanceof CellSelection ? selection.ranges : [selection];
     ranges.forEach(({
       $from,
@@ -197,12 +217,19 @@ export function setNormalText(fromBlockQuote) {
       }
     });
 
-    // Remove fontSize mark if present in schema
+    // Remove fontSize mark from any lists the selection touches
     const {
       fontSize
     } = schema.marks;
     if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
-      toggleBlockMarkNext(fontSize, () => false, [schema.nodes.paragraph])(tr);
+      if (selection instanceof CellSelection) {
+        selection.forEachCell((cell, pos) => {
+          createToggleBlockMarkOnRangeNext(fontSize, () => false, [schema.nodes.paragraph])(pos, pos + cell.nodeSize, tr);
+        });
+      } else {
+        const expandedRange = getSelectionRangeExpandedToLists(tr);
+        createToggleBlockMarkOnRangeNext(fontSize, () => false, [schema.nodes.paragraph])(expandedRange.from, expandedRange.to, tr);
+      }
     }
     return tr;
   };