@atlaskit/editor-plugin-annotation 1.0.2 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.2.0
+
+### Minor Changes
+
+- [#78508](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/78508) [`1d2b9d7a0542`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1d2b9d7a0542) - Expose setInlineCommentDraftState as one of the annotation plugin actions, extend the action with the ability to apply comment highlight to node, and add optional plugin dependency, FeatureFlagsPlugin
+
+## 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/commands/index.js

@@ -61,17 +61,18 @@ var removeInlineCommentNearSelection = exports.removeInlineCommentNearSelection
     return true;
   };
 };
-var getDraftCommandAction = function getDraftCommandAction(drafting) {
+var getDraftCommandAction = function getDraftCommandAction(drafting, targetType, isCommentOnMediaOn) {
   return function (editorState) {
     // validate selection only when entering draft mode
-    if (drafting && (0, _utils.isSelectionValid)(editorState) !== _types2.AnnotationSelectionType.VALID) {
+    if (drafting && (0, _utils.isSelectionValid)(editorState, isCommentOnMediaOn) !== _types2.AnnotationSelectionType.VALID) {
       return false;
     }
     return {
       type: _types.ACTIONS.SET_INLINE_COMMENT_DRAFT_STATE,
       data: {
         drafting: drafting,
-        editorState: editorState
+        editorState: editorState,
+        targetType: targetType
       }
     };
   };
@@ -79,7 +80,9 @@ var getDraftCommandAction = function getDraftCommandAction(drafting) {
 var setInlineCommentDraftState = exports.setInlineCommentDraftState = function setInlineCommentDraftState(editorAnalyticsAPI) {
   return function (drafting) {
     var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
-    var commandAction = getDraftCommandAction(drafting);
+    var targetType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'inline';
+    var isCommentOnMediaOn = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+    var commandAction = getDraftCommandAction(drafting, targetType, isCommentOnMediaOn);
     return (0, _pluginFactory.createCommand)(commandAction, _transform.default.addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, inputMethod));
   };
 };

package/dist/cjs/plugin.js

@@ -16,14 +16,17 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _annotation = require("@atlaskit/editor-common/annotation");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _commands = require("./commands");
 var _inlineComment = require("./pm-plugins/inline-comment");
 var _keymap = require("./pm-plugins/keymap");
 var _toolbar = require("./toolbar");
 var _InlineCommentView = require("./ui/InlineCommentView");
 var _utils = require("./utils");
 var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref) {
+  var _api$featureFlags, _api$analytics;
   var annotationProviders = _ref.config,
     api = _ref.api;
+  var featureFlags = api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState();
   return {
     name: 'annotation',
     marks: function marks() {
@@ -33,7 +36,8 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
       }];
     },
     actions: {
-      stripNonExistingAnnotations: _utils.stripNonExistingAnnotations
+      stripNonExistingAnnotations: _utils.stripNonExistingAnnotations,
+      setInlineCommentDraftState: (0, _commands.setInlineCommentDraftState)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
     },
     getSharedState: function getSharedState(editorState) {
       if (!editorState) {
@@ -49,13 +53,13 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
             portalProviderAPI = _ref2.portalProviderAPI,
             eventDispatcher = _ref2.eventDispatcher;
           if (annotationProviders) {
-            var _api$analytics;
+            var _api$analytics2;
             return (0, _inlineComment.inlineCommentPlugin)({
               dispatch: dispatch,
               portalProviderAPI: portalProviderAPI,
               eventDispatcher: eventDispatcher,
               provider: annotationProviders.inlineComment,
-              editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
+              editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions
             });
           }
           return;
@@ -64,8 +68,8 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
         name: 'annotationKeymap',
         plugin: function plugin() {
           if (annotationProviders) {
-            var _api$analytics2;
-            return (0, _keymap.keymapPlugin)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
+            var _api$analytics3;
+            return (0, _keymap.keymapPlugin)(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
           }
           return;
         }
@@ -78,9 +82,9 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
         }
         var pluginState = (0, _utils.getPluginState)(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
-          var _api$analytics3;
+          var _api$analytics4;
           var isToolbarAbove = annotationProviders.inlineComment.isToolbarAbove;
-          return (0, _toolbar.buildToolbar)(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)(state, intl, isToolbarAbove);
+          return (0, _toolbar.buildToolbar)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(state, intl, isToolbarAbove, featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMedia);
         }
       },
       selectionToolbar: function selectionToolbar(state, intl) {
@@ -89,9 +93,9 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
         }
         var pluginState = (0, _utils.getPluginState)(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
-          var _api$analytics4;
+          var _api$analytics5;
           var isToolbarAbove = annotationProviders.inlineComment.isToolbarAbove;
-          return (0, _toolbar.buildToolbar)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(state, intl, isToolbarAbove);
+          return (0, _toolbar.buildToolbar)(api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions)(state, intl, isToolbarAbove, featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMedia);
         }
       }
     },
@@ -111,7 +115,7 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
   };
 };
 function AnnotationContentComponent(_ref4) {
-  var _api$analytics5;
+  var _api$analytics6;
   var api = _ref4.api,
     editorView = _ref4.editorView,
     annotationProviders = _ref4.annotationProviders,
@@ -127,7 +131,7 @@ function AnnotationContentComponent(_ref4) {
     providers: annotationProviders,
     editorView: editorView,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-    editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions,
+    editorAnalyticsAPI: api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions,
     editorAPI: api
   }));
 }

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; }
@@ -25,24 +24,21 @@ var _default = exports.default = function _default(pluginState, action) {
         mouseData: mouseData
       });
     case _types.ACTIONS.SET_INLINE_COMMENT_DRAFT_STATE:
-      return getNewDraftState(pluginState, action.data.drafting, action.data.editorState);
+      return getNewDraftState(pluginState, action.data.drafting, action.data.editorState, action.data.targetType);
     case _types.ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         dirtyAnnotations: false,
         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,16 +52,14 @@ 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:
       return pluginState;
   }
 };
-function getNewDraftState(pluginState, drafting, editorState) {
+function getNewDraftState(pluginState, drafting, editorState, targetType) {
   var draftDecorationSet = pluginState.draftDecorationSet;
   if (!draftDecorationSet || !drafting) {
     draftDecorationSet = _view.DecorationSet.empty;
@@ -77,7 +71,7 @@ function getNewDraftState(pluginState, drafting, editorState) {
   if (drafting && editorState) {
     newState.bookmark = editorState.selection.getBookmark();
     var resolvedBookmark = newState.bookmark.resolve(editorState.doc);
-    var draftDecoration = (0, _utils.addDraftDecoration)(resolvedBookmark.from, resolvedBookmark.to);
+    var draftDecoration = (0, _utils.addDraftDecoration)(resolvedBookmark.from, resolvedBookmark.to, targetType);
     newState.draftDecorationSet = draftDecorationSet.add(editorState.doc, [draftDecoration]);
   }
   return newState;

package/dist/cjs/toolbar.js

@@ -8,6 +8,7 @@ exports.buildToolbar = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
+var _mediaSingle = require("@atlaskit/editor-common/media-single");
 var _messages = require("@atlaskit/editor-common/messages");
 var _utils = require("@atlaskit/editor-common/utils");
 var _comment = _interopRequireDefault(require("@atlaskit/icon/glyph/comment"));
@@ -17,9 +18,13 @@ var _utils2 = require("./utils");
 var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsAPI) {
   return function (state, intl) {
     var isToolbarAbove = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    var isCommentOnMediaOn = arguments.length > 3 ? arguments[3] : undefined;
     var schema = state.schema;
-    var selectionValid = (0, _utils2.isSelectionValid)(state);
-    if (selectionValid === _types.AnnotationSelectionType.INVALID) {
+    var selectionValid = (0, _utils2.isSelectionValid)(state, isCommentOnMediaOn);
+    var isMediaSelected = isCommentOnMediaOn && (0, _mediaSingle.currentMediaNodeWithPos)(state);
+
+    // comments on media can only be added via media floating toolbar
+    if (isMediaSelected || selectionValid === _types.AnnotationSelectionType.INVALID) {
       return undefined;
     }
     var createCommentMessage = intl.formatMessage(_messages.annotationMessages.createComment);

package/dist/cjs/types.js

@@ -4,6 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AnnotationTestIds = exports.AnnotationSelectionType = void 0;
+/**
+ * type of target that annotation apply to.
+ * This is used to apply correct decoration to a draft comment
+ */
+/**
+ * The source of draft comment being created
+ */
 var AnnotationSelectionType = exports.AnnotationSelectionType = /*#__PURE__*/function (AnnotationSelectionType) {
   AnnotationSelectionType["INVALID"] = "invalid";
   AnnotationSelectionType["DISABLED"] = "disabled";

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/cjs/utils.js

@@ -28,6 +28,7 @@ exports.stripNonExistingAnnotations = stripNonExistingAnnotations;
 exports.surroundingMarks = void 0;
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
+var _mediaSingle = require("@atlaskit/editor-common/media-single");
 var _styles = require("@atlaskit/editor-common/styles");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
@@ -130,6 +131,12 @@ var validateAnnotationMark = function validateAnnotationMark(annotationMark) {
  * (when creating new comment)
  */
 var addDraftDecoration = exports.addDraftDecoration = function addDraftDecoration(start, end) {
+  var targetType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'inline';
+  if (targetType === 'block') {
+    return _view.Decoration.node(start, end, {
+      class: "".concat(_styles.AnnotationSharedClassNames.draft)
+    });
+  }
   return _view.Decoration.inline(start, end, {
     class: "".concat(_styles.AnnotationSharedClassNames.draft)
   });
@@ -228,10 +235,16 @@ var getDraftCommandAnalyticsPayload = exports.getDraftCommandAnalyticsPayload =
   };
   return payload;
 };
-var isSelectionValid = exports.isSelectionValid = function isSelectionValid(state) {
+var isSelectionValid = exports.isSelectionValid = function isSelectionValid(state, isCommentOnMediaOn) {
+  var _currentMediaNodeWith;
   var selection = state.selection;
   var _ref3 = getPluginState(state) || {},
     disallowOnWhitespace = _ref3.disallowOnWhitespace;
+
+  // Allow media so that it can enter draft mode
+  if (isCommentOnMediaOn && (_currentMediaNodeWith = (0, _mediaSingle.currentMediaNodeWithPos)(state)) !== null && _currentMediaNodeWith !== void 0 && _currentMediaNodeWith.node) {
+    return _types.AnnotationSelectionType.VALID;
+  }
   if (selection.empty || !(selection instanceof _state.TextSelection || selection instanceof _state.AllSelection)) {
     return _types.AnnotationSelectionType.INVALID;
   }

package/dist/es2019/commands/index.js

@@ -47,23 +47,24 @@ export const removeInlineCommentNearSelection = id => (state, dispatch) => {
   }
   return true;
 };
-const getDraftCommandAction = drafting => {
+const getDraftCommandAction = (drafting, targetType, isCommentOnMediaOn) => {
   return editorState => {
     // validate selection only when entering draft mode
-    if (drafting && isSelectionValid(editorState) !== AnnotationSelectionType.VALID) {
+    if (drafting && isSelectionValid(editorState, isCommentOnMediaOn) !== AnnotationSelectionType.VALID) {
       return false;
     }
     return {
       type: ACTIONS.SET_INLINE_COMMENT_DRAFT_STATE,
       data: {
         drafting,
-        editorState
+        editorState,
+        targetType
       }
     };
   };
 };
-export const setInlineCommentDraftState = editorAnalyticsAPI => (drafting, inputMethod = INPUT_METHOD.TOOLBAR) => {
-  const commandAction = getDraftCommandAction(drafting);
+export const setInlineCommentDraftState = editorAnalyticsAPI => (drafting, inputMethod = INPUT_METHOD.TOOLBAR, targetType = 'inline', isCommentOnMediaOn = false) => {
+  const commandAction = getDraftCommandAction(drafting, targetType, isCommentOnMediaOn);
   return createCommand(commandAction, transform.addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, inputMethod));
 };
 export const addInlineComment = (editorAnalyticsAPI, editorAPI) => id => {

package/dist/es2019/plugin.js

@@ -3,6 +3,7 @@ import { annotation } from '@atlaskit/adf-schema';
 import { AnnotationUpdateEmitter } from '@atlaskit/editor-common/annotation';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { setInlineCommentDraftState } from './commands';
 import { inlineCommentPlugin } from './pm-plugins/inline-comment';
 import { keymapPlugin } from './pm-plugins/keymap';
 import { buildToolbar } from './toolbar';
@@ -12,6 +13,8 @@ export const annotationPlugin = ({
   config: annotationProviders,
   api
 }) => {
+  var _api$featureFlags, _api$analytics;
+  const featureFlags = api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState();
   return {
     name: 'annotation',
     marks() {
@@ -21,7 +24,8 @@ export const annotationPlugin = ({
       }];
     },
     actions: {
-      stripNonExistingAnnotations
+      stripNonExistingAnnotations,
+      setInlineCommentDraftState: setInlineCommentDraftState(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
     },
     getSharedState(editorState) {
       if (!editorState) {
@@ -37,13 +41,13 @@ export const annotationPlugin = ({
         eventDispatcher
       }) => {
         if (annotationProviders) {
-          var _api$analytics;
+          var _api$analytics2;
           return inlineCommentPlugin({
             dispatch,
             portalProviderAPI,
             eventDispatcher,
             provider: annotationProviders.inlineComment,
-            editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions
+            editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions
           });
         }
         return;
@@ -52,8 +56,8 @@ export const annotationPlugin = ({
       name: 'annotationKeymap',
       plugin: () => {
         if (annotationProviders) {
-          var _api$analytics2;
-          return keymapPlugin(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions);
+          var _api$analytics3;
+          return keymapPlugin(api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
         }
         return;
       }
@@ -65,11 +69,11 @@ export const annotationPlugin = ({
         }
         const pluginState = getPluginState(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
-          var _api$analytics3;
+          var _api$analytics4;
           const {
             isToolbarAbove
           } = annotationProviders.inlineComment;
-          return buildToolbar(api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions)(state, intl, isToolbarAbove);
+          return buildToolbar(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(state, intl, isToolbarAbove, featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMedia);
         }
       },
       selectionToolbar(state, intl) {
@@ -78,11 +82,11 @@ export const annotationPlugin = ({
         }
         const pluginState = getPluginState(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
-          var _api$analytics4;
+          var _api$analytics5;
           const {
             isToolbarAbove
           } = annotationProviders.inlineComment;
-          return buildToolbar(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(state, intl, isToolbarAbove);
+          return buildToolbar(api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions)(state, intl, isToolbarAbove, featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.commentsOnMedia);
         }
       }
     },
@@ -108,7 +112,7 @@ function AnnotationContentComponent({
   annotationProviders,
   dispatchAnalyticsEvent
 }) {
-  var _api$analytics5;
+  var _api$analytics6;
   const {
     annotationState: inlineCommentState
   } = useSharedPluginState(api, ['annotation']);
@@ -121,7 +125,7 @@ function AnnotationContentComponent({
     providers: annotationProviders,
     editorView: editorView,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-    editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions,
+    editorAnalyticsAPI: api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions,
     editorAPI: api
   }));
 }

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,