@atlaskit/editor-plugin-tasks-and-decisions 11.3.6 → 11.4.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-tasks-and-decisions
 
+## 11.4.0
+
+### Minor Changes
+
+- [`b749ce678d575`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b749ce678d575) -
+  Preserve small text formatting across list and task list edits
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 11.3.6
 
 ### Patch Changes

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

@@ -5,9 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.wrapSelectionInTaskList = exports.liftSelection = exports.joinAtCut = void 0;
 var _commands = require("@atlaskit/editor-common/commands");
+var _lists = require("@atlaskit/editor-common/lists");
+var _transforms = require("@atlaskit/editor-common/transforms");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _helpers = require("./helpers");
 var _utils = require("./utils");
+var _paste = require("./utils/paste");
 var liftSelection = exports.liftSelection = function liftSelection(state, dispatch) {
   var normalizedSelection = (0, _utils.normalizeTaskItemsSelection)(state.selection);
   var $from = normalizedSelection.$from,
@@ -94,6 +98,7 @@ var joinAtCut = exports.joinAtCut = function joinAtCut($pos) {
   return function (state, dispatch) {
     var $cut = (0, _commands.findCutBefore)($pos);
     var blockTaskItem = state.schema.nodes.blockTaskItem;
+    var fontSize = state.schema.marks.fontSize;
     if (!$cut) {
       return false;
     }
@@ -143,6 +148,21 @@ var joinAtCut = exports.joinAtCut = function joinAtCut($pos) {
       // see https://prosemirror.net/docs/ref/#transform.ReplaceStep.constructor
       // see https://prosemirror.net/docs/ref/#transform.ReplaceAroundStep.constructor
       var tr = state.tr.step(new _transform.ReplaceAroundStep(from, to, gapFrom, gapTo, slice, insert, true));
+      if (fontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
+        var targetTaskListSmallTextAttrs = (0, _lists.getFirstParagraphBlockMarkAttrs)($cut.nodeBefore, fontSize);
+        var followingListPos = $cut.pos + $cut.nodeAfter.nodeSize;
+        var followingListNode = state.doc.resolve(followingListPos).nodeAfter;
+        if (followingListNode && (0, _transforms.isTaskList)(followingListNode.type)) {
+          var normalizedListNode = (0, _paste.normalizeNodeForTaskTextSize)(followingListNode, state.schema, targetTaskListSmallTextAttrs)[0];
+          if (normalizedListNode && normalizedListNode !== followingListNode) {
+            var mappedFollowingListPos = tr.mapping.map(followingListPos);
+            var currentFollowingListNode = tr.doc.nodeAt(mappedFollowingListPos);
+            if (currentFollowingListNode) {
+              tr = tr.replaceWith(mappedFollowingListPos, mappedFollowingListPos + currentFollowingListNode.nodeSize, normalizedListNode);
+            }
+          }
+        }
+      }
       if (dispatch) {
         dispatch(tr);
       }

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

@@ -12,6 +12,7 @@ var _steps = require("@atlaskit/adf-schema/steps");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
+var _lists = require("@atlaskit/editor-common/lists");
 var _selection = require("@atlaskit/editor-common/selection");
 var _utils = require("@atlaskit/editor-common/utils");
 var _commands = require("@atlaskit/editor-prosemirror/commands");
@@ -497,14 +498,40 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
 var creatParentListItemFragement = function creatParentListItemFragement(state) {
   return state.schema.nodes.listItem.create({}, state.schema.nodes.paragraph.create());
 };
-var splitListItem = function splitListItem(state, dispatch) {
-  var tr = state.tr,
-    $from = state.selection.$from;
+var getCurrentBlockTaskFontSizeAttrs = function getCurrentBlockTaskFontSizeAttrs(state, $from) {
+  if (!(0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
+    return false;
+  }
+  var fontSize = state.schema.marks.fontSize;
+  if (!fontSize) {
+    return false;
+  }
+  var result = (0, _utils3.findBlockTaskItem)($from);
+  if (!result) {
+    return false;
+  }
+  return result.hasParagraph ? (0, _lists.getBlockMarkAttrs)($from.parent, fontSize) : (0, _lists.getFirstParagraphBlockMarkAttrs)(result.blockTaskItemNode, fontSize);
+};
+var createTaskItemForCurrentTextSize = function createTaskItemForCurrentTextSize(state, attrs, fontSizeAttrs) {
   var _state$schema$nodes5 = state.schema.nodes,
-    listItem = _state$schema$nodes5.listItem,
-    blockTaskItem = _state$schema$nodes5.blockTaskItem,
     taskItem = _state$schema$nodes5.taskItem,
+    blockTaskItem = _state$schema$nodes5.blockTaskItem,
     paragraph = _state$schema$nodes5.paragraph;
+  var fontSize = state.schema.marks.fontSize;
+  if (fontSizeAttrs && blockTaskItem && paragraph && fontSize) {
+    return blockTaskItem.createChecked(attrs, paragraph.createChecked({}, undefined, [fontSize.create(fontSizeAttrs)]));
+  }
+  return taskItem.createAndFill(attrs);
+};
+var splitListItem = function splitListItem(state, dispatch) {
+  var tr = state.tr,
+    $from = state.selection.$from;
+  var _state$schema$nodes6 = state.schema.nodes,
+    listItem = _state$schema$nodes6.listItem,
+    blockTaskItem = _state$schema$nodes6.blockTaskItem,
+    taskItem = _state$schema$nodes6.taskItem,
+    paragraph = _state$schema$nodes6.paragraph;
+  var currentBlockTaskFontSizeAttrs = getCurrentBlockTaskFontSizeAttrs(state, $from);
   if (actionDecisionFollowsOrNothing($from)) {
     if (dispatch) {
       // If previous node is a blockTaskItem we just want to delete the existing node and replace it with a paragraph
@@ -523,7 +550,11 @@ var splitListItem = function splitListItem(state, dispatch) {
         dispatch(splitListItemWith(tr, creatParentListItemFragement(state), $from, true));
         return true;
       }
-      dispatch(splitListItemWith(tr, paragraph.createChecked(), $from, true));
+      var splitTr = splitListItemWith(tr, paragraph.createChecked(), $from, true);
+      if (currentBlockTaskFontSizeAttrs) {
+        (0, _lists.reconcileBlockMarkForParagraphAtPos)(splitTr, splitTr.selection.from, state.schema.marks.fontSize, currentBlockTaskFontSizeAttrs);
+      }
+      dispatch(splitTr);
     }
     return true;
   }
@@ -591,11 +622,12 @@ var enter = function enter(editorAnalyticsAPI, getContextIdentifier) {
         // If the selection is a gap cursor at the end of the blockTaskItem,
         // we should insert a new taskItem.
         if ((!$from.parent.isTextblock || (0, _helpers.isInLastTextblockOfBlockTaskItem)(state)) && $from.parentOffset === $from.parent.nodeSize - 2) {
-          var _newTaskItem = taskItem.createAndFill({
+          var _currentBlockTaskFontSizeAttrs = getCurrentBlockTaskFontSizeAttrs(state, $from);
+          var newTaskNode = createTaskItemForCurrentTextSize(state, {
             localId: itemLocalId
-          });
-          if (_newTaskItem) {
-            tr.insert(_blockTaskItemNode.pos + _blockTaskItemNode.node.nodeSize, _newTaskItem);
+          }, _currentBlockTaskFontSizeAttrs);
+          if (newTaskNode) {
+            tr.insert(_blockTaskItemNode.pos + _blockTaskItemNode.node.nodeSize, newTaskNode);
 
             // Move the cursor to the end of the newly inserted blockTaskItem
             tr.setSelection(_state2.TextSelection.create(tr.doc, _blockTaskItemNode.pos + _blockTaskItemNode.node.nodeSize + 1));
@@ -604,12 +636,17 @@ var enter = function enter(editorAnalyticsAPI, getContextIdentifier) {
         }
 
         // Split near the depth of the current selection
-        return tr.split($from.pos, $from !== null && $from !== void 0 && (_$from$parent = $from.parent) !== null && _$from$parent !== void 0 && _$from$parent.isTextblock ? 2 : 1, [{
+        var splitTr = tr.split($from.pos, $from !== null && $from !== void 0 && (_$from$parent = $from.parent) !== null && _$from$parent !== void 0 && _$from$parent.isTextblock ? 2 : 1, [{
           type: blockTaskItem,
           attrs: {
             localId: itemLocalId
           }
         }]);
+        var currentBlockTaskFontSizeAttrs = getCurrentBlockTaskFontSizeAttrs(state, $from);
+        if (currentBlockTaskFontSizeAttrs) {
+          (0, _lists.reconcileBlockMarkForParagraphAtPos)(splitTr, splitTr.selection.from, state.schema.marks.fontSize, currentBlockTaskFontSizeAttrs);
+        }
+        return splitTr;
       }
       return tr.split($from.pos, 1, [{
         type: nodeType,

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

@@ -1,11 +1,16 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.tempTransformSliceToRemoveBlockTaskItem = void 0;
+exports.tempTransformSliceToRemoveBlockTaskItem = exports.normalizeNodeForTaskTextSize = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _adfSchema = require("@atlaskit/adf-schema");
+var _lists = require("@atlaskit/editor-common/lists");
+var _transforms = require("@atlaskit/editor-common/transforms");
 var _model = require("@atlaskit/editor-prosemirror/model");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 /**
  * Transforms a paste slice to handle blockTaskItem nodes when pasting into task items.
  *
@@ -25,54 +30,167 @@ var _model = require("@atlaskit/editor-prosemirror/model");
  *
  * @see {@link https://hello.atlassian.net/wiki/spaces/EDITOR/pages/5626622054/Block+elements+in+task+-+Decision+log#Can-users-create-block-task-items%3F} for reasoning
  */
-var tempTransformSliceToRemoveBlockTaskItem = exports.tempTransformSliceToRemoveBlockTaskItem = function tempTransformSliceToRemoveBlockTaskItem(slice, view) {
-  var schema = view.state.schema;
+var getTaskPasteContext = function getTaskPasteContext(view) {
+  var _schema$marks;
+  var _view$state = view.state,
+    schema = _view$state.schema,
+    selection = _view$state.selection;
   var _schema$nodes = schema.nodes,
     taskItem = _schema$nodes.taskItem,
     blockTaskItem = _schema$nodes.blockTaskItem,
     paragraph = _schema$nodes.paragraph;
-
-  // Check if we're pasting into a taskItem
-  var $from = view.state.selection.$from;
-  var isInTaskItem = $from.node().type === taskItem;
-  if (isInTaskItem && blockTaskItem) {
-    // Transform the slice to replace blockTaskItems with taskItems
+  var fontSize = (_schema$marks = schema.marks) === null || _schema$marks === void 0 ? void 0 : _schema$marks.fontSize;
+  var $from = selection.$from;
+  var currentParent = $from.parent;
+  var currentNode = typeof $from.node === 'function' ? $from.node() : undefined;
+  if ((currentParent === null || currentParent === void 0 ? void 0 : currentParent.type) === taskItem || (currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === taskItem) {
+    return {
+      isInTaskContext: true,
+      smallTextAttrs: false
+    };
+  }
+  if (!blockTaskItem) {
+    return {
+      isInTaskContext: false,
+      smallTextAttrs: false
+    };
+  }
+  if ((currentParent === null || currentParent === void 0 ? void 0 : currentParent.type) === blockTaskItem || (currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === blockTaskItem) {
+    return {
+      isInTaskContext: true,
+      smallTextAttrs: fontSize ? (0, _lists.getFirstParagraphBlockMarkAttrs)(currentParent !== null && currentParent !== void 0 ? currentParent : currentNode, fontSize) : false
+    };
+  }
+  if ((currentParent === null || currentParent === void 0 ? void 0 : currentParent.type) === paragraph && $from.depth > 0 && $from.node($from.depth - 1).type === blockTaskItem) {
+    return {
+      isInTaskContext: true,
+      smallTextAttrs: fontSize ? (0, _lists.getBlockMarkAttrs)(currentParent, fontSize) : false
+    };
+  }
+  return {
+    isInTaskContext: false,
+    smallTextAttrs: false
+  };
+};
+var convertTaskItemToBlockTaskItem = function convertTaskItemToBlockTaskItem(node, schema, smallTextAttrs) {
+  var _schema$nodes2 = schema.nodes,
+    blockTaskItem = _schema$nodes2.blockTaskItem,
+    paragraph = _schema$nodes2.paragraph;
+  var fontSize = schema.marks.fontSize;
+  return blockTaskItem.create(node.attrs, paragraph.createChecked({}, node.content, [fontSize.create(smallTextAttrs)]));
+};
+var addSmallTextToBlockTaskItem = function addSmallTextToBlockTaskItem(node, schema, smallTextAttrs) {
+  var paragraph = schema.nodes.paragraph;
+  var fontSize = schema.marks.fontSize;
+  var newContent = [];
+  node.content.forEach(function (child) {
+    if (child.type === paragraph) {
+      newContent.push(paragraph.createChecked(child.attrs, child.content, child.marks.filter(function (mark) {
+        return mark.type !== fontSize;
+      }).concat(fontSize.create(smallTextAttrs))));
+    } else {
+      newContent.push(child);
+    }
+  });
+  return node.type.create(node.attrs, newContent);
+};
+var normalizeBlockTaskItemToTaskItems = function normalizeBlockTaskItemToTaskItems(node, schema) {
+  var _schema$nodes3 = schema.nodes,
+    taskItem = _schema$nodes3.taskItem,
+    blockTaskItem = _schema$nodes3.blockTaskItem,
+    paragraph = _schema$nodes3.paragraph;
+  if (!blockTaskItem || node.type !== blockTaskItem) {
+    return [node];
+  }
+  var allChildrenAreParagraphs = true;
+  node.content.forEach(function (child) {
+    if (child.type !== paragraph) {
+      allChildrenAreParagraphs = false;
+    }
+  });
+  if (allChildrenAreParagraphs && node.childCount > 0) {
     var transformedContent = [];
-    slice.content.forEach(function (node) {
-      if (node.type === blockTaskItem) {
-        // Check if blockTaskItem only contains paragraphs
-        var allChildrenAreParagraphs = true;
-        node.content.forEach(function (child) {
-          if (child.type !== paragraph) {
-            allChildrenAreParagraphs = false;
-          }
-        });
-        if (allChildrenAreParagraphs && node.childCount > 0) {
-          // Convert each paragraph to a taskItem
-          node.content.forEach(function (paragraphNode) {
-            var newTaskItem = taskItem.create({
-              localId: _adfSchema.uuid.generate(),
-              state: node.attrs.state || 'TODO'
-            }, paragraphNode.content);
-            transformedContent.push(newTaskItem);
-          });
-        } else {
-          // Keep the blockTaskItem as is if it doesn't only contain paragraphs
-          transformedContent.push(node);
-        }
-      } else {
-        // Keep other nodes as is
-        transformedContent.push(node);
-      }
+    node.content.forEach(function (paragraphNode) {
+      transformedContent.push(taskItem.create({
+        localId: _adfSchema.uuid.generate(),
+        state: node.attrs.state || 'TODO'
+      }, paragraphNode.content));
     });
-
-    // Create new slice with transformed content
-    if (transformedContent.length !== slice.content.childCount || transformedContent.some(function (node, idx) {
-      return node !== slice.content.child(idx);
-    })) {
-      var newFragment = _model.Fragment.from(transformedContent);
-      return new _model.Slice(newFragment, slice.openStart, slice.openEnd);
-    }
+    return transformedContent;
+  }
+  return [node];
+};
+var transformSliceContent = function transformSliceContent(slice, transformNode) {
+  var transformedContent = [];
+  slice.content.forEach(function (node) {
+    transformedContent.push.apply(transformedContent, (0, _toConsumableArray2.default)(transformNode(node)));
+  });
+  if (transformedContent.length !== slice.content.childCount || transformedContent.some(function (node, idx) {
+    return node !== slice.content.child(idx);
+  })) {
+    var newFragment = _model.Fragment.from(transformedContent);
+    return new _model.Slice(newFragment, slice.openStart, slice.openEnd);
   }
   return slice;
+};
+var transformSliceToRemoveBlockTaskItemLegacy = function transformSliceToRemoveBlockTaskItemLegacy(slice, view) {
+  var schema = view.state.schema;
+  var _schema$nodes4 = schema.nodes,
+    taskItem = _schema$nodes4.taskItem,
+    blockTaskItem = _schema$nodes4.blockTaskItem;
+  var isInTaskItem = view.state.selection.$from.node().type === taskItem;
+  if (!isInTaskItem || !blockTaskItem) {
+    return slice;
+  }
+  return transformSliceContent(slice, function (node) {
+    return normalizeBlockTaskItemToTaskItems(node, schema);
+  });
+};
+var _normalizeNodeForTaskTextSize = exports.normalizeNodeForTaskTextSize = function normalizeNodeForTaskTextSize(node, schema, smallTextAttrs) {
+  var _schema$nodes5 = schema.nodes,
+    taskList = _schema$nodes5.taskList,
+    taskItem = _schema$nodes5.taskItem,
+    blockTaskItem = _schema$nodes5.blockTaskItem;
+  var fontSize = schema.marks.fontSize;
+  if (!smallTextAttrs) {
+    return [node];
+  }
+  if ((0, _transforms.isTaskList)(node.type)) {
+    var transformedChildren = [];
+    node.content.forEach(function (child) {
+      transformedChildren.push.apply(transformedChildren, (0, _toConsumableArray2.default)(_normalizeNodeForTaskTextSize(child, schema, smallTextAttrs)));
+    });
+    return [taskList.create(node.attrs, transformedChildren)];
+  }
+  if (blockTaskItem && fontSize) {
+    if (node.type === taskItem) {
+      return [convertTaskItemToBlockTaskItem(node, schema, smallTextAttrs)];
+    }
+    if (node.type === blockTaskItem) {
+      return [addSmallTextToBlockTaskItem(node, schema, smallTextAttrs)];
+    }
+  }
+  return [node];
+};
+var normalizeNodeForTaskPaste = function normalizeNodeForTaskPaste(node, schema, smallTextAttrs) {
+  if (smallTextAttrs) {
+    return _normalizeNodeForTaskTextSize(node, schema, smallTextAttrs);
+  }
+  return normalizeBlockTaskItemToTaskItems(node, schema);
+};
+var tempTransformSliceToRemoveBlockTaskItem = exports.tempTransformSliceToRemoveBlockTaskItem = function tempTransformSliceToRemoveBlockTaskItem(slice, view) {
+  var fontSizeExperimentEnabled = (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true);
+  if (!fontSizeExperimentEnabled) {
+    return transformSliceToRemoveBlockTaskItemLegacy(slice, view);
+  }
+  var blockTaskItem = view.state.schema.nodes.blockTaskItem;
+  var _getTaskPasteContext = getTaskPasteContext(view),
+    isInTaskContext = _getTaskPasteContext.isInTaskContext,
+    smallTextAttrs = _getTaskPasteContext.smallTextAttrs;
+  if (!isInTaskContext || !blockTaskItem) {
+    return slice;
+  }
+  return transformSliceContent(slice, function (node) {
+    return normalizeNodeForTaskPaste(node, view.state.schema, smallTextAttrs);
+  });
 };

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

@@ -1,7 +1,11 @@
 import { findCutBefore } from '@atlaskit/editor-common/commands';
+import { getFirstParagraphBlockMarkAttrs } from '@atlaskit/editor-common/lists';
+import { isTaskList } from '@atlaskit/editor-common/transforms';
 import { findWrapping, ReplaceAroundStep } from '@atlaskit/editor-prosemirror/transform';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getBlockRange, isActionOrDecisionItem, isActionOrDecisionList, liftBlock, subtreeHeight } from './helpers';
 import { findBlockTaskItem, normalizeTaskItemsSelection } from './utils';
+import { normalizeNodeForTaskTextSize } from './utils/paste';
 export const liftSelection = (state, dispatch) => {
   const normalizedSelection = normalizeTaskItemsSelection(state.selection);
   const {
@@ -95,6 +99,9 @@ export const joinAtCut = $pos => (state, dispatch) => {
   const {
     blockTaskItem
   } = state.schema.nodes;
+  const {
+    fontSize
+  } = state.schema.marks;
   if (!$cut) {
     return false;
   }
@@ -145,7 +152,22 @@ export const joinAtCut = $pos => (state, dispatch) => {
     //
     // see https://prosemirror.net/docs/ref/#transform.ReplaceStep.constructor
     // see https://prosemirror.net/docs/ref/#transform.ReplaceAroundStep.constructor
-    const tr = state.tr.step(new ReplaceAroundStep(from, to, gapFrom, gapTo, slice, insert, true));
+    let tr = state.tr.step(new ReplaceAroundStep(from, to, gapFrom, gapTo, slice, insert, true));
+    if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+      const targetTaskListSmallTextAttrs = getFirstParagraphBlockMarkAttrs($cut.nodeBefore, fontSize);
+      const followingListPos = $cut.pos + $cut.nodeAfter.nodeSize;
+      const followingListNode = state.doc.resolve(followingListPos).nodeAfter;
+      if (followingListNode && isTaskList(followingListNode.type)) {
+        const normalizedListNode = normalizeNodeForTaskTextSize(followingListNode, state.schema, targetTaskListSmallTextAttrs)[0];
+        if (normalizedListNode && normalizedListNode !== followingListNode) {
+          const mappedFollowingListPos = tr.mapping.map(followingListPos);
+          const currentFollowingListNode = tr.doc.nodeAt(mappedFollowingListPos);
+          if (currentFollowingListNode) {
+            tr = tr.replaceWith(mappedFollowingListPos, mappedFollowingListPos + currentFollowingListNode.nodeSize, normalizedListNode);
+          }
+        }
+      }
+    }
     if (dispatch) {
       dispatch(tr);
     }

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

@@ -3,6 +3,7 @@ import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INDENT_DIRECTION, INDENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { toggleTaskItemCheckbox, toggleTaskList as toggleTaskListKeymap } from '@atlaskit/editor-common/keymaps';
+import { getBlockMarkAttrs, getFirstParagraphBlockMarkAttrs, reconcileBlockMarkForParagraphAtPos } from '@atlaskit/editor-common/lists';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { deleteEmptyParagraphAndMoveBlockUp, filterCommand as filter, isEmptySelectionAtEnd, isEmptySelectionAtStart } from '@atlaskit/editor-common/utils';
 import { autoJoin, chainCommands } from '@atlaskit/editor-prosemirror/commands';
@@ -477,6 +478,36 @@ const splitListItemWith = (tr, content, $from, setSelection) => {
 const creatParentListItemFragement = state => {
   return state.schema.nodes.listItem.create({}, state.schema.nodes.paragraph.create());
 };
+const getCurrentBlockTaskFontSizeAttrs = (state, $from) => {
+  if (!expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+    return false;
+  }
+  const {
+    fontSize
+  } = state.schema.marks;
+  if (!fontSize) {
+    return false;
+  }
+  const result = findBlockTaskItem($from);
+  if (!result) {
+    return false;
+  }
+  return result.hasParagraph ? getBlockMarkAttrs($from.parent, fontSize) : getFirstParagraphBlockMarkAttrs(result.blockTaskItemNode, fontSize);
+};
+const createTaskItemForCurrentTextSize = (state, attrs, fontSizeAttrs) => {
+  const {
+    taskItem,
+    blockTaskItem,
+    paragraph
+  } = state.schema.nodes;
+  const {
+    fontSize
+  } = state.schema.marks;
+  if (fontSizeAttrs && blockTaskItem && paragraph && fontSize) {
+    return blockTaskItem.createChecked(attrs, paragraph.createChecked({}, undefined, [fontSize.create(fontSizeAttrs)]));
+  }
+  return taskItem.createAndFill(attrs);
+};
 const splitListItem = (state, dispatch) => {
   const {
     tr,
@@ -490,6 +521,7 @@ const splitListItem = (state, dispatch) => {
     taskItem,
     paragraph
   } = state.schema.nodes;
+  const currentBlockTaskFontSizeAttrs = getCurrentBlockTaskFontSizeAttrs(state, $from);
   if (actionDecisionFollowsOrNothing($from)) {
     if (dispatch) {
       // If previous node is a blockTaskItem we just want to delete the existing node and replace it with a paragraph
@@ -508,7 +540,11 @@ const splitListItem = (state, dispatch) => {
         dispatch(splitListItemWith(tr, creatParentListItemFragement(state), $from, true));
         return true;
       }
-      dispatch(splitListItemWith(tr, paragraph.createChecked(), $from, true));
+      const splitTr = splitListItemWith(tr, paragraph.createChecked(), $from, true);
+      if (currentBlockTaskFontSizeAttrs) {
+        reconcileBlockMarkForParagraphAtPos(splitTr, splitTr.selection.from, state.schema.marks.fontSize, currentBlockTaskFontSizeAttrs);
+      }
+      dispatch(splitTr);
     }
     return true;
   }
@@ -581,11 +617,12 @@ const enter = (editorAnalyticsAPI, getContextIdentifier) => filter(isInsideTaskO
       // If the selection is a gap cursor at the end of the blockTaskItem,
       // we should insert a new taskItem.
       if ((!$from.parent.isTextblock || isInLastTextblockOfBlockTaskItem(state)) && $from.parentOffset === $from.parent.nodeSize - 2) {
-        const newTaskItem = taskItem.createAndFill({
+        const currentBlockTaskFontSizeAttrs = getCurrentBlockTaskFontSizeAttrs(state, $from);
+        const newTaskNode = createTaskItemForCurrentTextSize(state, {
           localId: itemLocalId
-        });
-        if (newTaskItem) {
-          tr.insert(blockTaskItemNode.pos + blockTaskItemNode.node.nodeSize, newTaskItem);
+        }, currentBlockTaskFontSizeAttrs);
+        if (newTaskNode) {
+          tr.insert(blockTaskItemNode.pos + blockTaskItemNode.node.nodeSize, newTaskNode);
 
           // Move the cursor to the end of the newly inserted blockTaskItem
           tr.setSelection(TextSelection.create(tr.doc, blockTaskItemNode.pos + blockTaskItemNode.node.nodeSize + 1));
@@ -594,12 +631,17 @@ const enter = (editorAnalyticsAPI, getContextIdentifier) => filter(isInsideTaskO
       }
 
       // Split near the depth of the current selection
-      return tr.split($from.pos, $from !== null && $from !== void 0 && (_$from$parent = $from.parent) !== null && _$from$parent !== void 0 && _$from$parent.isTextblock ? 2 : 1, [{
+      const splitTr = tr.split($from.pos, $from !== null && $from !== void 0 && (_$from$parent = $from.parent) !== null && _$from$parent !== void 0 && _$from$parent.isTextblock ? 2 : 1, [{
         type: blockTaskItem,
         attrs: {
           localId: itemLocalId
         }
       }]);
+      const currentBlockTaskFontSizeAttrs = getCurrentBlockTaskFontSizeAttrs(state, $from);
+      if (currentBlockTaskFontSizeAttrs) {
+        reconcileBlockMarkForParagraphAtPos(splitTr, splitTr.selection.from, state.schema.marks.fontSize, currentBlockTaskFontSizeAttrs);
+      }
+      return splitTr;
     }
     return tr.split($from.pos, 1, [{
       type: nodeType,

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

@@ -1,5 +1,9 @@
 import { uuid } from '@atlaskit/adf-schema';
+import { getBlockMarkAttrs, getFirstParagraphBlockMarkAttrs } from '@atlaskit/editor-common/lists';
+import { isTaskList } from '@atlaskit/editor-common/transforms';
 import { Slice, Fragment } from '@atlaskit/editor-prosemirror/model';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+
 /**
  * Transforms a paste slice to handle blockTaskItem nodes when pasting into task items.
  *
@@ -19,57 +23,180 @@ import { Slice, Fragment } from '@atlaskit/editor-prosemirror/model';
  *
  * @see {@link https://hello.atlassian.net/wiki/spaces/EDITOR/pages/5626622054/Block+elements+in+task+-+Decision+log#Can-users-create-block-task-items%3F} for reasoning
  */
-export const tempTransformSliceToRemoveBlockTaskItem = (slice, view) => {
+const getTaskPasteContext = view => {
+  var _schema$marks;
   const {
-    schema
+    schema,
+    selection
   } = view.state;
   const {
     taskItem,
     blockTaskItem,
     paragraph
   } = schema.nodes;
-
-  // Check if we're pasting into a taskItem
+  const fontSize = (_schema$marks = schema.marks) === null || _schema$marks === void 0 ? void 0 : _schema$marks.fontSize;
   const {
     $from
-  } = view.state.selection;
-  const isInTaskItem = $from.node().type === taskItem;
-  if (isInTaskItem && blockTaskItem) {
-    // Transform the slice to replace blockTaskItems with taskItems
+  } = selection;
+  const currentParent = $from.parent;
+  const currentNode = typeof $from.node === 'function' ? $from.node() : undefined;
+  if ((currentParent === null || currentParent === void 0 ? void 0 : currentParent.type) === taskItem || (currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === taskItem) {
+    return {
+      isInTaskContext: true,
+      smallTextAttrs: false
+    };
+  }
+  if (!blockTaskItem) {
+    return {
+      isInTaskContext: false,
+      smallTextAttrs: false
+    };
+  }
+  if ((currentParent === null || currentParent === void 0 ? void 0 : currentParent.type) === blockTaskItem || (currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === blockTaskItem) {
+    return {
+      isInTaskContext: true,
+      smallTextAttrs: fontSize ? getFirstParagraphBlockMarkAttrs(currentParent !== null && currentParent !== void 0 ? currentParent : currentNode, fontSize) : false
+    };
+  }
+  if ((currentParent === null || currentParent === void 0 ? void 0 : currentParent.type) === paragraph && $from.depth > 0 && $from.node($from.depth - 1).type === blockTaskItem) {
+    return {
+      isInTaskContext: true,
+      smallTextAttrs: fontSize ? getBlockMarkAttrs(currentParent, fontSize) : false
+    };
+  }
+  return {
+    isInTaskContext: false,
+    smallTextAttrs: false
+  };
+};
+const convertTaskItemToBlockTaskItem = (node, schema, smallTextAttrs) => {
+  const {
+    blockTaskItem,
+    paragraph
+  } = schema.nodes;
+  const {
+    fontSize
+  } = schema.marks;
+  return blockTaskItem.create(node.attrs, paragraph.createChecked({}, node.content, [fontSize.create(smallTextAttrs)]));
+};
+const addSmallTextToBlockTaskItem = (node, schema, smallTextAttrs) => {
+  const {
+    paragraph
+  } = schema.nodes;
+  const {
+    fontSize
+  } = schema.marks;
+  const newContent = [];
+  node.content.forEach(child => {
+    if (child.type === paragraph) {
+      newContent.push(paragraph.createChecked(child.attrs, child.content, child.marks.filter(mark => mark.type !== fontSize).concat(fontSize.create(smallTextAttrs))));
+    } else {
+      newContent.push(child);
+    }
+  });
+  return node.type.create(node.attrs, newContent);
+};
+const normalizeBlockTaskItemToTaskItems = (node, schema) => {
+  const {
+    taskItem,
+    blockTaskItem,
+    paragraph
+  } = schema.nodes;
+  if (!blockTaskItem || node.type !== blockTaskItem) {
+    return [node];
+  }
+  let allChildrenAreParagraphs = true;
+  node.content.forEach(child => {
+    if (child.type !== paragraph) {
+      allChildrenAreParagraphs = false;
+    }
+  });
+  if (allChildrenAreParagraphs && node.childCount > 0) {
     const transformedContent = [];
-    slice.content.forEach(node => {
-      if (node.type === blockTaskItem) {
-        // Check if blockTaskItem only contains paragraphs
-        let allChildrenAreParagraphs = true;
-        node.content.forEach(child => {
-          if (child.type !== paragraph) {
-            allChildrenAreParagraphs = false;
-          }
-        });
-        if (allChildrenAreParagraphs && node.childCount > 0) {
-          // Convert each paragraph to a taskItem
-          node.content.forEach(paragraphNode => {
-            const newTaskItem = taskItem.create({
-              localId: uuid.generate(),
-              state: node.attrs.state || 'TODO'
-            }, paragraphNode.content);
-            transformedContent.push(newTaskItem);
-          });
-        } else {
-          // Keep the blockTaskItem as is if it doesn't only contain paragraphs
-          transformedContent.push(node);
-        }
-      } else {
-        // Keep other nodes as is
-        transformedContent.push(node);
-      }
+    node.content.forEach(paragraphNode => {
+      transformedContent.push(taskItem.create({
+        localId: uuid.generate(),
+        state: node.attrs.state || 'TODO'
+      }, paragraphNode.content));
     });
-
-    // Create new slice with transformed content
-    if (transformedContent.length !== slice.content.childCount || transformedContent.some((node, idx) => node !== slice.content.child(idx))) {
-      const newFragment = Fragment.from(transformedContent);
-      return new Slice(newFragment, slice.openStart, slice.openEnd);
-    }
+    return transformedContent;
+  }
+  return [node];
+};
+const transformSliceContent = (slice, transformNode) => {
+  const transformedContent = [];
+  slice.content.forEach(node => {
+    transformedContent.push(...transformNode(node));
+  });
+  if (transformedContent.length !== slice.content.childCount || transformedContent.some((node, idx) => node !== slice.content.child(idx))) {
+    const newFragment = Fragment.from(transformedContent);
+    return new Slice(newFragment, slice.openStart, slice.openEnd);
   }
   return slice;
+};
+const transformSliceToRemoveBlockTaskItemLegacy = (slice, view) => {
+  const {
+    schema
+  } = view.state;
+  const {
+    taskItem,
+    blockTaskItem
+  } = schema.nodes;
+  const isInTaskItem = view.state.selection.$from.node().type === taskItem;
+  if (!isInTaskItem || !blockTaskItem) {
+    return slice;
+  }
+  return transformSliceContent(slice, node => normalizeBlockTaskItemToTaskItems(node, schema));
+};
+export const normalizeNodeForTaskTextSize = (node, schema, smallTextAttrs) => {
+  const {
+    taskList,
+    taskItem,
+    blockTaskItem
+  } = schema.nodes;
+  const {
+    fontSize
+  } = schema.marks;
+  if (!smallTextAttrs) {
+    return [node];
+  }
+  if (isTaskList(node.type)) {
+    const transformedChildren = [];
+    node.content.forEach(child => {
+      transformedChildren.push(...normalizeNodeForTaskTextSize(child, schema, smallTextAttrs));
+    });
+    return [taskList.create(node.attrs, transformedChildren)];
+  }
+  if (blockTaskItem && fontSize) {
+    if (node.type === taskItem) {
+      return [convertTaskItemToBlockTaskItem(node, schema, smallTextAttrs)];
+    }
+    if (node.type === blockTaskItem) {
+      return [addSmallTextToBlockTaskItem(node, schema, smallTextAttrs)];
+    }
+  }
+  return [node];
+};
+const normalizeNodeForTaskPaste = (node, schema, smallTextAttrs) => {
+  if (smallTextAttrs) {
+    return normalizeNodeForTaskTextSize(node, schema, smallTextAttrs);
+  }
+  return normalizeBlockTaskItemToTaskItems(node, schema);
+};
+export const tempTransformSliceToRemoveBlockTaskItem = (slice, view) => {
+  const fontSizeExperimentEnabled = expValEquals('platform_editor_small_font_size', 'isEnabled', true);
+  if (!fontSizeExperimentEnabled) {
+    return transformSliceToRemoveBlockTaskItemLegacy(slice, view);
+  }
+  const {
+    blockTaskItem
+  } = view.state.schema.nodes;
+  const {
+    isInTaskContext,
+    smallTextAttrs
+  } = getTaskPasteContext(view);
+  if (!isInTaskContext || !blockTaskItem) {
+    return slice;
+  }
+  return transformSliceContent(slice, node => normalizeNodeForTaskPaste(node, view.state.schema, smallTextAttrs));
 };

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

@@ -1,7 +1,11 @@
 import { findCutBefore } from '@atlaskit/editor-common/commands';
+import { getFirstParagraphBlockMarkAttrs } from '@atlaskit/editor-common/lists';
+import { isTaskList } from '@atlaskit/editor-common/transforms';
 import { findWrapping, ReplaceAroundStep } from '@atlaskit/editor-prosemirror/transform';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { getBlockRange, isActionOrDecisionItem, isActionOrDecisionList, liftBlock, subtreeHeight } from './helpers';
 import { findBlockTaskItem, normalizeTaskItemsSelection } from './utils';
+import { normalizeNodeForTaskTextSize } from './utils/paste';
 export var liftSelection = function liftSelection(state, dispatch) {
   var normalizedSelection = normalizeTaskItemsSelection(state.selection);
   var $from = normalizedSelection.$from,
@@ -88,6 +92,7 @@ export var joinAtCut = function joinAtCut($pos) {
   return function (state, dispatch) {
     var $cut = findCutBefore($pos);
     var blockTaskItem = state.schema.nodes.blockTaskItem;
+    var fontSize = state.schema.marks.fontSize;
     if (!$cut) {
       return false;
     }
@@ -137,6 +142,21 @@ export var joinAtCut = function joinAtCut($pos) {
       // see https://prosemirror.net/docs/ref/#transform.ReplaceStep.constructor
       // see https://prosemirror.net/docs/ref/#transform.ReplaceAroundStep.constructor
       var tr = state.tr.step(new ReplaceAroundStep(from, to, gapFrom, gapTo, slice, insert, true));
+      if (fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+        var targetTaskListSmallTextAttrs = getFirstParagraphBlockMarkAttrs($cut.nodeBefore, fontSize);
+        var followingListPos = $cut.pos + $cut.nodeAfter.nodeSize;
+        var followingListNode = state.doc.resolve(followingListPos).nodeAfter;
+        if (followingListNode && isTaskList(followingListNode.type)) {
+          var normalizedListNode = normalizeNodeForTaskTextSize(followingListNode, state.schema, targetTaskListSmallTextAttrs)[0];
+          if (normalizedListNode && normalizedListNode !== followingListNode) {
+            var mappedFollowingListPos = tr.mapping.map(followingListPos);
+            var currentFollowingListNode = tr.doc.nodeAt(mappedFollowingListPos);
+            if (currentFollowingListNode) {
+              tr = tr.replaceWith(mappedFollowingListPos, mappedFollowingListPos + currentFollowingListNode.nodeSize, normalizedListNode);
+            }
+          }
+        }
+      }
       if (dispatch) {
         dispatch(tr);
       }

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

@@ -6,6 +6,7 @@ import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INDENT_DIRECTION, INDENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { toggleTaskItemCheckbox, toggleTaskList as toggleTaskListKeymap } from '@atlaskit/editor-common/keymaps';
+import { getBlockMarkAttrs, getFirstParagraphBlockMarkAttrs, reconcileBlockMarkForParagraphAtPos } from '@atlaskit/editor-common/lists';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { deleteEmptyParagraphAndMoveBlockUp, filterCommand as filter, isEmptySelectionAtEnd, isEmptySelectionAtStart } from '@atlaskit/editor-common/utils';
 import { autoJoin, chainCommands } from '@atlaskit/editor-prosemirror/commands';
@@ -489,14 +490,40 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
 var creatParentListItemFragement = function creatParentListItemFragement(state) {
   return state.schema.nodes.listItem.create({}, state.schema.nodes.paragraph.create());
 };
-var splitListItem = function splitListItem(state, dispatch) {
-  var tr = state.tr,
-    $from = state.selection.$from;
+var getCurrentBlockTaskFontSizeAttrs = function getCurrentBlockTaskFontSizeAttrs(state, $from) {
+  if (!expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+    return false;
+  }
+  var fontSize = state.schema.marks.fontSize;
+  if (!fontSize) {
+    return false;
+  }
+  var result = findBlockTaskItem($from);
+  if (!result) {
+    return false;
+  }
+  return result.hasParagraph ? getBlockMarkAttrs($from.parent, fontSize) : getFirstParagraphBlockMarkAttrs(result.blockTaskItemNode, fontSize);
+};
+var createTaskItemForCurrentTextSize = function createTaskItemForCurrentTextSize(state, attrs, fontSizeAttrs) {
   var _state$schema$nodes5 = state.schema.nodes,
-    listItem = _state$schema$nodes5.listItem,
-    blockTaskItem = _state$schema$nodes5.blockTaskItem,
     taskItem = _state$schema$nodes5.taskItem,
+    blockTaskItem = _state$schema$nodes5.blockTaskItem,
     paragraph = _state$schema$nodes5.paragraph;
+  var fontSize = state.schema.marks.fontSize;
+  if (fontSizeAttrs && blockTaskItem && paragraph && fontSize) {
+    return blockTaskItem.createChecked(attrs, paragraph.createChecked({}, undefined, [fontSize.create(fontSizeAttrs)]));
+  }
+  return taskItem.createAndFill(attrs);
+};
+var splitListItem = function splitListItem(state, dispatch) {
+  var tr = state.tr,
+    $from = state.selection.$from;
+  var _state$schema$nodes6 = state.schema.nodes,
+    listItem = _state$schema$nodes6.listItem,
+    blockTaskItem = _state$schema$nodes6.blockTaskItem,
+    taskItem = _state$schema$nodes6.taskItem,
+    paragraph = _state$schema$nodes6.paragraph;
+  var currentBlockTaskFontSizeAttrs = getCurrentBlockTaskFontSizeAttrs(state, $from);
   if (actionDecisionFollowsOrNothing($from)) {
     if (dispatch) {
       // If previous node is a blockTaskItem we just want to delete the existing node and replace it with a paragraph
@@ -515,7 +542,11 @@ var splitListItem = function splitListItem(state, dispatch) {
         dispatch(splitListItemWith(tr, creatParentListItemFragement(state), $from, true));
         return true;
       }
-      dispatch(splitListItemWith(tr, paragraph.createChecked(), $from, true));
+      var splitTr = splitListItemWith(tr, paragraph.createChecked(), $from, true);
+      if (currentBlockTaskFontSizeAttrs) {
+        reconcileBlockMarkForParagraphAtPos(splitTr, splitTr.selection.from, state.schema.marks.fontSize, currentBlockTaskFontSizeAttrs);
+      }
+      dispatch(splitTr);
     }
     return true;
   }
@@ -583,11 +614,12 @@ var enter = function enter(editorAnalyticsAPI, getContextIdentifier) {
         // If the selection is a gap cursor at the end of the blockTaskItem,
         // we should insert a new taskItem.
         if ((!$from.parent.isTextblock || isInLastTextblockOfBlockTaskItem(state)) && $from.parentOffset === $from.parent.nodeSize - 2) {
-          var _newTaskItem = taskItem.createAndFill({
+          var _currentBlockTaskFontSizeAttrs = getCurrentBlockTaskFontSizeAttrs(state, $from);
+          var newTaskNode = createTaskItemForCurrentTextSize(state, {
             localId: itemLocalId
-          });
-          if (_newTaskItem) {
-            tr.insert(_blockTaskItemNode.pos + _blockTaskItemNode.node.nodeSize, _newTaskItem);
+          }, _currentBlockTaskFontSizeAttrs);
+          if (newTaskNode) {
+            tr.insert(_blockTaskItemNode.pos + _blockTaskItemNode.node.nodeSize, newTaskNode);
 
             // Move the cursor to the end of the newly inserted blockTaskItem
             tr.setSelection(TextSelection.create(tr.doc, _blockTaskItemNode.pos + _blockTaskItemNode.node.nodeSize + 1));
@@ -596,12 +628,17 @@ var enter = function enter(editorAnalyticsAPI, getContextIdentifier) {
         }
 
         // Split near the depth of the current selection
-        return tr.split($from.pos, $from !== null && $from !== void 0 && (_$from$parent = $from.parent) !== null && _$from$parent !== void 0 && _$from$parent.isTextblock ? 2 : 1, [{
+        var splitTr = tr.split($from.pos, $from !== null && $from !== void 0 && (_$from$parent = $from.parent) !== null && _$from$parent !== void 0 && _$from$parent.isTextblock ? 2 : 1, [{
           type: blockTaskItem,
           attrs: {
             localId: itemLocalId
           }
         }]);
+        var currentBlockTaskFontSizeAttrs = getCurrentBlockTaskFontSizeAttrs(state, $from);
+        if (currentBlockTaskFontSizeAttrs) {
+          reconcileBlockMarkForParagraphAtPos(splitTr, splitTr.selection.from, state.schema.marks.fontSize, currentBlockTaskFontSizeAttrs);
+        }
+        return splitTr;
       }
       return tr.split($from.pos, 1, [{
         type: nodeType,

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

@@ -1,5 +1,10 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import { uuid } from '@atlaskit/adf-schema';
+import { getBlockMarkAttrs, getFirstParagraphBlockMarkAttrs } from '@atlaskit/editor-common/lists';
+import { isTaskList } from '@atlaskit/editor-common/transforms';
 import { Slice, Fragment } from '@atlaskit/editor-prosemirror/model';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+
 /**
  * Transforms a paste slice to handle blockTaskItem nodes when pasting into task items.
  *
@@ -19,54 +24,168 @@ import { Slice, Fragment } from '@atlaskit/editor-prosemirror/model';
  *
  * @see {@link https://hello.atlassian.net/wiki/spaces/EDITOR/pages/5626622054/Block+elements+in+task+-+Decision+log#Can-users-create-block-task-items%3F} for reasoning
  */
-export var tempTransformSliceToRemoveBlockTaskItem = function tempTransformSliceToRemoveBlockTaskItem(slice, view) {
-  var schema = view.state.schema;
+var getTaskPasteContext = function getTaskPasteContext(view) {
+  var _schema$marks;
+  var _view$state = view.state,
+    schema = _view$state.schema,
+    selection = _view$state.selection;
   var _schema$nodes = schema.nodes,
     taskItem = _schema$nodes.taskItem,
     blockTaskItem = _schema$nodes.blockTaskItem,
     paragraph = _schema$nodes.paragraph;
-
-  // Check if we're pasting into a taskItem
-  var $from = view.state.selection.$from;
-  var isInTaskItem = $from.node().type === taskItem;
-  if (isInTaskItem && blockTaskItem) {
-    // Transform the slice to replace blockTaskItems with taskItems
+  var fontSize = (_schema$marks = schema.marks) === null || _schema$marks === void 0 ? void 0 : _schema$marks.fontSize;
+  var $from = selection.$from;
+  var currentParent = $from.parent;
+  var currentNode = typeof $from.node === 'function' ? $from.node() : undefined;
+  if ((currentParent === null || currentParent === void 0 ? void 0 : currentParent.type) === taskItem || (currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === taskItem) {
+    return {
+      isInTaskContext: true,
+      smallTextAttrs: false
+    };
+  }
+  if (!blockTaskItem) {
+    return {
+      isInTaskContext: false,
+      smallTextAttrs: false
+    };
+  }
+  if ((currentParent === null || currentParent === void 0 ? void 0 : currentParent.type) === blockTaskItem || (currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === blockTaskItem) {
+    return {
+      isInTaskContext: true,
+      smallTextAttrs: fontSize ? getFirstParagraphBlockMarkAttrs(currentParent !== null && currentParent !== void 0 ? currentParent : currentNode, fontSize) : false
+    };
+  }
+  if ((currentParent === null || currentParent === void 0 ? void 0 : currentParent.type) === paragraph && $from.depth > 0 && $from.node($from.depth - 1).type === blockTaskItem) {
+    return {
+      isInTaskContext: true,
+      smallTextAttrs: fontSize ? getBlockMarkAttrs(currentParent, fontSize) : false
+    };
+  }
+  return {
+    isInTaskContext: false,
+    smallTextAttrs: false
+  };
+};
+var convertTaskItemToBlockTaskItem = function convertTaskItemToBlockTaskItem(node, schema, smallTextAttrs) {
+  var _schema$nodes2 = schema.nodes,
+    blockTaskItem = _schema$nodes2.blockTaskItem,
+    paragraph = _schema$nodes2.paragraph;
+  var fontSize = schema.marks.fontSize;
+  return blockTaskItem.create(node.attrs, paragraph.createChecked({}, node.content, [fontSize.create(smallTextAttrs)]));
+};
+var addSmallTextToBlockTaskItem = function addSmallTextToBlockTaskItem(node, schema, smallTextAttrs) {
+  var paragraph = schema.nodes.paragraph;
+  var fontSize = schema.marks.fontSize;
+  var newContent = [];
+  node.content.forEach(function (child) {
+    if (child.type === paragraph) {
+      newContent.push(paragraph.createChecked(child.attrs, child.content, child.marks.filter(function (mark) {
+        return mark.type !== fontSize;
+      }).concat(fontSize.create(smallTextAttrs))));
+    } else {
+      newContent.push(child);
+    }
+  });
+  return node.type.create(node.attrs, newContent);
+};
+var normalizeBlockTaskItemToTaskItems = function normalizeBlockTaskItemToTaskItems(node, schema) {
+  var _schema$nodes3 = schema.nodes,
+    taskItem = _schema$nodes3.taskItem,
+    blockTaskItem = _schema$nodes3.blockTaskItem,
+    paragraph = _schema$nodes3.paragraph;
+  if (!blockTaskItem || node.type !== blockTaskItem) {
+    return [node];
+  }
+  var allChildrenAreParagraphs = true;
+  node.content.forEach(function (child) {
+    if (child.type !== paragraph) {
+      allChildrenAreParagraphs = false;
+    }
+  });
+  if (allChildrenAreParagraphs && node.childCount > 0) {
     var transformedContent = [];
-    slice.content.forEach(function (node) {
-      if (node.type === blockTaskItem) {
-        // Check if blockTaskItem only contains paragraphs
-        var allChildrenAreParagraphs = true;
-        node.content.forEach(function (child) {
-          if (child.type !== paragraph) {
-            allChildrenAreParagraphs = false;
-          }
-        });
-        if (allChildrenAreParagraphs && node.childCount > 0) {
-          // Convert each paragraph to a taskItem
-          node.content.forEach(function (paragraphNode) {
-            var newTaskItem = taskItem.create({
-              localId: uuid.generate(),
-              state: node.attrs.state || 'TODO'
-            }, paragraphNode.content);
-            transformedContent.push(newTaskItem);
-          });
-        } else {
-          // Keep the blockTaskItem as is if it doesn't only contain paragraphs
-          transformedContent.push(node);
-        }
-      } else {
-        // Keep other nodes as is
-        transformedContent.push(node);
-      }
+    node.content.forEach(function (paragraphNode) {
+      transformedContent.push(taskItem.create({
+        localId: uuid.generate(),
+        state: node.attrs.state || 'TODO'
+      }, paragraphNode.content));
     });
-
-    // Create new slice with transformed content
-    if (transformedContent.length !== slice.content.childCount || transformedContent.some(function (node, idx) {
-      return node !== slice.content.child(idx);
-    })) {
-      var newFragment = Fragment.from(transformedContent);
-      return new Slice(newFragment, slice.openStart, slice.openEnd);
-    }
+    return transformedContent;
+  }
+  return [node];
+};
+var transformSliceContent = function transformSliceContent(slice, transformNode) {
+  var transformedContent = [];
+  slice.content.forEach(function (node) {
+    transformedContent.push.apply(transformedContent, _toConsumableArray(transformNode(node)));
+  });
+  if (transformedContent.length !== slice.content.childCount || transformedContent.some(function (node, idx) {
+    return node !== slice.content.child(idx);
+  })) {
+    var newFragment = Fragment.from(transformedContent);
+    return new Slice(newFragment, slice.openStart, slice.openEnd);
   }
   return slice;
+};
+var transformSliceToRemoveBlockTaskItemLegacy = function transformSliceToRemoveBlockTaskItemLegacy(slice, view) {
+  var schema = view.state.schema;
+  var _schema$nodes4 = schema.nodes,
+    taskItem = _schema$nodes4.taskItem,
+    blockTaskItem = _schema$nodes4.blockTaskItem;
+  var isInTaskItem = view.state.selection.$from.node().type === taskItem;
+  if (!isInTaskItem || !blockTaskItem) {
+    return slice;
+  }
+  return transformSliceContent(slice, function (node) {
+    return normalizeBlockTaskItemToTaskItems(node, schema);
+  });
+};
+var _normalizeNodeForTaskTextSize = function normalizeNodeForTaskTextSize(node, schema, smallTextAttrs) {
+  var _schema$nodes5 = schema.nodes,
+    taskList = _schema$nodes5.taskList,
+    taskItem = _schema$nodes5.taskItem,
+    blockTaskItem = _schema$nodes5.blockTaskItem;
+  var fontSize = schema.marks.fontSize;
+  if (!smallTextAttrs) {
+    return [node];
+  }
+  if (isTaskList(node.type)) {
+    var transformedChildren = [];
+    node.content.forEach(function (child) {
+      transformedChildren.push.apply(transformedChildren, _toConsumableArray(_normalizeNodeForTaskTextSize(child, schema, smallTextAttrs)));
+    });
+    return [taskList.create(node.attrs, transformedChildren)];
+  }
+  if (blockTaskItem && fontSize) {
+    if (node.type === taskItem) {
+      return [convertTaskItemToBlockTaskItem(node, schema, smallTextAttrs)];
+    }
+    if (node.type === blockTaskItem) {
+      return [addSmallTextToBlockTaskItem(node, schema, smallTextAttrs)];
+    }
+  }
+  return [node];
+};
+export { _normalizeNodeForTaskTextSize as normalizeNodeForTaskTextSize };
+var normalizeNodeForTaskPaste = function normalizeNodeForTaskPaste(node, schema, smallTextAttrs) {
+  if (smallTextAttrs) {
+    return _normalizeNodeForTaskTextSize(node, schema, smallTextAttrs);
+  }
+  return normalizeBlockTaskItemToTaskItems(node, schema);
+};
+export var tempTransformSliceToRemoveBlockTaskItem = function tempTransformSliceToRemoveBlockTaskItem(slice, view) {
+  var fontSizeExperimentEnabled = expValEquals('platform_editor_small_font_size', 'isEnabled', true);
+  if (!fontSizeExperimentEnabled) {
+    return transformSliceToRemoveBlockTaskItemLegacy(slice, view);
+  }
+  var blockTaskItem = view.state.schema.nodes.blockTaskItem;
+  var _getTaskPasteContext = getTaskPasteContext(view),
+    isInTaskContext = _getTaskPasteContext.isInTaskContext,
+    smallTextAttrs = _getTaskPasteContext.smallTextAttrs;
+  if (!isInTaskContext || !blockTaskItem) {
+    return slice;
+  }
+  return transformSliceContent(slice, function (node) {
+    return normalizeNodeForTaskPaste(node, view.state.schema, smallTextAttrs);
+  });
 };

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

@@ -1,22 +1,6 @@
+import type { FontSizeMarkAttrs } from '@atlaskit/adf-schema';
 import { Slice } from '@atlaskit/editor-prosemirror/model';
+import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-/**
- * Transforms a paste slice to handle blockTaskItem nodes when pasting into task items.
- *
- * Initially we do not support user creation of blockTaskItem - it is intended primarily
- * for TinyMCE migration purposes however that may change in the future.
- * This function handles the behavior to work around Prosemirror behaviour which decides
- * that blockTaskItem is the appropriate node to use here.
- *
- * @param slice - The slice being pasted
- * @param view - The editor view where the paste is occurring
- * @returns The transformed slice with blockTaskItems converted to taskItems when appropriate
- *
- * @example
- * ```typescript
- * const transformedSlice = tempTransformSliceToRemoveBlockTaskItem(pasteSlice, editorView);
- * ```
- *
- * @see {@link https://hello.atlassian.net/wiki/spaces/EDITOR/pages/5626622054/Block+elements+in+task+-+Decision+log#Can-users-create-block-task-items%3F} for reasoning
- */
+export declare const normalizeNodeForTaskTextSize: (node: PMNode, schema: Schema, smallTextAttrs: FontSizeMarkAttrs | false) => PMNode[];
 export declare const tempTransformSliceToRemoveBlockTaskItem: (slice: Slice, view: EditorView) => Slice;

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

@@ -1,22 +1,6 @@
+import type { FontSizeMarkAttrs } from '@atlaskit/adf-schema';
 import { Slice } from '@atlaskit/editor-prosemirror/model';
+import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-/**
- * Transforms a paste slice to handle blockTaskItem nodes when pasting into task items.
- *
- * Initially we do not support user creation of blockTaskItem - it is intended primarily
- * for TinyMCE migration purposes however that may change in the future.
- * This function handles the behavior to work around Prosemirror behaviour which decides
- * that blockTaskItem is the appropriate node to use here.
- *
- * @param slice - The slice being pasted
- * @param view - The editor view where the paste is occurring
- * @returns The transformed slice with blockTaskItems converted to taskItems when appropriate
- *
- * @example
- * ```typescript
- * const transformedSlice = tempTransformSliceToRemoveBlockTaskItem(pasteSlice, editorView);
- * ```
- *
- * @see {@link https://hello.atlassian.net/wiki/spaces/EDITOR/pages/5626622054/Block+elements+in+task+-+Decision+log#Can-users-create-block-task-items%3F} for reasoning
- */
+export declare const normalizeNodeForTaskTextSize: (node: PMNode, schema: Schema, smallTextAttrs: FontSizeMarkAttrs | false) => PMNode[];
 export declare const tempTransformSliceToRemoveBlockTaskItem: (slice: Slice, view: EditorView) => Slice;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-tasks-and-decisions",
-	"version": "11.3.6",
+	"version": "11.4.0",
 	"description": "Tasks and decisions plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -49,14 +49,14 @@
 		"@atlaskit/primitives": "^18.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.6.0",
 		"@atlaskit/task-decision": "^19.3.0",
-		"@atlaskit/tmp-editor-statsig": "^48.0.0",
-		"@atlaskit/tokens": "^11.3.0",
+		"@atlaskit/tmp-editor-statsig": "^49.0.0",
+		"@atlaskit/tokens": "^11.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.20.0",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.11.0",
+		"@atlaskit/editor-common": "^112.13.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"