@atlaskit/editor-plugin-paste 17.1.7 → 17.1.8

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-paste
 
+## 17.1.8
+
+### Patch Changes
+
+- [`513f878e1df07`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/513f878e1df07) -
+  [ux] Behind the platform_editor_preserve_mention_on_paste experiment, stop hoisting a mention's
+  avatar image out of its span during paste, so pasting a mention pastes a mention instead of a
+  standalone image
+- Updated dependencies
+
 ## 17.1.7
 
 ### Patch Changes

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 _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
 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; }
 /**
@@ -200,6 +201,14 @@ var unwrapNestedMediaElements = exports.unwrapNestedMediaElements = function unw
       return;
     }
 
+    // Bypass mention avatars - a mention's avatar <img> is nested only inside <span>s
+    // (never a valid container), so it would otherwise get hoisted out of the mention's
+    // DOM subtree and parsed as a standalone image instead of leaving the mention intact
+    // for its own parseDOM rule to match.
+    if ((0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_preserve_mention_on_paste') && imageTag.closest('[data-mention-id]')) {
+      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

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 { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 /**
  * Ensure correct layout in nested mode
  *
@@ -196,6 +197,14 @@ export const unwrapNestedMediaElements = html => {
       return;
     }
 
+    // Bypass mention avatars - a mention's avatar <img> is nested only inside <span>s
+    // (never a valid container), so it would otherwise get hoisted out of the mention's
+    // DOM subtree and parsed as a standalone image instead of leaving the mention intact
+    // for its own parseDOM rule to match.
+    if (isExperimentEnabled('platform_editor_preserve_mention_on_paste') && imageTag.closest('[data-mention-id]')) {
+      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

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 { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
 /**
  * Ensure correct layout in nested mode
  *
@@ -191,6 +192,14 @@ export var unwrapNestedMediaElements = function unwrapNestedMediaElements(html)
       return;
     }
 
+    // Bypass mention avatars - a mention's avatar <img> is nested only inside <span>s
+    // (never a valid container), so it would otherwise get hoisted out of the mention's
+    // DOM subtree and parsed as a standalone image instead of leaving the mention intact
+    // for its own parseDOM rule to match.
+    if (isExperimentEnabled('platform_editor_preserve_mention_on_paste') && imageTag.closest('[data-mention-id]')) {
+      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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-paste",
-	"version": "17.1.7",
+	"version": "17.1.8",
 	"description": "Paste plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -19,8 +19,8 @@
 	"sideEffects": false,
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^57.2.0",
-		"@atlaskit/adf-utils": "^20.8.0",
+		"@atlaskit/adf-schema": "^57.3.0",
+		"@atlaskit/adf-utils": "^20.9.0",
 		"@atlaskit/code": "^19.2.0",
 		"@atlaskit/editor-markdown-transformer": "^6.3.0",
 		"@atlaskit/editor-plugin-analytics": "^16.1.0",
@@ -39,7 +39,7 @@
 		"@atlaskit/icon": "^37.6.0",
 		"@atlaskit/insm": "^3.0.0",
 		"@atlaskit/linking-common": "^12.1.0",
-		"@atlaskit/media-client": "^37.6.0",
+		"@atlaskit/media-client": "^37.7.0",
 		"@atlaskit/media-common": "^14.6.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
@@ -51,7 +51,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^120.12.0",
+		"@atlaskit/editor-common": "^120.13.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"