@atlaskit/editor-plugin-paste 11.0.0 → 11.0.2

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-paste
 
+## 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
+
+- Updated dependencies
+
 ## 11.0.0
 
 ### Major Changes

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/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/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.0",
+	"version": "11.0.2",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,7 +37,7 @@
 		"@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.0.0",
+		"@atlaskit/editor-plugin-media": "^12.1.0",
 		"@atlaskit/editor-plugin-mentions": "^12.0.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/editor-tables": "^2.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": "^62.4.0",
+		"@atlaskit/tmp-editor-statsig": "^63.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.0.0",
+		"@atlaskit/editor-common": "^114.2.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"