@atlaskit/editor-plugin-block-type 12.1.19 → 12.1.21

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-block-type
 
+## 12.1.21
+
+### Patch Changes
+
+- Updated dependencies
+
+## 12.1.20
+
+### Patch Changes
+
+- [`1c4534dc921e6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1c4534dc921e6) -
+  Preserve small text formatting when converting selections to task lists across block menu, block
+  type, and paste flows
+- Updated dependencies
+
 ## 12.1.19
 
 ### Patch Changes

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

@@ -121,7 +121,7 @@ function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi, fromBl
       });
     }
     if (name === 'smallText' && marks.fontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
-      return setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi)({
+      return setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQuote)({
         tr: tr
       });
     }
@@ -134,7 +134,7 @@ function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi, fromBl
     return null;
   };
 }
-function setSmallText() {
+function setSmallText(fromBlockQuote) {
   return function (_ref5) {
     var tr = _ref5.tr;
     var _tr$doc$type$schema2 = tr.doc.type.schema,
@@ -144,39 +144,45 @@ function setSmallText() {
       return null;
     }
     var selection = tr.selection;
-    if (selection instanceof _editorTables.CellSelection) {
+    var applySmallFontSize = (0, _commands.createToggleBlockMarkOnRangeNext)(fontSize, function () {
+      return {
+        fontSize: 'small'
+      };
+    }, [paragraph]);
+    if (fromBlockQuote) {
+      var $from = selection.$from,
+        $to = selection.$to;
+      var range = $from.blockRange($to);
+      if (!range) {
+        return tr;
+      }
+      var targetLiftDepth = (0, _transform.liftTarget)(range);
+      if (targetLiftDepth || targetLiftDepth === 0) {
+        tr.lift(range, targetLiftDepth);
+      }
+      var from = tr.mapping.map($from.pos);
+      var to = tr.mapping.map($to.pos);
+      tr.setBlockType(from, to, paragraph);
+      applySmallFontSize(from, to, tr);
+    } else if (selection instanceof _editorTables.CellSelection) {
       var mapFrom = tr.steps.length;
       selection.forEachCell(function (cell, pos) {
-        var mappedPos = tr.mapping.slice(mapFrom).map(pos);
-        tr.setBlockType(mappedPos, mappedPos + cell.nodeSize, paragraph);
-        (0, _utils2.convertTaskItemsToBlockTaskItems)(tr, mappedPos, mappedPos + cell.nodeSize);
-        (0, _commands.createToggleBlockMarkOnRangeNext)(fontSize, function () {
-          return {
-            fontSize: 'small'
-          };
-        }, [paragraph])(mappedPos, mappedPos + cell.nodeSize, tr);
+        var from = tr.mapping.slice(mapFrom).map(pos);
+        var to = from + cell.nodeSize;
+        tr.setBlockType(from, to, paragraph);
+        (0, _utils2.convertTaskItemsToBlockTaskItems)(tr, from, to);
+        applySmallFontSize(from, to, tr);
       });
     } else {
-      // Step 1. Convert headings to paragraphs (for non-task content)
       tr.setBlockType(selection.from, selection.to, paragraph);
-
-      // Step 2. Expand the selection range to include full list nodes
       var expandedRange = (0, _utils2.getSelectionRangeExpandedToLists)(tr);
-
-      // Step 3. Convert taskItems → blockTaskItems so their content can hold the fontSize mark
       (0, _utils2.convertTaskItemsToBlockTaskItems)(tr, expandedRange.from, expandedRange.to);
-
-      // Step 4. Apply fontSize mark to all paragraphs in range (including those inside new blockTaskItems)
-      (0, _commands.createToggleBlockMarkOnRangeNext)(fontSize, function () {
-        return {
-          fontSize: 'small'
-        };
-      }, [paragraph])(tr.mapping.map(expandedRange.from, -1), tr.mapping.map(expandedRange.to, 1), tr);
+      applySmallFontSize(tr.mapping.map(expandedRange.from, -1), tr.mapping.map(expandedRange.to, 1), tr);
     }
     return tr;
   };
 }
-function setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi) {
+function setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
     return function (_ref6) {
       var tr = _ref6.tr;
@@ -190,7 +196,7 @@ function setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi) {
           previousBlockType: previousHeadingLevel !== undefined ? String(previousHeadingLevel) : undefined
         }
       })(tr);
-      return setSmallText()({
+      return setSmallText(fromBlockQuote)({
         tr: tr
       });
     };

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

@@ -6,16 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.wrapSelectionInBlockType = wrapSelectionInBlockType;
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
-function wrapSelectionInBlockType(nodeType) {
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+function wrapSelectionInBlockType(_nodeType) {
   return function (_ref) {
     var tr = _ref.tr;
     var nodes = tr.doc.type.schema.nodes;
     var _tr$doc$type$schema$m = tr.doc.type.schema.marks,
       alignment = _tr$doc$type$schema$m.alignment,
-      indentation = _tr$doc$type$schema$m.indentation;
+      indentation = _tr$doc$type$schema$m.indentation,
+      fontSize = _tr$doc$type$schema$m.fontSize;
     if (nodes.paragraph && nodes.blockquote) {
-      /**Remove alignment and indentation marks from the selection */
-      var marksToRemove = [alignment, indentation];
+      /** Remove alignment, indentation, and unsupported blockquote marks from the selection */
+      var marksToRemove = (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? [alignment, indentation, fontSize] : [alignment, indentation];
       var hasMark = function hasMark(mark) {
         return marksToRemove.indexOf(mark.type) > -1;
       };

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

@@ -9,9 +9,12 @@ exports.convertTaskItemsToBlockTaskItems = convertTaskItemsToBlockTaskItems;
 exports.createWrappingTextBlockRule = exports.createJoinNodesRule = void 0;
 exports.getSelectionRangeExpandedToLists = getSelectionRangeExpandedToLists;
 exports.isNodeAWrappingBlockNode = exports.hasBlockQuoteInOptions = void 0;
+exports.isSelectionInsideBlockquote = isSelectionInsideBlockquote;
 exports.isSelectionInsideListNode = isSelectionInsideListNode;
 var _mark = require("@atlaskit/editor-common/mark");
+var _transforms = require("@atlaskit/editor-common/transforms");
 var _utils = require("@atlaskit/editor-common/utils");
+var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _blockTypes = require("./block-types");
@@ -58,7 +61,8 @@ function getSelectedWrapperNodes(state) {
   if (state.selection) {
     var _state$selection = state.selection,
       $from = _state$selection.$from,
-      $to = _state$selection.$to;
+      $to = _state$selection.$to,
+      empty = _state$selection.empty;
     var _state$schema$nodes = state.schema.nodes,
       blockquote = _state$schema$nodes.blockquote,
       panel = _state$schema$nodes.panel,
@@ -73,6 +77,15 @@ function getSelectedWrapperNodes(state) {
       taskList = _state$schema$nodes.taskList;
     var wrapperNodes = [blockquote, panel, orderedList, bulletList, listItem, codeBlock, decisionItem, decisionList, taskItem, taskList];
     wrapperNodes.push(caption);
+    if (empty && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
+      for (var depth = 0; depth <= $from.depth; depth++) {
+        var node = $from.node(depth);
+        if (node.isBlock && wrapperNodes.indexOf(node.type) >= 0) {
+          nodes.push(node.type);
+        }
+      }
+      return nodes;
+    }
     state.doc.nodesBetween($from.pos, $to.pos, function (node) {
       if (node.isBlock && wrapperNodes.indexOf(node.type) >= 0) {
         nodes.push(node.type);
@@ -96,7 +109,24 @@ function areBlockTypesDisabled(state) {
     listItem = _state$schema$nodes2.listItem,
     taskList = _state$schema$nodes2.taskList,
     taskItem = _state$schema$nodes2.taskItem;
-  var excludedTypes = allowFontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? [panel, bulletList, orderedList, listItem, taskList, taskItem] : [panel];
+  var isSmallFontSizeEnabled = allowFontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true);
+  var excludedTypes = isSmallFontSizeEnabled ? [panel, bulletList, orderedList, listItem, taskList, taskItem] : [panel];
+  var disallowedWrapperTypes = nodesTypes.filter(function (type) {
+    return !excludedTypes.includes(type);
+  });
+  if (isSmallFontSizeEnabled) {
+    var selectionInsideList = isSelectionInsideListNode(state);
+    var selectionInsideQuote = isSelectionInsideBlockquote(state);
+
+    // Inside a blockquote (but not a list nested within one): the blockquote itself isn't a
+    // disallowing wrapper, but anything else is.
+    if (selectionInsideQuote && !selectionInsideList) {
+      return disallowedWrapperTypes.some(function (type) {
+        return type !== blockquote;
+      });
+    }
+    return disallowedWrapperTypes.length > 0;
+  }
   if ((0, _experiments.editorExperiment)('platform_editor_blockquote_in_text_formatting_menu', true)) {
     var hasQuote = false;
     var hasNestedListInQuote = false;
@@ -116,13 +146,9 @@ function areBlockTypesDisabled(state) {
       }
       return !hasNestedListInQuote;
     });
-    return nodesTypes.filter(function (type) {
-      return !excludedTypes.includes(type);
-    }).length > 0 && (!hasQuote || hasNestedListInQuote);
+    return disallowedWrapperTypes.length > 0 && (!hasQuote || hasNestedListInQuote);
   }
-  return nodesTypes.filter(function (type) {
-    return !excludedTypes.includes(type);
-  }).length > 0;
+  return disallowedWrapperTypes.length > 0;
 }
 
 /**
@@ -149,12 +175,40 @@ function isSelectionInsideListNode(state) {
     }
     return true;
   });
-  return insideList;
+  return insideList || listNodeTypes.some(function (nodeType) {
+    return (0, _utils2.hasParentNodeOfType)(nodeType)(state.selection);
+  });
 }
-var blockStylingIsPresent = function blockStylingIsPresent(state) {
+function isSelectionInsideBlockquote(state) {
+  if (!state.selection) {
+    return false;
+  }
   var _state$selection4 = state.selection,
-    from = _state$selection4.from,
-    to = _state$selection4.to;
+    $from = _state$selection4.$from,
+    $to = _state$selection4.$to;
+  var blockquote = state.schema.nodes.blockquote;
+
+  // For collapsed selections, check if the cursor is inside a blockquote
+  if ($from.pos === $to.pos) {
+    return (0, _utils2.hasParentNodeOfType)(blockquote)(state.selection);
+  }
+
+  // For range selections, check if any node in the range is a blockquote,
+  // or if the selection starts/ends inside a blockquote
+  var insideQuote = false;
+  state.doc.nodesBetween($from.pos, $to.pos, function (node) {
+    if (node.type === blockquote) {
+      insideQuote = true;
+      return false;
+    }
+    return true;
+  });
+  return insideQuote || (0, _utils2.hasParentNodeOfType)(blockquote)(state.selection);
+}
+var blockStylingIsPresent = function blockStylingIsPresent(state) {
+  var _state$selection5 = state.selection,
+    from = _state$selection5.from,
+    to = _state$selection5.to;
   var isBlockStyling = false;
   state.doc.nodesBetween(from, to, function (node) {
     if (_blockTypes.FORMATTING_NODE_TYPES.indexOf(node.type.name) !== -1) {
@@ -168,9 +222,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$selection5 = state.selection,
-        $from = _state$selection5.$from,
-        empty = _state$selection5.empty;
+      var _state$selection6 = state.selection,
+        $from = _state$selection6.$from,
+        empty = _state$selection6.empty;
       var marks = state.schema.marks;
       if (empty) {
         return !!marks[mark].isInSet(state.storedMarks || $from.marks());
@@ -252,8 +306,7 @@ function getSelectionRangeExpandedToLists(tr) {
 function convertTaskItemsToBlockTaskItems(tr, from, to) {
   var _tr$doc$type$schema$n2 = tr.doc.type.schema.nodes,
     taskItem = _tr$doc$type$schema$n2.taskItem,
-    blockTaskItem = _tr$doc$type$schema$n2.blockTaskItem,
-    paragraph = _tr$doc$type$schema$n2.paragraph;
+    blockTaskItem = _tr$doc$type$schema$n2.blockTaskItem;
   if (!blockTaskItem || !taskItem) {
     return;
   }
@@ -274,7 +327,11 @@ function convertTaskItemsToBlockTaskItems(tr, from, to) {
     var _taskItemsToConvert$i = taskItemsToConvert[i],
       pos = _taskItemsToConvert$i.pos,
       node = _taskItemsToConvert$i.node;
-    var blockTaskNode = blockTaskItem.create(node.attrs, paragraph.create(null, node.content));
+    var blockTaskNode = (0, _transforms.createBlockTaskItem)({
+      attrs: node.attrs,
+      content: node.content,
+      schema: tr.doc.type.schema
+    });
     tr.replaceWith(pos, pos + node.nodeSize, blockTaskNode);
   }
 }

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

@@ -112,7 +112,7 @@ export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi,
       });
     }
     if (name === 'smallText' && marks.fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
-      return setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi)({
+      return setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQuote)({
         tr
       });
     }
@@ -125,7 +125,7 @@ export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi,
     return null;
   };
 }
-export function setSmallText() {
+export function setSmallText(fromBlockQuote) {
   return function ({
     tr
   }) {
@@ -143,35 +143,45 @@ export function setSmallText() {
     const {
       selection
     } = tr;
-    if (selection instanceof CellSelection) {
+    const applySmallFontSize = createToggleBlockMarkOnRangeNext(fontSize, () => ({
+      fontSize: 'small'
+    }), [paragraph]);
+    if (fromBlockQuote) {
+      const {
+        $from,
+        $to
+      } = selection;
+      const range = $from.blockRange($to);
+      if (!range) {
+        return tr;
+      }
+      const targetLiftDepth = liftTarget(range);
+      if (targetLiftDepth || targetLiftDepth === 0) {
+        tr.lift(range, targetLiftDepth);
+      }
+      const from = tr.mapping.map($from.pos);
+      const to = tr.mapping.map($to.pos);
+      tr.setBlockType(from, to, paragraph);
+      applySmallFontSize(from, to, tr);
+    } else if (selection instanceof CellSelection) {
       const mapFrom = tr.steps.length;
       selection.forEachCell((cell, pos) => {
-        const mappedPos = tr.mapping.slice(mapFrom).map(pos);
-        tr.setBlockType(mappedPos, mappedPos + cell.nodeSize, paragraph);
-        convertTaskItemsToBlockTaskItems(tr, mappedPos, mappedPos + cell.nodeSize);
-        createToggleBlockMarkOnRangeNext(fontSize, () => ({
-          fontSize: 'small'
-        }), [paragraph])(mappedPos, mappedPos + cell.nodeSize, tr);
+        const from = tr.mapping.slice(mapFrom).map(pos);
+        const to = from + cell.nodeSize;
+        tr.setBlockType(from, to, paragraph);
+        convertTaskItemsToBlockTaskItems(tr, from, to);
+        applySmallFontSize(from, to, tr);
       });
     } else {
-      // Step 1. Convert headings to paragraphs (for non-task content)
       tr.setBlockType(selection.from, selection.to, paragraph);
-
-      // Step 2. Expand the selection range to include full list nodes
       const expandedRange = getSelectionRangeExpandedToLists(tr);
-
-      // Step 3. Convert taskItems → blockTaskItems so their content can hold the fontSize mark
       convertTaskItemsToBlockTaskItems(tr, expandedRange.from, expandedRange.to);
-
-      // Step 4. Apply fontSize mark to all paragraphs in range (including those inside new blockTaskItems)
-      createToggleBlockMarkOnRangeNext(fontSize, () => ({
-        fontSize: 'small'
-      }), [paragraph])(tr.mapping.map(expandedRange.from, -1), tr.mapping.map(expandedRange.to, 1), tr);
+      applySmallFontSize(tr.mapping.map(expandedRange.from, -1), tr.mapping.map(expandedRange.to, 1), tr);
     }
     return tr;
   };
 }
-export function setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi) {
+export function setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return withCurrentHeadingLevel(previousHeadingLevel => ({
     tr
   }) => {
@@ -185,7 +195,7 @@ export function setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi) {
         previousBlockType: previousHeadingLevel !== undefined ? String(previousHeadingLevel) : undefined
       }
     })(tr);
-    return setSmallText()({
+    return setSmallText(fromBlockQuote)({
       tr
     });
   });

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

@@ -1,6 +1,7 @@
 import { Slice, Fragment } from '@atlaskit/editor-prosemirror/model';
 import { findWrapping } from '@atlaskit/editor-prosemirror/transform';
-export function wrapSelectionInBlockType(nodeType) {
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+export function wrapSelectionInBlockType(_nodeType) {
   return ({
     tr
   }) => {
@@ -9,11 +10,12 @@ export function wrapSelectionInBlockType(nodeType) {
     } = tr.doc.type.schema;
     const {
       alignment,
-      indentation
+      indentation,
+      fontSize
     } = tr.doc.type.schema.marks;
     if (nodes.paragraph && nodes.blockquote) {
-      /**Remove alignment and indentation marks from the selection */
-      const marksToRemove = [alignment, indentation];
+      /** Remove alignment, indentation, and unsupported blockquote marks from the selection */
+      const marksToRemove = expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? [alignment, indentation, fontSize] : [alignment, indentation];
       const hasMark = mark => marksToRemove.indexOf(mark.type) > -1;
       const not = fn => arg => !fn(arg);
 

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

@@ -1,5 +1,7 @@
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
+import { createBlockTaskItem } from '@atlaskit/editor-common/transforms';
 import { createRule, createWrappingJoinRule } from '@atlaskit/editor-common/utils';
+import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/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';
@@ -43,7 +45,8 @@ function getSelectedWrapperNodes(state) {
   if (state.selection) {
     const {
       $from,
-      $to
+      $to,
+      empty
     } = state.selection;
     const {
       blockquote,
@@ -60,6 +63,15 @@ function getSelectedWrapperNodes(state) {
     } = state.schema.nodes;
     const wrapperNodes = [blockquote, panel, orderedList, bulletList, listItem, codeBlock, decisionItem, decisionList, taskItem, taskList];
     wrapperNodes.push(caption);
+    if (empty && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+      for (let depth = 0; depth <= $from.depth; depth++) {
+        const node = $from.node(depth);
+        if (node.isBlock && wrapperNodes.indexOf(node.type) >= 0) {
+          nodes.push(node.type);
+        }
+      }
+      return nodes;
+    }
     state.doc.nodesBetween($from.pos, $to.pos, node => {
       if (node.isBlock && wrapperNodes.indexOf(node.type) >= 0) {
         nodes.push(node.type);
@@ -83,7 +95,20 @@ export function areBlockTypesDisabled(state, allowFontSize = false) {
     taskList,
     taskItem
   } = state.schema.nodes;
-  const excludedTypes = allowFontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? [panel, bulletList, orderedList, listItem, taskList, taskItem] : [panel];
+  const isSmallFontSizeEnabled = allowFontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
+  const excludedTypes = isSmallFontSizeEnabled ? [panel, bulletList, orderedList, listItem, taskList, taskItem] : [panel];
+  const disallowedWrapperTypes = nodesTypes.filter(type => !excludedTypes.includes(type));
+  if (isSmallFontSizeEnabled) {
+    const selectionInsideList = isSelectionInsideListNode(state);
+    const selectionInsideQuote = isSelectionInsideBlockquote(state);
+
+    // Inside a blockquote (but not a list nested within one): the blockquote itself isn't a
+    // disallowing wrapper, but anything else is.
+    if (selectionInsideQuote && !selectionInsideList) {
+      return disallowedWrapperTypes.some(type => type !== blockquote);
+    }
+    return disallowedWrapperTypes.length > 0;
+  }
   if (editorExperiment('platform_editor_blockquote_in_text_formatting_menu', true)) {
     let hasQuote = false;
     let hasNestedListInQuote = false;
@@ -104,9 +129,9 @@ export function areBlockTypesDisabled(state, allowFontSize = false) {
       }
       return !hasNestedListInQuote;
     });
-    return nodesTypes.filter(type => !excludedTypes.includes(type)).length > 0 && (!hasQuote || hasNestedListInQuote);
+    return disallowedWrapperTypes.length > 0 && (!hasQuote || hasNestedListInQuote);
   }
-  return nodesTypes.filter(type => !excludedTypes.includes(type)).length > 0;
+  return disallowedWrapperTypes.length > 0;
 }
 
 /**
@@ -135,7 +160,36 @@ export function isSelectionInsideListNode(state) {
     }
     return true;
   });
-  return insideList;
+  return insideList || listNodeTypes.some(nodeType => hasParentNodeOfType(nodeType)(state.selection));
+}
+export function isSelectionInsideBlockquote(state) {
+  if (!state.selection) {
+    return false;
+  }
+  const {
+    $from,
+    $to
+  } = state.selection;
+  const {
+    blockquote
+  } = state.schema.nodes;
+
+  // For collapsed selections, check if the cursor is inside a blockquote
+  if ($from.pos === $to.pos) {
+    return hasParentNodeOfType(blockquote)(state.selection);
+  }
+
+  // For range selections, check if any node in the range is a blockquote,
+  // or if the selection starts/ends inside a blockquote
+  let insideQuote = false;
+  state.doc.nodesBetween($from.pos, $to.pos, node => {
+    if (node.type === blockquote) {
+      insideQuote = true;
+      return false;
+    }
+    return true;
+  });
+  return insideQuote || hasParentNodeOfType(blockquote)(state.selection);
 }
 const blockStylingIsPresent = state => {
   const {
@@ -244,8 +298,7 @@ export function convertTaskItemsToBlockTaskItems(tr, from, to) {
   const {
     nodes: {
       taskItem,
-      blockTaskItem,
-      paragraph
+      blockTaskItem
     }
   } = tr.doc.type.schema;
   if (!blockTaskItem || !taskItem) {
@@ -269,7 +322,11 @@ export function convertTaskItemsToBlockTaskItems(tr, from, to) {
       pos,
       node
     } = taskItemsToConvert[i];
-    const blockTaskNode = blockTaskItem.create(node.attrs, paragraph.create(null, node.content));
+    const blockTaskNode = createBlockTaskItem({
+      attrs: node.attrs,
+      content: node.content,
+      schema: tr.doc.type.schema
+    });
     tr.replaceWith(pos, pos + node.nodeSize, blockTaskNode);
   }
 }

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

@@ -104,7 +104,7 @@ export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi,
       });
     }
     if (name === 'smallText' && marks.fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
-      return setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi)({
+      return setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQuote)({
         tr: tr
       });
     }
@@ -117,7 +117,7 @@ export function setBlockTypeWithAnalytics(name, inputMethod, editorAnalyticsApi,
     return null;
   };
 }
-export function setSmallText() {
+export function setSmallText(fromBlockQuote) {
   return function (_ref5) {
     var tr = _ref5.tr;
     var _tr$doc$type$schema2 = tr.doc.type.schema,
@@ -127,39 +127,45 @@ export function setSmallText() {
       return null;
     }
     var selection = tr.selection;
-    if (selection instanceof CellSelection) {
+    var applySmallFontSize = createToggleBlockMarkOnRangeNext(fontSize, function () {
+      return {
+        fontSize: 'small'
+      };
+    }, [paragraph]);
+    if (fromBlockQuote) {
+      var $from = selection.$from,
+        $to = selection.$to;
+      var range = $from.blockRange($to);
+      if (!range) {
+        return tr;
+      }
+      var targetLiftDepth = liftTarget(range);
+      if (targetLiftDepth || targetLiftDepth === 0) {
+        tr.lift(range, targetLiftDepth);
+      }
+      var from = tr.mapping.map($from.pos);
+      var to = tr.mapping.map($to.pos);
+      tr.setBlockType(from, to, paragraph);
+      applySmallFontSize(from, to, tr);
+    } else if (selection instanceof CellSelection) {
       var mapFrom = tr.steps.length;
       selection.forEachCell(function (cell, pos) {
-        var mappedPos = tr.mapping.slice(mapFrom).map(pos);
-        tr.setBlockType(mappedPos, mappedPos + cell.nodeSize, paragraph);
-        convertTaskItemsToBlockTaskItems(tr, mappedPos, mappedPos + cell.nodeSize);
-        createToggleBlockMarkOnRangeNext(fontSize, function () {
-          return {
-            fontSize: 'small'
-          };
-        }, [paragraph])(mappedPos, mappedPos + cell.nodeSize, tr);
+        var from = tr.mapping.slice(mapFrom).map(pos);
+        var to = from + cell.nodeSize;
+        tr.setBlockType(from, to, paragraph);
+        convertTaskItemsToBlockTaskItems(tr, from, to);
+        applySmallFontSize(from, to, tr);
       });
     } else {
-      // Step 1. Convert headings to paragraphs (for non-task content)
       tr.setBlockType(selection.from, selection.to, paragraph);
-
-      // Step 2. Expand the selection range to include full list nodes
       var expandedRange = getSelectionRangeExpandedToLists(tr);
-
-      // Step 3. Convert taskItems → blockTaskItems so their content can hold the fontSize mark
       convertTaskItemsToBlockTaskItems(tr, expandedRange.from, expandedRange.to);
-
-      // Step 4. Apply fontSize mark to all paragraphs in range (including those inside new blockTaskItems)
-      createToggleBlockMarkOnRangeNext(fontSize, function () {
-        return {
-          fontSize: 'small'
-        };
-      }, [paragraph])(tr.mapping.map(expandedRange.from, -1), tr.mapping.map(expandedRange.to, 1), tr);
+      applySmallFontSize(tr.mapping.map(expandedRange.from, -1), tr.mapping.map(expandedRange.to, 1), tr);
     }
     return tr;
   };
 }
-export function setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi) {
+export function setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi, fromBlockQuote) {
   return withCurrentHeadingLevel(function (previousHeadingLevel) {
     return function (_ref6) {
       var tr = _ref6.tr;
@@ -173,7 +179,7 @@ export function setSmallTextWithAnalytics(inputMethod, editorAnalyticsApi) {
           previousBlockType: previousHeadingLevel !== undefined ? String(previousHeadingLevel) : undefined
         }
       })(tr);
-      return setSmallText()({
+      return setSmallText(fromBlockQuote)({
         tr: tr
       });
     };

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

@@ -1,15 +1,17 @@
 import { Slice, Fragment } from '@atlaskit/editor-prosemirror/model';
 import { findWrapping } from '@atlaskit/editor-prosemirror/transform';
-export function wrapSelectionInBlockType(nodeType) {
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+export function wrapSelectionInBlockType(_nodeType) {
   return function (_ref) {
     var tr = _ref.tr;
     var nodes = tr.doc.type.schema.nodes;
     var _tr$doc$type$schema$m = tr.doc.type.schema.marks,
       alignment = _tr$doc$type$schema$m.alignment,
-      indentation = _tr$doc$type$schema$m.indentation;
+      indentation = _tr$doc$type$schema$m.indentation,
+      fontSize = _tr$doc$type$schema$m.fontSize;
     if (nodes.paragraph && nodes.blockquote) {
-      /**Remove alignment and indentation marks from the selection */
-      var marksToRemove = [alignment, indentation];
+      /** Remove alignment, indentation, and unsupported blockquote marks from the selection */
+      var marksToRemove = expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? [alignment, indentation, fontSize] : [alignment, indentation];
       var hasMark = function hasMark(mark) {
         return marksToRemove.indexOf(mark.type) > -1;
       };

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

@@ -1,5 +1,7 @@
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
+import { createBlockTaskItem } from '@atlaskit/editor-common/transforms';
 import { createRule, createWrappingJoinRule } from '@atlaskit/editor-common/utils';
+import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/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';
@@ -46,7 +48,8 @@ function getSelectedWrapperNodes(state) {
   if (state.selection) {
     var _state$selection = state.selection,
       $from = _state$selection.$from,
-      $to = _state$selection.$to;
+      $to = _state$selection.$to,
+      empty = _state$selection.empty;
     var _state$schema$nodes = state.schema.nodes,
       blockquote = _state$schema$nodes.blockquote,
       panel = _state$schema$nodes.panel,
@@ -61,6 +64,15 @@ function getSelectedWrapperNodes(state) {
       taskList = _state$schema$nodes.taskList;
     var wrapperNodes = [blockquote, panel, orderedList, bulletList, listItem, codeBlock, decisionItem, decisionList, taskItem, taskList];
     wrapperNodes.push(caption);
+    if (empty && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+      for (var depth = 0; depth <= $from.depth; depth++) {
+        var node = $from.node(depth);
+        if (node.isBlock && wrapperNodes.indexOf(node.type) >= 0) {
+          nodes.push(node.type);
+        }
+      }
+      return nodes;
+    }
     state.doc.nodesBetween($from.pos, $to.pos, function (node) {
       if (node.isBlock && wrapperNodes.indexOf(node.type) >= 0) {
         nodes.push(node.type);
@@ -84,7 +96,24 @@ export function areBlockTypesDisabled(state) {
     listItem = _state$schema$nodes2.listItem,
     taskList = _state$schema$nodes2.taskList,
     taskItem = _state$schema$nodes2.taskItem;
-  var excludedTypes = allowFontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? [panel, bulletList, orderedList, listItem, taskList, taskItem] : [panel];
+  var isSmallFontSizeEnabled = allowFontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
+  var excludedTypes = isSmallFontSizeEnabled ? [panel, bulletList, orderedList, listItem, taskList, taskItem] : [panel];
+  var disallowedWrapperTypes = nodesTypes.filter(function (type) {
+    return !excludedTypes.includes(type);
+  });
+  if (isSmallFontSizeEnabled) {
+    var selectionInsideList = isSelectionInsideListNode(state);
+    var selectionInsideQuote = isSelectionInsideBlockquote(state);
+
+    // Inside a blockquote (but not a list nested within one): the blockquote itself isn't a
+    // disallowing wrapper, but anything else is.
+    if (selectionInsideQuote && !selectionInsideList) {
+      return disallowedWrapperTypes.some(function (type) {
+        return type !== blockquote;
+      });
+    }
+    return disallowedWrapperTypes.length > 0;
+  }
   if (editorExperiment('platform_editor_blockquote_in_text_formatting_menu', true)) {
     var hasQuote = false;
     var hasNestedListInQuote = false;
@@ -104,13 +133,9 @@ export function areBlockTypesDisabled(state) {
       }
       return !hasNestedListInQuote;
     });
-    return nodesTypes.filter(function (type) {
-      return !excludedTypes.includes(type);
-    }).length > 0 && (!hasQuote || hasNestedListInQuote);
+    return disallowedWrapperTypes.length > 0 && (!hasQuote || hasNestedListInQuote);
   }
-  return nodesTypes.filter(function (type) {
-    return !excludedTypes.includes(type);
-  }).length > 0;
+  return disallowedWrapperTypes.length > 0;
 }
 
 /**
@@ -137,12 +162,40 @@ export function isSelectionInsideListNode(state) {
     }
     return true;
   });
-  return insideList;
+  return insideList || listNodeTypes.some(function (nodeType) {
+    return hasParentNodeOfType(nodeType)(state.selection);
+  });
 }
-var blockStylingIsPresent = function blockStylingIsPresent(state) {
+export function isSelectionInsideBlockquote(state) {
+  if (!state.selection) {
+    return false;
+  }
   var _state$selection4 = state.selection,
-    from = _state$selection4.from,
-    to = _state$selection4.to;
+    $from = _state$selection4.$from,
+    $to = _state$selection4.$to;
+  var blockquote = state.schema.nodes.blockquote;
+
+  // For collapsed selections, check if the cursor is inside a blockquote
+  if ($from.pos === $to.pos) {
+    return hasParentNodeOfType(blockquote)(state.selection);
+  }
+
+  // For range selections, check if any node in the range is a blockquote,
+  // or if the selection starts/ends inside a blockquote
+  var insideQuote = false;
+  state.doc.nodesBetween($from.pos, $to.pos, function (node) {
+    if (node.type === blockquote) {
+      insideQuote = true;
+      return false;
+    }
+    return true;
+  });
+  return insideQuote || hasParentNodeOfType(blockquote)(state.selection);
+}
+var blockStylingIsPresent = function blockStylingIsPresent(state) {
+  var _state$selection5 = state.selection,
+    from = _state$selection5.from,
+    to = _state$selection5.to;
   var isBlockStyling = false;
   state.doc.nodesBetween(from, to, function (node) {
     if (FORMATTING_NODE_TYPES.indexOf(node.type.name) !== -1) {
@@ -156,9 +209,9 @@ var blockStylingIsPresent = function blockStylingIsPresent(state) {
 var marksArePresent = function marksArePresent(state) {
   var activeMarkTypes = FORMATTING_MARK_TYPES.filter(function (mark) {
     if (!!state.schema.marks[mark]) {
-      var _state$selection5 = state.selection,
-        $from = _state$selection5.$from,
-        empty = _state$selection5.empty;
+      var _state$selection6 = state.selection,
+        $from = _state$selection6.$from,
+        empty = _state$selection6.empty;
       var marks = state.schema.marks;
       if (empty) {
         return !!marks[mark].isInSet(state.storedMarks || $from.marks());
@@ -240,8 +293,7 @@ export function getSelectionRangeExpandedToLists(tr) {
 export function convertTaskItemsToBlockTaskItems(tr, from, to) {
   var _tr$doc$type$schema$n2 = tr.doc.type.schema.nodes,
     taskItem = _tr$doc$type$schema$n2.taskItem,
-    blockTaskItem = _tr$doc$type$schema$n2.blockTaskItem,
-    paragraph = _tr$doc$type$schema$n2.paragraph;
+    blockTaskItem = _tr$doc$type$schema$n2.blockTaskItem;
   if (!blockTaskItem || !taskItem) {
     return;
   }
@@ -262,7 +314,11 @@ export function convertTaskItemsToBlockTaskItems(tr, from, to) {
     var _taskItemsToConvert$i = taskItemsToConvert[i],
       pos = _taskItemsToConvert$i.pos,
       node = _taskItemsToConvert$i.node;
-    var blockTaskNode = blockTaskItem.create(node.attrs, paragraph.create(null, node.content));
+    var blockTaskNode = createBlockTaskItem({
+      attrs: node.attrs,
+      content: node.content,
+      schema: tr.doc.type.schema
+    });
     tr.replaceWith(pos, pos + node.nodeSize, blockTaskNode);
   }
 }

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

@@ -6,8 +6,8 @@ export type ClearFormattingInputMethod = INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHO
 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 setSmallText(): EditorCommand;
-export declare function setSmallTextWithAnalytics(inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined): EditorCommand;
+export declare function setSmallText(fromBlockQuote?: boolean): EditorCommand;
+export declare function setSmallTextWithAnalytics(inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined, fromBlockQuote?: boolean): EditorCommand;
 export declare function setNormalText(fromBlockQuote?: boolean): EditorCommand;
 export declare function clearFormatting(inputMethod: ClearFormattingInputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined): EditorCommand;
 export declare function setNormalTextWithAnalytics(inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined, fromBlockQuote?: boolean): EditorCommand;

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

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

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

@@ -19,6 +19,7 @@ export declare function areBlockTypesDisabled(state: EditorState, allowFontSize?
  * Used to determine which text styles should be enabled when the small font size experiment is active.
  */
 export declare function isSelectionInsideListNode(state: EditorState): boolean;
+export declare function isSelectionInsideBlockquote(state: EditorState): boolean;
 export declare const checkFormattingIsPresent: (state: EditorState) => boolean;
 export declare const hasBlockQuoteInOptions: (dropdownOptions: BlockType[]) => boolean;
 /**

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

@@ -6,8 +6,8 @@ export type ClearFormattingInputMethod = INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHO
 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 setSmallText(): EditorCommand;
-export declare function setSmallTextWithAnalytics(inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined): EditorCommand;
+export declare function setSmallText(fromBlockQuote?: boolean): EditorCommand;
+export declare function setSmallTextWithAnalytics(inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined, fromBlockQuote?: boolean): EditorCommand;
 export declare function setNormalText(fromBlockQuote?: boolean): EditorCommand;
 export declare function clearFormatting(inputMethod: ClearFormattingInputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined): EditorCommand;
 export declare function setNormalTextWithAnalytics(inputMethod: InputMethod, editorAnalyticsApi: EditorAnalyticsAPI | undefined, fromBlockQuote?: boolean): EditorCommand;

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

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

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

@@ -19,6 +19,7 @@ export declare function areBlockTypesDisabled(state: EditorState, allowFontSize?
  * Used to determine which text styles should be enabled when the small font size experiment is active.
  */
 export declare function isSelectionInsideListNode(state: EditorState): boolean;
+export declare function isSelectionInsideBlockquote(state: EditorState): boolean;
 export declare const checkFormattingIsPresent: (state: EditorState) => boolean;
 export declare const hasBlockQuoteInOptions: (dropdownOptions: BlockType[]) => boolean;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-type",
-	"version": "12.1.19",
+	"version": "12.1.21",
 	"description": "BlockType plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -43,20 +43,20 @@
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.20.0",
 		"@atlaskit/editor-toolbar-model": "^0.4.0",
-		"@atlaskit/icon": "^33.1.0",
+		"@atlaskit/icon": "^34.0.0",
 		"@atlaskit/icon-lab": "^6.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^18.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
 		"@atlaskit/prosemirror-input-rules": "^3.6.0",
-		"@atlaskit/tmp-editor-statsig": "^52.0.0",
+		"@atlaskit/tmp-editor-statsig": "^53.0.0",
 		"@atlaskit/tokens": "^11.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.13.0",
+		"@atlaskit/editor-common": "^112.15.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"