@atlaskit/editor-plugin-annotation 19.0.3 → 19.2.0

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/annotationPluginType.d.ts

@@ -27,7 +27,19 @@ export type AnnotationPluginDependencies = [
 export type AnnotationPluginOptions = AnnotationProviders;
 export type AnnotationPlugin = NextEditorPlugin<'annotation', {
     actions: {
+        /**
+         * Applies the current inline-comment draft as an annotation mark on the
+         * bookmarked selection. Callers must start a draft first via
+         * `setInlineCommentDraftState`.
+         * @returns A command that returns true when the draft is applied.
+         */
+        applyInlineCommentDraft: (annotationId: string) => Command;
         hasAnyUnResolvedAnnotationInPage: (state: EditorState) => boolean;
+        /**
+         * Removes an inline-comment annotation mark from the document by id.
+         * @returns A command that returns true when the remove transaction is dispatched.
+         */
+        removeInlineCommentAnnotation: (annotationId: string) => Command;
         /**
          * Requests that the active inline comment or comment draft be closed.
          * Runs the provider's close guard before closing when one is configured.

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;

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

@@ -3,7 +3,7 @@ import type { Mark, Node, ResolvedPos, Schema, Slice } from '@atlaskit/editor-pr
 import type { EditorState, Selection, SelectionBookmark } from '@atlaskit/editor-prosemirror/state';
 import { AllSelection, NodeSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
-import type { AnnotationInfo, DraftBookmark, InlineCommentInputMethod, TargetType } from '../types';
+import type { AnnotationInfo, DraftBookmark, InlineCommentAnnotationProvider, InlineCommentInputMethod, TargetType } from '../types';
 import { AnnotationSelectionType } from '../types';
 import type { InlineCommentPluginState } from './types';
 /**
@@ -19,7 +19,7 @@ export declare const decorationKey: {
 export declare const addDraftDecoration: (start: number, end: number, targetType?: TargetType) => Decoration;
 export declare const getAnnotationViewKey: (annotations: AnnotationInfo[]) => string;
 export declare const findAnnotationsInSelection: (selection: Selection, doc: Node) => AnnotationInfo[];
-export declare const resolveDraftBookmark: (editorState: EditorState, bookmark?: SelectionBookmark, supportedBlockNodes?: string[]) => DraftBookmark;
+export declare const resolveDraftBookmark: (editorState: EditorState, bookmark?: SelectionBookmark, supportedBlockNodes?: string[], isBlockNodeSupported?: InlineCommentAnnotationProvider['isBlockNodeSupported']) => DraftBookmark;
 /**
  * get selection from position to apply new comment for
  * @returns bookmarked positions if they exists, otherwise current selection positions
@@ -31,9 +31,9 @@ export declare const getPluginState: (state: EditorState) => InlineCommentPlugin
  * get payload for the open/close analytics event
  */
 export declare const getDraftCommandAnalyticsPayload: (drafting: boolean, inputMethod: InlineCommentInputMethod) => AnalyticsEventPayloadCallback;
-export declare const isSelectionValid: (state: EditorState, _supportedNodes?: string[]) => AnnotationSelectionType;
+export declare const isSelectionValid: (state: EditorState, supportedBlockNodes?: string[], isBlockNodeSupported?: InlineCommentAnnotationProvider['isBlockNodeSupported']) => AnnotationSelectionType;
 export declare const hasInvalidNodes: (state: EditorState) => boolean;
-export declare const isSupportedBlockNode: (node: Node, supportedBlockNodes?: string[]) => boolean;
+export declare const isSupportedBlockNode: (node: Node, supportedBlockNodes?: string[], isBlockNodeSupported?: InlineCommentAnnotationProvider['isBlockNodeSupported']) => boolean;
 /**
  * Checks if any of the nodes in a given selection are completely whitespace
  * This is to conform to Confluence annotation specifications

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

@@ -2,6 +2,7 @@ import type React from 'react';
 import type { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
 import type { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { AnnotationUpdateEmitter, AnnotationManager } from '@atlaskit/editor-common/annotation';
+import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 /**
  * type of target that annotation apply to.
  * This is used to apply correct decoration to a draft comment
@@ -99,6 +100,14 @@ export type InlineCommentAnnotationProvider = AnnotationTypeProvider<AnnotationT
     contentType?: string;
     createComponent?: React.ComponentType<React.PropsWithChildren<InlineCommentCreateComponentProps>>;
     getCanAddComments?: () => boolean;
+    /**
+     * @experimental Still under development. Do not use.
+     *
+     * Determines whether a specific block node supports inline comments.
+     * This is additive to `supportedBlockNodes`; a node is supported when either configuration
+     * matches it.
+     */
+    isBlockNodeSupported?: (node: PMNode) => boolean;
     isToolbarAbove?: boolean;
     onCommentButtonMount?: () => void;
     /** Checks whether the active inline comment can be safely closed. */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "19.0.3",
+	"version": "19.2.0",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,7 +35,7 @@
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^123.5.0",
+		"@atlaskit/editor-common": "^123.7.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -48,6 +48,10 @@
 		"wait-for-expect": "^1.2.0"
 	},
 	"platform-feature-flags": {
+		"cc_maui_annotations_on_extensions": {
+			"type": "boolean",
+			"referenceOnly": true
+		},
 		"platform_editor_comments_api_manager": {
 			"type": "boolean",
 			"referenceOnly": true