@atlaskit/editor-plugin-media 0.10.3 → 0.10.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-media
 
+## 0.10.4
+
+### Patch Changes
+
+- [#65825](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65825) [`d08cdd1cb2aa`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d08cdd1cb2aa) - add extra attributes for media link
+
 ## 0.10.3
 
 ### Patch Changes

package/dist/cjs/commands/linking.js

@@ -185,7 +185,7 @@ var unlink = exports.unlink = function unlink(editorAnalyticsAPI) {
     var transaction = toggleLinkMark(tr, state, {
       forceRemove: true
     });
-    return fireAnalyticForMediaLink(transaction, _analytics.ACTION.DELETED, undefined, editorAnalyticsAPI);
+    return fireAnalyticForMediaLink(transaction, _analytics.ACTION.DELETED, _objectSpread({}, getNodeTypeAndMediaTypeAttributes(state)), editorAnalyticsAPI);
   });
 };
 var getAction = function getAction(newUrl, state) {
@@ -197,6 +197,32 @@ var getAction = function getAction(newUrl, state) {
   }
   return undefined;
 };
+var getNodeTypeAndMediaTypeAttributes = function getNodeTypeAndMediaTypeAttributes(state) {
+  var mediaLinkingState = (0, _linking.getMediaLinkingState)(state);
+  var _getMediaPluginState2 = (0, _main.getMediaPluginState)(state),
+    allowInlineImages = _getMediaPluginState2.allowInlineImages;
+  var _state$schema$nodes2 = state.schema.nodes,
+    mediaInline = _state$schema$nodes2.mediaInline,
+    mediaSingle = _state$schema$nodes2.mediaSingle;
+  if (!mediaLinkingState || mediaLinkingState.mediaPos === null) {
+    return;
+  }
+  var $pos = state.doc.resolve(mediaLinkingState.mediaPos);
+  var node = state.doc.nodeAt($pos.pos);
+  if (!node) {
+    return {};
+  }
+  if (allowInlineImages && node.type === mediaInline) {
+    return {
+      type: mediaInline.name,
+      mediaType: node.attrs.type
+    };
+  }
+  return {
+    type: mediaSingle.name,
+    mediaType: node.attrs.type
+  };
+};
 var setUrlToMedia = exports.setUrlToMedia = function setUrlToMedia(url, inputMethod, editorAnalyticsAPI) {
   return (0, _linking.createMediaLinkingCommand)({
     type: _actions.MediaLinkingActionsTypes.setUrl,
@@ -206,18 +232,19 @@ var setUrlToMedia = exports.setUrlToMedia = function setUrlToMedia(url, inputMet
     if (!action) {
       return tr;
     }
+    var nodeTypeAndMediaTypeAttrs = getNodeTypeAndMediaTypeAttributes(state);
     try {
       var toggleLinkMarkResult = toggleLinkMark(tr, state, {
         url: url
       });
-      fireAnalyticForMediaLink(tr, action, action === _analytics.ACTION.ADDED ? {
+      fireAnalyticForMediaLink(tr, action, action === _analytics.ACTION.ADDED ? _objectSpread({
         inputMethod: inputMethod
-      } : undefined, editorAnalyticsAPI);
+      }, nodeTypeAndMediaTypeAttrs) : nodeTypeAndMediaTypeAttrs, editorAnalyticsAPI);
       return toggleLinkMarkResult;
     } catch (e) {
-      fireAnalyticForMediaLink(tr, _analytics.ACTION.ERRORED, {
+      fireAnalyticForMediaLink(tr, _analytics.ACTION.ERRORED, _objectSpread({
         action: action
-      }, editorAnalyticsAPI);
+      }, nodeTypeAndMediaTypeAttrs), editorAnalyticsAPI);
       throw e;
     }
   });

package/dist/es2019/commands/linking.js

@@ -176,7 +176,9 @@ export const unlink = editorAnalyticsAPI => createMediaLinkingCommand({
   const transaction = toggleLinkMark(tr, state, {
     forceRemove: true
   });
-  return fireAnalyticForMediaLink(transaction, ACTION.DELETED, undefined, editorAnalyticsAPI);
+  return fireAnalyticForMediaLink(transaction, ACTION.DELETED, {
+    ...getNodeTypeAndMediaTypeAttributes(state)
+  }, editorAnalyticsAPI);
 });
 const getAction = (newUrl, state) => {
   const currentUrl = getCurrentUrl(state);
@@ -187,6 +189,34 @@ const getAction = (newUrl, state) => {
   }
   return undefined;
 };
+const getNodeTypeAndMediaTypeAttributes = state => {
+  const mediaLinkingState = getMediaLinkingState(state);
+  const {
+    allowInlineImages
+  } = getMediaPluginState(state);
+  const {
+    mediaInline,
+    mediaSingle
+  } = state.schema.nodes;
+  if (!mediaLinkingState || mediaLinkingState.mediaPos === null) {
+    return;
+  }
+  const $pos = state.doc.resolve(mediaLinkingState.mediaPos);
+  const node = state.doc.nodeAt($pos.pos);
+  if (!node) {
+    return {};
+  }
+  if (allowInlineImages && node.type === mediaInline) {
+    return {
+      type: mediaInline.name,
+      mediaType: node.attrs.type
+    };
+  }
+  return {
+    type: mediaSingle.name,
+    mediaType: node.attrs.type
+  };
+};
 export const setUrlToMedia = (url, inputMethod, editorAnalyticsAPI) => createMediaLinkingCommand({
   type: MediaLinkingActionsTypes.setUrl,
   payload: normalizeUrl(url)
@@ -195,17 +225,20 @@ export const setUrlToMedia = (url, inputMethod, editorAnalyticsAPI) => createMed
   if (!action) {
     return tr;
   }
+  const nodeTypeAndMediaTypeAttrs = getNodeTypeAndMediaTypeAttributes(state);
   try {
     const toggleLinkMarkResult = toggleLinkMark(tr, state, {
       url: url
     });
     fireAnalyticForMediaLink(tr, action, action === ACTION.ADDED ? {
-      inputMethod
-    } : undefined, editorAnalyticsAPI);
+      inputMethod,
+      ...nodeTypeAndMediaTypeAttrs
+    } : nodeTypeAndMediaTypeAttrs, editorAnalyticsAPI);
     return toggleLinkMarkResult;
   } catch (e) {
     fireAnalyticForMediaLink(tr, ACTION.ERRORED, {
-      action: action
+      action: action,
+      ...nodeTypeAndMediaTypeAttrs
     }, editorAnalyticsAPI);
     throw e;
   }

package/dist/esm/commands/linking.js

@@ -178,7 +178,7 @@ export var unlink = function unlink(editorAnalyticsAPI) {
     var transaction = toggleLinkMark(tr, state, {
       forceRemove: true
     });
-    return fireAnalyticForMediaLink(transaction, ACTION.DELETED, undefined, editorAnalyticsAPI);
+    return fireAnalyticForMediaLink(transaction, ACTION.DELETED, _objectSpread({}, getNodeTypeAndMediaTypeAttributes(state)), editorAnalyticsAPI);
   });
 };
 var getAction = function getAction(newUrl, state) {
@@ -190,6 +190,32 @@ var getAction = function getAction(newUrl, state) {
   }
   return undefined;
 };
+var getNodeTypeAndMediaTypeAttributes = function getNodeTypeAndMediaTypeAttributes(state) {
+  var mediaLinkingState = getMediaLinkingState(state);
+  var _getMediaPluginState2 = getMediaPluginState(state),
+    allowInlineImages = _getMediaPluginState2.allowInlineImages;
+  var _state$schema$nodes2 = state.schema.nodes,
+    mediaInline = _state$schema$nodes2.mediaInline,
+    mediaSingle = _state$schema$nodes2.mediaSingle;
+  if (!mediaLinkingState || mediaLinkingState.mediaPos === null) {
+    return;
+  }
+  var $pos = state.doc.resolve(mediaLinkingState.mediaPos);
+  var node = state.doc.nodeAt($pos.pos);
+  if (!node) {
+    return {};
+  }
+  if (allowInlineImages && node.type === mediaInline) {
+    return {
+      type: mediaInline.name,
+      mediaType: node.attrs.type
+    };
+  }
+  return {
+    type: mediaSingle.name,
+    mediaType: node.attrs.type
+  };
+};
 export var setUrlToMedia = function setUrlToMedia(url, inputMethod, editorAnalyticsAPI) {
   return createMediaLinkingCommand({
     type: MediaLinkingActionsTypes.setUrl,
@@ -199,18 +225,19 @@ export var setUrlToMedia = function setUrlToMedia(url, inputMethod, editorAnalyt
     if (!action) {
       return tr;
     }
+    var nodeTypeAndMediaTypeAttrs = getNodeTypeAndMediaTypeAttributes(state);
     try {
       var toggleLinkMarkResult = toggleLinkMark(tr, state, {
         url: url
       });
-      fireAnalyticForMediaLink(tr, action, action === ACTION.ADDED ? {
+      fireAnalyticForMediaLink(tr, action, action === ACTION.ADDED ? _objectSpread({
         inputMethod: inputMethod
-      } : undefined, editorAnalyticsAPI);
+      }, nodeTypeAndMediaTypeAttrs) : nodeTypeAndMediaTypeAttrs, editorAnalyticsAPI);
       return toggleLinkMarkResult;
     } catch (e) {
-      fireAnalyticForMediaLink(tr, ACTION.ERRORED, {
+      fireAnalyticForMediaLink(tr, ACTION.ERRORED, _objectSpread({
         action: action
-      }, editorAnalyticsAPI);
+      }, nodeTypeAndMediaTypeAttrs), editorAnalyticsAPI);
       throw e;
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-media",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "description": "Media plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",