@atlaskit/editor-plugin-annotation 1.0.2 → 1.2.0

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

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

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

package/dist/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) => {
+  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

@@ -54,17 +54,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 +73,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/inline-comment.js

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

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

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

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

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

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

package/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,16 @@ export var getDraftCommandAnalyticsPayload = function getDraftCommandAnalyticsPa
   };
   return payload;
 };
-export var isSelectionValid = function isSelectionValid(state) {
+export var 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 = 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 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) => FloatingToolbarConfig | undefined;