@atlaskit/editor-plugin-annotation 19.1.0 → 19.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-annotation
 
+## 19.2.0
+
+### Minor Changes
+
+- [`c408ac489d43a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c408ac489d43a) -
+  Add an optional node-aware predicate for block annotation eligibility behind
+  `cc_maui_annotations_on_extensions`, while preserving the existing node-name configuration.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 19.1.0
 
 ### Minor Changes

package/dist/cjs/annotationPlugin.js

@@ -103,8 +103,8 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
         var _api$analytics2, _annotationProviders$;
         return (0, _editorCommands.removeInlineCommentFromDoc)(api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)(annotationId, (_annotationProviders$ = annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes) !== null && _annotationProviders$ !== void 0 ? _annotationProviders$ : []);
       },
-      setInlineCommentDraftState: (0, _editorCommands.setInlineCommentDraftState)(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes),
-      showCommentForBlockNode: (0, _editorCommands.showInlineCommentForBlockNode)(annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes),
+      setInlineCommentDraftState: (0, _editorCommands.setInlineCommentDraftState)(api === null || api === void 0 || (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes, undefined, annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.isBlockNodeSupported),
+      showCommentForBlockNode: (0, _editorCommands.showInlineCommentForBlockNode)(annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes, annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.isBlockNodeSupported),
       setSelectedAnnotation: _editorCommands.setSelectedAnnotation,
       setPendingSelectedAnnotation: _editorCommands.setPendingSelectedAnnotation
     },

package/dist/cjs/editor-commands/index.js

@@ -88,11 +88,13 @@ var setPendingSelectedAnnotation = exports.setPendingSelectedAnnotation = functi
 };
 var removeInlineCommentFromNode = function removeInlineCommentFromNode(id) {
   var supportedBlockNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  var state = arguments.length > 2 ? arguments[2] : undefined;
-  var dispatch = arguments.length > 3 ? arguments[3] : undefined;
+  var isBlockNodeSupported = arguments.length > 2 ? arguments[2] : undefined;
+  var state = arguments.length > 3 ? arguments[3] : undefined;
+  var dispatch = arguments.length > 4 ? arguments[4] : undefined;
   var tr = state.tr,
     selection = state.selection;
-  if (selection instanceof _state.NodeSelection && (0, _utils.isSupportedBlockNode)(selection.node, supportedBlockNodes)) {
+  var selectedNodeIsSupported = selection instanceof _state.NodeSelection && ((0, _utils.isSupportedBlockNode)(selection.node, supportedBlockNodes, isBlockNodeSupported) || selection.node.type === state.schema.nodes.mediaSingle && !!selection.node.firstChild && (0, _utils.isSupportedBlockNode)(selection.node.firstChild, supportedBlockNodes, isBlockNodeSupported));
+  if (selectedNodeIsSupported) {
     var $from = selection.$from;
     var currNode = selection.node;
     var from = $from.start();
@@ -122,10 +124,11 @@ var removeInlineCommentFromNode = function removeInlineCommentFromNode(id) {
 };
 var removeInlineCommentNearSelection = exports.removeInlineCommentNearSelection = function removeInlineCommentNearSelection(id) {
   var supportedNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var isBlockNodeSupported = arguments.length > 2 ? arguments[2] : undefined;
   return function (state, dispatch) {
     var tr = state.tr,
       $from = state.selection.$from;
-    if (removeInlineCommentFromNode(id, supportedNodes, state, dispatch)) {
+    if (removeInlineCommentFromNode(id, supportedNodes, isBlockNodeSupported, state, dispatch)) {
       return true;
     }
     var annotationMarkType = state.schema.marks.annotation;
@@ -150,6 +153,7 @@ var removeInlineCommentNearSelection = exports.removeInlineCommentNearSelection
 var removeInlineCommentFromDoc = exports.removeInlineCommentFromDoc = function removeInlineCommentFromDoc(editorAnalyticsAPI) {
   return function (id) {
     var supportedNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    var isBlockNodeSupported = arguments.length > 2 ? arguments[2] : undefined;
     return function (state, dispatch) {
       var tr = state.tr;
       state.doc.descendants(function (node, pos) {
@@ -158,11 +162,11 @@ var removeInlineCommentFromDoc = exports.removeInlineCommentFromDoc = function r
         if (node.type.name === 'mediaInline') {
           return false;
         }
-        var isSupportedBlockNode = node.isBlock && (supportedNodes === null || supportedNodes === void 0 ? void 0 : supportedNodes.includes(node.type.name));
+        var isSupportedBlock = node.isBlock && (0, _utils.isSupportedBlockNode)(node, supportedNodes, isBlockNodeSupported);
         node.marks.filter(function (mark) {
           return mark.type === state.schema.marks.annotation && mark.attrs.id === id;
         }).forEach(function (mark) {
-          if (isSupportedBlockNode) {
+          if (isSupportedBlock) {
             tr.removeNodeMark(pos, mark);
           } else {
             tr.removeMark(pos, pos + node.nodeSize, mark);
@@ -177,10 +181,10 @@ var removeInlineCommentFromDoc = exports.removeInlineCommentFromDoc = function r
     };
   };
 };
-var getDraftCommandAction = function getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar) {
+var getDraftCommandAction = function getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isBlockNodeSupported, isOpeningMediaCommentFromToolbar) {
   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, supportedBlockNodes, isBlockNodeSupported) !== _types2.AnnotationSelectionType.VALID) {
       return false;
     }
     return {
@@ -190,6 +194,7 @@ var getDraftCommandAction = function getDraftCommandAction(drafting, targetType,
         editorState: editorState,
         targetType: targetType,
         supportedBlockNodes: supportedBlockNodes,
+        isBlockNodeSupported: isBlockNodeSupported,
         targetNodeId: targetNodeId,
         isOpeningMediaCommentFromToolbar: isOpeningMediaCommentFromToolbar
       }
@@ -205,11 +210,12 @@ var getDraftCommandAction = function getDraftCommandAction(drafting, targetType,
  */
 var showInlineCommentForBlockNode = exports.showInlineCommentForBlockNode = function showInlineCommentForBlockNode() {
   var supportedBlockNodes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var isBlockNodeSupported = arguments.length > 1 ? arguments[1] : undefined;
   return function (node, viewMethod, isOpeningMediaCommentFromToolbar) {
     return function (state, dispatch) {
       var pluginState = (0, _utils.getPluginState)(state);
       var annotation = state.schema.marks.annotation;
-      if (node && node.isBlock && supportedBlockNodes.includes(node.type.name)) {
+      if (node && node.isBlock && (0, _utils.isSupportedBlockNode)(node, supportedBlockNodes, isBlockNodeSupported)) {
         var unresolvedAnnotationMarks = ((node === null || node === void 0 ? void 0 : node.marks) || []).filter(function (mark) {
           return mark.type === annotation && !(pluginState !== null && pluginState !== void 0 && pluginState.annotations[mark.attrs.id]);
         }).map(function (mark) {
@@ -242,12 +248,13 @@ var showInlineCommentForBlockNode = exports.showInlineCommentForBlockNode = func
 var setInlineCommentDraftState = exports.setInlineCommentDraftState = function setInlineCommentDraftState(editorAnalyticsAPI) {
   var supportedBlockNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var api = arguments.length > 2 ? arguments[2] : undefined;
+  var isBlockNodeSupported = arguments.length > 3 ? arguments[3] : undefined;
   return function (drafting) {
     var inputMethod = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _analytics.INPUT_METHOD.TOOLBAR;
     var targetType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'inline';
     var targetNodeId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : undefined;
     var isOpeningMediaCommentFromToolbar = arguments.length > 4 ? arguments[4] : undefined;
-    var commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar);
+    var commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isBlockNodeSupported, isOpeningMediaCommentFromToolbar);
     if (Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) {
       return function (state, dispatch) {
         var tr = _transform.default.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod)(state.tr, state);
@@ -273,7 +280,7 @@ var setInlineCommentDraftState = exports.setInlineCommentDraftState = function s
   };
 };
 var addInlineComment = exports.addInlineComment = function addInlineComment(editorAnalyticsAPI, editorAPI) {
-  return function (id, supportedBlockNodes) {
+  return function (id, supportedBlockNodes, isBlockNodeSupported) {
     var commandAction = function commandAction(editorState) {
       return {
         type: _types.ACTIONS.ADD_INLINE_COMMENT,
@@ -292,7 +299,7 @@ var addInlineComment = exports.addInlineComment = function addInlineComment(edit
     };
     if (Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar)) {
       return function (state, dispatch) {
-        var tr = _transform.default.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes)(state.tr, state);
+        var tr = _transform.default.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes, isBlockNodeSupported)(state.tr, state);
         tr.setMeta(_utils.inlineCommentPluginKey, commandAction(state));
         (0, _utils2.resetUserIntent)(editorAPI, tr);
         if (dispatch) {
@@ -302,7 +309,7 @@ var addInlineComment = exports.addInlineComment = function addInlineComment(edit
         return false;
       };
     } else {
-      return (0, _pluginFactory.createCommand)(commandAction, _transform.default.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes));
+      return (0, _pluginFactory.createCommand)(commandAction, _transform.default.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes, isBlockNodeSupported));
     }
   };
 };
@@ -340,6 +347,7 @@ var createAnnotation = exports.createAnnotation = function createAnnotation(edit
   return function (id) {
     var annotationType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _annotation.AnnotationTypes.INLINE_COMMENT;
     var supportedBlockNodes = arguments.length > 2 ? arguments[2] : undefined;
+    var isBlockNodeSupported = arguments.length > 3 ? arguments[3] : undefined;
     return function (state, dispatch) {
       // don't try to add if there are is no temp highlight bookmarked
       var _ref = (0, _utils.getPluginState)(state) || {},
@@ -348,7 +356,7 @@ var createAnnotation = exports.createAnnotation = function createAnnotation(edit
         return false;
       }
       if (annotationType === _annotation.AnnotationTypes.INLINE_COMMENT) {
-        return addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes)(state, dispatch);
+        return addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes, isBlockNodeSupported)(state, dispatch);
       }
       return false;
     };

package/dist/cjs/editor-commands/transform.js

@@ -15,7 +15,7 @@ var _utils2 = require("../pm-plugins/utils");
 var isAnnotationStep = function isAnnotationStep(step) {
   return step instanceof _transform.AddMarkStep && step.mark.type.name === 'annotation';
 };
-var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes) {
+var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes, isBlockNodeSupported) {
   return function (transaction, state) {
     var inlineCommentState = (0, _utils2.getPluginState)(state);
     var _ref = inlineCommentState || {},
@@ -24,7 +24,7 @@ var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes) {
       id: id,
       type: _annotation.AnnotationTypes.INLINE_COMMENT
     });
-    var _resolveDraftBookmark = (0, _utils2.resolveDraftBookmark)(state, bookmark, supportedBlockNodes),
+    var _resolveDraftBookmark = (0, _utils2.resolveDraftBookmark)(state, bookmark, supportedBlockNodes, isBlockNodeSupported),
       from = _resolveDraftBookmark.from,
       to = _resolveDraftBookmark.to,
       head = _resolveDraftBookmark.head,
@@ -48,10 +48,10 @@ var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes) {
   };
 };
 var addInlineComment = function addInlineComment(editorAnalyticsAPI, editorAPI) {
-  return function (id, supportedBlockNodes) {
+  return function (id, supportedBlockNodes, isBlockNodeSupported) {
     return function (transaction, state) {
       var _editorAPI$editorView, _pluginState$featureF;
-      var tr = addAnnotationMark(id, supportedBlockNodes)(transaction, state);
+      var tr = addAnnotationMark(id, supportedBlockNodes, isBlockNodeSupported)(transaction, state);
       editorAPI === null || editorAPI === void 0 || (_editorAPI$editorView = editorAPI.editorViewModeEffects) === null || _editorAPI$editorView === void 0 || _editorAPI$editorView.actions.applyViewModeStepAt(tr);
 
       // add insert analytics step to transaction

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

@@ -28,7 +28,7 @@ var domRefFromPos = function domRefFromPos(view, position) {
   }
   return dom;
 };
-var allowAnnotation = exports.allowAnnotation = function allowAnnotation(editorView, _options) {
+var allowAnnotation = exports.allowAnnotation = function allowAnnotation(editorView, options) {
   return function () {
     var _ref = _utils3.inlineCommentPluginKey.getState(editorView.state) || {},
       isDrafting = _ref.isDrafting,
@@ -42,7 +42,7 @@ var allowAnnotation = exports.allowAnnotation = function allowAnnotation(editorV
     if (!!(decoration !== null && decoration !== void 0 && decoration.length)) {
       return false;
     }
-    return (0, _utils3.isSelectionValid)(editorView.state) === _types.AnnotationSelectionType.VALID;
+    return (0, _utils3.isSelectionValid)(editorView.state, options.provider.supportedBlockNodes, options.provider.isBlockNodeSupported) === _types.AnnotationSelectionType.VALID;
   };
 };
 var startDraft = exports.startDraft = function startDraft(editorView, options) {
@@ -75,7 +75,7 @@ var startDraft = exports.startDraft = function startDraft(editorView, options) {
         });
       });
     }
-    (0, _editorCommands.setInlineCommentDraftState)(options.editorAnalyticsAPI, undefined, options.api)(true)(editorView.state, editorView.dispatch);
+    (0, _editorCommands.setInlineCommentDraftState)(options.editorAnalyticsAPI, options.provider.supportedBlockNodes, options.api, options.provider.isBlockNodeSupported)(true)(editorView.state, editorView.dispatch);
     var _ref3 = _utils3.inlineCommentPluginKey.getState(editorView.state) || {},
       draftDecorationSet = _ref3.draftDecorationSet;
     var decorations = draftDecorationSet === null || draftDecorationSet === void 0 ? void 0 : draftDecorationSet.find();
@@ -159,7 +159,7 @@ var applyDraft = exports.applyDraft = function applyDraft(editorView, options) {
       };
     }
     var from = decorations[0].from;
-    (0, _editorCommands.createAnnotation)(options.editorAnalyticsAPI, options.api)(id, _annotation.AnnotationTypes.INLINE_COMMENT, options.provider.supportedBlockNodes)(editorView.state, editorView.dispatch);
+    (0, _editorCommands.createAnnotation)(options.editorAnalyticsAPI, options.api)(id, _annotation.AnnotationTypes.INLINE_COMMENT, options.provider.supportedBlockNodes, options.provider.isBlockNodeSupported)(editorView.state, editorView.dispatch);
     !editorView.hasFocus() && editorView.focus();
 
     // Using the original decoration from position we should be able to locate the new target element.
@@ -343,7 +343,7 @@ var clearAnnotation = exports.clearAnnotation = function clearAnnotation(editorV
         reason: ERROR_REASON_ID_INVALID
       };
     }
-    (0, _editorCommands.removeInlineCommentFromDoc)(options.editorAnalyticsAPI)(id, options.provider.supportedBlockNodes)(editorView.state, editorView.dispatch);
+    (0, _editorCommands.removeInlineCommentFromDoc)(options.editorAnalyticsAPI)(id, options.provider.supportedBlockNodes, options.provider.isBlockNodeSupported)(editorView.state, editorView.dispatch);
     return {
       success: true,
       actionResult: undefined

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

@@ -467,13 +467,12 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
         // everytime we need to update the decorations. This handler will be called alot. We should be caching
         // the decorations in plugin state and only updating them when required.
         state.doc.descendants(function (node, pos) {
-          var _provider$supportedBl;
           // Inline comment on mediaInline is not supported as part of comments on media project
           // Thus, we skip the decoration for mediaInline node
           if (node.type.name === 'mediaInline') {
             return false;
           }
-          var isSupportedBlockNode = node.isBlock && ((_provider$supportedBl = provider.supportedBlockNodes) === null || _provider$supportedBl === void 0 ? void 0 : _provider$supportedBl.includes(node.type.name));
+          var isSupportedBlock = node.isBlock && (0, _utils3.isSupportedBlockNode)(node, provider.supportedBlockNodes, provider.isBlockNodeSupported);
           node.marks.filter(function (mark) {
             return mark.type === state.schema.marks.annotation;
           }).forEach(function (mark) {
@@ -485,7 +484,7 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
               var isHovered = !isInlineCommentViewClosed && !!(hoveredAnnotations !== null && hoveredAnnotations !== void 0 && hoveredAnnotations.some(function (hoveredAnnotation) {
                 return hoveredAnnotation.id === mark.attrs.id;
               }));
-              if (isSupportedBlockNode) {
+              if (isSupportedBlock) {
                 focusDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
                   class: "".concat((0, _nodeviews.getBlockAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved)
                 }, {

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

@@ -29,7 +29,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, action.data.targetType, action.data.supportedBlockNodes, action.data.targetNodeId, action.data.isOpeningMediaCommentFromToolbar);
+      return getNewDraftState(pluginState, action.data.drafting, action.data.editorState, action.data.targetType, action.data.supportedBlockNodes, action.data.isBlockNodeSupported, action.data.targetNodeId, action.data.isOpeningMediaCommentFromToolbar);
     case _types.ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         dirtyAnnotations: false,
@@ -91,7 +91,7 @@ var _default = exports.default = function _default(pluginState, action) {
       return pluginState;
   }
 };
-function getNewDraftState(pluginState, drafting, editorState, targetType, supportedBlockNodes, targetNodeId, isOpeningMediaCommentFromToolbar) {
+function getNewDraftState(pluginState, drafting, editorState, targetType, supportedBlockNodes, isBlockNodeSupported, targetNodeId, isOpeningMediaCommentFromToolbar) {
   var draftDecorationSet = pluginState.draftDecorationSet;
   if (!draftDecorationSet || !drafting) {
     draftDecorationSet = _view.DecorationSet.empty;
@@ -104,7 +104,7 @@ function getNewDraftState(pluginState, drafting, editorState, targetType, suppor
   newState.bookmark = undefined;
   if (drafting && editorState) {
     newState.bookmark = editorState.selection.getBookmark();
-    var _resolveDraftBookmark = (0, _utils.resolveDraftBookmark)(editorState, newState.bookmark, supportedBlockNodes),
+    var _resolveDraftBookmark = (0, _utils.resolveDraftBookmark)(editorState, newState.bookmark, supportedBlockNodes, isBlockNodeSupported),
       from = _resolveDraftBookmark.from,
       to = _resolveDraftBookmark.to;
     var draftDecoration = (0, _utils.addDraftDecoration)(from, to, targetType);

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

@@ -202,6 +202,7 @@ var findAnnotationsInSelection = exports.findAnnotationsInSelection = function f
 };
 var resolveDraftBookmark = exports.resolveDraftBookmark = function resolveDraftBookmark(editorState, bookmark) {
   var supportedBlockNodes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  var isBlockNodeSupported = arguments.length > 3 ? arguments[3] : undefined;
   var doc = editorState.doc;
   var resolvedBookmark = bookmark ? bookmark.resolve(doc) : editorState.selection;
   var from = resolvedBookmark.from,
@@ -223,7 +224,8 @@ var resolveDraftBookmark = exports.resolveDraftBookmark = function resolveDraftB
         return false;
       }
       var nodeEndsAt = pos + node.nodeSize;
-      if (supportedBlockNodes.includes(node.type.name)) {
+      var isLegacyMediaSingleWrapper = node.type.name === 'mediaSingle' && supportedBlockNodes.includes('media') && !supportedBlockNodes.includes('mediaSingle');
+      if (isSupportedBlockNode(node, supportedBlockNodes, isBlockNodeSupported) && !isLegacyMediaSingleWrapper) {
         draftBookmark = {
           from: pos,
           to: nodeEndsAt,
@@ -300,14 +302,16 @@ var getDraftCommandAnalyticsPayload = exports.getDraftCommandAnalyticsPayload =
 };
 var isSelectionValid = exports.isSelectionValid = function isSelectionValid(state) {
   var _currentMediaNodeWith;
-  var _supportedNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var supportedBlockNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var isBlockNodeSupported = arguments.length > 2 ? arguments[2] : undefined;
   var selection = state.selection;
   var _ref3 = getPluginState(state) || {},
     disallowOnWhitespace = _ref3.disallowOnWhitespace;
   var allowedInlineNodes = ['emoji', 'status', 'date', 'mention', 'inlineCard'];
   var isSelectionEmpty = selection.empty;
   var isTextOrAllSelection = selection instanceof _state.TextSelection || selection instanceof _state.AllSelection;
-  var isValidNodeSelection = selection instanceof _state.NodeSelection && allowedInlineNodes.includes(selection.node.type.name);
+  var isSupportedBlockNodeSelection = selection instanceof _state.NodeSelection && isSupportedBlockNode(selection.node, supportedBlockNodes, isBlockNodeSupported);
+  var isValidNodeSelection = selection instanceof _state.NodeSelection && (allowedInlineNodes.includes(selection.node.type.name) || isSupportedBlockNodeSelection);
   var isValidSelection = isTextOrAllSelection || isValidNodeSelection;
 
   // Allow media so that it can enter draft mode
@@ -317,7 +321,7 @@ var isSelectionValid = exports.isSelectionValid = function isSelectionValid(stat
   if (isSelectionEmpty || !isValidSelection) {
     return _types.AnnotationSelectionType.INVALID;
   }
-  var containsInvalidNodes = hasInvalidNodes(state);
+  var containsInvalidNodes = !isSupportedBlockNodeSelection && hasInvalidNodes(state);
 
   // A selection that only covers 1 pos, and is an invalid node
   // e.g. a text selection over a mention
@@ -346,7 +350,8 @@ var hasInvalidNodes = exports.hasInvalidNodes = function hasInvalidNodes(state)
 };
 var isSupportedBlockNode = exports.isSupportedBlockNode = function isSupportedBlockNode(node) {
   var supportedBlockNodes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  return supportedBlockNodes.indexOf(node.type.name) >= 0 || node.type.name === 'mediaSingle' && supportedBlockNodes.indexOf('media') >= 0;
+  var isBlockNodeSupported = arguments.length > 2 ? arguments[2] : undefined;
+  return supportedBlockNodes.indexOf(node.type.name) >= 0 || node.type.name === 'mediaSingle' && supportedBlockNodes.indexOf('media') >= 0 || (0, _fg.fg)('cc_maui_annotations_on_extensions') && (isBlockNodeSupported === null || isBlockNodeSupported === void 0 ? void 0 : isBlockNodeSupported(node)) === true;
 };
 
 /**

package/dist/cjs/ui/InlineCommentView.js

@@ -122,7 +122,7 @@ function InlineCommentView(_ref) {
       ,
       onCreate: function onCreate(id) {
         if (!isAnnotationManagerEnabled) {
-          var createAnnotationResult = (0, _editorCommands.createAnnotation)(editorAnalyticsAPI, editorAPI)(id, _annotation.AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch);
+          var createAnnotationResult = (0, _editorCommands.createAnnotation)(editorAnalyticsAPI, editorAPI)(id, _annotation.AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes, inlineCommentProvider.isBlockNodeSupported)(editorView.state, editorView.dispatch);
           !editorView.hasFocus() && editorView.focus();
           if (!createAnnotationResult) {
             throw new Error('Failed to create annotation');
@@ -135,7 +135,7 @@ function InlineCommentView(_ref) {
         return (
           // This is called when optimistic create inline comment encounters an error,
           // in which case the optimistically added annotation must be removed.
-          (0, _editorCommands.removeInlineCommentNearSelection)(id, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch)
+          (0, _editorCommands.removeInlineCommentNearSelection)(id, inlineCommentProvider.supportedBlockNodes, inlineCommentProvider.isBlockNodeSupported)(editorView.state, editorView.dispatch)
         );
       }
       // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
@@ -204,7 +204,7 @@ function InlineCommentView(_ref) {
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     ,
     onDelete: function onDelete(id) {
-      return (0, _editorCommands.removeInlineCommentNearSelection)(id, inlineCommentProvider.supportedBlockNodes)(editorView.state, dispatch);
+      return (0, _editorCommands.removeInlineCommentNearSelection)(id, inlineCommentProvider.supportedBlockNodes, inlineCommentProvider.isBlockNodeSupported)(editorView.state, dispatch);
     }
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     ,

package/dist/es2019/annotationPlugin.js

@@ -71,8 +71,8 @@ export const annotationPlugin = ({
         var _api$analytics2, _annotationProviders$;
         return removeInlineCommentFromDoc(api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)(annotationId, (_annotationProviders$ = annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes) !== null && _annotationProviders$ !== void 0 ? _annotationProviders$ : []);
       },
-      setInlineCommentDraftState: setInlineCommentDraftState(api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes),
-      showCommentForBlockNode: showInlineCommentForBlockNode(annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes),
+      setInlineCommentDraftState: setInlineCommentDraftState(api === null || api === void 0 ? void 0 : (_api$analytics3 = api.analytics) === null || _api$analytics3 === void 0 ? void 0 : _api$analytics3.actions, annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes, undefined, annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.isBlockNodeSupported),
+      showCommentForBlockNode: showInlineCommentForBlockNode(annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes, annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.isBlockNodeSupported),
       setSelectedAnnotation,
       setPendingSelectedAnnotation
     },

package/dist/es2019/editor-commands/index.js

@@ -58,12 +58,13 @@ export const setPendingSelectedAnnotation = id => createCommand({
     }]
   }
 });
-const removeInlineCommentFromNode = (id, supportedBlockNodes = [], state, dispatch) => {
+const removeInlineCommentFromNode = (id, supportedBlockNodes = [], isBlockNodeSupported, state, dispatch) => {
   const {
     tr,
     selection
   } = state;
-  if (selection instanceof NodeSelection && isSupportedBlockNode(selection.node, supportedBlockNodes)) {
+  const selectedNodeIsSupported = selection instanceof NodeSelection && (isSupportedBlockNode(selection.node, supportedBlockNodes, isBlockNodeSupported) || selection.node.type === state.schema.nodes.mediaSingle && !!selection.node.firstChild && isSupportedBlockNode(selection.node.firstChild, supportedBlockNodes, isBlockNodeSupported));
+  if (selectedNodeIsSupported) {
     const {
       $from
     } = selection;
@@ -93,14 +94,14 @@ const removeInlineCommentFromNode = (id, supportedBlockNodes = [], state, dispat
   }
   return false;
 };
-export const removeInlineCommentNearSelection = (id, supportedNodes = []) => (state, dispatch) => {
+export const removeInlineCommentNearSelection = (id, supportedNodes = [], isBlockNodeSupported) => (state, dispatch) => {
   const {
     tr,
     selection: {
       $from
     }
   } = state;
-  if (removeInlineCommentFromNode(id, supportedNodes, state, dispatch)) {
+  if (removeInlineCommentFromNode(id, supportedNodes, isBlockNodeSupported, state, dispatch)) {
     return true;
   }
   const {
@@ -121,7 +122,7 @@ export const removeInlineCommentNearSelection = (id, supportedNodes = []) => (st
   }
   return true;
 };
-export const removeInlineCommentFromDoc = editorAnalyticsAPI => (id, supportedNodes = []) => (state, dispatch) => {
+export const removeInlineCommentFromDoc = editorAnalyticsAPI => (id, supportedNodes = [], isBlockNodeSupported) => (state, dispatch) => {
   const {
     tr
   } = state;
@@ -131,9 +132,9 @@ export const removeInlineCommentFromDoc = editorAnalyticsAPI => (id, supportedNo
     if (node.type.name === 'mediaInline') {
       return false;
     }
-    const isSupportedBlockNode = node.isBlock && (supportedNodes === null || supportedNodes === void 0 ? void 0 : supportedNodes.includes(node.type.name));
+    const isSupportedBlock = node.isBlock && isSupportedBlockNode(node, supportedNodes, isBlockNodeSupported);
     node.marks.filter(mark => mark.type === state.schema.marks.annotation && mark.attrs.id === id).forEach(mark => {
-      if (isSupportedBlockNode) {
+      if (isSupportedBlock) {
         tr.removeNodeMark(pos, mark);
       } else {
         tr.removeMark(pos, pos + node.nodeSize, mark);
@@ -146,10 +147,10 @@ export const removeInlineCommentFromDoc = editorAnalyticsAPI => (id, supportedNo
   }
   return false;
 };
-const getDraftCommandAction = (drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar) => {
+const getDraftCommandAction = (drafting, targetType, targetNodeId, supportedBlockNodes, isBlockNodeSupported, isOpeningMediaCommentFromToolbar) => {
   return editorState => {
     // validate selection only when entering draft mode
-    if (drafting && isSelectionValid(editorState) !== AnnotationSelectionType.VALID) {
+    if (drafting && isSelectionValid(editorState, supportedBlockNodes, isBlockNodeSupported) !== AnnotationSelectionType.VALID) {
       return false;
     }
     return {
@@ -159,6 +160,7 @@ const getDraftCommandAction = (drafting, targetType, targetNodeId, supportedBloc
         editorState,
         targetType,
         supportedBlockNodes,
+        isBlockNodeSupported,
         targetNodeId,
         isOpeningMediaCommentFromToolbar
       }
@@ -172,12 +174,12 @@ const getDraftCommandAction = (drafting, targetType, targetNodeId, supportedBloc
  * @param supportedBlockNodes
  * @example
  */
-export const showInlineCommentForBlockNode = (supportedBlockNodes = []) => (node, viewMethod, isOpeningMediaCommentFromToolbar) => (state, dispatch) => {
+export const showInlineCommentForBlockNode = (supportedBlockNodes = [], isBlockNodeSupported) => (node, viewMethod, isOpeningMediaCommentFromToolbar) => (state, dispatch) => {
   const pluginState = getPluginState(state);
   const {
     annotation
   } = state.schema.marks;
-  if (node && node.isBlock && supportedBlockNodes.includes(node.type.name)) {
+  if (node && node.isBlock && isSupportedBlockNode(node, supportedBlockNodes, isBlockNodeSupported)) {
     const unresolvedAnnotationMarks = ((node === null || node === void 0 ? void 0 : node.marks) || []).filter(mark => mark.type === annotation && !(pluginState !== null && pluginState !== void 0 && pluginState.annotations[mark.attrs.id])).map(mark => ({
       id: mark.attrs.id,
       type: mark.attrs.annotationType
@@ -201,8 +203,8 @@ export const showInlineCommentForBlockNode = (supportedBlockNodes = []) => (node
   }
   return false;
 };
-export const setInlineCommentDraftState = (editorAnalyticsAPI, supportedBlockNodes = [], api) => (drafting, inputMethod = INPUT_METHOD.TOOLBAR, targetType = 'inline', targetNodeId = undefined, isOpeningMediaCommentFromToolbar) => {
-  const commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isOpeningMediaCommentFromToolbar);
+export const setInlineCommentDraftState = (editorAnalyticsAPI, supportedBlockNodes = [], api, isBlockNodeSupported) => (drafting, inputMethod = INPUT_METHOD.TOOLBAR, targetType = 'inline', targetNodeId = undefined, isOpeningMediaCommentFromToolbar) => {
+  const commandAction = getDraftCommandAction(drafting, targetType, targetNodeId, supportedBlockNodes, isBlockNodeSupported, isOpeningMediaCommentFromToolbar);
   if (Boolean(api === null || api === void 0 ? void 0 : api.toolbar)) {
     return (state, dispatch) => {
       const tr = transform.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod)(state.tr, state);
@@ -226,7 +228,7 @@ export const setInlineCommentDraftState = (editorAnalyticsAPI, supportedBlockNod
     return createCommand(commandAction, transform.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod));
   }
 };
-export const addInlineComment = (editorAnalyticsAPI, editorAPI) => (id, supportedBlockNodes) => {
+export const addInlineComment = (editorAnalyticsAPI, editorAPI) => (id, supportedBlockNodes, isBlockNodeSupported) => {
   const commandAction = editorState => ({
     type: ACTIONS.ADD_INLINE_COMMENT,
     data: {
@@ -245,7 +247,7 @@ export const addInlineComment = (editorAnalyticsAPI, editorAPI) => (id, supporte
   });
   if (Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar)) {
     return (state, dispatch) => {
-      const tr = transform.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes)(state.tr, state);
+      const tr = transform.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes, isBlockNodeSupported)(state.tr, state);
       tr.setMeta(inlineCommentPluginKey, commandAction(state));
       resetUserIntent(editorAPI, tr);
       if (dispatch) {
@@ -255,7 +257,7 @@ export const addInlineComment = (editorAnalyticsAPI, editorAPI) => (id, supporte
       return false;
     };
   } else {
-    return createCommand(commandAction, transform.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes));
+    return createCommand(commandAction, transform.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes, isBlockNodeSupported));
   }
 };
 export const updateMouseState = mouseData => createCommand({
@@ -282,7 +284,7 @@ export const setHoveredAnnotation = id => createCommand({
     }]
   }
 });
-export const createAnnotation = (editorAnalyticsAPI, editorAPI) => (id, annotationType = AnnotationTypes.INLINE_COMMENT, supportedBlockNodes) => (state, dispatch) => {
+export const createAnnotation = (editorAnalyticsAPI, editorAPI) => (id, annotationType = AnnotationTypes.INLINE_COMMENT, supportedBlockNodes, isBlockNodeSupported) => (state, dispatch) => {
   // don't try to add if there are is no temp highlight bookmarked
   const {
     bookmark
@@ -291,7 +293,7 @@ export const createAnnotation = (editorAnalyticsAPI, editorAPI) => (id, annotati
     return false;
   }
   if (annotationType === AnnotationTypes.INLINE_COMMENT) {
-    return addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes)(state, dispatch);
+    return addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes, isBlockNodeSupported)(state, dispatch);
   }
   return false;
 };

package/dist/es2019/editor-commands/transform.js

@@ -7,7 +7,7 @@ import { AddMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { getDraftCommandAnalyticsPayload, getPluginState, resolveDraftBookmark } from '../pm-plugins/utils';
 const isAnnotationStep = step => step instanceof AddMarkStep && step.mark.type.name === 'annotation';
-const addAnnotationMark = (id, supportedBlockNodes) => (transaction, state) => {
+const addAnnotationMark = (id, supportedBlockNodes, isBlockNodeSupported) => (transaction, state) => {
   const inlineCommentState = getPluginState(state);
   const {
     bookmark
@@ -21,7 +21,7 @@ const addAnnotationMark = (id, supportedBlockNodes) => (transaction, state) => {
     to,
     head,
     isBlockNode
-  } = resolveDraftBookmark(state, bookmark, supportedBlockNodes);
+  } = resolveDraftBookmark(state, bookmark, supportedBlockNodes, isBlockNodeSupported);
   let tr = transaction;
   if (isBlockNode) {
     tr = tr.addNodeMark(from, annotationMark);
@@ -39,9 +39,9 @@ const addAnnotationMark = (id, supportedBlockNodes) => (transaction, state) => {
   }
   return tr;
 };
-const addInlineComment = (editorAnalyticsAPI, editorAPI) => (id, supportedBlockNodes) => (transaction, state) => {
+const addInlineComment = (editorAnalyticsAPI, editorAPI) => (id, supportedBlockNodes, isBlockNodeSupported) => (transaction, state) => {
   var _editorAPI$editorView, _pluginState$featureF;
-  let tr = addAnnotationMark(id, supportedBlockNodes)(transaction, state);
+  let tr = addAnnotationMark(id, supportedBlockNodes, isBlockNodeSupported)(transaction, state);
   editorAPI === null || editorAPI === void 0 ? void 0 : (_editorAPI$editorView = editorAPI.editorViewModeEffects) === null || _editorAPI$editorView === void 0 ? void 0 : _editorAPI$editorView.actions.applyViewModeStepAt(tr);
 
   // add insert analytics step to transaction

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

@@ -22,7 +22,7 @@ const domRefFromPos = (view, position) => {
   }
   return dom;
 };
-export const allowAnnotation = (editorView, _options) => () => {
+export const allowAnnotation = (editorView, options) => () => {
   const {
     isDrafting,
     draftDecorationSet
@@ -36,7 +36,7 @@ export const allowAnnotation = (editorView, _options) => () => {
   if (!!(decoration !== null && decoration !== void 0 && decoration.length)) {
     return false;
   }
-  return isSelectionValid(editorView.state) === AnnotationSelectionType.VALID;
+  return isSelectionValid(editorView.state, options.provider.supportedBlockNodes, options.provider.isBlockNodeSupported) === AnnotationSelectionType.VALID;
 };
 export const startDraft = (editorView, options) => () => {
   var _getRangeInlineNodeNa, _options$annotationMa2;
@@ -68,7 +68,7 @@ export const startDraft = (editorView, options) => () => {
       });
     });
   }
-  setInlineCommentDraftState(options.editorAnalyticsAPI, undefined, options.api)(true)(editorView.state, editorView.dispatch);
+  setInlineCommentDraftState(options.editorAnalyticsAPI, options.provider.supportedBlockNodes, options.api, options.provider.isBlockNodeSupported)(true)(editorView.state, editorView.dispatch);
   const {
     draftDecorationSet
   } = inlineCommentPluginKey.getState(editorView.state) || {};
@@ -151,7 +151,7 @@ export const applyDraft = (editorView, options) => id => {
     };
   }
   const from = decorations[0].from;
-  createAnnotation(options.editorAnalyticsAPI, options.api)(id, AnnotationTypes.INLINE_COMMENT, options.provider.supportedBlockNodes)(editorView.state, editorView.dispatch);
+  createAnnotation(options.editorAnalyticsAPI, options.api)(id, AnnotationTypes.INLINE_COMMENT, options.provider.supportedBlockNodes, options.provider.isBlockNodeSupported)(editorView.state, editorView.dispatch);
   !editorView.hasFocus() && editorView.focus();
 
   // Using the original decoration from position we should be able to locate the new target element.
@@ -327,7 +327,7 @@ export const clearAnnotation = (editorView, options) => id => {
       reason: ERROR_REASON_ID_INVALID
     };
   }
-  removeInlineCommentFromDoc(options.editorAnalyticsAPI)(id, options.provider.supportedBlockNodes)(editorView.state, editorView.dispatch);
+  removeInlineCommentFromDoc(options.editorAnalyticsAPI)(id, options.provider.supportedBlockNodes, options.provider.isBlockNodeSupported)(editorView.state, editorView.dispatch);
   return {
     success: true,
     actionResult: undefined