@atlaskit/editor-core 187.14.9 → 187.14.11

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-core
 
+## 187.14.11
+
+### Patch Changes
+
+- [`bc706129ddb`](https://bitbucket.org/atlassian/atlassian-frontend/commits/bc706129ddb) - Updated media to no longer use the old addAnalytics, using new AnalyticsAPI
+
 ## 187.14.9
 
 ### Patch Changes

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.selectCaptionFromMediaSinglePos = exports.insertAndSelectCaptionFromMediaSinglePos = void 0;
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _analytics = require("../../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var selectCaptionFromMediaSinglePos = function selectCaptionFromMediaSinglePos(mediaSingleNodePos, mediaSingleNode) {
   return function (state, dispatch) {
     // node should have two children, media and caption
@@ -24,33 +24,35 @@ var selectCaptionFromMediaSinglePos = function selectCaptionFromMediaSinglePos(m
   };
 };
 exports.selectCaptionFromMediaSinglePos = selectCaptionFromMediaSinglePos;
-var insertAndSelectCaptionFromMediaSinglePos = function insertAndSelectCaptionFromMediaSinglePos(mediaSingleNodePos, mediaSingleNode) {
-  return function (state, dispatch) {
-    if (typeof mediaSingleNodePos !== 'number') {
-      return false;
-    }
-    var tr = state.tr;
+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);
-      (0, _analytics.addAnalytics)(state, tr, {
-        action: _analytics.ACTION.ADDED,
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        actionSubject: _analytics.ACTION_SUBJECT.MEDIA_SINGLE,
-        actionSubjectId: _analytics.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: _analytics.ACTION.ADDED,
+          eventType: _analytics.EVENT_TYPE.TRACK,
+          actionSubject: _analytics.ACTION_SUBJECT.MEDIA_SINGLE,
+          actionSubjectId: _analytics.ACTION_SUBJECT_ID.CAPTION
+        })(tr);
+        dispatch(tr);
+      }
+      return true;
+    };
   };
 };
 exports.insertAndSelectCaptionFromMediaSinglePos = insertAndSelectCaptionFromMediaSinglePos;

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

@@ -10,7 +10,7 @@ var _linking = require("../pm-plugins/linking");
 var _utils = require("@atlaskit/editor-common/utils");
 var _commands = require("../../../commands");
 var _actions = require("../pm-plugins/linking/actions");
-var _analytics = require("../../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _currentMediaNode = require("../utils/current-media-node");
 var _checkMediaType = require("../utils/check-media-type");
 var _main = require("../pm-plugins/main");
@@ -126,24 +126,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 (0, _analytics.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: _analytics.EVENT_TYPE.TRACK,
     actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
     actionSubjectId: _analytics.ACTION_SUBJECT_ID.LINK,
     attributes: attributes
-  });
+  })(tr);
+  return tr;
 };
-var unlink = (0, _linking.createMediaLinkingCommand)({
-  type: _actions.MediaLinkingActionsTypes.unlink
-}, function (tr, state) {
-  var transaction = toggleLinkMark(tr, state, {
-    forceRemove: true
+var unlink = function unlink(editorAnalyticsAPI) {
+  return (0, _linking.createMediaLinkingCommand)({
+    type: _actions.MediaLinkingActionsTypes.unlink
+  }, function (tr, state) {
+    var transaction = toggleLinkMark(tr, state, {
+      forceRemove: true
+    });
+    return fireAnalyticForMediaLink(transaction, _analytics.ACTION.DELETED, undefined, editorAnalyticsAPI);
   });
-  return fireAnalyticForMediaLink(transaction, state, _analytics.ACTION.DELETED);
-});
+};
 exports.unlink = unlink;
 var getAction = function getAction(newUrl, state) {
   var currentUrl = getCurrentUrl(state);
@@ -154,7 +158,7 @@ var getAction = function getAction(newUrl, state) {
   }
   return undefined;
 };
-var setUrlToMedia = function setUrlToMedia(url, inputMethod) {
+var setUrlToMedia = function setUrlToMedia(url, inputMethod, editorAnalyticsAPI) {
   return (0, _linking.createMediaLinkingCommand)({
     type: _actions.MediaLinkingActionsTypes.setUrl,
     payload: (0, _utils.normalizeUrl)(url)
@@ -167,14 +171,14 @@ var setUrlToMedia = function setUrlToMedia(url, inputMethod) {
       var toggleLinkMarkResult = toggleLinkMark(tr, state, {
         url: url
       });
-      fireAnalyticForMediaLink(tr, state, action, action === _analytics.ACTION.ADDED ? {
+      fireAnalyticForMediaLink(tr, action, action === _analytics.ACTION.ADDED ? {
         inputMethod: inputMethod
-      } : undefined);
+      } : undefined, editorAnalyticsAPI);
       return toggleLinkMarkResult;
     } catch (e) {
-      fireAnalyticForMediaLink(tr, state, _analytics.ACTION.ERRORED, {
+      fireAnalyticForMediaLink(tr, _analytics.ACTION.ERRORED, {
         action: action
-      });
+      }, editorAnalyticsAPI);
       throw e;
     }
   });

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

@@ -124,7 +124,8 @@ var mediaPlugin = function mediaPlugin() {
       }, {
         name: 'mediaKeymap',
         plugin: function plugin() {
-          return (0, _keymap3.default)(options);
+          var _api$dependencies$ana;
+          return (0, _keymap3.default)(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) {
@@ -239,11 +240,11 @@ var mediaPlugin = function mediaPlugin() {
             return /*#__PURE__*/_react.default.createElement(_quickInsert.IconImages, null);
           },
           action: function action(insert, state) {
-            var _api$dependencies$ana;
+            var _api$dependencies$ana2;
             var pluginState = _main.stateKey.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: _analytics.ACTION.OPENED,
               actionSubject: _analytics.ACTION_SUBJECT.PICKER,
               actionSubjectId: _analytics.ACTION_SUBJECT_ID.PICKER_CLOUD,

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

@@ -239,14 +239,16 @@ var MediaSingleNode = /*#__PURE__*/function (_Component) {
       (_this$captionPlaceHol = _this.captionPlaceHolderRef.current) === null || _this$captionPlaceHol === void 0 ? void 0 : _this$captionPlaceHol.click();
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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;
       }
-      (0, _captions.insertAndSelectCaptionFromMediaSinglePos)(getPos(), node)(view.state, view.dispatch);
+      (0, _captions.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/cjs/plugins/media/pm-plugins/keymap.js

@@ -15,15 +15,15 @@ var _selection = require("@atlaskit/editor-common/selection");
 var _captions = require("../commands/captions");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function keymapPlugin(options) {
+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 ((0, _mediaCommon.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);
   }
@@ -39,20 +39,22 @@ var splitMediaGroup = function splitMediaGroup(state) {
   var mediaPluginState = _pluginKey.stateKey.getState(state);
   return mediaPluginState.splitMediaGroup();
 };
-var insertAndSelectCaption = function insertAndSelectCaption(state, dispatch) {
-  var selection = state.selection,
-    schema = state.schema;
-  if (selection instanceof _state.NodeSelection && selection.node.type === schema.nodes.mediaSingle && schema.nodes.caption) {
-    if (dispatch) {
-      var from = selection.from,
-        node = selection.node;
-      if (!(0, _captions.insertAndSelectCaptionFromMediaSinglePos)(from, node)(state, dispatch)) {
-        (0, _captions.selectCaptionFromMediaSinglePos)(from, node)(state, dispatch);
+var insertAndSelectCaption = function insertAndSelectCaption(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    var selection = state.selection,
+      schema = state.schema;
+    if (selection instanceof _state.NodeSelection && selection.node.type === schema.nodes.mediaSingle && schema.nodes.caption) {
+      if (dispatch) {
+        var from = selection.from,
+          node = selection.node;
+        if (!(0, _captions.insertAndSelectCaptionFromMediaSinglePos)(editorAnalyticsAPI)(from, node)(state, dispatch)) {
+          (0, _captions.selectCaptionFromMediaSinglePos)(from, node)(state, dispatch);
+        }
       }
+      return true;
     }
-    return true;
-  }
-  return false;
+    return false;
+  };
 };
 var arrowLeftFromMediaSingle = function arrowLeftFromMediaSingle(editorSelectionAPI) {
   return function (state, dispatch) {

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

@@ -70,7 +70,7 @@ var createDropPlaceholder = function createDropPlaceholder(intl, allowDropLine)
 };
 var MEDIA_RESOLVED_STATES = ['ready', 'error', 'cancelled'];
 var MediaPluginStateImplementation = /*#__PURE__*/function () {
-  function MediaPluginStateImplementation(_state, options, mediaOptions, newInsertionBehaviour, _dispatch, pluginInjectionApi) {
+  function MediaPluginStateImplementation(_state, options, mediaOptions, newInsertionBehaviour, _dispatch, _pluginInjectionApi) {
     var _this = this;
     (0, _classCallCheck2.default)(this, MediaPluginStateImplementation);
     (0, _defineProperty2.default)(this, "allowsUploads", false);
@@ -222,7 +222,7 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
      *
      * called when we insert a new file via the picker (connected via pickerfacade)
      */
-    (0, _defineProperty2.default)(this, "insertFile", function (mediaState, onMediaStateChanged, pickerType) {
+    (0, _defineProperty2.default)(this, "insertFile", function (mediaState, onMediaStateChanged, pickerType, pluginInjectionApi) {
       var _mediaState$collectio, _this$mediaOptions2;
       var state = _this.view.state;
       var mediaStateWithContext = _objectSpread(_objectSpread({}, mediaState), {}, {
@@ -245,9 +245,11 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
         var widthPluginState = (_this$pluginInjection = _this.pluginInjectionApi) === null || _this$pluginInjection === void 0 ? void 0 : _this$pluginInjection.dependencies.width.sharedState.currentState();
         (0, _mediaSingle.insertMediaSingleNode)(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, _this.newInsertionBehaviour, widthPluginState);
       } else if ((0, _mediaCommon2.getMediaFeatureFlag)('mediaInline', (_this$mediaOptions2 = _this.mediaOptions) === null || _this$mediaOptions2 === void 0 ? void 0 : _this$mediaOptions2.featureFlags) && !(0, _document.isInEmptyLine)(state) && (!(0, _mediaCommon.isInsidePotentialEmptyParagraph)(state) || (0, _utils3.isInListItem)(state)) && (0, _mediaFiles.canInsertMediaInline)(state)) {
-        (0, _mediaFiles.insertMediaInlineNode)(_this.view, mediaStateWithContext, collection, _this.getInputMethod(pickerType));
+        var _pluginInjectionApi$d, _pluginInjectionApi$d2;
+        (0, _mediaFiles.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 {
-        (0, _mediaFiles.insertMediaGroupNode)(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType));
+        var _pluginInjectionApi$d3, _pluginInjectionApi$d4;
+        (0, _mediaFiles.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
@@ -484,7 +486,7 @@ 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;
     (0, _assert.default)(nodes.media && (nodes.mediaGroup || nodes.mediaSingle), 'Editor: unable to init media plugin - media or mediaGroup/mediaSingle node absent in schema');

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

@@ -7,85 +7,89 @@ exports.toggleBorderMark = exports.setBorderMark = exports.removeInlineCard = ex
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _analytics = require("../../analytics");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils2 = require("./utils");
 var _currentMediaNode = require("../utils/current-media-node");
 var DEFAULT_BORDER_COLOR = '#091e4224';
 exports.DEFAULT_BORDER_COLOR = DEFAULT_BORDER_COLOR;
 var DEFAULT_BORDER_SIZE = 2;
 exports.DEFAULT_BORDER_SIZE = DEFAULT_BORDER_SIZE;
-var changeInlineToMediaCard = function changeInlineToMediaCard(state, dispatch) {
-  var _state$schema$nodes = state.schema.nodes,
-    media = _state$schema$nodes.media,
-    mediaInline = _state$schema$nodes.mediaInline,
-    mediaGroup = _state$schema$nodes.mediaGroup;
-  var selectedNode = state.selection instanceof _state.NodeSelection && state.selection.node.type === mediaInline && state.selection.node;
-  if (!selectedNode) {
-    return false;
-  }
-  var _selectedNode$attrs = selectedNode.attrs,
-    id = _selectedNode$attrs.id,
-    type = _selectedNode$attrs.type,
-    collection = _selectedNode$attrs.collection;
-  var mediaNode = media.createChecked({
-    id: id,
-    type: type,
-    collection: collection
-  });
-  var group = mediaGroup.createChecked({}, mediaNode);
-  var nodePos = state.tr.doc.resolve(state.selection.from).end();
-  var tr = state.tr;
-  tr = (0, _utils.removeSelectedNode)(tr);
-  tr = (0, _utils.safeInsert)(group, nodePos, true)(tr);
-  if (dispatch) {
-    (0, _analytics.addAnalytics)(state, tr, {
-      action: _analytics.ACTION.CHANGED_TYPE,
-      actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
-      eventType: _analytics.EVENT_TYPE.TRACK,
-      attributes: {
-        newType: _analytics.ACTION_SUBJECT_ID.MEDIA_GROUP,
-        previousType: _analytics.ACTION_SUBJECT_ID.MEDIA_INLINE
-      }
+var changeInlineToMediaCard = function changeInlineToMediaCard(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    var _state$schema$nodes = state.schema.nodes,
+      media = _state$schema$nodes.media,
+      mediaInline = _state$schema$nodes.mediaInline,
+      mediaGroup = _state$schema$nodes.mediaGroup;
+    var selectedNode = state.selection instanceof _state.NodeSelection && state.selection.node.type === mediaInline && state.selection.node;
+    if (!selectedNode) {
+      return false;
+    }
+    var _selectedNode$attrs = selectedNode.attrs,
+      id = _selectedNode$attrs.id,
+      type = _selectedNode$attrs.type,
+      collection = _selectedNode$attrs.collection;
+    var mediaNode = media.createChecked({
+      id: id,
+      type: type,
+      collection: collection
     });
-    dispatch(tr);
-  }
-  return true;
+    var group = mediaGroup.createChecked({}, mediaNode);
+    var nodePos = state.tr.doc.resolve(state.selection.from).end();
+    var tr = state.tr;
+    tr = (0, _utils.removeSelectedNode)(tr);
+    tr = (0, _utils.safeInsert)(group, nodePos, true)(tr);
+    if (dispatch) {
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+        action: _analytics.ACTION.CHANGED_TYPE,
+        actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
+        eventType: _analytics.EVENT_TYPE.TRACK,
+        attributes: {
+          newType: _analytics.ACTION_SUBJECT_ID.MEDIA_GROUP,
+          previousType: _analytics.ACTION_SUBJECT_ID.MEDIA_INLINE
+        }
+      })(tr);
+      dispatch(tr);
+    }
+    return true;
+  };
 };
 exports.changeInlineToMediaCard = changeInlineToMediaCard;
-var changeMediaCardToInline = function changeMediaCardToInline(state, dispatch) {
-  var _state$schema$nodes2 = state.schema.nodes,
-    media = _state$schema$nodes2.media,
-    mediaInline = _state$schema$nodes2.mediaInline,
-    paragraph = _state$schema$nodes2.paragraph;
-  var selectedNode = state.selection instanceof _state.NodeSelection && state.selection.node;
+var changeMediaCardToInline = function changeMediaCardToInline(editorAnalyticsAPI) {
+  return function (state, dispatch) {
+    var _state$schema$nodes2 = state.schema.nodes,
+      media = _state$schema$nodes2.media,
+      mediaInline = _state$schema$nodes2.mediaInline,
+      paragraph = _state$schema$nodes2.paragraph;
+    var selectedNode = state.selection instanceof _state.NodeSelection && state.selection.node;
 
-  // @ts-ignore - [unblock prosemirror bump] redundant check comparing boolean to media
-  if (!selectedNode || !selectedNode.type === media) {
-    return false;
-  }
-  var mediaInlineNode = mediaInline.create({
-    id: selectedNode.attrs.id,
-    collection: selectedNode.attrs.collection
-  });
-  var space = state.schema.text(' ');
-  var content = _model.Fragment.from([mediaInlineNode, space]);
-  var node = paragraph.createChecked({}, content);
-  var nodePos = state.tr.doc.resolve(state.selection.from).start() - 1;
-  var tr = (0, _utils2.removeMediaGroupNode)(state);
-  tr = (0, _utils.safeInsert)(node, nodePos, true)(tr);
-  if (dispatch) {
-    (0, _analytics.addAnalytics)(state, tr, {
-      action: _analytics.ACTION.CHANGED_TYPE,
-      actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
-      eventType: _analytics.EVENT_TYPE.TRACK,
-      attributes: {
-        newType: _analytics.ACTION_SUBJECT_ID.MEDIA_INLINE,
-        previousType: _analytics.ACTION_SUBJECT_ID.MEDIA_GROUP
-      }
+    // @ts-ignore - [unblock prosemirror bump] redundant check comparing boolean to media
+    if (!selectedNode || !selectedNode.type === media) {
+      return false;
+    }
+    var mediaInlineNode = mediaInline.create({
+      id: selectedNode.attrs.id,
+      collection: selectedNode.attrs.collection
     });
-    dispatch(tr);
-  }
-  return true;
+    var space = state.schema.text(' ');
+    var content = _model.Fragment.from([mediaInlineNode, space]);
+    var node = paragraph.createChecked({}, content);
+    var nodePos = state.tr.doc.resolve(state.selection.from).start() - 1;
+    var tr = (0, _utils2.removeMediaGroupNode)(state);
+    tr = (0, _utils.safeInsert)(node, nodePos, true)(tr);
+    if (dispatch) {
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+        action: _analytics.ACTION.CHANGED_TYPE,
+        actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
+        eventType: _analytics.EVENT_TYPE.TRACK,
+        attributes: {
+          newType: _analytics.ACTION_SUBJECT_ID.MEDIA_INLINE,
+          previousType: _analytics.ACTION_SUBJECT_ID.MEDIA_GROUP
+        }
+      })(tr);
+      dispatch(tr);
+    }
+    return true;
+  };
 };
 exports.changeMediaCardToInline = changeMediaCardToInline;
 var removeInlineCard = function removeInlineCard(state, dispatch) {
@@ -98,77 +102,22 @@ var removeInlineCard = function removeInlineCard(state, dispatch) {
   return false;
 };
 exports.removeInlineCard = removeInlineCard;
-var toggleBorderMark = function toggleBorderMark(state, dispatch) {
-  var nodeWithPos = (0, _currentMediaNode.currentMediaNodeWithPos)(state);
-  if (!nodeWithPos) {
-    return false;
-  }
-  var node = nodeWithPos.node,
-    pos = nodeWithPos.pos;
-  var borderMark = node.marks.find(function (m) {
-    return m.type.name === 'border';
-  });
-  var marks = node.marks.filter(function (m) {
-    return m.type.name !== 'border';
-  }).concat(borderMark ? [] : state.schema.marks.border.create({
-    color: DEFAULT_BORDER_COLOR,
-    size: DEFAULT_BORDER_SIZE
-  }));
-  var tr = state.tr.setNodeMarkup(pos, node.type, node.attrs, marks);
-  tr.setMeta('scrollIntoView', false);
-  if (state.selection instanceof _state.NodeSelection) {
-    if (state.selection.$anchor.pos === state.selection.from) {
-      tr.setSelection(_state.NodeSelection.create(tr.doc, state.selection.from));
-    }
-  }
-  if (dispatch) {
-    if (borderMark !== null && borderMark !== void 0 && borderMark.attrs) {
-      (0, _analytics.addAnalytics)(state, tr, {
-        action: _analytics.ACTION.DELETED,
-        actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.BORDER,
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        attributes: {
-          previousColor: borderMark.attrs.color,
-          previousSize: borderMark.attrs.size
-        }
-      });
-    } else {
-      (0, _analytics.addAnalytics)(state, tr, {
-        action: _analytics.ACTION.ADDED,
-        actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.BORDER,
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        attributes: {
-          color: DEFAULT_BORDER_COLOR,
-          size: DEFAULT_BORDER_SIZE
-        }
-      });
-    }
-    dispatch(tr);
-  }
-  return true;
-};
-exports.toggleBorderMark = toggleBorderMark;
-var setBorderMark = function setBorderMark(attrs) {
+var toggleBorderMark = function toggleBorderMark(editorAnalyticsAPI) {
   return function (state, dispatch) {
-    var _node$marks$find, _ref, _attrs$color, _ref2, _attrs$size;
     var nodeWithPos = (0, _currentMediaNode.currentMediaNodeWithPos)(state);
     if (!nodeWithPos) {
       return false;
     }
     var node = nodeWithPos.node,
       pos = nodeWithPos.pos;
-    var borderMark = (_node$marks$find = node.marks.find(function (m) {
+    var borderMark = node.marks.find(function (m) {
       return m.type.name === 'border';
-    })) === null || _node$marks$find === void 0 ? void 0 : _node$marks$find.attrs;
-    var color = (_ref = (_attrs$color = attrs.color) !== null && _attrs$color !== void 0 ? _attrs$color : borderMark === null || borderMark === void 0 ? void 0 : borderMark.color) !== null && _ref !== void 0 ? _ref : DEFAULT_BORDER_COLOR;
-    var size = (_ref2 = (_attrs$size = attrs.size) !== null && _attrs$size !== void 0 ? _attrs$size : borderMark === null || borderMark === void 0 ? void 0 : borderMark.size) !== null && _ref2 !== void 0 ? _ref2 : DEFAULT_BORDER_SIZE;
+    });
     var marks = node.marks.filter(function (m) {
       return m.type.name !== 'border';
-    }).concat(state.schema.marks.border.create({
-      color: color,
-      size: size
+    }).concat(borderMark ? [] : state.schema.marks.border.create({
+      color: DEFAULT_BORDER_COLOR,
+      size: DEFAULT_BORDER_SIZE
     }));
     var tr = state.tr.setNodeMarkup(pos, node.type, node.attrs, marks);
     tr.setMeta('scrollIntoView', false);
@@ -178,21 +127,80 @@ var setBorderMark = function setBorderMark(attrs) {
       }
     }
     if (dispatch) {
-      (0, _analytics.addAnalytics)(state, tr, {
-        action: _analytics.ACTION.UPDATED,
-        actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.BORDER,
-        eventType: _analytics.EVENT_TYPE.TRACK,
-        attributes: {
-          previousColor: borderMark === null || borderMark === void 0 ? void 0 : borderMark.color,
-          previousSize: borderMark === null || borderMark === void 0 ? void 0 : borderMark.size,
-          newColor: color,
-          newSize: size
-        }
-      });
+      if (borderMark !== null && borderMark !== void 0 && borderMark.attrs) {
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+          action: _analytics.ACTION.DELETED,
+          actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
+          actionSubjectId: _analytics.ACTION_SUBJECT_ID.BORDER,
+          eventType: _analytics.EVENT_TYPE.TRACK,
+          attributes: {
+            previousColor: borderMark.attrs.color,
+            previousSize: borderMark.attrs.size
+          }
+        })(tr);
+      } else {
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+          action: _analytics.ACTION.ADDED,
+          actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
+          actionSubjectId: _analytics.ACTION_SUBJECT_ID.BORDER,
+          eventType: _analytics.EVENT_TYPE.TRACK,
+          attributes: {
+            color: DEFAULT_BORDER_COLOR,
+            size: DEFAULT_BORDER_SIZE
+          }
+        })(tr);
+      }
       dispatch(tr);
     }
     return true;
   };
 };
+exports.toggleBorderMark = toggleBorderMark;
+var setBorderMark = function setBorderMark(editorAnalyticsAPI) {
+  return function (attrs) {
+    return function (state, dispatch) {
+      var _node$marks$find, _ref, _attrs$color, _ref2, _attrs$size;
+      var nodeWithPos = (0, _currentMediaNode.currentMediaNodeWithPos)(state);
+      if (!nodeWithPos) {
+        return false;
+      }
+      var node = nodeWithPos.node,
+        pos = nodeWithPos.pos;
+      var borderMark = (_node$marks$find = node.marks.find(function (m) {
+        return m.type.name === 'border';
+      })) === null || _node$marks$find === void 0 ? void 0 : _node$marks$find.attrs;
+      var color = (_ref = (_attrs$color = attrs.color) !== null && _attrs$color !== void 0 ? _attrs$color : borderMark === null || borderMark === void 0 ? void 0 : borderMark.color) !== null && _ref !== void 0 ? _ref : DEFAULT_BORDER_COLOR;
+      var size = (_ref2 = (_attrs$size = attrs.size) !== null && _attrs$size !== void 0 ? _attrs$size : borderMark === null || borderMark === void 0 ? void 0 : borderMark.size) !== null && _ref2 !== void 0 ? _ref2 : DEFAULT_BORDER_SIZE;
+      var marks = node.marks.filter(function (m) {
+        return m.type.name !== 'border';
+      }).concat(state.schema.marks.border.create({
+        color: color,
+        size: size
+      }));
+      var tr = state.tr.setNodeMarkup(pos, node.type, node.attrs, marks);
+      tr.setMeta('scrollIntoView', false);
+      if (state.selection instanceof _state.NodeSelection) {
+        if (state.selection.$anchor.pos === state.selection.from) {
+          tr.setSelection(_state.NodeSelection.create(tr.doc, state.selection.from));
+        }
+      }
+      if (dispatch) {
+        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
+          action: _analytics.ACTION.UPDATED,
+          actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
+          actionSubjectId: _analytics.ACTION_SUBJECT_ID.BORDER,
+          eventType: _analytics.EVENT_TYPE.TRACK,
+          attributes: {
+            previousColor: borderMark === null || borderMark === void 0 ? void 0 : borderMark.color,
+            previousSize: borderMark === null || borderMark === void 0 ? void 0 : borderMark.size,
+            newColor: color,
+            newSize: size
+          }
+        })(tr);
+        dispatch(tr);
+      }
+      return true;
+    };
+  };
+};
 exports.setBorderMark = setBorderMark;