@atlaskit/editor-plugin-paste 31.0.4 → 31.1.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-paste
 
+## 31.1.0
+
+### Minor Changes
+
+- [`7821cf2be124c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7821cf2be124c) -
+  Keep pasted text inside panels, expands and lists when the copied paragraph has an alignment or
+  indentation the destination does not allow (behind
+  platform_editor_paste_strip_invalid_block_marks)
+
+### Patch Changes
+
+- Updated dependencies
+
+## 31.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 31.0.4
 
 ### Patch Changes

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

@@ -1136,6 +1136,17 @@ function getTopLevelMarkTypesInSlice(slice) {
   return markTypes;
 }
 
+/**
+ * Whether the slice's top-level block marks (e.g. alignment, indentation) include one that the
+ * node containing the destination textblock does not allow, such as alignment inside a panel.
+ */
+function sliceHasBlockMarksDisallowedAtDestination(slice, $from) {
+  var destinationContainer = $from.node(Math.max(0, $from.depth - 1));
+  return (0, _toConsumableArray2.default)(getTopLevelMarkTypesInSlice(slice)).some(function (markType) {
+    return !destinationContainer.type.allowsMarkType(markType);
+  });
+}
+
 /**
  * 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.
@@ -1273,7 +1284,13 @@ function handleParagraphBlockMarks(state, slice) {
   // so pasted content adopts the destination list state.
   var destinationHasContent = $from.parent.textContent.length > 0;
   if (slice.content.childCount === 1 && destinationHasContent && !shouldNormalizeFontSizeForTarget) {
-    return slice;
+    var _slice$content$firstC4;
+    // A paragraph keeping a block mark its destination container disallows cannot be placed
+    // inside that container, so it is inserted after it instead. Drop those marks below.
+    var mustDropDisallowedBlockMarks = (0, _fg.fg)('platform_editor_paste_strip_invalid_block_marks') && ((_slice$content$firstC4 = slice.content.firstChild) === null || _slice$content$firstC4 === void 0 ? void 0 : _slice$content$firstC4.type) === paragraph && sliceHasBlockMarksDisallowedAtDestination(slice, $from);
+    if (!mustDropDisallowedBlockMarks) {
+      return slice;
+    }
   }
 
   // Check the parent of (paragraph -> text) because block marks are assigned to a wrapper
@@ -1608,8 +1625,8 @@ var handleSelectedTable = exports.handleSelectedTable = function handleSelectedT
   };
 };
 function checkTaskListInList(state, slice) {
-  var _slice$content$firstC4;
-  return Boolean((0, _utils.isInListItem)(state) && ['taskList', 'taskItem'].includes(((_slice$content$firstC4 = slice.content.firstChild) === null || _slice$content$firstC4 === void 0 || (_slice$content$firstC4 = _slice$content$firstC4.type) === null || _slice$content$firstC4 === void 0 ? void 0 : _slice$content$firstC4.name) || ''));
+  var _slice$content$firstC5;
+  return Boolean((0, _utils.isInListItem)(state) && ['taskList', 'taskItem'].includes(((_slice$content$firstC5 = slice.content.firstChild) === null || _slice$content$firstC5 === void 0 || (_slice$content$firstC5 = _slice$content$firstC5.type) === null || _slice$content$firstC5 === void 0 ? void 0 : _slice$content$firstC5.name) || ''));
 }
 function checkIfSelectionInNestedList(state) {
   var selection = state.selection,

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

@@ -1127,6 +1127,15 @@ function getTopLevelMarkTypesInSlice(slice) {
   return markTypes;
 }
 
+/**
+ * Whether the slice's top-level block marks (e.g. alignment, indentation) include one that the
+ * node containing the destination textblock does not allow, such as alignment inside a panel.
+ */
+function sliceHasBlockMarksDisallowedAtDestination(slice, $from) {
+  const destinationContainer = $from.node(Math.max(0, $from.depth - 1));
+  return [...getTopLevelMarkTypesInSlice(slice)].some(markType => !destinationContainer.type.allowsMarkType(markType));
+}
+
 /**
  * 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.
@@ -1265,7 +1274,13 @@ export function handleParagraphBlockMarks(state, slice) {
   // so pasted content adopts the destination list state.
   const destinationHasContent = $from.parent.textContent.length > 0;
   if (slice.content.childCount === 1 && destinationHasContent && !shouldNormalizeFontSizeForTarget) {
-    return slice;
+    var _slice$content$firstC4;
+    // A paragraph keeping a block mark its destination container disallows cannot be placed
+    // inside that container, so it is inserted after it instead. Drop those marks below.
+    const mustDropDisallowedBlockMarks = fg('platform_editor_paste_strip_invalid_block_marks') && ((_slice$content$firstC4 = slice.content.firstChild) === null || _slice$content$firstC4 === void 0 ? void 0 : _slice$content$firstC4.type) === paragraph && sliceHasBlockMarksDisallowedAtDestination(slice, $from);
+    if (!mustDropDisallowedBlockMarks) {
+      return slice;
+    }
   }
 
   // Check the parent of (paragraph -> text) because block marks are assigned to a wrapper
@@ -1577,8 +1592,8 @@ export const handleSelectedTable = editorAnalyticsAPI => slice => (state, dispat
   return false;
 };
 export function checkTaskListInList(state, slice) {
-  var _slice$content$firstC4, _slice$content$firstC5;
-  return Boolean(isInListItem(state) && ['taskList', 'taskItem'].includes(((_slice$content$firstC4 = slice.content.firstChild) === null || _slice$content$firstC4 === void 0 ? void 0 : (_slice$content$firstC5 = _slice$content$firstC4.type) === null || _slice$content$firstC5 === void 0 ? void 0 : _slice$content$firstC5.name) || ''));
+  var _slice$content$firstC5, _slice$content$firstC6;
+  return Boolean(isInListItem(state) && ['taskList', 'taskItem'].includes(((_slice$content$firstC5 = slice.content.firstChild) === null || _slice$content$firstC5 === void 0 ? void 0 : (_slice$content$firstC6 = _slice$content$firstC5.type) === null || _slice$content$firstC6 === void 0 ? void 0 : _slice$content$firstC6.name) || ''));
 }
 export function checkIfSelectionInNestedList(state) {
   const {

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

@@ -1107,6 +1107,17 @@ function getTopLevelMarkTypesInSlice(slice) {
   return markTypes;
 }
 
+/**
+ * Whether the slice's top-level block marks (e.g. alignment, indentation) include one that the
+ * node containing the destination textblock does not allow, such as alignment inside a panel.
+ */
+function sliceHasBlockMarksDisallowedAtDestination(slice, $from) {
+  var destinationContainer = $from.node(Math.max(0, $from.depth - 1));
+  return _toConsumableArray(getTopLevelMarkTypesInSlice(slice)).some(function (markType) {
+    return !destinationContainer.type.allowsMarkType(markType);
+  });
+}
+
 /**
  * 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.
@@ -1244,7 +1255,13 @@ export function handleParagraphBlockMarks(state, slice) {
   // so pasted content adopts the destination list state.
   var destinationHasContent = $from.parent.textContent.length > 0;
   if (slice.content.childCount === 1 && destinationHasContent && !shouldNormalizeFontSizeForTarget) {
-    return slice;
+    var _slice$content$firstC4;
+    // A paragraph keeping a block mark its destination container disallows cannot be placed
+    // inside that container, so it is inserted after it instead. Drop those marks below.
+    var mustDropDisallowedBlockMarks = fg('platform_editor_paste_strip_invalid_block_marks') && ((_slice$content$firstC4 = slice.content.firstChild) === null || _slice$content$firstC4 === void 0 ? void 0 : _slice$content$firstC4.type) === paragraph && sliceHasBlockMarksDisallowedAtDestination(slice, $from);
+    if (!mustDropDisallowedBlockMarks) {
+      return slice;
+    }
   }
 
   // Check the parent of (paragraph -> text) because block marks are assigned to a wrapper
@@ -1579,8 +1596,8 @@ export var handleSelectedTable = function handleSelectedTable(editorAnalyticsAPI
   };
 };
 export function checkTaskListInList(state, slice) {
-  var _slice$content$firstC4;
-  return Boolean(isInListItem(state) && ['taskList', 'taskItem'].includes(((_slice$content$firstC4 = slice.content.firstChild) === null || _slice$content$firstC4 === void 0 || (_slice$content$firstC4 = _slice$content$firstC4.type) === null || _slice$content$firstC4 === void 0 ? void 0 : _slice$content$firstC4.name) || ''));
+  var _slice$content$firstC5;
+  return Boolean(isInListItem(state) && ['taskList', 'taskItem'].includes(((_slice$content$firstC5 = slice.content.firstChild) === null || _slice$content$firstC5 === void 0 || (_slice$content$firstC5 = _slice$content$firstC5.type) === null || _slice$content$firstC5 === void 0 ? void 0 : _slice$content$firstC5.name) || ''));
 }
 export function checkIfSelectionInNestedList(state) {
   var selection = state.selection,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "31.0.4",
+	"version": "31.1.0",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,7 +31,7 @@
 		"@atlaskit/editor-plugin-extension": "^33.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^29.0.0",
 		"@atlaskit/editor-plugin-list": "^32.0.0",
-		"@atlaskit/editor-plugin-media": "^32.1.0",
+		"@atlaskit/editor-plugin-media": "^32.2.0",
 		"@atlaskit/editor-plugin-mentions": "^32.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
 		"@atlaskit/editor-tables": "^3.2.0",
@@ -44,14 +44,14 @@
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
 		"@atlaskit/prosemirror-history": "^1.3.0",
-		"@atlaskit/tmp-editor-statsig": "^248.0.0",
-		"@atlaskit/tokens": "^20.8.0",
+		"@atlaskit/tmp-editor-statsig": "^250.0.0",
+		"@atlaskit/tokens": "^20.9.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^134.2.0",
+		"@atlaskit/editor-common": "^134.3.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -73,6 +73,9 @@
 		},
 		"platform_media_cross_client_copy_with_auth": {
 			"type": "boolean"
+		},
+		"platform_editor_paste_strip_invalid_block_marks": {
+			"type": "boolean"
 		}
 	},
 	"platform-experiments": {