@atlaskit/editor-plugin-paste 9.0.16 → 9.1.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-paste
 
+## 9.1.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 9.1.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
+
 ## 9.0.16
 
 ### Patch Changes

package/dist/cjs/pm-plugins/util/handlers.js

@@ -34,6 +34,7 @@ var _v = _interopRequireDefault(require("uuid/v4"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _card = require("@atlaskit/editor-common/card");
 var _coreUtils = require("@atlaskit/editor-common/core-utils");
+var _lists = require("@atlaskit/editor-common/lists");
 var _mark = require("@atlaskit/editor-common/mark");
 var _nesting = require("@atlaskit/editor-common/nesting");
 var _selection = require("@atlaskit/editor-common/selection");
@@ -49,7 +50,7 @@ var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equa
 var _commands = require("../../editor-commands/commands");
 var _pluginFactory = require("../plugin-factory");
 var _edgeCases = require("./edge-cases");
-var _lists = require("./edge-cases/lists");
+var _lists2 = require("./edge-cases/lists");
 var _index = require("./index");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -173,7 +174,7 @@ function handlePasteIntoTaskOrDecisionOrPanel(slice, queueCardsFromChangedTr) {
     var isFirstChildTaskNode = transformedSlice.content.firstChild.type === taskList || transformedSlice.content.firstChild.type === taskItem;
     var tr = (0, _prosemirrorHistory.closeHistory)(state.tr);
     if (panelNode && sliceHasTask && ((_slice$content$firstC3 = slice.content.firstChild) === null || _slice$content$firstC3 === void 0 ? void 0 : _slice$content$firstC3.type) === panel && (0, _index.isEmptyNode)(panelNode) && selection.$from.node() === selection.$to.node()) {
-      return Boolean((0, _lists.insertSliceInsideOfPanelNodeSelected)(panelNode)({
+      return Boolean((0, _lists2.insertSliceInsideOfPanelNodeSelected)(panelNode)({
         tr: tr,
         slice: slice
       }));
@@ -912,21 +913,32 @@ function getTopLevelMarkTypesInSlice(slice) {
   return markTypes;
 }
 function handleParagraphBlockMarks(state, slice) {
+  var _findParentNodeOfType2;
   if (slice.content.size === 0) {
     return slice;
   }
   var schema = state.schema,
+    selection = state.selection,
     $from = state.selection.$from;
+  var destinationListNode = (_findParentNodeOfType2 = (0, _utils2.findParentNodeOfType)([schema.nodes.bulletList, schema.nodes.orderedList])(selection)) === null || _findParentNodeOfType2 === void 0 ? void 0 : _findParentNodeOfType2.node;
+  var currentNode = typeof $from.node === 'function' ? $from.node() : undefined;
+  var isInNormalTaskContext = (currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === schema.nodes.taskItem || $from.parent.type === schema.nodes.taskItem;
+  var isInSmallTaskContext = schema.nodes.blockTaskItem && (currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === schema.nodes.blockTaskItem || schema.nodes.blockTaskItem && $from.parent.type === schema.nodes.blockTaskItem || schema.nodes.blockTaskItem && $from.parent.type === schema.nodes.paragraph && $from.depth > 0 && $from.node($from.depth - 1).type === schema.nodes.blockTaskItem;
+  var destinationBlockMarkAttrs = (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) && schema.marks.fontSize ? destinationListNode ? (0, _lists.getFirstParagraphBlockMarkAttrs)(destinationListNode, schema.marks.fontSize) : isInSmallTaskContext ? (0, _lists.getBlockMarkAttrs)($from.parent, schema.marks.fontSize) || (0, _lists.getFirstParagraphBlockMarkAttrs)(currentNode, schema.marks.fontSize) : false : false;
 
   // If no paragraph in the slice contains marks, there's no need for special handling
+  // unless we're pasting into a small-text list and need to add the destination block mark.
   // Note: this doesn't check for marks applied to lower level nodes such as text
-  if (!sliceHasTopLevelMarks(slice)) {
+  if (!sliceHasTopLevelMarks(slice) && !destinationBlockMarkAttrs) {
     return slice;
   }
+  var shouldNormalizeFontSizeForTarget = (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) && !!schema.marks.fontSize && (!!destinationListNode || isInNormalTaskContext || !!isInSmallTaskContext);
 
-  // If pasting a single paragraph into pre-existing content, match destination formatting
+  // If pasting a single paragraph into pre-existing content, match destination formatting.
+  // For bullet/ordered lists under small-text, we still need to normalize the paragraph block mark
+  // so pasted content adopts the destination list state.
   var destinationHasContent = $from.parent.textContent.length > 0;
-  if (slice.content.childCount === 1 && destinationHasContent) {
+  if (slice.content.childCount === 1 && destinationHasContent && !shouldNormalizeFontSizeForTarget) {
     return slice;
   }
 
@@ -949,23 +961,16 @@ function handleParagraphBlockMarks(state, slice) {
   } finally {
     _iterator.f();
   }
-  if (forbiddenMarkTypes.length === 0) {
-    // In a slice containing one or more paragraphs at the document level (not wrapped in
-    // another node), the first paragraph will only have its text content captured and pasted
-    // since openStart is 1. We decrement the open depth of the slice so it retains any block
-    // marks applied to it. We only care about the depth at the start of the selection so
-    // there's no need to change openEnd - the rest of the slice gets pasted correctly.
-    var openStart = Math.max(0, slice.openStart - 1);
-    return new _model.Slice(slice.content, openStart, slice.openEnd);
-  }
-
-  // If the paragraph or heading contains marks forbidden by the parent node
-  // (e.g. alignment/indentation), drop those marks from the slice
-  return (0, _utils.mapSlice)(slice, function (node) {
+  var fontSizeMarkType = shouldNormalizeFontSizeForTarget ? schema.marks.fontSize : undefined;
+  var normalizedContent = (0, _utils.mapSlice)(slice, function (node) {
     if (node.type === schema.nodes.paragraph) {
-      return schema.nodes.paragraph.createChecked(undefined, node.content, node.marks.filter(function (mark) {
+      var paragraphMarks = node.marks.filter(function (mark) {
         return !forbiddenMarkTypes.includes(mark.type);
-      }));
+      });
+      var normalizedMarks = fontSizeMarkType ? paragraphMarks.filter(function (mark) {
+        return mark.type !== fontSizeMarkType;
+      }) : paragraphMarks;
+      return schema.nodes.paragraph.createChecked(undefined, node.content, destinationBlockMarkAttrs && fontSizeMarkType ? normalizedMarks.concat(fontSizeMarkType.create(destinationBlockMarkAttrs)) : normalizedMarks);
     } else if (node.type === schema.nodes.heading) {
       // Preserve heading attributes to keep formatting
       return schema.nodes.heading.createChecked(node.attrs, node.content, node.marks.filter(function (mark) {
@@ -974,6 +979,24 @@ function handleParagraphBlockMarks(state, slice) {
     }
     return node;
   });
+  if (forbiddenMarkTypes.length === 0 && !shouldNormalizeFontSizeForTarget) {
+    // In a slice containing one or more paragraphs at the document level (not wrapped in
+    // another node), the first paragraph will only have its text content captured and pasted
+    // since openStart is 1. We decrement the open depth of the slice so it retains any block
+    // marks applied to it. We only care about the depth at the start of the selection so
+    // there's no need to change openEnd - the rest of the slice gets pasted correctly.
+    var openStart = Math.max(0, slice.openStart - 1);
+    return new _model.Slice(slice.content, openStart, slice.openEnd);
+  }
+  if (forbiddenMarkTypes.length === 0 && shouldNormalizeFontSizeForTarget) {
+    var _openStart = Math.max(0, slice.openStart - 1);
+    return new _model.Slice(normalizedContent.content, _openStart, slice.openEnd);
+  }
+
+  // If the paragraph or heading contains marks forbidden by the parent node
+  // (e.g. alignment/indentation), drop those marks from the slice. For lists under the small
+  // text experiment, also normalize fontSize to the destination list state.
+  return new _model.Slice(normalizedContent.content, slice.openStart, slice.openEnd);
 }
 
 /**
@@ -1015,7 +1038,7 @@ function flattenNestedListInSlice(slice) {
 }
 function handleRichText(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
-    var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
+    var _slice$content, _slice$content2, _findParentNodeOfType3, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
     var _state$schema$nodes4 = state.schema.nodes,
       codeBlock = _state$schema$nodes4.codeBlock,
       heading = _state$schema$nodes4.heading,
@@ -1025,6 +1048,7 @@ function handleRichText(slice, queueCardsFromChangedTr) {
       schema = state.schema;
     var firstChildOfSlice = (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.firstChild;
     var lastChildOfSlice = (_slice$content2 = slice.content) === null || _slice$content2 === void 0 ? void 0 : _slice$content2.lastChild;
+    var destinationListFontSizeAttrs = (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? (0, _lists.getFirstParagraphBlockMarkAttrs)((_findParentNodeOfType3 = (0, _utils2.findParentNodeOfType)([schema.nodes.bulletList, schema.nodes.orderedList])(selection)) === null || _findParentNodeOfType3 === void 0 ? void 0 : _findParentNodeOfType3.node, schema.marks.fontSize) : false;
 
     // In case user is pasting inline code,
     // any backtick ` immediately preceding it should be removed.
@@ -1109,6 +1133,12 @@ function handleRichText(slice, queueCardsFromChangedTr) {
         }
       }
     }
+    if ((0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) && isSliceContentListNodes) {
+      var containingList = (0, _utils2.findParentNodeOfTypeClosestToPos)(tr.doc.resolve(tr.mapping.map(selection.from)), [schema.nodes.bulletList, schema.nodes.orderedList]);
+      if (containingList) {
+        (0, _lists.reconcileBlockMarkForContainerAtPos)(tr, containingList.pos, schema.marks.fontSize, destinationListFontSizeAttrs);
+      }
+    }
     tr.setStoredMarks([]);
     if (tr.selection.empty && tr.selection.$from.parent.type === codeBlock) {
       tr.setSelection(_state.TextSelection.near(tr.selection.$from, 1));

package/dist/es2019/pm-plugins/util/handlers.js

@@ -3,6 +3,7 @@ import uuid from 'uuid/v4';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { insideTable } from '@atlaskit/editor-common/core-utils';
+import { getBlockMarkAttrs, getFirstParagraphBlockMarkAttrs, reconcileBlockMarkForContainerAtPos } from '@atlaskit/editor-common/lists';
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
 import { getParentOfTypeCount, getPositionAfterTopParentNodeOfType } from '@atlaskit/editor-common/nesting';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
@@ -898,25 +899,36 @@ function getTopLevelMarkTypesInSlice(slice) {
   return markTypes;
 }
 export function handleParagraphBlockMarks(state, slice) {
+  var _findParentNodeOfType2;
   if (slice.content.size === 0) {
     return slice;
   }
   const {
     schema,
+    selection,
     selection: {
       $from
     }
   } = state;
+  const destinationListNode = (_findParentNodeOfType2 = findParentNodeOfType([schema.nodes.bulletList, schema.nodes.orderedList])(selection)) === null || _findParentNodeOfType2 === void 0 ? void 0 : _findParentNodeOfType2.node;
+  const currentNode = typeof $from.node === 'function' ? $from.node() : undefined;
+  const isInNormalTaskContext = (currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === schema.nodes.taskItem || $from.parent.type === schema.nodes.taskItem;
+  const isInSmallTaskContext = schema.nodes.blockTaskItem && (currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === schema.nodes.blockTaskItem || schema.nodes.blockTaskItem && $from.parent.type === schema.nodes.blockTaskItem || schema.nodes.blockTaskItem && $from.parent.type === schema.nodes.paragraph && $from.depth > 0 && $from.node($from.depth - 1).type === schema.nodes.blockTaskItem;
+  const destinationBlockMarkAttrs = expValEquals('platform_editor_small_font_size', 'isEnabled', true) && schema.marks.fontSize ? destinationListNode ? getFirstParagraphBlockMarkAttrs(destinationListNode, schema.marks.fontSize) : isInSmallTaskContext ? getBlockMarkAttrs($from.parent, schema.marks.fontSize) || getFirstParagraphBlockMarkAttrs(currentNode, schema.marks.fontSize) : false : false;
 
   // If no paragraph in the slice contains marks, there's no need for special handling
+  // unless we're pasting into a small-text list and need to add the destination block mark.
   // Note: this doesn't check for marks applied to lower level nodes such as text
-  if (!sliceHasTopLevelMarks(slice)) {
+  if (!sliceHasTopLevelMarks(slice) && !destinationBlockMarkAttrs) {
     return slice;
   }
+  const shouldNormalizeFontSizeForTarget = expValEquals('platform_editor_small_font_size', 'isEnabled', true) && !!schema.marks.fontSize && (!!destinationListNode || isInNormalTaskContext || !!isInSmallTaskContext);
 
-  // If pasting a single paragraph into pre-existing content, match destination formatting
+  // If pasting a single paragraph into pre-existing content, match destination formatting.
+  // For bullet/ordered lists under small-text, we still need to normalize the paragraph block mark
+  // so pasted content adopts the destination list state.
   const destinationHasContent = $from.parent.textContent.length > 0;
-  if (slice.content.childCount === 1 && destinationHasContent) {
+  if (slice.content.childCount === 1 && destinationHasContent && !shouldNormalizeFontSizeForTarget) {
     return slice;
   }
 
@@ -930,7 +942,19 @@ export function handleParagraphBlockMarks(state, slice) {
       forbiddenMarkTypes.push(markType);
     }
   }
-  if (forbiddenMarkTypes.length === 0) {
+  const fontSizeMarkType = shouldNormalizeFontSizeForTarget ? schema.marks.fontSize : undefined;
+  const normalizedContent = mapSlice(slice, node => {
+    if (node.type === schema.nodes.paragraph) {
+      const paragraphMarks = node.marks.filter(mark => !forbiddenMarkTypes.includes(mark.type));
+      const normalizedMarks = fontSizeMarkType ? paragraphMarks.filter(mark => mark.type !== fontSizeMarkType) : paragraphMarks;
+      return schema.nodes.paragraph.createChecked(undefined, node.content, destinationBlockMarkAttrs && fontSizeMarkType ? normalizedMarks.concat(fontSizeMarkType.create(destinationBlockMarkAttrs)) : normalizedMarks);
+    } else if (node.type === schema.nodes.heading) {
+      // Preserve heading attributes to keep formatting
+      return schema.nodes.heading.createChecked(node.attrs, node.content, node.marks.filter(mark => !forbiddenMarkTypes.includes(mark.type)));
+    }
+    return node;
+  });
+  if (forbiddenMarkTypes.length === 0 && !shouldNormalizeFontSizeForTarget) {
     // In a slice containing one or more paragraphs at the document level (not wrapped in
     // another node), the first paragraph will only have its text content captured and pasted
     // since openStart is 1. We decrement the open depth of the slice so it retains any block
@@ -939,18 +963,15 @@ export function handleParagraphBlockMarks(state, slice) {
     const openStart = Math.max(0, slice.openStart - 1);
     return new Slice(slice.content, openStart, slice.openEnd);
   }
+  if (forbiddenMarkTypes.length === 0 && shouldNormalizeFontSizeForTarget) {
+    const openStart = Math.max(0, slice.openStart - 1);
+    return new Slice(normalizedContent.content, openStart, slice.openEnd);
+  }
 
   // If the paragraph or heading contains marks forbidden by the parent node
-  // (e.g. alignment/indentation), drop those marks from the slice
-  return mapSlice(slice, node => {
-    if (node.type === schema.nodes.paragraph) {
-      return schema.nodes.paragraph.createChecked(undefined, node.content, node.marks.filter(mark => !forbiddenMarkTypes.includes(mark.type)));
-    } else if (node.type === schema.nodes.heading) {
-      // Preserve heading attributes to keep formatting
-      return schema.nodes.heading.createChecked(node.attrs, node.content, node.marks.filter(mark => !forbiddenMarkTypes.includes(mark.type)));
-    }
-    return node;
-  });
+  // (e.g. alignment/indentation), drop those marks from the slice. For lists under the small
+  // text experiment, also normalize fontSize to the destination list state.
+  return new Slice(normalizedContent.content, slice.openStart, slice.openEnd);
 }
 
 /**
@@ -992,7 +1013,7 @@ export function flattenNestedListInSlice(slice) {
 }
 export function handleRichText(slice, queueCardsFromChangedTr) {
   return (state, dispatch) => {
-    var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
+    var _slice$content, _slice$content2, _findParentNodeOfType3, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
     const {
       codeBlock,
       heading,
@@ -1005,6 +1026,7 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
     } = state;
     const firstChildOfSlice = (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.firstChild;
     const lastChildOfSlice = (_slice$content2 = slice.content) === null || _slice$content2 === void 0 ? void 0 : _slice$content2.lastChild;
+    const destinationListFontSizeAttrs = expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getFirstParagraphBlockMarkAttrs((_findParentNodeOfType3 = findParentNodeOfType([schema.nodes.bulletList, schema.nodes.orderedList])(selection)) === null || _findParentNodeOfType3 === void 0 ? void 0 : _findParentNodeOfType3.node, schema.marks.fontSize) : false;
 
     // In case user is pasting inline code,
     // any backtick ` immediately preceding it should be removed.
@@ -1089,6 +1111,12 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
         }
       }
     }
+    if (expValEquals('platform_editor_small_font_size', 'isEnabled', true) && isSliceContentListNodes) {
+      const containingList = findParentNodeOfTypeClosestToPos(tr.doc.resolve(tr.mapping.map(selection.from)), [schema.nodes.bulletList, schema.nodes.orderedList]);
+      if (containingList) {
+        reconcileBlockMarkForContainerAtPos(tr, containingList.pos, schema.marks.fontSize, destinationListFontSizeAttrs);
+      }
+    }
     tr.setStoredMarks([]);
     if (tr.selection.empty && tr.selection.$from.parent.type === codeBlock) {
       tr.setSelection(TextSelection.near(tr.selection.$from, 1));

package/dist/esm/pm-plugins/util/handlers.js

@@ -11,6 +11,7 @@ import uuid from 'uuid/v4';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { addLinkMetadata } from '@atlaskit/editor-common/card';
 import { insideTable } from '@atlaskit/editor-common/core-utils';
+import { getBlockMarkAttrs, getFirstParagraphBlockMarkAttrs, reconcileBlockMarkForContainerAtPos } from '@atlaskit/editor-common/lists';
 import { anyMarkActive } from '@atlaskit/editor-common/mark';
 import { getParentOfTypeCount, getPositionAfterTopParentNodeOfType } from '@atlaskit/editor-common/nesting';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
@@ -885,21 +886,32 @@ function getTopLevelMarkTypesInSlice(slice) {
   return markTypes;
 }
 export function handleParagraphBlockMarks(state, slice) {
+  var _findParentNodeOfType2;
   if (slice.content.size === 0) {
     return slice;
   }
   var schema = state.schema,
+    selection = state.selection,
     $from = state.selection.$from;
+  var destinationListNode = (_findParentNodeOfType2 = findParentNodeOfType([schema.nodes.bulletList, schema.nodes.orderedList])(selection)) === null || _findParentNodeOfType2 === void 0 ? void 0 : _findParentNodeOfType2.node;
+  var currentNode = typeof $from.node === 'function' ? $from.node() : undefined;
+  var isInNormalTaskContext = (currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === schema.nodes.taskItem || $from.parent.type === schema.nodes.taskItem;
+  var isInSmallTaskContext = schema.nodes.blockTaskItem && (currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === schema.nodes.blockTaskItem || schema.nodes.blockTaskItem && $from.parent.type === schema.nodes.blockTaskItem || schema.nodes.blockTaskItem && $from.parent.type === schema.nodes.paragraph && $from.depth > 0 && $from.node($from.depth - 1).type === schema.nodes.blockTaskItem;
+  var destinationBlockMarkAttrs = expValEquals('platform_editor_small_font_size', 'isEnabled', true) && schema.marks.fontSize ? destinationListNode ? getFirstParagraphBlockMarkAttrs(destinationListNode, schema.marks.fontSize) : isInSmallTaskContext ? getBlockMarkAttrs($from.parent, schema.marks.fontSize) || getFirstParagraphBlockMarkAttrs(currentNode, schema.marks.fontSize) : false : false;
 
   // If no paragraph in the slice contains marks, there's no need for special handling
+  // unless we're pasting into a small-text list and need to add the destination block mark.
   // Note: this doesn't check for marks applied to lower level nodes such as text
-  if (!sliceHasTopLevelMarks(slice)) {
+  if (!sliceHasTopLevelMarks(slice) && !destinationBlockMarkAttrs) {
     return slice;
   }
+  var shouldNormalizeFontSizeForTarget = expValEquals('platform_editor_small_font_size', 'isEnabled', true) && !!schema.marks.fontSize && (!!destinationListNode || isInNormalTaskContext || !!isInSmallTaskContext);
 
-  // If pasting a single paragraph into pre-existing content, match destination formatting
+  // If pasting a single paragraph into pre-existing content, match destination formatting.
+  // For bullet/ordered lists under small-text, we still need to normalize the paragraph block mark
+  // so pasted content adopts the destination list state.
   var destinationHasContent = $from.parent.textContent.length > 0;
-  if (slice.content.childCount === 1 && destinationHasContent) {
+  if (slice.content.childCount === 1 && destinationHasContent && !shouldNormalizeFontSizeForTarget) {
     return slice;
   }
 
@@ -922,23 +934,16 @@ export function handleParagraphBlockMarks(state, slice) {
   } finally {
     _iterator.f();
   }
-  if (forbiddenMarkTypes.length === 0) {
-    // In a slice containing one or more paragraphs at the document level (not wrapped in
-    // another node), the first paragraph will only have its text content captured and pasted
-    // since openStart is 1. We decrement the open depth of the slice so it retains any block
-    // marks applied to it. We only care about the depth at the start of the selection so
-    // there's no need to change openEnd - the rest of the slice gets pasted correctly.
-    var openStart = Math.max(0, slice.openStart - 1);
-    return new Slice(slice.content, openStart, slice.openEnd);
-  }
-
-  // If the paragraph or heading contains marks forbidden by the parent node
-  // (e.g. alignment/indentation), drop those marks from the slice
-  return mapSlice(slice, function (node) {
+  var fontSizeMarkType = shouldNormalizeFontSizeForTarget ? schema.marks.fontSize : undefined;
+  var normalizedContent = mapSlice(slice, function (node) {
     if (node.type === schema.nodes.paragraph) {
-      return schema.nodes.paragraph.createChecked(undefined, node.content, node.marks.filter(function (mark) {
+      var paragraphMarks = node.marks.filter(function (mark) {
         return !forbiddenMarkTypes.includes(mark.type);
-      }));
+      });
+      var normalizedMarks = fontSizeMarkType ? paragraphMarks.filter(function (mark) {
+        return mark.type !== fontSizeMarkType;
+      }) : paragraphMarks;
+      return schema.nodes.paragraph.createChecked(undefined, node.content, destinationBlockMarkAttrs && fontSizeMarkType ? normalizedMarks.concat(fontSizeMarkType.create(destinationBlockMarkAttrs)) : normalizedMarks);
     } else if (node.type === schema.nodes.heading) {
       // Preserve heading attributes to keep formatting
       return schema.nodes.heading.createChecked(node.attrs, node.content, node.marks.filter(function (mark) {
@@ -947,6 +952,24 @@ export function handleParagraphBlockMarks(state, slice) {
     }
     return node;
   });
+  if (forbiddenMarkTypes.length === 0 && !shouldNormalizeFontSizeForTarget) {
+    // In a slice containing one or more paragraphs at the document level (not wrapped in
+    // another node), the first paragraph will only have its text content captured and pasted
+    // since openStart is 1. We decrement the open depth of the slice so it retains any block
+    // marks applied to it. We only care about the depth at the start of the selection so
+    // there's no need to change openEnd - the rest of the slice gets pasted correctly.
+    var openStart = Math.max(0, slice.openStart - 1);
+    return new Slice(slice.content, openStart, slice.openEnd);
+  }
+  if (forbiddenMarkTypes.length === 0 && shouldNormalizeFontSizeForTarget) {
+    var _openStart = Math.max(0, slice.openStart - 1);
+    return new Slice(normalizedContent.content, _openStart, slice.openEnd);
+  }
+
+  // If the paragraph or heading contains marks forbidden by the parent node
+  // (e.g. alignment/indentation), drop those marks from the slice. For lists under the small
+  // text experiment, also normalize fontSize to the destination list state.
+  return new Slice(normalizedContent.content, slice.openStart, slice.openEnd);
 }
 
 /**
@@ -988,7 +1011,7 @@ export function flattenNestedListInSlice(slice) {
 }
 export function handleRichText(slice, queueCardsFromChangedTr) {
   return function (state, dispatch) {
-    var _slice$content, _slice$content2, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
+    var _slice$content, _slice$content2, _findParentNodeOfType3, _firstChildOfSlice$ty, _lastChildOfSlice$typ, _panelParentOverCurre;
     var _state$schema$nodes4 = state.schema.nodes,
       codeBlock = _state$schema$nodes4.codeBlock,
       heading = _state$schema$nodes4.heading,
@@ -998,6 +1021,7 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
       schema = state.schema;
     var firstChildOfSlice = (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.firstChild;
     var lastChildOfSlice = (_slice$content2 = slice.content) === null || _slice$content2 === void 0 ? void 0 : _slice$content2.lastChild;
+    var destinationListFontSizeAttrs = expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getFirstParagraphBlockMarkAttrs((_findParentNodeOfType3 = findParentNodeOfType([schema.nodes.bulletList, schema.nodes.orderedList])(selection)) === null || _findParentNodeOfType3 === void 0 ? void 0 : _findParentNodeOfType3.node, schema.marks.fontSize) : false;
 
     // In case user is pasting inline code,
     // any backtick ` immediately preceding it should be removed.
@@ -1082,6 +1106,12 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
         }
       }
     }
+    if (expValEquals('platform_editor_small_font_size', 'isEnabled', true) && isSliceContentListNodes) {
+      var containingList = findParentNodeOfTypeClosestToPos(tr.doc.resolve(tr.mapping.map(selection.from)), [schema.nodes.bulletList, schema.nodes.orderedList]);
+      if (containingList) {
+        reconcileBlockMarkForContainerAtPos(tr, containingList.pos, schema.marks.fontSize, destinationListFontSizeAttrs);
+      }
+    }
     tr.setStoredMarks([]);
     if (tr.selection.empty && tr.selection.$from.parent.type === codeBlock) {
       tr.setSelection(TextSelection.near(tr.selection.$from, 1));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "9.0.16",
+	"version": "9.1.1",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -36,7 +36,7 @@
 		"@atlaskit/editor-plugin-card": "^13.1.0",
 		"@atlaskit/editor-plugin-expand": "^9.1.0",
 		"@atlaskit/editor-plugin-feature-flags": "^7.0.0",
-		"@atlaskit/editor-plugin-list": "^10.1.0",
+		"@atlaskit/editor-plugin-list": "^10.2.0",
 		"@atlaskit/editor-plugin-media": "^10.1.0",
 		"@atlaskit/editor-plugin-mentions": "^10.0.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
@@ -48,15 +48,15 @@
 		"@atlaskit/media-common": "^13.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/tmp-editor-statsig": "^48.1.0",
-		"@atlaskit/tokens": "^11.3.0",
+		"@atlaskit/tmp-editor-statsig": "^50.0.0",
+		"@atlaskit/tokens": "^11.4.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"react-intl-next": "npm:react-intl@^5.18.1",
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.11.0",
+		"@atlaskit/editor-common": "^112.13.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},