@atlaskit/editor-plugin-media 14.2.17 → 14.3.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-media
 
+## 14.3.0
+
+### Minor Changes
+
+- [`1bdd62ad6abf9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1bdd62ad6abf9) -
+  Fix the AI "Ask Rovo" / "Edit image" loading overlay appearing on every copy of a duplicated
+  image, so only the acted-on image shows the loading state. Behind an experiment.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 14.2.18
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 14.2.17
 
 ### Patch Changes

package/dist/cjs/pm-plugins/ai-generating-decoration.js

@@ -39,15 +39,27 @@ var AI_GENERATING_DECORATION_TYPE = 'ai-generating';
 
 /**
  * Build a DecorationSet containing a Decoration.node for every media node
- * whose `id` is in the given set.
+ * targeted by the given set.
+ *
+ * Targets are matched by `localId` first (the mediaSingle wrapper's or the media
+ * node's own) so that duplicate copies of the same image — which share a media
+ * file `id` — don't all get decorated; only the node the user acted on lights
+ * up. Falls back to the media file `id` for the CWR flow and for any node that
+ * has no localId yet.
  */
-function buildDecorationSet(doc, mediaIds) {
-  if (mediaIds.size === 0) {
+function buildDecorationSet(doc, targetIds) {
+  if (targetIds.size === 0) {
     return _view.DecorationSet.empty;
   }
   var decorations = [];
-  doc.descendants(function (node, pos) {
-    if (node.type.name === 'media' && mediaIds.has(node.attrs.id)) {
+  doc.descendants(function (node, pos, parent) {
+    var _parent$attrs;
+    if (node.type.name !== 'media') {
+      return;
+    }
+    var wrapperLocalId = parent === null || parent === void 0 || (_parent$attrs = parent.attrs) === null || _parent$attrs === void 0 ? void 0 : _parent$attrs.localId;
+    var matches = wrapperLocalId && targetIds.has(wrapperLocalId) || node.attrs.localId && targetIds.has(node.attrs.localId) || targetIds.has(node.attrs.id);
+    if (matches) {
       decorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {},
       // no DOM attrs needed — the NodeView reads the decoration spec
       {

package/dist/es2019/pm-plugins/ai-generating-decoration.js

@@ -25,15 +25,27 @@ const AI_GENERATING_DECORATION_TYPE = 'ai-generating';
 
 /**
  * Build a DecorationSet containing a Decoration.node for every media node
- * whose `id` is in the given set.
+ * targeted by the given set.
+ *
+ * Targets are matched by `localId` first (the mediaSingle wrapper's or the media
+ * node's own) so that duplicate copies of the same image — which share a media
+ * file `id` — don't all get decorated; only the node the user acted on lights
+ * up. Falls back to the media file `id` for the CWR flow and for any node that
+ * has no localId yet.
  */
-function buildDecorationSet(doc, mediaIds) {
-  if (mediaIds.size === 0) {
+function buildDecorationSet(doc, targetIds) {
+  if (targetIds.size === 0) {
     return DecorationSet.empty;
   }
   const decorations = [];
-  doc.descendants((node, pos) => {
-    if (node.type.name === 'media' && mediaIds.has(node.attrs.id)) {
+  doc.descendants((node, pos, parent) => {
+    var _parent$attrs;
+    if (node.type.name !== 'media') {
+      return;
+    }
+    const wrapperLocalId = parent === null || parent === void 0 ? void 0 : (_parent$attrs = parent.attrs) === null || _parent$attrs === void 0 ? void 0 : _parent$attrs.localId;
+    const matches = wrapperLocalId && targetIds.has(wrapperLocalId) || node.attrs.localId && targetIds.has(node.attrs.localId) || targetIds.has(node.attrs.id);
+    if (matches) {
       decorations.push(Decoration.node(pos, pos + node.nodeSize, {},
       // no DOM attrs needed — the NodeView reads the decoration spec
       {

package/dist/esm/pm-plugins/ai-generating-decoration.js

@@ -29,15 +29,27 @@ var AI_GENERATING_DECORATION_TYPE = 'ai-generating';
 
 /**
  * Build a DecorationSet containing a Decoration.node for every media node
- * whose `id` is in the given set.
+ * targeted by the given set.
+ *
+ * Targets are matched by `localId` first (the mediaSingle wrapper's or the media
+ * node's own) so that duplicate copies of the same image — which share a media
+ * file `id` — don't all get decorated; only the node the user acted on lights
+ * up. Falls back to the media file `id` for the CWR flow and for any node that
+ * has no localId yet.
  */
-function buildDecorationSet(doc, mediaIds) {
-  if (mediaIds.size === 0) {
+function buildDecorationSet(doc, targetIds) {
+  if (targetIds.size === 0) {
     return DecorationSet.empty;
   }
   var decorations = [];
-  doc.descendants(function (node, pos) {
-    if (node.type.name === 'media' && mediaIds.has(node.attrs.id)) {
+  doc.descendants(function (node, pos, parent) {
+    var _parent$attrs;
+    if (node.type.name !== 'media') {
+      return;
+    }
+    var wrapperLocalId = parent === null || parent === void 0 || (_parent$attrs = parent.attrs) === null || _parent$attrs === void 0 ? void 0 : _parent$attrs.localId;
+    var matches = wrapperLocalId && targetIds.has(wrapperLocalId) || node.attrs.localId && targetIds.has(node.attrs.localId) || targetIds.has(node.attrs.id);
+    if (matches) {
       decorations.push(Decoration.node(pos, pos + node.nodeSize, {},
       // no DOM attrs needed — the NodeView reads the decoration spec
       {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "14.2.17",
+	"version": "14.3.0",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -57,7 +57,7 @@
 		"@atlaskit/platform-feature-flags": "^2.0.0",
 		"@atlaskit/primitives": "^20.5.0",
 		"@atlaskit/textfield": "^9.1.0",
-		"@atlaskit/tmp-editor-statsig": "^123.0.0",
+		"@atlaskit/tmp-editor-statsig": "^124.1.0",
 		"@atlaskit/tokens": "^15.5.0",
 		"@atlaskit/tooltip": "^23.1.0",
 		"@babel/runtime": "^7.0.0",