@atlaskit/editor-plugin-paste 11.0.1 → 11.0.3

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-plugin-paste
 
+## 11.0.3
+
+### Patch Changes
+
+- [`402738b592e0b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/402738b592e0b) -
+  Fix invalid flexible list structures caused by delete, paste, and typing operations.
+
+  Under platform_editor_flexible_list_schema, operations that remove content spanning list or task
+  list items could leave nodes with a nested list as their first child instead of a required
+  paragraph/item. Normalisation now runs efficiently on all relevant transactions in
+  appendTransaction.
+
+- Updated dependencies
+
+## 11.0.2
+
+### Patch Changes
+
+- [`90779068bff5a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/90779068bff5a) -
+  Fix: preserve fontSize block mark when pasting small text copied from inside container nodes (e.g.
+  panel, expand). ProseMirror wraps the pasted content back in the container context, increasing
+  openStart/openEnd. handleParagraphBlockMarks now unwraps these container nodes so the fontSize
+  mark is preserved during paste.
+
 ## 11.0.1
 
 ### Patch Changes

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

@@ -45,30 +45,6 @@ var _tinyMCE = require("./util/tinyMCE");
 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; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; } // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
-function isListIntoListPaste(tr, state) {
-  var _state$schema$nodes = state.schema.nodes,
-    listItem = _state$schema$nodes.listItem,
-    bulletList = _state$schema$nodes.bulletList,
-    orderedList = _state$schema$nodes.orderedList;
-  var _state$selection = state.selection,
-    $from = _state$selection.$from,
-    $to = _state$selection.$to;
-  var selectionInList = !!(0, _utils2.findParentNodeOfTypeClosestToPos)($from, [listItem]) || !!(0, _utils2.findParentNodeOfTypeClosestToPos)($to, [listItem]);
-  if (!selectionInList) {
-    return false;
-  }
-  return tr.steps.some(function (step) {
-    var _slice$content;
-    var slice = (0, _utils.extractSliceFromStep)(step);
-    var listExists = false;
-    slice === null || slice === void 0 || (_slice$content = slice.content) === null || _slice$content === void 0 || _slice$content.forEach(function (node) {
-      if (node.type === bulletList || node.type === orderedList) {
-        listExists = true;
-      }
-    });
-    return listExists;
-  });
-}
 var isInsideBlockQuote = exports.isInsideBlockQuote = function isInsideBlockQuote(state) {
   var blockquote = state.schema.nodes.blockquote;
   return (0, _utils2.hasParentNodeOfType)(blockquote)(state.selection);
@@ -307,10 +283,10 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
           // to split those repairing transactions in prosemirror-history when they're being added to the
           // "done" stack
           var isPastingTable = tr.steps.some(function (step) {
-            var _slice$content2;
+            var _slice$content;
             var slice = (0, _utils.extractSliceFromStep)(step);
             var tableExists = false;
-            slice === null || slice === void 0 || (_slice$content2 = slice.content) === null || _slice$content2 === void 0 || _slice$content2.forEach(function (node) {
+            slice === null || slice === void 0 || (_slice$content = slice.content) === null || _slice$content === void 0 || _slice$content.forEach(function (node) {
               if (node.type === state.schema.nodes.table) {
                 tableExists = true;
               }
@@ -318,14 +294,26 @@ function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFlags, pl
             return tableExists;
           });
 
-          // Don't add closeHistory if we're pasting a list into a list, as the list plugin will
-          // appendTransaction to normalise the list structure and we want to keep the paste and
-          // normalisation as one undo event. We also set a meta on the transaction so the list
-          // plugin's appendTransaction can cheaply detect this case without re-checking flags.
-          if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_flexible_list_schema', 'isEnabled', true) && isListIntoListPaste(tr, state)) {
-            tr = tr.setMeta('listPasteNormalisation', true);
+          // Don't flag as a paste event (add closeHistory) when the paste affects a list and
+          // the list plugin's appendTransaction will normalise the structure, and we want the
+          // paste + normalisation to be a single undo step.
+          // Pasting into an existing list — selection is inside a list node.
+          var isPastingIntoList = false;
+          // Pasting list content from an external source — slice top-level contains a list node.
+          var isPastingListContent = false;
+          if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_flexible_list_schema', 'isEnabled', true)) {
+            var listNodeTypes = [state.schema.nodes.bulletList, state.schema.nodes.orderedList, state.schema.nodes.taskList].filter(function (n) {
+              return Boolean(n);
+            });
+            isPastingIntoList = (0, _utils2.hasParentNodeOfType)(listNodeTypes)(state.selection);
+            for (var i = 0; i < slice.content.childCount; i++) {
+              if (listNodeTypes.includes(slice.content.child(i).type)) {
+                isPastingListContent = true;
+                break;
+              }
+            }
           }
-          if (!isPastingTextInsidePlaceholderText && !isPastingTable && !isPastingOverLayoutColumns && !tr.getMeta('listPasteNormalisation') && pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.betterTypeHistory) {
+          if (!isPastingTextInsidePlaceholderText && !isPastingTable && !isPastingOverLayoutColumns && !isPastingIntoList && !isPastingListContent && pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.betterTypeHistory) {
             var _pluginInjectionApi$b;
             tr = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$b = pluginInjectionApi.betterTypeHistory) === null || _pluginInjectionApi$b === void 0 ? void 0 : _pluginInjectionApi$b.actions.flagPasteEvent(tr);
           }

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

@@ -912,6 +912,70 @@ function getTopLevelMarkTypesInSlice(slice) {
   });
   return markTypes;
 }
+
+/**
+ * Peels container wrapper nodes (e.g. panel, expand) added by ProseMirror's addContext()
+ * so that fontSize-marked paragraphs become top-level, preserving the mark on paste.
+ */
+function unwrapContainerNodesWithBlockMarks(slice, schema, fontSize) {
+  var content = slice.content;
+  var levelsUnwrapped = 0;
+  while (content.childCount === 1 && content.firstChild && !content.firstChild.isTextblock && slice.openStart - levelsUnwrapped > 1) {
+    var hasBlockMarkedParagraph = false;
+    for (var i = 0; i < content.firstChild.childCount; i++) {
+      var child = content.firstChild.child(i);
+      if (child.type === schema.nodes.paragraph && child.marks.some(function (m) {
+        return m.type === fontSize;
+      })) {
+        hasBlockMarkedParagraph = true;
+        break;
+      }
+    }
+    if (!hasBlockMarkedParagraph) {
+      break;
+    }
+    content = content.firstChild.content;
+    levelsUnwrapped++;
+  }
+  if (levelsUnwrapped === 0) {
+    return slice;
+  }
+  return new _model.Slice(content, slice.openStart - levelsUnwrapped, Math.max(0, slice.openEnd - levelsUnwrapped));
+}
+
+/**
+ * Returns the fontSize attrs to apply at the paste destination, or false if none.
+ * Checks list and task destinations in priority order.
+ */
+function getDestinationFontSizeAttrs(destinationListNode, isInSmallTaskContext, $from, currentNode, fontSize) {
+  if (destinationListNode) {
+    return (0, _lists.getFirstParagraphBlockMarkAttrs)(destinationListNode, fontSize);
+  }
+  if (isInSmallTaskContext) {
+    return (0, _lists.getBlockMarkAttrs)($from.parent, fontSize) || (0, _lists.getFirstParagraphBlockMarkAttrs)(currentNode, fontSize);
+  }
+  return false;
+}
+
+/**
+ * Resolves which marks to apply to a paragraph node after filtering forbidden marks.
+ * When a destination block mark is provided, replaces any existing fontSize mark with it.
+ * When normalizing for the target context, removes the fontSize mark entirely.
+ * Otherwise returns the filtered marks unchanged.
+ */
+function resolveParagraphMarks(marks, destinationBlockMarkAttrs, shouldNormalize, fontSize) {
+  if (destinationBlockMarkAttrs) {
+    return marks.filter(function (m) {
+      return m.type !== fontSize;
+    }).concat(fontSize.create(destinationBlockMarkAttrs));
+  }
+  if (shouldNormalize) {
+    return marks.filter(function (m) {
+      return m.type !== fontSize;
+    });
+  }
+  return marks;
+}
 function handleParagraphBlockMarks(state, slice) {
   var _findParentNodeOfType2;
   if (slice.content.size === 0) {
@@ -928,12 +992,19 @@ 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;
+
+  // When copying from inside a container (e.g. panel, expand), ProseMirror wraps the
+  // content back in the container via addContext(), increasing openStart/openEnd. Unwrap
+  // so the paragraph (with its fontSize mark) becomes top-level.
+  if (isSmallFontSizeEnabled) {
+    slice = unwrapContainerNodesWithBlockMarks(slice, schema, fontSize);
+  }
   var destinationListNode = (_findParentNodeOfType2 = (0, _utils2.findParentNodeOfType)([bulletList, 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) === 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 isSmallFontSizeEnabled = (0, _expValEquals.expValEquals)('platform_editor_small_font_size', 'isEnabled', true) && !!fontSize;
-  var destinationBlockMarkAttrs = isSmallFontSizeEnabled ? destinationListNode ? (0, _lists.getFirstParagraphBlockMarkAttrs)(destinationListNode, fontSize) : isInSmallTaskContext ? (0, _lists.getBlockMarkAttrs)($from.parent, fontSize) || (0, _lists.getFirstParagraphBlockMarkAttrs)(currentNode, fontSize) : false : false;
+  var destinationBlockMarkAttrs = isSmallFontSizeEnabled ? getDestinationFontSizeAttrs(destinationListNode, isInSmallTaskContext, $from, currentNode, fontSize) : 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.
@@ -975,11 +1046,7 @@ function handleParagraphBlockMarks(state, slice) {
       var paragraphMarks = node.marks.filter(function (mark) {
         return !forbiddenMarkTypes.includes(mark.type);
       });
-      return paragraph.createChecked(undefined, node.content, destinationBlockMarkAttrs ? paragraphMarks.filter(function (mark) {
-        return mark.type !== fontSize;
-      }).concat(fontSize.create(destinationBlockMarkAttrs)) : shouldNormalizeFontSizeForTarget ? paragraphMarks.filter(function (mark) {
-        return mark.type !== fontSize;
-      }) : paragraphMarks);
+      return paragraph.createChecked(undefined, node.content, resolveParagraphMarks(paragraphMarks, destinationBlockMarkAttrs, shouldNormalizeFontSizeForTarget, fontSize));
     } else if (node.type === heading) {
       // Preserve heading attributes to keep formatting
       return heading.createChecked(node.attrs, node.content, node.marks.filter(function (mark) {

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

@@ -13,7 +13,7 @@ import { removeBreakoutFromRendererSyncBlockHTML, transformSingleColumnLayout, t
 import { containsAnyAnnotations, extractSliceFromStep, linkifyContent, mapChildren } from '@atlaskit/editor-common/utils';
 import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import { contains, findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { contains, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
 import { insm } from '@atlaskit/insm';
 import { extractClientIdsFromHtml } from '@atlaskit/media-common';
@@ -32,32 +32,6 @@ import { handleVSCodeBlock } from './util/edge-cases/handleVSCodeBlock';
 import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks, handlePasteExpand, handleTableContentPasteInBodiedExtension } from './util/handlers';
 import { handleSyncBlocksPaste } from './util/sync-block';
 import { htmlHasIncompleteTable, isPastedFromTinyMCEConfluence, tryRebuildCompleteTableHtml } from './util/tinyMCE';
-function isListIntoListPaste(tr, state) {
-  const {
-    listItem,
-    bulletList,
-    orderedList
-  } = state.schema.nodes;
-  const {
-    $from,
-    $to
-  } = state.selection;
-  const selectionInList = !!findParentNodeOfTypeClosestToPos($from, [listItem]) || !!findParentNodeOfTypeClosestToPos($to, [listItem]);
-  if (!selectionInList) {
-    return false;
-  }
-  return tr.steps.some(step => {
-    var _slice$content;
-    const slice = extractSliceFromStep(step);
-    let listExists = false;
-    slice === null || slice === void 0 ? void 0 : (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.forEach(node => {
-      if (node.type === bulletList || node.type === orderedList) {
-        listExists = true;
-      }
-    });
-    return listExists;
-  });
-}
 export const isInsideBlockQuote = state => {
   const {
     blockquote
@@ -271,10 +245,10 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           // to split those repairing transactions in prosemirror-history when they're being added to the
           // "done" stack
           const isPastingTable = tr.steps.some(step => {
-            var _slice$content2;
+            var _slice$content;
             const slice = extractSliceFromStep(step);
             let tableExists = false;
-            slice === null || slice === void 0 ? void 0 : (_slice$content2 = slice.content) === null || _slice$content2 === void 0 ? void 0 : _slice$content2.forEach(node => {
+            slice === null || slice === void 0 ? void 0 : (_slice$content = slice.content) === null || _slice$content === void 0 ? void 0 : _slice$content.forEach(node => {
               if (node.type === state.schema.nodes.table) {
                 tableExists = true;
               }
@@ -282,14 +256,24 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
             return tableExists;
           });
 
-          // Don't add closeHistory if we're pasting a list into a list, as the list plugin will
-          // appendTransaction to normalise the list structure and we want to keep the paste and
-          // normalisation as one undo event. We also set a meta on the transaction so the list
-          // plugin's appendTransaction can cheaply detect this case without re-checking flags.
-          if (expValEqualsNoExposure('platform_editor_flexible_list_schema', 'isEnabled', true) && isListIntoListPaste(tr, state)) {
-            tr = tr.setMeta('listPasteNormalisation', true);
+          // Don't flag as a paste event (add closeHistory) when the paste affects a list and
+          // the list plugin's appendTransaction will normalise the structure, and we want the
+          // paste + normalisation to be a single undo step.
+          // Pasting into an existing list — selection is inside a list node.
+          let isPastingIntoList = false;
+          // Pasting list content from an external source — slice top-level contains a list node.
+          let isPastingListContent = false;
+          if (expValEqualsNoExposure('platform_editor_flexible_list_schema', 'isEnabled', true)) {
+            const listNodeTypes = [state.schema.nodes.bulletList, state.schema.nodes.orderedList, state.schema.nodes.taskList].filter(n => Boolean(n));
+            isPastingIntoList = hasParentNodeOfType(listNodeTypes)(state.selection);
+            for (let i = 0; i < slice.content.childCount; i++) {
+              if (listNodeTypes.includes(slice.content.child(i).type)) {
+                isPastingListContent = true;
+                break;
+              }
+            }
           }
-          if (!isPastingTextInsidePlaceholderText && !isPastingTable && !isPastingOverLayoutColumns && !tr.getMeta('listPasteNormalisation') && pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.betterTypeHistory) {
+          if (!isPastingTextInsidePlaceholderText && !isPastingTable && !isPastingOverLayoutColumns && !isPastingIntoList && !isPastingListContent && pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.betterTypeHistory) {
             var _pluginInjectionApi$b;
             tr = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$b = pluginInjectionApi.betterTypeHistory) === null || _pluginInjectionApi$b === void 0 ? void 0 : _pluginInjectionApi$b.actions.flagPasteEvent(tr);
           }

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

@@ -898,6 +898,64 @@ function getTopLevelMarkTypesInSlice(slice) {
   });
   return markTypes;
 }
+
+/**
+ * Peels container wrapper nodes (e.g. panel, expand) added by ProseMirror's addContext()
+ * so that fontSize-marked paragraphs become top-level, preserving the mark on paste.
+ */
+function unwrapContainerNodesWithBlockMarks(slice, schema, fontSize) {
+  let content = slice.content;
+  let levelsUnwrapped = 0;
+  while (content.childCount === 1 && content.firstChild && !content.firstChild.isTextblock && slice.openStart - levelsUnwrapped > 1) {
+    let hasBlockMarkedParagraph = false;
+    for (let i = 0; i < content.firstChild.childCount; i++) {
+      const child = content.firstChild.child(i);
+      if (child.type === schema.nodes.paragraph && child.marks.some(m => m.type === fontSize)) {
+        hasBlockMarkedParagraph = true;
+        break;
+      }
+    }
+    if (!hasBlockMarkedParagraph) {
+      break;
+    }
+    content = content.firstChild.content;
+    levelsUnwrapped++;
+  }
+  if (levelsUnwrapped === 0) {
+    return slice;
+  }
+  return new Slice(content, slice.openStart - levelsUnwrapped, Math.max(0, slice.openEnd - levelsUnwrapped));
+}
+
+/**
+ * Returns the fontSize attrs to apply at the paste destination, or false if none.
+ * Checks list and task destinations in priority order.
+ */
+function getDestinationFontSizeAttrs(destinationListNode, isInSmallTaskContext, $from, currentNode, fontSize) {
+  if (destinationListNode) {
+    return getFirstParagraphBlockMarkAttrs(destinationListNode, fontSize);
+  }
+  if (isInSmallTaskContext) {
+    return getBlockMarkAttrs($from.parent, fontSize) || getFirstParagraphBlockMarkAttrs(currentNode, fontSize);
+  }
+  return false;
+}
+
+/**
+ * Resolves which marks to apply to a paragraph node after filtering forbidden marks.
+ * When a destination block mark is provided, replaces any existing fontSize mark with it.
+ * When normalizing for the target context, removes the fontSize mark entirely.
+ * Otherwise returns the filtered marks unchanged.
+ */
+function resolveParagraphMarks(marks, destinationBlockMarkAttrs, shouldNormalize, fontSize) {
+  if (destinationBlockMarkAttrs) {
+    return marks.filter(m => m.type !== fontSize).concat(fontSize.create(destinationBlockMarkAttrs));
+  }
+  if (shouldNormalize) {
+    return marks.filter(m => m.type !== fontSize);
+  }
+  return marks;
+}
 export function handleParagraphBlockMarks(state, slice) {
   var _findParentNodeOfType2;
   if (slice.content.size === 0) {
@@ -921,12 +979,19 @@ export function handleParagraphBlockMarks(state, slice) {
   const {
     fontSize
   } = schema.marks;
+  const isSmallFontSizeEnabled = expValEquals('platform_editor_small_font_size', 'isEnabled', true) && !!fontSize;
+
+  // When copying from inside a container (e.g. panel, expand), ProseMirror wraps the
+  // content back in the container via addContext(), increasing openStart/openEnd. Unwrap
+  // so the paragraph (with its fontSize mark) becomes top-level.
+  if (isSmallFontSizeEnabled) {
+    slice = unwrapContainerNodesWithBlockMarks(slice, schema, fontSize);
+  }
   const destinationListNode = (_findParentNodeOfType2 = findParentNodeOfType([bulletList, 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) === 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 isSmallFontSizeEnabled = expValEquals('platform_editor_small_font_size', 'isEnabled', true) && !!fontSize;
-  const destinationBlockMarkAttrs = isSmallFontSizeEnabled ? destinationListNode ? getFirstParagraphBlockMarkAttrs(destinationListNode, fontSize) : isInSmallTaskContext ? getBlockMarkAttrs($from.parent, fontSize) || getFirstParagraphBlockMarkAttrs(currentNode, fontSize) : false : false;
+  const destinationBlockMarkAttrs = isSmallFontSizeEnabled ? getDestinationFontSizeAttrs(destinationListNode, isInSmallTaskContext, $from, currentNode, fontSize) : 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.
@@ -957,7 +1022,7 @@ export function handleParagraphBlockMarks(state, slice) {
   const normalizedContent = mapSlice(slice, node => {
     if (node.type === paragraph) {
       const paragraphMarks = node.marks.filter(mark => !forbiddenMarkTypes.includes(mark.type));
-      return paragraph.createChecked(undefined, node.content, destinationBlockMarkAttrs ? paragraphMarks.filter(mark => mark.type !== fontSize).concat(fontSize.create(destinationBlockMarkAttrs)) : shouldNormalizeFontSizeForTarget ? paragraphMarks.filter(mark => mark.type !== fontSize) : paragraphMarks);
+      return paragraph.createChecked(undefined, node.content, resolveParagraphMarks(paragraphMarks, destinationBlockMarkAttrs, shouldNormalizeFontSizeForTarget, fontSize));
     } else if (node.type === heading) {
       // Preserve heading attributes to keep formatting
       return heading.createChecked(node.attrs, node.content, node.marks.filter(mark => !forbiddenMarkTypes.includes(mark.type)));

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

@@ -18,7 +18,7 @@ import { removeBreakoutFromRendererSyncBlockHTML, transformSingleColumnLayout, t
 import { containsAnyAnnotations, extractSliceFromStep, linkifyContent, mapChildren } from '@atlaskit/editor-common/utils';
 import { MarkdownTransformer } from '@atlaskit/editor-markdown-transformer';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
-import { contains, findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
+import { contains, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { handlePaste as handlePasteTable } from '@atlaskit/editor-tables/utils';
 import { insm } from '@atlaskit/insm';
 import { extractClientIdsFromHtml } from '@atlaskit/media-common';
@@ -37,30 +37,6 @@ import { handleVSCodeBlock } from './util/edge-cases/handleVSCodeBlock';
 import { handleMacroAutoConvert, handleMention, handleParagraphBlockMarks, handlePasteExpand, handleTableContentPasteInBodiedExtension } from './util/handlers';
 import { handleSyncBlocksPaste } from './util/sync-block';
 import { htmlHasIncompleteTable, isPastedFromTinyMCEConfluence, tryRebuildCompleteTableHtml } from './util/tinyMCE';
-function isListIntoListPaste(tr, state) {
-  var _state$schema$nodes = state.schema.nodes,
-    listItem = _state$schema$nodes.listItem,
-    bulletList = _state$schema$nodes.bulletList,
-    orderedList = _state$schema$nodes.orderedList;
-  var _state$selection = state.selection,
-    $from = _state$selection.$from,
-    $to = _state$selection.$to;
-  var selectionInList = !!findParentNodeOfTypeClosestToPos($from, [listItem]) || !!findParentNodeOfTypeClosestToPos($to, [listItem]);
-  if (!selectionInList) {
-    return false;
-  }
-  return tr.steps.some(function (step) {
-    var _slice$content;
-    var slice = extractSliceFromStep(step);
-    var listExists = false;
-    slice === null || slice === void 0 || (_slice$content = slice.content) === null || _slice$content === void 0 || _slice$content.forEach(function (node) {
-      if (node.type === bulletList || node.type === orderedList) {
-        listExists = true;
-      }
-    });
-    return listExists;
-  });
-}
 export var isInsideBlockQuote = function isInsideBlockQuote(state) {
   var blockquote = state.schema.nodes.blockquote;
   return hasParentNodeOfType(blockquote)(state.selection);
@@ -299,10 +275,10 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
           // to split those repairing transactions in prosemirror-history when they're being added to the
           // "done" stack
           var isPastingTable = tr.steps.some(function (step) {
-            var _slice$content2;
+            var _slice$content;
             var slice = extractSliceFromStep(step);
             var tableExists = false;
-            slice === null || slice === void 0 || (_slice$content2 = slice.content) === null || _slice$content2 === void 0 || _slice$content2.forEach(function (node) {
+            slice === null || slice === void 0 || (_slice$content = slice.content) === null || _slice$content === void 0 || _slice$content.forEach(function (node) {
               if (node.type === state.schema.nodes.table) {
                 tableExists = true;
               }
@@ -310,14 +286,26 @@ export function createPlugin(schema, dispatchAnalyticsEvent, dispatch, featureFl
             return tableExists;
           });
 
-          // Don't add closeHistory if we're pasting a list into a list, as the list plugin will
-          // appendTransaction to normalise the list structure and we want to keep the paste and
-          // normalisation as one undo event. We also set a meta on the transaction so the list
-          // plugin's appendTransaction can cheaply detect this case without re-checking flags.
-          if (expValEqualsNoExposure('platform_editor_flexible_list_schema', 'isEnabled', true) && isListIntoListPaste(tr, state)) {
-            tr = tr.setMeta('listPasteNormalisation', true);
+          // Don't flag as a paste event (add closeHistory) when the paste affects a list and
+          // the list plugin's appendTransaction will normalise the structure, and we want the
+          // paste + normalisation to be a single undo step.
+          // Pasting into an existing list — selection is inside a list node.
+          var isPastingIntoList = false;
+          // Pasting list content from an external source — slice top-level contains a list node.
+          var isPastingListContent = false;
+          if (expValEqualsNoExposure('platform_editor_flexible_list_schema', 'isEnabled', true)) {
+            var listNodeTypes = [state.schema.nodes.bulletList, state.schema.nodes.orderedList, state.schema.nodes.taskList].filter(function (n) {
+              return Boolean(n);
+            });
+            isPastingIntoList = hasParentNodeOfType(listNodeTypes)(state.selection);
+            for (var i = 0; i < slice.content.childCount; i++) {
+              if (listNodeTypes.includes(slice.content.child(i).type)) {
+                isPastingListContent = true;
+                break;
+              }
+            }
           }
-          if (!isPastingTextInsidePlaceholderText && !isPastingTable && !isPastingOverLayoutColumns && !tr.getMeta('listPasteNormalisation') && pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.betterTypeHistory) {
+          if (!isPastingTextInsidePlaceholderText && !isPastingTable && !isPastingOverLayoutColumns && !isPastingIntoList && !isPastingListContent && pluginInjectionApi !== null && pluginInjectionApi !== void 0 && pluginInjectionApi.betterTypeHistory) {
             var _pluginInjectionApi$b;
             tr = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$b = pluginInjectionApi.betterTypeHistory) === null || _pluginInjectionApi$b === void 0 ? void 0 : _pluginInjectionApi$b.actions.flagPasteEvent(tr);
           }

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

@@ -885,6 +885,70 @@ function getTopLevelMarkTypesInSlice(slice) {
   });
   return markTypes;
 }
+
+/**
+ * Peels container wrapper nodes (e.g. panel, expand) added by ProseMirror's addContext()
+ * so that fontSize-marked paragraphs become top-level, preserving the mark on paste.
+ */
+function unwrapContainerNodesWithBlockMarks(slice, schema, fontSize) {
+  var content = slice.content;
+  var levelsUnwrapped = 0;
+  while (content.childCount === 1 && content.firstChild && !content.firstChild.isTextblock && slice.openStart - levelsUnwrapped > 1) {
+    var hasBlockMarkedParagraph = false;
+    for (var i = 0; i < content.firstChild.childCount; i++) {
+      var child = content.firstChild.child(i);
+      if (child.type === schema.nodes.paragraph && child.marks.some(function (m) {
+        return m.type === fontSize;
+      })) {
+        hasBlockMarkedParagraph = true;
+        break;
+      }
+    }
+    if (!hasBlockMarkedParagraph) {
+      break;
+    }
+    content = content.firstChild.content;
+    levelsUnwrapped++;
+  }
+  if (levelsUnwrapped === 0) {
+    return slice;
+  }
+  return new Slice(content, slice.openStart - levelsUnwrapped, Math.max(0, slice.openEnd - levelsUnwrapped));
+}
+
+/**
+ * Returns the fontSize attrs to apply at the paste destination, or false if none.
+ * Checks list and task destinations in priority order.
+ */
+function getDestinationFontSizeAttrs(destinationListNode, isInSmallTaskContext, $from, currentNode, fontSize) {
+  if (destinationListNode) {
+    return getFirstParagraphBlockMarkAttrs(destinationListNode, fontSize);
+  }
+  if (isInSmallTaskContext) {
+    return getBlockMarkAttrs($from.parent, fontSize) || getFirstParagraphBlockMarkAttrs(currentNode, fontSize);
+  }
+  return false;
+}
+
+/**
+ * Resolves which marks to apply to a paragraph node after filtering forbidden marks.
+ * When a destination block mark is provided, replaces any existing fontSize mark with it.
+ * When normalizing for the target context, removes the fontSize mark entirely.
+ * Otherwise returns the filtered marks unchanged.
+ */
+function resolveParagraphMarks(marks, destinationBlockMarkAttrs, shouldNormalize, fontSize) {
+  if (destinationBlockMarkAttrs) {
+    return marks.filter(function (m) {
+      return m.type !== fontSize;
+    }).concat(fontSize.create(destinationBlockMarkAttrs));
+  }
+  if (shouldNormalize) {
+    return marks.filter(function (m) {
+      return m.type !== fontSize;
+    });
+  }
+  return marks;
+}
 export function handleParagraphBlockMarks(state, slice) {
   var _findParentNodeOfType2;
   if (slice.content.size === 0) {
@@ -901,12 +965,19 @@ 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;
+
+  // When copying from inside a container (e.g. panel, expand), ProseMirror wraps the
+  // content back in the container via addContext(), increasing openStart/openEnd. Unwrap
+  // so the paragraph (with its fontSize mark) becomes top-level.
+  if (isSmallFontSizeEnabled) {
+    slice = unwrapContainerNodesWithBlockMarks(slice, schema, fontSize);
+  }
   var destinationListNode = (_findParentNodeOfType2 = findParentNodeOfType([bulletList, 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) === 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 isSmallFontSizeEnabled = expValEquals('platform_editor_small_font_size', 'isEnabled', true) && !!fontSize;
-  var destinationBlockMarkAttrs = isSmallFontSizeEnabled ? destinationListNode ? getFirstParagraphBlockMarkAttrs(destinationListNode, fontSize) : isInSmallTaskContext ? getBlockMarkAttrs($from.parent, fontSize) || getFirstParagraphBlockMarkAttrs(currentNode, fontSize) : false : false;
+  var destinationBlockMarkAttrs = isSmallFontSizeEnabled ? getDestinationFontSizeAttrs(destinationListNode, isInSmallTaskContext, $from, currentNode, fontSize) : 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.
@@ -948,11 +1019,7 @@ export function handleParagraphBlockMarks(state, slice) {
       var paragraphMarks = node.marks.filter(function (mark) {
         return !forbiddenMarkTypes.includes(mark.type);
       });
-      return paragraph.createChecked(undefined, node.content, destinationBlockMarkAttrs ? paragraphMarks.filter(function (mark) {
-        return mark.type !== fontSize;
-      }).concat(fontSize.create(destinationBlockMarkAttrs)) : shouldNormalizeFontSizeForTarget ? paragraphMarks.filter(function (mark) {
-        return mark.type !== fontSize;
-      }) : paragraphMarks);
+      return paragraph.createChecked(undefined, node.content, resolveParagraphMarks(paragraphMarks, destinationBlockMarkAttrs, shouldNormalizeFontSizeForTarget, fontSize));
     } else if (node.type === heading) {
       // Preserve heading attributes to keep formatting
       return heading.createChecked(node.attrs, node.content, node.marks.filter(function (mark) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "11.0.1",
+	"version": "11.0.3",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -55,7 +55,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^114.2.0",
+		"@atlaskit/editor-common": "^114.3.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"