@atlaskit/editor-plugin-annotation 2.9.2 → 2.9.3

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-plugin-annotation
 
+## 2.9.3
+
+### Patch Changes
+
+- [#163361](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/163361)
+  [`76c3619bccda1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/76c3619bccda1) -
+  Changed the annotation manager feature gate to instead use the existance of the manager rather
+  then a gate
+- Updated dependencies
+
 ## 2.9.2
 
 ### Patch Changes

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

@@ -7,7 +7,6 @@ exports.startDraft = exports.setIsAnnotationSelected = exports.setIsAnnotationHo
 var _adfSchema = require("@atlaskit/adf-schema");
 var _utils = require("@atlaskit/editor-common/utils");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _editorCommands = require("../editor-commands");
 var _types = require("../types");
 var _utils3 = require("./utils");
@@ -58,7 +57,7 @@ var startDraft = exports.startDraft = function startDraft(editorView, options) {
         reason: ERROR_REASON_DRAFT_IN_PROGRESS
       };
     }
-    if (!!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.length) && (0, _platformFeatureFlags.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.
       (0, _editorCommands.closeComponent)()(editorView.state, editorView.dispatch);

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

@@ -93,6 +93,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: [],
@@ -107,7 +108,8 @@ var initialState = function initialState() {
     featureFlagsPluginState: featureFlagsPluginState,
     isDrafting: false,
     pendingSelectedAnnotations: [],
-    pendingSelectedAnnotationsUpdateCount: 0
+    pendingSelectedAnnotationsUpdateCount: 0,
+    isAnnotationManagerEnabled: isAnnotationManagerEnabled
   };
 };
 var hideToolbar = function hideToolbar(state, dispatch) {
@@ -164,7 +166,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
     annotationManager = options.annotationManager;
   return new _safePlugin.SafePlugin({
     key: _utils2.inlineCommentPluginKey,
-    state: (0, _pluginFactory.createPluginState)(options.dispatch, initialState(provider.disallowOnWhitespace, featureFlagsPluginState)),
+    state: (0, _pluginFactory.createPluginState)(options.dispatch, initialState(provider.disallowOnWhitespace, featureFlagsPluginState, !!annotationManager)),
     view: function view(editorView) {
       var allowAnnotationFn;
       var startDraftFn;
@@ -174,25 +176,23 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
       var setIsAnnotationSelectedFn;
       var setIsAnnotationHoveredFn;
       var clearAnnotationFn;
-      if (annotationManager && (0, _platformFeatureFlags.fg)('platform_editor_comments_api_manager')) {
+      if (annotationManager) {
         allowAnnotationFn = (0, _annotationManagerHooks.allowAnnotation)(editorView, options);
         startDraftFn = (0, _annotationManagerHooks.startDraft)(editorView, options);
         clearDraftFn = (0, _annotationManagerHooks.clearDraft)(editorView, options);
         applyDraftFn = (0, _annotationManagerHooks.applyDraft)(editorView, options);
         getDraftFn = (0, _annotationManagerHooks.getDraft)(editorView, options);
+        setIsAnnotationSelectedFn = (0, _annotationManagerHooks.setIsAnnotationSelected)(editorView, options);
+        setIsAnnotationHoveredFn = (0, _annotationManagerHooks.setIsAnnotationHovered)(editorView, options);
+        clearAnnotationFn = (0, _annotationManagerHooks.clearAnnotation)(editorView, options);
         annotationManager.hook('allowAnnotation', allowAnnotationFn);
         annotationManager.hook('startDraft', startDraftFn);
         annotationManager.hook('clearDraft', clearDraftFn);
         annotationManager.hook('applyDraft', applyDraftFn);
         annotationManager.hook('getDraft', getDraftFn);
-        if ((0, _platformFeatureFlags.fg)('platform_editor_comments_api_manager_select')) {
-          setIsAnnotationSelectedFn = (0, _annotationManagerHooks.setIsAnnotationSelected)(editorView, options);
-          setIsAnnotationHoveredFn = (0, _annotationManagerHooks.setIsAnnotationHovered)(editorView, options);
-          clearAnnotationFn = (0, _annotationManagerHooks.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
@@ -277,7 +277,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
             // 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 ((0, _platformFeatureFlags.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
@@ -295,7 +295,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
               // 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 = (0, _utils2.getPluginState)(view.state) || {},
                   isDrafting = _ref8.isDrafting,
                   latestPendingSelectedAnnotations = _ref8.pendingSelectedAnnotations,
@@ -314,8 +314,8 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
                       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,
@@ -327,9 +327,9 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
 
                   // 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,
@@ -352,8 +352,8 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
               });
             }
           }
-          var _ref10 = (0, _utils2.getPluginState)(view.state) || {},
-            dirtyAnnotations = _ref10.dirtyAnnotations;
+          var _ref0 = (0, _utils2.getPluginState)(view.state) || {},
+            dirtyAnnotations = _ref0.dirtyAnnotations;
           if (!dirtyAnnotations) {
             return;
           }
@@ -366,7 +366,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
           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 && (0, _platformFeatureFlags.fg)('platform_editor_comments_api_manager')) {
+          if (annotationManager) {
             annotationManager.unhook('allowAnnotation', allowAnnotationFn);
             annotationManager.unhook('startDraft', startDraftFn);
             annotationManager.unhook('clearDraft', clearDraftFn);
@@ -416,13 +416,13 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
           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 ((0, _platformFeatureFlags.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
@@ -445,13 +445,13 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
       },
       decorations: function decorations(state) {
         // highlight comments, depending on state
-        var _ref12 = (0, _utils2.getPluginState)(state) || {},
-          draftDecorationSet = _ref12.draftDecorationSet,
-          annotations = _ref12.annotations,
-          selectedAnnotations = _ref12.selectedAnnotations,
-          isVisible = _ref12.isVisible,
-          isInlineCommentViewClosed = _ref12.isInlineCommentViewClosed,
-          hoveredAnnotations = _ref12.hoveredAnnotations;
+        var _ref10 = (0, _utils2.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 : _view.DecorationSet.empty;
         var focusDecorations = [];
 

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

@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _reducer = _interopRequireDefault(require("./reducer"));
 var _utils2 = require("./utils");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -111,7 +110,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,
@@ -140,7 +138,11 @@ var getSelectionChangeHandlerNew = function getSelectionChangeHandlerNew(reopenC
 };
 var getSelectionChangedHandler = function getSelectionChangedHandler(reopenCommentView) {
   return function (tr, pluginState) {
-    return (0, _platformFeatureFlags.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 = (0, _utils.pluginFactory)(_utils2.inlineCommentPluginKey, _reducer.default, {

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

@@ -38,7 +38,7 @@ var _default = exports.default = function _default(pluginState, action) {
         isOpeningMediaCommentFromToolbar: false
       }, (0, _platformFeatureFlags.fg)('platform_editor_annotation_selected_annotation') && {
         selectedAnnotations: []
-      }), (0, _platformFeatureFlags.fg)('platform_editor_comments_api_manager_select') && {
+      }), pluginState.isAnnotationManagerEnabled && {
         selectedAnnotations: []
       });
     case _types.ACTIONS.ADD_INLINE_COMMENT:
@@ -48,7 +48,7 @@ var _default = exports.default = function _default(pluginState, action) {
         annotations: _objectSpread(_objectSpread({}, pluginState.annotations), action.data.inlineComments),
         isInlineCommentViewClosed: false,
         selectAnnotationMethod: undefined
-      }, (0, _platformFeatureFlags.fg)('platform_editor_comments_api_manager_select') && {
+      }, pluginState.isAnnotationManagerEnabled && {
         skipSelectionHandling: true
       });
     case _types.ACTIONS.INLINE_COMMENT_SET_VISIBLE:

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

@@ -133,7 +133,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
             pageMode: 'edit'
           }
         });
-        if (annotationManager && (0, _platformFeatureFlags.fg)('platform_editor_comments_api_manager')) {
+        if (annotationManager) {
           annotationManager.checkPreemptiveGate().then(function (canStartDraft) {
             if (canStartDraft) {
               createCommentExperience === null || createCommentExperience === void 0 || createCommentExperience.start({

package/dist/cjs/ui/InlineCommentView.js

@@ -20,8 +20,7 @@ var _editorCommands = require("../editor-commands");
 var _utils3 = require("../pm-plugins/utils");
 var _types = require("../types");
 var _AnnotationViewWrapper = require("./AnnotationViewWrapper");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var findPosForDOM = function findPosForDOM(sel) {
   var $from = sel.$from,
     from = sel.from;

package/dist/es2019/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';
@@ -51,7 +50,7 @@ export const 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);

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,
@@ -249,8 +248,8 @@ export const inlineCommentPlugin = options => {
                   // Flush the pending selections into the selected annotations list.
                   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,
@@ -303,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);
@@ -358,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

@@ -131,7 +131,7 @@ export const buildToolbar = editorAnalyticsAPI => ({
           pageMode: 'edit'
         }
       });
-      if (annotationManager && fg('platform_editor_comments_api_manager')) {
+      if (annotationManager) {
         annotationManager.checkPreemptiveGate().then(canStartDraft => {
           if (canStartDraft) {
             createCommentExperience === null || createCommentExperience === void 0 ? void 0 : createCommentExperience.start({

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);

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,
@@ -307,8 +307,8 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
                       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,
@@ -345,8 +345,8 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
               });
             }
           }
-          var _ref10 = getPluginState(view.state) || {},
-            dirtyAnnotations = _ref10.dirtyAnnotations;
+          var _ref0 = getPluginState(view.state) || {},
+            dirtyAnnotations = _ref0.dirtyAnnotations;
           if (!dirtyAnnotations) {
             return;
           }
@@ -359,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);
@@ -409,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
@@ -438,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, {

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

@@ -31,7 +31,7 @@ export default (function (pluginState, action) {
         isOpeningMediaCommentFromToolbar: false
       }, fg('platform_editor_annotation_selected_annotation') && {
         selectedAnnotations: []
-      }), fg('platform_editor_comments_api_manager_select') && {
+      }), pluginState.isAnnotationManagerEnabled && {
         selectedAnnotations: []
       });
     case ACTIONS.ADD_INLINE_COMMENT:
@@ -41,7 +41,7 @@ export default (function (pluginState, action) {
         annotations: _objectSpread(_objectSpread({}, pluginState.annotations), action.data.inlineComments),
         isInlineCommentViewClosed: false,
         selectAnnotationMethod: undefined
-      }, fg('platform_editor_comments_api_manager_select') && {
+      }, pluginState.isAnnotationManagerEnabled && {
         skipSelectionHandling: true
       });
     case ACTIONS.INLINE_COMMENT_SET_VISIBLE:

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

@@ -126,7 +126,7 @@ export var buildToolbar = function buildToolbar(editorAnalyticsAPI) {
             pageMode: 'edit'
           }
         });
-        if (annotationManager && fg('platform_editor_comments_api_manager')) {
+        if (annotationManager) {
           annotationManager.checkPreemptiveGate().then(function (canStartDraft) {
             if (canStartDraft) {
               createCommentExperience === null || createCommentExperience === void 0 || createCommentExperience.start({

package/dist/types/pm-plugins/types.d.ts

@@ -162,4 +162,8 @@ export type InlineCommentPluginState = {
      * if the pendingSelectedAnnotations has been updated since the last time it was flushed to selectedAnnotations.
      */
     pendingSelectedAnnotationsUpdateCount: number;
+    /**
+     * A simple toggle to indicate if the annotation manager is enabled.
+     */
+    isAnnotationManagerEnabled: boolean;
 };

package/dist/types-ts4.5/pm-plugins/types.d.ts

@@ -162,4 +162,8 @@ export type InlineCommentPluginState = {
      * if the pendingSelectedAnnotations has been updated since the last time it was flushed to selectedAnnotations.
      */
     pendingSelectedAnnotationsUpdateCount: number;
+    /**
+     * A simple toggle to indicate if the annotation manager is enabled.
+     */
+    isAnnotationManagerEnabled: boolean;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "2.9.2",
+	"version": "2.9.3",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/analytics-next": "^11.0.0",
-		"@atlaskit/editor-common": "^106.0.0",
+		"@atlaskit/editor-common": "^106.1.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode-effects": "^2.0.0",
@@ -42,7 +42,7 @@
 		"@atlaskit/icon": "^26.4.0",
 		"@atlaskit/onboarding": "^14.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^5.5.0",
+		"@atlaskit/tmp-editor-statsig": "^5.7.0",
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
@@ -97,9 +97,6 @@
 		"platform_editor_comments_api_manager": {
 			"type": "boolean"
 		},
-		"platform_editor_comments_api_manager_select": {
-			"type": "boolean"
-		},
 		"editor_inline_comments_on_inline_nodes": {
 			"type": "boolean"
 		},