@atlaskit/renderer 109.15.1 → 109.16.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/renderer
 
+## 109.16.0
+
+### Minor Changes
+
+- [#89299](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/89299) [`b462593ddae0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b462593ddae0) - [ED-22909] Update AnnotationRangeDispatchContext with actions to set and clear draft range for hover component
+
+### Patch Changes
+
+- [#89269](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/89269) [`78ee8b68398b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/78ee8b68398b) - Add onClick functionality to comment badge renderer
+- Updated dependencies
+
+## 109.15.3
+
+### Patch Changes
+
+- [#88742](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88742) [`6771cedeadd3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6771cedeadd3) - Add UI for comment badge in Renderer, clean up props
+
+## 109.15.2
+
+### Patch Changes
+
+- [#88323](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88323) [`b56b60b50087`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b56b60b50087) - Support nested annotation marks for media nodes in renderer
+- Updated dependencies
+
 ## 109.15.1
 
 ### Patch Changes

package/dist/cjs/react/nodes/media/index.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
@@ -14,6 +13,8 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _analyticsNext = require("@atlaskit/analytics-next");
@@ -21,16 +22,23 @@ var _analyticsNamespacedContext = require("@atlaskit/analytics-namespaced-contex
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _ui = require("@atlaskit/editor-common/ui");
 var _MediaCard = require("../../../ui/MediaCard");
+var _adfSchema = require("@atlaskit/adf-schema");
 var _editorPalette = require("@atlaskit/editor-palette");
 var _utils = require("../../../utils");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _events = require("../../../analytics/events");
 var _annotation = _interopRequireDefault(require("../../marks/annotation"));
 var _styles = require("./styles");
+var _mediaSingle = require("@atlaskit/editor-common/media-single");
+var _reactIntlNext = require("react-intl-next");
+var _hooks = require("../../../ui/annotations/hooks");
+var _types = require("@atlaskit/editor-common/types");
+var _excluded = ["marks"];
+/** @jsx jsx */
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /** @jsx jsx */
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var MediaBorder = function MediaBorder(_ref) {
   var _mark$attrs$color, _mark$attrs$size;
   var mark = _ref.mark,
@@ -85,6 +93,54 @@ var MediaAnnotation = function MediaAnnotation(_ref3) {
     useBlockLevel: true
   }, children);
 };
+var MediaAnnotations = function MediaAnnotations(_ref4) {
+  var _ref4$marks = _ref4.marks,
+    marks = _ref4$marks === void 0 ? [] : _ref4$marks,
+    children = _ref4.children;
+  // Early Exit
+  if (marks.length === 0) {
+    return (0, _react2.jsx)(_react.Fragment, null, children);
+  }
+
+  // Recursive marks
+  var currentMark = marks[0];
+  var otherMarks = marks.slice(1);
+  return (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(MediaAnnotation, {
+    key: currentMark.attrs.id,
+    mark: currentMark
+  }, otherMarks.length ? (0, _react2.jsx)(MediaAnnotations, {
+    marks: otherMarks
+  }, children) : (0, _react2.jsx)(_react.Fragment, null, children)));
+};
+var CommentBadge = (0, _reactIntlNext.injectIntl)(_mediaSingle.CommentBadge);
+var CommentBadgeWrapper = function CommentBadgeWrapper(_ref5) {
+  var _marks$map;
+  var marks = _ref5.marks,
+    rest = (0, _objectWithoutProperties2.default)(_ref5, _excluded);
+  var updateSubscriber = (0, _hooks.useInlineCommentSubscriberContext)();
+  var activeParentIds = (0, _hooks.useInlineCommentsFilter)({
+    annotationIds: (_marks$map = marks === null || marks === void 0 ? void 0 : marks.map(function (mark) {
+      return mark.attrs.id;
+    })) !== null && _marks$map !== void 0 ? _marks$map : [''],
+    filter: {
+      state: _adfSchema.AnnotationMarkStates.ACTIVE
+    }
+  });
+  if (!activeParentIds.length) {
+    return null;
+  }
+  var onClick = function onClick(e) {
+    if (updateSubscriber) {
+      updateSubscriber.emit(_types.AnnotationUpdateEvent.ON_ANNOTATION_CLICK, {
+        annotationIds: activeParentIds,
+        eventTarget: e.target
+      });
+    }
+  };
+  return (0, _react2.jsx)(CommentBadge, (0, _extends2.default)({
+    onClick: onClick
+  }, rest));
+};
 var Media = exports.default = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Media, _PureComponent);
   var _super = _createSuper(Media);
@@ -101,8 +157,11 @@ var Media = exports.default = /*#__PURE__*/function (_PureComponent) {
         featureFlags = _this$props.featureFlags,
         allowMediaViewer = _this$props.shouldOpenMediaViewer,
         enableDownloadButton = _this$props.enableDownloadButton,
-        ssr = _this$props.ssr;
-      var annotationMark = _this.props.isAnnotationMark ? _this.props.marks.find(_this.props.isAnnotationMark) : undefined;
+        ssr = _this$props.ssr,
+        width = _this$props.width,
+        height = _this$props.height,
+        mediaSingleElement = _this$props.mediaSingleElement;
+      var annotationMarks = _this.props.isAnnotationMark ? _this.props.marks.filter(_this.props.isAnnotationMark) : undefined;
       var borderMark = _this.props.marks.find(_this.props.isBorderMark);
       var linkMark = _this.props.marks.find(_this.props.isLinkMark);
       var linkHref = linkMark === null || linkMark === void 0 ? void 0 : linkMark.attrs.href;
@@ -111,15 +170,20 @@ var Media = exports.default = /*#__PURE__*/function (_PureComponent) {
       return (0, _react2.jsx)(MediaLink, {
         mark: linkMark,
         onClick: _this.handleMediaLinkClickFn
-      }, (0, _react2.jsx)(MediaAnnotation, {
-        mark: annotationMark
+      }, (0, _react2.jsx)(MediaAnnotations, {
+        marks: annotationMarks
       }, (0, _react2.jsx)(MediaBorder, {
         mark: borderMark
       }, (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
         data: (0, _defineProperty2.default)({}, _analyticsNamespacedContext.MEDIA_CONTEXT, {
           border: !!borderMark
         })
-      }, (0, _react2.jsx)(_MediaCard.MediaCard, (0, _extends2.default)({
+      }, !!annotationMarks && (0, _react2.jsx)(CommentBadgeWrapper, {
+        marks: annotationMarks,
+        mediaElement: mediaSingleElement,
+        width: width,
+        height: height
+      }), (0, _react2.jsx)(_MediaCard.MediaCard, (0, _extends2.default)({
         contextIdentifierProvider: contextIdentifierProvider
       }, _this.props, {
         shouldOpenMediaViewer: shouldOpenMediaViewer,

package/dist/cjs/react/nodes/mediaSingle/index.js

@@ -165,7 +165,8 @@ var MediaSingle = function MediaSingle(props) {
       originalDimensions: originalDimensions,
       onExternalImageLoaded: onExternalImageLoaded,
       disableOverlay: true,
-      featureFlags: featureFlags
+      featureFlags: featureFlags,
+      mediaSingleElement: ref.current
     });
     var uiMediaSingleStyles = layout === 'full-width' || layout === 'wide' ? [_styles.uiMediaSingleBaseStyles, _styles.uiMediaSingleLayoutStyles] : [_styles.uiMediaSingleBaseStyles];
     return (0, _react2.jsx)(_ui.MediaSingle, {

package/dist/cjs/ui/Renderer/index.js

@@ -55,7 +55,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "109.15.1";
+var packageVersion = "109.16.0";
 var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

package/dist/cjs/ui/annotations/contexts/AnnotationRangeContext.js

@@ -39,6 +39,13 @@ function reducer(state, action) {
         });
       }
       return state;
+    case 'clearDraftHover':
+      if (state.type === 'hover') {
+        return _objectSpread(_objectSpread({}, state), {}, {
+          draftRange: null
+        });
+      }
+      return state;
     case 'clearHover':
       if (state.type === 'hover') {
         return {
@@ -56,6 +63,14 @@ function reducer(state, action) {
         });
       }
       return state;
+    case 'setHover':
+      if (state.range !== action.range || state.type !== 'hover') {
+        return _objectSpread(_objectSpread({}, state), {}, {
+          range: action.range,
+          type: 'hover'
+        });
+      }
+      return state;
     case 'setDraftSelection':
       if (state.draftRange !== action.draftRange || state.type !== 'selection') {
         return {
@@ -65,16 +80,14 @@ function reducer(state, action) {
         };
       }
       return state;
-    case 'setHover':
-      if (state.range !== action.range || state.type !== 'hover') {
+    case 'setDraftHover':
+      if (state.draftRange !== action.draftRange || state.type !== 'hover') {
         return _objectSpread(_objectSpread({}, state), {}, {
-          range: action.range,
-          type: 'hover'
+          draftRange: action.draftRange
         });
       }
       return state;
   }
-  return state;
 }
 var AnnotationRangeStateContext = exports.AnnotationRangeStateContext = /*#__PURE__*/(0, _react.createContext)({
   range: null,
@@ -113,8 +126,14 @@ var AnnotationRangeProvider = exports.AnnotationRangeProvider = function Annotat
       type: 'clearSelection'
     });
   }, []);
-  var clearDraftRange = (0, _react.useCallback)(function () {
-    return dispatch({
+  var clearDraftRange = (0, _react.useCallback)(function (type) {
+    if (type === 'hover') {
+      dispatch({
+        type: 'clearDraftHover'
+      });
+      return;
+    }
+    dispatch({
       type: 'clearDraftSelection'
     });
   }, []);
@@ -129,7 +148,14 @@ var AnnotationRangeProvider = exports.AnnotationRangeProvider = function Annotat
       range: range
     });
   }, []);
-  var setDraftRange = (0, _react.useCallback)(function (range) {
+  var setDraftRange = (0, _react.useCallback)(function (range, type) {
+    if (type === 'hover') {
+      dispatch({
+        type: 'setDraftHover',
+        draftRange: range
+      });
+      return;
+    }
     dispatch({
       type: 'setDraftSelection',
       draftRange: range

package/dist/cjs/ui/annotations/wrapper.js

@@ -15,7 +15,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 var AnnotationsContextWrapper = exports.AnnotationsContextWrapper = function AnnotationsContextWrapper(props) {
   var providers = (0, _react.useContext)(_context.ProvidersContext);
   var _useAnnotationRangeSt = (0, _AnnotationRangeContext.useAnnotationRangeState)(),
-    range = _useAnnotationRangeSt.range;
+    range = _useAnnotationRangeSt.range,
+    type = _useAnnotationRangeSt.type;
   var _useAnnotationRangeDi = (0, _AnnotationRangeContext.useAnnotationRangeDispatch)(),
     setDraftRange = _useAnnotationRangeDi.setDraftRange,
     clearDraftRange = _useAnnotationRangeDi.clearDraftRange;
@@ -28,8 +29,11 @@ var AnnotationsContextWrapper = exports.AnnotationsContextWrapper = function Ann
 
   // We want to set the draft to the range the user highlighted
   var setRangeForDraft = (0, _react.useCallback)(function () {
-    setDraftRange(range);
-  }, [range, setDraftRange]);
+    setDraftRange(range, type);
+  }, [range, setDraftRange, type]);
+  var clearRangeForDraft = (0, _react.useCallback)(function () {
+    clearDraftRange(type);
+  }, [type, clearDraftRange]);
   var render = (0, _react.useCallback)(function (_ref) {
     var applyAnnotationDraftAt = _ref.applyAnnotationDraftAt,
       clearAnnotationDraft = _ref.clearAnnotationDraft;
@@ -52,6 +56,6 @@ var AnnotationsContextWrapper = exports.AnnotationsContextWrapper = function Ann
   }
   return /*#__PURE__*/_react.default.createElement(_context.AnnotationsDraftContextWrapper, {
     setDraftRange: setRangeForDraft,
-    clearDraftRange: clearDraftRange
+    clearDraftRange: clearRangeForDraft
   }, render);
 };

package/dist/es2019/react/nodes/media/index.js

@@ -1,5 +1,5 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
 
 import React, { PureComponent, Fragment } from 'react';
@@ -9,12 +9,17 @@ import { MEDIA_CONTEXT } from '@atlaskit/analytics-namespaced-context';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { MediaBorderGapFiller } from '@atlaskit/editor-common/ui';
 import { MediaCard } from '../../../ui/MediaCard';
+import { AnnotationMarkStates } from '@atlaskit/adf-schema';
 import { hexToEditorBorderPaletteColor } from '@atlaskit/editor-palette';
 import { getEventHandler } from '../../../utils';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { MODE, PLATFORM } from '../../../analytics/events';
 import AnnotationComponent from '../../marks/annotation';
 import { linkStyle, borderStyle } from './styles';
+import { CommentBadge as CommentBadgeComponent } from '@atlaskit/editor-common/media-single';
+import { injectIntl } from 'react-intl-next';
+import { useInlineCommentSubscriberContext, useInlineCommentsFilter } from '../../../ui/annotations/hooks';
+import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
 const MediaBorder = ({
   mark,
   children
@@ -72,6 +77,53 @@ const MediaAnnotation = ({
     useBlockLevel: true
   }, children);
 };
+const MediaAnnotations = ({
+  marks = [],
+  children
+}) => {
+  // Early Exit
+  if (marks.length === 0) {
+    return jsx(Fragment, null, children);
+  }
+
+  // Recursive marks
+  const currentMark = marks[0];
+  const otherMarks = marks.slice(1);
+  return jsx(Fragment, null, jsx(MediaAnnotation, {
+    key: currentMark.attrs.id,
+    mark: currentMark
+  }, otherMarks.length ? jsx(MediaAnnotations, {
+    marks: otherMarks
+  }, children) : jsx(Fragment, null, children)));
+};
+const CommentBadge = injectIntl(CommentBadgeComponent);
+const CommentBadgeWrapper = ({
+  marks,
+  ...rest
+}) => {
+  var _marks$map;
+  const updateSubscriber = useInlineCommentSubscriberContext();
+  const activeParentIds = useInlineCommentsFilter({
+    annotationIds: (_marks$map = marks === null || marks === void 0 ? void 0 : marks.map(mark => mark.attrs.id)) !== null && _marks$map !== void 0 ? _marks$map : [''],
+    filter: {
+      state: AnnotationMarkStates.ACTIVE
+    }
+  });
+  if (!activeParentIds.length) {
+    return null;
+  }
+  const onClick = e => {
+    if (updateSubscriber) {
+      updateSubscriber.emit(AnnotationUpdateEvent.ON_ANNOTATION_CLICK, {
+        annotationIds: activeParentIds,
+        eventTarget: e.target
+      });
+    }
+  };
+  return jsx(CommentBadge, _extends({
+    onClick: onClick
+  }, rest));
+};
 export default class Media extends PureComponent {
   constructor(props) {
     super(props);
@@ -85,9 +137,12 @@ export default class Media extends PureComponent {
         featureFlags,
         shouldOpenMediaViewer: allowMediaViewer,
         enableDownloadButton,
-        ssr
+        ssr,
+        width,
+        height,
+        mediaSingleElement
       } = this.props;
-      const annotationMark = this.props.isAnnotationMark ? this.props.marks.find(this.props.isAnnotationMark) : undefined;
+      const annotationMarks = this.props.isAnnotationMark ? this.props.marks.filter(this.props.isAnnotationMark) : undefined;
       const borderMark = this.props.marks.find(this.props.isBorderMark);
       const linkMark = this.props.marks.find(this.props.isLinkMark);
       const linkHref = linkMark === null || linkMark === void 0 ? void 0 : linkMark.attrs.href;
@@ -96,8 +151,8 @@ export default class Media extends PureComponent {
       return jsx(MediaLink, {
         mark: linkMark,
         onClick: this.handleMediaLinkClickFn
-      }, jsx(MediaAnnotation, {
-        mark: annotationMark
+      }, jsx(MediaAnnotations, {
+        marks: annotationMarks
       }, jsx(MediaBorder, {
         mark: borderMark
       }, jsx(AnalyticsContext, {
@@ -106,7 +161,12 @@ export default class Media extends PureComponent {
             border: !!borderMark
           }
         }
-      }, jsx(MediaCard, _extends({
+      }, !!annotationMarks && jsx(CommentBadgeWrapper, {
+        marks: annotationMarks,
+        mediaElement: mediaSingleElement,
+        width: width,
+        height: height
+      }), jsx(MediaCard, _extends({
         contextIdentifierProvider: contextIdentifierProvider
       }, this.props, {
         shouldOpenMediaViewer: shouldOpenMediaViewer,

package/dist/es2019/react/nodes/mediaSingle/index.js

@@ -150,7 +150,8 @@ const MediaSingle = props => {
       originalDimensions,
       onExternalImageLoaded,
       disableOverlay: true,
-      featureFlags
+      featureFlags,
+      mediaSingleElement: ref.current
     });
     const uiMediaSingleStyles = layout === 'full-width' || layout === 'wide' ? [uiMediaSingleBaseStyles, uiMediaSingleLayoutStyles] : [uiMediaSingleBaseStyles];
     return jsx(UIMediaSingle, {

package/dist/es2019/ui/Renderer/index.js

@@ -36,7 +36,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "109.15.1";
+const packageVersion = "109.16.0";
 export class Renderer extends PureComponent {
   constructor(props) {
     super(props);

package/dist/es2019/ui/annotations/contexts/AnnotationRangeContext.js

@@ -27,6 +27,14 @@ function reducer(state, action) {
         };
       }
       return state;
+    case 'clearDraftHover':
+      if (state.type === 'hover') {
+        return {
+          ...state,
+          draftRange: null
+        };
+      }
+      return state;
     case 'clearHover':
       if (state.type === 'hover') {
         return {
@@ -45,6 +53,15 @@ function reducer(state, action) {
         };
       }
       return state;
+    case 'setHover':
+      if (state.range !== action.range || state.type !== 'hover') {
+        return {
+          ...state,
+          range: action.range,
+          type: 'hover'
+        };
+      }
+      return state;
     case 'setDraftSelection':
       if (state.draftRange !== action.draftRange || state.type !== 'selection') {
         return {
@@ -54,17 +71,15 @@ function reducer(state, action) {
         };
       }
       return state;
-    case 'setHover':
-      if (state.range !== action.range || state.type !== 'hover') {
+    case 'setDraftHover':
+      if (state.draftRange !== action.draftRange || state.type !== 'hover') {
         return {
           ...state,
-          range: action.range,
-          type: 'hover'
+          draftRange: action.draftRange
         };
       }
       return state;
   }
-  return state;
 }
 export const AnnotationRangeStateContext = /*#__PURE__*/createContext({
   range: null,
@@ -98,9 +113,17 @@ export const AnnotationRangeProvider = ({
   const clearSelectionRange = useCallback(() => dispatch({
     type: 'clearSelection'
   }), []);
-  const clearDraftRange = useCallback(() => dispatch({
-    type: 'clearDraftSelection'
-  }), []);
+  const clearDraftRange = useCallback(type => {
+    if (type === 'hover') {
+      dispatch({
+        type: 'clearDraftHover'
+      });
+      return;
+    }
+    dispatch({
+      type: 'clearDraftSelection'
+    });
+  }, []);
   const clearHoverRange = useCallback(() => dispatch({
     type: 'clearHover'
   }), []);
@@ -108,7 +131,14 @@ export const AnnotationRangeProvider = ({
     type: 'setSelection',
     range
   }), []);
-  const setDraftRange = useCallback(range => {
+  const setDraftRange = useCallback((range, type) => {
+    if (type === 'hover') {
+      dispatch({
+        type: 'setDraftHover',
+        draftRange: range
+      });
+      return;
+    }
     dispatch({
       type: 'setDraftSelection',
       draftRange: range

package/dist/es2019/ui/annotations/wrapper.js

@@ -6,7 +6,8 @@ import { useAnnotationRangeDispatch, useAnnotationRangeState } from './contexts/
 export const AnnotationsContextWrapper = props => {
   const providers = useContext(ProvidersContext);
   const {
-    range
+    range,
+    type
   } = useAnnotationRangeState();
   const {
     setDraftRange,
@@ -23,8 +24,11 @@ export const AnnotationsContextWrapper = props => {
 
   // We want to set the draft to the range the user highlighted
   const setRangeForDraft = useCallback(() => {
-    setDraftRange(range);
-  }, [range, setDraftRange]);
+    setDraftRange(range, type);
+  }, [range, setDraftRange, type]);
+  const clearRangeForDraft = useCallback(() => {
+    clearDraftRange(type);
+  }, [type, clearDraftRange]);
   const render = useCallback(({
     applyAnnotationDraftAt,
     clearAnnotationDraft
@@ -48,6 +52,6 @@ export const AnnotationsContextWrapper = props => {
   }
   return /*#__PURE__*/React.createElement(AnnotationsDraftContextWrapper, {
     setDraftRange: setRangeForDraft,
-    clearDraftRange: clearDraftRange
+    clearDraftRange: clearRangeForDraft
   }, render);
 };

package/dist/esm/react/nodes/media/index.js

@@ -1,4 +1,3 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
@@ -6,6 +5,9 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+var _excluded = ["marks"];
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 /** @jsx jsx */
@@ -17,12 +19,17 @@ import { MEDIA_CONTEXT } from '@atlaskit/analytics-namespaced-context';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { MediaBorderGapFiller } from '@atlaskit/editor-common/ui';
 import { MediaCard } from '../../../ui/MediaCard';
+import { AnnotationMarkStates } from '@atlaskit/adf-schema';
 import { hexToEditorBorderPaletteColor } from '@atlaskit/editor-palette';
 import { getEventHandler } from '../../../utils';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { MODE, PLATFORM } from '../../../analytics/events';
 import AnnotationComponent from '../../marks/annotation';
 import { linkStyle, borderStyle } from './styles';
+import { CommentBadge as CommentBadgeComponent } from '@atlaskit/editor-common/media-single';
+import { injectIntl } from 'react-intl-next';
+import { useInlineCommentSubscriberContext, useInlineCommentsFilter } from '../../../ui/annotations/hooks';
+import { AnnotationUpdateEvent } from '@atlaskit/editor-common/types';
 var MediaBorder = function MediaBorder(_ref) {
   var _mark$attrs$color, _mark$attrs$size;
   var mark = _ref.mark,
@@ -77,6 +84,54 @@ var MediaAnnotation = function MediaAnnotation(_ref3) {
     useBlockLevel: true
   }, children);
 };
+var MediaAnnotations = function MediaAnnotations(_ref4) {
+  var _ref4$marks = _ref4.marks,
+    marks = _ref4$marks === void 0 ? [] : _ref4$marks,
+    children = _ref4.children;
+  // Early Exit
+  if (marks.length === 0) {
+    return jsx(Fragment, null, children);
+  }
+
+  // Recursive marks
+  var currentMark = marks[0];
+  var otherMarks = marks.slice(1);
+  return jsx(Fragment, null, jsx(MediaAnnotation, {
+    key: currentMark.attrs.id,
+    mark: currentMark
+  }, otherMarks.length ? jsx(MediaAnnotations, {
+    marks: otherMarks
+  }, children) : jsx(Fragment, null, children)));
+};
+var CommentBadge = injectIntl(CommentBadgeComponent);
+var CommentBadgeWrapper = function CommentBadgeWrapper(_ref5) {
+  var _marks$map;
+  var marks = _ref5.marks,
+    rest = _objectWithoutProperties(_ref5, _excluded);
+  var updateSubscriber = useInlineCommentSubscriberContext();
+  var activeParentIds = useInlineCommentsFilter({
+    annotationIds: (_marks$map = marks === null || marks === void 0 ? void 0 : marks.map(function (mark) {
+      return mark.attrs.id;
+    })) !== null && _marks$map !== void 0 ? _marks$map : [''],
+    filter: {
+      state: AnnotationMarkStates.ACTIVE
+    }
+  });
+  if (!activeParentIds.length) {
+    return null;
+  }
+  var onClick = function onClick(e) {
+    if (updateSubscriber) {
+      updateSubscriber.emit(AnnotationUpdateEvent.ON_ANNOTATION_CLICK, {
+        annotationIds: activeParentIds,
+        eventTarget: e.target
+      });
+    }
+  };
+  return jsx(CommentBadge, _extends({
+    onClick: onClick
+  }, rest));
+};
 var Media = /*#__PURE__*/function (_PureComponent) {
   _inherits(Media, _PureComponent);
   var _super = _createSuper(Media);
@@ -93,8 +148,11 @@ var Media = /*#__PURE__*/function (_PureComponent) {
         featureFlags = _this$props.featureFlags,
         allowMediaViewer = _this$props.shouldOpenMediaViewer,
         enableDownloadButton = _this$props.enableDownloadButton,
-        ssr = _this$props.ssr;
-      var annotationMark = _this.props.isAnnotationMark ? _this.props.marks.find(_this.props.isAnnotationMark) : undefined;
+        ssr = _this$props.ssr,
+        width = _this$props.width,
+        height = _this$props.height,
+        mediaSingleElement = _this$props.mediaSingleElement;
+      var annotationMarks = _this.props.isAnnotationMark ? _this.props.marks.filter(_this.props.isAnnotationMark) : undefined;
       var borderMark = _this.props.marks.find(_this.props.isBorderMark);
       var linkMark = _this.props.marks.find(_this.props.isLinkMark);
       var linkHref = linkMark === null || linkMark === void 0 ? void 0 : linkMark.attrs.href;
@@ -103,15 +161,20 @@ var Media = /*#__PURE__*/function (_PureComponent) {
       return jsx(MediaLink, {
         mark: linkMark,
         onClick: _this.handleMediaLinkClickFn
-      }, jsx(MediaAnnotation, {
-        mark: annotationMark
+      }, jsx(MediaAnnotations, {
+        marks: annotationMarks
       }, jsx(MediaBorder, {
         mark: borderMark
       }, jsx(AnalyticsContext, {
         data: _defineProperty({}, MEDIA_CONTEXT, {
           border: !!borderMark
         })
-      }, jsx(MediaCard, _extends({
+      }, !!annotationMarks && jsx(CommentBadgeWrapper, {
+        marks: annotationMarks,
+        mediaElement: mediaSingleElement,
+        width: width,
+        height: height
+      }), jsx(MediaCard, _extends({
         contextIdentifierProvider: contextIdentifierProvider
       }, _this.props, {
         shouldOpenMediaViewer: shouldOpenMediaViewer,

package/dist/esm/react/nodes/mediaSingle/index.js

@@ -155,7 +155,8 @@ var MediaSingle = function MediaSingle(props) {
       originalDimensions: originalDimensions,
       onExternalImageLoaded: onExternalImageLoaded,
       disableOverlay: true,
-      featureFlags: featureFlags
+      featureFlags: featureFlags,
+      mediaSingleElement: ref.current
     });
     var uiMediaSingleStyles = layout === 'full-width' || layout === 'wide' ? [uiMediaSingleBaseStyles, uiMediaSingleLayoutStyles] : [uiMediaSingleBaseStyles];
     return jsx(UIMediaSingle, {

package/dist/esm/ui/Renderer/index.js

@@ -46,7 +46,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "109.15.1";
+var packageVersion = "109.16.0";
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

package/dist/esm/ui/annotations/contexts/AnnotationRangeContext.js

@@ -29,6 +29,13 @@ function reducer(state, action) {
         });
       }
       return state;
+    case 'clearDraftHover':
+      if (state.type === 'hover') {
+        return _objectSpread(_objectSpread({}, state), {}, {
+          draftRange: null
+        });
+      }
+      return state;
     case 'clearHover':
       if (state.type === 'hover') {
         return {
@@ -46,6 +53,14 @@ function reducer(state, action) {
         });
       }
       return state;
+    case 'setHover':
+      if (state.range !== action.range || state.type !== 'hover') {
+        return _objectSpread(_objectSpread({}, state), {}, {
+          range: action.range,
+          type: 'hover'
+        });
+      }
+      return state;
     case 'setDraftSelection':
       if (state.draftRange !== action.draftRange || state.type !== 'selection') {
         return {
@@ -55,16 +70,14 @@ function reducer(state, action) {
         };
       }
       return state;
-    case 'setHover':
-      if (state.range !== action.range || state.type !== 'hover') {
+    case 'setDraftHover':
+      if (state.draftRange !== action.draftRange || state.type !== 'hover') {
         return _objectSpread(_objectSpread({}, state), {}, {
-          range: action.range,
-          type: 'hover'
+          draftRange: action.draftRange
         });
       }
       return state;
   }
-  return state;
 }
 export var AnnotationRangeStateContext = /*#__PURE__*/createContext({
   range: null,
@@ -103,8 +116,14 @@ export var AnnotationRangeProvider = function AnnotationRangeProvider(_ref) {
       type: 'clearSelection'
     });
   }, []);
-  var clearDraftRange = useCallback(function () {
-    return dispatch({
+  var clearDraftRange = useCallback(function (type) {
+    if (type === 'hover') {
+      dispatch({
+        type: 'clearDraftHover'
+      });
+      return;
+    }
+    dispatch({
       type: 'clearDraftSelection'
     });
   }, []);
@@ -119,7 +138,14 @@ export var AnnotationRangeProvider = function AnnotationRangeProvider(_ref) {
       range: range
     });
   }, []);
-  var setDraftRange = useCallback(function (range) {
+  var setDraftRange = useCallback(function (range, type) {
+    if (type === 'hover') {
+      dispatch({
+        type: 'setDraftHover',
+        draftRange: range
+      });
+      return;
+    }
     dispatch({
       type: 'setDraftSelection',
       draftRange: range

package/dist/esm/ui/annotations/wrapper.js

@@ -6,7 +6,8 @@ import { useAnnotationRangeDispatch, useAnnotationRangeState } from './contexts/
 export var AnnotationsContextWrapper = function AnnotationsContextWrapper(props) {
   var providers = useContext(ProvidersContext);
   var _useAnnotationRangeSt = useAnnotationRangeState(),
-    range = _useAnnotationRangeSt.range;
+    range = _useAnnotationRangeSt.range,
+    type = _useAnnotationRangeSt.type;
   var _useAnnotationRangeDi = useAnnotationRangeDispatch(),
     setDraftRange = _useAnnotationRangeDi.setDraftRange,
     clearDraftRange = _useAnnotationRangeDi.clearDraftRange;
@@ -19,8 +20,11 @@ export var AnnotationsContextWrapper = function AnnotationsContextWrapper(props)
 
   // We want to set the draft to the range the user highlighted
   var setRangeForDraft = useCallback(function () {
-    setDraftRange(range);
-  }, [range, setDraftRange]);
+    setDraftRange(range, type);
+  }, [range, setDraftRange, type]);
+  var clearRangeForDraft = useCallback(function () {
+    clearDraftRange(type);
+  }, [type, clearDraftRange]);
   var render = useCallback(function (_ref) {
     var applyAnnotationDraftAt = _ref.applyAnnotationDraftAt,
       clearAnnotationDraft = _ref.clearAnnotationDraft;
@@ -43,6 +47,6 @@ export var AnnotationsContextWrapper = function AnnotationsContextWrapper(props)
   }
   return /*#__PURE__*/React.createElement(AnnotationsDraftContextWrapper, {
     setDraftRange: setRangeForDraft,
-    clearDraftRange: clearDraftRange
+    clearDraftRange: clearRangeForDraft
   }, render);
 };

package/dist/types/react/nodes/media/index.d.ts

@@ -19,6 +19,9 @@ export type MediaProps = MediaCardProps & {
     featureFlags?: MediaFeatureFlags;
     eventHandlers?: EventHandlers;
     enableDownloadButton?: boolean;
+    mediaSingleElement?: HTMLElement | null;
+    width?: number;
+    height?: number;
 };
 export default class Media extends PureComponent<MediaProps, {}> {
     constructor(props: MediaProps);

package/dist/types/ui/annotations/contexts/AnnotationRangeContext.d.ts

@@ -1,17 +1,18 @@
 import type { ReactNode } from 'react';
 import React from 'react';
+type RangeType = 'selection' | 'hover' | null;
 interface AnnotationRangeStateContext {
     range: Range | null;
     draftRange: Range | null;
-    type: 'selection' | 'hover' | null;
+    type: RangeType;
 }
 interface AnnotationRangeDispatchContext {
     clearRange: () => void;
     clearSelectionRange: () => void;
-    clearDraftRange: () => void;
+    clearDraftRange: (type: RangeType) => void;
     clearHoverRange: () => void;
     setRange: (range: Range) => void;
-    setDraftRange: (draftRange: Range | null) => void;
+    setDraftRange: (draftRange: Range | null, type: RangeType) => void;
     setHoverTarget?: (target: HTMLElement) => void;
 }
 export declare const AnnotationRangeStateContext: React.Context<AnnotationRangeStateContext>;

package/dist/types-ts4.5/react/nodes/media/index.d.ts

@@ -19,6 +19,9 @@ export type MediaProps = MediaCardProps & {
     featureFlags?: MediaFeatureFlags;
     eventHandlers?: EventHandlers;
     enableDownloadButton?: boolean;
+    mediaSingleElement?: HTMLElement | null;
+    width?: number;
+    height?: number;
 };
 export default class Media extends PureComponent<MediaProps, {}> {
     constructor(props: MediaProps);

package/dist/types-ts4.5/ui/annotations/contexts/AnnotationRangeContext.d.ts

@@ -1,17 +1,18 @@
 import type { ReactNode } from 'react';
 import React from 'react';
+type RangeType = 'selection' | 'hover' | null;
 interface AnnotationRangeStateContext {
     range: Range | null;
     draftRange: Range | null;
-    type: 'selection' | 'hover' | null;
+    type: RangeType;
 }
 interface AnnotationRangeDispatchContext {
     clearRange: () => void;
     clearSelectionRange: () => void;
-    clearDraftRange: () => void;
+    clearDraftRange: (type: RangeType) => void;
     clearHoverRange: () => void;
     setRange: (range: Range) => void;
-    setDraftRange: (draftRange: Range | null) => void;
+    setDraftRange: (draftRange: Range | null, type: RangeType) => void;
     setHoverTarget?: (target: HTMLElement) => void;
 }
 export declare const AnnotationRangeStateContext: React.Context<AnnotationRangeStateContext>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/renderer",
-  "version": "109.15.1",
+  "version": "109.16.0",
   "description": "Renderer component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -29,22 +29,22 @@
     "@atlaskit/analytics-listeners": "^8.9.0",
     "@atlaskit/analytics-namespaced-context": "^6.9.0",
     "@atlaskit/analytics-next": "^9.2.0",
-    "@atlaskit/button": "^17.10.0",
+    "@atlaskit/button": "^17.11.0",
     "@atlaskit/code": "^15.1.0",
-    "@atlaskit/editor-common": "^78.23.0",
+    "@atlaskit/editor-common": "^78.25.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-palette": "1.5.3",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/editor-shared-styles": "^2.9.0",
     "@atlaskit/emoji": "^67.6.0",
     "@atlaskit/icon": "^22.1.0",
-    "@atlaskit/link-datasource": "^1.25.0",
-    "@atlaskit/media-card": "^77.10.0",
-    "@atlaskit/media-client": "^26.2.0",
+    "@atlaskit/link-datasource": "^1.26.0",
+    "@atlaskit/media-card": "^77.11.0",
+    "@atlaskit/media-client": "^26.3.0",
     "@atlaskit/media-client-react": "^2.0.0",
     "@atlaskit/media-common": "^11.1.0",
     "@atlaskit/media-filmstrip": "^47.0.0",
-    "@atlaskit/media-ui": "^25.5.0",
+    "@atlaskit/media-ui": "^25.6.0",
     "@atlaskit/media-viewer": "^48.4.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/smart-card": "^26.52.0",
@@ -52,7 +52,7 @@
     "@atlaskit/task-decision": "^17.9.0",
     "@atlaskit/theme": "^12.7.0",
     "@atlaskit/tokens": "^1.43.0",
-    "@atlaskit/tooltip": "^18.1.0",
+    "@atlaskit/tooltip": "^18.2.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
     "lodash": "^4.17.21",
@@ -98,6 +98,7 @@
     "react": "^16.8.0",
     "react-dom": "^16.8.0",
     "react-live-clock": "^5.0.0",
+    "react-magnetic-di": "^2.2.6",
     "react-moment": "^1.1.2",
     "react-test-renderer": "^16.8.0",
     "rxjs": "^5.5.0",