@atlaskit/editor-plugin-annotation 1.24.1 → 1.25.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-plugin-annotation
 
+## 1.25.1
+
+### Patch Changes
+
+- [#167498](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/167498)
+  [`e275b9ee8b698`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e275b9ee8b698) -
+  ED-25805: refactors plugins to meet folder standards
+- Updated dependencies
+
+## 1.25.0
+
+### Minor Changes
+
+- [#167231](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/167231)
+  [`335a373081eaf`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/335a373081eaf) -
+  [ux] Added hoveredAnnotation for the renderer and the editor to accomodate the newly implemented
+  comment's panel
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.24.1
 
 ### Patch Changes

package/dist/cjs/{plugin.js → annotationPlugin.js}

@@ -15,12 +15,12 @@ var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _annotation = require("@atlaskit/editor-common/annotation");
 var _hooks = require("@atlaskit/editor-common/hooks");
-var _commands = require("./commands");
+var _editorCommands = require("./editor-commands");
 var _inlineComment = require("./pm-plugins/inline-comment");
 var _keymap = require("./pm-plugins/keymap");
-var _toolbar = require("./toolbar");
+var _toolbar = require("./pm-plugins/toolbar");
+var _utils = require("./pm-plugins/utils");
 var _InlineCommentView = require("./ui/InlineCommentView");
-var _utils = require("./utils");
 var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref) {
   var _api$featureFlags, _api$analytics;
   var annotationProviders = _ref.config,
@@ -36,8 +36,8 @@ var annotationPlugin = exports.annotationPlugin = function annotationPlugin(_ref
     },
     actions: {
       stripNonExistingAnnotations: _utils.stripNonExistingAnnotations,
-      setInlineCommentDraftState: (0, _commands.setInlineCommentDraftState)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes),
-      showCommentForBlockNode: (0, _commands.showInlineCommentForBlockNode)(annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes)
+      setInlineCommentDraftState: (0, _editorCommands.setInlineCommentDraftState)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes),
+      showCommentForBlockNode: (0, _editorCommands.showInlineCommentForBlockNode)(annotationProviders === null || annotationProviders === void 0 ? void 0 : annotationProviders.inlineComment.supportedBlockNodes)
     },
     getSharedState: function getSharedState(editorState) {
       if (!editorState) {

package/dist/cjs/annotationPluginType.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/{commands → editor-commands}/index.js

@@ -4,15 +4,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateMouseState = exports.updateInlineCommentResolvedState = exports.showInlineCommentForBlockNode = exports.setSelectedAnnotation = exports.setInlineCommentsVisibility = exports.setInlineCommentDraftState = exports.removeInlineCommentNearSelection = exports.createAnnotation = exports.closeComponent = exports.clearDirtyMark = exports.addInlineComment = void 0;
+exports.updateMouseState = exports.updateInlineCommentResolvedState = exports.showInlineCommentForBlockNode = exports.setSelectedAnnotation = exports.setInlineCommentsVisibility = exports.setInlineCommentDraftState = exports.setHoveredAnnotation = exports.removeInlineCommentNearSelection = exports.createAnnotation = exports.closeComponent = exports.clearDirtyMark = exports.addInlineComment = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _pluginFactory = require("../pm-plugins/plugin-factory");
 var _types = require("../pm-plugins/types");
+var _utils = require("../pm-plugins/utils");
 var _types2 = require("../types");
-var _utils = require("../utils");
 var _transform = _interopRequireDefault(require("./transform"));
 var updateInlineCommentResolvedState = exports.updateInlineCommentResolvedState = function updateInlineCommentResolvedState(editorAnalyticsAPI) {
   return function (partialNewState, resolveMethod) {
@@ -223,6 +223,17 @@ var setSelectedAnnotation = exports.setSelectedAnnotation = function setSelected
     }
   });
 };
+var setHoveredAnnotation = exports.setHoveredAnnotation = function setHoveredAnnotation(id) {
+  return (0, _pluginFactory.createCommand)({
+    type: _types.ACTIONS.SET_HOVERED_ANNOTATION,
+    data: {
+      hoveredAnnotations: [{
+        id: id,
+        type: _adfSchema.AnnotationTypes.INLINE_COMMENT
+      }]
+    }
+  });
+};
 var createAnnotation = exports.createAnnotation = function createAnnotation(editorAnalyticsAPI, editorAPI) {
   return function (id) {
     var annotationType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _adfSchema.AnnotationTypes.INLINE_COMMENT;

package/dist/cjs/{commands → editor-commands}/transform.js

@@ -10,7 +10,7 @@ var _mark = require("@atlaskit/editor-common/mark");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _utils2 = require("../utils");
+var _utils2 = require("../pm-plugins/utils");
 var addAnnotationMark = function addAnnotationMark(id, supportedBlockNodes) {
   return function (transaction, state) {
     var inlineCommentState = (0, _utils2.getPluginState)(state);

package/dist/cjs/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "annotationPlugin", {
   enumerable: true,
   get: function get() {
-    return _plugin.annotationPlugin;
+    return _annotationPlugin.annotationPlugin;
   }
 });
-var _plugin = require("./plugin");
+var _annotationPlugin = require("./annotationPlugin");

package/dist/cjs/nodeviews/index.js

@@ -51,11 +51,17 @@ var AnnotationNodeView = exports.AnnotationNodeView = /*#__PURE__*/function (_Re
   }]);
   return AnnotationNodeView;
 }(_reactNodeView.default);
-var getAnnotationViewClassname = exports.getAnnotationViewClassname = function getAnnotationViewClassname(isUnresolved, hasFocus) {
+var getAnnotationViewClassname = exports.getAnnotationViewClassname = function getAnnotationViewClassname(isUnresolved, hasFocus, isHovered) {
   if (!isUnresolved) {
     return;
   }
-  return hasFocus ? _styles.AnnotationSharedClassNames.focus : _styles.AnnotationSharedClassNames.blur;
+  if (hasFocus) {
+    return _styles.AnnotationSharedClassNames.focus;
+  }
+  if (isHovered) {
+    return _styles.AnnotationSharedClassNames.hover;
+  }
+  return _styles.AnnotationSharedClassNames.blur;
 };
 var getBlockAnnotationViewClassname = exports.getBlockAnnotationViewClassname = function getBlockAnnotationViewClassname(isUnresolved, hasFocus) {
   if (!isUnresolved) {

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

@@ -13,10 +13,10 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _commands = require("../commands");
+var _editorCommands = require("../editor-commands");
 var _nodeviews = require("../nodeviews");
-var _utils = require("../utils");
 var _pluginFactory = require("./plugin-factory");
+var _utils = require("./utils");
 var fetchProviderStates = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(provider, annotationIds) {
     var data, result;
@@ -64,7 +64,7 @@ var fetchState = /*#__PURE__*/function () {
         case 4:
           inlineCommentStates = _context2.sent;
           if (editorView.dispatch) {
-            (0, _commands.updateInlineCommentResolvedState)(editorAnalyticsAPI)(inlineCommentStates)(editorView.state, editorView.dispatch);
+            (0, _editorCommands.updateInlineCommentResolvedState)(editorAnalyticsAPI)(inlineCommentStates)(editorView.state, editorView.dispatch);
           }
         case 6:
         case "end":
@@ -82,6 +82,7 @@ var initialState = function initialState() {
   return {
     annotations: {},
     selectedAnnotations: [],
+    hoveredAnnotations: [],
     mouseData: {
       isSelecting: false
     },
@@ -95,7 +96,7 @@ var initialState = function initialState() {
 };
 var hideToolbar = function hideToolbar(state, dispatch) {
   return function () {
-    (0, _commands.updateMouseState)({
+    (0, _editorCommands.updateMouseState)({
       isSelecting: true
     })(state, dispatch);
   };
@@ -105,14 +106,14 @@ var hideToolbar = function hideToolbar(state, dispatch) {
 var onResolve = function onResolve(editorAnalyticsAPI) {
   return function (state, dispatch) {
     return function (annotationId) {
-      (0, _commands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, annotationId, true), _analytics.RESOLVE_METHOD.CONSUMER)(state, dispatch);
+      (0, _editorCommands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, annotationId, true), _analytics.RESOLVE_METHOD.CONSUMER)(state, dispatch);
     };
   };
 };
 var onUnResolve = function onUnResolve(editorAnalyticsAPI) {
   return function (state, dispatch) {
     return function (annotationId) {
-      (0, _commands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, annotationId, false))(state, dispatch);
+      (0, _editorCommands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, annotationId, false))(state, dispatch);
     };
   };
 };
@@ -121,7 +122,7 @@ var onMouseUp = function onMouseUp(state, dispatch) {
     var _ref3 = (0, _utils.getPluginState)(state) || {},
       mouseData = _ref3.mouseData;
     if (mouseData !== null && mouseData !== void 0 && mouseData.isSelecting) {
-      (0, _commands.updateMouseState)({
+      (0, _editorCommands.updateMouseState)({
         isSelecting: false
       })(state, dispatch);
     }
@@ -131,7 +132,7 @@ var onSetVisibility = function onSetVisibility(view) {
   return function (isVisible) {
     var state = view.state,
       dispatch = view.dispatch;
-    (0, _commands.setInlineCommentsVisibility)(isVisible)(state, dispatch);
+    (0, _editorCommands.setInlineCommentsVisibility)(isVisible)(state, dispatch);
     if (isVisible) {
       // PM retains focus when we click away from the editor.
       // This will restore the visual aspect of the selection,
@@ -167,14 +168,24 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
       };
       var setSelectedAnnotationFn = function setSelectedAnnotationFn(annotationId) {
         if (!annotationId) {
-          (0, _commands.closeComponent)()(editorView.state, editorView.dispatch);
+          (0, _editorCommands.closeComponent)()(editorView.state, editorView.dispatch);
         } else {
-          (0, _commands.setSelectedAnnotation)(annotationId)(editorView.state, editorView.dispatch);
+          (0, _editorCommands.setSelectedAnnotation)(annotationId)(editorView.state, editorView.dispatch);
         }
       };
+      var setHoveredAnnotationFn = function setHoveredAnnotationFn(annotationId) {
+        if (!annotationId) {
+          (0, _editorCommands.closeComponent)()(editorView.state, editorView.dispatch);
+        } else {
+          (0, _editorCommands.setHoveredAnnotation)(annotationId)(editorView.state, editorView.dispatch);
+        }
+      };
+      var removeHoveredannotationFn = function removeHoveredannotationFn() {
+        (0, _editorCommands.setHoveredAnnotation)('')(editorView.state, editorView.dispatch);
+      };
       var updateSubscriber = provider.updateSubscriber;
       if (updateSubscriber) {
-        updateSubscriber.on('resolve', resolve).on('delete', resolve).on('unresolve', unResolve).on('create', unResolve).on('setvisibility', setVisibility).on('setselectedannotation', setSelectedAnnotationFn);
+        updateSubscriber.on('resolve', resolve).on('delete', resolve).on('unresolve', unResolve).on('create', unResolve).on('setvisibility', setVisibility).on('setselectedannotation', setSelectedAnnotationFn).on('sethoveredannotation', setHoveredAnnotationFn).on('removehoveredannotation', removeHoveredannotationFn);
       }
 
       // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
@@ -186,14 +197,14 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
           if (!dirtyAnnotations) {
             return;
           }
-          (0, _commands.clearDirtyMark)()(view.state, view.dispatch);
+          (0, _editorCommands.clearDirtyMark)()(view.state, view.dispatch);
           fetchState(provider, (0, _utils.getAllAnnotations)(view.state.doc), view, options.editorAnalyticsAPI);
         },
         destroy: function destroy() {
           // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
           editorView.root.removeEventListener('mouseup', mouseUp);
           if (updateSubscriber) {
-            updateSubscriber.off('resolve', resolve).off('delete', resolve).off('unresolve', unResolve).off('create', unResolve).off('setvisibility', setVisibility).off('setselectedannotation', setSelectedAnnotationFn);
+            updateSubscriber.off('resolve', resolve).off('delete', resolve).off('unresolve', unResolve).off('create', unResolve).off('setvisibility', setVisibility).off('setselectedannotation', setSelectedAnnotationFn).off('sethoveredannotation', setHoveredAnnotationFn).off('removehoveredannotation', removeHoveredannotationFn);
           }
         }
       };
@@ -226,7 +237,8 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
           annotations = _ref5.annotations,
           selectedAnnotations = _ref5.selectedAnnotations,
           isVisible = _ref5.isVisible,
-          isInlineCommentViewClosed = _ref5.isInlineCommentViewClosed;
+          isInlineCommentViewClosed = _ref5.isInlineCommentViewClosed,
+          hoveredAnnotations = _ref5.hoveredAnnotations;
         var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : _view.DecorationSet.empty;
         var focusDecorations = [];
         state.doc.descendants(function (node, pos) {
@@ -245,6 +257,9 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
               var isSelected = !isInlineCommentViewClosed && !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(function (selectedAnnotation) {
                 return selectedAnnotation.id === mark.attrs.id;
               }));
+              var isHovered = !isInlineCommentViewClosed && !!(hoveredAnnotations !== null && hoveredAnnotations !== void 0 && hoveredAnnotations.some(function (hoveredAnnotation) {
+                return hoveredAnnotation.id === mark.attrs.id;
+              }));
               if (isSupportedBlockNode) {
                 focusDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
                   class: "".concat((0, _nodeviews.getBlockAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved)
@@ -255,19 +270,19 @@ var inlineCommentPlugin = exports.inlineCommentPlugin = function inlineCommentPl
                 if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
                   if (node.isText) {
                     focusDecorations.push(_view.Decoration.inline(pos, pos + node.nodeSize, {
-                      class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved),
+                      class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected, isHovered), " ").concat(isUnresolved),
                       nodeName: 'span'
                     }));
                   } else {
                     focusDecorations.push(_view.Decoration.node(pos, pos + node.nodeSize, {
-                      class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved)
+                      class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected, isHovered), " ").concat(isUnresolved)
                     }, {
                       key: _utils.decorationKey.block
                     }));
                   }
                 } else {
                   focusDecorations.push(_view.Decoration.inline(pos, pos + node.nodeSize, {
-                    class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved),
+                    class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected, isHovered), " ").concat(isUnresolved),
                     nodeName: 'span'
                   }));
                 }

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

@@ -7,9 +7,9 @@ exports.keymapPlugin = keymapPlugin;
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
-var _commands = require("../commands");
+var _editorCommands = require("../editor-commands");
 function keymapPlugin(editorAnalyticsAPI) {
   var list = {};
-  (0, _keymaps.bindKeymapWithCommand)(_keymaps.addInlineComment.common, (0, _commands.setInlineCommentDraftState)(editorAnalyticsAPI)(true, _analytics.INPUT_METHOD.SHORTCUT), list);
+  (0, _keymaps.bindKeymapWithCommand)(_keymaps.addInlineComment.common, (0, _editorCommands.setInlineCommentDraftState)(editorAnalyticsAPI)(true, _analytics.INPUT_METHOD.SHORTCUT), list);
   return (0, _keymap.keymap)(list);
 }

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

@@ -9,8 +9,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _utils2 = require("../utils");
 var _reducer = _interopRequireDefault(require("./reducer"));
+var _utils2 = require("./utils");
 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 handleDocChanged = function handleDocChanged(tr, prevPluginState) {

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

@@ -8,8 +8,8 @@ exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _utils = require("../utils");
 var _types = require("./types");
+var _utils = require("./utils");
 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 _default = exports.default = function _default(pluginState, action) {
@@ -60,6 +60,12 @@ var _default = exports.default = function _default(pluginState, action) {
         isInlineCommentViewClosed: false,
         isOpeningMediaCommentFromToolbar: action.data.isOpeningMediaCommentFromToolbar
       });
+    case _types.ACTIONS.SET_HOVERED_ANNOTATION:
+      return _objectSpread(_objectSpread({}, pluginState), {}, {
+        hoveredAnnotations: (0, _toConsumableArray2.default)(action.data.hoveredAnnotations),
+        skipSelectionHandling: true,
+        isInlineCommentViewClosed: false
+      });
     default:
       return pluginState;
   }

package/dist/cjs/{toolbar.js → pm-plugins/toolbar.js}

@@ -15,8 +15,8 @@ var _comment = _interopRequireDefault(require("@atlaskit/icon/core/comment"));
 var _comment2 = _interopRequireDefault(require("@atlaskit/icon/glyph/comment"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
-var _commands = require("./commands");
-var _types = require("./types");
+var _editorCommands = require("../editor-commands");
+var _types = require("../types");
 var _utils2 = require("./utils");
 var INLINE_COMMENT_ON_INLINE_NODE_SPOTLIGHT_EP_MESSAGE_ID = 'inline-comments-on-inline-node-spotlight';
 var createSpotlightConfig = function createSpotlightConfig(_ref) {
@@ -138,7 +138,7 @@ var buildToolbar = exports.buildToolbar = function buildToolbar(editorAnalyticsA
             }
           });
         }
-        return (0, _commands.setInlineCommentDraftState)(editorAnalyticsAPI)(true)(state, dispatch);
+        return (0, _editorCommands.setInlineCommentDraftState)(editorAnalyticsAPI)(true)(state, dispatch);
       },
       supportsViewMode: true,
       // TODO: MODES-3950 Clean up this floating toolbar view mode logic,

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

@@ -13,5 +13,6 @@ var ACTIONS = exports.ACTIONS = /*#__PURE__*/function (ACTIONS) {
   ACTIONS[ACTIONS["INLINE_COMMENT_SET_VISIBLE"] = 5] = "INLINE_COMMENT_SET_VISIBLE";
   ACTIONS[ACTIONS["CLOSE_COMPONENT"] = 6] = "CLOSE_COMPONENT";
   ACTIONS[ACTIONS["SET_SELECTED_ANNOTATION"] = 7] = "SET_SELECTED_ANNOTATION";
+  ACTIONS[ACTIONS["SET_HOVERED_ANNOTATION"] = 8] = "SET_HOVERED_ANNOTATION";
   return ACTIONS;
 }({});

package/dist/cjs/{utils.js → pm-plugins/utils.js}

@@ -34,7 +34,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _types = require("./types");
+var _types = require("../types");
 function sum(arr, f) {
   return arr.reduce(function (val, x) {
     return val + f(x);

package/dist/cjs/ui/InlineCommentView.js

@@ -11,9 +11,9 @@ var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("@atlaskit/editor-common/utils");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
-var _commands = require("../commands");
+var _editorCommands = require("../editor-commands");
+var _utils3 = require("../pm-plugins/utils");
 var _types = require("../types");
-var _utils3 = require("../utils");
 var _AnnotationViewWrapper = require("./AnnotationViewWrapper");
 var findPosForDOM = function findPosForDOM(sel) {
   var $from = sel.$from,
@@ -98,11 +98,11 @@ function InlineCommentView(_ref) {
       dom: dom,
       textSelection: textSelection,
       onCreate: function onCreate(id) {
-        (0, _commands.createAnnotation)(editorAnalyticsAPI, editorAPI)(id, _adfSchema.AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch);
+        (0, _editorCommands.createAnnotation)(editorAnalyticsAPI, editorAPI)(id, _adfSchema.AnnotationTypes.INLINE_COMMENT, inlineCommentProvider.supportedBlockNodes)(editorView.state, editorView.dispatch);
         !editorView.hasFocus() && editorView.focus();
       },
       onClose: function onClose() {
-        (0, _commands.setInlineCommentDraftState)(editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
+        (0, _editorCommands.setInlineCommentDraftState)(editorAnalyticsAPI)(false)(editorView.state, editorView.dispatch);
         !editorView.hasFocus() && editorView.focus();
       },
       inlineNodeTypes: inlineNodeTypes,
@@ -160,13 +160,13 @@ function InlineCommentView(_ref) {
     getInlineNodeTypes: getInlineNodeTypes,
     dom: dom,
     onDelete: function onDelete(id) {
-      return (0, _commands.removeInlineCommentNearSelection)(id, inlineCommentProvider.supportedBlockNodes)(state, dispatch);
+      return (0, _editorCommands.removeInlineCommentNearSelection)(id, inlineCommentProvider.supportedBlockNodes)(state, dispatch);
     },
     onResolve: function onResolve(id) {
-      return (0, _commands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, id, true), _analytics.RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch);
+      return (0, _editorCommands.updateInlineCommentResolvedState)(editorAnalyticsAPI)((0, _defineProperty2.default)({}, id, true), _analytics.RESOLVE_METHOD.COMPONENT)(editorView.state, editorView.dispatch);
     },
     onClose: function onClose() {
-      (0, _commands.closeComponent)()(editorView.state, editorView.dispatch);
+      (0, _editorCommands.closeComponent)()(editorView.state, editorView.dispatch);
     },
     isOpeningMediaCommentFromToolbar: isOpeningMediaCommentFromToolbar
   }));

package/dist/es2019/{plugin.js → annotationPlugin.js}

@@ -2,12 +2,12 @@ import React from 'react';
 import { annotation } from '@atlaskit/adf-schema';
 import { AnnotationUpdateEmitter } from '@atlaskit/editor-common/annotation';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './commands';
+import { setInlineCommentDraftState, showInlineCommentForBlockNode } from './editor-commands';
 import { inlineCommentPlugin } from './pm-plugins/inline-comment';
 import { keymapPlugin } from './pm-plugins/keymap';
-import { buildToolbar } from './toolbar';
+import { buildToolbar } from './pm-plugins/toolbar';
+import { getPluginState, stripNonExistingAnnotations } from './pm-plugins/utils';
 import { InlineCommentView } from './ui/InlineCommentView';
-import { getPluginState, stripNonExistingAnnotations } from './utils';
 export const annotationPlugin = ({
   config: annotationProviders,
   api

package/dist/es2019/annotationPluginType.js

@@ -0,0 +1 @@
+export {};

package/dist/es2019/{commands → editor-commands}/index.js

@@ -3,8 +3,8 @@ import { INPUT_METHOD, RESOLVE_METHOD } from '@atlaskit/editor-common/analytics'
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { createCommand } from '../pm-plugins/plugin-factory';
 import { ACTIONS } from '../pm-plugins/types';
+import { getPluginState, inlineCommentPluginKey, isSelectionValid, isSupportedBlockNode } from '../pm-plugins/utils';
 import { AnnotationSelectionType } from '../types';
-import { getPluginState, inlineCommentPluginKey, isSelectionValid, isSupportedBlockNode } from '../utils';
 import transform from './transform';
 export const updateInlineCommentResolvedState = editorAnalyticsAPI => (partialNewState, resolveMethod) => {
   const command = {
@@ -185,6 +185,15 @@ export const setSelectedAnnotation = id => createCommand({
     }]
   }
 });
+export const setHoveredAnnotation = id => createCommand({
+  type: ACTIONS.SET_HOVERED_ANNOTATION,
+  data: {
+    hoveredAnnotations: [{
+      id,
+      type: AnnotationTypes.INLINE_COMMENT
+    }]
+  }
+});
 export const createAnnotation = (editorAnalyticsAPI, editorAPI) => (id, annotationType = AnnotationTypes.INLINE_COMMENT, supportedBlockNodes) => (state, dispatch) => {
   // don't try to add if there are is no temp highlight bookmarked
   const {

package/dist/es2019/{commands → editor-commands}/transform.js

@@ -4,7 +4,7 @@ import { applyMarkOnRange } from '@atlaskit/editor-common/mark';
 import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { getDraftCommandAnalyticsPayload, getPluginState, resolveDraftBookmark } from '../utils';
+import { getDraftCommandAnalyticsPayload, getPluginState, resolveDraftBookmark } from '../pm-plugins/utils';
 const addAnnotationMark = (id, supportedBlockNodes) => (transaction, state) => {
   const inlineCommentState = getPluginState(state);
   const {

package/dist/es2019/index.js

@@ -1 +1 @@
-export { annotationPlugin } from './plugin';
+export { annotationPlugin } from './annotationPlugin';

package/dist/es2019/nodeviews/index.js

@@ -23,11 +23,17 @@ export class AnnotationNodeView extends ReactNodeView {
     );
   }
 }
-export const getAnnotationViewClassname = (isUnresolved, hasFocus) => {
+export const getAnnotationViewClassname = (isUnresolved, hasFocus, isHovered) => {
   if (!isUnresolved) {
     return;
   }
-  return hasFocus ? AnnotationSharedClassNames.focus : AnnotationSharedClassNames.blur;
+  if (hasFocus) {
+    return AnnotationSharedClassNames.focus;
+  }
+  if (isHovered) {
+    return AnnotationSharedClassNames.hover;
+  }
+  return AnnotationSharedClassNames.blur;
 };
 export const getBlockAnnotationViewClassname = (isUnresolved, hasFocus) => {
   if (!isUnresolved) {

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

@@ -3,10 +3,10 @@ import { RESOLVE_METHOD } from '@atlaskit/editor-common/analytics';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { clearDirtyMark, closeComponent, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../commands';
+import { clearDirtyMark, closeComponent, setHoveredAnnotation, setInlineCommentsVisibility, setSelectedAnnotation, updateInlineCommentResolvedState, updateMouseState } from '../editor-commands';
 import { AnnotationNodeView, getAnnotationViewClassname, getBlockAnnotationViewClassname } from '../nodeviews';
-import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from '../utils';
 import { createPluginState } from './plugin-factory';
+import { decorationKey, getAllAnnotations, getPluginState, inlineCommentPluginKey } from './utils';
 const fetchProviderStates = async (provider, annotationIds) => {
   const data = await provider.getState(annotationIds);
   let result = {};
@@ -33,6 +33,7 @@ const initialState = (disallowOnWhitespace = false, featureFlagsPluginState) =>
   return {
     annotations: {},
     selectedAnnotations: [],
+    hoveredAnnotations: [],
     mouseData: {
       isSelecting: false
     },
@@ -110,11 +111,21 @@ export const inlineCommentPlugin = options => {
           setSelectedAnnotation(annotationId)(editorView.state, editorView.dispatch);
         }
       };
+      const setHoveredAnnotationFn = annotationId => {
+        if (!annotationId) {
+          closeComponent()(editorView.state, editorView.dispatch);
+        } else {
+          setHoveredAnnotation(annotationId)(editorView.state, editorView.dispatch);
+        }
+      };
+      const removeHoveredannotationFn = () => {
+        setHoveredAnnotation('')(editorView.state, editorView.dispatch);
+      };
       const {
         updateSubscriber
       } = provider;
       if (updateSubscriber) {
-        updateSubscriber.on('resolve', resolve).on('delete', resolve).on('unresolve', unResolve).on('create', unResolve).on('setvisibility', setVisibility).on('setselectedannotation', setSelectedAnnotationFn);
+        updateSubscriber.on('resolve', resolve).on('delete', resolve).on('unresolve', unResolve).on('create', unResolve).on('setvisibility', setVisibility).on('setselectedannotation', setSelectedAnnotationFn).on('sethoveredannotation', setHoveredAnnotationFn).on('removehoveredannotation', removeHoveredannotationFn);
       }
 
       // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
@@ -134,7 +145,7 @@ export const inlineCommentPlugin = options => {
           // eslint-disable-next-line @repo/internal/dom-events/no-unsafe-event-listeners
           editorView.root.removeEventListener('mouseup', mouseUp);
           if (updateSubscriber) {
-            updateSubscriber.off('resolve', resolve).off('delete', resolve).off('unresolve', unResolve).off('create', unResolve).off('setvisibility', setVisibility).off('setselectedannotation', setSelectedAnnotationFn);
+            updateSubscriber.off('resolve', resolve).off('delete', resolve).off('unresolve', unResolve).off('create', unResolve).off('setvisibility', setVisibility).off('setselectedannotation', setSelectedAnnotationFn).off('sethoveredannotation', setHoveredAnnotationFn).off('removehoveredannotation', removeHoveredannotationFn);
           }
         }
       };
@@ -165,7 +176,8 @@ export const inlineCommentPlugin = options => {
           annotations,
           selectedAnnotations,
           isVisible,
-          isInlineCommentViewClosed
+          isInlineCommentViewClosed,
+          hoveredAnnotations
         } = getPluginState(state) || {};
         let decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : DecorationSet.empty;
         const focusDecorations = [];
@@ -181,6 +193,7 @@ export const inlineCommentPlugin = options => {
             if (isVisible) {
               const isUnresolved = !!annotations && annotations[mark.attrs.id] === false;
               const isSelected = !isInlineCommentViewClosed && !!(selectedAnnotations !== null && selectedAnnotations !== void 0 && selectedAnnotations.some(selectedAnnotation => selectedAnnotation.id === mark.attrs.id));
+              const isHovered = !isInlineCommentViewClosed && !!(hoveredAnnotations !== null && hoveredAnnotations !== void 0 && hoveredAnnotations.some(hoveredAnnotation => hoveredAnnotation.id === mark.attrs.id));
               if (isSupportedBlockNode) {
                 focusDecorations.push(Decoration.node(pos, pos + node.nodeSize, {
                   class: `${getBlockAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`
@@ -191,19 +204,19 @@ export const inlineCommentPlugin = options => {
                 if (fg('editor_inline_comments_on_inline_nodes')) {
                   if (node.isText) {
                     focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
-                      class: `${getAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`,
+                      class: `${getAnnotationViewClassname(isUnresolved, isSelected, isHovered)} ${isUnresolved}`,
                       nodeName: 'span'
                     }));
                   } else {
                     focusDecorations.push(Decoration.node(pos, pos + node.nodeSize, {
-                      class: `${getAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`
+                      class: `${getAnnotationViewClassname(isUnresolved, isSelected, isHovered)} ${isUnresolved}`
                     }, {
                       key: decorationKey.block
                     }));
                   }
                 } else {
                   focusDecorations.push(Decoration.inline(pos, pos + node.nodeSize, {
-                    class: `${getAnnotationViewClassname(isUnresolved, isSelected)} ${isUnresolved}`,
+                    class: `${getAnnotationViewClassname(isUnresolved, isSelected, isHovered)} ${isUnresolved}`,
                     nodeName: 'span'
                   }));
                 }

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

@@ -1,7 +1,7 @@
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { addInlineComment, bindKeymapWithCommand } from '@atlaskit/editor-common/keymaps';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
-import { setInlineCommentDraftState } from '../commands';
+import { setInlineCommentDraftState } from '../editor-commands';
 export function keymapPlugin(editorAnalyticsAPI) {
   const list = {};
   bindKeymapWithCommand(addInlineComment.common, setInlineCommentDraftState(editorAnalyticsAPI)(true, INPUT_METHOD.SHORTCUT), list);