@atlaskit/editor-plugin-annotation 1.0.2 → 1.1.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.1.0
+
+### Minor Changes
+
+- [#78363](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/78363) [`3a8e207fbf7c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3a8e207fbf7c) - EDF-27 Cleaned up platform.editor.annotation.decouple-inline-comment-closed_flmox FF. This decouples selected annotation logic from logic to close the inline comment view by default. This fixed a bug where the inline comment view can be unexpectedly opened from doc changes (through remote editors or non-selection altering changes such as expanding / collapsing expand blocks)
+
 ## 1.0.2
 
 ### Patch Changes

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

@@ -12,7 +12,6 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("../commands");
 var _nodeviews = require("../nodeviews");
 var _utils = require("../utils");
@@ -224,9 +223,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
           node.marks.filter(function (mark) {
             return mark.type === state.schema.marks.annotation;
           }).forEach(function (mark) {
-            var isSelected = (0, _platformFeatureFlags.getBooleanFF)('platform.editor.annotation.decouple-inline-comment-closed_flmox') ? !isInlineCommentViewClosed && !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(function (selectedAnnotation) {
-              return selectedAnnotation.id === mark.attrs.id;
-            })) : !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(function (selectedAnnotation) {
+            var isSelected = !isInlineCommentViewClosed && !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(function (selectedAnnotation) {
               return selectedAnnotation.id === mark.attrs.id;
             }));
             var isUnresolved = !!annotations && annotations[mark.attrs.id] === false;

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

@@ -7,52 +7,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.createPluginState = exports.createCommand = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _utils = require("@atlaskit/editor-common/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _utils2 = require("../utils");
 var _reducer = _interopRequireDefault(require("./reducer"));
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var handleDocChanged = function handleDocChanged(tr, prevPluginState) {
   if (!tr.getMeta('replaceDocument')) {
-    return (0, _platformFeatureFlags.getBooleanFF)('platform.editor.annotation.decouple-inline-comment-closed_flmox') ? getSelectionChangedHandler(false)(tr, prevPluginState) : handleSelectionChanged(tr, prevPluginState);
+    return getSelectionChangedHandler(false)(tr, prevPluginState);
   }
   return _objectSpread(_objectSpread({}, prevPluginState), {}, {
     dirtyAnnotations: true
   });
 };
-var handleSelectionChanged = function handleSelectionChanged(tr, pluginState) {
-  if (pluginState.skipSelectionHandling) {
-    return _objectSpread(_objectSpread({}, pluginState), {}, {
-      skipSelectionHandling: false
-    });
-  }
-  var selectedAnnotations = (0, _utils2.findAnnotationsInSelection)(tr.selection, tr.doc);
-  var changed = selectedAnnotations.length !== pluginState.selectedAnnotations.length || selectedAnnotations.some(function (annotationInfo) {
-    return !pluginState.selectedAnnotations.some(function (aInfo) {
-      return aInfo.type === annotationInfo.id;
-    });
-  });
-  if (changed) {
-    return _objectSpread(_objectSpread({}, pluginState), {}, {
-      selectedAnnotations: selectedAnnotations
-    });
-  }
-  return pluginState;
-};
 var getSelectionChangedHandler = function getSelectionChangedHandler(reopenCommentView) {
   return function (tr, pluginState) {
-    /**
-     * If feature flag is **OFF** we want to keep the old behavior. Note that
-     * reopenCommentView is not relevant here when using old behaviour.
-     *
-     * Feature flag is evaluated here rather than directly in onSelectionChanged where it is assigned
-     * to prevent the plugin from setting up the handler before the feature flag is evaluated.
-     *
-     * This comment / logic can be cleaned up once the feature flag is removed.
-     */
-    if (!(0, _platformFeatureFlags.getBooleanFF)('platform.editor.annotation.decouple-inline-comment-closed_flmox')) {
-      return handleSelectionChanged(tr, pluginState);
-    }
     if (pluginState.skipSelectionHandling) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         skipSelectionHandling: false

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

@@ -8,7 +8,6 @@ exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _utils = require("../utils");
 var _types = require("./types");
 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; }
@@ -32,17 +31,14 @@ var _default = exports.default = function _default(pluginState, action) {
         annotations: {}
       });
     case _types.ACTIONS.CLOSE_COMPONENT:
-      return (0, _platformFeatureFlags.getBooleanFF)('platform.editor.annotation.decouple-inline-comment-closed_flmox') ? _objectSpread(_objectSpread({}, pluginState), {}, {
+      return _objectSpread(_objectSpread({}, pluginState), {}, {
         isInlineCommentViewClosed: true
-      }) : _objectSpread(_objectSpread({}, pluginState), {}, {
-        selectedAnnotations: []
       });
     case _types.ACTIONS.ADD_INLINE_COMMENT:
       var updatedPluginState = getNewDraftState(pluginState, action.data.drafting, action.data.editorState);
       return _objectSpread(_objectSpread({}, updatedPluginState), {}, {
         selectedAnnotations: [].concat((0, _toConsumableArray2.default)(updatedPluginState.selectedAnnotations), (0, _toConsumableArray2.default)(action.data.selectedAnnotations)),
-        annotations: _objectSpread(_objectSpread({}, pluginState.annotations), action.data.inlineComments)
-      }, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.annotation.decouple-inline-comment-closed_flmox') && {
+        annotations: _objectSpread(_objectSpread({}, pluginState.annotations), action.data.inlineComments),
         isInlineCommentViewClosed: false
       });
     case _types.ACTIONS.INLINE_COMMENT_SET_VISIBLE:
@@ -56,9 +52,7 @@ var _default = exports.default = function _default(pluginState, action) {
     case _types.ACTIONS.SET_SELECTED_ANNOTATION:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         selectedAnnotations: (0, _toConsumableArray2.default)(action.data.selectedAnnotations),
-        skipSelectionHandling: true
-      }, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.annotation.decouple-inline-comment-closed_flmox') && {
-        // if selecting annotation explicitly, reopen the comment view
+        skipSelectionHandling: true,
         isInlineCommentViewClosed: false
       });
     default:

package/dist/cjs/ui/InlineCommentView.js

@@ -9,7 +9,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _commands = require("../commands");
 var _types = require("../types");
 var _utils2 = require("../utils");
@@ -125,7 +124,7 @@ function InlineCommentView(_ref) {
     };
     dispatchAnalyticsEvent(payload);
   };
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.annotation.decouple-inline-comment-closed_flmox') && isInlineCommentViewClosed || !selectedAnnotations) {
+  if (isInlineCommentViewClosed || !selectedAnnotations) {
     return null;
   }
   return /*#__PURE__*/_react.default.createElement(_AnnotationViewWrapper.AnnotationViewWrapper, {

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

@@ -2,7 +2,6 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { clearDirtyMark, closeComponent, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../commands';
 import { AnnotationNodeView, getAnnotationViewClassname } from '../nodeviews';
 import { getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
@@ -163,7 +162,7 @@ export const inlineCommentPlugin = options => {
         const focusDecorations = [];
         state.doc.descendants((node, pos) => {
           node.marks.filter(mark => mark.type === state.schema.marks.annotation).forEach(mark => {
-            const isSelected = getBooleanFF('platform.editor.annotation.decouple-inline-comment-closed_flmox') ? !isInlineCommentViewClosed && !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(selectedAnnotation => selectedAnnotation.id === mark.attrs.id)) : !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(selectedAnnotation => selectedAnnotation.id === mark.attrs.id));
+            const isSelected = !isInlineCommentViewClosed && !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(selectedAnnotation => selectedAnnotation.id === mark.attrs.id));
             const isUnresolved = !!annotations && annotations[mark.attrs.id] === false;
             if (isVisible) {
               focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {

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

@@ -1,48 +1,16 @@
 import { pluginFactory } from '@atlaskit/editor-common/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { findAnnotationsInSelection, inlineCommentPluginKey, isSelectedAnnotationsChanged } from '../utils';
 import reducer from './reducer';
 const handleDocChanged = (tr, prevPluginState) => {
   if (!tr.getMeta('replaceDocument')) {
-    return getBooleanFF('platform.editor.annotation.decouple-inline-comment-closed_flmox') ? getSelectionChangedHandler(false)(tr, prevPluginState) : handleSelectionChanged(tr, prevPluginState);
+    return getSelectionChangedHandler(false)(tr, prevPluginState);
   }
   return {
     ...prevPluginState,
     dirtyAnnotations: true
   };
 };
-const handleSelectionChanged = (tr, pluginState) => {
-  if (pluginState.skipSelectionHandling) {
-    return {
-      ...pluginState,
-      skipSelectionHandling: false
-    };
-  }
-  const selectedAnnotations = findAnnotationsInSelection(tr.selection, tr.doc);
-  const changed = selectedAnnotations.length !== pluginState.selectedAnnotations.length || selectedAnnotations.some(annotationInfo => {
-    return !pluginState.selectedAnnotations.some(aInfo => aInfo.type === annotationInfo.id);
-  });
-  if (changed) {
-    return {
-      ...pluginState,
-      selectedAnnotations
-    };
-  }
-  return pluginState;
-};
 const getSelectionChangedHandler = reopenCommentView => (tr, pluginState) => {
-  /**
-   * If feature flag is **OFF** we want to keep the old behavior. Note that
-   * reopenCommentView is not relevant here when using old behaviour.
-   *
-   * Feature flag is evaluated here rather than directly in onSelectionChanged where it is assigned
-   * to prevent the plugin from setting up the handler before the feature flag is evaluated.
-   *
-   * This comment / logic can be cleaned up once the feature flag is removed.
-   */
-  if (!getBooleanFF('platform.editor.annotation.decouple-inline-comment-closed_flmox')) {
-    return handleSelectionChanged(tr, pluginState);
-  }
   if (pluginState.skipSelectionHandling) {
     return {
       ...pluginState,

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

@@ -1,5 +1,4 @@
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { addDraftDecoration } from '../utils';
 import { ACTIONS } from './types';
 export default ((pluginState, action) => {
@@ -27,12 +26,9 @@ export default ((pluginState, action) => {
         annotations: {}
       };
     case ACTIONS.CLOSE_COMPONENT:
-      return getBooleanFF('platform.editor.annotation.decouple-inline-comment-closed_flmox') ? {
+      return {
         ...pluginState,
         isInlineCommentViewClosed: true
-      } : {
-        ...pluginState,
-        selectedAnnotations: []
       };
     case ACTIONS.ADD_INLINE_COMMENT:
       const updatedPluginState = getNewDraftState(pluginState, action.data.drafting, action.data.editorState);
@@ -43,9 +39,7 @@ export default ((pluginState, action) => {
           ...pluginState.annotations,
           ...action.data.inlineComments
         },
-        ...(getBooleanFF('platform.editor.annotation.decouple-inline-comment-closed_flmox') && {
-          isInlineCommentViewClosed: false
-        })
+        isInlineCommentViewClosed: false
       };
     case ACTIONS.INLINE_COMMENT_SET_VISIBLE:
       const {
@@ -63,10 +57,7 @@ export default ((pluginState, action) => {
         ...pluginState,
         selectedAnnotations: [...action.data.selectedAnnotations],
         skipSelectionHandling: true,
-        ...(getBooleanFF('platform.editor.annotation.decouple-inline-comment-closed_flmox') && {
-          // if selecting annotation explicitly, reopen the comment view
-          isInlineCommentViewClosed: false
-        })
+        isInlineCommentViewClosed: false
       };
     default:
       return pluginState;

package/dist/es2019/ui/InlineCommentView.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { closeComponent, createAnnotation, removeInlineCommentNearSelection, setInlineCommentDraftState, updateInlineCommentResolvedState } from '../commands';
 import { AnnotationTestIds } from '../types';
 import { getAllAnnotations, getAnnotationViewKey, getPluginState, getSelectionPositions } from '../utils';
@@ -123,7 +122,7 @@ export function InlineCommentView({
     };
     dispatchAnalyticsEvent(payload);
   };
-  if (getBooleanFF('platform.editor.annotation.decouple-inline-comment-closed_flmox') && isInlineCommentViewClosed || !selectedAnnotations) {
+  if (isInlineCommentViewClosed || !selectedAnnotations) {
     return null;
   }
   return /*#__PURE__*/React.createElement(AnnotationViewWrapper, {

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

@@ -5,7 +5,6 @@ import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { clearDirtyMark, closeComponent, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../commands';
 import { AnnotationNodeView, getAnnotationViewClassname } from '../nodeviews';
 import { getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
@@ -217,9 +216,7 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
           node.marks.filter(function (mark) {
             return mark.type === state.schema.marks.annotation;
           }).forEach(function (mark) {
-            var isSelected = getBooleanFF('platform.editor.annotation.decouple-inline-comment-closed_flmox') ? !isInlineCommentViewClosed && !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(function (selectedAnnotation) {
-              return selectedAnnotation.id === mark.attrs.id;
-            })) : !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(function (selectedAnnotation) {
+            var isSelected = !isInlineCommentViewClosed && !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(function (selectedAnnotation) {
               return selectedAnnotation.id === mark.attrs.id;
             }));
             var isUnresolved = !!annotations && annotations[mark.attrs.id] === false;

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

@@ -2,50 +2,18 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { pluginFactory } from '@atlaskit/editor-common/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { findAnnotationsInSelection, inlineCommentPluginKey, isSelectedAnnotationsChanged } from '../utils';
 import reducer from './reducer';
 var handleDocChanged = function handleDocChanged(tr, prevPluginState) {
   if (!tr.getMeta('replaceDocument')) {
-    return getBooleanFF('platform.editor.annotation.decouple-inline-comment-closed_flmox') ? getSelectionChangedHandler(false)(tr, prevPluginState) : handleSelectionChanged(tr, prevPluginState);
+    return getSelectionChangedHandler(false)(tr, prevPluginState);
   }
   return _objectSpread(_objectSpread({}, prevPluginState), {}, {
     dirtyAnnotations: true
   });
 };
-var handleSelectionChanged = function handleSelectionChanged(tr, pluginState) {
-  if (pluginState.skipSelectionHandling) {
-    return _objectSpread(_objectSpread({}, pluginState), {}, {
-      skipSelectionHandling: false
-    });
-  }
-  var selectedAnnotations = findAnnotationsInSelection(tr.selection, tr.doc);
-  var changed = selectedAnnotations.length !== pluginState.selectedAnnotations.length || selectedAnnotations.some(function (annotationInfo) {
-    return !pluginState.selectedAnnotations.some(function (aInfo) {
-      return aInfo.type === annotationInfo.id;
-    });
-  });
-  if (changed) {
-    return _objectSpread(_objectSpread({}, pluginState), {}, {
-      selectedAnnotations: selectedAnnotations
-    });
-  }
-  return pluginState;
-};
 var getSelectionChangedHandler = function getSelectionChangedHandler(reopenCommentView) {
   return function (tr, pluginState) {
-    /**
-     * If feature flag is **OFF** we want to keep the old behavior. Note that
-     * reopenCommentView is not relevant here when using old behaviour.
-     *
-     * Feature flag is evaluated here rather than directly in onSelectionChanged where it is assigned
-     * to prevent the plugin from setting up the handler before the feature flag is evaluated.
-     *
-     * This comment / logic can be cleaned up once the feature flag is removed.
-     */
-    if (!getBooleanFF('platform.editor.annotation.decouple-inline-comment-closed_flmox')) {
-      return handleSelectionChanged(tr, pluginState);
-    }
     if (pluginState.skipSelectionHandling) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         skipSelectionHandling: false

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

@@ -3,7 +3,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { addDraftDecoration } from '../utils';
 import { ACTIONS } from './types';
 export default (function (pluginState, action) {
@@ -25,17 +24,14 @@ export default (function (pluginState, action) {
         annotations: {}
       });
     case ACTIONS.CLOSE_COMPONENT:
-      return getBooleanFF('platform.editor.annotation.decouple-inline-comment-closed_flmox') ? _objectSpread(_objectSpread({}, pluginState), {}, {
+      return _objectSpread(_objectSpread({}, pluginState), {}, {
         isInlineCommentViewClosed: true
-      }) : _objectSpread(_objectSpread({}, pluginState), {}, {
-        selectedAnnotations: []
       });
     case ACTIONS.ADD_INLINE_COMMENT:
       var updatedPluginState = getNewDraftState(pluginState, action.data.drafting, action.data.editorState);
       return _objectSpread(_objectSpread({}, updatedPluginState), {}, {
         selectedAnnotations: [].concat(_toConsumableArray(updatedPluginState.selectedAnnotations), _toConsumableArray(action.data.selectedAnnotations)),
-        annotations: _objectSpread(_objectSpread({}, pluginState.annotations), action.data.inlineComments)
-      }, getBooleanFF('platform.editor.annotation.decouple-inline-comment-closed_flmox') && {
+        annotations: _objectSpread(_objectSpread({}, pluginState.annotations), action.data.inlineComments),
         isInlineCommentViewClosed: false
       });
     case ACTIONS.INLINE_COMMENT_SET_VISIBLE:
@@ -49,9 +45,7 @@ export default (function (pluginState, action) {
     case ACTIONS.SET_SELECTED_ANNOTATION:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         selectedAnnotations: _toConsumableArray(action.data.selectedAnnotations),
-        skipSelectionHandling: true
-      }, getBooleanFF('platform.editor.annotation.decouple-inline-comment-closed_flmox') && {
-        // if selecting annotation explicitly, reopen the comment view
+        skipSelectionHandling: true,
         isInlineCommentViewClosed: false
       });
     default:

package/dist/esm/ui/InlineCommentView.js

@@ -2,7 +2,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { closeComponent, createAnnotation, removeInlineCommentNearSelection, setInlineCommentDraftState, updateInlineCommentResolvedState } from '../commands';
 import { AnnotationTestIds } from '../types';
 import { getAllAnnotations, getAnnotationViewKey, getPluginState, getSelectionPositions } from '../utils';
@@ -118,7 +117,7 @@ export function InlineCommentView(_ref) {
     };
     dispatchAnalyticsEvent(payload);
   };
-  if (getBooleanFF('platform.editor.annotation.decouple-inline-comment-closed_flmox') && isInlineCommentViewClosed || !selectedAnnotations) {
+  if (isInlineCommentViewClosed || !selectedAnnotations) {
     return null;
   }
   return /*#__PURE__*/React.createElement(AnnotationViewWrapper, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-annotation",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Annotation plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -93,9 +93,6 @@
   },
   "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0",
   "platform-feature-flags": {
-    "platform.editor.annotation.decouple-inline-comment-closed_flmox": {
-      "type": "boolean"
-    },
     "platform.editor.enable-selection-toolbar_ucdwd": {
       "type": "boolean"
     }