@atlaskit/editor-plugin-annotation 26.0.3 → 26.0.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-annotation
 
+## 26.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
+## 26.0.4
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 26.0.3
 
 ### Patch Changes

package/dist/cjs/annotationPlugin.js

@@ -10,8 +10,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _react = _interopRequireDefault(require("react"));
 var _annotation = require("@atlaskit/adf-schema/annotation");
-var _coreUtils = require("@atlaskit/editor-common/core-utils");
-var _hooks = require("@atlaskit/editor-common/hooks");
+var _isSsr = require("@atlaskit/editor-common/is-ssr");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var _editorCommands = require("./editor-commands");
@@ -202,7 +202,7 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
     contentComponent: function contentComponent(_ref5) {
       var editorView = _ref5.editorView,
         dispatchAnalyticsEvent = _ref5.dispatchAnalyticsEvent;
-      if (!annotationProviders || !editorView || (0, _coreUtils.isSSR)()) {
+      if (!annotationProviders || !editorView || (0, _isSsr.isSSR)()) {
         return null;
       }
       return /*#__PURE__*/_react.default.createElement(AnnotationContentComponent, {
@@ -228,7 +228,7 @@ function AnnotationContentComponent(_ref6) {
     editorView = _ref6.editorView,
     annotationProviders = _ref6.annotationProviders,
     dispatchAnalyticsEvent = _ref6.dispatchAnalyticsEvent;
-  var annotationState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['annotation'], selector);
+  var annotationState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['annotation'], selector);
 
   // need to explicitly check for false as undefined is also a valid value to continue
   if ((annotationState === null || annotationState === void 0 ? void 0 : annotationState.isVisible) === false) {

package/dist/cjs/editor-commands/index.js

@@ -7,7 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.updateMouseState = exports.updateInlineCommentResolvedState = exports.showInlineCommentForBlockNode = exports.setSelectedAnnotation = exports.setPendingSelectedAnnotation = exports.setInlineCommentsVisibility = exports.setInlineCommentsFetched = exports.setInlineCommentDraftState = exports.setHoveredAnnotation = exports.removeInlineCommentNearSelection = exports.removeInlineCommentFromDoc = exports.flushPendingSelections = exports.createAnnotation = exports.closeComponent = exports.clearDirtyMark = exports.addInlineComment = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _annotation = require("@atlaskit/adf-schema/annotation");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _inlineCommentEvents = require("@atlaskit/editor-common/analytics/types/inline-comment-events");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
 var _types = require("../pm-plugins/types");
@@ -34,7 +35,7 @@ var updateInlineCommentResolvedState = exports.updateInlineCommentResolvedState
     // To quickly fix this problem to unblock live pages this will just stop the transaction causing a scroll when the
     // resolve method is set.
     var transformer = function transformer(tr, state) {
-      return resolveMethod === _analytics.RESOLVE_METHOD.CONSUMER ? tr.setMeta('scrollIntoView', false) : tr;
+      return resolveMethod === _inlineCommentEvents.RESOLVE_METHOD.CONSUMER ? tr.setMeta('scrollIntoView', false) : tr;
     };
     if (resolveMethod && allResolved) {
       return (0, _pluginFactory.createCommand)(command, function (tr, state) {
@@ -250,7 +251,7 @@ var setInlineCommentDraftState = exports.setInlineCommentDraftState = function s
   var api = arguments.length > 2 ? arguments[2] : undefined;
   var isBlockNodeSupported = arguments.length > 3 ? arguments[3] : undefined;
   return function (drafting) {
-    var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
+    var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _enums.INPUT_METHOD.TOOLBAR;
     var targetType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'inline';
     var targetNodeId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
     var isOpeningMediaCommentFromToolbar = arguments.length > 4 ? arguments[4] : undefined;

package/dist/cjs/editor-commands/transform.js

@@ -5,26 +5,26 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _annotation = require("@atlaskit/adf-schema/annotation");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _mark = require("@atlaskit/editor-common/mark");
-var _utils = require("@atlaskit/editor-common/utils");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _commands = require("@atlaskit/editor-common/mark/commands");
+var _annotation2 = require("@atlaskit/editor-common/utils/annotation");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
-var _utils2 = require("../pm-plugins/utils");
+var _utils = require("../pm-plugins/utils");
 var isAnnotationStep = function isAnnotationStep(step) {
   return step instanceof _transform.AddMarkStep && step.mark.type.name === 'annotation';
 };
 var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes, isBlockNodeSupported) {
   return function (transaction, state) {
-    var inlineCommentState = (0, _utils2.getPluginState)(state);
+    var inlineCommentState = (0, _utils.getPluginState)(state);
     var _ref = inlineCommentState || {},
       bookmark = _ref.bookmark;
     var annotationMark = state.schema.marks.annotation.create({
       id: id,
       type: _annotation.AnnotationTypes.INLINE_COMMENT
     });
-    var _resolveDraftBookmark = (0, _utils2.resolveDraftBookmark)(state, bookmark, supportedBlockNodes, isBlockNodeSupported),
+    var _resolveDraftBookmark = (0, _utils.resolveDraftBookmark)(state, bookmark, supportedBlockNodes, isBlockNodeSupported),
       from = _resolveDraftBookmark.from,
       to = _resolveDraftBookmark.to,
       head = _resolveDraftBookmark.head,
@@ -36,7 +36,7 @@ var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes, isBl
       tr.setSelection(_state.NodeSelection.create(tr.doc, from));
     } else {
       // Apply the mark only to text node in the range.
-      var _tr = (0, _mark.applyMarkOnRange)(from, to, false, annotationMark, transaction);
+      var _tr = (0, _commands.applyMarkOnRange)(from, to, false, annotationMark, transaction);
 
       // The mark may not be applied to the current "head" of the bookmark so determine what was applied
       // above and use that instead
@@ -57,8 +57,8 @@ var addInlineComment = function addInlineComment(editorAnalyticsAPI, editorAPI)
       // add insert analytics step to transaction
       tr = addInsertAnalytics(editorAnalyticsAPI)(tr, state);
       // add close analytics step to transaction
-      tr = addOpenCloseAnalytics(editorAnalyticsAPI)(false, _analytics.INPUT_METHOD.TOOLBAR)(tr, state);
-      var pluginState = (0, _utils2.getPluginState)(state);
+      tr = addOpenCloseAnalytics(editorAnalyticsAPI)(false, _enums.INPUT_METHOD.TOOLBAR)(tr, state);
+      var pluginState = (0, _utils.getPluginState)(state);
       var isAutoScrollBugFixEnabled = pluginState === null || pluginState === void 0 || (_pluginState$featureF = pluginState.featureFlagsPluginState) === null || _pluginState$featureF === void 0 ? void 0 : _pluginState$featureF.commentsOnMediaAutoscrollInEditor;
       if (isAutoScrollBugFixEnabled) {
         // Explicitly disable scrollIntoView as scrolling is handled by CommentSidebar
@@ -70,9 +70,9 @@ var addInlineComment = function addInlineComment(editorAnalyticsAPI, editorAPI)
 };
 var addOpenCloseAnalytics = function addOpenCloseAnalytics(editorAnalyticsAPI) {
   return function (drafting) {
-    var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
+    var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _enums.INPUT_METHOD.TOOLBAR;
     return function (transaction, state) {
-      var draftingPayload = (0, _utils2.getDraftCommandAnalyticsPayload)(drafting, method)(state);
+      var draftingPayload = (0, _utils.getDraftCommandAnalyticsPayload)(drafting, method)(state);
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(draftingPayload)(transaction);
       return transaction;
     };
@@ -80,11 +80,11 @@ var addOpenCloseAnalytics = function addOpenCloseAnalytics(editorAnalyticsAPI) {
 };
 var handleDraftState = function handleDraftState(editorAnalyticsAPI) {
   return function (drafting) {
-    var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
+    var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _enums.INPUT_METHOD.TOOLBAR;
     return function (transaction, state) {
       var _pluginState$featureF2;
       var tr = addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, method)(transaction, state);
-      var pluginState = (0, _utils2.getPluginState)(state);
+      var pluginState = (0, _utils.getPluginState)(state);
       var isAutoScrollBugFixEnabled = pluginState === null || pluginState === void 0 || (_pluginState$featureF2 = pluginState.featureFlagsPluginState) === null || _pluginState$featureF2 === void 0 ? void 0 : _pluginState$featureF2.commentsOnMediaAutoscrollInEditor;
       if (isAutoScrollBugFixEnabled) {
         // Explicitly disable scrollIntoView as scrolling is handled by CommentSidebar
@@ -97,22 +97,22 @@ var handleDraftState = function handleDraftState(editorAnalyticsAPI) {
 var addInsertAnalytics = function addInsertAnalytics(editorAnalyticsAPI) {
   return function (transaction, state) {
     var analyticsEvent = {
-      action: _analytics.ACTION.INSERTED,
-      actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
-      eventType: _analytics.EVENT_TYPE.TRACK,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
+      action: _enums.ACTION.INSERTED,
+      actionSubject: _enums.ACTION_SUBJECT.ANNOTATION,
+      eventType: _enums.EVENT_TYPE.TRACK,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.INLINE_COMMENT,
       attributes: {}
     };
     if ((0, _fg.fg)('editor_inline_comments_on_inline_nodes')) {
-      var _ref2 = (0, _utils2.getPluginState)(state) || {},
+      var _ref2 = (0, _utils.getPluginState)(state) || {},
         bookmark = _ref2.bookmark;
 
       // When this FF is removed we can move the analytics event creation inside of the
       // attachAnalyticsEvent and get type inference for the attributes.
       // @ts-ignore
-      analyticsEvent.attributes.inlineNodeNames = (0, _utils.getRangeInlineNodeNames)({
+      analyticsEvent.attributes.inlineNodeNames = (0, _annotation2.getRangeInlineNodeNames)({
         doc: state.doc,
-        pos: (0, _utils2.resolveDraftBookmark)(state, bookmark)
+        pos: (0, _utils.resolveDraftBookmark)(state, bookmark)
       });
     }
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(analyticsEvent)(transaction);
@@ -123,10 +123,10 @@ var addResolveAnalytics = function addResolveAnalytics(editorAnalyticsAPI) {
   return function (method) {
     return function (transaction, state) {
       var resolvedPayload = {
-        action: _analytics.ACTION.RESOLVED,
-        actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
-        eventType: _analytics.EVENT_TYPE.TRACK,
+        action: _enums.ACTION.RESOLVED,
+        actionSubject: _enums.ACTION_SUBJECT.ANNOTATION,
+        actionSubjectId: _enums.ACTION_SUBJECT_ID.INLINE_COMMENT,
+        eventType: _enums.EVENT_TYPE.TRACK,
         attributes: {
           method: method
         }
@@ -140,10 +140,10 @@ var addPreemptiveGateErrorAnalytics = function addPreemptiveGateErrorAnalytics(e
   return function (errorReason) {
     return function (transaction, state) {
       var analyticsEvent = {
-        action: _analytics.ACTION.ERROR,
-        actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
-        actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
-        eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+        action: _enums.ACTION.ERROR,
+        actionSubject: _enums.ACTION_SUBJECT.ANNOTATION,
+        actionSubjectId: _enums.ACTION_SUBJECT_ID.INLINE_COMMENT,
+        eventType: _enums.EVENT_TYPE.OPERATIONAL,
         attributes: {
           errorReason: errorReason
         }
@@ -156,10 +156,10 @@ var addPreemptiveGateErrorAnalytics = function addPreemptiveGateErrorAnalytics(e
 var addDeleteAnalytics = function addDeleteAnalytics(editorAnalyticsAPI) {
   return function (transaction, state) {
     var analyticsEvent = {
-      action: _analytics.ACTION.DELETED,
-      actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
-      actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
-      eventType: _analytics.EVENT_TYPE.TRACK,
+      action: _enums.ACTION.DELETED,
+      actionSubject: _enums.ACTION_SUBJECT.ANNOTATION,
+      actionSubjectId: _enums.ACTION_SUBJECT_ID.INLINE_COMMENT,
+      eventType: _enums.EVENT_TYPE.TRACK,
       attributes: {}
     };
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(analyticsEvent)(transaction);

package/dist/cjs/nodeviews/index.js

@@ -4,22 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getBlockAnnotationViewClassname = exports.getAnnotationViewClassname = void 0;
-var _styles = require("@atlaskit/editor-common/styles");
+var _annotation = require("@atlaskit/editor-common/styles/annotation");
 var getAnnotationViewClassname = exports.getAnnotationViewClassname = function getAnnotationViewClassname(isUnresolved, hasFocus, isHovered) {
   if (!isUnresolved) {
     return;
   }
   if (hasFocus) {
-    return _styles.AnnotationSharedClassNames.focus;
+    return _annotation.AnnotationSharedClassNames.focus;
   }
   if (isHovered) {
-    return _styles.AnnotationSharedClassNames.hover;
+    return _annotation.AnnotationSharedClassNames.hover;
   }
-  return _styles.AnnotationSharedClassNames.blur;
+  return _annotation.AnnotationSharedClassNames.blur;
 };
 var getBlockAnnotationViewClassname = exports.getBlockAnnotationViewClassname = function getBlockAnnotationViewClassname(isUnresolved, hasFocus) {
   if (!isUnresolved) {
     return;
   }
-  return hasFocus ? _styles.BlockAnnotationSharedClassNames.focus : _styles.BlockAnnotationSharedClassNames.blur;
+  return hasFocus ? _annotation.BlockAnnotationSharedClassNames.focus : _annotation.BlockAnnotationSharedClassNames.blur;
 };

package/dist/cjs/pm-plugins/annotation-manager-hooks.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.startDraft = exports.setIsAnnotationSelected = exports.setIsAnnotationHovered = exports.getDraft = exports.clearDraft = exports.clearAnnotation = exports.applyDraft = exports.allowAnnotation = void 0;
 var _annotation = require("@atlaskit/adf-schema/annotation");
-var _utils = require("@atlaskit/editor-common/utils");
-var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _annotation2 = require("@atlaskit/editor-common/utils/annotation");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorCommands = require("../editor-commands");
 var _types = require("../types");
-var _utils3 = require("./utils");
+var _utils2 = require("./utils");
 var ERROR_REASON_DRAFT_NOT_STARTED = 'draft-not-started';
 var ERROR_REASON_DRAFT_IN_PROGRESS = 'draft-in-progress';
 var ERROR_REASON_RANGE_MISSING = 'range-no-longer-exists';
@@ -20,7 +20,7 @@ var domRefFromPos = function domRefFromPos(view, position) {
   try {
     // Ignored via go/ees005
     // eslint-disable-next-line @atlaskit/editor/no-as-casting
-    dom = (0, _utils2.findDomRefAtPos)(position, view.domAtPos.bind(view));
+    dom = (0, _utils.findDomRefAtPos)(position, view.domAtPos.bind(view));
   } catch (error) {
     // eslint-disable-next-line no-console
     console.warn(error);
@@ -30,7 +30,7 @@ var domRefFromPos = function domRefFromPos(view, position) {
 };
 var allowAnnotation = exports.allowAnnotation = function allowAnnotation(editorView, options) {
   return function () {
-    var _ref = _utils3.inlineCommentPluginKey.getState(editorView.state) || {},
+    var _ref = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
       isDrafting = _ref.isDrafting,
       draftDecorationSet = _ref.draftDecorationSet;
     if (isDrafting) {
@@ -42,13 +42,13 @@ var allowAnnotation = exports.allowAnnotation = function allowAnnotation(editorV
     if (!!(decoration !== null && decoration !== void 0 && decoration.length)) {
       return false;
     }
-    return (0, _utils3.isSelectionValid)(editorView.state, options.provider.supportedBlockNodes, options.provider.isBlockNodeSupported) === _types.AnnotationSelectionType.VALID;
+    return (0, _utils2.isSelectionValid)(editorView.state, options.provider.supportedBlockNodes, options.provider.isBlockNodeSupported) === _types.AnnotationSelectionType.VALID;
   };
 };
 var startDraft = exports.startDraft = function startDraft(editorView, options) {
   return function () {
     var _getRangeInlineNodeNa, _options$annotationMa2;
-    var _ref2 = _utils3.inlineCommentPluginKey.getState(editorView.state) || {},
+    var _ref2 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
       isDrafting = _ref2.isDrafting,
       selectedAnnotations = _ref2.selectedAnnotations;
     if (isDrafting) {
@@ -70,13 +70,13 @@ var startDraft = exports.startDraft = function startDraft(editorView, options) {
           data: {
             annotationId: annotation.id,
             isSelected: false,
-            inlineNodeTypes: (_getAnnotationInlineN = (0, _utils.getAnnotationInlineNodeTypes)(editorView.state, annotation.id)) !== null && _getAnnotationInlineN !== void 0 ? _getAnnotationInlineN : []
+            inlineNodeTypes: (_getAnnotationInlineN = (0, _annotation2.getAnnotationInlineNodeTypes)(editorView.state, annotation.id)) !== null && _getAnnotationInlineN !== void 0 ? _getAnnotationInlineN : []
           }
         });
       });
     }
     (0, _editorCommands.setInlineCommentDraftState)(options.editorAnalyticsAPI, options.provider.supportedBlockNodes, options.api, options.provider.isBlockNodeSupported)(true)(editorView.state, editorView.dispatch);
-    var _ref3 = _utils3.inlineCommentPluginKey.getState(editorView.state) || {},
+    var _ref3 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
       draftDecorationSet = _ref3.draftDecorationSet;
     var decorations = draftDecorationSet === null || draftDecorationSet === void 0 ? void 0 : draftDecorationSet.find();
 
@@ -89,7 +89,7 @@ var startDraft = exports.startDraft = function startDraft(editorView, options) {
     }
     var from = decorations[0].from;
     var targetElement = domRefFromPos(editorView, from);
-    var inlineNodeTypes = (_getRangeInlineNodeNa = (0, _utils.getRangeInlineNodeNames)({
+    var inlineNodeTypes = (_getRangeInlineNodeNa = (0, _annotation2.getRangeInlineNodeNames)({
       doc: editorView.state.doc,
       pos: {
         from: from,
@@ -115,7 +115,7 @@ var startDraft = exports.startDraft = function startDraft(editorView, options) {
 };
 var clearDraft = exports.clearDraft = function clearDraft(editorView, options) {
   return function () {
-    var _ref4 = _utils3.inlineCommentPluginKey.getState(editorView.state) || {},
+    var _ref4 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
       isDrafting = _ref4.isDrafting,
       draftDecorationSet = _ref4.draftDecorationSet;
     if (!isDrafting) {
@@ -141,7 +141,7 @@ var clearDraft = exports.clearDraft = function clearDraft(editorView, options) {
 var applyDraft = exports.applyDraft = function applyDraft(editorView, options) {
   return function (id) {
     var _options$annotationMa3, _getAnnotationInlineN2;
-    var _ref5 = _utils3.inlineCommentPluginKey.getState(editorView.state) || {},
+    var _ref5 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
       isDrafting = _ref5.isDrafting,
       draftDecorationSet = _ref5.draftDecorationSet,
       bookmark = _ref5.bookmark;
@@ -173,7 +173,7 @@ var applyDraft = exports.applyDraft = function applyDraft(editorView, options) {
       data: {
         annotationId: id,
         isSelected: true,
-        inlineNodeTypes: (_getAnnotationInlineN2 = (0, _utils.getAnnotationInlineNodeTypes)(editorView.state, id)) !== null && _getAnnotationInlineN2 !== void 0 ? _getAnnotationInlineN2 : []
+        inlineNodeTypes: (_getAnnotationInlineN2 = (0, _annotation2.getAnnotationInlineNodeTypes)(editorView.state, id)) !== null && _getAnnotationInlineN2 !== void 0 ? _getAnnotationInlineN2 : []
       }
     });
     return {
@@ -188,7 +188,7 @@ var applyDraft = exports.applyDraft = function applyDraft(editorView, options) {
 var getDraft = exports.getDraft = function getDraft(editorView, _options) {
   return function () {
     var _getRangeInlineNodeNa2;
-    var _ref6 = _utils3.inlineCommentPluginKey.getState(editorView.state) || {},
+    var _ref6 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
       isDrafting = _ref6.isDrafting,
       draftDecorationSet = _ref6.draftDecorationSet;
     if (!isDrafting) {
@@ -206,7 +206,7 @@ var getDraft = exports.getDraft = function getDraft(editorView, _options) {
     }
     var from = decorations[0].from;
     var targetElement = domRefFromPos(editorView, from);
-    var inlineNodeTypes = (_getRangeInlineNodeNa2 = (0, _utils.getRangeInlineNodeNames)({
+    var inlineNodeTypes = (_getRangeInlineNodeNa2 = (0, _annotation2.getRangeInlineNodeNames)({
       doc: editorView.state.doc,
       pos: {
         from: from,
@@ -224,7 +224,7 @@ var getDraft = exports.getDraft = function getDraft(editorView, _options) {
 var setIsAnnotationSelected = exports.setIsAnnotationSelected = function setIsAnnotationSelected(editorView, options) {
   return function (id, isSelected) {
     var _selectedAnnotations$;
-    var _ref7 = _utils3.inlineCommentPluginKey.getState(editorView.state) || {},
+    var _ref7 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
       annotations = _ref7.annotations,
       isDrafting = _ref7.isDrafting,
       selectedAnnotations = _ref7.selectedAnnotations;
@@ -257,7 +257,7 @@ var setIsAnnotationSelected = exports.setIsAnnotationSelected = function setIsAn
           data: {
             annotationId: id,
             isSelected: false,
-            inlineNodeTypes: (_getAnnotationInlineN3 = (0, _utils.getAnnotationInlineNodeTypes)(editorView.state, id)) !== null && _getAnnotationInlineN3 !== void 0 ? _getAnnotationInlineN3 : []
+            inlineNodeTypes: (_getAnnotationInlineN3 = (0, _annotation2.getAnnotationInlineNodeTypes)(editorView.state, id)) !== null && _getAnnotationInlineN3 !== void 0 ? _getAnnotationInlineN3 : []
           }
         });
       } else if (!isCurrentlySelected && isSelected) {
@@ -274,7 +274,7 @@ var setIsAnnotationSelected = exports.setIsAnnotationSelected = function setIsAn
               data: {
                 annotationId: annotation.id,
                 isSelected: false,
-                inlineNodeTypes: (_getAnnotationInlineN4 = (0, _utils.getAnnotationInlineNodeTypes)(editorView.state, annotation.id)) !== null && _getAnnotationInlineN4 !== void 0 ? _getAnnotationInlineN4 : []
+                inlineNodeTypes: (_getAnnotationInlineN4 = (0, _annotation2.getAnnotationInlineNodeTypes)(editorView.state, annotation.id)) !== null && _getAnnotationInlineN4 !== void 0 ? _getAnnotationInlineN4 : []
               }
             });
           }
@@ -286,7 +286,7 @@ var setIsAnnotationSelected = exports.setIsAnnotationSelected = function setIsAn
           data: {
             annotationId: id,
             isSelected: true,
-            inlineNodeTypes: (_getAnnotationInlineN5 = (0, _utils.getAnnotationInlineNodeTypes)(editorView.state, id)) !== null && _getAnnotationInlineN5 !== void 0 ? _getAnnotationInlineN5 : []
+            inlineNodeTypes: (_getAnnotationInlineN5 = (0, _annotation2.getAnnotationInlineNodeTypes)(editorView.state, id)) !== null && _getAnnotationInlineN5 !== void 0 ? _getAnnotationInlineN5 : []
           }
         });
       }
@@ -300,7 +300,7 @@ var setIsAnnotationSelected = exports.setIsAnnotationSelected = function setIsAn
 var setIsAnnotationHovered = exports.setIsAnnotationHovered = function setIsAnnotationHovered(editorView, _options) {
   return function (id, isHovered) {
     var _hoveredAnnotations$f;
-    var _ref8 = _utils3.inlineCommentPluginKey.getState(editorView.state) || {},
+    var _ref8 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
       annotations = _ref8.annotations,
       hoveredAnnotations = _ref8.hoveredAnnotations;
 
@@ -333,7 +333,7 @@ var setIsAnnotationHovered = exports.setIsAnnotationHovered = function setIsAnno
 };
 var clearAnnotation = exports.clearAnnotation = function clearAnnotation(editorView, options) {
   return function (id) {
-    var _ref9 = _utils3.inlineCommentPluginKey.getState(editorView.state) || {},
+    var _ref9 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
       annotations = _ref9.annotations;
 
     // If there is no annotation state with this id then we can assume the annotation is invalid.

package/dist/cjs/pm-plugins/inline-comment.js

@@ -9,18 +9,18 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _annotation = require("@atlaskit/adf-schema/annotation");
-var _analytics = require("@atlaskit/editor-common/analytics");
+var _inlineCommentEvents = require("@atlaskit/editor-common/analytics/types/inline-comment-events");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _utils = require("@atlaskit/editor-common/utils");
+var _annotation2 = require("@atlaskit/editor-common/utils/annotation");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _editorCommands = require("../editor-commands");
-var _utils2 = require("../editor-commands/utils");
+var _utils = require("../editor-commands/utils");
 var _nodeviews = require("../nodeviews");
 var _annotationManagerHooks = require("./annotation-manager-hooks");
 var _pluginFactory = require("./plugin-factory");
 var _toolbar = require("./toolbar");
-var _utils3 = require("./utils");
+var _utils2 = require("./utils");
 var fetchProviderStates = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(provider, annotationIds) {
     var data, result;
@@ -71,7 +71,7 @@ var fetchState = /*#__PURE__*/function () {
             _context2.next = 2;
             break;
           }
-          _ref3 = (0, _utils3.getPluginState)(editorView.state) || {}, annotationsLoaded = _ref3.annotationsLoaded;
+          _ref3 = (0, _utils2.getPluginState)(editorView.state) || {}, annotationsLoaded = _ref3.annotationsLoaded;
           if (!annotationsLoaded) {
             (0, _editorCommands.setInlineCommentsFetched)()(editorView.state, editorView.dispatch);
           }
@@ -125,7 +125,7 @@ var hideToolbar = function hideToolbar(state, dispatch) {
 var onResolve = function onResolve(editorAnalyticsAPI) {
   return function (state, dispatch) {
     return function (annotationId) {
-      (0, _editorCommands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, annotationId, true), _analytics.RESOLVE_METHOD.CONSUMER)(state, dispatch);
+      (0, _editorCommands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, annotationId, true), _inlineCommentEvents.RESOLVE_METHOD.CONSUMER)(state, dispatch);
     };
   };
 };
@@ -138,7 +138,7 @@ var onUnResolve = function onUnResolve(editorAnalyticsAPI) {
 };
 var onMouseUp = function onMouseUp(state, dispatch) {
   return function (e) {
-    var _ref4 = (0, _utils3.getPluginState)(state) || {},
+    var _ref4 = (0, _utils2.getPluginState)(state) || {},
       mouseData = _ref4.mouseData;
     if (mouseData !== null && mouseData !== void 0 && mouseData.isSelecting) {
       (0, _editorCommands.updateMouseState)({
@@ -166,7 +166,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
     featureFlagsPluginState = options.featureFlagsPluginState,
     annotationManager = options.annotationManager;
   return new _safePlugin.SafePlugin({
-    key: _utils3.inlineCommentPluginKey,
+    key: _utils2.inlineCommentPluginKey,
     state: (0, _pluginFactory.createPluginState)(options.dispatch, initialState(provider.disallowOnWhitespace, featureFlagsPluginState, !!annotationManager)),
     view: function view(editorView) {
       var allowAnnotationFn;
@@ -197,7 +197,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
       }
       // Get initial state
       // Need to pass `editorView` to mitigate editor state going stale
-      fetchState(provider, (0, _utils3.getAllAnnotations)(editorView.state.doc), editorView, options.editorAnalyticsAPI);
+      fetchState(provider, (0, _utils2.getAllAnnotations)(editorView.state.doc), editorView, options.editorAnalyticsAPI);
       var resolve = function resolve(annotationId) {
         return onResolve(options.editorAnalyticsAPI)(editorView.state, editorView.dispatch)(annotationId);
       };
@@ -247,12 +247,12 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
       return {
         update: function update(view, _prevState) {
           var _prevSelectedAnnotati;
-          var _ref5 = (0, _utils3.getPluginState)(view.state) || {},
+          var _ref5 = (0, _utils2.getPluginState)(view.state) || {},
             selectedAnnotations = _ref5.selectedAnnotations,
             annotations = _ref5.annotations,
             isDrafting = _ref5.isDrafting,
             bookmark = _ref5.bookmark;
-          var _ref6 = (0, _utils3.getPluginState)(_prevState) || {},
+          var _ref6 = (0, _utils2.getPluginState)(_prevState) || {},
             prevSelectedAnnotations = _ref6.selectedAnnotations;
           var selectedAnnotationId = selectedAnnotations && selectedAnnotations.length !== 0 && selectedAnnotations[0].id ? selectedAnnotations[0].id : undefined;
 
@@ -281,9 +281,9 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
                 state: view.state,
                 bookmark: bookmark
               })) {
-                (0, _utils2.setUserIntent)(api, tr);
+                (0, _utils.setUserIntent)(api, tr);
               } else {
-                (0, _utils2.resetUserIntent)(api, tr);
+                (0, _utils.resetUserIntent)(api, tr);
               }
               return tr;
             });
@@ -297,17 +297,17 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
             // at a time when changing the selection could cause data loss.
             // The following preemptive check is designed to cover these items.
 
-            var _ref8 = (0, _utils3.getPluginState)(view.state) || {},
+            var _ref8 = (0, _utils2.getPluginState)(view.state) || {},
               pendingSelectedAnnotations = _ref8.pendingSelectedAnnotations,
               pendingSelectedAnnotationsUpdateCount = _ref8.pendingSelectedAnnotationsUpdateCount;
-            var _ref9 = (0, _utils3.getPluginState)(_prevState) || {},
+            var _ref9 = (0, _utils2.getPluginState)(_prevState) || {},
               prevPendingSelectedAnnotationsUpdateCount = _ref9.pendingSelectedAnnotationsUpdateCount;
             if (!isPreemptiveGateActive && pendingSelectedAnnotationsUpdateCount !== prevPendingSelectedAnnotationsUpdateCount && !!(pendingSelectedAnnotations !== null && pendingSelectedAnnotations !== void 0 && pendingSelectedAnnotations.length)) {
               // Need to set a lock to avoid calling gate multiple times. The lock will be released
               // when the preemptive gate is complete.
               isPreemptiveGateActive = true;
               annotationManager.checkPreemptiveGate().then(function (canSelectAnnotation) {
-                var _ref0 = (0, _utils3.getPluginState)(view.state) || {},
+                var _ref0 = (0, _utils2.getPluginState)(view.state) || {},
                   isDrafting = _ref0.isDrafting,
                   latestPendingSelectedAnnotations = _ref0.pendingSelectedAnnotations,
                   latestSelectedAnnotations = _ref0.selectedAnnotations;
@@ -331,7 +331,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
                       data: {
                         annotationId: annotation.id,
                         isSelected: false,
-                        inlineNodeTypes: (_getAnnotationInlineN = (0, _utils.getAnnotationInlineNodeTypes)(editorView.state, annotation.id)) !== null && _getAnnotationInlineN !== void 0 ? _getAnnotationInlineN : []
+                        inlineNodeTypes: (_getAnnotationInlineN = (0, _annotation2.getAnnotationInlineNodeTypes)(editorView.state, annotation.id)) !== null && _getAnnotationInlineN !== void 0 ? _getAnnotationInlineN : []
                       }
                     });
                   });
@@ -345,7 +345,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
                       data: {
                         annotationId: id,
                         isSelected: true,
-                        inlineNodeTypes: (_getAnnotationInlineN2 = (0, _utils.getAnnotationInlineNodeTypes)(view.state, id)) !== null && _getAnnotationInlineN2 !== void 0 ? _getAnnotationInlineN2 : []
+                        inlineNodeTypes: (_getAnnotationInlineN2 = (0, _annotation2.getAnnotationInlineNodeTypes)(view.state, id)) !== null && _getAnnotationInlineN2 !== void 0 ? _getAnnotationInlineN2 : []
                       }
                     });
                   });
@@ -363,13 +363,13 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
               });
             }
           }
-          var _ref10 = (0, _utils3.getPluginState)(view.state) || {},
+          var _ref10 = (0, _utils2.getPluginState)(view.state) || {},
             dirtyAnnotations = _ref10.dirtyAnnotations;
           if (!dirtyAnnotations) {
             return;
           }
           (0, _editorCommands.clearDirtyMark)()(view.state, view.dispatch);
-          fetchState(provider, (0, _utils3.getAllAnnotations)(view.state.doc), view, options.editorAnalyticsAPI);
+          fetchState(provider, (0, _utils2.getAllAnnotations)(view.state.doc), view, options.editorAnalyticsAPI);
         },
         destroy: function destroy() {
           // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
@@ -393,7 +393,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
     props: {
       handleDOMEvents: {
         mousedown: function mousedown(view) {
-          var pluginState = (0, _utils3.getPluginState)(view.state);
+          var pluginState = (0, _utils2.getPluginState)(view.state);
           if (!(pluginState !== null && pluginState !== void 0 && pluginState.mouseData.isSelecting)) {
             hideToolbar(view.state, view.dispatch)();
           }
@@ -415,7 +415,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
           if (!annotationId) {
             return false;
           }
-          var pluginState = (0, _utils3.getPluginState)(view.state);
+          var pluginState = (0, _utils2.getPluginState)(view.state);
           var isSelected = pluginState === null || pluginState === void 0 || (_pluginState$selected = pluginState.selectedAnnotations) === null || _pluginState$selected === void 0 ? void 0 : _pluginState$selected.some(function (selectedAnnotation) {
             return selectedAnnotation.id === annotationId;
           });
@@ -453,7 +453,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
       },
       decorations: function decorations(state) {
         // highlight comments, depending on state
-        var _ref12 = (0, _utils3.getPluginState)(state) || {},
+        var _ref12 = (0, _utils2.getPluginState)(state) || {},
           draftDecorationSet = _ref12.draftDecorationSet,
           annotations = _ref12.annotations,
           selectedAnnotations = _ref12.selectedAnnotations,
@@ -468,7 +468,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
         // the decorations in plugin state and only updating them when required.
         state.doc.descendants(function (node, pos) {
           // Do not render saved chart marks as text highlights when annotation support is off.
-          if ((0, _utils3.shouldHideRemixAnnotation)(node)) {
+          if ((0, _utils2.shouldHideRemixAnnotation)(node)) {
             return false;
           }
           // Inline comment on mediaInline is not supported as part of comments on media project
@@ -476,7 +476,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
           if (node.type.name === 'mediaInline') {
             return false;
           }
-          var isSupportedBlock = node.isBlock && (0, _utils3.isSupportedBlockNode)(node, provider.supportedBlockNodes, provider.isBlockNodeSupported);
+          var isSupportedBlock = node.isBlock && (0, _utils2.isSupportedBlockNode)(node, provider.supportedBlockNodes, provider.isBlockNodeSupported);
           node.marks.filter(function (mark) {
             return mark.type === state.schema.marks.annotation;
           }).forEach(function (mark) {
@@ -492,7 +492,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
                 focusDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
                   class: "".concat((0, _nodeviews.getBlockAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved)
                 }, {
-                  key: _utils3.decorationKey.block
+                  key: _utils2.decorationKey.block
                 }));
               } else {
                 if ((0, _fg.fg)('editor_inline_comments_on_inline_nodes')) {
@@ -505,7 +505,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
                     focusDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
                       class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected, isHovered), " ").concat(isUnresolved)
                     }, {
-                      key: _utils3.decorationKey.block
+                      key: _utils2.decorationKey.block
                     }));
                   }
                 } else {