@atlaskit/editor-plugin-annotation 19.1.0 → 19.2.0

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

@@ -10,7 +10,7 @@ import { getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../
 import { allowAnnotation, applyDraft, clearDraft, clearAnnotation, getDraft, setIsAnnotationHovered, setIsAnnotationSelected, startDraft } from './annotation-manager-hooks';
 import { createPluginState } from './plugin-factory';
 import { shouldSuppressFloatingToolbar } from './toolbar';
-import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from './utils';
+import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey, isSupportedBlockNode } from './utils';
 const fetchProviderStates = async (provider, annotationIds) => {
   if (!provider || !provider.getState) {
     return {};
@@ -409,19 +409,18 @@ export const inlineCommentPlugin = options => {
         // 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((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;
           }
-          const isSupportedBlockNode = node.isBlock && ((_provider$supportedBl = provider.supportedBlockNodes) === null || _provider$supportedBl === void 0 ? void 0 : _provider$supportedBl.includes(node.type.name));
+          const isSupportedBlock = node.isBlock && isSupportedBlockNode(node, provider.supportedBlockNodes, provider.isBlockNodeSupported);
           node.marks.filter(mark => mark.type === state.schema.marks.annotation).forEach(mark => {
             if (isVisible) {
               const isUnresolved = !!annotations && annotations[mark.attrs.id] === false;
               const isSelected = !isInlineCommentViewClosed && !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(selectedAnnotation => selectedAnnotation.id === mark.attrs.id));
               const isHovered = !isInlineCommentViewClosed && !!(hoveredAnnotations !== null && hoveredAnnotations !== void 0 && hoveredAnnotations.some(hoveredAnnotation => hoveredAnnotation.id === mark.attrs.id));
-              if (isSupportedBlockNode) {
+              if (isSupportedBlock) {
                 focusDecorations.push(Decoration.node(pos, pos + node.nodeSize, {
                   class: `${getBlockAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`
                 }, {

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

@@ -24,7 +24,7 @@ export default ((pluginState, action) => {
         mouseData
       };
     case 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 ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK:
       return {
         ...pluginState,
@@ -100,7 +100,7 @@ export default ((pluginState, action) => {
       return pluginState;
   }
 });
-function getNewDraftState(pluginState, drafting, editorState, targetType, supportedBlockNodes, targetNodeId, isOpeningMediaCommentFromToolbar) {
+function getNewDraftState(pluginState, drafting, editorState, targetType, supportedBlockNodes, isBlockNodeSupported, targetNodeId, isOpeningMediaCommentFromToolbar) {
   let {
     draftDecorationSet
   } = pluginState;
@@ -119,7 +119,7 @@ function getNewDraftState(pluginState, drafting, editorState, targetType, suppor
     const {
       from,
       to
-    } = resolveDraftBookmark(editorState, newState.bookmark, supportedBlockNodes);
+    } = resolveDraftBookmark(editorState, newState.bookmark, supportedBlockNodes, isBlockNodeSupported);
     const draftDecoration = addDraftDecoration(from, to, targetType);
     newState.draftDecorationSet = draftDecorationSet.add(editorState.doc, [draftDecoration]);
   }

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

@@ -159,7 +159,7 @@ export const findAnnotationsInSelection = (selection, doc) => {
   reorderAnnotations(annotations, $anchor);
   return annotations;
 };
-export const resolveDraftBookmark = (editorState, bookmark, supportedBlockNodes = []) => {
+export const resolveDraftBookmark = (editorState, bookmark, supportedBlockNodes = [], isBlockNodeSupported) => {
   const {
     doc
   } = editorState;
@@ -185,7 +185,8 @@ export const resolveDraftBookmark = (editorState, bookmark, supportedBlockNodes
         return false;
       }
       const nodeEndsAt = pos + node.nodeSize;
-      if (supportedBlockNodes.includes(node.type.name)) {
+      const isLegacyMediaSingleWrapper = node.type.name === 'mediaSingle' && supportedBlockNodes.includes('media') && !supportedBlockNodes.includes('mediaSingle');
+      if (isSupportedBlockNode(node, supportedBlockNodes, isBlockNodeSupported) && !isLegacyMediaSingleWrapper) {
         draftBookmark = {
           from: pos,
           to: nodeEndsAt,
@@ -262,7 +263,7 @@ export const getDraftCommandAnalyticsPayload = (drafting, inputMethod) => {
   };
   return payload;
 };
-export const isSelectionValid = (state, _supportedNodes = []) => {
+export const isSelectionValid = (state, supportedBlockNodes = [], isBlockNodeSupported) => {
   var _currentMediaNodeWith;
   const {
     selection
@@ -273,7 +274,8 @@ export const isSelectionValid = (state, _supportedNodes = []) => {
   const allowedInlineNodes = ['emoji', 'status', 'date', 'mention', 'inlineCard'];
   const isSelectionEmpty = selection.empty;
   const isTextOrAllSelection = selection instanceof TextSelection || selection instanceof AllSelection;
-  const isValidNodeSelection = selection instanceof NodeSelection && allowedInlineNodes.includes(selection.node.type.name);
+  const isSupportedBlockNodeSelection = selection instanceof NodeSelection && isSupportedBlockNode(selection.node, supportedBlockNodes, isBlockNodeSupported);
+  const isValidNodeSelection = selection instanceof NodeSelection && (allowedInlineNodes.includes(selection.node.type.name) || isSupportedBlockNodeSelection);
   const isValidSelection = isTextOrAllSelection || isValidNodeSelection;
 
   // Allow media so that it can enter draft mode
@@ -283,7 +285,7 @@ export const isSelectionValid = (state, _supportedNodes = []) => {
   if (isSelectionEmpty || !isValidSelection) {
     return AnnotationSelectionType.INVALID;
   }
-  const containsInvalidNodes = hasInvalidNodes(state);
+  const containsInvalidNodes = !isSupportedBlockNodeSelection && hasInvalidNodes(state);
 
   // A selection that only covers 1 pos, and is an invalid node
   // e.g. a text selection over a mention
@@ -312,8 +314,8 @@ export const hasInvalidNodes = state => {
     to: selection.to
   }, doc, schema);
 };
-export const isSupportedBlockNode = (node, supportedBlockNodes = []) => {
-  return supportedBlockNodes.indexOf(node.type.name) >= 0 || node.type.name === 'mediaSingle' && supportedBlockNodes.indexOf('media') >= 0;
+export const isSupportedBlockNode = (node, supportedBlockNodes = [], isBlockNodeSupported) => {
+  return supportedBlockNodes.indexOf(node.type.name) >= 0 || node.type.name === 'mediaSingle' && supportedBlockNodes.indexOf('media') >= 0 || fg('cc_maui_annotations_on_extensions') && (isBlockNodeSupported === null || isBlockNodeSupported === void 0 ? void 0 : isBlockNodeSupported(node)) === true;
 };
 
 /**

package/dist/es2019/ui/InlineCommentView.js

@@ -122,7 +122,7 @@ export function InlineCommentView({
       ,
       onCreate: id => {
         if (!isAnnotationManagerEnabled) {
-          const createAnnotationResult = createAnnotation(editorAnalyticsAPI, editorAPI)(id, AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch);
+          const createAnnotationResult = createAnnotation(editorAnalyticsAPI, editorAPI)(id, AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes, inlineCommentProvider.isBlockNodeSupported)(editorView.state, editorView.dispatch);
           !editorView.hasFocus() && editorView.focus();
           if (!createAnnotationResult) {
             throw new Error('Failed to create annotation');
@@ -134,7 +134,7 @@ export function InlineCommentView({
       onCreateError: id =>
       // This is called when optimistic create inline comment encounters an error,
       // in which case the optimistically added annotation must be removed.
-      removeInlineCommentNearSelection(id, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch)
+      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)
       ,
       onClose: () => {
@@ -196,7 +196,7 @@ export function InlineCommentView({
     dom: dom
     // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
     ,
-    onDelete: id => removeInlineCommentNearSelection(id, inlineCommentProvider.supportedBlockNodes)(editorView.state, dispatch)
+    onDelete: id => 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)
     ,
     onResolve: id => updateInlineCommentResolvedState(editorAnalyticsAPI)({

package/dist/esm/annotationPlugin.js

@@ -96,8 +96,8 @@ export var annotationPlugin = function annotationPlugin(_ref) {
         var _api$analytics2, _annotationProviders$;
         return 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: 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: showInlineCommentForBlockNode(annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes),
+      setInlineCommentDraftState: 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: showInlineCommentForBlockNode(annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes, annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.isBlockNodeSupported),
       setSelectedAnnotation: setSelectedAnnotation,
       setPendingSelectedAnnotation: setPendingSelectedAnnotation
     },

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

@@ -81,11 +81,13 @@ export var setPendingSelectedAnnotation = function setPendingSelectedAnnotation(
 };
 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 NodeSelection && isSupportedBlockNode(selection.node, supportedBlockNodes)) {
+  var 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) {
     var $from = selection.$from;
     var currNode = selection.node;
     var from = $from.start();
@@ -115,10 +117,11 @@ var removeInlineCommentFromNode = function removeInlineCommentFromNode(id) {
 };
 export var 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;
@@ -143,6 +146,7 @@ export var removeInlineCommentNearSelection = function removeInlineCommentNearSe
 export var 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) {
@@ -151,11 +155,11 @@ export var removeInlineCommentFromDoc = function removeInlineCommentFromDoc(edit
         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 && 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);
@@ -170,10 +174,10 @@ export var removeInlineCommentFromDoc = function removeInlineCommentFromDoc(edit
     };
   };
 };
-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 && isSelectionValid(editorState) !== AnnotationSelectionType.VALID) {
+    if (drafting && isSelectionValid(editorState, supportedBlockNodes, isBlockNodeSupported) !== AnnotationSelectionType.VALID) {
       return false;
     }
     return {
@@ -183,6 +187,7 @@ var getDraftCommandAction = function getDraftCommandAction(drafting, targetType,
         editorState: editorState,
         targetType: targetType,
         supportedBlockNodes: supportedBlockNodes,
+        isBlockNodeSupported: isBlockNodeSupported,
         targetNodeId: targetNodeId,
         isOpeningMediaCommentFromToolbar: isOpeningMediaCommentFromToolbar
       }
@@ -198,11 +203,12 @@ var getDraftCommandAction = function getDraftCommandAction(drafting, targetType,
  */
 export var 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 = getPluginState(state);
       var annotation = state.schema.marks.annotation;
-      if (node && node.isBlock && supportedBlockNodes.includes(node.type.name)) {
+      if (node && node.isBlock && 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) {
@@ -235,12 +241,13 @@ export var showInlineCommentForBlockNode = function showInlineCommentForBlockNod
 export var 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] : 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.handleDraftState(editorAnalyticsAPI)(drafting, inputMethod)(state.tr, state);
@@ -266,7 +273,7 @@ export var setInlineCommentDraftState = function setInlineCommentDraftState(edit
   };
 };
 export var addInlineComment = function addInlineComment(editorAnalyticsAPI, editorAPI) {
-  return function (id, supportedBlockNodes) {
+  return function (id, supportedBlockNodes, isBlockNodeSupported) {
     var commandAction = function commandAction(editorState) {
       return {
         type: ACTIONS.ADD_INLINE_COMMENT,
@@ -285,7 +292,7 @@ export var addInlineComment = function addInlineComment(editorAnalyticsAPI, edit
     };
     if (Boolean(editorAPI === null || editorAPI === void 0 ? void 0 : editorAPI.toolbar)) {
       return function (state, dispatch) {
-        var tr = transform.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes)(state.tr, state);
+        var tr = transform.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes, isBlockNodeSupported)(state.tr, state);
         tr.setMeta(inlineCommentPluginKey, commandAction(state));
         resetUserIntent(editorAPI, tr);
         if (dispatch) {
@@ -295,7 +302,7 @@ export var addInlineComment = function addInlineComment(editorAnalyticsAPI, edit
         return false;
       };
     } else {
-      return createCommand(commandAction, transform.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes));
+      return createCommand(commandAction, transform.addInlineComment(editorAnalyticsAPI, editorAPI)(id, supportedBlockNodes, isBlockNodeSupported));
     }
   };
 };
@@ -333,6 +340,7 @@ export var createAnnotation = function createAnnotation(editorAnalyticsAPI, edit
   return function (id) {
     var annotationType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 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 = getPluginState(state) || {},
@@ -341,7 +349,7 @@ export var createAnnotation = function createAnnotation(editorAnalyticsAPI, edit
         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/esm/editor-commands/transform.js

@@ -9,7 +9,7 @@ import { getDraftCommandAnalyticsPayload, getPluginState, resolveDraftBookmark }
 var isAnnotationStep = function isAnnotationStep(step) {
   return step instanceof 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 = getPluginState(state);
     var _ref = inlineCommentState || {},
@@ -18,7 +18,7 @@ var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes) {
       id: id,
       type: AnnotationTypes.INLINE_COMMENT
     });
-    var _resolveDraftBookmark = resolveDraftBookmark(state, bookmark, supportedBlockNodes),
+    var _resolveDraftBookmark = resolveDraftBookmark(state, bookmark, supportedBlockNodes, isBlockNodeSupported),
       from = _resolveDraftBookmark.from,
       to = _resolveDraftBookmark.to,
       head = _resolveDraftBookmark.head,
@@ -42,10 +42,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/esm/pm-plugins/annotation-manager-hooks.js

@@ -22,7 +22,7 @@ var domRefFromPos = function domRefFromPos(view, position) {
   }
   return dom;
 };
-export var allowAnnotation = function allowAnnotation(editorView, _options) {
+export var allowAnnotation = function allowAnnotation(editorView, options) {
   return function () {
     var _ref = inlineCommentPluginKey.getState(editorView.state) || {},
       isDrafting = _ref.isDrafting,
@@ -36,7 +36,7 @@ export var allowAnnotation = function 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 var startDraft = function startDraft(editorView, options) {
@@ -69,7 +69,7 @@ export var startDraft = function 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);
     var _ref3 = inlineCommentPluginKey.getState(editorView.state) || {},
       draftDecorationSet = _ref3.draftDecorationSet;
     var decorations = draftDecorationSet === null || draftDecorationSet === void 0 ? void 0 : draftDecorationSet.find();
@@ -153,7 +153,7 @@ export var applyDraft = function applyDraft(editorView, options) {
       };
     }
     var 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.
@@ -337,7 +337,7 @@ export var clearAnnotation = function clearAnnotation(editorView, options) {
         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

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

@@ -13,7 +13,7 @@ import { getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../
 import { allowAnnotation, applyDraft, clearDraft, clearAnnotation, getDraft, setIsAnnotationHovered, setIsAnnotationSelected, startDraft } from './annotation-manager-hooks';
 import { createPluginState } from './plugin-factory';
 import { shouldSuppressFloatingToolbar } from './toolbar';
-import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from './utils';
+import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey, isSupportedBlockNode } from './utils';
 var fetchProviderStates = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(provider, annotationIds) {
     var data, result;
@@ -460,13 +460,12 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
         // 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 && isSupportedBlockNode(node, provider.supportedBlockNodes, provider.isBlockNodeSupported);
           node.marks.filter(function (mark) {
             return mark.type === state.schema.marks.annotation;
           }).forEach(function (mark) {
@@ -478,7 +477,7 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
               var isHovered = !isInlineCommentViewClosed && !!(hoveredAnnotations !== null && hoveredAnnotations !== void 0 && hoveredAnnotations.some(function (hoveredAnnotation) {
                 return hoveredAnnotation.id === mark.attrs.id;
               }));
-              if (isSupportedBlockNode) {
+              if (isSupportedBlock) {
                 focusDecorations.push(Decoration.node(pos, pos + node.nodeSize, {
                   class: "".concat(getBlockAnnotationViewClassname(isUnresolved, isSelected), " ").concat(isUnresolved)
                 }, {

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

@@ -22,7 +22,7 @@ export default (function (pluginState, action) {
         mouseData: mouseData
       });
     case 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 ACTIONS.INLINE_COMMENT_CLEAR_DIRTY_MARK:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         dirtyAnnotations: false,
@@ -84,7 +84,7 @@ export default (function (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 = DecorationSet.empty;
@@ -97,7 +97,7 @@ function getNewDraftState(pluginState, drafting, editorState, targetType, suppor
   newState.bookmark = undefined;
   if (drafting && editorState) {
     newState.bookmark = editorState.selection.getBookmark();
-    var _resolveDraftBookmark = resolveDraftBookmark(editorState, newState.bookmark, supportedBlockNodes),
+    var _resolveDraftBookmark = resolveDraftBookmark(editorState, newState.bookmark, supportedBlockNodes, isBlockNodeSupported),
       from = _resolveDraftBookmark.from,
       to = _resolveDraftBookmark.to;
     var draftDecoration = addDraftDecoration(from, to, targetType);

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

@@ -185,6 +185,7 @@ export var findAnnotationsInSelection = function findAnnotationsInSelection(sele
 };
 export var 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,
@@ -206,7 +207,8 @@ export var resolveDraftBookmark = function resolveDraftBookmark(editorState, boo
         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,
@@ -283,14 +285,16 @@ export var getDraftCommandAnalyticsPayload = function getDraftCommandAnalyticsPa
 };
 export var 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 TextSelection || selection instanceof AllSelection;
-  var isValidNodeSelection = selection instanceof NodeSelection && allowedInlineNodes.includes(selection.node.type.name);
+  var isSupportedBlockNodeSelection = selection instanceof NodeSelection && isSupportedBlockNode(selection.node, supportedBlockNodes, isBlockNodeSupported);
+  var isValidNodeSelection = selection instanceof NodeSelection && (allowedInlineNodes.includes(selection.node.type.name) || isSupportedBlockNodeSelection);
   var isValidSelection = isTextOrAllSelection || isValidNodeSelection;
 
   // Allow media so that it can enter draft mode
@@ -300,7 +304,7 @@ export var isSelectionValid = function isSelectionValid(state) {
   if (isSelectionEmpty || !isValidSelection) {
     return 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
@@ -329,7 +333,8 @@ export var hasInvalidNodes = function hasInvalidNodes(state) {
 };
 export var 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 || fg('cc_maui_annotations_on_extensions') && (isBlockNodeSupported === null || isBlockNodeSupported === void 0 ? void 0 : isBlockNodeSupported(node)) === true;
 };
 
 /**

package/dist/esm/ui/InlineCommentView.js

@@ -115,7 +115,7 @@ export function InlineCommentView(_ref) {
       ,
       onCreate: function onCreate(id) {
         if (!isAnnotationManagerEnabled) {
-          var createAnnotationResult = createAnnotation(editorAnalyticsAPI, editorAPI)(id, AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch);
+          var createAnnotationResult = createAnnotation(editorAnalyticsAPI, editorAPI)(id, AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes, inlineCommentProvider.isBlockNodeSupported)(editorView.state, editorView.dispatch);
           !editorView.hasFocus() && editorView.focus();
           if (!createAnnotationResult) {
             throw new Error('Failed to create annotation');
@@ -128,7 +128,7 @@ export 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.
-          removeInlineCommentNearSelection(id, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch)
+          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)
@@ -197,7 +197,7 @@ export 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 removeInlineCommentNearSelection(id, inlineCommentProvider.supportedBlockNodes)(editorView.state, dispatch);
+      return 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/types/editor-commands/index.d.ts

@@ -5,26 +5,26 @@ import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { AnnotationPlugin } from '../annotationPluginType';
 import type { InlineCommentMap, InlineCommentMouseData } from '../pm-plugins/types';
-import type { InlineCommentInputMethod, TargetType } from '../types';
+import type { InlineCommentAnnotationProvider, 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 setInlineCommentsFetched: () => Command;
 export declare const flushPendingSelections: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (canSetAsSelectedAnnotations: boolean, errorReason?: string) => Command;
 export declare const setPendingSelectedAnnotation: (id: string) => Command;
-export declare const removeInlineCommentNearSelection: (id: string, supportedNodes?: string[]) => Command;
-export declare const removeInlineCommentFromDoc: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (id: string, supportedNodes?: string[]) => Command;
+export declare const removeInlineCommentNearSelection: (id: string, supportedNodes?: string[], isBlockNodeSupported?: InlineCommentAnnotationProvider['isBlockNodeSupported']) => Command;
+export declare const removeInlineCommentFromDoc: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (id: string, supportedNodes?: string[], isBlockNodeSupported?: InlineCommentAnnotationProvider['isBlockNodeSupported']) => Command;
 /**
  * Show active inline comments for a given block node, otherwise,
  * return false if the node has no comments or no unresolved comments.
  * @param supportedBlockNodes
  * @example
  */
-export declare const showInlineCommentForBlockNode: (supportedBlockNodes?: string[]) => (node: PMNode | null, viewMethod?: VIEW_METHOD, isOpeningMediaCommentFromToolbar?: boolean) => Command;
-export declare const setInlineCommentDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, supportedBlockNodes?: string[], api?: ExtractInjectionAPI<AnnotationPlugin>) => (drafting: boolean, inputMethod?: InlineCommentInputMethod, targetType?: TargetType, targetNodeId?: string | undefined, isOpeningMediaCommentFromToolbar?: boolean) => Command;
-export declare const addInlineComment: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorAPI?: ExtractInjectionAPI<AnnotationPlugin> | undefined) => (id: string, supportedBlockNodes?: string[]) => Command;
+export declare const showInlineCommentForBlockNode: (supportedBlockNodes?: string[], isBlockNodeSupported?: InlineCommentAnnotationProvider['isBlockNodeSupported']) => (node: PMNode | null, viewMethod?: VIEW_METHOD, isOpeningMediaCommentFromToolbar?: boolean) => Command;
+export declare const setInlineCommentDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, supportedBlockNodes?: string[], api?: ExtractInjectionAPI<AnnotationPlugin>, isBlockNodeSupported?: InlineCommentAnnotationProvider['isBlockNodeSupported']) => (drafting: boolean, inputMethod?: InlineCommentInputMethod, targetType?: TargetType, targetNodeId?: string | undefined, isOpeningMediaCommentFromToolbar?: boolean) => Command;
+export declare const addInlineComment: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorAPI?: ExtractInjectionAPI<AnnotationPlugin> | undefined) => (id: string, supportedBlockNodes?: string[], isBlockNodeSupported?: InlineCommentAnnotationProvider['isBlockNodeSupported']) => Command;
 export declare const updateMouseState: (mouseData: InlineCommentMouseData) => Command;
 export declare const setSelectedAnnotation: (id: string) => Command;
 export declare const setHoveredAnnotation: (id: string) => Command;
-export declare const createAnnotation: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorAPI?: ExtractInjectionAPI<AnnotationPlugin> | undefined) => (id: string, annotationType?: AnnotationTypes, supportedBlockNodes?: string[]) => Command;
+export declare const createAnnotation: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorAPI?: ExtractInjectionAPI<AnnotationPlugin> | undefined) => (id: string, annotationType?: AnnotationTypes, supportedBlockNodes?: string[], isBlockNodeSupported?: InlineCommentAnnotationProvider['isBlockNodeSupported']) => Command;
 export declare const setInlineCommentsVisibility: (isVisible: boolean) => Command;

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

@@ -2,11 +2,11 @@ import type { EditorAnalyticsAPI, RESOLVE_METHOD } from '@atlaskit/editor-common
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { AnnotationPlugin } from '../annotationPluginType';
-import type { InlineCommentInputMethod } from '../types';
+import type { InlineCommentAnnotationProvider, InlineCommentInputMethod } from '../types';
 declare const _default_1: {
-    addAnnotationMark: (id: string, supportedBlockNodes?: string[]) => (transaction: Transaction, state: EditorState) => Transaction;
+    addAnnotationMark: (id: string, supportedBlockNodes?: string[], isBlockNodeSupported?: InlineCommentAnnotationProvider['isBlockNodeSupported']) => (transaction: Transaction, state: EditorState) => Transaction;
     addDeleteAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (transaction: Transaction, state: EditorState) => Transaction;
-    addInlineComment: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorAPI: ExtractInjectionAPI<AnnotationPlugin> | undefined) => (id: string, supportedBlockNodes?: string[]) => (transaction: Transaction, state: EditorState) => Transaction;
+    addInlineComment: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorAPI: ExtractInjectionAPI<AnnotationPlugin> | undefined) => (id: string, supportedBlockNodes?: string[], isBlockNodeSupported?: InlineCommentAnnotationProvider['isBlockNodeSupported']) => (transaction: Transaction, state: EditorState) => Transaction;
     addInsertAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (transaction: Transaction, state: EditorState) => Transaction;
     addOpenCloseAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (drafting: boolean, method?: InlineCommentInputMethod) => (transaction: Transaction, state: EditorState) => Transaction;
     addPreemptiveGateErrorAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (errorReason?: string) => (transaction: Transaction, state: EditorState) => Transaction;

package/dist/types/pm-plugins/annotation-manager-hooks.d.ts

@@ -2,7 +2,7 @@ import { type AnnotationId } from '@atlaskit/adf-schema/annotation';
 import type { ApplyDraftResult, ClearAnnotationResult, ClearDraftResult, GetDraftResult, HoverAnnotationResult, SelectAnnotationResult, StartDraftResult } from '@atlaskit/editor-common/annotation';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { InlineCommentPluginOptions } from './types';
-export declare const allowAnnotation: (editorView: EditorView, _options: InlineCommentPluginOptions) => () => boolean;
+export declare const allowAnnotation: (editorView: EditorView, options: InlineCommentPluginOptions) => () => boolean;
 export declare const startDraft: (editorView: EditorView, options: InlineCommentPluginOptions) => () => StartDraftResult;
 export declare const clearDraft: (editorView: EditorView, options: InlineCommentPluginOptions) => () => ClearDraftResult;
 export declare const applyDraft: (editorView: EditorView, options: InlineCommentPluginOptions) => (id: AnnotationId) => ApplyDraftResult;

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

@@ -43,6 +43,7 @@ export type InlineCommentAction = {
     data: {
         drafting: boolean;
         editorState: EditorState;
+        isBlockNodeSupported?: InlineCommentAnnotationProvider['isBlockNodeSupported'];
         isOpeningMediaCommentFromToolbar?: boolean;
         supportedBlockNodes?: string[];
         targetNodeId?: string;