@atlaskit/editor-plugin-annotation 1.1.0 → 1.2.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.2.1
+
+### Patch Changes
+
+- [#78577](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/78577) [`207fbd3685dc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/207fbd3685dc) - ED-22111 add supported nodes option to annotation plugin
+
+## 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

package/dist/cjs/commands/index.js

@@ -39,6 +39,7 @@ var clearDirtyMark = exports.clearDirtyMark = function clearDirtyMark() {
   });
 };
 var removeInlineCommentNearSelection = exports.removeInlineCommentNearSelection = function removeInlineCommentNearSelection(id) {
+  var _supportedNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   return function (state, dispatch) {
     var tr = state.tr,
       $from = state.selection.$from;
@@ -61,17 +62,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 +81,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/reducer.js

@@ -24,7 +24,7 @@ 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,
@@ -59,7 +59,7 @@ var _default = exports.default = function _default(pluginState, action) {
       return pluginState;
   }
 };
-function getNewDraftState(pluginState, drafting, editorState) {
+function getNewDraftState(pluginState, drafting, editorState, targetType) {
   var draftDecorationSet = pluginState.draftDecorationSet;
   if (!draftDecorationSet || !drafting) {
     draftDecorationSet = _view.DecorationSet.empty;
@@ -71,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,14 @@ 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 _supportedNodes = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
     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

@@ -137,7 +137,7 @@ function InlineCommentView(_ref) {
     annotations: activeAnnotations,
     dom: dom,
     onDelete: function onDelete(id) {
-      return (0, _commands.removeInlineCommentNearSelection)(id)(state, dispatch);
+      return (0, _commands.removeInlineCommentNearSelection)(id, inlineCommentProvider.supportedBlockNodes)(state, dispatch);
     },
     onResolve: function onResolve(id) {
       return (0, _commands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, id, true), _analytics.RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch);

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,17 @@ var getDraftCommandAnalyticsPayload = exports.getDraftCommandAnalyticsPayload =
   };
   return payload;
 };
-var isSelectionValid = exports.isSelectionValid = function isSelectionValid(state) {
+var isSelectionValid = exports.isSelectionValid = function isSelectionValid(state, isCommentOnMediaOn) {
+  var _currentMediaNodeWith;
+  var _supportedNodes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   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

@@ -22,7 +22,7 @@ export const closeComponent = () => createCommand({
 export const clearDirtyMark = () => createCommand({
   type: ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK
 });
-export const removeInlineCommentNearSelection = id => (state, dispatch) => {
+export const removeInlineCommentNearSelection = (id, _supportedNodes = []) => (state, dispatch) => {
   const {
     tr,
     selection: {
@@ -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/reducer.js

@@ -18,7 +18,7 @@ export default ((pluginState, action) => {
         mouseData
       };
     case 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 ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK:
       return {
         ...pluginState,
@@ -63,7 +63,7 @@ export default ((pluginState, action) => {
       return pluginState;
   }
 });
-function getNewDraftState(pluginState, drafting, editorState) {
+function getNewDraftState(pluginState, drafting, editorState, targetType) {
   let {
     draftDecorationSet
   } = pluginState;
@@ -78,7 +78,7 @@ function getNewDraftState(pluginState, drafting, editorState) {
   if (drafting && editorState) {
     newState.bookmark = editorState.selection.getBookmark();
     const resolvedBookmark = newState.bookmark.resolve(editorState.doc);
-    const draftDecoration = addDraftDecoration(resolvedBookmark.from, resolvedBookmark.to);
+    const draftDecoration = addDraftDecoration(resolvedBookmark.from, resolvedBookmark.to, targetType);
     newState.draftDecorationSet = draftDecorationSet.add(editorState.doc, [draftDecoration]);
   }
   return newState;

package/dist/es2019/toolbar.js

@@ -1,18 +1,22 @@
 import React from 'react';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { addInlineComment, ToolTipContent } from '@atlaskit/editor-common/keymaps';
+import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 import { annotationMessages } from '@atlaskit/editor-common/messages';
 import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils';
 import CommentIcon from '@atlaskit/icon/glyph/comment';
 import { setInlineCommentDraftState } from './commands';
 import { AnnotationSelectionType, AnnotationTestIds } from './types';
 import { isSelectionValid } from './utils';
-export const buildToolbar = editorAnalyticsAPI => (state, intl, isToolbarAbove = false) => {
+export const buildToolbar = editorAnalyticsAPI => (state, intl, isToolbarAbove = false, isCommentOnMediaOn, _supportedNodes = []) => {
   const {
     schema
   } = state;
-  const selectionValid = isSelectionValid(state);
-  if (selectionValid === AnnotationSelectionType.INVALID) {
+  const selectionValid = isSelectionValid(state, isCommentOnMediaOn);
+  const isMediaSelected = isCommentOnMediaOn && currentMediaNodeWithPos(state);
+
+  // comments on media can only be added via media floating toolbar
+  if (isMediaSelected || selectionValid === AnnotationSelectionType.INVALID) {
     return undefined;
   }
   const createCommentMessage = intl.formatMessage(annotationMessages.createComment);

package/dist/es2019/types.js

@@ -1,3 +1,12 @@
+/**
+ * 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
+ */
+
 export let AnnotationSelectionType = /*#__PURE__*/function (AnnotationSelectionType) {
   AnnotationSelectionType["INVALID"] = "invalid";
   AnnotationSelectionType["DISABLED"] = "disabled";

package/dist/es2019/ui/InlineCommentView.js

@@ -134,7 +134,7 @@ export function InlineCommentView({
     annotationsList: annotationsList,
     annotations: activeAnnotations,
     dom: dom,
-    onDelete: id => removeInlineCommentNearSelection(id)(state, dispatch),
+    onDelete: id => removeInlineCommentNearSelection(id, inlineCommentProvider.supportedBlockNodes)(state, dispatch),
     onResolve: id => updateInlineCommentResolvedState(editorAnalyticsAPI)({
       [id]: true
     }, RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch),

package/dist/es2019/utils.js

@@ -1,5 +1,6 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 import { AnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
 import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, hasAnnotationMark, isParagraph, isText } from '@atlaskit/editor-common/utils';
 import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -91,7 +92,12 @@ const validateAnnotationMark = annotationMark => {
  * add decoration for the comment selection in draft state
  * (when creating new comment)
  */
-export const addDraftDecoration = (start, end) => {
+export const addDraftDecoration = (start, end, targetType = 'inline') => {
+  if (targetType === 'block') {
+    return Decoration.node(start, end, {
+      class: `${AnnotationSharedClassNames.draft}`
+    });
+  }
   return Decoration.inline(start, end, {
     class: `${AnnotationSharedClassNames.draft}`
   });
@@ -188,13 +194,19 @@ export const getDraftCommandAnalyticsPayload = (drafting, inputMethod) => {
   };
   return payload;
 };
-export const isSelectionValid = state => {
+export const isSelectionValid = (state, isCommentOnMediaOn, _supportedNodes = []) => {
+  var _currentMediaNodeWith;
   const {
     selection
   } = state;
   const {
     disallowOnWhitespace
   } = getPluginState(state) || {};
+
+  // Allow media so that it can enter draft mode
+  if (isCommentOnMediaOn && (_currentMediaNodeWith = currentMediaNodeWithPos(state)) !== null && _currentMediaNodeWith !== void 0 && _currentMediaNodeWith.node) {
+    return AnnotationSelectionType.VALID;
+  }
   if (selection.empty || !(selection instanceof TextSelection || selection instanceof AllSelection)) {
     return AnnotationSelectionType.INVALID;
   }

package/dist/esm/commands/index.js

@@ -32,6 +32,7 @@ export var clearDirtyMark = function clearDirtyMark() {
   });
 };
 export var removeInlineCommentNearSelection = function removeInlineCommentNearSelection(id) {
+  var _supportedNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   return function (state, dispatch) {
     var tr = state.tr,
       $from = state.selection.$from;
@@ -54,17 +55,18 @@ export var removeInlineCommentNearSelection = function removeInlineCommentNearSe
     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 && isSelectionValid(editorState) !== AnnotationSelectionType.VALID) {
+    if (drafting && isSelectionValid(editorState, isCommentOnMediaOn) !== AnnotationSelectionType.VALID) {
       return false;
     }
     return {
       type: ACTIONS.SET_INLINE_COMMENT_DRAFT_STATE,
       data: {
         drafting: drafting,
-        editorState: editorState
+        editorState: editorState,
+        targetType: targetType
       }
     };
   };
@@ -72,7 +74,9 @@ var getDraftCommandAction = function getDraftCommandAction(drafting) {
 export var setInlineCommentDraftState = function setInlineCommentDraftState(editorAnalyticsAPI) {
   return function (drafting) {
     var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 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 createCommand(commandAction, transform.addOpenCloseAnalytics(editorAnalyticsAPI)(drafting, inputMethod));
   };
 };

package/dist/esm/plugin.js

@@ -3,14 +3,17 @@ 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';
 import { InlineCommentView } from './ui/InlineCommentView';
 import { getPluginState, stripNonExistingAnnotations } from './utils';
 export var 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() {
@@ -20,7 +23,8 @@ export var annotationPlugin = function annotationPlugin(_ref) {
       }];
     },
     actions: {
-      stripNonExistingAnnotations: stripNonExistingAnnotations
+      stripNonExistingAnnotations: stripNonExistingAnnotations,
+      setInlineCommentDraftState: 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) {
@@ -36,13 +40,13 @@ export var annotationPlugin = function annotationPlugin(_ref) {
             portalProviderAPI = _ref2.portalProviderAPI,
             eventDispatcher = _ref2.eventDispatcher;
           if (annotationProviders) {
-            var _api$analytics;
+            var _api$analytics2;
             return 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;
@@ -51,8 +55,8 @@ export var annotationPlugin = function annotationPlugin(_ref) {
         name: 'annotationKeymap',
         plugin: function plugin() {
           if (annotationProviders) {
-            var _api$analytics2;
-            return keymapPlugin(api === null || api === 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 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions);
           }
           return;
         }
@@ -65,9 +69,9 @@ export var annotationPlugin = function annotationPlugin(_ref) {
         }
         var pluginState = getPluginState(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
-          var _api$analytics3;
+          var _api$analytics4;
           var isToolbarAbove = annotationProviders.inlineComment.isToolbarAbove;
-          return buildToolbar(api === null || api === 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 || (_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) {
@@ -76,9 +80,9 @@ export var annotationPlugin = function annotationPlugin(_ref) {
         }
         var pluginState = getPluginState(state);
         if (pluginState && pluginState.isVisible && !pluginState.bookmark && !pluginState.mouseData.isSelecting) {
-          var _api$analytics4;
+          var _api$analytics5;
           var isToolbarAbove = annotationProviders.inlineComment.isToolbarAbove;
-          return buildToolbar(api === null || api === 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 || (_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);
         }
       }
     },
@@ -98,7 +102,7 @@ export var annotationPlugin = function annotationPlugin(_ref) {
   };
 };
 function AnnotationContentComponent(_ref4) {
-  var _api$analytics5;
+  var _api$analytics6;
   var api = _ref4.api,
     editorView = _ref4.editorView,
     annotationProviders = _ref4.annotationProviders,
@@ -114,7 +118,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/esm/pm-plugins/reducer.js

@@ -17,7 +17,7 @@ export default (function (pluginState, action) {
         mouseData: mouseData
       });
     case 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 ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         dirtyAnnotations: false,
@@ -52,7 +52,7 @@ export default (function (pluginState, action) {
       return pluginState;
   }
 });
-function getNewDraftState(pluginState, drafting, editorState) {
+function getNewDraftState(pluginState, drafting, editorState, targetType) {
   var draftDecorationSet = pluginState.draftDecorationSet;
   if (!draftDecorationSet || !drafting) {
     draftDecorationSet = DecorationSet.empty;
@@ -64,7 +64,7 @@ function getNewDraftState(pluginState, drafting, editorState) {
   if (drafting && editorState) {
     newState.bookmark = editorState.selection.getBookmark();
     var resolvedBookmark = newState.bookmark.resolve(editorState.doc);
-    var draftDecoration = addDraftDecoration(resolvedBookmark.from, resolvedBookmark.to);
+    var draftDecoration = addDraftDecoration(resolvedBookmark.from, resolvedBookmark.to, targetType);
     newState.draftDecorationSet = draftDecorationSet.add(editorState.doc, [draftDecoration]);
   }
   return newState;

package/dist/esm/toolbar.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { addInlineComment, ToolTipContent } from '@atlaskit/editor-common/keymaps';
+import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 import { annotationMessages } from '@atlaskit/editor-common/messages';
 import { calculateToolbarPositionAboveSelection, calculateToolbarPositionTrackHead } from '@atlaskit/editor-common/utils';
 import CommentIcon from '@atlaskit/icon/glyph/comment';
@@ -10,9 +11,14 @@ import { isSelectionValid } from './utils';
 export var 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 _supportedNodes = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
     var schema = state.schema;
-    var selectionValid = isSelectionValid(state);
-    if (selectionValid === AnnotationSelectionType.INVALID) {
+    var selectionValid = isSelectionValid(state, isCommentOnMediaOn);
+    var isMediaSelected = isCommentOnMediaOn && currentMediaNodeWithPos(state);
+
+    // comments on media can only be added via media floating toolbar
+    if (isMediaSelected || selectionValid === AnnotationSelectionType.INVALID) {
       return undefined;
     }
     var createCommentMessage = intl.formatMessage(annotationMessages.createComment);

package/dist/esm/types.js

@@ -1,3 +1,12 @@
+/**
+ * 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
+ */
+
 export var AnnotationSelectionType = /*#__PURE__*/function (AnnotationSelectionType) {
   AnnotationSelectionType["INVALID"] = "invalid";
   AnnotationSelectionType["DISABLED"] = "disabled";

package/dist/esm/ui/InlineCommentView.js

@@ -130,7 +130,7 @@ export function InlineCommentView(_ref) {
     annotations: activeAnnotations,
     dom: dom,
     onDelete: function onDelete(id) {
-      return removeInlineCommentNearSelection(id)(state, dispatch);
+      return removeInlineCommentNearSelection(id, inlineCommentProvider.supportedBlockNodes)(state, dispatch);
     },
     onResolve: function onResolve(id) {
       return updateInlineCommentResolvedState(editorAnalyticsAPI)(_defineProperty({}, id, true), RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch);

package/dist/esm/utils.js

@@ -1,5 +1,6 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
+import { currentMediaNodeWithPos } from '@atlaskit/editor-common/media-single';
 import { AnnotationSharedClassNames } from '@atlaskit/editor-common/styles';
 import { canApplyAnnotationOnRange, containsAnyAnnotations, getAnnotationIdsFromRange, hasAnnotationMark, isParagraph, isText } from '@atlaskit/editor-common/utils';
 import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
@@ -103,6 +104,12 @@ var validateAnnotationMark = function validateAnnotationMark(annotationMark) {
  * (when creating new comment)
  */
 export var addDraftDecoration = function addDraftDecoration(start, end) {
+  var targetType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'inline';
+  if (targetType === 'block') {
+    return Decoration.node(start, end, {
+      class: "".concat(AnnotationSharedClassNames.draft)
+    });
+  }
   return Decoration.inline(start, end, {
     class: "".concat(AnnotationSharedClassNames.draft)
   });
@@ -201,10 +208,17 @@ export var getDraftCommandAnalyticsPayload = function getDraftCommandAnalyticsPa
   };
   return payload;
 };
-export var isSelectionValid = function isSelectionValid(state) {
+export var isSelectionValid = function isSelectionValid(state, isCommentOnMediaOn) {
+  var _currentMediaNodeWith;
+  var _supportedNodes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   var selection = state.selection;
   var _ref3 = getPluginState(state) || {},
     disallowOnWhitespace = _ref3.disallowOnWhitespace;
+
+  // Allow media so that it can enter draft mode
+  if (isCommentOnMediaOn && (_currentMediaNodeWith = currentMediaNodeWithPos(state)) !== null && _currentMediaNodeWith !== void 0 && _currentMediaNodeWith.node) {
+    return AnnotationSelectionType.VALID;
+  }
   if (selection.empty || !(selection instanceof TextSelection || selection instanceof AllSelection)) {
     return AnnotationSelectionType.INVALID;
   }

package/dist/types/commands/index.d.ts

@@ -1,14 +1,13 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import type { EditorAnalyticsAPI, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { InlineCommentMap, InlineCommentMouseData } from '../pm-plugins/types';
-import type { AnnotationPlugin } from '../types';
+import type { AnnotationPlugin, InlineCommentInputMethod, TargetType } from '../types';
 export declare const updateInlineCommentResolvedState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (partialNewState: InlineCommentMap, resolveMethod?: RESOLVE_METHOD) => Command;
 export declare const closeComponent: () => Command;
 export declare const clearDirtyMark: () => Command;
-export declare const removeInlineCommentNearSelection: (id: string) => Command;
-export declare const setInlineCommentDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (drafting: boolean, inputMethod?: INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHORTCUT) => Command;
+export declare const removeInlineCommentNearSelection: (id: string, _supportedNodes?: string[]) => Command;
+export declare const setInlineCommentDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (drafting: boolean, inputMethod?: InlineCommentInputMethod, targetType?: TargetType, isCommentOnMediaOn?: boolean) => Command;
 export declare const addInlineComment: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorAPI?: ExtractInjectionAPI<AnnotationPlugin> | undefined) => (id: string) => Command;
 export declare const updateMouseState: (mouseData: InlineCommentMouseData) => Command;
 export declare const setSelectedAnnotation: (id: string) => Command;

package/dist/types/commands/transform.d.ts

@@ -1,6 +1,6 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { EditorAnalyticsAPI, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { InlineCommentInputMethod } from '../types';
 declare const _default: {
     addAnnotationMark: (id: string) => (transaction: Transaction, state: EditorState) => Transaction;
     addInlineComment: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorAPI: import("@atlaskit/editor-common/types").PublicPluginAPI<[import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"annotation", {
@@ -62,9 +62,13 @@ declare const _default: {
             };
         }, {
             mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
-        } | undefined>>];
+        } | undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
+            pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
+            sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
+        }, import("@atlaskit/editor-common/types").FeatureFlags>>];
         actions: {
             stripNonExistingAnnotations: (slice: import("prosemirror-model").Slice, state: EditorState) => boolean | undefined;
+            setInlineCommentDraftState: (drafting: boolean, inputMethod: InlineCommentInputMethod, targetType?: import("../types").TargetType | undefined, isCommentOnMediaOn?: boolean | undefined) => import("@atlaskit/editor-common/types").Command;
         };
     }, import("../types").AnnotationProviders | undefined>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
         pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;
@@ -122,8 +126,11 @@ declare const _default: {
         };
     }, {
         mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
-    } | undefined>>]> | undefined) => (id: string) => (transaction: Transaction, state: EditorState) => Transaction;
-    addOpenCloseAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (drafting: boolean, method?: INPUT_METHOD.SHORTCUT | INPUT_METHOD.TOOLBAR) => (transaction: Transaction, state: EditorState) => Transaction;
+    } | undefined>>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
+        pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
+        sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
+    }, import("@atlaskit/editor-common/types").FeatureFlags>>]> | undefined) => (id: string) => (transaction: Transaction, state: EditorState) => Transaction;
+    addOpenCloseAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (drafting: boolean, method?: InlineCommentInputMethod) => (transaction: Transaction, state: EditorState) => Transaction;
     addInsertAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (transaction: Transaction, state: EditorState) => Transaction;
     addResolveAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (method?: RESOLVE_METHOD | undefined) => (transaction: Transaction, state: EditorState) => Transaction;
 };

package/dist/types/index.d.ts

@@ -1,3 +1,3 @@
 export { annotationPlugin } from './plugin';
-export type { AnnotationPlugin, AnnotationProviders, InlineCommentAnnotationProvider, AnnotationInfo, InlineCommentCreateComponentProps, InlineCommentViewComponentProps, AnnotationState, AnnotationTypeProvider, InlineCommentState, } from './types';
+export type { AnnotationPlugin, AnnotationProviders, InlineCommentAnnotationProvider, AnnotationInfo, InlineCommentCreateComponentProps, InlineCommentViewComponentProps, AnnotationState, AnnotationTypeProvider, InlineCommentState, TargetType, InlineCommentInputMethod, } from './types';
 export type { InlineCommentMap, InlineCommentPluginState, InlineCommentPluginOptions, InlineCommentAction, } from './pm-plugins/types';

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

@@ -3,7 +3,7 @@ import type { Dispatch, EventDispatcher } from '@atlaskit/editor-common/event-di
 import type { PortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import type { EditorState, SelectionBookmark } from '@atlaskit/editor-prosemirror/state';
 import type { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import type { AnnotationInfo, InlineCommentAnnotationProvider } from '../types';
+import type { AnnotationInfo, InlineCommentAnnotationProvider, TargetType } from '../types';
 export declare enum ACTIONS {
     UPDATE_INLINE_COMMENT_STATE = 0,
     SET_INLINE_COMMENT_DRAFT_STATE = 1,
@@ -35,6 +35,7 @@ export type InlineCommentAction = {
     data: {
         drafting: boolean;
         editorState: EditorState;
+        targetType?: TargetType;
     };
 } | {
     type: ACTIONS.INLINE_COMMENT_UPDATE_MOUSE_STATE;

package/dist/types/toolbar.d.ts

@@ -2,4 +2,4 @@ import type { IntlShape } from 'react-intl-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { FloatingToolbarConfig } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-export declare const buildToolbar: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (state: EditorState, intl: IntlShape, isToolbarAbove?: boolean) => FloatingToolbarConfig | undefined;
+export declare const buildToolbar: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (state: EditorState, intl: IntlShape, isToolbarAbove?: boolean, isCommentOnMediaOn?: boolean, _supportedNodes?: string[]) => FloatingToolbarConfig | undefined;

package/dist/types/types.d.ts

@@ -1,22 +1,40 @@
 import type React from 'react';
 import type { AnnotationTypes } from '@atlaskit/adf-schema';
+import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { AnnotationUpdateEmitter } from '@atlaskit/editor-common/annotation';
-import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { Command, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
+import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { InlineCommentPluginState } from './pm-plugins/types';
 type StripNonExistingAnnotations = (slice: Slice, state: EditorState) => boolean | undefined;
+/**
+ * type of target that annotation apply to.
+ * This is used to apply correct decoration to a draft comment
+ */
+export type TargetType = 'block' | 'inline';
+/**
+ * The source of draft comment being created
+ */
+export type InlineCommentInputMethod = INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHORTCUT | INPUT_METHOD.FLOATING_TB;
+type SetInlineCommentDraftState = (drafting: boolean, inputMethod: InlineCommentInputMethod, 
+/** @default 'inline' */
+targetType?: TargetType, 
+/** check for platform_editor_media_comments_base feature gate */
+isCommentOnMediaOn?: boolean) => Command;
 export type AnnotationPlugin = NextEditorPlugin<'annotation', {
     pluginConfiguration: AnnotationProviders | undefined;
     sharedState: InlineCommentPluginState | undefined;
     dependencies: [
         OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<EditorViewModePlugin>
+        OptionalPlugin<EditorViewModePlugin>,
+        OptionalPlugin<FeatureFlagsPlugin>
     ];
     actions: {
         stripNonExistingAnnotations: StripNonExistingAnnotations;
+        setInlineCommentDraftState: SetInlineCommentDraftState;
     };
 }>;
 export type AnnotationInfo = {
@@ -79,6 +97,16 @@ export type InlineCommentAnnotationProvider = AnnotationTypeProvider<AnnotationT
     createComponent?: React.ComponentType<InlineCommentCreateComponentProps>;
     viewComponent?: React.ComponentType<InlineCommentViewComponentProps>;
     isToolbarAbove?: boolean;
+    /**
+     * @experimental Still under development. Do not use.
+     *
+     * A list of supported editor node names for inline comment,
+     * Note 1: value is the type name of the node, e.g. media, mediaInline
+     * Invalid node names, nodes does not support annotation
+     * or nodes not supported by current ADF schema will be ignored.
+     * Note 2: text is supported by default.
+     */
+    supportedBlockNodes?: string[];
 };
 export interface AnnotationProviders {
     inlineComment: InlineCommentAnnotationProvider;

package/dist/types/utils.d.ts

@@ -1,11 +1,11 @@
-import type { AnalyticsEventPayloadCallback, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import type { AnalyticsEventPayloadCallback } from '@atlaskit/editor-common/analytics';
 import { containsAnyAnnotations, hasAnnotationMark } from '@atlaskit/editor-common/utils';
 import type { Mark, Node, ResolvedPos, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { InlineCommentPluginState } from './pm-plugins/types';
-import type { AnnotationInfo } from './types';
+import type { AnnotationInfo, InlineCommentInputMethod, TargetType } from './types';
 import { AnnotationSelectionType } from './types';
 export { hasAnnotationMark, containsAnyAnnotations };
 /**
@@ -14,7 +14,7 @@ export { hasAnnotationMark, containsAnyAnnotations };
  */
 export declare const surroundingMarks: ($pos: ResolvedPos) => (readonly Mark[])[];
 export declare const getAllAnnotations: (doc: Node) => string[];
-export declare const addDraftDecoration: (start: number, end: number) => Decoration;
+export declare const addDraftDecoration: (start: number, end: number, targetType?: TargetType) => Decoration;
 export declare const getAnnotationViewKey: (annotations: AnnotationInfo[]) => string;
 export declare const findAnnotationsInSelection: (selection: Selection, doc: Node) => AnnotationInfo[];
 /**
@@ -27,8 +27,8 @@ export declare const getPluginState: (state: EditorState) => InlineCommentPlugin
 /**
  * get payload for the open/close analytics event
  */
-export declare const getDraftCommandAnalyticsPayload: (drafting: boolean, inputMethod: INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHORTCUT) => AnalyticsEventPayloadCallback;
-export declare const isSelectionValid: (state: EditorState) => AnnotationSelectionType;
+export declare const getDraftCommandAnalyticsPayload: (drafting: boolean, inputMethod: InlineCommentInputMethod) => AnalyticsEventPayloadCallback;
+export declare const isSelectionValid: (state: EditorState, isCommentOnMediaOn?: boolean, _supportedNodes?: string[]) => AnnotationSelectionType;
 export declare const hasInvalidNodes: (state: EditorState) => boolean;
 /**
  * Checks if any of the nodes in a given selection are completely whitespace

package/dist/types-ts4.5/commands/index.d.ts

@@ -1,14 +1,13 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import type { EditorAnalyticsAPI, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { InlineCommentMap, InlineCommentMouseData } from '../pm-plugins/types';
-import type { AnnotationPlugin } from '../types';
+import type { AnnotationPlugin, InlineCommentInputMethod, TargetType } from '../types';
 export declare const updateInlineCommentResolvedState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (partialNewState: InlineCommentMap, resolveMethod?: RESOLVE_METHOD) => Command;
 export declare const closeComponent: () => Command;
 export declare const clearDirtyMark: () => Command;
-export declare const removeInlineCommentNearSelection: (id: string) => Command;
-export declare const setInlineCommentDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (drafting: boolean, inputMethod?: INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHORTCUT) => Command;
+export declare const removeInlineCommentNearSelection: (id: string, _supportedNodes?: string[]) => Command;
+export declare const setInlineCommentDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (drafting: boolean, inputMethod?: InlineCommentInputMethod, targetType?: TargetType, isCommentOnMediaOn?: boolean) => Command;
 export declare const addInlineComment: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorAPI?: ExtractInjectionAPI<AnnotationPlugin> | undefined) => (id: string) => Command;
 export declare const updateMouseState: (mouseData: InlineCommentMouseData) => Command;
 export declare const setSelectedAnnotation: (id: string) => Command;

package/dist/types-ts4.5/commands/transform.d.ts

@@ -1,6 +1,6 @@
-import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { EditorAnalyticsAPI, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { InlineCommentInputMethod } from '../types';
 declare const _default: {
     addAnnotationMark: (id: string) => (transaction: Transaction, state: EditorState) => Transaction;
     addInlineComment: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorAPI: import("@atlaskit/editor-common/types").PublicPluginAPI<[
@@ -74,10 +74,15 @@ declare const _default: {
                     };
                 }, {
                     mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
-                } | undefined>>
+                } | undefined>>,
+                import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
+                    pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
+                    sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
+                }, import("@atlaskit/editor-common/types").FeatureFlags>>
             ];
             actions: {
                 stripNonExistingAnnotations: (slice: import("prosemirror-model").Slice, state: EditorState) => boolean | undefined;
+                setInlineCommentDraftState: (drafting: boolean, inputMethod: InlineCommentInputMethod, targetType?: import("../types").TargetType | undefined, isCommentOnMediaOn?: boolean | undefined) => import("@atlaskit/editor-common/types").Command;
             };
         }, import("../types").AnnotationProviders | undefined>,
         import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
@@ -146,9 +151,13 @@ declare const _default: {
             };
         }, {
             mode?: import("@atlaskit/editor-plugin-editor-viewmode").ViewMode | undefined;
-        } | undefined>>
+        } | undefined>>,
+        import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
+            pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
+            sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
+        }, import("@atlaskit/editor-common/types").FeatureFlags>>
     ]> | undefined) => (id: string) => (transaction: Transaction, state: EditorState) => Transaction;
-    addOpenCloseAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (drafting: boolean, method?: INPUT_METHOD.SHORTCUT | INPUT_METHOD.TOOLBAR) => (transaction: Transaction, state: EditorState) => Transaction;
+    addOpenCloseAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (drafting: boolean, method?: InlineCommentInputMethod) => (transaction: Transaction, state: EditorState) => Transaction;
     addInsertAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (transaction: Transaction, state: EditorState) => Transaction;
     addResolveAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (method?: RESOLVE_METHOD | undefined) => (transaction: Transaction, state: EditorState) => Transaction;
 };

package/dist/types-ts4.5/index.d.ts

@@ -1,3 +1,3 @@
 export { annotationPlugin } from './plugin';
-export type { AnnotationPlugin, AnnotationProviders, InlineCommentAnnotationProvider, AnnotationInfo, InlineCommentCreateComponentProps, InlineCommentViewComponentProps, AnnotationState, AnnotationTypeProvider, InlineCommentState, } from './types';
+export type { AnnotationPlugin, AnnotationProviders, InlineCommentAnnotationProvider, AnnotationInfo, InlineCommentCreateComponentProps, InlineCommentViewComponentProps, AnnotationState, AnnotationTypeProvider, InlineCommentState, TargetType, InlineCommentInputMethod, } from './types';
 export type { InlineCommentMap, InlineCommentPluginState, InlineCommentPluginOptions, InlineCommentAction, } from './pm-plugins/types';

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

@@ -3,7 +3,7 @@ import type { Dispatch, EventDispatcher } from '@atlaskit/editor-common/event-di
 import type { PortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import type { EditorState, SelectionBookmark } from '@atlaskit/editor-prosemirror/state';
 import type { DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import type { AnnotationInfo, InlineCommentAnnotationProvider } from '../types';
+import type { AnnotationInfo, InlineCommentAnnotationProvider, TargetType } from '../types';
 export declare enum ACTIONS {
     UPDATE_INLINE_COMMENT_STATE = 0,
     SET_INLINE_COMMENT_DRAFT_STATE = 1,
@@ -35,6 +35,7 @@ export type InlineCommentAction = {
     data: {
         drafting: boolean;
         editorState: EditorState;
+        targetType?: TargetType;
     };
 } | {
     type: ACTIONS.INLINE_COMMENT_UPDATE_MOUSE_STATE;

package/dist/types-ts4.5/toolbar.d.ts

@@ -2,4 +2,4 @@ import type { IntlShape } from 'react-intl-next';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { FloatingToolbarConfig } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
-export declare const buildToolbar: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (state: EditorState, intl: IntlShape, isToolbarAbove?: boolean) => FloatingToolbarConfig | undefined;
+export declare const buildToolbar: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (state: EditorState, intl: IntlShape, isToolbarAbove?: boolean, isCommentOnMediaOn?: boolean, _supportedNodes?: string[]) => FloatingToolbarConfig | undefined;

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

@@ -1,22 +1,40 @@
 import type React from 'react';
 import type { AnnotationTypes } from '@atlaskit/adf-schema';
+import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { AnnotationUpdateEmitter } from '@atlaskit/editor-common/annotation';
-import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { Command, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
+import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { InlineCommentPluginState } from './pm-plugins/types';
 type StripNonExistingAnnotations = (slice: Slice, state: EditorState) => boolean | undefined;
+/**
+ * type of target that annotation apply to.
+ * This is used to apply correct decoration to a draft comment
+ */
+export type TargetType = 'block' | 'inline';
+/**
+ * The source of draft comment being created
+ */
+export type InlineCommentInputMethod = INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHORTCUT | INPUT_METHOD.FLOATING_TB;
+type SetInlineCommentDraftState = (drafting: boolean, inputMethod: InlineCommentInputMethod, 
+/** @default 'inline' */
+targetType?: TargetType, 
+/** check for platform_editor_media_comments_base feature gate */
+isCommentOnMediaOn?: boolean) => Command;
 export type AnnotationPlugin = NextEditorPlugin<'annotation', {
     pluginConfiguration: AnnotationProviders | undefined;
     sharedState: InlineCommentPluginState | undefined;
     dependencies: [
         OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<EditorViewModePlugin>
+        OptionalPlugin<EditorViewModePlugin>,
+        OptionalPlugin<FeatureFlagsPlugin>
     ];
     actions: {
         stripNonExistingAnnotations: StripNonExistingAnnotations;
+        setInlineCommentDraftState: SetInlineCommentDraftState;
     };
 }>;
 export type AnnotationInfo = {
@@ -79,6 +97,16 @@ export type InlineCommentAnnotationProvider = AnnotationTypeProvider<AnnotationT
     createComponent?: React.ComponentType<InlineCommentCreateComponentProps>;
     viewComponent?: React.ComponentType<InlineCommentViewComponentProps>;
     isToolbarAbove?: boolean;
+    /**
+     * @experimental Still under development. Do not use.
+     *
+     * A list of supported editor node names for inline comment,
+     * Note 1: value is the type name of the node, e.g. media, mediaInline
+     * Invalid node names, nodes does not support annotation
+     * or nodes not supported by current ADF schema will be ignored.
+     * Note 2: text is supported by default.
+     */
+    supportedBlockNodes?: string[];
 };
 export interface AnnotationProviders {
     inlineComment: InlineCommentAnnotationProvider;

package/dist/types-ts4.5/utils.d.ts

@@ -1,11 +1,11 @@
-import type { AnalyticsEventPayloadCallback, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import type { AnalyticsEventPayloadCallback } from '@atlaskit/editor-common/analytics';
 import { containsAnyAnnotations, hasAnnotationMark } from '@atlaskit/editor-common/utils';
 import type { Mark, Node, ResolvedPos, Schema, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
 import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import type { InlineCommentPluginState } from './pm-plugins/types';
-import type { AnnotationInfo } from './types';
+import type { AnnotationInfo, InlineCommentInputMethod, TargetType } from './types';
 import { AnnotationSelectionType } from './types';
 export { hasAnnotationMark, containsAnyAnnotations };
 /**
@@ -14,7 +14,7 @@ export { hasAnnotationMark, containsAnyAnnotations };
  */
 export declare const surroundingMarks: ($pos: ResolvedPos) => (readonly Mark[])[];
 export declare const getAllAnnotations: (doc: Node) => string[];
-export declare const addDraftDecoration: (start: number, end: number) => Decoration;
+export declare const addDraftDecoration: (start: number, end: number, targetType?: TargetType) => Decoration;
 export declare const getAnnotationViewKey: (annotations: AnnotationInfo[]) => string;
 export declare const findAnnotationsInSelection: (selection: Selection, doc: Node) => AnnotationInfo[];
 /**
@@ -27,8 +27,8 @@ export declare const getPluginState: (state: EditorState) => InlineCommentPlugin
 /**
  * get payload for the open/close analytics event
  */
-export declare const getDraftCommandAnalyticsPayload: (drafting: boolean, inputMethod: INPUT_METHOD.TOOLBAR | INPUT_METHOD.SHORTCUT) => AnalyticsEventPayloadCallback;
-export declare const isSelectionValid: (state: EditorState) => AnnotationSelectionType;
+export declare const getDraftCommandAnalyticsPayload: (drafting: boolean, inputMethod: InlineCommentInputMethod) => AnalyticsEventPayloadCallback;
+export declare const isSelectionValid: (state: EditorState, isCommentOnMediaOn?: boolean, _supportedNodes?: string[]) => AnnotationSelectionType;
 export declare const hasInvalidNodes: (state: EditorState) => boolean;
 /**
  * Checks if any of the nodes in a given selection are completely whitespace

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-annotation",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "Annotation plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,9 +33,10 @@
   },
   "dependencies": {
     "@atlaskit/adf-schema": "^35.5.2",
-    "@atlaskit/editor-common": "^78.10.0",
+    "@atlaskit/editor-common": "^78.11.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-editor-viewmode": "^1.0.0",
+    "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/icon": "^22.1.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",