@atlaskit/editor-plugin-paste 11.0.4 → 11.0.6

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-paste
 
+## 11.0.6
+
+### Patch Changes
+
+- Updated dependencies
+
+## 11.0.5
+
+### Patch Changes
+
+- [`583f16df338b0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/583f16df338b0) -
+  Normalise small text fontSize mark on paste: strip fontSize when pasting into headings, and
+  preserve source style when pasting normal text into small-text paragraphs
+
 ## 11.0.4
 
 ### Patch Changes

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

@@ -992,7 +992,7 @@ function handleParagraphBlockMarks(state, slice) {
     paragraph = _schema$nodes3.paragraph,
     heading = _schema$nodes3.heading;
   var fontSize = schema.marks.fontSize;
-  var isSmallFontSizeEnabled = (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) && !!fontSize;
+  var isSmallFontSizeEnabled = !!fontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true);
 
   // When copying from inside a container (e.g. panel, expand), ProseMirror wraps the
   // content back in the container via addContext(), increasing openStart/openEnd. Unwrap
@@ -1005,6 +1005,7 @@ function handleParagraphBlockMarks(state, slice) {
   var isInNormalTaskContext = (currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === taskItem || $from.parent.type === taskItem;
   var isInSmallTaskContext = !!blockTaskItem && ((currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === blockTaskItem || $from.parent.type === blockTaskItem || $from.parent.type === paragraph && $from.depth > 0 && $from.node($from.depth - 1).type === blockTaskItem);
   var destinationBlockMarkAttrs = isSmallFontSizeEnabled ? getDestinationFontSizeAttrs(destinationListNode, isInSmallTaskContext, $from, currentNode, fontSize) : false;
+  var isInHeadingContext = $from.parent.type === heading;
 
   // 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.
@@ -1012,7 +1013,7 @@ function handleParagraphBlockMarks(state, slice) {
   if (!sliceHasTopLevelMarks(slice) && !destinationBlockMarkAttrs) {
     return slice;
   }
-  var shouldNormalizeFontSizeForTarget = isSmallFontSizeEnabled && (!!destinationListNode || isInNormalTaskContext || isInSmallTaskContext);
+  var shouldNormalizeFontSizeForTarget = isSmallFontSizeEnabled && (!!destinationListNode || isInNormalTaskContext || isInSmallTaskContext || isInHeadingContext);
 
   // 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
@@ -1065,7 +1066,9 @@ function handleParagraphBlockMarks(state, slice) {
     return new _model.Slice(slice.content, openStart, slice.openEnd);
   }
   if (forbiddenMarkTypes.length === 0 && shouldNormalizeFontSizeForTarget) {
-    var _openStart = Math.max(0, slice.openStart - 1);
+    // When pasting into a heading, keep the original openStart so ProseMirror merges inline
+    // content into the heading node rather than replacing it with a paragraph.
+    var _openStart = isInHeadingContext ? slice.openStart : Math.max(0, slice.openStart - 1);
     return new _model.Slice(normalizedContent.content, _openStart, slice.openEnd);
   }
 
@@ -1142,7 +1145,9 @@ function handleRichText(slice, queueCardsFromChangedTr) {
     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 listContainerNodeTypes = [bulletList, orderedList];
-    var destinationListFontSizeAttrs = (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) ? (0, _lists.getFirstParagraphBlockMarkAttrs)((_findParentNodeOfType3 = (0, _utils2.findParentNodeOfType)(listContainerNodeTypes)(selection)) === null || _findParentNodeOfType3 === void 0 ? void 0 : _findParentNodeOfType3.node, fontSize) : false;
+    var isSmallFontSizeEnabled = !!fontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true);
+    var destinationListNode = isSmallFontSizeEnabled ? (_findParentNodeOfType3 = (0, _utils2.findParentNodeOfType)(listContainerNodeTypes)(selection)) === null || _findParentNodeOfType3 === void 0 ? void 0 : _findParentNodeOfType3.node : undefined;
+    var destinationListFontSizeAttrs = isSmallFontSizeEnabled ? (0, _lists.getFirstParagraphBlockMarkAttrs)(destinationListNode, fontSize) : false;
 
     // In case user is pasting inline code,
     // any backtick ` immediately preceding it should be removed.
@@ -1162,6 +1167,17 @@ function handleRichText(slice, queueCardsFromChangedTr) {
     var isSliceContentTaskListNodes = isFirstChildTaskListNode || isLastChildTaskListNode;
     var sliceContentBlockquoteListNodes = doesSliceContainBlockquoteListNodes(slice, listContainerNodeTypes);
 
+    // Compute once and reuse below to avoid traversing the slice twice.
+    var sliceMarkTypes = isSmallFontSizeEnabled ? getTopLevelMarkTypesInSlice(slice) : new Set();
+    var destinationIsEmpty = isSmallFontSizeEnabled && selection.$from.parent.type === paragraph && selection.$from.parent.textContent.length === 0;
+
+    // Capture the destination paragraph's non-fontSize block marks (e.g. alignment, indentation)
+    // before the paste so they can be restored if the paste replaces the paragraph entirely
+    // (which happens when small text is pasted with openStart=0).
+    var destinationNonFontSizeBlockMarks = isSmallFontSizeEnabled && selection.$from.parent.type === paragraph && sliceMarkTypes.has(fontSize) ? selection.$from.parent.marks.filter(function (m) {
+      return m.type !== fontSize;
+    }) : [];
+
     // We want to use safeInsert to insert invalid content, as it inserts at the closest non schema violating position
     // rather than spliting the selection parent node in half (which is what replaceSelection does)
     // Exception is paragraph and heading nodes, these should be split, provided their parent supports the pasted content
@@ -1228,12 +1244,38 @@ function handleRichText(slice, queueCardsFromChangedTr) {
         }
       }
     }
-    if ((isSliceContentListNodes || sliceContentBlockquoteListNodes) && fontSize && (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true)) {
+
+    // font size handling for pasting into lists or blockquotes
+    if (isSmallFontSizeEnabled && (isSliceContentListNodes || sliceContentBlockquoteListNodes)) {
       var containingList = (0, _utils2.findParentNodeOfTypeClosestToPos)(tr.selection.$from, listContainerNodeTypes);
       if (containingList) {
         (0, _lists.reconcileBlockMarkForContainerAtPos)(tr, containingList.pos, fontSize, isSliceContentListNodes ? destinationListFontSizeAttrs : false);
       }
     }
+
+    // font size handling for pasting into paragraphs (normal text) - preserve source style
+    if (isSmallFontSizeEnabled && destinationIsEmpty && !sliceMarkTypes.has(fontSize) && !destinationListNode && selection.$from.parent.type === paragraph && (0, _lists.getBlockMarkAttrs)(selection.$from.parent, fontSize)) {
+      (0, _lists.reconcileBlockMarkForParagraphAtPos)(tr, tr.mapping.map(selection.$from.pos), fontSize, false);
+    }
+
+    // Restore destination block marks (e.g. alignment) that were lost when pasting small text
+    // replaced the paragraph entirely (openStart=0 from container unwrap).
+    if (isSmallFontSizeEnabled && destinationNonFontSizeBlockMarks.length > 0) {
+      var pastedFrom = tr.mapping.map(selection.from, -1);
+      var pastedTo = tr.mapping.map(selection.to, 1);
+      var _iterator2 = _createForOfIteratorHelper(destinationNonFontSizeBlockMarks),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var mark = _step2.value;
+          (0, _lists.reconcileBlockMarkInRange)(tr, pastedFrom, pastedTo, mark.type, mark.attrs);
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    }
     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,7 +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 { getBlockMarkAttrs, getFirstParagraphBlockMarkAttrs, reconcileBlockMarkForContainerAtPos, reconcileBlockMarkForParagraphAtPos, reconcileBlockMarkInRange } 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';
@@ -979,7 +979,7 @@ export function handleParagraphBlockMarks(state, slice) {
   const {
     fontSize
   } = schema.marks;
-  const isSmallFontSizeEnabled = expValEquals('platform_editor_small_font_size', 'isEnabled', true) && !!fontSize;
+  const isSmallFontSizeEnabled = !!fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
 
   // When copying from inside a container (e.g. panel, expand), ProseMirror wraps the
   // content back in the container via addContext(), increasing openStart/openEnd. Unwrap
@@ -992,6 +992,7 @@ export function handleParagraphBlockMarks(state, slice) {
   const isInNormalTaskContext = (currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === taskItem || $from.parent.type === taskItem;
   const isInSmallTaskContext = !!blockTaskItem && ((currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === blockTaskItem || $from.parent.type === blockTaskItem || $from.parent.type === paragraph && $from.depth > 0 && $from.node($from.depth - 1).type === blockTaskItem);
   const destinationBlockMarkAttrs = isSmallFontSizeEnabled ? getDestinationFontSizeAttrs(destinationListNode, isInSmallTaskContext, $from, currentNode, fontSize) : false;
+  const isInHeadingContext = $from.parent.type === heading;
 
   // 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.
@@ -999,7 +1000,7 @@ export function handleParagraphBlockMarks(state, slice) {
   if (!sliceHasTopLevelMarks(slice) && !destinationBlockMarkAttrs) {
     return slice;
   }
-  const shouldNormalizeFontSizeForTarget = isSmallFontSizeEnabled && (!!destinationListNode || isInNormalTaskContext || isInSmallTaskContext);
+  const shouldNormalizeFontSizeForTarget = isSmallFontSizeEnabled && (!!destinationListNode || isInNormalTaskContext || isInSmallTaskContext || isInHeadingContext);
 
   // 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
@@ -1039,7 +1040,9 @@ export function handleParagraphBlockMarks(state, slice) {
     return new Slice(slice.content, openStart, slice.openEnd);
   }
   if (forbiddenMarkTypes.length === 0 && shouldNormalizeFontSizeForTarget) {
-    const openStart = Math.max(0, slice.openStart - 1);
+    // When pasting into a heading, keep the original openStart so ProseMirror merges inline
+    // content into the heading node rather than replacing it with a paragraph.
+    const openStart = isInHeadingContext ? slice.openStart : Math.max(0, slice.openStart - 1);
     return new Slice(normalizedContent.content, openStart, slice.openEnd);
   }
 
@@ -1121,7 +1124,9 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
     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 listContainerNodeTypes = [bulletList, orderedList];
-    const destinationListFontSizeAttrs = expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getFirstParagraphBlockMarkAttrs((_findParentNodeOfType3 = findParentNodeOfType(listContainerNodeTypes)(selection)) === null || _findParentNodeOfType3 === void 0 ? void 0 : _findParentNodeOfType3.node, fontSize) : false;
+    const isSmallFontSizeEnabled = !!fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
+    const destinationListNode = isSmallFontSizeEnabled ? (_findParentNodeOfType3 = findParentNodeOfType(listContainerNodeTypes)(selection)) === null || _findParentNodeOfType3 === void 0 ? void 0 : _findParentNodeOfType3.node : undefined;
+    const destinationListFontSizeAttrs = isSmallFontSizeEnabled ? getFirstParagraphBlockMarkAttrs(destinationListNode, fontSize) : false;
 
     // In case user is pasting inline code,
     // any backtick ` immediately preceding it should be removed.
@@ -1141,6 +1146,15 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
     const isSliceContentTaskListNodes = isFirstChildTaskListNode || isLastChildTaskListNode;
     const sliceContentBlockquoteListNodes = doesSliceContainBlockquoteListNodes(slice, listContainerNodeTypes);
 
+    // Compute once and reuse below to avoid traversing the slice twice.
+    const sliceMarkTypes = isSmallFontSizeEnabled ? getTopLevelMarkTypesInSlice(slice) : new Set();
+    const destinationIsEmpty = isSmallFontSizeEnabled && selection.$from.parent.type === paragraph && selection.$from.parent.textContent.length === 0;
+
+    // Capture the destination paragraph's non-fontSize block marks (e.g. alignment, indentation)
+    // before the paste so they can be restored if the paste replaces the paragraph entirely
+    // (which happens when small text is pasted with openStart=0).
+    const destinationNonFontSizeBlockMarks = isSmallFontSizeEnabled && selection.$from.parent.type === paragraph && sliceMarkTypes.has(fontSize) ? selection.$from.parent.marks.filter(m => m.type !== fontSize) : [];
+
     // We want to use safeInsert to insert invalid content, as it inserts at the closest non schema violating position
     // rather than spliting the selection parent node in half (which is what replaceSelection does)
     // Exception is paragraph and heading nodes, these should be split, provided their parent supports the pasted content
@@ -1207,12 +1221,29 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
         }
       }
     }
-    if ((isSliceContentListNodes || sliceContentBlockquoteListNodes) && fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+
+    // font size handling for pasting into lists or blockquotes
+    if (isSmallFontSizeEnabled && (isSliceContentListNodes || sliceContentBlockquoteListNodes)) {
       const containingList = findParentNodeOfTypeClosestToPos(tr.selection.$from, listContainerNodeTypes);
       if (containingList) {
         reconcileBlockMarkForContainerAtPos(tr, containingList.pos, fontSize, isSliceContentListNodes ? destinationListFontSizeAttrs : false);
       }
     }
+
+    // font size handling for pasting into paragraphs (normal text) - preserve source style
+    if (isSmallFontSizeEnabled && destinationIsEmpty && !sliceMarkTypes.has(fontSize) && !destinationListNode && selection.$from.parent.type === paragraph && getBlockMarkAttrs(selection.$from.parent, fontSize)) {
+      reconcileBlockMarkForParagraphAtPos(tr, tr.mapping.map(selection.$from.pos), fontSize, false);
+    }
+
+    // Restore destination block marks (e.g. alignment) that were lost when pasting small text
+    // replaced the paragraph entirely (openStart=0 from container unwrap).
+    if (isSmallFontSizeEnabled && destinationNonFontSizeBlockMarks.length > 0) {
+      const pastedFrom = tr.mapping.map(selection.from, -1);
+      const pastedTo = tr.mapping.map(selection.to, 1);
+      for (const mark of destinationNonFontSizeBlockMarks) {
+        reconcileBlockMarkInRange(tr, pastedFrom, pastedTo, mark.type, mark.attrs);
+      }
+    }
     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,7 +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 { getBlockMarkAttrs, getFirstParagraphBlockMarkAttrs, reconcileBlockMarkForContainerAtPos, reconcileBlockMarkForParagraphAtPos, reconcileBlockMarkInRange } 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';
@@ -965,7 +965,7 @@ export function handleParagraphBlockMarks(state, slice) {
     paragraph = _schema$nodes3.paragraph,
     heading = _schema$nodes3.heading;
   var fontSize = schema.marks.fontSize;
-  var isSmallFontSizeEnabled = expValEquals('platform_editor_small_font_size', 'isEnabled', true) && !!fontSize;
+  var isSmallFontSizeEnabled = !!fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
 
   // When copying from inside a container (e.g. panel, expand), ProseMirror wraps the
   // content back in the container via addContext(), increasing openStart/openEnd. Unwrap
@@ -978,6 +978,7 @@ export function handleParagraphBlockMarks(state, slice) {
   var isInNormalTaskContext = (currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === taskItem || $from.parent.type === taskItem;
   var isInSmallTaskContext = !!blockTaskItem && ((currentNode === null || currentNode === void 0 ? void 0 : currentNode.type) === blockTaskItem || $from.parent.type === blockTaskItem || $from.parent.type === paragraph && $from.depth > 0 && $from.node($from.depth - 1).type === blockTaskItem);
   var destinationBlockMarkAttrs = isSmallFontSizeEnabled ? getDestinationFontSizeAttrs(destinationListNode, isInSmallTaskContext, $from, currentNode, fontSize) : false;
+  var isInHeadingContext = $from.parent.type === heading;
 
   // 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.
@@ -985,7 +986,7 @@ export function handleParagraphBlockMarks(state, slice) {
   if (!sliceHasTopLevelMarks(slice) && !destinationBlockMarkAttrs) {
     return slice;
   }
-  var shouldNormalizeFontSizeForTarget = isSmallFontSizeEnabled && (!!destinationListNode || isInNormalTaskContext || isInSmallTaskContext);
+  var shouldNormalizeFontSizeForTarget = isSmallFontSizeEnabled && (!!destinationListNode || isInNormalTaskContext || isInSmallTaskContext || isInHeadingContext);
 
   // 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
@@ -1038,7 +1039,9 @@ export function handleParagraphBlockMarks(state, slice) {
     return new Slice(slice.content, openStart, slice.openEnd);
   }
   if (forbiddenMarkTypes.length === 0 && shouldNormalizeFontSizeForTarget) {
-    var _openStart = Math.max(0, slice.openStart - 1);
+    // When pasting into a heading, keep the original openStart so ProseMirror merges inline
+    // content into the heading node rather than replacing it with a paragraph.
+    var _openStart = isInHeadingContext ? slice.openStart : Math.max(0, slice.openStart - 1);
     return new Slice(normalizedContent.content, _openStart, slice.openEnd);
   }
 
@@ -1115,7 +1118,9 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
     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 listContainerNodeTypes = [bulletList, orderedList];
-    var destinationListFontSizeAttrs = expValEquals('platform_editor_small_font_size', 'isEnabled', true) ? getFirstParagraphBlockMarkAttrs((_findParentNodeOfType3 = findParentNodeOfType(listContainerNodeTypes)(selection)) === null || _findParentNodeOfType3 === void 0 ? void 0 : _findParentNodeOfType3.node, fontSize) : false;
+    var isSmallFontSizeEnabled = !!fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true);
+    var destinationListNode = isSmallFontSizeEnabled ? (_findParentNodeOfType3 = findParentNodeOfType(listContainerNodeTypes)(selection)) === null || _findParentNodeOfType3 === void 0 ? void 0 : _findParentNodeOfType3.node : undefined;
+    var destinationListFontSizeAttrs = isSmallFontSizeEnabled ? getFirstParagraphBlockMarkAttrs(destinationListNode, fontSize) : false;
 
     // In case user is pasting inline code,
     // any backtick ` immediately preceding it should be removed.
@@ -1135,6 +1140,17 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
     var isSliceContentTaskListNodes = isFirstChildTaskListNode || isLastChildTaskListNode;
     var sliceContentBlockquoteListNodes = doesSliceContainBlockquoteListNodes(slice, listContainerNodeTypes);
 
+    // Compute once and reuse below to avoid traversing the slice twice.
+    var sliceMarkTypes = isSmallFontSizeEnabled ? getTopLevelMarkTypesInSlice(slice) : new Set();
+    var destinationIsEmpty = isSmallFontSizeEnabled && selection.$from.parent.type === paragraph && selection.$from.parent.textContent.length === 0;
+
+    // Capture the destination paragraph's non-fontSize block marks (e.g. alignment, indentation)
+    // before the paste so they can be restored if the paste replaces the paragraph entirely
+    // (which happens when small text is pasted with openStart=0).
+    var destinationNonFontSizeBlockMarks = isSmallFontSizeEnabled && selection.$from.parent.type === paragraph && sliceMarkTypes.has(fontSize) ? selection.$from.parent.marks.filter(function (m) {
+      return m.type !== fontSize;
+    }) : [];
+
     // We want to use safeInsert to insert invalid content, as it inserts at the closest non schema violating position
     // rather than spliting the selection parent node in half (which is what replaceSelection does)
     // Exception is paragraph and heading nodes, these should be split, provided their parent supports the pasted content
@@ -1201,12 +1217,38 @@ export function handleRichText(slice, queueCardsFromChangedTr) {
         }
       }
     }
-    if ((isSliceContentListNodes || sliceContentBlockquoteListNodes) && fontSize && expValEquals('platform_editor_small_font_size', 'isEnabled', true)) {
+
+    // font size handling for pasting into lists or blockquotes
+    if (isSmallFontSizeEnabled && (isSliceContentListNodes || sliceContentBlockquoteListNodes)) {
       var containingList = findParentNodeOfTypeClosestToPos(tr.selection.$from, listContainerNodeTypes);
       if (containingList) {
         reconcileBlockMarkForContainerAtPos(tr, containingList.pos, fontSize, isSliceContentListNodes ? destinationListFontSizeAttrs : false);
       }
     }
+
+    // font size handling for pasting into paragraphs (normal text) - preserve source style
+    if (isSmallFontSizeEnabled && destinationIsEmpty && !sliceMarkTypes.has(fontSize) && !destinationListNode && selection.$from.parent.type === paragraph && getBlockMarkAttrs(selection.$from.parent, fontSize)) {
+      reconcileBlockMarkForParagraphAtPos(tr, tr.mapping.map(selection.$from.pos), fontSize, false);
+    }
+
+    // Restore destination block marks (e.g. alignment) that were lost when pasting small text
+    // replaced the paragraph entirely (openStart=0 from container unwrap).
+    if (isSmallFontSizeEnabled && destinationNonFontSizeBlockMarks.length > 0) {
+      var pastedFrom = tr.mapping.map(selection.from, -1);
+      var pastedTo = tr.mapping.map(selection.to, 1);
+      var _iterator2 = _createForOfIteratorHelper(destinationNonFontSizeBlockMarks),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var mark = _step2.value;
+          reconcileBlockMarkInRange(tr, pastedFrom, pastedTo, mark.type, mark.attrs);
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    }
     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": "11.0.4",
+	"version": "11.0.6",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,14 +31,14 @@
 		"@atlaskit/code": "^17.4.0",
 		"@atlaskit/editor-markdown-transformer": "^5.20.0",
 		"@atlaskit/editor-plugin-analytics": "^10.0.0",
-		"@atlaskit/editor-plugin-annotation": "^10.0.0",
+		"@atlaskit/editor-plugin-annotation": "^10.1.0",
 		"@atlaskit/editor-plugin-better-type-history": "^10.0.0",
-		"@atlaskit/editor-plugin-card": "^16.0.0",
+		"@atlaskit/editor-plugin-card": "^16.2.0",
 		"@atlaskit/editor-plugin-expand": "^11.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^9.0.0",
 		"@atlaskit/editor-plugin-list": "^12.0.0",
 		"@atlaskit/editor-plugin-media": "^12.1.0",
-		"@atlaskit/editor-plugin-mentions": "^12.0.0",
+		"@atlaskit/editor-plugin-mentions": "^12.1.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/flag": "^17.9.0",
@@ -48,14 +48,14 @@
 		"@atlaskit/media-common": "^13.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/tmp-editor-statsig": "^64.0.0",
+		"@atlaskit/tmp-editor-statsig": "^65.0.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.5.0",
+		"@atlaskit/editor-common": "^114.6.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"