@atlaskit/editor-plugin-annotation 1.8.0 → 1.9.1

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.9.1
+
+### Patch Changes
+
+-   [#97803](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97803)
+    [`4c1023ffb3d8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4c1023ffb3d8) -
+    [ED-23094] Ignore annotations on mediaInline node, including highlight styling,
+    event(onMouseEnter, onClick) listeners, update active annotations when the node is selected or
+    the cursor is right after the node
+
+## 1.9.0
+
+### Minor Changes
+
+-   [#100662](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/100662)
+    [`3d61cd8f2afe`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3d61cd8f2afe) -
+    [ED-23355] Update annotation viewed event to with attributes nodeType and method to capture
+    usage for comments on media
+
+### Patch Changes
+
+-   Updated dependencies
+
 ## 1.8.0
 
 ### Minor Changes

package/dist/cjs/commands/index.js

@@ -138,7 +138,7 @@ var getDraftCommandAction = function getDraftCommandAction(drafting, targetType,
  */
 var showInlineCommentForBlockNode = exports.showInlineCommentForBlockNode = function showInlineCommentForBlockNode() {
   var supportedBlockNodes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  return function (node) {
+  return function (node, viewMethod) {
     return function (state, dispatch) {
       var pluginState = (0, _utils.getPluginState)(state);
       var annotation = state.schema.marks.annotation;
@@ -159,7 +159,8 @@ var showInlineCommentForBlockNode = exports.showInlineCommentForBlockNode = func
             dispatch(state.tr.setMeta(_utils.inlineCommentPluginKey, {
               type: _types.ACTIONS.SET_SELECTED_ANNOTATION,
               data: {
-                selectedAnnotations: unresolvedAnnotationMarks
+                selectedAnnotations: unresolvedAnnotationMarks,
+                selectAnnotationMethod: viewMethod
               }
             }));
             return true;

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

@@ -220,11 +220,18 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
           annotations = _ref5.annotations,
           selectedAnnotations = _ref5.selectedAnnotations,
           isVisible = _ref5.isVisible,
-          isInlineCommentViewClosed = _ref5.isInlineCommentViewClosed;
+          isInlineCommentViewClosed = _ref5.isInlineCommentViewClosed,
+          featureFlagsPluginState = _ref5.featureFlagsPluginState;
         var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : _view.DecorationSet.empty;
         var focusDecorations = [];
+        var isCommentsOnMediaMediaInlineBugFixEnabled = featureFlagsPluginState === null || featureFlagsPluginState === void 0 ? void 0 : featureFlagsPluginState.commentsOnMediaMediaInlineBugFix;
         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 (isCommentsOnMediaMediaInlineBugFixEnabled && 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));
           node.marks.filter(function (mark) {
             return mark.type === state.schema.marks.annotation;

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

@@ -22,7 +22,7 @@ var handleDocChanged = function handleDocChanged(tr, prevPluginState) {
 };
 var getSelectionChangedHandler = function getSelectionChangedHandler(reopenCommentView) {
   return function (tr, pluginState) {
-    var _pluginState$featureF;
+    var _pluginState$featureF, _pluginState$featureF2;
     if (pluginState.skipSelectionHandling) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         skipSelectionHandling: false
@@ -38,22 +38,26 @@ var getSelectionChangedHandler = function getSelectionChangedHandler(reopenComme
         isInlineCommentViewClosed: false
       });
     }
-    var selectedAnnotations = (0, _utils2.findAnnotationsInSelection)(tr.selection, tr.doc);
+    var selectedAnnotations = (0, _utils2.findAnnotationsInSelection)(tr.selection, tr.doc, (_pluginState$featureF2 = pluginState.featureFlagsPluginState) === null || _pluginState$featureF2 === void 0 ? void 0 : _pluginState$featureF2.commentsOnMediaMediaInlineBugFix);
     if (selectedAnnotations.length === 0) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         selectedAnnotations: selectedAnnotations,
-        isInlineCommentViewClosed: true
+        isInlineCommentViewClosed: true,
+        selectAnnotationMethod: undefined
       });
     }
     if ((0, _utils2.isSelectedAnnotationsChanged)(selectedAnnotations, pluginState.selectedAnnotations)) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
-        selectedAnnotations: selectedAnnotations
+        selectedAnnotations: selectedAnnotations,
+        selectAnnotationMethod: undefined
       }, reopenCommentView && {
         isInlineCommentViewClosed: false
       });
     }
-    return _objectSpread(_objectSpread({}, pluginState), reopenCommentView && {
+    return _objectSpread(_objectSpread(_objectSpread({}, pluginState), reopenCommentView && {
       isInlineCommentViewClosed: false
+    }), {}, {
+      selectAnnotationMethod: undefined
     });
   };
 };

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

@@ -40,7 +40,8 @@ var _default = exports.default = function _default(pluginState, action) {
       return _objectSpread(_objectSpread({}, updatedPluginState), {}, {
         selectedAnnotations: [].concat((0, _toConsumableArray2.default)(updatedPluginState.selectedAnnotations), (0, _toConsumableArray2.default)(action.data.selectedAnnotations)),
         annotations: _objectSpread(_objectSpread({}, pluginState.annotations), action.data.inlineComments),
-        isInlineCommentViewClosed: false
+        isInlineCommentViewClosed: false,
+        selectAnnotationMethod: undefined
       });
     case _types.ACTIONS.INLINE_COMMENT_SET_VISIBLE:
       var isVisible = action.data.isVisible;
@@ -53,6 +54,7 @@ var _default = exports.default = function _default(pluginState, action) {
     case _types.ACTIONS.SET_SELECTED_ANNOTATION:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         selectedAnnotations: (0, _toConsumableArray2.default)(action.data.selectedAnnotations),
+        selectAnnotationMethod: action.data.selectAnnotationMethod,
         skipSelectionHandling: true,
         isInlineCommentViewClosed: false
       });

package/dist/cjs/ui/InlineCommentView.js

@@ -14,6 +14,8 @@ var _commands = require("../commands");
 var _types = require("../types");
 var _utils2 = require("../utils");
 var _AnnotationViewWrapper = require("./AnnotationViewWrapper");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var findPosForDOM = function findPosForDOM(sel) {
   var $from = sel.$from,
     from = sel.from;
@@ -110,18 +112,27 @@ function InlineCommentView(_ref) {
     return null;
   }
   var onAnnotationViewed = function onAnnotationViewed() {
+    var _editorView$state$doc;
     if (!dispatchAnalyticsEvent) {
       return;
     }
+    var _ref3 = inlineCommentState || {},
+      selectAnnotationMethod = _ref3.selectAnnotationMethod,
+      featureFlagsPluginState = _ref3.featureFlagsPluginState;
+    var isCommentsOnMediaAnalyticsEnabled = featureFlagsPluginState === null || featureFlagsPluginState === void 0 ? void 0 : featureFlagsPluginState.commentsOnMediaAnalytics;
+
     // fire analytics
     var payload = {
       action: _analytics.ACTION.VIEWED,
       actionSubject: _analytics.ACTION_SUBJECT.ANNOTATION,
       actionSubjectId: _analytics.ACTION_SUBJECT_ID.INLINE_COMMENT,
       eventType: _analytics.EVENT_TYPE.TRACK,
-      attributes: {
+      attributes: _objectSpread({
         overlap: activeAnnotations.length ? activeAnnotations.length - 1 : 0
-      }
+      }, isCommentsOnMediaAnalyticsEnabled && {
+        targetNodeType: (_editorView$state$doc = editorView.state.doc.nodeAt(position)) === null || _editorView$state$doc === void 0 ? void 0 : _editorView$state$doc.type.name,
+        method: selectAnnotationMethod
+      })
     };
     dispatchAnalyticsEvent(payload);
   };

package/dist/cjs/utils.js

@@ -167,7 +167,7 @@ var isCurrentBlockNodeSelected = exports.isCurrentBlockNodeSelected = function i
   }
   return false;
 };
-var findAnnotationsInSelection = exports.findAnnotationsInSelection = function findAnnotationsInSelection(selection, doc) {
+var findAnnotationsInSelection = exports.findAnnotationsInSelection = function findAnnotationsInSelection(selection, doc, isCommentsOnMediaMediaInlineBugFixEnabled) {
   var empty = selection.empty,
     $anchor = selection.$anchor,
     anchor = selection.anchor;
@@ -176,11 +176,19 @@ var findAnnotationsInSelection = exports.findAnnotationsInSelection = function f
     return [];
   }
   var node = doc.nodeAt(anchor);
-  if (!node && !$anchor.nodeBefore) {
+  var nodeBefore = $anchor.nodeBefore;
+  if (!node && !nodeBefore) {
+    return [];
+  }
+
+  // Inline comment on mediaInline is not supported as part of comments on media project
+  // Hence, we ignore annotations associated with the node when the cursor is right after/before the node
+  if (isCommentsOnMediaMediaInlineBugFixEnabled && [nodeBefore, node].some(function (node) {
+    return (node === null || node === void 0 ? void 0 : node.type.name) === 'mediaInline';
+  })) {
     return [];
   }
   var annotationMark = doc.type.schema.marks.annotation;
-  var nodeBefore = $anchor.nodeBefore;
   var anchorAnnotationMarks = (node === null || node === void 0 ? void 0 : node.marks) || [];
   var marks = [];
   if (annotationMark.isInSet(anchorAnnotationMarks)) {

package/dist/es2019/commands/index.js

@@ -118,7 +118,7 @@ const getDraftCommandAction = (drafting, targetType, targetNodeId, isCommentOnMe
  * Show active inline comments for a given block node, otherwise,
  * return false if the node has no comments or no unresolved comments.
  */
-export const showInlineCommentForBlockNode = (supportedBlockNodes = []) => node => (state, dispatch) => {
+export const showInlineCommentForBlockNode = (supportedBlockNodes = []) => (node, viewMethod) => (state, dispatch) => {
   const pluginState = getPluginState(state);
   const {
     annotation
@@ -136,7 +136,8 @@ export const showInlineCommentForBlockNode = (supportedBlockNodes = []) => node
         dispatch(state.tr.setMeta(inlineCommentPluginKey, {
           type: ACTIONS.SET_SELECTED_ANNOTATION,
           data: {
-            selectedAnnotations: unresolvedAnnotationMarks
+            selectedAnnotations: unresolvedAnnotationMarks,
+            selectAnnotationMethod: viewMethod
           }
         }));
         return true;

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

@@ -159,12 +159,19 @@ export const inlineCommentPlugin = options => {
           annotations,
           selectedAnnotations,
           isVisible,
-          isInlineCommentViewClosed
+          isInlineCommentViewClosed,
+          featureFlagsPluginState
         } = getPluginState(state) || {};
         let decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : DecorationSet.empty;
         const focusDecorations = [];
+        const isCommentsOnMediaMediaInlineBugFixEnabled = featureFlagsPluginState === null || featureFlagsPluginState === void 0 ? void 0 : featureFlagsPluginState.commentsOnMediaMediaInlineBugFix;
         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 (isCommentsOnMediaMediaInlineBugFixEnabled && 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));
           node.marks.filter(mark => mark.type === state.schema.marks.annotation).forEach(mark => {
             if (isVisible) {

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

@@ -12,7 +12,7 @@ const handleDocChanged = (tr, prevPluginState) => {
   };
 };
 const getSelectionChangedHandler = reopenCommentView => (tr, pluginState) => {
-  var _pluginState$featureF;
+  var _pluginState$featureF, _pluginState$featureF2;
   if (pluginState.skipSelectionHandling) {
     return {
       ...pluginState,
@@ -33,18 +33,20 @@ const getSelectionChangedHandler = reopenCommentView => (tr, pluginState) => {
       })
     };
   }
-  const selectedAnnotations = findAnnotationsInSelection(tr.selection, tr.doc);
+  const selectedAnnotations = findAnnotationsInSelection(tr.selection, tr.doc, (_pluginState$featureF2 = pluginState.featureFlagsPluginState) === null || _pluginState$featureF2 === void 0 ? void 0 : _pluginState$featureF2.commentsOnMediaMediaInlineBugFix);
   if (selectedAnnotations.length === 0) {
     return {
       ...pluginState,
       selectedAnnotations,
-      isInlineCommentViewClosed: true
+      isInlineCommentViewClosed: true,
+      selectAnnotationMethod: undefined
     };
   }
   if (isSelectedAnnotationsChanged(selectedAnnotations, pluginState.selectedAnnotations)) {
     return {
       ...pluginState,
       selectedAnnotations,
+      selectAnnotationMethod: undefined,
       ...(reopenCommentView && {
         isInlineCommentViewClosed: false
       })
@@ -54,7 +56,8 @@ const getSelectionChangedHandler = reopenCommentView => (tr, pluginState) => {
     ...pluginState,
     ...(reopenCommentView && {
       isInlineCommentViewClosed: false
-    })
+    }),
+    selectAnnotationMethod: undefined
   };
 };
 export const {

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

@@ -40,7 +40,8 @@ export default ((pluginState, action) => {
           ...pluginState.annotations,
           ...action.data.inlineComments
         },
-        isInlineCommentViewClosed: false
+        isInlineCommentViewClosed: false,
+        selectAnnotationMethod: undefined
       };
     case ACTIONS.INLINE_COMMENT_SET_VISIBLE:
       const {
@@ -57,6 +58,7 @@ export default ((pluginState, action) => {
       return {
         ...pluginState,
         selectedAnnotations: [...action.data.selectedAnnotations],
+        selectAnnotationMethod: action.data.selectAnnotationMethod,
         skipSelectionHandling: true,
         isInlineCommentViewClosed: false
       };

package/dist/es2019/ui/InlineCommentView.js

@@ -108,9 +108,16 @@ export function InlineCommentView({
     return null;
   }
   const onAnnotationViewed = () => {
+    var _editorView$state$doc;
     if (!dispatchAnalyticsEvent) {
       return;
     }
+    const {
+      selectAnnotationMethod,
+      featureFlagsPluginState
+    } = inlineCommentState || {};
+    const isCommentsOnMediaAnalyticsEnabled = featureFlagsPluginState === null || featureFlagsPluginState === void 0 ? void 0 : featureFlagsPluginState.commentsOnMediaAnalytics;
+
     // fire analytics
     const payload = {
       action: ACTION.VIEWED,
@@ -118,7 +125,11 @@ export function InlineCommentView({
       actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
       eventType: EVENT_TYPE.TRACK,
       attributes: {
-        overlap: activeAnnotations.length ? activeAnnotations.length - 1 : 0
+        overlap: activeAnnotations.length ? activeAnnotations.length - 1 : 0,
+        ...(isCommentsOnMediaAnalyticsEnabled && {
+          targetNodeType: (_editorView$state$doc = editorView.state.doc.nodeAt(position)) === null || _editorView$state$doc === void 0 ? void 0 : _editorView$state$doc.type.name,
+          method: selectAnnotationMethod
+        })
       }
     };
     dispatchAnalyticsEvent(payload);

package/dist/es2019/utils.js

@@ -128,7 +128,7 @@ export const isCurrentBlockNodeSelected = (state, node) => {
   }
   return false;
 };
-export const findAnnotationsInSelection = (selection, doc) => {
+export const findAnnotationsInSelection = (selection, doc, isCommentsOnMediaMediaInlineBugFixEnabled) => {
   const {
     empty,
     $anchor,
@@ -139,11 +139,17 @@ export const findAnnotationsInSelection = (selection, doc) => {
     return [];
   }
   const node = doc.nodeAt(anchor);
-  if (!node && !$anchor.nodeBefore) {
+  const nodeBefore = $anchor.nodeBefore;
+  if (!node && !nodeBefore) {
+    return [];
+  }
+
+  // Inline comment on mediaInline is not supported as part of comments on media project
+  // Hence, we ignore annotations associated with the node when the cursor is right after/before the node
+  if (isCommentsOnMediaMediaInlineBugFixEnabled && [nodeBefore, node].some(node => (node === null || node === void 0 ? void 0 : node.type.name) === 'mediaInline')) {
     return [];
   }
   const annotationMark = doc.type.schema.marks.annotation;
-  const nodeBefore = $anchor.nodeBefore;
   const anchorAnnotationMarks = (node === null || node === void 0 ? void 0 : node.marks) || [];
   let marks = [];
   if (annotationMark.isInSet(anchorAnnotationMarks)) {

package/dist/esm/commands/index.js

@@ -131,7 +131,7 @@ var getDraftCommandAction = function getDraftCommandAction(drafting, targetType,
  */
 export var showInlineCommentForBlockNode = function showInlineCommentForBlockNode() {
   var supportedBlockNodes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  return function (node) {
+  return function (node, viewMethod) {
     return function (state, dispatch) {
       var pluginState = getPluginState(state);
       var annotation = state.schema.marks.annotation;
@@ -152,7 +152,8 @@ export var showInlineCommentForBlockNode = function showInlineCommentForBlockNod
             dispatch(state.tr.setMeta(inlineCommentPluginKey, {
               type: ACTIONS.SET_SELECTED_ANNOTATION,
               data: {
-                selectedAnnotations: unresolvedAnnotationMarks
+                selectedAnnotations: unresolvedAnnotationMarks,
+                selectAnnotationMethod: viewMethod
               }
             }));
             return true;

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

@@ -213,11 +213,18 @@ export var inlineCommentPlugin = function inlineCommentPlugin(options) {
           annotations = _ref5.annotations,
           selectedAnnotations = _ref5.selectedAnnotations,
           isVisible = _ref5.isVisible,
-          isInlineCommentViewClosed = _ref5.isInlineCommentViewClosed;
+          isInlineCommentViewClosed = _ref5.isInlineCommentViewClosed,
+          featureFlagsPluginState = _ref5.featureFlagsPluginState;
         var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : DecorationSet.empty;
         var focusDecorations = [];
+        var isCommentsOnMediaMediaInlineBugFixEnabled = featureFlagsPluginState === null || featureFlagsPluginState === void 0 ? void 0 : featureFlagsPluginState.commentsOnMediaMediaInlineBugFix;
         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 (isCommentsOnMediaMediaInlineBugFixEnabled && 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));
           node.marks.filter(function (mark) {
             return mark.type === state.schema.marks.annotation;

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

@@ -15,7 +15,7 @@ var handleDocChanged = function handleDocChanged(tr, prevPluginState) {
 };
 var getSelectionChangedHandler = function getSelectionChangedHandler(reopenCommentView) {
   return function (tr, pluginState) {
-    var _pluginState$featureF;
+    var _pluginState$featureF, _pluginState$featureF2;
     if (pluginState.skipSelectionHandling) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         skipSelectionHandling: false
@@ -31,22 +31,26 @@ var getSelectionChangedHandler = function getSelectionChangedHandler(reopenComme
         isInlineCommentViewClosed: false
       });
     }
-    var selectedAnnotations = findAnnotationsInSelection(tr.selection, tr.doc);
+    var selectedAnnotations = findAnnotationsInSelection(tr.selection, tr.doc, (_pluginState$featureF2 = pluginState.featureFlagsPluginState) === null || _pluginState$featureF2 === void 0 ? void 0 : _pluginState$featureF2.commentsOnMediaMediaInlineBugFix);
     if (selectedAnnotations.length === 0) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         selectedAnnotations: selectedAnnotations,
-        isInlineCommentViewClosed: true
+        isInlineCommentViewClosed: true,
+        selectAnnotationMethod: undefined
       });
     }
     if (isSelectedAnnotationsChanged(selectedAnnotations, pluginState.selectedAnnotations)) {
       return _objectSpread(_objectSpread({}, pluginState), {}, {
-        selectedAnnotations: selectedAnnotations
+        selectedAnnotations: selectedAnnotations,
+        selectAnnotationMethod: undefined
       }, reopenCommentView && {
         isInlineCommentViewClosed: false
       });
     }
-    return _objectSpread(_objectSpread({}, pluginState), reopenCommentView && {
+    return _objectSpread(_objectSpread(_objectSpread({}, pluginState), reopenCommentView && {
       isInlineCommentViewClosed: false
+    }), {}, {
+      selectAnnotationMethod: undefined
     });
   };
 };

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

@@ -33,7 +33,8 @@ export default (function (pluginState, action) {
       return _objectSpread(_objectSpread({}, updatedPluginState), {}, {
         selectedAnnotations: [].concat(_toConsumableArray(updatedPluginState.selectedAnnotations), _toConsumableArray(action.data.selectedAnnotations)),
         annotations: _objectSpread(_objectSpread({}, pluginState.annotations), action.data.inlineComments),
-        isInlineCommentViewClosed: false
+        isInlineCommentViewClosed: false,
+        selectAnnotationMethod: undefined
       });
     case ACTIONS.INLINE_COMMENT_SET_VISIBLE:
       var isVisible = action.data.isVisible;
@@ -46,6 +47,7 @@ export default (function (pluginState, action) {
     case ACTIONS.SET_SELECTED_ANNOTATION:
       return _objectSpread(_objectSpread({}, pluginState), {}, {
         selectedAnnotations: _toConsumableArray(action.data.selectedAnnotations),
+        selectAnnotationMethod: action.data.selectAnnotationMethod,
         skipSelectionHandling: true,
         isInlineCommentViewClosed: false
       });

package/dist/esm/ui/InlineCommentView.js

@@ -1,4 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React from 'react';
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, CONTENT_COMPONENT, EVENT_TYPE, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
@@ -103,18 +105,27 @@ export function InlineCommentView(_ref) {
     return null;
   }
   var onAnnotationViewed = function onAnnotationViewed() {
+    var _editorView$state$doc;
     if (!dispatchAnalyticsEvent) {
       return;
     }
+    var _ref3 = inlineCommentState || {},
+      selectAnnotationMethod = _ref3.selectAnnotationMethod,
+      featureFlagsPluginState = _ref3.featureFlagsPluginState;
+    var isCommentsOnMediaAnalyticsEnabled = featureFlagsPluginState === null || featureFlagsPluginState === void 0 ? void 0 : featureFlagsPluginState.commentsOnMediaAnalytics;
+
     // fire analytics
     var payload = {
       action: ACTION.VIEWED,
       actionSubject: ACTION_SUBJECT.ANNOTATION,
       actionSubjectId: ACTION_SUBJECT_ID.INLINE_COMMENT,
       eventType: EVENT_TYPE.TRACK,
-      attributes: {
+      attributes: _objectSpread({
         overlap: activeAnnotations.length ? activeAnnotations.length - 1 : 0
-      }
+      }, isCommentsOnMediaAnalyticsEnabled && {
+        targetNodeType: (_editorView$state$doc = editorView.state.doc.nodeAt(position)) === null || _editorView$state$doc === void 0 ? void 0 : _editorView$state$doc.type.name,
+        method: selectAnnotationMethod
+      })
     };
     dispatchAnalyticsEvent(payload);
   };

package/dist/esm/utils.js

@@ -140,7 +140,7 @@ export var isCurrentBlockNodeSelected = function isCurrentBlockNodeSelected(stat
   }
   return false;
 };
-export var findAnnotationsInSelection = function findAnnotationsInSelection(selection, doc) {
+export var findAnnotationsInSelection = function findAnnotationsInSelection(selection, doc, isCommentsOnMediaMediaInlineBugFixEnabled) {
   var empty = selection.empty,
     $anchor = selection.$anchor,
     anchor = selection.anchor;
@@ -149,11 +149,19 @@ export var findAnnotationsInSelection = function findAnnotationsInSelection(sele
     return [];
   }
   var node = doc.nodeAt(anchor);
-  if (!node && !$anchor.nodeBefore) {
+  var nodeBefore = $anchor.nodeBefore;
+  if (!node && !nodeBefore) {
+    return [];
+  }
+
+  // Inline comment on mediaInline is not supported as part of comments on media project
+  // Hence, we ignore annotations associated with the node when the cursor is right after/before the node
+  if (isCommentsOnMediaMediaInlineBugFixEnabled && [nodeBefore, node].some(function (node) {
+    return (node === null || node === void 0 ? void 0 : node.type.name) === 'mediaInline';
+  })) {
     return [];
   }
   var annotationMark = doc.type.schema.marks.annotation;
-  var nodeBefore = $anchor.nodeBefore;
   var anchorAnnotationMarks = (node === null || node === void 0 ? void 0 : node.marks) || [];
   var marks = [];
   if (annotationMark.isInSet(anchorAnnotationMarks)) {

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

@@ -1,6 +1,6 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
+import { RESOLVE_METHOD, type VIEW_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { InlineCommentMap, InlineCommentMouseData } from '../pm-plugins/types';
@@ -13,7 +13,7 @@ export declare const removeInlineCommentNearSelection: (id: string, supportedNod
  * Show active inline comments for a given block node, otherwise,
  * return false if the node has no comments or no unresolved comments.
  */
-export declare const showInlineCommentForBlockNode: (supportedBlockNodes?: string[]) => (node: PMNode | null) => Command;
+export declare const showInlineCommentForBlockNode: (supportedBlockNodes?: string[]) => (node: PMNode | null, viewMethod?: VIEW_METHOD) => Command;
 export declare const setInlineCommentDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, supportedBlockNodes?: string[]) => (drafting: boolean, inputMethod?: InlineCommentInputMethod, targetType?: TargetType, isCommentOnMediaOn?: boolean, targetNodeId?: string | undefined) => Command;
 export declare const addInlineComment: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorAPI?: ExtractInjectionAPI<AnnotationPlugin> | undefined) => (id: string, supportedBlockNodes?: string[]) => Command;
 export declare const updateMouseState: (mouseData: InlineCommentMouseData) => Command;

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

@@ -69,7 +69,7 @@ declare const _default: {
         actions: {
             stripNonExistingAnnotations: (slice: import("prosemirror-model").Slice, state: EditorState) => boolean | undefined;
             setInlineCommentDraftState: (drafting: boolean, inputMethod: InlineCommentInputMethod, targetType?: import("../types").TargetType | undefined, isCommentOnMediaOn?: boolean | undefined, targetNodeId?: string | undefined) => import("@atlaskit/editor-common/types").Command;
-            showCommentForBlockNode: (node: import("prosemirror-model").Node | null) => import("@atlaskit/editor-common/types").Command;
+            showCommentForBlockNode: (node: import("prosemirror-model").Node | null, viewMethod?: import("@atlaskit/editor-common/analytics").VIEW_METHOD | undefined) => import("@atlaskit/editor-common/types").Command;
         };
     }, import("../types").AnnotationProviders | undefined>, import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {
         pluginConfiguration: import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions;

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

@@ -1,4 +1,4 @@
-import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { EditorAnalyticsAPI, VIEW_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Dispatch, EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import type { LegacyPortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import { type PortalProviderAPI } from '@atlaskit/editor-common/src/portal';
@@ -69,6 +69,7 @@ export type InlineCommentAction = {
     type: ACTIONS.SET_SELECTED_ANNOTATION;
     data: {
         selectedAnnotations: AnnotationInfo[];
+        selectAnnotationMethod?: VIEW_METHOD;
     };
 };
 export type InlineCommentPluginState = {
@@ -85,4 +86,5 @@ export type InlineCommentPluginState = {
     featureFlagsPluginState?: FeatureFlags;
     isDrafting: boolean;
     targetNodeId?: string;
+    selectAnnotationMethod?: VIEW_METHOD;
 };

package/dist/types/utils.d.ts

@@ -21,7 +21,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 isCurrentBlockNodeSelected: (state: EditorState, node: Node) => boolean;
-export declare const findAnnotationsInSelection: (selection: Selection, doc: Node) => AnnotationInfo[];
+export declare const findAnnotationsInSelection: (selection: Selection, doc: Node, isCommentsOnMediaMediaInlineBugFixEnabled?: boolean) => AnnotationInfo[];
 export declare const resolveDraftBookmark: (editorState: EditorState, bookmark?: SelectionBookmark, supportedBlockNodes?: string[]) => DraftBookmark;
 /**
  * get selection from position to apply new comment for

package/dist/types-ts4.5/commands/index.d.ts

@@ -1,6 +1,6 @@
 import { AnnotationTypes } from '@atlaskit/adf-schema';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
+import { RESOLVE_METHOD, type VIEW_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Command, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { InlineCommentMap, InlineCommentMouseData } from '../pm-plugins/types';
@@ -13,7 +13,7 @@ export declare const removeInlineCommentNearSelection: (id: string, supportedNod
  * Show active inline comments for a given block node, otherwise,
  * return false if the node has no comments or no unresolved comments.
  */
-export declare const showInlineCommentForBlockNode: (supportedBlockNodes?: string[]) => (node: PMNode | null) => Command;
+export declare const showInlineCommentForBlockNode: (supportedBlockNodes?: string[]) => (node: PMNode | null, viewMethod?: VIEW_METHOD) => Command;
 export declare const setInlineCommentDraftState: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, supportedBlockNodes?: string[]) => (drafting: boolean, inputMethod?: InlineCommentInputMethod, targetType?: TargetType, isCommentOnMediaOn?: boolean, targetNodeId?: string | undefined) => Command;
 export declare const addInlineComment: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, editorAPI?: ExtractInjectionAPI<AnnotationPlugin> | undefined) => (id: string, supportedBlockNodes?: string[]) => Command;
 export declare const updateMouseState: (mouseData: InlineCommentMouseData) => Command;

package/dist/types-ts4.5/commands/transform.d.ts

@@ -83,7 +83,7 @@ declare const _default: {
             actions: {
                 stripNonExistingAnnotations: (slice: import("prosemirror-model").Slice, state: EditorState) => boolean | undefined;
                 setInlineCommentDraftState: (drafting: boolean, inputMethod: InlineCommentInputMethod, targetType?: import("../types").TargetType | undefined, isCommentOnMediaOn?: boolean | undefined, targetNodeId?: string | undefined) => import("@atlaskit/editor-common/types").Command;
-                showCommentForBlockNode: (node: import("prosemirror-model").Node | null) => import("@atlaskit/editor-common/types").Command;
+                showCommentForBlockNode: (node: import("prosemirror-model").Node | null, viewMethod?: import("@atlaskit/editor-common/analytics").VIEW_METHOD | undefined) => import("@atlaskit/editor-common/types").Command;
             };
         }, import("../types").AnnotationProviders | undefined>,
         import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"analytics", {

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

@@ -1,4 +1,4 @@
-import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+import type { EditorAnalyticsAPI, VIEW_METHOD } from '@atlaskit/editor-common/analytics';
 import type { Dispatch, EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import type { LegacyPortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
 import { type PortalProviderAPI } from '@atlaskit/editor-common/src/portal';
@@ -69,6 +69,7 @@ export type InlineCommentAction = {
     type: ACTIONS.SET_SELECTED_ANNOTATION;
     data: {
         selectedAnnotations: AnnotationInfo[];
+        selectAnnotationMethod?: VIEW_METHOD;
     };
 };
 export type InlineCommentPluginState = {
@@ -85,4 +86,5 @@ export type InlineCommentPluginState = {
     featureFlagsPluginState?: FeatureFlags;
     isDrafting: boolean;
     targetNodeId?: string;
+    selectAnnotationMethod?: VIEW_METHOD;
 };

package/dist/types-ts4.5/utils.d.ts

@@ -21,7 +21,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 isCurrentBlockNodeSelected: (state: EditorState, node: Node) => boolean;
-export declare const findAnnotationsInSelection: (selection: Selection, doc: Node) => AnnotationInfo[];
+export declare const findAnnotationsInSelection: (selection: Selection, doc: Node, isCommentsOnMediaMediaInlineBugFixEnabled?: boolean) => AnnotationInfo[];
 export declare const resolveDraftBookmark: (editorState: EditorState, bookmark?: SelectionBookmark, supportedBlockNodes?: string[]) => DraftBookmark;
 /**
  * get selection from position to apply new comment for

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-annotation",
-  "version": "1.8.0",
+  "version": "1.9.1",
   "description": "Annotation plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@atlaskit/adf-schema": "^36.3.0",
-    "@atlaskit/editor-common": "^80.1.0",
+    "@atlaskit/editor-common": "^80.4.0",
     "@atlaskit/editor-plugin-analytics": "^1.2.0",
     "@atlaskit/editor-plugin-editor-viewmode": "^1.1.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.1.0",