@atlaskit/editor-plugin-paste 9.0.9 → 9.0.10

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-paste
 
+## 9.0.10
+
+### Patch Changes
+
+- [`d193def6569f2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d193def6569f2) -
+  Fixed mixed HTML/Editor content copy/paste issue on mediaInline node by preventing
+  unwrapNestedMediaElements from hoisting images out of mediaInline wrappers.
+- Updated dependencies
+
 ## 9.0.9
 
 ### Patch Changes

package/dist/cjs/editor-commands/commands.js

@@ -172,7 +172,7 @@ var extractListFromParagraph = exports.extractListFromParagraph = function extra
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @atlassian/perf-linting/no-expensive-split-replace -- Ignored via go/ees017 (to be fixed)
       order: parseInt(firstNonHardBreakNode.text.split('.')[0])
     } : undefined;
     var newList = nodeType.createChecked(attrs, [listItemNode]);

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

@@ -12,6 +12,7 @@ var _mediaSingle = require("@atlaskit/editor-common/media-single");
 var _utils = require("@atlaskit/editor-common/utils");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _mediaCommon = require("@atlaskit/media-common");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
@@ -177,6 +178,16 @@ var unwrapNestedMediaElements = exports.unwrapNestedMediaElements = function unw
       return;
     }
 
+    // Bypass mediaInline images - don't hoist images that are inside a mediaInline wrapper
+    // as this would break parseDOM matching for mediaInline nodes
+    // We remove the img from the DOM since mediaInline is a leaf node with no content
+    if (imageTag.closest('[data-node-type="mediaInline"]') && (0, _expValEquals.expValEquals)('platform_editor_inline_media_copy_paste_fix', 'isEnabled', true)) {
+      // Remove the img element so ProseMirror doesn't try to parse it
+      // mediaInline nodes are leaf nodes and cannot have children
+      imageTag.remove();
+      return;
+    }
+
     // If either the parent or the image itself contains styles that would make
     // them invisible on copy, dont paste them.
     if (isElementInvisible(mediaParent) || isElementInvisible(imageTag)) {

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

@@ -147,7 +147,7 @@ function escapeBackslashAndLinksExceptCodeBlock(textInput) {
       return line;
     } else {
       // Ignored via go/ees005
-      // eslint-disable-next-line require-unicode-regexp
+      // eslint-disable-next-line require-unicode-regexp, @atlassian/perf-linting/no-expensive-split-replace -- Ignored via go/ees017 (to be fixed)
       var escaped = line.replace(/\\/g, '\\\\');
       escaped = escapeLinks(escaped);
       return escaped;

package/dist/es2019/editor-commands/commands.js

@@ -154,7 +154,7 @@ export const extractListFromParagraph = (node, parent, schema) => {
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @atlassian/perf-linting/no-expensive-split-replace -- Ignored via go/ees017 (to be fixed)
       order: parseInt(firstNonHardBreakNode.text.split('.')[0])
     } : undefined;
     const newList = nodeType.createChecked(attrs, [listItemNode]);

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

@@ -2,6 +2,7 @@ import { DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/media-single';
 import { mapSlice, removeNestedEmptyEls, unwrap, walkUpTreeUntil } from '@atlaskit/editor-common/utils';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getRandomHex } from '@atlaskit/media-common';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 /**
  * Ensure correct layout in nested mode
  *
@@ -173,6 +174,16 @@ export const unwrapNestedMediaElements = html => {
       return;
     }
 
+    // Bypass mediaInline images - don't hoist images that are inside a mediaInline wrapper
+    // as this would break parseDOM matching for mediaInline nodes
+    // We remove the img from the DOM since mediaInline is a leaf node with no content
+    if (imageTag.closest('[data-node-type="mediaInline"]') && expValEquals('platform_editor_inline_media_copy_paste_fix', 'isEnabled', true)) {
+      // Remove the img element so ProseMirror doesn't try to parse it
+      // mediaInline nodes are leaf nodes and cannot have children
+      imageTag.remove();
+      return;
+    }
+
     // If either the parent or the image itself contains styles that would make
     // them invisible on copy, dont paste them.
     if (isElementInvisible(mediaParent) || isElementInvisible(imageTag)) {

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

@@ -125,7 +125,7 @@ export function escapeBackslashAndLinksExceptCodeBlock(textInput) {
       return line;
     } else {
       // Ignored via go/ees005
-      // eslint-disable-next-line require-unicode-regexp
+      // eslint-disable-next-line require-unicode-regexp, @atlassian/perf-linting/no-expensive-split-replace -- Ignored via go/ees017 (to be fixed)
       let escaped = line.replace(/\\/g, '\\\\');
       escaped = escapeLinks(escaped);
       return escaped;

package/dist/esm/editor-commands/commands.js

@@ -166,7 +166,7 @@ export var extractListFromParagraph = function extractListFromParagraph(node, pa
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       // Ignored via go/ees005
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @atlassian/perf-linting/no-expensive-split-replace -- Ignored via go/ees017 (to be fixed)
       order: parseInt(firstNonHardBreakNode.text.split('.')[0])
     } : undefined;
     var newList = nodeType.createChecked(attrs, [listItemNode]);

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

@@ -5,6 +5,7 @@ import { DEFAULT_IMAGE_WIDTH } from '@atlaskit/editor-common/media-single';
 import { mapSlice, removeNestedEmptyEls, unwrap, walkUpTreeUntil } from '@atlaskit/editor-common/utils';
 import { hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { getRandomHex } from '@atlaskit/media-common';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 /**
  * Ensure correct layout in nested mode
  *
@@ -168,6 +169,16 @@ export var unwrapNestedMediaElements = function unwrapNestedMediaElements(html)
       return;
     }
 
+    // Bypass mediaInline images - don't hoist images that are inside a mediaInline wrapper
+    // as this would break parseDOM matching for mediaInline nodes
+    // We remove the img from the DOM since mediaInline is a leaf node with no content
+    if (imageTag.closest('[data-node-type="mediaInline"]') && expValEquals('platform_editor_inline_media_copy_paste_fix', 'isEnabled', true)) {
+      // Remove the img element so ProseMirror doesn't try to parse it
+      // mediaInline nodes are leaf nodes and cannot have children
+      imageTag.remove();
+      return;
+    }
+
     // If either the parent or the image itself contains styles that would make
     // them invisible on copy, dont paste them.
     if (isElementInvisible(mediaParent) || isElementInvisible(imageTag)) {

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

@@ -126,7 +126,7 @@ export function escapeBackslashAndLinksExceptCodeBlock(textInput) {
       return line;
     } else {
       // Ignored via go/ees005
-      // eslint-disable-next-line require-unicode-regexp
+      // eslint-disable-next-line require-unicode-regexp, @atlassian/perf-linting/no-expensive-split-replace -- Ignored via go/ees017 (to be fixed)
       var escaped = line.replace(/\\/g, '\\\\');
       escaped = escapeLinks(escaped);
       return escaped;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "9.0.9",
+	"version": "9.0.10",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,7 +37,7 @@
 		"@atlaskit/editor-plugin-expand": "^9.1.0",
 		"@atlaskit/editor-plugin-feature-flags": "^7.0.0",
 		"@atlaskit/editor-plugin-list": "^10.0.0",
-		"@atlaskit/editor-plugin-media": "^10.0.0",
+		"@atlaskit/editor-plugin-media": "^10.1.0",
 		"@atlaskit/editor-plugin-mentions": "^10.0.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
 		"@atlaskit/editor-tables": "^2.9.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/media-common": "^13.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/tmp-editor-statsig": "^43.0.0",
+		"@atlaskit/tmp-editor-statsig": "^44.0.0",
 		"@atlaskit/tokens": "^11.1.0",
 		"@babel/runtime": "^7.0.0",
 		"lodash": "^4.17.21",
@@ -118,6 +118,9 @@
 		},
 		"platform_media_cross_client_copy_with_auth": {
 			"type": "boolean"
+		},
+		"platform_editor_inline_media_copy_paste_fix": {
+			"type": "boolean"
 		}
 	}
 }