@atlaskit/editor-core 187.14.9 → 187.14.12

package/dist/es2019/plugins/media/toolbar/index.js

@@ -37,7 +37,7 @@ const handleRemoveMediaGroup = (state, dispatch) => {
   }
   return true;
 };
-const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState, hoverDecoration) => {
+const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState, hoverDecoration, editorAnalyticsAPI) => {
   const {
     mediaGroup
   } = state.schema.nodes;
@@ -50,7 +50,7 @@ const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState, hoverDe
       title: intl.formatMessage(cardMessages.inline),
       selected: false,
       disabled: false,
-      onClick: changeMediaCardToInline,
+      onClick: changeMediaCardToInline(editorAnalyticsAPI),
       testId: 'inline-appearance'
     }, {
       id: 'editor.media.view.switcher.thumbnail',
@@ -112,7 +112,7 @@ const generateMediaCardFloatingToolbar = (state, intl, mediaPluginState, hoverDe
   }];
   return items;
 };
-const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState, hoverDecoration) => {
+const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState, hoverDecoration, editorAnalyticsAPI) => {
   const {
     mediaInline
   } = state.schema.nodes;
@@ -134,7 +134,7 @@ const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState, hover
       title: intl.formatMessage(messages.displayThumbnail),
       selected: false,
       disabled: false,
-      onClick: changeInlineToMediaCard,
+      onClick: changeInlineToMediaCard(editorAnalyticsAPI),
       testId: 'thumbnail-appearance'
     }]
   }, {
@@ -188,7 +188,7 @@ const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState, hover
   return items;
 };
 const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, mediaLinkingState, pluginInjectionApi, getEditorFeatureFlags) => {
-  var _pluginInjectionApi$d3;
+  var _pluginInjectionApi$d7;
   const {
     mediaSingle
   } = state.schema.nodes;
@@ -215,10 +215,12 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
         const borderMark = currentMediaNodeBorderMark(state);
         return /*#__PURE__*/React.createElement(ImageBorderItem, {
           toggleBorder: () => {
-            toggleBorderMark(state, dispatch);
+            var _pluginInjectionApi$d, _pluginInjectionApi$d2;
+            toggleBorderMark(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.analytics) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions)(state, dispatch);
           },
           setBorder: attrs => {
-            setBorderMark(attrs)(state, dispatch);
+            var _pluginInjectionApi$d3, _pluginInjectionApi$d4;
+            setBorderMark(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : (_pluginInjectionApi$d4 = _pluginInjectionApi$d3.analytics) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.actions)(attrs)(state, dispatch);
           },
           showSomewhatSemanticTooltips: getEditorFeatureFlags === null || getEditorFeatureFlags === void 0 ? void 0 : getEditorFeatureFlags().useSomewhatSemanticTextColorNames,
           borderMark: borderMark,
@@ -231,7 +233,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
     });
   }
   if (allowAdvancedToolBarOptions) {
-    var _pluginInjectionApi$d;
+    var _pluginInjectionApi$d5;
     const widthPlugin = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.width;
     let isChangingLayoutDisabled = false;
     if (getBooleanFF('platform.editor.media.extended-resize-experience')) {
@@ -247,7 +249,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
         }
       }
     }
-    const layoutButtons = buildLayoutButtons(state, intl, state.schema.nodes.mediaSingle, widthPlugin, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.actions, allowResizing, allowResizingInTables, true, true, isChangingLayoutDisabled);
+    const layoutButtons = buildLayoutButtons(state, intl, state.schema.nodes.mediaSingle, widthPlugin, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d5 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d5 === void 0 ? void 0 : _pluginInjectionApi$d5.actions, allowResizing, allowResizingInTables, true, true, isChangingLayoutDisabled);
     toolbarButtons = [...toolbarButtons, ...layoutButtons];
     if (layoutButtons.length) {
       toolbarButtons.push({
@@ -271,14 +273,14 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
             };
             const openLink = () => {
               if (editorView) {
-                var _pluginInjectionApi$d2;
+                var _pluginInjectionApi$d6;
                 const {
                   state: {
                     tr
                   },
                   dispatch
                 } = editorView;
-                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d2 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions.attachAnalyticsEvent({
+                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d6 = pluginInjectionApi.dependencies.analytics) === null || _pluginInjectionApi$d6 === void 0 ? void 0 : _pluginInjectionApi$d6.actions.attachAnalyticsEvent({
                   eventType: EVENT_TYPE.TRACK,
                   action: ACTION.VISITED,
                   actionSubject: ACTION_SUBJECT.MEDIA,
@@ -310,7 +312,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
   }
   const {
     hoverDecoration
-  } = (_pluginInjectionApi$d3 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d3 !== void 0 ? _pluginInjectionApi$d3 : {};
+  } = (_pluginInjectionApi$d7 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d7 !== void 0 ? _pluginInjectionApi$d7 : {};
   const removeButton = {
     id: 'editor.media.delete',
     type: 'button',
@@ -338,7 +340,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
   return items;
 };
 export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) => {
-  var _pluginInjectionApi$d4;
+  var _pluginInjectionApi$d8;
   const {
     media,
     mediaInline,
@@ -357,7 +359,7 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
   const mediaLinkingState = getMediaLinkingState(state);
   const {
     hoverDecoration
-  } = (_pluginInjectionApi$d4 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d4 !== void 0 ? _pluginInjectionApi$d4 : {};
+  } = (_pluginInjectionApi$d8 = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.dependencies.decorations.actions) !== null && _pluginInjectionApi$d8 !== void 0 ? _pluginInjectionApi$d8 : {};
   if (!mediaPluginState || mediaPluginState.isResizing) {
     return;
   }
@@ -388,20 +390,22 @@ export const floatingToolbar = (state, intl, options = {}, pluginInjectionApi) =
     selectedNodeType = state.selection.node.type;
   }
   if (allowMediaInline && (parentMediaGroupNode === null || parentMediaGroupNode === void 0 ? void 0 : parentMediaGroupNode.node.type) === mediaGroup) {
+    var _pluginInjectionApi$d9, _pluginInjectionApi$d10;
     const mediaOffset = state.selection.$from.parentOffset + 1;
     baseToolbar.getDomRef = () => {
       var _mediaPluginState$ele;
       const selector = mediaFilmstripItemDOMSelector(mediaOffset);
       return (_mediaPluginState$ele = mediaPluginState.element) === null || _mediaPluginState$ele === void 0 ? void 0 : _mediaPluginState$ele.querySelector(selector);
     };
-    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration);
+    items = generateMediaCardFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d9 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d9 === void 0 ? void 0 : (_pluginInjectionApi$d10 = _pluginInjectionApi$d9.analytics) === null || _pluginInjectionApi$d10 === void 0 ? void 0 : _pluginInjectionApi$d10.actions);
   } else if (allowMediaInline && selectedNodeType && selectedNodeType === mediaInline) {
+    var _pluginInjectionApi$d11, _pluginInjectionApi$d12;
     baseToolbar.getDomRef = () => {
       var _mediaPluginState$ele2;
       const element = (_mediaPluginState$ele2 = mediaPluginState.element) === null || _mediaPluginState$ele2 === void 0 ? void 0 : _mediaPluginState$ele2.querySelector(`.${MediaInlineNodeSelector}`);
       return element || mediaPluginState.element;
     };
-    items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState, hoverDecoration);
+    items = generateMediaInlineFloatingToolbar(state, intl, mediaPluginState, hoverDecoration, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d11 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d11 === void 0 ? void 0 : (_pluginInjectionApi$d12 = _pluginInjectionApi$d11.analytics) === null || _pluginInjectionApi$d12 === void 0 ? void 0 : _pluginInjectionApi$d12.actions);
   } else {
     baseToolbar.getDomRef = () => {
       var _mediaPluginState$ele3;

package/dist/es2019/plugins/media/toolbar/linking.js

@@ -55,7 +55,10 @@ export const getLinkingToolbar = (toolbarBaseConfig, mediaLinkingState, state, i
               providerFactory: providerFactory,
               intl: intl,
               editing: editing,
-              onUnlink: () => unlink(view.state, view.dispatch, view),
+              onUnlink: () => {
+                var _pluginInjectionApi$d, _pluginInjectionApi$d2;
+                return unlink(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.analytics) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions)(view.state, view.dispatch, view);
+              },
               onBack: (href, meta) => {
                 if (href.trim() && meta.inputMethod) {
                   setUrlToMedia(href, meta.inputMethod)(view.state, view.dispatch, view);
@@ -63,7 +66,7 @@ export const getLinkingToolbar = (toolbarBaseConfig, mediaLinkingState, state, i
                 hideLinkingToolbar(view.state, view.dispatch, view);
               },
               onCancel: () => {
-                var _pluginInjectionApi$d;
+                var _pluginInjectionApi$d3;
                 hideLinkingToolbar(view.state, view.dispatch, view, true);
                 /** Focus should move to the 'Add link' button when the toolbar closes
                  * and not close the floating toolbar.
@@ -74,7 +77,7 @@ export const getLinkingToolbar = (toolbarBaseConfig, mediaLinkingState, state, i
                   },
                   dispatch
                 } = view;
-                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies.floatingToolbar.actions) === null || _pluginInjectionApi$d === void 0 ? void 0 : _pluginInjectionApi$d.forceFocusSelector(FORCE_FOCUS_SELECTOR)(tr);
+                pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies.floatingToolbar.actions) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : _pluginInjectionApi$d3.forceFocusSelector(FORCE_FOCUS_SELECTOR)(tr);
                 dispatch(tr);
               },
               onSubmit: (href, meta) => {

package/dist/es2019/plugins/media/utils/media-files.js

@@ -5,7 +5,6 @@ import { posOfPrecedingMediaGroup, posOfMediaGroupNearby, posOfParentMediaGroup,
 import { canInsert, safeInsert, hasParentNode } from '@atlaskit/editor-prosemirror/utils';
 import { atTheBeginningOfBlock, atTheEndOfBlock, atTheEndOfDoc, endPositionOfParent, startPositionOfParent } from '../../../utils/prosemirror/position';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { addAnalytics } from '../../analytics';
 export const canInsertMediaInline = state => {
   const node = state.schema.nodes.mediaInline.create({});
   return canInsert(state.selection.$to, Fragment.from(node));
@@ -80,7 +79,7 @@ function shouldAppendParagraph(state, node) {
  * @param mediaState Media file to be added to the editor
  * @param collection Collection for the media to be added
  */
-export const insertMediaInlineNode = (view, mediaState, collection, inputMethod) => {
+export const insertMediaInlineNode = editorAnalyticsAPI => (view, mediaState, collection, inputMethod) => {
   const {
     state,
     dispatch
@@ -120,7 +119,7 @@ export const insertMediaInlineNode = (view, mediaState, collection, inputMethod)
   } else {
     tr.insert(pos, content).deleteRange(deleteRange.start, deleteRange.end);
   }
-  addAnalytics(state, tr, getInsertMediaInlineAnalytics(mediaState, inputMethod));
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(getInsertMediaInlineAnalytics(mediaState, inputMethod))(tr);
   dispatch(tr);
   return true;
 };
@@ -132,7 +131,7 @@ export const insertMediaInlineNode = (view, mediaState, collection, inputMethod)
  * @param mediaStates Media files to be added to the editor
  * @param collection Collection for the media to be added
  */
-export const insertMediaGroupNode = (view, mediaStates, collection, inputMethod) => {
+export const insertMediaGroupNode = editorAnalyticsAPI => (view, mediaStates, collection, inputMethod) => {
   const {
     state,
     dispatch
@@ -170,7 +169,7 @@ export const insertMediaGroupNode = (view, mediaStates, collection, inputMethod)
     } else {
       tr.insert(mediaInsertPos, content).deleteRange(deleteRange.start, deleteRange.end);
     }
-    addAnalytics(state, tr, getInsertMediaGroupAnalytics(mediaStates, inputMethod));
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(getInsertMediaGroupAnalytics(mediaStates, inputMethod))(tr);
     dispatch(tr);
     setSelectionAfterMediaInsertion(view);
     return;
@@ -180,7 +179,7 @@ export const insertMediaGroupNode = (view, mediaStates, collection, inputMethod)
   if (withParagraph && parent.type !== schema.nodes.mediaGroup) {
     content.push(paragraph.create());
   }
-  addAnalytics(state, tr, getInsertMediaGroupAnalytics(mediaStates, inputMethod));
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(getInsertMediaGroupAnalytics(mediaStates, inputMethod))(tr);
   dispatch(safeInsert(Fragment.fromArray(content), mediaInsertPos)(tr));
 };
 const createMediaFileNodes = (mediaStates, collection, media) => {

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.14.9";
+export const version = "187.14.12";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "187.14.9",
+	"version": "187.14.12",
 	"sideEffects": false
 }

package/dist/esm/plugins/floating-toolbar/ui/Separator.js

@@ -1,12 +1,2 @@
-import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
-var _templateObject;
-/** @jsx jsx */
-import { css, jsx } from '@emotion/react';
-import { N30 } from '@atlaskit/theme/colors';
-var separator = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background: ", ";\n  width: 1px;\n  height: 20px;\n  margin: 0 4px;\n  align-self: center;\n"])), "var(--ds-border, ".concat(N30, ")"));
-export default (function () {
-  return jsx("div", {
-    css: separator,
-    className: "separator"
-  });
-});
+import { FloatingToolbarSeparator } from '@atlaskit/editor-common/ui';
+export default FloatingToolbarSeparator;

package/dist/esm/plugins/media/commands/captions.js

@@ -1,5 +1,5 @@
 import { setTextSelection } from '@atlaskit/editor-prosemirror/utils';
-import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE } from '../../analytics';
+import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 export var selectCaptionFromMediaSinglePos = function selectCaptionFromMediaSinglePos(mediaSingleNodePos, mediaSingleNode) {
   return function (state, dispatch) {
     // node should have two children, media and caption
@@ -17,33 +17,35 @@ export var selectCaptionFromMediaSinglePos = function selectCaptionFromMediaSing
     return true;
   };
 };
-export var insertAndSelectCaptionFromMediaSinglePos = function insertAndSelectCaptionFromMediaSinglePos(mediaSingleNodePos, mediaSingleNode) {
-  return function (state, dispatch) {
-    if (typeof mediaSingleNodePos !== 'number') {
-      return false;
-    }
-    var tr = state.tr;
+export var insertAndSelectCaptionFromMediaSinglePos = function insertAndSelectCaptionFromMediaSinglePos(editorAnalyticsAPI) {
+  return function (mediaSingleNodePos, mediaSingleNode) {
+    return function (state, dispatch) {
+      if (typeof mediaSingleNodePos !== 'number') {
+        return false;
+      }
+      var tr = state.tr;
 
-    // node should have one child, media
-    if (mediaSingleNode.childCount !== 1) {
-      return false;
-    }
-    if (dispatch) {
-      var schema = state.schema;
-      var media = mediaSingleNode.child(0);
-      var caption = schema.nodes.caption.create();
-      tr = state.tr.insert(mediaSingleNodePos + media.nodeSize + 1, caption);
-      tr = setSelectionAtEndOfCaption(tr, mediaSingleNodePos, media.nodeSize, caption.nodeSize);
-      tr.setMeta('scrollIntoView', false);
-      addAnalytics(state, tr, {
-        action: ACTION.ADDED,
-        eventType: EVENT_TYPE.TRACK,
-        actionSubject: ACTION_SUBJECT.MEDIA_SINGLE,
-        actionSubjectId: ACTION_SUBJECT_ID.CAPTION
-      });
-      dispatch(tr);
-    }
-    return true;
+      // node should have one child, media
+      if (mediaSingleNode.childCount !== 1) {
+        return false;
+      }
+      if (dispatch) {
+        var schema = state.schema;
+        var media = mediaSingleNode.child(0);
+        var caption = schema.nodes.caption.create();
+        tr = state.tr.insert(mediaSingleNodePos + media.nodeSize + 1, caption);
+        tr = setSelectionAtEndOfCaption(tr, mediaSingleNodePos, media.nodeSize, caption.nodeSize);
+        tr.setMeta('scrollIntoView', false);
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+          action: ACTION.ADDED,
+          eventType: EVENT_TYPE.TRACK,
+          actionSubject: ACTION_SUBJECT.MEDIA_SINGLE,
+          actionSubjectId: ACTION_SUBJECT_ID.CAPTION
+        })(tr);
+        dispatch(tr);
+      }
+      return true;
+    };
   };
 };
 var setSelectionAtEndOfCaption = function setSelectionAtEndOfCaption(tr, mediaSingleNodePos, mediaNodeSize, captionNodeSize) {

package/dist/esm/plugins/media/commands/linking.js

@@ -5,7 +5,7 @@ import { createMediaLinkingCommand, getMediaLinkingState, mediaLinkingPluginKey
 import { normalizeUrl } from '@atlaskit/editor-common/utils';
 import { createToggleBlockMarkOnRange } from '../../../commands';
 import { MediaLinkingActionsTypes } from '../pm-plugins/linking/actions';
-import { addAnalytics, EVENT_TYPE, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID } from '../../analytics';
+import { EVENT_TYPE, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
 import { currentMediaNode } from '../utils/current-media-node';
 import { checkMediaType } from '../utils/check-media-type';
 import { getMediaPluginState } from '../pm-plugins/main';
@@ -116,24 +116,28 @@ function toggleLinkMark(tr, state, _ref) {
   toggleBlockLinkMark($pos.pos, $pos.pos + node.nodeSize, tr, state);
   return tr;
 }
-var fireAnalyticForMediaLink = function fireAnalyticForMediaLink(tr, state, action) {
-  var attributes = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
-  return addAnalytics(state, tr, {
+var fireAnalyticForMediaLink = function fireAnalyticForMediaLink(tr, action) {
+  var attributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
+  var editorAnalyticsAPI = arguments.length > 3 ? arguments[3] : undefined;
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
     action: action,
     eventType: EVENT_TYPE.TRACK,
     actionSubject: ACTION_SUBJECT.MEDIA,
     actionSubjectId: ACTION_SUBJECT_ID.LINK,
     attributes: attributes
-  });
+  })(tr);
+  return tr;
 };
-export var unlink = createMediaLinkingCommand({
-  type: MediaLinkingActionsTypes.unlink
-}, function (tr, state) {
-  var transaction = toggleLinkMark(tr, state, {
-    forceRemove: true
+export var unlink = function unlink(editorAnalyticsAPI) {
+  return createMediaLinkingCommand({
+    type: MediaLinkingActionsTypes.unlink
+  }, function (tr, state) {
+    var transaction = toggleLinkMark(tr, state, {
+      forceRemove: true
+    });
+    return fireAnalyticForMediaLink(transaction, ACTION.DELETED, undefined, editorAnalyticsAPI);
   });
-  return fireAnalyticForMediaLink(transaction, state, ACTION.DELETED);
-});
+};
 var getAction = function getAction(newUrl, state) {
   var currentUrl = getCurrentUrl(state);
   if (!currentUrl) {
@@ -143,7 +147,7 @@ var getAction = function getAction(newUrl, state) {
   }
   return undefined;
 };
-export var setUrlToMedia = function setUrlToMedia(url, inputMethod) {
+export var setUrlToMedia = function setUrlToMedia(url, inputMethod, editorAnalyticsAPI) {
   return createMediaLinkingCommand({
     type: MediaLinkingActionsTypes.setUrl,
     payload: normalizeUrl(url)
@@ -156,14 +160,14 @@ export var setUrlToMedia = function setUrlToMedia(url, inputMethod) {
       var toggleLinkMarkResult = toggleLinkMark(tr, state, {
         url: url
       });
-      fireAnalyticForMediaLink(tr, state, action, action === ACTION.ADDED ? {
+      fireAnalyticForMediaLink(tr, action, action === ACTION.ADDED ? {
         inputMethod: inputMethod
-      } : undefined);
+      } : undefined, editorAnalyticsAPI);
       return toggleLinkMarkResult;
     } catch (e) {
-      fireAnalyticForMediaLink(tr, state, ACTION.ERRORED, {
+      fireAnalyticForMediaLink(tr, ACTION.ERRORED, {
         action: action
-      });
+      }, editorAnalyticsAPI);
       throw e;
     }
   });

package/dist/esm/plugins/media/index.js

@@ -111,7 +111,8 @@ var mediaPlugin = function mediaPlugin() {
       }, {
         name: 'mediaKeymap',
         plugin: function plugin() {
-          return keymapPlugin(options);
+          var _api$dependencies$ana;
+          return keymapPlugin(options, api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions);
         }
       }];
       if (options && options.allowMediaSingle) {
@@ -226,11 +227,11 @@ var mediaPlugin = function mediaPlugin() {
             return /*#__PURE__*/React.createElement(IconImages, null);
           },
           action: function action(insert, state) {
-            var _api$dependencies$ana;
+            var _api$dependencies$ana2;
             var pluginState = pluginKey.getState(state);
             pluginState === null || pluginState === void 0 ? void 0 : pluginState.showMediaPicker();
             var tr = insert('');
-            api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions.attachAnalyticsEvent({
+            api === null || api === void 0 ? void 0 : (_api$dependencies$ana2 = api.dependencies.analytics) === null || _api$dependencies$ana2 === void 0 ? void 0 : _api$dependencies$ana2.actions.attachAnalyticsEvent({
               action: ACTION.OPENED,
               actionSubject: ACTION_SUBJECT.PICKER,
               actionSubjectId: ACTION_SUBJECT_ID.PICKER_CLOUD,

package/dist/esm/plugins/media/nodeviews/mediaSingle.js

@@ -230,14 +230,16 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
       (_this$captionPlaceHol = _this.captionPlaceHolderRef.current) === null || _this$captionPlaceHol === void 0 ? void 0 : _this$captionPlaceHol.click();
     });
     _defineProperty(_assertThisInitialized(_this), "clickPlaceholder", function () {
+      var _pluginInjectionApi$d, _pluginInjectionApi$d2;
       var _this$props = _this.props,
         view = _this$props.view,
         getPos = _this$props.getPos,
-        node = _this$props.node;
+        node = _this$props.node,
+        pluginInjectionApi = _this$props.pluginInjectionApi;
       if (typeof getPos === 'boolean') {
         return;
       }
-      insertAndSelectCaptionFromMediaSinglePos(getPos(), node)(view.state, view.dispatch);
+      insertAndSelectCaptionFromMediaSinglePos(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.analytics) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions)(getPos(), node)(view.state, view.dispatch);
     });
     /**
      * Get parent width for a nested media single node

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

@@ -5,15 +5,15 @@ import { stateKey } from '../pm-plugins/plugin-key';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { insertAndSelectCaptionFromMediaSinglePos, selectCaptionFromMediaSinglePos } from '../commands/captions';
-export function keymapPlugin(options) {
+export function keymapPlugin(options, editorAnalyticsAPI) {
   var list = {};
   var _ref = options || {},
     featureFlags = _ref.featureFlags;
   keymaps.bindKeymapWithCommand(keymaps.undo.common, ignoreLinksInSteps, list);
   keymaps.bindKeymapWithCommand(keymaps.enter.common, splitMediaGroup, list);
   if (getMediaFeatureFlag('captions', featureFlags)) {
-    keymaps.bindKeymapWithCommand(keymaps.moveDown.common, insertAndSelectCaption, list);
-    keymaps.bindKeymapWithCommand(keymaps.tab.common, insertAndSelectCaption, list);
+    keymaps.bindKeymapWithCommand(keymaps.moveDown.common, insertAndSelectCaption(editorAnalyticsAPI), list);
+    keymaps.bindKeymapWithCommand(keymaps.tab.common, insertAndSelectCaption(editorAnalyticsAPI), list);
     keymaps.bindKeymapWithCommand(keymaps.moveLeft.common, arrowLeftFromMediaSingle(options === null || options === void 0 ? void 0 : options.editorSelectionAPI), list);
     keymaps.bindKeymapWithCommand(keymaps.moveRight.common, arrowRightFromMediaSingle(options === null || options === void 0 ? void 0 : options.editorSelectionAPI), list);
   }
@@ -29,20 +29,22 @@ var splitMediaGroup = function splitMediaGroup(state) {
   var mediaPluginState = stateKey.getState(state);
   return mediaPluginState.splitMediaGroup();
 };
-var insertAndSelectCaption = function insertAndSelectCaption(state, dispatch) {
-  var selection = state.selection,
-    schema = state.schema;
-  if (selection instanceof NodeSelection && selection.node.type === schema.nodes.mediaSingle && schema.nodes.caption) {
-    if (dispatch) {
-      var from = selection.from,
-        node = selection.node;
-      if (!insertAndSelectCaptionFromMediaSinglePos(from, node)(state, dispatch)) {
-        selectCaptionFromMediaSinglePos(from, node)(state, dispatch);
+var insertAndSelectCaption = function insertAndSelectCaption(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    var selection = state.selection,
+      schema = state.schema;
+    if (selection instanceof NodeSelection && selection.node.type === schema.nodes.mediaSingle && schema.nodes.caption) {
+      if (dispatch) {
+        var from = selection.from,
+          node = selection.node;
+        if (!insertAndSelectCaptionFromMediaSinglePos(editorAnalyticsAPI)(from, node)(state, dispatch)) {
+          selectCaptionFromMediaSinglePos(from, node)(state, dispatch);
+        }
       }
+      return true;
     }
-    return true;
-  }
-  return false;
+    return false;
+  };
 };
 var arrowLeftFromMediaSingle = function arrowLeftFromMediaSingle(editorSelectionAPI) {
   return function (state, dispatch) {

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

@@ -54,7 +54,7 @@ var createDropPlaceholder = function createDropPlaceholder(intl, allowDropLine)
 };
 var MEDIA_RESOLVED_STATES = ['ready', 'error', 'cancelled'];
 export var MediaPluginStateImplementation = /*#__PURE__*/function () {
-  function MediaPluginStateImplementation(_state, options, mediaOptions, newInsertionBehaviour, _dispatch, pluginInjectionApi) {
+  function MediaPluginStateImplementation(_state, options, mediaOptions, newInsertionBehaviour, _dispatch, _pluginInjectionApi) {
     var _this = this;
     _classCallCheck(this, MediaPluginStateImplementation);
     _defineProperty(this, "allowsUploads", false);
@@ -206,7 +206,7 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
      *
      * called when we insert a new file via the picker (connected via pickerfacade)
      */
-    _defineProperty(this, "insertFile", function (mediaState, onMediaStateChanged, pickerType) {
+    _defineProperty(this, "insertFile", function (mediaState, onMediaStateChanged, pickerType, pluginInjectionApi) {
       var _mediaState$collectio, _this$mediaOptions2;
       var state = _this.view.state;
       var mediaStateWithContext = _objectSpread(_objectSpread({}, mediaState), {}, {
@@ -229,9 +229,11 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
         var widthPluginState = (_this$pluginInjection = _this.pluginInjectionApi) === null || _this$pluginInjection === void 0 ? void 0 : _this$pluginInjection.dependencies.width.sharedState.currentState();
         insertMediaSingleNode(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, _this.newInsertionBehaviour, widthPluginState);
       } else if (getMediaFeatureFlag('mediaInline', (_this$mediaOptions2 = _this.mediaOptions) === null || _this$mediaOptions2 === void 0 ? void 0 : _this$mediaOptions2.featureFlags) && !isInEmptyLine(state) && (!isInsidePotentialEmptyParagraph(state) || isInListItem(state)) && canInsertMediaInline(state)) {
-        insertMediaInlineNode(_this.view, mediaStateWithContext, collection, _this.getInputMethod(pickerType));
+        var _pluginInjectionApi$d, _pluginInjectionApi$d2;
+        insertMediaInlineNode(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d === void 0 ? void 0 : (_pluginInjectionApi$d2 = _pluginInjectionApi$d.analytics) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions)(_this.view, mediaStateWithContext, collection, _this.getInputMethod(pickerType));
       } else {
-        insertMediaGroupNode(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType));
+        var _pluginInjectionApi$d3, _pluginInjectionApi$d4;
+        insertMediaGroupNode(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$d3 = pluginInjectionApi.dependencies) === null || _pluginInjectionApi$d3 === void 0 ? void 0 : (_pluginInjectionApi$d4 = _pluginInjectionApi$d3.analytics) === null || _pluginInjectionApi$d4 === void 0 ? void 0 : _pluginInjectionApi$d4.actions)(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType));
       }
 
       // do events when media state changes
@@ -468,7 +470,7 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
     this.mediaOptions = mediaOptions;
     this.newInsertionBehaviour = newInsertionBehaviour;
     this.dispatch = _dispatch;
-    this.pluginInjectionApi = pluginInjectionApi;
+    this.pluginInjectionApi = _pluginInjectionApi;
     this.waitForMediaUpload = options.waitForMediaUpload === undefined ? true : options.waitForMediaUpload;
     var nodes = _state.schema.nodes;
     assert(nodes.media && (nodes.mediaGroup || nodes.mediaSingle), 'Editor: unable to init media plugin - media or mediaGroup/mediaSingle node absent in schema');