@atlaskit/editor-core 189.1.0 → 189.1.2

package/dist/es2019/plugins/annotation/commands/index.js

@@ -5,14 +5,14 @@ import { isSelectionValid, getPluginState } from '../utils';
 import { ACTIONS } from '../pm-plugins/types';
 import transform from './transform';
 import { AnnotationSelectionType } from '../types';
-export const updateInlineCommentResolvedState = (partialNewState, resolveMethod) => {
+export const updateInlineCommentResolvedState = editorAnalyticsAPI => (partialNewState, resolveMethod) => {
   const command = {
     type: ACTIONS.UPDATE_INLINE_COMMENT_STATE,
     data: partialNewState
   };
   const allResolved = Object.values(partialNewState).every(state => state);
   if (resolveMethod && allResolved) {
-    return createCommand(command, transform.addResolveAnalytics(resolveMethod));
+    return createCommand(command, transform.addResolveAnalytics(editorAnalyticsAPI)(resolveMethod));
   }
   return createCommand(command);
 };
@@ -62,11 +62,11 @@ const getDraftCommandAction = drafting => {
     };
   };
 };
-export const setInlineCommentDraftState = (drafting, inputMethod = INPUT_METHOD.TOOLBAR) => {
+export const setInlineCommentDraftState = editorAnalyticsAPI => (drafting, inputMethod = INPUT_METHOD.TOOLBAR) => {
   const commandAction = getDraftCommandAction(drafting);
-  return createCommand(commandAction, transform.addOpenCloseAnalytics(drafting, inputMethod));
+  return createCommand(commandAction, transform.addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, inputMethod));
 };
-export const addInlineComment = id => {
+export const addInlineComment = editorAnalyticsAPI => id => {
   const commandAction = editorState => ({
     type: ACTIONS.ADD_INLINE_COMMENT,
     data: {
@@ -83,7 +83,7 @@ export const addInlineComment = id => {
       editorState
     }
   });
-  return createCommand(commandAction, transform.addInlineComment(id));
+  return createCommand(commandAction, transform.addInlineComment(editorAnalyticsAPI)(id));
 };
 export const updateMouseState = mouseData => createCommand({
   type: ACTIONS.INLINE_COMMENT_UPDATE_MOUSE_STATE,
@@ -100,7 +100,7 @@ export const setSelectedAnnotation = id => createCommand({
     }]
   }
 });
-export const createAnnotation = (id, annotationType = AnnotationTypes.INLINE_COMMENT) => (state, dispatch) => {
+export const createAnnotation = editorAnalyticsAPI => (id, annotationType = AnnotationTypes.INLINE_COMMENT) => (state, dispatch) => {
   // don't try to add if there are is no temp highlight bookmarked
   const {
     bookmark
@@ -109,7 +109,7 @@ export const createAnnotation = (id, annotationType = AnnotationTypes.INLINE_COM
     return false;
   }
   if (annotationType === AnnotationTypes.INLINE_COMMENT) {
-    return addInlineComment(id)(state, dispatch);
+    return addInlineComment(editorAnalyticsAPI)(id)(state, dispatch);
   }
   return false;
 };

package/dist/es2019/plugins/annotation/commands/transform.js

@@ -1,7 +1,6 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, ACTION, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { addAnalytics } from '../../analytics/utils';
 import { getSelectionPositions, getPluginState, getDraftCommandAnalyticsPayload } from '../utils';
 import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
 const addAnnotationMark = id => (transaction, state) => {
@@ -21,27 +20,29 @@ const addAnnotationMark = id => (transaction, state) => {
   tr.setSelection(TextSelection.create(tr.doc, head));
   return tr;
 };
-const addInlineComment = id => (transaction, state) => {
+const addInlineComment = editorAnalyticsAPI => id => (transaction, state) => {
   let tr = addAnnotationMark(id)(transaction, state);
   // add insert analytics step to transaction
-  tr = addInsertAnalytics(tr, state);
+  tr = addInsertAnalytics(editorAnalyticsAPI)(tr, state);
   // add close analytics step to transaction
-  tr = addOpenCloseAnalytics(false, INPUT_METHOD.TOOLBAR)(tr, state);
+  tr = addOpenCloseAnalytics(editorAnalyticsAPI)(false, INPUT_METHOD.TOOLBAR)(tr, state);
   return tr;
 };
-const addOpenCloseAnalytics = (drafting, method = INPUT_METHOD.TOOLBAR) => (transaction, state) => {
+const addOpenCloseAnalytics = editorAnalyticsAPI => (drafting, method = INPUT_METHOD.TOOLBAR) => (transaction, state) => {
   const draftingPayload = getDraftCommandAnalyticsPayload(drafting, method)(state);
-  return addAnalytics(state, transaction, draftingPayload);
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(draftingPayload)(transaction);
+  return transaction;
 };
-const addInsertAnalytics = (transaction, state) => {
-  return addAnalytics(state, transaction, {
+const addInsertAnalytics = editorAnalyticsAPI => (transaction, state) => {
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.ANNOTATION,
     eventType: EVENT_TYPE.TRACK,
     actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT
-  });
+  })(transaction);
+  return transaction;
 };
-const addResolveAnalytics = method => (transaction, state) => {
+const addResolveAnalytics = editorAnalyticsAPI => method => (transaction, state) => {
   const resolvedPayload = {
     action: ACTION.RESOLVED,
     actionSubject: ACTION_SUBJECT.ANNOTATION,
@@ -51,7 +52,8 @@ const addResolveAnalytics = method => (transaction, state) => {
       method
     }
   };
-  return addAnalytics(state, transaction, resolvedPayload);
+  editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent(resolvedPayload)(transaction);
+  return transaction;
 };
 export default {
   addAnnotationMark,

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

@@ -34,11 +34,13 @@ const annotationPlugin = ({
         eventDispatcher
       }) => {
         if (annotationProviders) {
+          var _api$analytics;
           return inlineCommentPlugin({
             dispatch,
             portalProviderAPI,
             eventDispatcher,
-            provider: annotationProviders.inlineComment
+            provider: annotationProviders.inlineComment,
+            editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
           });
         }
         return;
@@ -47,7 +49,8 @@ const annotationPlugin = ({
       name: 'annotationKeymap',
       plugin: () => {
         if (annotationProviders) {
-          return keymapPlugin();
+          var _api$analytics2;
+          return keymapPlugin(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
         }
         return;
       }
@@ -59,10 +62,11 @@ const annotationPlugin = ({
         }
         const pluginState = getPluginState(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
+          var _api$analytics3;
           const {
             isToolbarAbove
           } = annotationProviders.inlineComment;
-          return buildToolbar(state, intl, isToolbarAbove);
+          return buildToolbar(api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)(state, intl, isToolbarAbove);
         }
       },
       selectionToolbar(state, intl) {
@@ -71,10 +75,11 @@ const annotationPlugin = ({
         }
         const pluginState = getPluginState(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
+          var _api$analytics4;
           const {
             isToolbarAbove
           } = annotationProviders.inlineComment;
-          return buildToolbar(state, intl, isToolbarAbove);
+          return buildToolbar(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(state, intl, isToolbarAbove);
         }
       }
     },
@@ -100,6 +105,7 @@ function AnnotationContentComponent({
   annotationProviders,
   dispatchAnalyticsEvent
 }) {
+  var _api$analytics5;
   const {
     annotationState: inlineCommentState
   } = useSharedPluginState(api, ['annotation']);
@@ -111,7 +117,8 @@ function AnnotationContentComponent({
   }, /*#__PURE__*/React.createElement(InlineCommentView, {
     providers: annotationProviders,
     editorView: editorView,
-    dispatchAnalyticsEvent: dispatchAnalyticsEvent
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions
   }));
 }
 export default annotationPlugin;

package/dist/es2019/plugins/annotation/pm-plugins/inline-comment.js

@@ -19,13 +19,13 @@ const fetchProviderStates = async (provider, annotationIds) => {
 
 // fetchState is unable to return a command as it's runs async and may dispatch at a later time
 // Requires `editorView` instead of the decomposition as the async means state may end up stale
-const fetchState = async (provider, annotationIds, editorView) => {
+const fetchState = async (provider, annotationIds, editorView, editorAnalyticsAPI) => {
   if (!annotationIds || !annotationIds.length) {
     return;
   }
   const inlineCommentStates = await fetchProviderStates(provider, annotationIds);
   if (editorView.dispatch) {
-    updateInlineCommentResolvedState(inlineCommentStates)(editorView.state, editorView.dispatch);
+    updateInlineCommentResolvedState(editorAnalyticsAPI)(inlineCommentStates)(editorView.state, editorView.dispatch);
   }
 };
 const initialState = (disallowOnWhitespace = false) => {
@@ -47,13 +47,13 @@ const hideToolbar = (state, dispatch) => () => {
 };
 
 // Subscribe to updates from consumer
-const onResolve = (state, dispatch) => annotationId => {
-  updateInlineCommentResolvedState({
+const onResolve = editorAnalyticsAPI => (state, dispatch) => annotationId => {
+  updateInlineCommentResolvedState(editorAnalyticsAPI)({
     [annotationId]: true
   }, RESOLVE_METHOD.CONSUMER)(state, dispatch);
 };
-const onUnResolve = (state, dispatch) => annotationId => {
-  updateInlineCommentResolvedState({
+const onUnResolve = editorAnalyticsAPI => (state, dispatch) => annotationId => {
+  updateInlineCommentResolvedState(editorAnalyticsAPI)({
     [annotationId]: false
   })(state, dispatch);
 };
@@ -93,9 +93,9 @@ export const inlineCommentPlugin = options => {
     view(editorView) {
       // Get initial state
       // Need to pass `editorView` to mitigate editor state going stale
-      fetchState(provider, getAllAnnotations(editorView.state.doc), editorView);
-      const resolve = annotationId => onResolve(editorView.state, editorView.dispatch)(annotationId);
-      const unResolve = annotationId => onUnResolve(editorView.state, editorView.dispatch)(annotationId);
+      fetchState(provider, getAllAnnotations(editorView.state.doc), editorView, options.editorAnalyticsAPI);
+      const resolve = annotationId => onResolve(options.editorAnalyticsAPI)(editorView.state, editorView.dispatch)(annotationId);
+      const unResolve = annotationId => onUnResolve(options.editorAnalyticsAPI)(editorView.state, editorView.dispatch)(annotationId);
       const mouseUp = event => onMouseUp(editorView.state, editorView.dispatch)(event);
       const setVisibility = isVisible => onSetVisibility(editorView)(isVisible);
       const setSelectedAnnotationFn = annotationId => {
@@ -121,7 +121,7 @@ export const inlineCommentPlugin = options => {
             return;
           }
           clearDirtyMark()(view.state, view.dispatch);
-          fetchState(provider, getAllAnnotations(view.state.doc), view);
+          fetchState(provider, getAllAnnotations(view.state.doc), view, options.editorAnalyticsAPI);
         },
         destroy() {
           editorView.root.removeEventListener('mouseup', mouseUp);

package/dist/es2019/plugins/annotation/pm-plugins/keymap.js

@@ -2,8 +2,8 @@ import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { bindKeymapWithCommand, addInlineComment } from '../../../keymaps';
 import { setInlineCommentDraftState } from '../commands';
 import { INPUT_METHOD } from '../../analytics';
-export function keymapPlugin() {
+export function keymapPlugin(editorAnalyticsAPI) {
   const list = {};
-  bindKeymapWithCommand(addInlineComment.common, setInlineCommentDraftState(true, INPUT_METHOD.SHORTCUT), list);
+  bindKeymapWithCommand(addInlineComment.common, setInlineCommentDraftState(editorAnalyticsAPI)(true, INPUT_METHOD.SHORTCUT), list);
   return keymap(list);
 }

package/dist/es2019/plugins/annotation/toolbar.js

@@ -6,7 +6,7 @@ import { AnnotationTestIds, AnnotationSelectionType } from './types';
 import { isSelectionValid } from './utils';
 import { annotationMessages } from '@atlaskit/editor-common/messages';
 import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils';
-export const buildToolbar = (state, intl, isToolbarAbove = false) => {
+export const buildToolbar = editorAnalyticsAPI => (state, intl, isToolbarAbove = false) => {
   const {
     schema
   } = state;
@@ -28,7 +28,7 @@ export const buildToolbar = (state, intl, isToolbarAbove = false) => {
     }),
     title: createCommentMessage,
     onClick: (state, dispatch) => {
-      return setInlineCommentDraftState(true)(state, dispatch);
+      return setInlineCommentDraftState(editorAnalyticsAPI)(true)(state, dispatch);
     }
   };
   const {

package/dist/es2019/plugins/annotation/ui/InlineCommentView.js

@@ -26,6 +26,7 @@ const findPosForDOM = sel => {
 export function InlineCommentView({
   providers,
   editorView,
+  editorAnalyticsAPI,
   dispatchAnalyticsEvent
 }) {
   // As inlineComment is the only annotation present, this function is not generic
@@ -93,11 +94,11 @@ export function InlineCommentView({
       dom: dom,
       textSelection: textSelection,
       onCreate: id => {
-        createAnnotation(id)(editorView.state, editorView.dispatch);
+        createAnnotation(editorAnalyticsAPI)(id)(editorView.state, editorView.dispatch);
         !editorView.hasFocus() && editorView.focus();
       },
       onClose: () => {
-        setInlineCommentDraftState(false)(editorView.state, editorView.dispatch);
+        setInlineCommentDraftState(editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
         !editorView.hasFocus() && editorView.focus();
       }
     }));
@@ -137,7 +138,7 @@ export function InlineCommentView({
     annotations: activeAnnotations,
     dom: dom,
     onDelete: id => removeInlineCommentNearSelection(id)(state, dispatch),
-    onResolve: id => updateInlineCommentResolvedState({
+    onResolve: id => updateInlineCommentResolvedState(editorAnalyticsAPI)({
       [id]: true
     }, RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch),
     onClose: () => {

package/dist/es2019/plugins/index.js

@@ -15,7 +15,6 @@ export { default as tasksAndDecisionsPlugin } from './tasks-and-decisions';
 export { default as breakoutPlugin } from './breakout';
 export { default as alignmentPlugin } from './alignment';
 export { default as dataConsumerMarkPlugin } from './data-consumer';
-export { default as fragmentMarkPlugin } from './fragment';
 export { default as indentationPlugin } from './indentation';
 export { default as annotationPlugin } from './annotation';
 export { default as analyticsPlugin } from './analytics';

package/dist/es2019/presets/universal.js

@@ -1,4 +1,4 @@
-import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, fragmentMarkPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, panelPlugin, placeholderTextPlugin, tasksAndDecisionsPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, expandPlugin, isExpandInsertionEnabled, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../plugins';
+import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, insertBlockPlugin, jiraIssuePlugin, layoutPlugin, toolbarListsIndentationPlugin, macroPlugin, maxContentSizePlugin, panelPlugin, placeholderTextPlugin, tasksAndDecisionsPlugin, alignmentPlugin, indentationPlugin, customAutoformatPlugin, feedbackDialogPlugin, expandPlugin, isExpandInsertionEnabled, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin, codeBidiWarningPlugin } from '../plugins';
 import { textColorPlugin } from '@atlaskit/editor-plugin-text-color';
 import { historyPlugin } from '@atlaskit/editor-plugin-history';
 import { statusPlugin } from '@atlaskit/editor-plugin-status';
@@ -8,6 +8,7 @@ import { borderPlugin } from '@atlaskit/editor-plugin-border';
 import { helpDialogPlugin } from '@atlaskit/editor-plugin-help-dialog';
 import { mediaPlugin } from '@atlaskit/editor-plugin-media';
 import { rulePlugin } from '@atlaskit/editor-plugin-rule';
+import { fragmentPlugin } from '@atlaskit/editor-plugin-fragment';
 import { emojiPlugin } from '@atlaskit/editor-plugin-emoji';
 import { pasteOptionsToolbarPlugin } from '@atlaskit/editor-plugin-paste-options-toolbar';
 import { listPlugin } from '@atlaskit/editor-plugin-list';
@@ -388,7 +389,7 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
       return builder.add(plugin);
     }
     return builder;
-  }).maybeAdd(fragmentMarkPlugin, (plugin, builder) => {
+  }).maybeAdd(fragmentPlugin, (plugin, builder) => {
     if (props.allowFragmentMark) {
       return builder.add(plugin);
     }

package/dist/es2019/utils/document.js

@@ -12,31 +12,6 @@ export function processRawFragmentValue(schema, value, providerFactory, sanitize
   }
   return Fragment.from(adfEntities);
 }
-export function getChangedNodesIn({
-  tr,
-  doc
-}) {
-  const nodes = [];
-  const stepRange = getStepRange(tr);
-  if (!stepRange) {
-    return nodes;
-  }
-  const from = Math.min(doc.nodeSize - 2, stepRange.from);
-  const to = Math.min(doc.nodeSize - 2, stepRange.to);
-  doc.nodesBetween(from, to, (node, pos) => {
-    nodes.push({
-      node,
-      pos
-    });
-  });
-  return nodes;
-}
-export function getChangedNodes(tr) {
-  return getChangedNodesIn({
-    tr: tr,
-    doc: tr.doc
-  });
-}
 export function nodesBetweenChanged(tr, f, startPos) {
   const stepRange = getStepRange(tr);
   if (!stepRange) {

package/dist/es2019/version-wrapper.js

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

package/dist/esm/extensibility.js

@@ -1,4 +1,4 @@
-export { getChangedNodes } from './utils/document';
+export { getChangedNodes } from '@atlaskit/editor-common/utils';
 export { validateNodes } from './utils/nodes';
 export { toJSON } from './utils';
 export { default as Extension } from './plugins/extension/ui/Extension';

package/dist/esm/plugins/annotation/commands/index.js

@@ -6,18 +6,20 @@ import { isSelectionValid, getPluginState } from '../utils';
 import { ACTIONS } from '../pm-plugins/types';
 import transform from './transform';
 import { AnnotationSelectionType } from '../types';
-export var updateInlineCommentResolvedState = function updateInlineCommentResolvedState(partialNewState, resolveMethod) {
-  var command = {
-    type: ACTIONS.UPDATE_INLINE_COMMENT_STATE,
-    data: partialNewState
+export var updateInlineCommentResolvedState = function updateInlineCommentResolvedState(editorAnalyticsAPI) {
+  return function (partialNewState, resolveMethod) {
+    var command = {
+      type: ACTIONS.UPDATE_INLINE_COMMENT_STATE,
+      data: partialNewState
+    };
+    var allResolved = Object.values(partialNewState).every(function (state) {
+      return state;
+    });
+    if (resolveMethod && allResolved) {
+      return createCommand(command, transform.addResolveAnalytics(editorAnalyticsAPI)(resolveMethod));
+    }
+    return createCommand(command);
   };
-  var allResolved = Object.values(partialNewState).every(function (state) {
-    return state;
-  });
-  if (resolveMethod && allResolved) {
-    return createCommand(command, transform.addResolveAnalytics(resolveMethod));
-  }
-  return createCommand(command);
 };
 export var closeComponent = function closeComponent() {
   return createCommand({
@@ -67,29 +69,33 @@ var getDraftCommandAction = function getDraftCommandAction(drafting) {
     };
   };
 };
-export var setInlineCommentDraftState = function setInlineCommentDraftState(drafting) {
-  var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.TOOLBAR;
-  var commandAction = getDraftCommandAction(drafting);
-  return createCommand(commandAction, transform.addOpenCloseAnalytics(drafting, inputMethod));
+export var setInlineCommentDraftState = function setInlineCommentDraftState(editorAnalyticsAPI) {
+  return function (drafting) {
+    var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.TOOLBAR;
+    var commandAction = getDraftCommandAction(drafting);
+    return createCommand(commandAction, transform.addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, inputMethod));
+  };
 };
-export var addInlineComment = function addInlineComment(id) {
-  var commandAction = function commandAction(editorState) {
-    return {
-      type: ACTIONS.ADD_INLINE_COMMENT,
-      data: {
-        drafting: false,
-        inlineComments: _defineProperty({}, id, false),
-        // Auto make the newly inserted comment selected.
-        // We move the selection to the head of the comment selection.
-        selectedAnnotations: [{
-          id: id,
-          type: AnnotationTypes.INLINE_COMMENT
-        }],
-        editorState: editorState
-      }
+export var addInlineComment = function addInlineComment(editorAnalyticsAPI) {
+  return function (id) {
+    var commandAction = function commandAction(editorState) {
+      return {
+        type: ACTIONS.ADD_INLINE_COMMENT,
+        data: {
+          drafting: false,
+          inlineComments: _defineProperty({}, id, false),
+          // Auto make the newly inserted comment selected.
+          // We move the selection to the head of the comment selection.
+          selectedAnnotations: [{
+            id: id,
+            type: AnnotationTypes.INLINE_COMMENT
+          }],
+          editorState: editorState
+        }
+      };
     };
+    return createCommand(commandAction, transform.addInlineComment(editorAnalyticsAPI)(id));
   };
-  return createCommand(commandAction, transform.addInlineComment(id));
 };
 export var updateMouseState = function updateMouseState(mouseData) {
   return createCommand({
@@ -110,19 +116,21 @@ export var setSelectedAnnotation = function setSelectedAnnotation(id) {
     }
   });
 };
-export var createAnnotation = function createAnnotation(id) {
-  var annotationType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : AnnotationTypes.INLINE_COMMENT;
-  return function (state, dispatch) {
-    // don't try to add if there are is no temp highlight bookmarked
-    var _ref = getPluginState(state) || {},
-      bookmark = _ref.bookmark;
-    if (!bookmark || !dispatch) {
+export var createAnnotation = function createAnnotation(editorAnalyticsAPI) {
+  return function (id) {
+    var annotationType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : AnnotationTypes.INLINE_COMMENT;
+    return function (state, dispatch) {
+      // don't try to add if there are is no temp highlight bookmarked
+      var _ref = getPluginState(state) || {},
+        bookmark = _ref.bookmark;
+      if (!bookmark || !dispatch) {
+        return false;
+      }
+      if (annotationType === AnnotationTypes.INLINE_COMMENT) {
+        return addInlineComment(editorAnalyticsAPI)(id)(state, dispatch);
+      }
       return false;
-    }
-    if (annotationType === AnnotationTypes.INLINE_COMMENT) {
-      return addInlineComment(id)(state, dispatch);
-    }
-    return false;
+    };
   };
 };
 export var setInlineCommentsVisibility = function setInlineCommentsVisibility(isVisible) {

package/dist/esm/plugins/annotation/commands/transform.js

@@ -1,7 +1,6 @@
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, ACTION, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { addAnalytics } from '../../analytics/utils';
 import { getSelectionPositions, getPluginState, getDraftCommandAnalyticsPayload } from '../utils';
 import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
 var addAnnotationMark = function addAnnotationMark(id) {
@@ -22,43 +21,54 @@ var addAnnotationMark = function addAnnotationMark(id) {
     return tr;
   };
 };
-var addInlineComment = function addInlineComment(id) {
-  return function (transaction, state) {
-    var tr = addAnnotationMark(id)(transaction, state);
-    // add insert analytics step to transaction
-    tr = addInsertAnalytics(tr, state);
-    // add close analytics step to transaction
-    tr = addOpenCloseAnalytics(false, INPUT_METHOD.TOOLBAR)(tr, state);
-    return tr;
+var addInlineComment = function addInlineComment(editorAnalyticsAPI) {
+  return function (id) {
+    return function (transaction, state) {
+      var tr = addAnnotationMark(id)(transaction, state);
+      // add insert analytics step to transaction
+      tr = addInsertAnalytics(editorAnalyticsAPI)(tr, state);
+      // add close analytics step to transaction
+      tr = addOpenCloseAnalytics(editorAnalyticsAPI)(false, INPUT_METHOD.TOOLBAR)(tr, state);
+      return tr;
+    };
   };
 };
-var addOpenCloseAnalytics = function addOpenCloseAnalytics(drafting) {
-  var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.TOOLBAR;
-  return function (transaction, state) {
-    var draftingPayload = getDraftCommandAnalyticsPayload(drafting, method)(state);
-    return addAnalytics(state, transaction, draftingPayload);
+var addOpenCloseAnalytics = function addOpenCloseAnalytics(editorAnalyticsAPI) {
+  return function (drafting) {
+    var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : INPUT_METHOD.TOOLBAR;
+    return function (transaction, state) {
+      var draftingPayload = getDraftCommandAnalyticsPayload(drafting, method)(state);
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(draftingPayload)(transaction);
+      return transaction;
+    };
   };
 };
-var addInsertAnalytics = function addInsertAnalytics(transaction, state) {
-  return addAnalytics(state, transaction, {
-    action: ACTION.INSERTED,
-    actionSubject: ACTION_SUBJECT.ANNOTATION,
-    eventType: EVENT_TYPE.TRACK,
-    actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT
-  });
-};
-var addResolveAnalytics = function addResolveAnalytics(method) {
+var addInsertAnalytics = function addInsertAnalytics(editorAnalyticsAPI) {
   return function (transaction, state) {
-    var resolvedPayload = {
-      action: ACTION.RESOLVED,
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
+      action: ACTION.INSERTED,
       actionSubject: ACTION_SUBJECT.ANNOTATION,
-      actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
       eventType: EVENT_TYPE.TRACK,
-      attributes: {
-        method: method
-      }
+      actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT
+    })(transaction);
+    return transaction;
+  };
+};
+var addResolveAnalytics = function addResolveAnalytics(editorAnalyticsAPI) {
+  return function (method) {
+    return function (transaction, state) {
+      var resolvedPayload = {
+        action: ACTION.RESOLVED,
+        actionSubject: ACTION_SUBJECT.ANNOTATION,
+        actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
+        eventType: EVENT_TYPE.TRACK,
+        attributes: {
+          method: method
+        }
+      };
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(resolvedPayload)(transaction);
+      return transaction;
     };
-    return addAnalytics(state, transaction, resolvedPayload);
   };
 };
 export default {