@atlaskit/editor-plugin-annotation 27.0.5 → 28.0.0

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @atlaskit/editor-plugin-annotation
 
+## 28.0.0
+
+### Minor Changes
+
+- [`ebf585edb7bcc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ebf585edb7bcc) -
+  Support starting an annotation draft on a block node, behind
+  `platform_editor_comments_api_manager`.
+  - The `startDraft` manager hook accepts an optional `localId`. It resolves the target through
+    `resolveAnnotatableTargetFromLocalId`, selects the node ProseMirror can select (a `media` node's
+    `mediaSingle` parent), starts a block draft, and reports `targetNodeType` on both the result and
+    the `draftAnnotationStarted` event. An unresolvable `localId` fails with `invalid-localId` and
+    leaves the document untouched.
+  - `clearDraft` now emits `draftAnnotationCleared`.
+  - The annotation plugin's shared state exposes `annotationManager`, so other plugins (media) can
+    drive the manager without the provider being threaded through them.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 27.0.6
+
+### Patch Changes
+
+- [`38bcbb3966a67`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/38bcbb3966a67) -
+  Prevent Remix Edit from opening inline comments when it collapses the chart selection. Explicit
+  comment actions remain supported with cc_maui_annotations_on_extensions enabled; rollback behavior
+  is unchanged.
+
 ## 27.0.5
 
 ### Patch Changes

package/dist/cjs/annotationPlugin.js

@@ -120,7 +120,9 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
       var pluginState = (0, _utils.getPluginState)(editorState) || undefined;
       var clonedPluginState = Object.assign({}, pluginState);
       clonedPluginState === null || clonedPluginState === void 0 || delete clonedPluginState.featureFlagsPluginState;
-      return clonedPluginState;
+      return _objectSpread(_objectSpread({}, clonedPluginState), {}, {
+        annotationManager: annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.annotationManager
+      });
     },
     pmPlugins: function pmPlugins() {
       return [{

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

@@ -5,16 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.startDraft = exports.setIsAnnotationSelected = exports.setIsAnnotationHovered = exports.getDraft = exports.clearDraft = exports.clearAnnotation = exports.applyDraft = exports.allowAnnotation = void 0;
 var _annotation = require("@atlaskit/adf-schema/annotation");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _annotation2 = require("@atlaskit/editor-common/utils/annotation");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorCommands = require("../editor-commands");
 var _types = require("../types");
+var _resolveAnnotatableTarget = require("./resolve-annotatable-target");
 var _utils2 = require("./utils");
 var ERROR_REASON_DRAFT_NOT_STARTED = 'draft-not-started';
 var ERROR_REASON_DRAFT_IN_PROGRESS = 'draft-in-progress';
 var ERROR_REASON_RANGE_MISSING = 'range-no-longer-exists';
 var ERROR_REASON_RANGE_INVALID = 'invalid-range';
 var ERROR_REASON_ID_INVALID = 'id-not-valid';
+var ERROR_REASON_INVALID_LOCAL_ID = 'invalid-localId';
 var domRefFromPos = function domRefFromPos(view, position) {
   var dom;
   try {
@@ -46,8 +50,8 @@ var allowAnnotation = exports.allowAnnotation = function allowAnnotation(editorV
   };
 };
 var startDraft = exports.startDraft = function startDraft(editorView, options) {
-  return function () {
-    var _getRangeInlineNodeNa, _options$annotationMa2;
+  return function (localId) {
+    var _getRangeInlineNodeNa2, _options$annotationMa3;
     var _ref2 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
       isDrafting = _ref2.isDrafting,
       selectedAnnotations = _ref2.selectedAnnotations;
@@ -75,9 +79,71 @@ var startDraft = exports.startDraft = function startDraft(editorView, options) {
         });
       });
     }
+    if (localId !== undefined) {
+      var _$target$parent, _target$node$attrs$id, _getRangeInlineNodeNa, _options$annotationMa2;
+      var target = (0, _resolveAnnotatableTarget.resolveAnnotatableTargetFromLocalId)(editorView.state, localId, {
+        supportedBlockNodes: options.provider.supportedBlockNodes
+      });
+      if (!target) {
+        return {
+          success: false,
+          reason: ERROR_REASON_INVALID_LOCAL_ID
+        };
+      }
+
+      // The resolver returns the node accepting the annotation (the inner `media`), but
+      // `isSelectionValid` requires the selection to be on the selectable `mediaSingle`.
+      var doc = editorView.state.doc;
+      var selectionPos = target.pos;
+      var $target = doc.resolve(target.pos);
+      if (target.node.type.name === 'media' && ((_$target$parent = $target.parent) === null || _$target$parent === void 0 ? void 0 : _$target$parent.type.name) === 'mediaSingle') {
+        selectionPos = $target.before();
+      }
+
+      // A NodeSelection makes resolveDraftBookmark record isBlockNode: true.
+      editorView.dispatch(editorView.state.tr.setSelection(_state.NodeSelection.create(doc, selectionPos)));
+      var targetNodeId = (_target$node$attrs$id = target.node.attrs.id) !== null && _target$node$attrs$id !== void 0 ? _target$node$attrs$id : target.node.attrs.localId;
+      (0, _editorCommands.setInlineCommentDraftState)(options.editorAnalyticsAPI, options.provider.supportedBlockNodes, options.api, options.provider.isBlockNodeSupported)(true, _analytics.INPUT_METHOD.FLOATING_TB, 'block', targetNodeId, true)(editorView.state, editorView.dispatch);
+      var _ref3 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
+        _draftDecorationSet = _ref3.draftDecorationSet;
+      var _decorations = _draftDecorationSet === null || _draftDecorationSet === void 0 ? void 0 : _draftDecorationSet.find();
+      if (!(_decorations !== null && _decorations !== void 0 && _decorations.length)) {
+        return {
+          success: false,
+          reason: ERROR_REASON_RANGE_INVALID
+        };
+      }
+      var _from = _decorations[0].from;
+      var _targetElement = domRefFromPos(editorView, _from);
+      var _inlineNodeTypes = (_getRangeInlineNodeNa = (0, _annotation2.getRangeInlineNodeNames)({
+        doc: editorView.state.doc,
+        pos: {
+          from: _from,
+          to: _decorations[_decorations.length - 1].to
+        }
+      })) !== null && _getRangeInlineNodeNa !== void 0 ? _getRangeInlineNodeNa : [];
+      var targetNodeType = target.node.type.name;
+      (_options$annotationMa2 = options.annotationManager) === null || _options$annotationMa2 === void 0 || _options$annotationMa2.emit({
+        name: 'draftAnnotationStarted',
+        data: {
+          targetElement: _targetElement,
+          actionResult: undefined,
+          inlineNodeTypes: _inlineNodeTypes,
+          targetNodeType: targetNodeType
+        }
+      });
+      return {
+        success: true,
+        targetElement: _targetElement,
+        // In Editor the action result is undefined, because the editor will perform the transaction on the document.
+        actionResult: undefined,
+        inlineNodeTypes: _inlineNodeTypes,
+        targetNodeType: targetNodeType
+      };
+    }
     (0, _editorCommands.setInlineCommentDraftState)(options.editorAnalyticsAPI, options.provider.supportedBlockNodes, options.api, options.provider.isBlockNodeSupported)(true)(editorView.state, editorView.dispatch);
-    var _ref3 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
-      draftDecorationSet = _ref3.draftDecorationSet;
+    var _ref4 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
+      draftDecorationSet = _ref4.draftDecorationSet;
     var decorations = draftDecorationSet === null || draftDecorationSet === void 0 ? void 0 : draftDecorationSet.find();
 
     // If the matching decorations is not found containing the id, it means something went wrong with the draft.
@@ -89,14 +155,14 @@ var startDraft = exports.startDraft = function startDraft(editorView, options) {
     }
     var from = decorations[0].from;
     var targetElement = domRefFromPos(editorView, from);
-    var inlineNodeTypes = (_getRangeInlineNodeNa = (0, _annotation2.getRangeInlineNodeNames)({
+    var inlineNodeTypes = (_getRangeInlineNodeNa2 = (0, _annotation2.getRangeInlineNodeNames)({
       doc: editorView.state.doc,
       pos: {
         from: from,
         to: decorations[decorations.length - 1].to
       }
-    })) !== null && _getRangeInlineNodeNa !== void 0 ? _getRangeInlineNodeNa : [];
-    (_options$annotationMa2 = options.annotationManager) === null || _options$annotationMa2 === void 0 || _options$annotationMa2.emit({
+    })) !== null && _getRangeInlineNodeNa2 !== void 0 ? _getRangeInlineNodeNa2 : [];
+    (_options$annotationMa3 = options.annotationManager) === null || _options$annotationMa3 === void 0 || _options$annotationMa3.emit({
       name: 'draftAnnotationStarted',
       data: {
         targetElement: targetElement,
@@ -115,9 +181,10 @@ var startDraft = exports.startDraft = function startDraft(editorView, options) {
 };
 var clearDraft = exports.clearDraft = function clearDraft(editorView, options) {
   return function () {
-    var _ref4 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
-      isDrafting = _ref4.isDrafting,
-      draftDecorationSet = _ref4.draftDecorationSet;
+    var _options$annotationMa4;
+    var _ref5 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
+      isDrafting = _ref5.isDrafting,
+      draftDecorationSet = _ref5.draftDecorationSet;
     if (!isDrafting) {
       return {
         success: false,
@@ -133,6 +200,9 @@ var clearDraft = exports.clearDraft = function clearDraft(editorView, options) {
     }
     (0, _editorCommands.setInlineCommentDraftState)(options.editorAnalyticsAPI, undefined, options.api)(false)(editorView.state, editorView.dispatch);
     !editorView.hasFocus() && editorView.focus();
+    (_options$annotationMa4 = options.annotationManager) === null || _options$annotationMa4 === void 0 || _options$annotationMa4.emit({
+      name: 'draftAnnotationCleared'
+    });
     return {
       success: true
     };
@@ -140,11 +210,11 @@ var clearDraft = exports.clearDraft = function clearDraft(editorView, options) {
 };
 var applyDraft = exports.applyDraft = function applyDraft(editorView, options) {
   return function (id) {
-    var _options$annotationMa3, _getAnnotationInlineN2;
-    var _ref5 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
-      isDrafting = _ref5.isDrafting,
-      draftDecorationSet = _ref5.draftDecorationSet,
-      bookmark = _ref5.bookmark;
+    var _options$annotationMa5, _getAnnotationInlineN2;
+    var _ref6 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
+      isDrafting = _ref6.isDrafting,
+      draftDecorationSet = _ref6.draftDecorationSet,
+      bookmark = _ref6.bookmark;
     if (!isDrafting) {
       return {
         success: false,
@@ -168,7 +238,7 @@ var applyDraft = exports.applyDraft = function applyDraft(editorView, options) {
 
     // When a draft is applied it is automatically selected, so we need to set the selected annotation.
     // emit the event for the selected annotation.
-    (_options$annotationMa3 = options.annotationManager) === null || _options$annotationMa3 === void 0 || _options$annotationMa3.emit({
+    (_options$annotationMa5 = options.annotationManager) === null || _options$annotationMa5 === void 0 || _options$annotationMa5.emit({
       name: 'annotationSelectionChanged',
       data: {
         annotationId: id,
@@ -187,10 +257,10 @@ var applyDraft = exports.applyDraft = function applyDraft(editorView, options) {
 };
 var getDraft = exports.getDraft = function getDraft(editorView, _options) {
   return function () {
-    var _getRangeInlineNodeNa2;
-    var _ref6 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
-      isDrafting = _ref6.isDrafting,
-      draftDecorationSet = _ref6.draftDecorationSet;
+    var _getRangeInlineNodeNa3;
+    var _ref7 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
+      isDrafting = _ref7.isDrafting,
+      draftDecorationSet = _ref7.draftDecorationSet;
     if (!isDrafting) {
       return {
         success: false,
@@ -206,13 +276,13 @@ var getDraft = exports.getDraft = function getDraft(editorView, _options) {
     }
     var from = decorations[0].from;
     var targetElement = domRefFromPos(editorView, from);
-    var inlineNodeTypes = (_getRangeInlineNodeNa2 = (0, _annotation2.getRangeInlineNodeNames)({
+    var inlineNodeTypes = (_getRangeInlineNodeNa3 = (0, _annotation2.getRangeInlineNodeNames)({
       doc: editorView.state.doc,
       pos: {
         from: from,
         to: decorations[decorations.length - 1].to
       }
-    })) !== null && _getRangeInlineNodeNa2 !== void 0 ? _getRangeInlineNodeNa2 : [];
+    })) !== null && _getRangeInlineNodeNa3 !== void 0 ? _getRangeInlineNodeNa3 : [];
     return {
       success: true,
       inlineNodeTypes: inlineNodeTypes,
@@ -224,10 +294,10 @@ var getDraft = exports.getDraft = function getDraft(editorView, _options) {
 var setIsAnnotationSelected = exports.setIsAnnotationSelected = function setIsAnnotationSelected(editorView, options) {
   return function (id, isSelected) {
     var _selectedAnnotations$;
-    var _ref7 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
-      annotations = _ref7.annotations,
-      isDrafting = _ref7.isDrafting,
-      selectedAnnotations = _ref7.selectedAnnotations;
+    var _ref8 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
+      annotations = _ref8.annotations,
+      isDrafting = _ref8.isDrafting,
+      selectedAnnotations = _ref8.selectedAnnotations;
     if (isDrafting) {
       return {
         success: false,
@@ -249,10 +319,10 @@ var setIsAnnotationSelected = exports.setIsAnnotationSelected = function setIsAn
     if (isSelected !== isCurrentlySelected) {
       // the annotation is selection is changing.
       if (isCurrentlySelected && !isSelected) {
-        var _options$annotationMa4, _getAnnotationInlineN3;
+        var _options$annotationMa6, _getAnnotationInlineN3;
         // the selected annotaion is being unselected, so we need to close the view.
         (0, _editorCommands.closeComponent)()(editorView.state, editorView.dispatch);
-        (_options$annotationMa4 = options.annotationManager) === null || _options$annotationMa4 === void 0 || _options$annotationMa4.emit({
+        (_options$annotationMa6 = options.annotationManager) === null || _options$annotationMa6 === void 0 || _options$annotationMa6.emit({
           name: 'annotationSelectionChanged',
           data: {
             annotationId: id,
@@ -261,15 +331,15 @@ var setIsAnnotationSelected = exports.setIsAnnotationSelected = function setIsAn
           }
         });
       } else if (!isCurrentlySelected && isSelected) {
-        var _options$annotationMa6, _getAnnotationInlineN5;
+        var _options$annotationMa8, _getAnnotationInlineN5;
         // the annotation is currently not selected and is being selected, so we need to open the view.
         (0, _editorCommands.setSelectedAnnotation)(id)(editorView.state, editorView.dispatch);
 
         // the current annotations are going to be unselected. So we need to notify listeners of this change also.
         selectedAnnotations === null || selectedAnnotations === void 0 || selectedAnnotations.forEach(function (annotation) {
           if (annotation.id !== id) {
-            var _options$annotationMa5, _getAnnotationInlineN4;
-            (_options$annotationMa5 = options.annotationManager) === null || _options$annotationMa5 === void 0 || _options$annotationMa5.emit({
+            var _options$annotationMa7, _getAnnotationInlineN4;
+            (_options$annotationMa7 = options.annotationManager) === null || _options$annotationMa7 === void 0 || _options$annotationMa7.emit({
               name: 'annotationSelectionChanged',
               data: {
                 annotationId: annotation.id,
@@ -281,7 +351,7 @@ var setIsAnnotationSelected = exports.setIsAnnotationSelected = function setIsAn
         });
 
         // Lastly we need to emit the event for the selected annotation.
-        (_options$annotationMa6 = options.annotationManager) === null || _options$annotationMa6 === void 0 || _options$annotationMa6.emit({
+        (_options$annotationMa8 = options.annotationManager) === null || _options$annotationMa8 === void 0 || _options$annotationMa8.emit({
           name: 'annotationSelectionChanged',
           data: {
             annotationId: id,
@@ -300,9 +370,9 @@ var setIsAnnotationSelected = exports.setIsAnnotationSelected = function setIsAn
 var setIsAnnotationHovered = exports.setIsAnnotationHovered = function setIsAnnotationHovered(editorView, _options) {
   return function (id, isHovered) {
     var _hoveredAnnotations$f;
-    var _ref8 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
-      annotations = _ref8.annotations,
-      hoveredAnnotations = _ref8.hoveredAnnotations;
+    var _ref9 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
+      annotations = _ref9.annotations,
+      hoveredAnnotations = _ref9.hoveredAnnotations;
 
     // If there is no annotation state with this id then we can assume the annotation is invalid.
     if (!(annotations !== null && annotations !== void 0 && annotations.hasOwnProperty(id))) {
@@ -333,8 +403,8 @@ var setIsAnnotationHovered = exports.setIsAnnotationHovered = function setIsAnno
 };
 var clearAnnotation = exports.clearAnnotation = function clearAnnotation(editorView, options) {
   return function (id) {
-    var _ref9 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
-      annotations = _ref9.annotations;
+    var _ref0 = _utils2.inlineCommentPluginKey.getState(editorView.state) || {},
+      annotations = _ref0.annotations;
 
     // If there is no annotation state with this id then we can assume the annotation is invalid.
     if (!(annotations !== null && annotations !== void 0 && annotations.hasOwnProperty(id))) {

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

@@ -146,10 +146,13 @@ var getAnnotationViewKey = exports.getAnnotationViewKey = function getAnnotation
   }).join('_');
   return "view-annotation-wrapper_".concat(keys);
 };
+var isRemixExtension = function isRemixExtension(node) {
+  return node.type.name === 'extension' && node.attrs.extensionKey === 'native-embed:maui';
+};
 
 // During rollback, hide chart highlights and automatic comment opening, not saved marks.
 var shouldHideRemixAnnotation = exports.shouldHideRemixAnnotation = function shouldHideRemixAnnotation(node) {
-  return node.type.name === 'extension' && node.attrs.extensionKey === 'native-embed:maui' && !(0, _fg.fg)('cc_maui_annotations_on_extensions');
+  return isRemixExtension(node) && !(0, _fg.fg)('cc_maui_annotations_on_extensions');
 };
 var findAnnotationsInSelection = exports.findAnnotationsInSelection = function findAnnotationsInSelection(selection, doc) {
   var empty = selection.empty,
@@ -181,12 +184,14 @@ var findAnnotationsInSelection = exports.findAnnotationsInSelection = function f
     return [];
   }
   var annotationMark = doc.type.schema.marks.annotation;
-  var anchorAnnotationMarks = node && !shouldHideRemixAnnotation(node) ? node.marks : [];
+  // Opening Remix Edit moves the selection beside the chart. Only explicit comment
+  // actions should open its threads; a nearby caret must not select its annotations.
+  var anchorAnnotationMarks = node && !isRemixExtension(node) ? node.marks : [];
   var marks = [];
   if (annotationMark.isInSet(anchorAnnotationMarks)) {
     marks = anchorAnnotationMarks;
   }
-  if (nodeBefore && !shouldHideRemixAnnotation(nodeBefore) && annotationMark.isInSet(nodeBefore.marks)) {
+  if (nodeBefore && !isRemixExtension(nodeBefore) && annotationMark.isInSet(nodeBefore.marks)) {
     var _marks;
     var existingMarkIds = marks.map(function (m) {
       return m.attrs.id;

package/dist/es2019/annotationPlugin.js

@@ -88,7 +88,10 @@ export const annotationPlugin = ({
       const pluginState = getPluginState(editorState) || undefined;
       const clonedPluginState = Object.assign({}, pluginState);
       clonedPluginState === null || clonedPluginState === void 0 ? true : delete clonedPluginState.featureFlagsPluginState;
-      return clonedPluginState;
+      return {
+        ...clonedPluginState,
+        annotationManager: annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.annotationManager
+      };
     },
     pmPlugins: () => [{
       name: 'annotation',

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

@@ -1,14 +1,18 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils/annotation';
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { setInlineCommentDraftState, createAnnotation, setSelectedAnnotation, closeComponent, setHoveredAnnotation, removeInlineCommentFromDoc } from '../editor-commands';
 import { AnnotationSelectionType } from '../types';
+import { resolveAnnotatableTargetFromLocalId } from './resolve-annotatable-target';
 import { inlineCommentPluginKey, isSelectionValid } from './utils';
 const ERROR_REASON_DRAFT_NOT_STARTED = 'draft-not-started';
 const ERROR_REASON_DRAFT_IN_PROGRESS = 'draft-in-progress';
 const ERROR_REASON_RANGE_MISSING = 'range-no-longer-exists';
 const ERROR_REASON_RANGE_INVALID = 'invalid-range';
 const ERROR_REASON_ID_INVALID = 'id-not-valid';
+const ERROR_REASON_INVALID_LOCAL_ID = 'invalid-localId';
 const domRefFromPos = (view, position) => {
   let dom;
   try {
@@ -38,8 +42,8 @@ export const allowAnnotation = (editorView, options) => () => {
   }
   return isSelectionValid(editorView.state, options.provider.supportedBlockNodes, options.provider.isBlockNodeSupported) === AnnotationSelectionType.VALID;
 };
-export const startDraft = (editorView, options) => () => {
-  var _getRangeInlineNodeNa, _options$annotationMa2;
+export const startDraft = (editorView, options) => localId => {
+  var _getRangeInlineNodeNa2, _options$annotationMa3;
   const {
     isDrafting,
     selectedAnnotations
@@ -68,6 +72,71 @@ export const startDraft = (editorView, options) => () => {
       });
     });
   }
+  if (localId !== undefined) {
+    var _$target$parent, _target$node$attrs$id, _getRangeInlineNodeNa, _options$annotationMa2;
+    const target = resolveAnnotatableTargetFromLocalId(editorView.state, localId, {
+      supportedBlockNodes: options.provider.supportedBlockNodes
+    });
+    if (!target) {
+      return {
+        success: false,
+        reason: ERROR_REASON_INVALID_LOCAL_ID
+      };
+    }
+
+    // The resolver returns the node accepting the annotation (the inner `media`), but
+    // `isSelectionValid` requires the selection to be on the selectable `mediaSingle`.
+    const {
+      doc
+    } = editorView.state;
+    let selectionPos = target.pos;
+    const $target = doc.resolve(target.pos);
+    if (target.node.type.name === 'media' && ((_$target$parent = $target.parent) === null || _$target$parent === void 0 ? void 0 : _$target$parent.type.name) === 'mediaSingle') {
+      selectionPos = $target.before();
+    }
+
+    // A NodeSelection makes resolveDraftBookmark record isBlockNode: true.
+    editorView.dispatch(editorView.state.tr.setSelection(NodeSelection.create(doc, selectionPos)));
+    const targetNodeId = (_target$node$attrs$id = target.node.attrs.id) !== null && _target$node$attrs$id !== void 0 ? _target$node$attrs$id : target.node.attrs.localId;
+    setInlineCommentDraftState(options.editorAnalyticsAPI, options.provider.supportedBlockNodes, options.api, options.provider.isBlockNodeSupported)(true, INPUT_METHOD.FLOATING_TB, 'block', targetNodeId, true)(editorView.state, editorView.dispatch);
+    const {
+      draftDecorationSet
+    } = inlineCommentPluginKey.getState(editorView.state) || {};
+    const decorations = draftDecorationSet === null || draftDecorationSet === void 0 ? void 0 : draftDecorationSet.find();
+    if (!(decorations !== null && decorations !== void 0 && decorations.length)) {
+      return {
+        success: false,
+        reason: ERROR_REASON_RANGE_INVALID
+      };
+    }
+    const from = decorations[0].from;
+    const targetElement = domRefFromPos(editorView, from);
+    const inlineNodeTypes = (_getRangeInlineNodeNa = getRangeInlineNodeNames({
+      doc: editorView.state.doc,
+      pos: {
+        from,
+        to: decorations[decorations.length - 1].to
+      }
+    })) !== null && _getRangeInlineNodeNa !== void 0 ? _getRangeInlineNodeNa : [];
+    const targetNodeType = target.node.type.name;
+    (_options$annotationMa2 = options.annotationManager) === null || _options$annotationMa2 === void 0 ? void 0 : _options$annotationMa2.emit({
+      name: 'draftAnnotationStarted',
+      data: {
+        targetElement,
+        actionResult: undefined,
+        inlineNodeTypes,
+        targetNodeType
+      }
+    });
+    return {
+      success: true,
+      targetElement,
+      // In Editor the action result is undefined, because the editor will perform the transaction on the document.
+      actionResult: undefined,
+      inlineNodeTypes,
+      targetNodeType
+    };
+  }
   setInlineCommentDraftState(options.editorAnalyticsAPI, options.provider.supportedBlockNodes, options.api, options.provider.isBlockNodeSupported)(true)(editorView.state, editorView.dispatch);
   const {
     draftDecorationSet
@@ -83,14 +152,14 @@ export const startDraft = (editorView, options) => () => {
   }
   const from = decorations[0].from;
   const targetElement = domRefFromPos(editorView, from);
-  const inlineNodeTypes = (_getRangeInlineNodeNa = getRangeInlineNodeNames({
+  const inlineNodeTypes = (_getRangeInlineNodeNa2 = getRangeInlineNodeNames({
     doc: editorView.state.doc,
     pos: {
       from,
       to: decorations[decorations.length - 1].to
     }
-  })) !== null && _getRangeInlineNodeNa !== void 0 ? _getRangeInlineNodeNa : [];
-  (_options$annotationMa2 = options.annotationManager) === null || _options$annotationMa2 === void 0 ? void 0 : _options$annotationMa2.emit({
+  })) !== null && _getRangeInlineNodeNa2 !== void 0 ? _getRangeInlineNodeNa2 : [];
+  (_options$annotationMa3 = options.annotationManager) === null || _options$annotationMa3 === void 0 ? void 0 : _options$annotationMa3.emit({
     name: 'draftAnnotationStarted',
     data: {
       targetElement,
@@ -107,6 +176,7 @@ export const startDraft = (editorView, options) => () => {
   };
 };
 export const clearDraft = (editorView, options) => () => {
+  var _options$annotationMa4;
   const {
     isDrafting,
     draftDecorationSet
@@ -126,12 +196,15 @@ export const clearDraft = (editorView, options) => () => {
   }
   setInlineCommentDraftState(options.editorAnalyticsAPI, undefined, options.api)(false)(editorView.state, editorView.dispatch);
   !editorView.hasFocus() && editorView.focus();
+  (_options$annotationMa4 = options.annotationManager) === null || _options$annotationMa4 === void 0 ? void 0 : _options$annotationMa4.emit({
+    name: 'draftAnnotationCleared'
+  });
   return {
     success: true
   };
 };
 export const applyDraft = (editorView, options) => id => {
-  var _options$annotationMa3, _getAnnotationInlineN2;
+  var _options$annotationMa5, _getAnnotationInlineN2;
   const {
     isDrafting,
     draftDecorationSet,
@@ -160,7 +233,7 @@ export const applyDraft = (editorView, options) => id => {
 
   // When a draft is applied it is automatically selected, so we need to set the selected annotation.
   // emit the event for the selected annotation.
-  (_options$annotationMa3 = options.annotationManager) === null || _options$annotationMa3 === void 0 ? void 0 : _options$annotationMa3.emit({
+  (_options$annotationMa5 = options.annotationManager) === null || _options$annotationMa5 === void 0 ? void 0 : _options$annotationMa5.emit({
     name: 'annotationSelectionChanged',
     data: {
       annotationId: id,
@@ -177,7 +250,7 @@ export const applyDraft = (editorView, options) => id => {
   };
 };
 export const getDraft = (editorView, _options) => () => {
-  var _getRangeInlineNodeNa2;
+  var _getRangeInlineNodeNa3;
   const {
     isDrafting,
     draftDecorationSet
@@ -197,13 +270,13 @@ export const getDraft = (editorView, _options) => () => {
   }
   const from = decorations[0].from;
   const targetElement = domRefFromPos(editorView, from);
-  const inlineNodeTypes = (_getRangeInlineNodeNa2 = getRangeInlineNodeNames({
+  const inlineNodeTypes = (_getRangeInlineNodeNa3 = getRangeInlineNodeNames({
     doc: editorView.state.doc,
     pos: {
       from,
       to: decorations[decorations.length - 1].to
     }
-  })) !== null && _getRangeInlineNodeNa2 !== void 0 ? _getRangeInlineNodeNa2 : [];
+  })) !== null && _getRangeInlineNodeNa3 !== void 0 ? _getRangeInlineNodeNa3 : [];
   return {
     success: true,
     inlineNodeTypes,
@@ -237,10 +310,10 @@ export const setIsAnnotationSelected = (editorView, options) => (id, isSelected)
   if (isSelected !== isCurrentlySelected) {
     // the annotation is selection is changing.
     if (isCurrentlySelected && !isSelected) {
-      var _options$annotationMa4, _getAnnotationInlineN3;
+      var _options$annotationMa6, _getAnnotationInlineN3;
       // the selected annotaion is being unselected, so we need to close the view.
       closeComponent()(editorView.state, editorView.dispatch);
-      (_options$annotationMa4 = options.annotationManager) === null || _options$annotationMa4 === void 0 ? void 0 : _options$annotationMa4.emit({
+      (_options$annotationMa6 = options.annotationManager) === null || _options$annotationMa6 === void 0 ? void 0 : _options$annotationMa6.emit({
         name: 'annotationSelectionChanged',
         data: {
           annotationId: id,
@@ -249,15 +322,15 @@ export const setIsAnnotationSelected = (editorView, options) => (id, isSelected)
         }
       });
     } else if (!isCurrentlySelected && isSelected) {
-      var _options$annotationMa6, _getAnnotationInlineN5;
+      var _options$annotationMa8, _getAnnotationInlineN5;
       // the annotation is currently not selected and is being selected, so we need to open the view.
       setSelectedAnnotation(id)(editorView.state, editorView.dispatch);
 
       // the current annotations are going to be unselected. So we need to notify listeners of this change also.
       selectedAnnotations === null || selectedAnnotations === void 0 ? void 0 : selectedAnnotations.forEach(annotation => {
         if (annotation.id !== id) {
-          var _options$annotationMa5, _getAnnotationInlineN4;
-          (_options$annotationMa5 = options.annotationManager) === null || _options$annotationMa5 === void 0 ? void 0 : _options$annotationMa5.emit({
+          var _options$annotationMa7, _getAnnotationInlineN4;
+          (_options$annotationMa7 = options.annotationManager) === null || _options$annotationMa7 === void 0 ? void 0 : _options$annotationMa7.emit({
             name: 'annotationSelectionChanged',
             data: {
               annotationId: annotation.id,
@@ -269,7 +342,7 @@ export const setIsAnnotationSelected = (editorView, options) => (id, isSelected)
       });
 
       // Lastly we need to emit the event for the selected annotation.
-      (_options$annotationMa6 = options.annotationManager) === null || _options$annotationMa6 === void 0 ? void 0 : _options$annotationMa6.emit({
+      (_options$annotationMa8 = options.annotationManager) === null || _options$annotationMa8 === void 0 ? void 0 : _options$annotationMa8.emit({
         name: 'annotationSelectionChanged',
         data: {
           annotationId: id,

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

@@ -114,9 +114,10 @@ export const getAnnotationViewKey = annotations => {
   const keys = annotations.map(mark => mark.id).join('_');
   return `view-annotation-wrapper_${keys}`;
 };
+const isRemixExtension = node => node.type.name === 'extension' && node.attrs.extensionKey === 'native-embed:maui';
 
 // During rollback, hide chart highlights and automatic comment opening, not saved marks.
-export const shouldHideRemixAnnotation = node => node.type.name === 'extension' && node.attrs.extensionKey === 'native-embed:maui' && !fg('cc_maui_annotations_on_extensions');
+export const shouldHideRemixAnnotation = node => isRemixExtension(node) && !fg('cc_maui_annotations_on_extensions');
 export const findAnnotationsInSelection = (selection, doc) => {
   const {
     empty,
@@ -147,12 +148,14 @@ export const findAnnotationsInSelection = (selection, doc) => {
     return [];
   }
   const annotationMark = doc.type.schema.marks.annotation;
-  const anchorAnnotationMarks = node && !shouldHideRemixAnnotation(node) ? node.marks : [];
+  // Opening Remix Edit moves the selection beside the chart. Only explicit comment
+  // actions should open its threads; a nearby caret must not select its annotations.
+  const anchorAnnotationMarks = node && !isRemixExtension(node) ? node.marks : [];
   let marks = [];
   if (annotationMark.isInSet(anchorAnnotationMarks)) {
     marks = anchorAnnotationMarks;
   }
-  if (nodeBefore && !shouldHideRemixAnnotation(nodeBefore) && annotationMark.isInSet(nodeBefore.marks)) {
+  if (nodeBefore && !isRemixExtension(nodeBefore) && annotationMark.isInSet(nodeBefore.marks)) {
     const existingMarkIds = marks.map(m => m.attrs.id);
     marks = marks.concat(...nodeBefore.marks.filter(m => !existingMarkIds.includes(m.attrs.id)));
   }

package/dist/esm/annotationPlugin.js

@@ -113,7 +113,9 @@ export var annotationPlugin = function annotationPlugin(_ref) {
       var pluginState = getPluginState(editorState) || undefined;
       var clonedPluginState = Object.assign({}, pluginState);
       clonedPluginState === null || clonedPluginState === void 0 || delete clonedPluginState.featureFlagsPluginState;
-      return clonedPluginState;
+      return _objectSpread(_objectSpread({}, clonedPluginState), {}, {
+        annotationManager: annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.annotationManager
+      });
     },
     pmPlugins: function pmPlugins() {
       return [{

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

@@ -1,14 +1,18 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema/annotation';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { getAnnotationInlineNodeTypes, getRangeInlineNodeNames } from '@atlaskit/editor-common/utils/annotation';
+import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { setInlineCommentDraftState, createAnnotation, setSelectedAnnotation, closeComponent, setHoveredAnnotation, removeInlineCommentFromDoc } from '../editor-commands';
 import { AnnotationSelectionType } from '../types';
+import { resolveAnnotatableTargetFromLocalId } from './resolve-annotatable-target';
 import { inlineCommentPluginKey, isSelectionValid } from './utils';
 var ERROR_REASON_DRAFT_NOT_STARTED = 'draft-not-started';
 var ERROR_REASON_DRAFT_IN_PROGRESS = 'draft-in-progress';
 var ERROR_REASON_RANGE_MISSING = 'range-no-longer-exists';
 var ERROR_REASON_RANGE_INVALID = 'invalid-range';
 var ERROR_REASON_ID_INVALID = 'id-not-valid';
+var ERROR_REASON_INVALID_LOCAL_ID = 'invalid-localId';
 var domRefFromPos = function domRefFromPos(view, position) {
   var dom;
   try {
@@ -40,8 +44,8 @@ export var allowAnnotation = function allowAnnotation(editorView, options) {
   };
 };
 export var startDraft = function startDraft(editorView, options) {
-  return function () {
-    var _getRangeInlineNodeNa, _options$annotationMa2;
+  return function (localId) {
+    var _getRangeInlineNodeNa2, _options$annotationMa3;
     var _ref2 = inlineCommentPluginKey.getState(editorView.state) || {},
       isDrafting = _ref2.isDrafting,
       selectedAnnotations = _ref2.selectedAnnotations;
@@ -69,9 +73,71 @@ export var startDraft = function startDraft(editorView, options) {
         });
       });
     }
+    if (localId !== undefined) {
+      var _$target$parent, _target$node$attrs$id, _getRangeInlineNodeNa, _options$annotationMa2;
+      var target = resolveAnnotatableTargetFromLocalId(editorView.state, localId, {
+        supportedBlockNodes: options.provider.supportedBlockNodes
+      });
+      if (!target) {
+        return {
+          success: false,
+          reason: ERROR_REASON_INVALID_LOCAL_ID
+        };
+      }
+
+      // The resolver returns the node accepting the annotation (the inner `media`), but
+      // `isSelectionValid` requires the selection to be on the selectable `mediaSingle`.
+      var doc = editorView.state.doc;
+      var selectionPos = target.pos;
+      var $target = doc.resolve(target.pos);
+      if (target.node.type.name === 'media' && ((_$target$parent = $target.parent) === null || _$target$parent === void 0 ? void 0 : _$target$parent.type.name) === 'mediaSingle') {
+        selectionPos = $target.before();
+      }
+
+      // A NodeSelection makes resolveDraftBookmark record isBlockNode: true.
+      editorView.dispatch(editorView.state.tr.setSelection(NodeSelection.create(doc, selectionPos)));
+      var targetNodeId = (_target$node$attrs$id = target.node.attrs.id) !== null && _target$node$attrs$id !== void 0 ? _target$node$attrs$id : target.node.attrs.localId;
+      setInlineCommentDraftState(options.editorAnalyticsAPI, options.provider.supportedBlockNodes, options.api, options.provider.isBlockNodeSupported)(true, INPUT_METHOD.FLOATING_TB, 'block', targetNodeId, 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();
+      if (!(_decorations !== null && _decorations !== void 0 && _decorations.length)) {
+        return {
+          success: false,
+          reason: ERROR_REASON_RANGE_INVALID
+        };
+      }
+      var _from = _decorations[0].from;
+      var _targetElement = domRefFromPos(editorView, _from);
+      var _inlineNodeTypes = (_getRangeInlineNodeNa = getRangeInlineNodeNames({
+        doc: editorView.state.doc,
+        pos: {
+          from: _from,
+          to: _decorations[_decorations.length - 1].to
+        }
+      })) !== null && _getRangeInlineNodeNa !== void 0 ? _getRangeInlineNodeNa : [];
+      var targetNodeType = target.node.type.name;
+      (_options$annotationMa2 = options.annotationManager) === null || _options$annotationMa2 === void 0 || _options$annotationMa2.emit({
+        name: 'draftAnnotationStarted',
+        data: {
+          targetElement: _targetElement,
+          actionResult: undefined,
+          inlineNodeTypes: _inlineNodeTypes,
+          targetNodeType: targetNodeType
+        }
+      });
+      return {
+        success: true,
+        targetElement: _targetElement,
+        // In Editor the action result is undefined, because the editor will perform the transaction on the document.
+        actionResult: undefined,
+        inlineNodeTypes: _inlineNodeTypes,
+        targetNodeType: targetNodeType
+      };
+    }
     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 _ref4 = inlineCommentPluginKey.getState(editorView.state) || {},
+      draftDecorationSet = _ref4.draftDecorationSet;
     var decorations = draftDecorationSet === null || draftDecorationSet === void 0 ? void 0 : draftDecorationSet.find();
 
     // If the matching decorations is not found containing the id, it means something went wrong with the draft.
@@ -83,14 +149,14 @@ export var startDraft = function startDraft(editorView, options) {
     }
     var from = decorations[0].from;
     var targetElement = domRefFromPos(editorView, from);
-    var inlineNodeTypes = (_getRangeInlineNodeNa = getRangeInlineNodeNames({
+    var inlineNodeTypes = (_getRangeInlineNodeNa2 = getRangeInlineNodeNames({
       doc: editorView.state.doc,
       pos: {
         from: from,
         to: decorations[decorations.length - 1].to
       }
-    })) !== null && _getRangeInlineNodeNa !== void 0 ? _getRangeInlineNodeNa : [];
-    (_options$annotationMa2 = options.annotationManager) === null || _options$annotationMa2 === void 0 || _options$annotationMa2.emit({
+    })) !== null && _getRangeInlineNodeNa2 !== void 0 ? _getRangeInlineNodeNa2 : [];
+    (_options$annotationMa3 = options.annotationManager) === null || _options$annotationMa3 === void 0 || _options$annotationMa3.emit({
       name: 'draftAnnotationStarted',
       data: {
         targetElement: targetElement,
@@ -109,9 +175,10 @@ export var startDraft = function startDraft(editorView, options) {
 };
 export var clearDraft = function clearDraft(editorView, options) {
   return function () {
-    var _ref4 = inlineCommentPluginKey.getState(editorView.state) || {},
-      isDrafting = _ref4.isDrafting,
-      draftDecorationSet = _ref4.draftDecorationSet;
+    var _options$annotationMa4;
+    var _ref5 = inlineCommentPluginKey.getState(editorView.state) || {},
+      isDrafting = _ref5.isDrafting,
+      draftDecorationSet = _ref5.draftDecorationSet;
     if (!isDrafting) {
       return {
         success: false,
@@ -127,6 +194,9 @@ export var clearDraft = function clearDraft(editorView, options) {
     }
     setInlineCommentDraftState(options.editorAnalyticsAPI, undefined, options.api)(false)(editorView.state, editorView.dispatch);
     !editorView.hasFocus() && editorView.focus();
+    (_options$annotationMa4 = options.annotationManager) === null || _options$annotationMa4 === void 0 || _options$annotationMa4.emit({
+      name: 'draftAnnotationCleared'
+    });
     return {
       success: true
     };
@@ -134,11 +204,11 @@ export var clearDraft = function clearDraft(editorView, options) {
 };
 export var applyDraft = function applyDraft(editorView, options) {
   return function (id) {
-    var _options$annotationMa3, _getAnnotationInlineN2;
-    var _ref5 = inlineCommentPluginKey.getState(editorView.state) || {},
-      isDrafting = _ref5.isDrafting,
-      draftDecorationSet = _ref5.draftDecorationSet,
-      bookmark = _ref5.bookmark;
+    var _options$annotationMa5, _getAnnotationInlineN2;
+    var _ref6 = inlineCommentPluginKey.getState(editorView.state) || {},
+      isDrafting = _ref6.isDrafting,
+      draftDecorationSet = _ref6.draftDecorationSet,
+      bookmark = _ref6.bookmark;
     if (!isDrafting) {
       return {
         success: false,
@@ -162,7 +232,7 @@ export var applyDraft = function applyDraft(editorView, options) {
 
     // When a draft is applied it is automatically selected, so we need to set the selected annotation.
     // emit the event for the selected annotation.
-    (_options$annotationMa3 = options.annotationManager) === null || _options$annotationMa3 === void 0 || _options$annotationMa3.emit({
+    (_options$annotationMa5 = options.annotationManager) === null || _options$annotationMa5 === void 0 || _options$annotationMa5.emit({
       name: 'annotationSelectionChanged',
       data: {
         annotationId: id,
@@ -181,10 +251,10 @@ export var applyDraft = function applyDraft(editorView, options) {
 };
 export var getDraft = function getDraft(editorView, _options) {
   return function () {
-    var _getRangeInlineNodeNa2;
-    var _ref6 = inlineCommentPluginKey.getState(editorView.state) || {},
-      isDrafting = _ref6.isDrafting,
-      draftDecorationSet = _ref6.draftDecorationSet;
+    var _getRangeInlineNodeNa3;
+    var _ref7 = inlineCommentPluginKey.getState(editorView.state) || {},
+      isDrafting = _ref7.isDrafting,
+      draftDecorationSet = _ref7.draftDecorationSet;
     if (!isDrafting) {
       return {
         success: false,
@@ -200,13 +270,13 @@ export var getDraft = function getDraft(editorView, _options) {
     }
     var from = decorations[0].from;
     var targetElement = domRefFromPos(editorView, from);
-    var inlineNodeTypes = (_getRangeInlineNodeNa2 = getRangeInlineNodeNames({
+    var inlineNodeTypes = (_getRangeInlineNodeNa3 = getRangeInlineNodeNames({
       doc: editorView.state.doc,
       pos: {
         from: from,
         to: decorations[decorations.length - 1].to
       }
-    })) !== null && _getRangeInlineNodeNa2 !== void 0 ? _getRangeInlineNodeNa2 : [];
+    })) !== null && _getRangeInlineNodeNa3 !== void 0 ? _getRangeInlineNodeNa3 : [];
     return {
       success: true,
       inlineNodeTypes: inlineNodeTypes,
@@ -218,10 +288,10 @@ export var getDraft = function getDraft(editorView, _options) {
 export var setIsAnnotationSelected = function setIsAnnotationSelected(editorView, options) {
   return function (id, isSelected) {
     var _selectedAnnotations$;
-    var _ref7 = inlineCommentPluginKey.getState(editorView.state) || {},
-      annotations = _ref7.annotations,
-      isDrafting = _ref7.isDrafting,
-      selectedAnnotations = _ref7.selectedAnnotations;
+    var _ref8 = inlineCommentPluginKey.getState(editorView.state) || {},
+      annotations = _ref8.annotations,
+      isDrafting = _ref8.isDrafting,
+      selectedAnnotations = _ref8.selectedAnnotations;
     if (isDrafting) {
       return {
         success: false,
@@ -243,10 +313,10 @@ export var setIsAnnotationSelected = function setIsAnnotationSelected(editorView
     if (isSelected !== isCurrentlySelected) {
       // the annotation is selection is changing.
       if (isCurrentlySelected && !isSelected) {
-        var _options$annotationMa4, _getAnnotationInlineN3;
+        var _options$annotationMa6, _getAnnotationInlineN3;
         // the selected annotaion is being unselected, so we need to close the view.
         closeComponent()(editorView.state, editorView.dispatch);
-        (_options$annotationMa4 = options.annotationManager) === null || _options$annotationMa4 === void 0 || _options$annotationMa4.emit({
+        (_options$annotationMa6 = options.annotationManager) === null || _options$annotationMa6 === void 0 || _options$annotationMa6.emit({
           name: 'annotationSelectionChanged',
           data: {
             annotationId: id,
@@ -255,15 +325,15 @@ export var setIsAnnotationSelected = function setIsAnnotationSelected(editorView
           }
         });
       } else if (!isCurrentlySelected && isSelected) {
-        var _options$annotationMa6, _getAnnotationInlineN5;
+        var _options$annotationMa8, _getAnnotationInlineN5;
         // the annotation is currently not selected and is being selected, so we need to open the view.
         setSelectedAnnotation(id)(editorView.state, editorView.dispatch);
 
         // the current annotations are going to be unselected. So we need to notify listeners of this change also.
         selectedAnnotations === null || selectedAnnotations === void 0 || selectedAnnotations.forEach(function (annotation) {
           if (annotation.id !== id) {
-            var _options$annotationMa5, _getAnnotationInlineN4;
-            (_options$annotationMa5 = options.annotationManager) === null || _options$annotationMa5 === void 0 || _options$annotationMa5.emit({
+            var _options$annotationMa7, _getAnnotationInlineN4;
+            (_options$annotationMa7 = options.annotationManager) === null || _options$annotationMa7 === void 0 || _options$annotationMa7.emit({
               name: 'annotationSelectionChanged',
               data: {
                 annotationId: annotation.id,
@@ -275,7 +345,7 @@ export var setIsAnnotationSelected = function setIsAnnotationSelected(editorView
         });
 
         // Lastly we need to emit the event for the selected annotation.
-        (_options$annotationMa6 = options.annotationManager) === null || _options$annotationMa6 === void 0 || _options$annotationMa6.emit({
+        (_options$annotationMa8 = options.annotationManager) === null || _options$annotationMa8 === void 0 || _options$annotationMa8.emit({
           name: 'annotationSelectionChanged',
           data: {
             annotationId: id,
@@ -294,9 +364,9 @@ export var setIsAnnotationSelected = function setIsAnnotationSelected(editorView
 export var setIsAnnotationHovered = function setIsAnnotationHovered(editorView, _options) {
   return function (id, isHovered) {
     var _hoveredAnnotations$f;
-    var _ref8 = inlineCommentPluginKey.getState(editorView.state) || {},
-      annotations = _ref8.annotations,
-      hoveredAnnotations = _ref8.hoveredAnnotations;
+    var _ref9 = inlineCommentPluginKey.getState(editorView.state) || {},
+      annotations = _ref9.annotations,
+      hoveredAnnotations = _ref9.hoveredAnnotations;
 
     // If there is no annotation state with this id then we can assume the annotation is invalid.
     if (!(annotations !== null && annotations !== void 0 && annotations.hasOwnProperty(id))) {
@@ -327,8 +397,8 @@ export var setIsAnnotationHovered = function setIsAnnotationHovered(editorView,
 };
 export var clearAnnotation = function clearAnnotation(editorView, options) {
   return function (id) {
-    var _ref9 = inlineCommentPluginKey.getState(editorView.state) || {},
-      annotations = _ref9.annotations;
+    var _ref0 = inlineCommentPluginKey.getState(editorView.state) || {},
+      annotations = _ref0.annotations;
 
     // If there is no annotation state with this id then we can assume the annotation is invalid.
     if (!(annotations !== null && annotations !== void 0 && annotations.hasOwnProperty(id))) {

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

@@ -129,10 +129,13 @@ export var getAnnotationViewKey = function getAnnotationViewKey(annotations) {
   }).join('_');
   return "view-annotation-wrapper_".concat(keys);
 };
+var isRemixExtension = function isRemixExtension(node) {
+  return node.type.name === 'extension' && node.attrs.extensionKey === 'native-embed:maui';
+};
 
 // During rollback, hide chart highlights and automatic comment opening, not saved marks.
 export var shouldHideRemixAnnotation = function shouldHideRemixAnnotation(node) {
-  return node.type.name === 'extension' && node.attrs.extensionKey === 'native-embed:maui' && !fg('cc_maui_annotations_on_extensions');
+  return isRemixExtension(node) && !fg('cc_maui_annotations_on_extensions');
 };
 export var findAnnotationsInSelection = function findAnnotationsInSelection(selection, doc) {
   var empty = selection.empty,
@@ -164,12 +167,14 @@ export var findAnnotationsInSelection = function findAnnotationsInSelection(sele
     return [];
   }
   var annotationMark = doc.type.schema.marks.annotation;
-  var anchorAnnotationMarks = node && !shouldHideRemixAnnotation(node) ? node.marks : [];
+  // Opening Remix Edit moves the selection beside the chart. Only explicit comment
+  // actions should open its threads; a nearby caret must not select its annotations.
+  var anchorAnnotationMarks = node && !isRemixExtension(node) ? node.marks : [];
   var marks = [];
   if (annotationMark.isInSet(anchorAnnotationMarks)) {
     marks = anchorAnnotationMarks;
   }
-  if (nodeBefore && !shouldHideRemixAnnotation(nodeBefore) && annotationMark.isInSet(nodeBefore.marks)) {
+  if (nodeBefore && !isRemixExtension(nodeBefore) && annotationMark.isInSet(nodeBefore.marks)) {
     var _marks;
     var existingMarkIds = marks.map(function (m) {
       return m.attrs.id;

package/dist/types/annotationPluginType.d.ts

@@ -1,3 +1,4 @@
+import type { AnnotationManager } from '@atlaskit/editor-common/annotation';
 import type { Command } from '@atlaskit/editor-common/types/command';
 import type { ExtractInjectionAPI, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics/analyticsPluginType';
@@ -26,6 +27,10 @@ export type AnnotationPluginDependencies = [
     OptionalPlugin<UserIntentPlugin>
 ];
 export type AnnotationPluginOptions = AnnotationProviders;
+/** Inline comment plugin state, plus the manager so other plugins (e.g. media) can use it. */
+export type AnnotationSharedState = InlineCommentPluginState & {
+    annotationManager?: AnnotationManager;
+};
 export type AnnotationPlugin = NextEditorPlugin<'annotation', {
     actions: {
         /**
@@ -73,7 +78,7 @@ export type AnnotationPlugin = NextEditorPlugin<'annotation', {
     };
     dependencies: AnnotationPluginDependencies;
     pluginConfiguration: AnnotationPluginOptions | undefined;
-    sharedState: InlineCommentPluginState | undefined;
+    sharedState: AnnotationSharedState | undefined;
 }>;
 export type AnnotationPluginInjectionAPI = ExtractInjectionAPI<AnnotationPlugin> | undefined;
 export {};

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

@@ -3,7 +3,7 @@ import type { ApplyDraftResult, ClearAnnotationResult, ClearDraftResult, GetDraf
 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 startDraft: (editorView: EditorView, options: InlineCommentPluginOptions) => () => StartDraftResult;
+export declare const startDraft: (editorView: EditorView, options: InlineCommentPluginOptions) => (localId?: string) => StartDraftResult;
 export declare const clearDraft: (editorView: EditorView, options: InlineCommentPluginOptions) => () => ClearDraftResult;
 export declare const applyDraft: (editorView: EditorView, options: InlineCommentPluginOptions) => (id: AnnotationId) => ApplyDraftResult;
 export declare const getDraft: (editorView: EditorView, _options: InlineCommentPluginOptions) => () => GetDraftResult;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-annotation",
-	"version": "27.0.5",
+	"version": "28.0.0",
 	"description": "Annotation plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -20,12 +20,12 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/adf-schema": "^57.7.0",
-		"@atlaskit/editor-plugin-analytics": "^27.0.0",
-		"@atlaskit/editor-plugin-connectivity": "^27.0.0",
-		"@atlaskit/editor-plugin-editor-viewmode-effects": "^27.0.0",
-		"@atlaskit/editor-plugin-feature-flags": "^26.0.0",
-		"@atlaskit/editor-plugin-toolbar": "^24.0.0",
-		"@atlaskit/editor-plugin-user-intent": "^25.0.0",
+		"@atlaskit/editor-plugin-analytics": "^28.0.0",
+		"@atlaskit/editor-plugin-connectivity": "^28.0.0",
+		"@atlaskit/editor-plugin-editor-viewmode-effects": "^28.0.0",
+		"@atlaskit/editor-plugin-feature-flags": "^27.0.0",
+		"@atlaskit/editor-plugin-toolbar": "^25.0.0",
+		"@atlaskit/editor-plugin-user-intent": "^26.0.0",
 		"@atlaskit/editor-prosemirror": "^9.0.0",
 		"@atlaskit/editor-toolbar": "^2.8.0",
 		"@atlaskit/editor-toolbar-model": "^1.2.0",
@@ -35,7 +35,7 @@
 		"@babel/runtime": "^7.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^131.2.0",
+		"@atlaskit/editor-common": "^132.0.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"