@atlaskit/editor-plugin-media 8.4.16 → 8.4.17

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-media
 
+## 8.4.17
+
+### Patch Changes
+
+- [`1083b6f1f8eb2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1083b6f1f8eb2) -
+  [ux] Fix issues where media is selected when a parent node is selected
+- Updated dependencies
+
 ## 8.4.16
 
 ### Patch Changes

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

@@ -936,7 +936,7 @@ var createPlugin = exports.createPlugin = function createPlugin(_schema, options
           doc = state.doc;
 
         // Find any media nodes in the current selection
-        if (state.selection instanceof _state2.TextSelection || state.selection instanceof _state2.AllSelection || state.selection instanceof _state2.NodeSelection || state.selection instanceof _cellSelection.CellSelection) {
+        if (state.selection instanceof _state2.TextSelection || state.selection instanceof _state2.AllSelection || !(0, _expValEquals.expValEquals)('platform_editor_nested_media_selection_fix', 'isEnabled', true) && state.selection instanceof _state2.NodeSelection || state.selection instanceof _cellSelection.CellSelection) {
           doc.nodesBetween(state.selection.from, state.selection.to, function (node, pos) {
             if (node.type === schema.nodes.media) {
               mediaNodes.push(_view2.Decoration.node(pos, pos + node.nodeSize, {}, {
@@ -947,6 +947,22 @@ var createPlugin = exports.createPlugin = function createPlugin(_schema, options
             }
             return true;
           });
+        } else if ((0, _expValEquals.expValEquals)('platform_editor_nested_media_selection_fix', 'isEnabled', true) && state.selection instanceof _state2.NodeSelection) {
+          var _state$selection = state.selection,
+            node = _state$selection.node,
+            $from = _state$selection.$from;
+          if (node.type === schema.nodes.mediaSingle || node.type === schema.nodes.mediaGroup) {
+            doc.nodesBetween($from.pos, $from.pos + node.nodeSize, function (mediaNode, mediaPos) {
+              if (mediaNode.type === schema.nodes.media) {
+                mediaNodes.push(_view2.Decoration.node(mediaPos, mediaPos + mediaNode.nodeSize, {}, {
+                  type: 'media',
+                  selected: true
+                }));
+                return false;
+              }
+              return true;
+            });
+          }
         }
         var pluginState = getMediaPluginState(state);
         if (!pluginState.showDropzone) {
@@ -955,8 +971,8 @@ var createPlugin = exports.createPlugin = function createPlugin(_schema, options
 
         // When a media is already selected
         if (state.selection instanceof _state2.NodeSelection) {
-          var node = state.selection.node;
-          if (node.type === schema.nodes.mediaSingle) {
+          var _node = state.selection.node;
+          if (_node.type === schema.nodes.mediaSingle) {
             var deco = _view2.Decoration.node(state.selection.from, state.selection.to, {
               class: 'richMedia-selected'
             });

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

@@ -824,7 +824,7 @@ export const createPlugin = (_schema, options, getIntl, pluginInjectionApi, node
         } = state;
 
         // Find any media nodes in the current selection
-        if (state.selection instanceof TextSelection || state.selection instanceof AllSelection || state.selection instanceof NodeSelection || state.selection instanceof CellSelection) {
+        if (state.selection instanceof TextSelection || state.selection instanceof AllSelection || !expValEquals('platform_editor_nested_media_selection_fix', 'isEnabled', true) && state.selection instanceof NodeSelection || state.selection instanceof CellSelection) {
           doc.nodesBetween(state.selection.from, state.selection.to, (node, pos) => {
             if (node.type === schema.nodes.media) {
               mediaNodes.push(Decoration.node(pos, pos + node.nodeSize, {}, {
@@ -835,6 +835,23 @@ export const createPlugin = (_schema, options, getIntl, pluginInjectionApi, node
             }
             return true;
           });
+        } else if (expValEquals('platform_editor_nested_media_selection_fix', 'isEnabled', true) && state.selection instanceof NodeSelection) {
+          const {
+            node,
+            $from
+          } = state.selection;
+          if (node.type === schema.nodes.mediaSingle || node.type === schema.nodes.mediaGroup) {
+            doc.nodesBetween($from.pos, $from.pos + node.nodeSize, (mediaNode, mediaPos) => {
+              if (mediaNode.type === schema.nodes.media) {
+                mediaNodes.push(Decoration.node(mediaPos, mediaPos + mediaNode.nodeSize, {}, {
+                  type: 'media',
+                  selected: true
+                }));
+                return false;
+              }
+              return true;
+            });
+          }
         }
         const pluginState = getMediaPluginState(state);
         if (!pluginState.showDropzone) {

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

@@ -928,7 +928,7 @@ export var createPlugin = function createPlugin(_schema, options, getIntl, plugi
           doc = state.doc;
 
         // Find any media nodes in the current selection
-        if (state.selection instanceof TextSelection || state.selection instanceof AllSelection || state.selection instanceof NodeSelection || state.selection instanceof CellSelection) {
+        if (state.selection instanceof TextSelection || state.selection instanceof AllSelection || !expValEquals('platform_editor_nested_media_selection_fix', 'isEnabled', true) && state.selection instanceof NodeSelection || state.selection instanceof CellSelection) {
           doc.nodesBetween(state.selection.from, state.selection.to, function (node, pos) {
             if (node.type === schema.nodes.media) {
               mediaNodes.push(Decoration.node(pos, pos + node.nodeSize, {}, {
@@ -939,6 +939,22 @@ export var createPlugin = function createPlugin(_schema, options, getIntl, plugi
             }
             return true;
           });
+        } else if (expValEquals('platform_editor_nested_media_selection_fix', 'isEnabled', true) && state.selection instanceof NodeSelection) {
+          var _state$selection = state.selection,
+            node = _state$selection.node,
+            $from = _state$selection.$from;
+          if (node.type === schema.nodes.mediaSingle || node.type === schema.nodes.mediaGroup) {
+            doc.nodesBetween($from.pos, $from.pos + node.nodeSize, function (mediaNode, mediaPos) {
+              if (mediaNode.type === schema.nodes.media) {
+                mediaNodes.push(Decoration.node(mediaPos, mediaPos + mediaNode.nodeSize, {}, {
+                  type: 'media',
+                  selected: true
+                }));
+                return false;
+              }
+              return true;
+            });
+          }
         }
         var pluginState = getMediaPluginState(state);
         if (!pluginState.showDropzone) {
@@ -947,8 +963,8 @@ export var createPlugin = function createPlugin(_schema, options, getIntl, plugi
 
         // When a media is already selected
         if (state.selection instanceof NodeSelection) {
-          var node = state.selection.node;
-          if (node.type === schema.nodes.mediaSingle) {
+          var _node = state.selection.node;
+          if (_node.type === schema.nodes.mediaSingle) {
             var deco = Decoration.node(state.selection.from, state.selection.to, {
               class: 'richMedia-selected'
             });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "8.4.16",
+	"version": "8.4.17",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -66,7 +66,7 @@
 		"@atlaskit/primitives": "^16.4.0",
 		"@atlaskit/textfield": "^8.1.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^14.5.0",
+		"@atlaskit/tmp-editor-statsig": "^14.6.0",
 		"@atlaskit/tokens": "^8.4.0",
 		"@atlaskit/tooltip": "^20.10.0",
 		"@babel/runtime": "^7.0.0",