@atlaskit/editor-plugin-annotation 2.9.1 → 2.9.3

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

@@ -37,7 +37,7 @@ const fetchState = async (provider, annotationIds, editorView, editorAnalyticsAP
     updateInlineCommentResolvedState(editorAnalyticsAPI)(inlineCommentStates)(editorView.state, editorView.dispatch);
   }
 };
-const initialState = (disallowOnWhitespace = false, featureFlagsPluginState) => {
+const initialState = (disallowOnWhitespace = false, featureFlagsPluginState, isAnnotationManagerEnabled = false) => {
   return {
     annotations: {},
     selectedAnnotations: [],
@@ -52,7 +52,8 @@ const initialState = (disallowOnWhitespace = false, featureFlagsPluginState) =>
     featureFlagsPluginState,
     isDrafting: false,
     pendingSelectedAnnotations: [],
-    pendingSelectedAnnotationsUpdateCount: 0
+    pendingSelectedAnnotationsUpdateCount: 0,
+    isAnnotationManagerEnabled
   };
 };
 const hideToolbar = (state, dispatch) => () => {
@@ -104,7 +105,7 @@ export const inlineCommentPlugin = options => {
   } = options;
   return new SafePlugin({
     key: inlineCommentPluginKey,
-    state: createPluginState(options.dispatch, initialState(provider.disallowOnWhitespace, featureFlagsPluginState)),
+    state: createPluginState(options.dispatch, initialState(provider.disallowOnWhitespace, featureFlagsPluginState, !!annotationManager)),
     view(editorView) {
       let allowAnnotationFn;
       let startDraftFn;
@@ -114,25 +115,23 @@ export const inlineCommentPlugin = options => {
       let setIsAnnotationSelectedFn;
       let setIsAnnotationHoveredFn;
       let clearAnnotationFn;
-      if (annotationManager && fg('platform_editor_comments_api_manager')) {
+      if (annotationManager) {
         allowAnnotationFn = allowAnnotation(editorView, options);
         startDraftFn = startDraft(editorView, options);
         clearDraftFn = clearDraft(editorView, options);
         applyDraftFn = applyDraft(editorView, options);
         getDraftFn = getDraft(editorView, options);
+        setIsAnnotationSelectedFn = setIsAnnotationSelected(editorView, options);
+        setIsAnnotationHoveredFn = setIsAnnotationHovered(editorView, options);
+        clearAnnotationFn = clearAnnotation(editorView, options);
         annotationManager.hook('allowAnnotation', allowAnnotationFn);
         annotationManager.hook('startDraft', startDraftFn);
         annotationManager.hook('clearDraft', clearDraftFn);
         annotationManager.hook('applyDraft', applyDraftFn);
         annotationManager.hook('getDraft', getDraftFn);
-        if (fg('platform_editor_comments_api_manager_select')) {
-          setIsAnnotationSelectedFn = setIsAnnotationSelected(editorView, options);
-          setIsAnnotationHoveredFn = setIsAnnotationHovered(editorView, options);
-          clearAnnotationFn = clearAnnotation(editorView, options);
-          annotationManager.hook('setIsAnnotationSelected', setIsAnnotationSelectedFn);
-          annotationManager.hook('setIsAnnotationHovered', setIsAnnotationHoveredFn);
-          annotationManager.hook('clearAnnotation', clearAnnotationFn);
-        }
+        annotationManager.hook('setIsAnnotationSelected', setIsAnnotationSelectedFn);
+        annotationManager.hook('setIsAnnotationHovered', setIsAnnotationHoveredFn);
+        annotationManager.hook('clearAnnotation', clearAnnotationFn);
       }
       // Get initial state
       // Need to pass `editorView` to mitigate editor state going stale
@@ -213,7 +212,7 @@ export const inlineCommentPlugin = options => {
             // The selectComponentExperience is using a simplified object, which is why it's type asserted.
             (_options$selectCommen = options.selectCommentExperience) === null || _options$selectCommen === void 0 ? void 0 : _options$selectCommen.selectAnnotation.complete(selectedAnnotationId);
           }
-          if (fg('platform_editor_comments_api_manager_select')) {
+          if (annotationManager) {
             // In the Editor, Annotations can be selected in three ways:
             // 1. By clicking on the annotation in the editor
             // 2. By using the annotation manager to select the annotation
@@ -233,7 +232,7 @@ export const inlineCommentPlugin = options => {
               // 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 === null || annotationManager === void 0 ? void 0 : annotationManager.checkPreemptiveGate().then(canSelectAnnotation => {
+              annotationManager.checkPreemptiveGate().then(canSelectAnnotation => {
                 const {
                   isDrafting,
                   pendingSelectedAnnotations: latestPendingSelectedAnnotations,
@@ -247,10 +246,10 @@ export const inlineCommentPlugin = options => {
                   }
 
                   // Flush the pending selections into the selected annotations list.
-                  flushPendingSelections(true)(view.state, view.dispatch);
+                  flushPendingSelections(options.editorAnalyticsAPI)(true)(view.state, view.dispatch);
                   latestSelectedAnnotations === null || latestSelectedAnnotations === void 0 ? void 0 : latestSelectedAnnotations.filter(annotation => (latestPendingSelectedAnnotations === null || latestPendingSelectedAnnotations === void 0 ? void 0 : latestPendingSelectedAnnotations.findIndex(pendingAnnotation => pendingAnnotation.id === annotation.id)) === -1).forEach(annotation => {
-                    var _options$annotationMa, _getAnnotationInlineN;
-                    (_options$annotationMa = options.annotationManager) === null || _options$annotationMa === void 0 ? void 0 : _options$annotationMa.emit({
+                    var _getAnnotationInlineN;
+                    annotationManager.emit({
                       name: 'annotationSelectionChanged',
                       data: {
                         annotationId: annotation.id,
@@ -264,8 +263,8 @@ export const inlineCommentPlugin = options => {
                   latestPendingSelectedAnnotations === null || latestPendingSelectedAnnotations === void 0 ? void 0 : latestPendingSelectedAnnotations.forEach(({
                     id
                   }) => {
-                    var _options$annotationMa2, _getAnnotationInlineN2;
-                    (_options$annotationMa2 = options.annotationManager) === null || _options$annotationMa2 === void 0 ? void 0 : _options$annotationMa2.emit({
+                    var _getAnnotationInlineN2;
+                    annotationManager.emit({
                       name: 'annotationSelectionChanged',
                       data: {
                         annotationId: id,
@@ -278,13 +277,11 @@ export const inlineCommentPlugin = options => {
                   // Clears the pending selections if the preemptive gate returns false.
                   // We should need to worry about dispatching change events here because the pending selections
                   // are being aborted and the selections will remain unchanged.
-                  flushPendingSelections(false)(view.state, view.dispatch);
+                  flushPendingSelections(options.editorAnalyticsAPI)(false)(view.state, view.dispatch);
                 }
               }).catch(error => {
-                // TODO: EDITOR-595 - Ensure and anlytic is fired to indicate which reports on the error.
-
                 // If an error has occured we will clear any pending selections to avoid accidentally setting the wrong thing.
-                flushPendingSelections(false)(view.state, view.dispatch);
+                flushPendingSelections(options.editorAnalyticsAPI)(false, 'pending-selection-preemptive-gate-error')(view.state, view.dispatch);
               }).finally(() => {
                 isPreemptiveGateActive = false;
               });
@@ -305,7 +302,7 @@ export const inlineCommentPlugin = options => {
           if (updateSubscriber) {
             updateSubscriber.off('resolve', resolve).off('delete', resolve).off('unresolve', unResolve).off('create', unResolve).off('setvisibility', setVisibility).off('setselectedannotation', setSelectedAnnotationFn).off('sethoveredannotation', setHoveredAnnotationFn).off('removehoveredannotation', removeHoveredannotationFn).off('closeinlinecomment', closeInlineCommentFn);
           }
-          if (annotationManager && fg('platform_editor_comments_api_manager')) {
+          if (annotationManager) {
             annotationManager.unhook('allowAnnotation', allowAnnotationFn);
             annotationManager.unhook('startDraft', startDraftFn);
             annotationManager.unhook('clearDraft', clearDraftFn);
@@ -360,7 +357,7 @@ export const inlineCommentPlugin = options => {
           if (!isUnresolved) {
             return false;
           }
-          if (fg('platform_editor_comments_api_manager_select')) {
+          if (annotationManager) {
             var _pluginState$pendingS;
             // The manager disable setting the selected annotation on click because in the editor this is already
             // handled by the selection update handler. When the manager is enabled, and a selection changes it's pushed into

package/dist/es2019/pm-plugins/plugin-factory.js

@@ -1,7 +1,6 @@
 import { pluginFactory } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import reducer from './reducer';
 import { decorationKey, findAnnotationsInSelection, inlineCommentPluginKey, isBlockNodeAnnotationsSelected, isSelectedAnnotationsChanged } from './utils';
 const handleDocChanged = (tr, prevPluginState) => {
@@ -111,7 +110,6 @@ const getSelectionChangeHandlerNew = reopenCommentView => (tr, pluginState) => {
 
   // NOTE: I've left this commented code here as a reference that the previous old code would reset the selected annotations
   // if the selection is empty. If this is no longer needed, we can remove this code.
-  // clean up with platform_editor_comments_api_manager_select
   // if (selectedAnnotations.length === 0) {
   // 	return {
   // 		...pluginState,
@@ -141,7 +139,11 @@ const getSelectionChangeHandlerNew = reopenCommentView => (tr, pluginState) => {
     selectAnnotationMethod: undefined
   };
 };
-const getSelectionChangedHandler = reopenCommentView => (tr, pluginState) => fg('platform_editor_comments_api_manager_select') ? getSelectionChangeHandlerNew(reopenCommentView)(tr, pluginState) : getSelectionChangeHandlerOld(reopenCommentView)(tr, pluginState);
+const getSelectionChangedHandler = reopenCommentView => (tr, pluginState) => pluginState.isAnnotationManagerEnabled ?
+// if platform_editor_comments_api_manager == true
+getSelectionChangeHandlerNew(reopenCommentView)(tr, pluginState) :
+// else if platform_editor_comments_api_manager == false
+getSelectionChangeHandlerOld(reopenCommentView)(tr, pluginState);
 export const {
   createPluginState,
   createCommand

package/dist/es2019/pm-plugins/reducer.js

@@ -35,7 +35,7 @@ export default ((pluginState, action) => {
         ...(fg('platform_editor_annotation_selected_annotation') && {
           selectedAnnotations: []
         }),
-        ...(fg('platform_editor_comments_api_manager_select') && {
+        ...(pluginState.isAnnotationManagerEnabled && {
           selectedAnnotations: []
         })
       };
@@ -50,7 +50,7 @@ export default ((pluginState, action) => {
         },
         isInlineCommentViewClosed: false,
         selectAnnotationMethod: undefined,
-        ...(fg('platform_editor_comments_api_manager_select') && {
+        ...(pluginState.isAnnotationManagerEnabled && {
           skipSelectionHandling: true
         })
       };

package/dist/es2019/pm-plugins/toolbar.js

@@ -121,25 +121,17 @@ export const buildToolbar = editorAnalyticsAPI => ({
       }
     },
     onClick: (state, dispatch) => {
-      if (editorAnalyticsAPI) {
-        editorAnalyticsAPI.fireAnalyticsEvent({
-          action: ACTION.CLICKED,
-          actionSubject: ACTION_SUBJECT.BUTTON,
-          actionSubjectId: ACTION_SUBJECT_ID.CREATE_INLINE_COMMENT_FROM_HIGHLIGHT_ACTIONS_MENU,
-          eventType: EVENT_TYPE.UI,
-          attributes: {
-            source: 'highlightActionsMenu',
-            pageMode: 'edit'
-          }
-        });
-      }
-      if (fg('platform_editor_comments_api_manager')) {
-        if (!annotationManager) {
-          // TODO: EDITOR-595 - If we've reached here and the manager is not initialized, we should
-          // dispatch an analytics event to indicate that the user has clicked the button but
-          // the action was not completed.
-          return false;
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.fireAnalyticsEvent({
+        action: ACTION.CLICKED,
+        actionSubject: ACTION_SUBJECT.BUTTON,
+        actionSubjectId: ACTION_SUBJECT_ID.CREATE_INLINE_COMMENT_FROM_HIGHLIGHT_ACTIONS_MENU,
+        eventType: EVENT_TYPE.UI,
+        attributes: {
+          source: 'highlightActionsMenu',
+          pageMode: 'edit'
         }
+      });
+      if (annotationManager) {
         annotationManager.checkPreemptiveGate().then(canStartDraft => {
           if (canStartDraft) {
             createCommentExperience === null || createCommentExperience === void 0 ? void 0 : createCommentExperience.start({
@@ -150,18 +142,30 @@ export const buildToolbar = editorAnalyticsAPI => ({
             });
             createCommentExperience === null || createCommentExperience === void 0 ? void 0 : createCommentExperience.initExperience.start();
             const result = annotationManager.startDraft();
-            if (result.success) {
-              // TODO: EDITOR-595 - Ensure and anlytic is fired to indicate that the user has started a draft.
-            } else {
-              // TODO: EDITOR-595 - Fire an analytics event to indicate that the user has clicked the button
+            if (!result.success) {
+              // Fire an analytics event to indicate that the user has clicked the button
               // but the action was not completed, the result should contain a reason.
+              editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.fireAnalyticsEvent({
+                action: ACTION.ERROR,
+                actionSubject: ACTION_SUBJECT.ANNOTATION,
+                actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
+                eventType: EVENT_TYPE.OPERATIONAL,
+                attributes: {
+                  errorReason: `toolbar-start-draft-failed/${result.reason}`
+                }
+              });
             }
-          } else {
-            // TODO: EDITOR-595 - Track the toolbar comment button was clicked but the preemptive gate
-            // check returned false and the draft cannot be started.
           }
         }).catch(() => {
-          // TODO: EDITOR-595 - Handle preemptive gate check error. Something went very wrong in the gate.
+          editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.fireAnalyticsEvent({
+            action: ACTION.ERROR,
+            actionSubject: ACTION_SUBJECT.ANNOTATION,
+            actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
+            eventType: EVENT_TYPE.OPERATIONAL,
+            attributes: {
+              errorReason: `toolbar-start-draft-preemptive-gate-error`
+            }
+          });
         });
         return true;
       } else {

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

@@ -44,13 +44,21 @@ export var clearDirtyMark = function clearDirtyMark() {
     type: ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK
   });
 };
-export var flushPendingSelections = function flushPendingSelections(canSetAsSelectedAnnotations) {
-  return createCommand({
-    type: ACTIONS.FLUSH_PENDING_SELECTIONS,
-    data: {
-      canSetAsSelectedAnnotations: canSetAsSelectedAnnotations
+export var flushPendingSelections = function flushPendingSelections(editorAnalyticsAPI) {
+  return function (canSetAsSelectedAnnotations, errorReason) {
+    var command = {
+      type: ACTIONS.FLUSH_PENDING_SELECTIONS,
+      data: {
+        canSetAsSelectedAnnotations: canSetAsSelectedAnnotations
+      }
+    };
+    if (!!errorReason) {
+      return createCommand(command, function (tr, state) {
+        return transform.addPreemptiveGateErrorAnalytics(editorAnalyticsAPI)(errorReason)(tr, state);
+      });
     }
-  });
+    return createCommand(command);
+  };
 };
 export var setPendingSelectedAnnotation = function setPendingSelectedAnnotation(id) {
   return createCommand({
@@ -124,32 +132,34 @@ export var removeInlineCommentNearSelection = function removeInlineCommentNearSe
     return true;
   };
 };
-export var removeInlineCommentFromDoc = function removeInlineCommentFromDoc(id) {
-  var supportedNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  return function (state, dispatch) {
-    var tr = state.tr;
-    state.doc.descendants(function (node, pos) {
-      // Inline comment on mediaInline is not supported as part of comments on media project
-      // Thus, we skip the decoration for mediaInline node
-      if (node.type.name === 'mediaInline') {
-        return false;
-      }
-      var isSupportedBlockNode = node.isBlock && (supportedNodes === null || supportedNodes === void 0 ? void 0 : supportedNodes.includes(node.type.name));
-      node.marks.filter(function (mark) {
-        return mark.type === state.schema.marks.annotation && mark.attrs.id === id;
-      }).forEach(function (mark) {
-        if (isSupportedBlockNode) {
-          tr.removeNodeMark(pos, mark);
-        } else {
-          tr.removeMark(pos, pos + node.nodeSize, mark);
+export var removeInlineCommentFromDoc = function removeInlineCommentFromDoc(editorAnalyticsAPI) {
+  return function (id) {
+    var supportedNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    return function (state, dispatch) {
+      var tr = state.tr;
+      state.doc.descendants(function (node, pos) {
+        // Inline comment on mediaInline is not supported as part of comments on media project
+        // Thus, we skip the decoration for mediaInline node
+        if (node.type.name === 'mediaInline') {
+          return false;
         }
+        var isSupportedBlockNode = node.isBlock && (supportedNodes === null || supportedNodes === void 0 ? void 0 : supportedNodes.includes(node.type.name));
+        node.marks.filter(function (mark) {
+          return mark.type === state.schema.marks.annotation && mark.attrs.id === id;
+        }).forEach(function (mark) {
+          if (isSupportedBlockNode) {
+            tr.removeNodeMark(pos, mark);
+          } else {
+            tr.removeMark(pos, pos + node.nodeSize, mark);
+          }
+        });
       });
-    });
-    if (dispatch) {
-      dispatch(tr);
-      return true;
-    }
-    return false;
+      if (dispatch) {
+        dispatch(transform.addDeleteAnalytics(editorAnalyticsAPI)(tr, state));
+        return true;
+      }
+      return false;
+    };
   };
 };
 var getDraftCommandAction = function getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar) {

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

@@ -130,11 +130,43 @@ var addResolveAnalytics = function addResolveAnalytics(editorAnalyticsAPI) {
     };
   };
 };
+var addPreemptiveGateErrorAnalytics = function addPreemptiveGateErrorAnalytics(editorAnalyticsAPI) {
+  return function (errorReason) {
+    return function (transaction, state) {
+      var analyticsEvent = {
+        action: ACTION.ERROR,
+        actionSubject: ACTION_SUBJECT.ANNOTATION,
+        actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
+        eventType: EVENT_TYPE.OPERATIONAL,
+        attributes: {
+          errorReason: errorReason
+        }
+      };
+      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(analyticsEvent)(transaction);
+      return transaction;
+    };
+  };
+};
+var addDeleteAnalytics = function addDeleteAnalytics(editorAnalyticsAPI) {
+  return function (transaction, state) {
+    var analyticsEvent = {
+      action: ACTION.DELETED,
+      actionSubject: ACTION_SUBJECT.ANNOTATION,
+      actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
+      eventType: EVENT_TYPE.TRACK,
+      attributes: {}
+    };
+    editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(analyticsEvent)(transaction);
+    return transaction;
+  };
+};
 export default {
   addAnnotationMark: addAnnotationMark,
   addInlineComment: addInlineComment,
   handleDraftState: handleDraftState,
   addOpenCloseAnalytics: addOpenCloseAnalytics,
   addInsertAnalytics: addInsertAnalytics,
-  addResolveAnalytics: addResolveAnalytics
+  addResolveAnalytics: addResolveAnalytics,
+  addPreemptiveGateErrorAnalytics: addPreemptiveGateErrorAnalytics,
+  addDeleteAnalytics: addDeleteAnalytics
 };

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

@@ -1,7 +1,6 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { setInlineCommentDraftState, createAnnotation, setSelectedAnnotation, closeComponent, setHoveredAnnotation, removeInlineCommentFromDoc } from '../editor-commands';
 import { AnnotationSelectionType } from '../types';
 import { inlineCommentPluginKey, isSelectionValid } from './utils';
@@ -52,7 +51,7 @@ export var startDraft = function startDraft(editorView, options) {
         reason: ERROR_REASON_DRAFT_IN_PROGRESS
       };
     }
-    if (!!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.length) && fg('platform_editor_comments_api_manager_select')) {
+    if (!!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.length)) {
       // if there are selected annotations when starting a draft, we need to clear the selected annotations
       // before we start the draft.
       closeComponent()(editorView.state, editorView.dispatch);
@@ -338,7 +337,7 @@ export var clearAnnotation = function clearAnnotation(editorView, options) {
         reason: ERROR_REASON_ID_INVALID
       };
     }
-    removeInlineCommentFromDoc(id, options.provider.supportedBlockNodes)(editorView.state, editorView.dispatch);
+    removeInlineCommentFromDoc(options.editorAnalyticsAPI)(id, options.provider.supportedBlockNodes)(editorView.state, editorView.dispatch);
     return {
       success: true,
       actionResult: undefined

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

@@ -86,6 +86,7 @@ var fetchState = /*#__PURE__*/function () {
 var initialState = function initialState() {
   var disallowOnWhitespace = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
   var featureFlagsPluginState = arguments.length > 1 ? arguments[1] : undefined;
+  var isAnnotationManagerEnabled = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   return {
     annotations: {},
     selectedAnnotations: [],
@@ -100,7 +101,8 @@ var initialState = function initialState() {
     featureFlagsPluginState: featureFlagsPluginState,
     isDrafting: false,
     pendingSelectedAnnotations: [],
-    pendingSelectedAnnotationsUpdateCount: 0
+    pendingSelectedAnnotationsUpdateCount: 0,
+    isAnnotationManagerEnabled: isAnnotationManagerEnabled
   };
 };
 var hideToolbar = function hideToolbar(state, dispatch) {
@@ -157,7 +159,7 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
     annotationManager = options.annotationManager;
   return new SafePlugin({
     key: inlineCommentPluginKey,
-    state: createPluginState(options.dispatch, initialState(provider.disallowOnWhitespace, featureFlagsPluginState)),
+    state: createPluginState(options.dispatch, initialState(provider.disallowOnWhitespace, featureFlagsPluginState, !!annotationManager)),
     view: function view(editorView) {
       var allowAnnotationFn;
       var startDraftFn;
@@ -167,25 +169,23 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
       var setIsAnnotationSelectedFn;
       var setIsAnnotationHoveredFn;
       var clearAnnotationFn;
-      if (annotationManager && fg('platform_editor_comments_api_manager')) {
+      if (annotationManager) {
         allowAnnotationFn = allowAnnotation(editorView, options);
         startDraftFn = startDraft(editorView, options);
         clearDraftFn = clearDraft(editorView, options);
         applyDraftFn = applyDraft(editorView, options);
         getDraftFn = getDraft(editorView, options);
+        setIsAnnotationSelectedFn = setIsAnnotationSelected(editorView, options);
+        setIsAnnotationHoveredFn = setIsAnnotationHovered(editorView, options);
+        clearAnnotationFn = clearAnnotation(editorView, options);
         annotationManager.hook('allowAnnotation', allowAnnotationFn);
         annotationManager.hook('startDraft', startDraftFn);
         annotationManager.hook('clearDraft', clearDraftFn);
         annotationManager.hook('applyDraft', applyDraftFn);
         annotationManager.hook('getDraft', getDraftFn);
-        if (fg('platform_editor_comments_api_manager_select')) {
-          setIsAnnotationSelectedFn = setIsAnnotationSelected(editorView, options);
-          setIsAnnotationHoveredFn = setIsAnnotationHovered(editorView, options);
-          clearAnnotationFn = clearAnnotation(editorView, options);
-          annotationManager.hook('setIsAnnotationSelected', setIsAnnotationSelectedFn);
-          annotationManager.hook('setIsAnnotationHovered', setIsAnnotationHoveredFn);
-          annotationManager.hook('clearAnnotation', clearAnnotationFn);
-        }
+        annotationManager.hook('setIsAnnotationSelected', setIsAnnotationSelectedFn);
+        annotationManager.hook('setIsAnnotationHovered', setIsAnnotationHoveredFn);
+        annotationManager.hook('clearAnnotation', clearAnnotationFn);
       }
       // Get initial state
       // Need to pass `editorView` to mitigate editor state going stale
@@ -270,7 +270,7 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
             // The selectComponentExperience is using a simplified object, which is why it's type asserted.
             (_options$selectCommen = options.selectCommentExperience) === null || _options$selectCommen === void 0 || _options$selectCommen.selectAnnotation.complete(selectedAnnotationId);
           }
-          if (fg('platform_editor_comments_api_manager_select')) {
+          if (annotationManager) {
             // In the Editor, Annotations can be selected in three ways:
             // 1. By clicking on the annotation in the editor
             // 2. By using the annotation manager to select the annotation
@@ -288,7 +288,7 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
               // 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 === null || annotationManager === void 0 || annotationManager.checkPreemptiveGate().then(function (canSelectAnnotation) {
+              annotationManager.checkPreemptiveGate().then(function (canSelectAnnotation) {
                 var _ref8 = getPluginState(view.state) || {},
                   isDrafting = _ref8.isDrafting,
                   latestPendingSelectedAnnotations = _ref8.pendingSelectedAnnotations,
@@ -301,14 +301,14 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
                   }
 
                   // Flush the pending selections into the selected annotations list.
-                  flushPendingSelections(true)(view.state, view.dispatch);
+                  flushPendingSelections(options.editorAnalyticsAPI)(true)(view.state, view.dispatch);
                   latestSelectedAnnotations === null || latestSelectedAnnotations === void 0 || latestSelectedAnnotations.filter(function (annotation) {
                     return (latestPendingSelectedAnnotations === null || latestPendingSelectedAnnotations === void 0 ? void 0 : latestPendingSelectedAnnotations.findIndex(function (pendingAnnotation) {
                       return pendingAnnotation.id === annotation.id;
                     })) === -1;
                   }).forEach(function (annotation) {
-                    var _options$annotationMa, _getAnnotationInlineN;
-                    (_options$annotationMa = options.annotationManager) === null || _options$annotationMa === void 0 || _options$annotationMa.emit({
+                    var _getAnnotationInlineN;
+                    annotationManager.emit({
                       name: 'annotationSelectionChanged',
                       data: {
                         annotationId: annotation.id,
@@ -320,9 +320,9 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
 
                   // Notify the annotation manager that the pending selection has changed.
                   latestPendingSelectedAnnotations === null || latestPendingSelectedAnnotations === void 0 || latestPendingSelectedAnnotations.forEach(function (_ref9) {
-                    var _options$annotationMa2, _getAnnotationInlineN2;
+                    var _getAnnotationInlineN2;
                     var id = _ref9.id;
-                    (_options$annotationMa2 = options.annotationManager) === null || _options$annotationMa2 === void 0 || _options$annotationMa2.emit({
+                    annotationManager.emit({
                       name: 'annotationSelectionChanged',
                       data: {
                         annotationId: id,
@@ -335,20 +335,18 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
                   // Clears the pending selections if the preemptive gate returns false.
                   // We should need to worry about dispatching change events here because the pending selections
                   // are being aborted and the selections will remain unchanged.
-                  flushPendingSelections(false)(view.state, view.dispatch);
+                  flushPendingSelections(options.editorAnalyticsAPI)(false)(view.state, view.dispatch);
                 }
               }).catch(function (error) {
-                // TODO: EDITOR-595 - Ensure and anlytic is fired to indicate which reports on the error.
-
                 // If an error has occured we will clear any pending selections to avoid accidentally setting the wrong thing.
-                flushPendingSelections(false)(view.state, view.dispatch);
+                flushPendingSelections(options.editorAnalyticsAPI)(false, 'pending-selection-preemptive-gate-error')(view.state, view.dispatch);
               }).finally(function () {
                 isPreemptiveGateActive = false;
               });
             }
           }
-          var _ref10 = getPluginState(view.state) || {},
-            dirtyAnnotations = _ref10.dirtyAnnotations;
+          var _ref0 = getPluginState(view.state) || {},
+            dirtyAnnotations = _ref0.dirtyAnnotations;
           if (!dirtyAnnotations) {
             return;
           }
@@ -361,7 +359,7 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
           if (updateSubscriber) {
             updateSubscriber.off('resolve', resolve).off('delete', resolve).off('unresolve', unResolve).off('create', unResolve).off('setvisibility', setVisibility).off('setselectedannotation', setSelectedAnnotationFn).off('sethoveredannotation', setHoveredAnnotationFn).off('removehoveredannotation', removeHoveredannotationFn).off('closeinlinecomment', closeInlineCommentFn);
           }
-          if (annotationManager && fg('platform_editor_comments_api_manager')) {
+          if (annotationManager) {
             annotationManager.unhook('allowAnnotation', allowAnnotationFn);
             annotationManager.unhook('startDraft', startDraftFn);
             annotationManager.unhook('clearDraft', clearDraftFn);
@@ -411,13 +409,13 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
           if (isSelected && !(pluginState !== null && pluginState !== void 0 && pluginState.isInlineCommentViewClosed)) {
             return false;
           }
-          var _ref11 = pluginState || {},
-            annotations = _ref11.annotations;
+          var _ref1 = pluginState || {},
+            annotations = _ref1.annotations;
           var isUnresolved = annotations && annotations[annotationId] === false;
           if (!isUnresolved) {
             return false;
           }
-          if (fg('platform_editor_comments_api_manager_select')) {
+          if (annotationManager) {
             var _pluginState$pendingS;
             // The manager disable setting the selected annotation on click because in the editor this is already
             // handled by the selection update handler. When the manager is enabled, and a selection changes it's pushed into
@@ -440,13 +438,13 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
       },
       decorations: function decorations(state) {
         // highlight comments, depending on state
-        var _ref12 = getPluginState(state) || {},
-          draftDecorationSet = _ref12.draftDecorationSet,
-          annotations = _ref12.annotations,
-          selectedAnnotations = _ref12.selectedAnnotations,
-          isVisible = _ref12.isVisible,
-          isInlineCommentViewClosed = _ref12.isInlineCommentViewClosed,
-          hoveredAnnotations = _ref12.hoveredAnnotations;
+        var _ref10 = getPluginState(state) || {},
+          draftDecorationSet = _ref10.draftDecorationSet,
+          annotations = _ref10.annotations,
+          selectedAnnotations = _ref10.selectedAnnotations,
+          isVisible = _ref10.isVisible,
+          isInlineCommentViewClosed = _ref10.isInlineCommentViewClosed,
+          hoveredAnnotations = _ref10.hoveredAnnotations;
         var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : DecorationSet.empty;
         var focusDecorations = [];
 

package/dist/esm/pm-plugins/plugin-factory.js

@@ -4,7 +4,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { pluginFactory } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import reducer from './reducer';
 import { decorationKey, findAnnotationsInSelection, inlineCommentPluginKey, isBlockNodeAnnotationsSelected, isSelectedAnnotationsChanged } from './utils';
 var handleDocChanged = function handleDocChanged(tr, prevPluginState) {
@@ -104,7 +103,6 @@ var getSelectionChangeHandlerNew = function getSelectionChangeHandlerNew(reopenC
 
     // NOTE: I've left this commented code here as a reference that the previous old code would reset the selected annotations
     // if the selection is empty. If this is no longer needed, we can remove this code.
-    // clean up with platform_editor_comments_api_manager_select
     // if (selectedAnnotations.length === 0) {
     // 	return {
     // 		...pluginState,
@@ -133,7 +131,11 @@ var getSelectionChangeHandlerNew = function getSelectionChangeHandlerNew(reopenC
 };
 var getSelectionChangedHandler = function getSelectionChangedHandler(reopenCommentView) {
   return function (tr, pluginState) {
-    return fg('platform_editor_comments_api_manager_select') ? getSelectionChangeHandlerNew(reopenCommentView)(tr, pluginState) : getSelectionChangeHandlerOld(reopenCommentView)(tr, pluginState);
+    return pluginState.isAnnotationManagerEnabled ?
+    // if platform_editor_comments_api_manager == true
+    getSelectionChangeHandlerNew(reopenCommentView)(tr, pluginState) :
+    // else if platform_editor_comments_api_manager == false
+    getSelectionChangeHandlerOld(reopenCommentView)(tr, pluginState);
   };
 };
 var _pluginFactory = pluginFactory(inlineCommentPluginKey, reducer, {