@atlaskit/editor-core 187.14.9 → 187.14.12

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

@@ -11,7 +11,6 @@ var _mediaCommon = require("./media-common");
 var _utils3 = require("@atlaskit/editor-prosemirror/utils");
 var _position = require("../../../utils/prosemirror/position");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _analytics2 = require("../../analytics");
 var canInsertMediaInline = function canInsertMediaInline(state) {
   var node = state.schema.nodes.mediaInline.create({});
   return (0, _utils3.canInsert)(state.selection.$to, _model.Fragment.from(node));
@@ -79,41 +78,43 @@ function shouldAppendParagraph(state, node) {
  * @param mediaState Media file to be added to the editor
  * @param collection Collection for the media to be added
  */
-var insertMediaInlineNode = function insertMediaInlineNode(view, mediaState, collection, inputMethod) {
-  var state = view.state,
-    dispatch = view.dispatch;
-  var schema = state.schema,
-    tr = state.tr;
-  var mediaInline = schema.nodes.mediaInline;
+var insertMediaInlineNode = function insertMediaInlineNode(editorAnalyticsAPI) {
+  return function (view, mediaState, collection, inputMethod) {
+    var state = view.state,
+      dispatch = view.dispatch;
+    var schema = state.schema,
+      tr = state.tr;
+    var mediaInline = schema.nodes.mediaInline;
 
-  // Do nothing if no media found
-  if (!mediaInline || !mediaState || collection === undefined) {
-    return false;
-  }
-  var id = mediaState.id;
-  var mediaInlineNode = mediaInline.create({
-    id: id,
-    collection: collection
-  });
-  var space = state.schema.text(' ');
-  var pos = state.selection.$to.pos;
+    // Do nothing if no media found
+    if (!mediaInline || !mediaState || collection === undefined) {
+      return false;
+    }
+    var id = mediaState.id;
+    var mediaInlineNode = mediaInline.create({
+      id: id,
+      collection: collection
+    });
+    var space = state.schema.text(' ');
+    var pos = state.selection.$to.pos;
 
-  // If the selection is inside an empty list item set pos inside paragraph
-  if ((0, _utils.isInListItem)(state) && (0, _mediaCommon.isInsidePotentialEmptyParagraph)(state)) {
-    pos = pos + 1;
-  }
-  var content = _model.Fragment.from([mediaInlineNode, space]);
+    // If the selection is inside an empty list item set pos inside paragraph
+    if ((0, _utils.isInListItem)(state) && (0, _mediaCommon.isInsidePotentialEmptyParagraph)(state)) {
+      pos = pos + 1;
+    }
+    var content = _model.Fragment.from([mediaInlineNode, space]);
 
-  // Delete the selection if a selection is made
-  var deleteRange = findDeleteRange(state);
-  if (!deleteRange) {
-    tr.insert(pos, content);
-  } else {
-    tr.insert(pos, content).deleteRange(deleteRange.start, deleteRange.end);
-  }
-  (0, _analytics2.addAnalytics)(state, tr, getInsertMediaInlineAnalytics(mediaState, inputMethod));
-  dispatch(tr);
-  return true;
+    // Delete the selection if a selection is made
+    var deleteRange = findDeleteRange(state);
+    if (!deleteRange) {
+      tr.insert(pos, content);
+    } else {
+      tr.insert(pos, content).deleteRange(deleteRange.start, deleteRange.end);
+    }
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(getInsertMediaInlineAnalytics(mediaState, inputMethod))(tr);
+    dispatch(tr);
+    return true;
+  };
 };
 
 /**
@@ -124,51 +125,53 @@ var insertMediaInlineNode = function insertMediaInlineNode(view, mediaState, col
  * @param collection Collection for the media to be added
  */
 exports.insertMediaInlineNode = insertMediaInlineNode;
-var insertMediaGroupNode = function insertMediaGroupNode(view, mediaStates, collection, inputMethod) {
-  var state = view.state,
-    dispatch = view.dispatch;
-  var tr = state.tr,
-    schema = state.schema;
-  var _schema$nodes = schema.nodes,
-    media = _schema$nodes.media,
-    paragraph = _schema$nodes.paragraph;
+var insertMediaGroupNode = function insertMediaGroupNode(editorAnalyticsAPI) {
+  return function (view, mediaStates, collection, inputMethod) {
+    var state = view.state,
+      dispatch = view.dispatch;
+    var tr = state.tr,
+      schema = state.schema;
+    var _schema$nodes = schema.nodes,
+      media = _schema$nodes.media,
+      paragraph = _schema$nodes.paragraph;
 
-  // Do nothing if no media found
-  if (!media || !mediaStates.length) {
-    return;
-  }
-  var mediaNodes = createMediaFileNodes(mediaStates, collection, media);
-  var mediaInsertPos = findMediaInsertPos(state);
-  var resolvedInsertPos = tr.doc.resolve(mediaInsertPos);
-  var parent = resolvedInsertPos.parent;
-  var nodeAtInsertionPoint = tr.doc.nodeAt(mediaInsertPos);
-  var shouldSplit = !isSelectionMediaGroup(state) && (0, _utils2.isSupportedInParent)(state, _model.Fragment.from(state.schema.nodes.mediaGroup.createChecked({}, mediaNodes)));
-  var withParagraph = shouldAppendParagraph(state, nodeAtInsertionPoint);
-  var content = parent.type === schema.nodes.mediaGroup ? mediaNodes // If parent is a mediaGroup do not wrap items again.
-  : [schema.nodes.mediaGroup.createChecked({}, mediaNodes)];
-  if (shouldSplit) {
-    content = withParagraph ? content.concat(paragraph.create()) : content;
-    // delete the selection or empty paragraph
-    var deleteRange = findDeleteRange(state);
-    if (!deleteRange) {
-      tr.insert(mediaInsertPos, content);
-    } else if (mediaInsertPos <= deleteRange.start) {
-      tr.deleteRange(deleteRange.start, deleteRange.end).insert(mediaInsertPos, content);
-    } else {
-      tr.insert(mediaInsertPos, content).deleteRange(deleteRange.start, deleteRange.end);
+    // Do nothing if no media found
+    if (!media || !mediaStates.length) {
+      return;
+    }
+    var mediaNodes = createMediaFileNodes(mediaStates, collection, media);
+    var mediaInsertPos = findMediaInsertPos(state);
+    var resolvedInsertPos = tr.doc.resolve(mediaInsertPos);
+    var parent = resolvedInsertPos.parent;
+    var nodeAtInsertionPoint = tr.doc.nodeAt(mediaInsertPos);
+    var shouldSplit = !isSelectionMediaGroup(state) && (0, _utils2.isSupportedInParent)(state, _model.Fragment.from(state.schema.nodes.mediaGroup.createChecked({}, mediaNodes)));
+    var withParagraph = shouldAppendParagraph(state, nodeAtInsertionPoint);
+    var content = parent.type === schema.nodes.mediaGroup ? mediaNodes // If parent is a mediaGroup do not wrap items again.
+    : [schema.nodes.mediaGroup.createChecked({}, mediaNodes)];
+    if (shouldSplit) {
+      content = withParagraph ? content.concat(paragraph.create()) : content;
+      // delete the selection or empty paragraph
+      var deleteRange = findDeleteRange(state);
+      if (!deleteRange) {
+        tr.insert(mediaInsertPos, content);
+      } else if (mediaInsertPos <= deleteRange.start) {
+        tr.deleteRange(deleteRange.start, deleteRange.end).insert(mediaInsertPos, content);
+      } else {
+        tr.insert(mediaInsertPos, content).deleteRange(deleteRange.start, deleteRange.end);
+      }
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(getInsertMediaGroupAnalytics(mediaStates, inputMethod))(tr);
+      dispatch(tr);
+      setSelectionAfterMediaInsertion(view);
+      return;
     }
-    (0, _analytics2.addAnalytics)(state, tr, getInsertMediaGroupAnalytics(mediaStates, inputMethod));
-    dispatch(tr);
-    setSelectionAfterMediaInsertion(view);
-    return;
-  }
 
-  // Don't append new paragraph when adding media to a existing mediaGroup
-  if (withParagraph && parent.type !== schema.nodes.mediaGroup) {
-    content.push(paragraph.create());
-  }
-  (0, _analytics2.addAnalytics)(state, tr, getInsertMediaGroupAnalytics(mediaStates, inputMethod));
-  dispatch((0, _utils3.safeInsert)(_model.Fragment.fromArray(content), mediaInsertPos)(tr));
+    // Don't append new paragraph when adding media to a existing mediaGroup
+    if (withParagraph && parent.type !== schema.nodes.mediaGroup) {
+      content.push(paragraph.create());
+    }
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(getInsertMediaGroupAnalytics(mediaStates, inputMethod))(tr);
+    dispatch((0, _utils3.safeInsert)(_model.Fragment.fromArray(content), mediaInsertPos)(tr));
+  };
 };
 exports.insertMediaGroupNode = insertMediaGroupNode;
 var createMediaFileNodes = function createMediaFileNodes(mediaStates, collection, media) {

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "187.14.9";
+var version = "187.14.12";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

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

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

@@ -1,14 +1,2 @@
-/** @jsx jsx */
-import { css, jsx } from '@emotion/react';
-import { N30 } from '@atlaskit/theme/colors';
-const separator = css`
-  background: ${`var(--ds-border, ${N30})`};
-  width: 1px;
-  height: 20px;
-  margin: 0 4px;
-  align-self: center;
-`;
-export default (() => jsx("div", {
-  css: separator,
-  className: "separator"
-}));
+import { FloatingToolbarSeparator } from '@atlaskit/editor-common/ui';
+export default FloatingToolbarSeparator;

package/dist/es2019/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 const selectCaptionFromMediaSinglePos = (mediaSingleNodePos, mediaSingleNode) => (state, dispatch) => {
   // node should have two children, media and caption
   if (mediaSingleNode.childCount !== 2) {
@@ -15,7 +15,7 @@ export const selectCaptionFromMediaSinglePos = (mediaSingleNodePos, mediaSingleN
   }
   return true;
 };
-export const insertAndSelectCaptionFromMediaSinglePos = (mediaSingleNodePos, mediaSingleNode) => (state, dispatch) => {
+export const insertAndSelectCaptionFromMediaSinglePos = editorAnalyticsAPI => (mediaSingleNodePos, mediaSingleNode) => (state, dispatch) => {
   if (typeof mediaSingleNodePos !== 'number') {
     return false;
   }
@@ -32,12 +32,12 @@ export const insertAndSelectCaptionFromMediaSinglePos = (mediaSingleNodePos, med
     tr = state.tr.insert(mediaSingleNodePos + media.nodeSize + 1, caption);
     tr = setSelectionAtEndOfCaption(tr, mediaSingleNodePos, media.nodeSize, caption.nodeSize);
     tr.setMeta('scrollIntoView', false);
-    addAnalytics(state, tr, {
+    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;

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

@@ -2,7 +2,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';
@@ -117,22 +117,23 @@ function toggleLinkMark(tr, state, {
   toggleBlockLinkMark($pos.pos, $pos.pos + node.nodeSize, tr, state);
   return tr;
 }
-const fireAnalyticForMediaLink = (tr, state, action, attributes = undefined) => {
-  return addAnalytics(state, tr, {
+const fireAnalyticForMediaLink = (tr, action, attributes = undefined, editorAnalyticsAPI) => {
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
     action,
     eventType: EVENT_TYPE.TRACK,
     actionSubject: ACTION_SUBJECT.MEDIA,
     actionSubjectId: ACTION_SUBJECT_ID.LINK,
     attributes
-  });
+  })(tr);
+  return tr;
 };
-export const unlink = createMediaLinkingCommand({
+export const unlink = editorAnalyticsAPI => createMediaLinkingCommand({
   type: MediaLinkingActionsTypes.unlink
 }, (tr, state) => {
   const transaction = toggleLinkMark(tr, state, {
     forceRemove: true
   });
-  return fireAnalyticForMediaLink(transaction, state, ACTION.DELETED);
+  return fireAnalyticForMediaLink(transaction, ACTION.DELETED, undefined, editorAnalyticsAPI);
 });
 const getAction = (newUrl, state) => {
   const currentUrl = getCurrentUrl(state);
@@ -143,7 +144,7 @@ const getAction = (newUrl, state) => {
   }
   return undefined;
 };
-export const setUrlToMedia = (url, inputMethod) => createMediaLinkingCommand({
+export const setUrlToMedia = (url, inputMethod, editorAnalyticsAPI) => createMediaLinkingCommand({
   type: MediaLinkingActionsTypes.setUrl,
   payload: normalizeUrl(url)
 }, (tr, state) => {
@@ -155,14 +156,14 @@ export const setUrlToMedia = (url, inputMethod) => createMediaLinkingCommand({
     const toggleLinkMarkResult = toggleLinkMark(tr, state, {
       url: url
     });
-    fireAnalyticForMediaLink(tr, state, action, action === ACTION.ADDED ? {
+    fireAnalyticForMediaLink(tr, action, action === ACTION.ADDED ? {
       inputMethod
-    } : undefined);
+    } : undefined, editorAnalyticsAPI);
     return toggleLinkMarkResult;
   } catch (e) {
-    fireAnalyticForMediaLink(tr, state, ACTION.ERRORED, {
+    fireAnalyticForMediaLink(tr, ACTION.ERRORED, {
       action: action
-    });
+    }, editorAnalyticsAPI);
     throw e;
   }
 });

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

@@ -108,7 +108,10 @@ const mediaPlugin = (options = {}, api) => {
         }
       }, {
         name: 'mediaKeymap',
-        plugin: () => keymapPlugin(options)
+        plugin: () => {
+          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) {
         pmPlugins.push({
@@ -222,11 +225,11 @@ const mediaPlugin = (options = {}, api) => {
         keywords: ['attachment', 'gif', 'media', 'picture', 'image', 'video'],
         icon: () => /*#__PURE__*/React.createElement(IconImages, null),
         action(insert, state) {
-          var _api$dependencies$ana;
+          var _api$dependencies$ana2;
           const pluginState = pluginKey.getState(state);
           pluginState === null || pluginState === void 0 ? void 0 : pluginState.showMediaPicker();
           const 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/es2019/plugins/media/nodeviews/mediaSingle.js

@@ -164,15 +164,17 @@ export default class MediaSingleNode extends Component {
       (_this$captionPlaceHol = this.captionPlaceHolderRef.current) === null || _this$captionPlaceHol === void 0 ? void 0 : _this$captionPlaceHol.click();
     });
     _defineProperty(this, "clickPlaceholder", () => {
+      var _pluginInjectionApi$d, _pluginInjectionApi$d2;
       const {
         view,
         getPos,
-        node
+        node,
+        pluginInjectionApi
       } = this.props;
       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/es2019/plugins/media/pm-plugins/keymap.js

@@ -5,7 +5,7 @@ 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) {
   const list = {};
   const {
     featureFlags
@@ -13,8 +13,8 @@ export function keymapPlugin(options) {
   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);
   }
@@ -30,7 +30,7 @@ const splitMediaGroup = state => {
   const mediaPluginState = stateKey.getState(state);
   return mediaPluginState.splitMediaGroup();
 };
-const insertAndSelectCaption = (state, dispatch) => {
+const insertAndSelectCaption = editorAnalyticsAPI => (state, dispatch) => {
   const {
     selection,
     schema
@@ -41,7 +41,7 @@ const insertAndSelectCaption = (state, dispatch) => {
         from,
         node
       } = selection;
-      if (!insertAndSelectCaptionFromMediaSinglePos(from, node)(state, dispatch)) {
+      if (!insertAndSelectCaptionFromMediaSinglePos(editorAnalyticsAPI)(from, node)(state, dispatch)) {
         selectCaptionFromMediaSinglePos(from, node)(state, dispatch);
       }
     }

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

@@ -45,7 +45,7 @@ const createDropPlaceholder = (intl, allowDropLine) => {
 };
 const MEDIA_RESOLVED_STATES = ['ready', 'error', 'cancelled'];
 export class MediaPluginStateImplementation {
-  constructor(_state, options, mediaOptions, newInsertionBehaviour, _dispatch, pluginInjectionApi) {
+  constructor(_state, options, mediaOptions, newInsertionBehaviour, _dispatch, _pluginInjectionApi) {
     _defineProperty(this, "allowsUploads", false);
     _defineProperty(this, "ignoreLinks", false);
     _defineProperty(this, "waitForMediaUpload", true);
@@ -149,7 +149,7 @@ export class MediaPluginStateImplementation {
      *
      * called when we insert a new file via the picker (connected via pickerfacade)
      */
-    _defineProperty(this, "insertFile", (mediaState, onMediaStateChanged, pickerType) => {
+    _defineProperty(this, "insertFile", (mediaState, onMediaStateChanged, pickerType, pluginInjectionApi) => {
       var _mediaState$collectio, _this$mediaOptions2;
       const {
         state
@@ -175,9 +175,11 @@ export class MediaPluginStateImplementation {
         const 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
@@ -413,7 +415,7 @@ export class MediaPluginStateImplementation {
     this.mediaOptions = mediaOptions;
     this.newInsertionBehaviour = newInsertionBehaviour;
     this.dispatch = _dispatch;
-    this.pluginInjectionApi = pluginInjectionApi;
+    this.pluginInjectionApi = _pluginInjectionApi;
     this.waitForMediaUpload = options.waitForMediaUpload === undefined ? true : options.waitForMediaUpload;
     const {
       nodes

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

@@ -1,12 +1,12 @@
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { isNodeSelection, removeSelectedNode, safeInsert } 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';
 import { removeMediaGroupNode } from './utils';
 import { currentMediaNodeWithPos } from '../utils/current-media-node';
 export const DEFAULT_BORDER_COLOR = '#091e4224';
 export const DEFAULT_BORDER_SIZE = 2;
-export const changeInlineToMediaCard = (state, dispatch) => {
+export const changeInlineToMediaCard = editorAnalyticsAPI => (state, dispatch) => {
   const {
     media,
     mediaInline,
@@ -32,7 +32,7 @@ export const changeInlineToMediaCard = (state, dispatch) => {
   tr = removeSelectedNode(tr);
   tr = safeInsert(group, nodePos, true)(tr);
   if (dispatch) {
-    addAnalytics(state, tr, {
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
       action: ACTION.CHANGED_TYPE,
       actionSubject: ACTION_SUBJECT.MEDIA,
       eventType: EVENT_TYPE.TRACK,
@@ -40,12 +40,12 @@ export const changeInlineToMediaCard = (state, dispatch) => {
         newType: ACTION_SUBJECT_ID.MEDIA_GROUP,
         previousType: ACTION_SUBJECT_ID.MEDIA_INLINE
       }
-    });
+    })(tr);
     dispatch(tr);
   }
   return true;
 };
-export const changeMediaCardToInline = (state, dispatch) => {
+export const changeMediaCardToInline = editorAnalyticsAPI => (state, dispatch) => {
   const {
     media,
     mediaInline,
@@ -68,7 +68,7 @@ export const changeMediaCardToInline = (state, dispatch) => {
   let tr = removeMediaGroupNode(state);
   tr = safeInsert(node, nodePos, true)(tr);
   if (dispatch) {
-    addAnalytics(state, tr, {
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
       action: ACTION.CHANGED_TYPE,
       actionSubject: ACTION_SUBJECT.MEDIA,
       eventType: EVENT_TYPE.TRACK,
@@ -76,7 +76,7 @@ export const changeMediaCardToInline = (state, dispatch) => {
         newType: ACTION_SUBJECT_ID.MEDIA_INLINE,
         previousType: ACTION_SUBJECT_ID.MEDIA_GROUP
       }
-    });
+    })(tr);
     dispatch(tr);
   }
   return true;
@@ -90,7 +90,7 @@ export const removeInlineCard = (state, dispatch) => {
   }
   return false;
 };
-export const toggleBorderMark = (state, dispatch) => {
+export const toggleBorderMark = editorAnalyticsAPI => (state, dispatch) => {
   const nodeWithPos = currentMediaNodeWithPos(state);
   if (!nodeWithPos) {
     return false;
@@ -113,7 +113,7 @@ export const toggleBorderMark = (state, dispatch) => {
   }
   if (dispatch) {
     if (borderMark !== null && borderMark !== void 0 && borderMark.attrs) {
-      addAnalytics(state, tr, {
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
         action: ACTION.DELETED,
         actionSubject: ACTION_SUBJECT.MEDIA,
         actionSubjectId: ACTION_SUBJECT_ID.BORDER,
@@ -122,9 +122,9 @@ export const toggleBorderMark = (state, dispatch) => {
           previousColor: borderMark.attrs.color,
           previousSize: borderMark.attrs.size
         }
-      });
+      })(tr);
     } else {
-      addAnalytics(state, tr, {
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
         action: ACTION.ADDED,
         actionSubject: ACTION_SUBJECT.MEDIA,
         actionSubjectId: ACTION_SUBJECT_ID.BORDER,
@@ -133,13 +133,13 @@ export const toggleBorderMark = (state, dispatch) => {
           color: DEFAULT_BORDER_COLOR,
           size: DEFAULT_BORDER_SIZE
         }
-      });
+      })(tr);
     }
     dispatch(tr);
   }
   return true;
 };
-export const setBorderMark = attrs => (state, dispatch) => {
+export const setBorderMark = editorAnalyticsAPI => attrs => (state, dispatch) => {
   var _node$marks$find, _ref, _attrs$color, _ref2, _attrs$size;
   const nodeWithPos = currentMediaNodeWithPos(state);
   if (!nodeWithPos) {
@@ -164,7 +164,7 @@ export const setBorderMark = attrs => (state, dispatch) => {
     }
   }
   if (dispatch) {
-    addAnalytics(state, tr, {
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
       action: ACTION.UPDATED,
       actionSubject: ACTION_SUBJECT.MEDIA,
       actionSubjectId: ACTION_SUBJECT_ID.BORDER,
@@ -175,7 +175,7 @@ export const setBorderMark = attrs => (state, dispatch) => {
         newColor: color,
         newSize: size
       }
-    });
+    })(tr);
     dispatch(tr);
   }
   return true;