@atlaskit/renderer 109.18.0 → 109.18.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/renderer
 
+## 109.18.1
+
+### Patch Changes
+
+- [#90969](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/90969) [`e6b63a9cbe78`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e6b63a9cbe78) - Fix issues with comment hover for media nodes
+
 ## 109.18.0
 
 ### Minor Changes

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

@@ -15,6 +15,7 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _style = require("../../../ui/Renderer/style");
 var _styles = require("./styles");
+var _AnnotationRangeContext = require("../../../ui/annotations/contexts/AnnotationRangeContext");
 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; }
 /** @jsx jsx */
@@ -144,6 +145,24 @@ var MediaSingleWithChildren = function MediaSingleWithChildren(props) {
       height: height
     };
   }, [height, width]);
+  var _useAnnotationRangeDi = (0, _AnnotationRangeContext.useAnnotationRangeDispatch)(),
+    setHoverTarget = _useAnnotationRangeDi.setHoverTarget;
+  (0, _react.useEffect)(function () {
+    var mediaSingleElement = ref.current;
+    var callback = function callback(event) {
+      if (event.buttons === 0) {
+        setHoverTarget && setHoverTarget(event.target);
+      }
+    };
+    if (mediaSingleElement) {
+      mediaSingleElement.addEventListener('mouseenter', callback);
+    }
+    return function () {
+      if (mediaSingleElement) {
+        mediaSingleElement.removeEventListener('mouseenter', callback);
+      }
+    };
+  }, [setHoverTarget]);
 
   // Note: in SSR mode the `window` object is not defined,
   // therefore width here is 0, see:

package/dist/cjs/ui/MediaCard.js

@@ -21,7 +21,6 @@ var _traverse = require("@atlaskit/adf-utils/traverse");
 var _mediaCard = require("@atlaskit/media-card");
 var _mediaClientReact = require("@atlaskit/media-client-react");
 var _utils = require("@atlaskit/editor-common/utils");
-var _AnnotationRangeContext = require("./annotations/contexts/AnnotationRangeContext");
 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 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; }
@@ -269,7 +268,6 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
         shouldEnableDownloadButton = _this$props5.shouldEnableDownloadButton,
         ssr = _this$props5.ssr,
         mediaClient = _this$props5.mediaClient,
-        setHoverTarget = _this$props5.setHoverTarget,
         dataAttributes = _this$props5.dataAttributes;
       var isMobile = rendererAppearance === 'mobile';
       var shouldPlayInline = useInlinePlayer !== undefined ? useInlinePlayer : true;
@@ -305,15 +303,7 @@ var MediaCardView = exports.MediaCardView = /*#__PURE__*/function (_Component) {
         contextIdentifierProvider: contextIdentifierProvider,
         originalDimensions: originalDimensions,
         fileState: fileState
-      }), dataAttributes, {
-        onMouseEnter: function onMouseEnter(event) {
-          // We will not allow a hover target to be set if any mouse button is depressed during the mouse enter state.
-          // This could be due to the user trying to select text across the document.
-          if (event.buttons === 0) {
-            setHoverTarget && setHoverTarget(event.target);
-          }
-        }
-      }), /*#__PURE__*/_react.default.createElement(_mediaCard.Card, {
+      }), dataAttributes), /*#__PURE__*/_react.default.createElement(_mediaCard.Card, {
         identifier: identifier,
         alt: alt,
         contextId: contextId,
@@ -371,11 +361,8 @@ var getClipboardAttrs = exports.getClipboardAttrs = function getClipboardAttrs(_
 };
 var MediaCardInternal = exports.MediaCardInternal = function MediaCardInternal(props) {
   var mediaClient = (0, _react.useContext)(_mediaClientReact.MediaClientContext);
-  var _useAnnotationRangeDi = (0, _AnnotationRangeContext.useAnnotationRangeDispatch)(),
-    setHoverTarget = _useAnnotationRangeDi.setHoverTarget;
   return /*#__PURE__*/_react.default.createElement(MediaCardView, (0, _extends2.default)({}, props, {
-    mediaClient: mediaClient,
-    setHoverTarget: setHoverTarget
+    mediaClient: mediaClient
   }));
 };
 var MediaCard = exports.MediaCard = (0, _utils.withImageLoader)(MediaCardInternal);

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.18.0";
+var packageVersion = "109.18.1";
 var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

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

@@ -162,9 +162,11 @@ var AnnotationRangeProvider = exports.AnnotationRangeProvider = function Annotat
     });
   }, []);
   var setHoverTarget = (0, _react.useCallback)(function (target) {
+    // the HoverComponent expects an element deeply nested inside media, these classes work with the current implementation
+    var mediaNode = target.querySelector('.media-card-inline-player, .media-file-card-view');
     var range = document.createRange();
-    range.setStartBefore(target);
-    range.setEndAfter(target);
+    range.setStartBefore(mediaNode);
+    range.setEndAfter(mediaNode);
     dispatch({
       type: 'setHover',
       range: range

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

@@ -1,13 +1,14 @@
 import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
 
-import { default as React, Fragment, useCallback, useContext, useMemo } from 'react';
+import { default as React, Fragment, useCallback, useContext, useMemo, useEffect } from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import { MediaSingle as UIMediaSingle, WidthContext } from '@atlaskit/editor-common/ui';
 import { akEditorFullWidthLayoutWidth, akEditorDefaultLayoutWidth, akEditorWideLayoutWidth } from '@atlaskit/editor-shared-styles';
 import { FullPagePadding } from '../../../ui/Renderer/style';
 import { uiMediaSingleBaseStyles, uiMediaSingleLayoutStyles } from './styles';
+import { useAnnotationRangeDispatch } from '../../../ui/annotations/contexts/AnnotationRangeContext';
 const DEFAULT_WIDTH = 250;
 const DEFAULT_HEIGHT = 200;
 const isMediaElement = media => {
@@ -129,6 +130,25 @@ const MediaSingleWithChildren = props => {
     width,
     height
   }), [height, width]);
+  const {
+    setHoverTarget
+  } = useAnnotationRangeDispatch();
+  useEffect(() => {
+    const mediaSingleElement = ref.current;
+    const callback = event => {
+      if (event.buttons === 0) {
+        setHoverTarget && setHoverTarget(event.target);
+      }
+    };
+    if (mediaSingleElement) {
+      mediaSingleElement.addEventListener('mouseenter', callback);
+    }
+    return () => {
+      if (mediaSingleElement) {
+        mediaSingleElement.removeEventListener('mouseenter', callback);
+      }
+    };
+  }, [setHoverTarget]);
 
   // Note: in SSR mode the `window` object is not defined,
   // therefore width here is 0, see:

package/dist/es2019/ui/MediaCard.js

@@ -5,7 +5,6 @@ import { filter } from '@atlaskit/adf-utils/traverse';
 import { Card, CardLoading, CardError } from '@atlaskit/media-card';
 import { MediaClientContext } from '@atlaskit/media-client-react';
 import { withImageLoader } from '@atlaskit/editor-common/utils';
-import { useAnnotationRangeDispatch } from './annotations/contexts/AnnotationRangeContext';
 export const mediaIdentifierMap = new Map();
 export const getListOfIdentifiersFromDoc = doc => {
   if (!doc) {
@@ -201,7 +200,6 @@ export class MediaCardView extends Component {
       shouldEnableDownloadButton,
       ssr,
       mediaClient,
-      setHoverTarget,
       dataAttributes
     } = this.props;
     const isMobile = rendererAppearance === 'mobile';
@@ -238,15 +236,7 @@ export class MediaCardView extends Component {
       contextIdentifierProvider,
       originalDimensions,
       fileState
-    }), dataAttributes, {
-      onMouseEnter: event => {
-        // We will not allow a hover target to be set if any mouse button is depressed during the mouse enter state.
-        // This could be due to the user trying to select text across the document.
-        if (event.buttons === 0) {
-          setHoverTarget && setHoverTarget(event.target);
-        }
-      }
-    }), /*#__PURE__*/React.createElement(Card, {
+    }), dataAttributes), /*#__PURE__*/React.createElement(Card, {
       identifier: identifier,
       alt: alt,
       contextId: contextId,
@@ -303,12 +293,8 @@ export const getClipboardAttrs = ({
 };
 export const MediaCardInternal = props => {
   const mediaClient = useContext(MediaClientContext);
-  const {
-    setHoverTarget
-  } = useAnnotationRangeDispatch();
   return /*#__PURE__*/React.createElement(MediaCardView, _extends({}, props, {
-    mediaClient: mediaClient,
-    setHoverTarget: setHoverTarget
+    mediaClient: mediaClient
   }));
 };
 export const MediaCard = withImageLoader(MediaCardInternal);

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.18.0";
+const packageVersion = "109.18.1";
 export class Renderer extends PureComponent {
   constructor(props) {
     super(props);

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

@@ -145,9 +145,11 @@ export const AnnotationRangeProvider = ({
     });
   }, []);
   const setHoverTarget = useCallback(target => {
+    // the HoverComponent expects an element deeply nested inside media, these classes work with the current implementation
+    const mediaNode = target.querySelector('.media-card-inline-player, .media-file-card-view');
     const range = document.createRange();
-    range.setStartBefore(target);
-    range.setEndAfter(target);
+    range.setStartBefore(mediaNode);
+    range.setEndAfter(mediaNode);
     dispatch({
       type: 'setHover',
       range

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

@@ -2,13 +2,14 @@ import _extends from "@babel/runtime/helpers/extends";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 /** @jsx jsx */
 
-import { default as React, Fragment, useCallback, useContext, useMemo } from 'react';
+import { default as React, Fragment, useCallback, useContext, useMemo, useEffect } from 'react';
 import { jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import { MediaSingle as UIMediaSingle, WidthContext } from '@atlaskit/editor-common/ui';
 import { akEditorFullWidthLayoutWidth, akEditorDefaultLayoutWidth, akEditorWideLayoutWidth } from '@atlaskit/editor-shared-styles';
 import { FullPagePadding } from '../../../ui/Renderer/style';
 import { uiMediaSingleBaseStyles, uiMediaSingleLayoutStyles } from './styles';
+import { useAnnotationRangeDispatch } from '../../../ui/annotations/contexts/AnnotationRangeContext';
 var DEFAULT_WIDTH = 250;
 var DEFAULT_HEIGHT = 200;
 var isMediaElement = function isMediaElement(media) {
@@ -134,6 +135,24 @@ var MediaSingleWithChildren = function MediaSingleWithChildren(props) {
       height: height
     };
   }, [height, width]);
+  var _useAnnotationRangeDi = useAnnotationRangeDispatch(),
+    setHoverTarget = _useAnnotationRangeDi.setHoverTarget;
+  useEffect(function () {
+    var mediaSingleElement = ref.current;
+    var callback = function callback(event) {
+      if (event.buttons === 0) {
+        setHoverTarget && setHoverTarget(event.target);
+      }
+    };
+    if (mediaSingleElement) {
+      mediaSingleElement.addEventListener('mouseenter', callback);
+    }
+    return function () {
+      if (mediaSingleElement) {
+        mediaSingleElement.removeEventListener('mouseenter', callback);
+      }
+    };
+  }, [setHoverTarget]);
 
   // Note: in SSR mode the `window` object is not defined,
   // therefore width here is 0, see:

package/dist/esm/ui/MediaCard.js

@@ -17,7 +17,6 @@ import { filter } from '@atlaskit/adf-utils/traverse';
 import { Card, CardLoading, CardError } from '@atlaskit/media-card';
 import { MediaClientContext } from '@atlaskit/media-client-react';
 import { withImageLoader } from '@atlaskit/editor-common/utils';
-import { useAnnotationRangeDispatch } from './annotations/contexts/AnnotationRangeContext';
 export var mediaIdentifierMap = new Map();
 export var getListOfIdentifiersFromDoc = function getListOfIdentifiersFromDoc(doc) {
   if (!doc) {
@@ -259,7 +258,6 @@ export var MediaCardView = /*#__PURE__*/function (_Component) {
         shouldEnableDownloadButton = _this$props5.shouldEnableDownloadButton,
         ssr = _this$props5.ssr,
         mediaClient = _this$props5.mediaClient,
-        setHoverTarget = _this$props5.setHoverTarget,
         dataAttributes = _this$props5.dataAttributes;
       var isMobile = rendererAppearance === 'mobile';
       var shouldPlayInline = useInlinePlayer !== undefined ? useInlinePlayer : true;
@@ -295,15 +293,7 @@ export var MediaCardView = /*#__PURE__*/function (_Component) {
         contextIdentifierProvider: contextIdentifierProvider,
         originalDimensions: originalDimensions,
         fileState: fileState
-      }), dataAttributes, {
-        onMouseEnter: function onMouseEnter(event) {
-          // We will not allow a hover target to be set if any mouse button is depressed during the mouse enter state.
-          // This could be due to the user trying to select text across the document.
-          if (event.buttons === 0) {
-            setHoverTarget && setHoverTarget(event.target);
-          }
-        }
-      }), /*#__PURE__*/React.createElement(Card, {
+      }), dataAttributes), /*#__PURE__*/React.createElement(Card, {
         identifier: identifier,
         alt: alt,
         contextId: contextId,
@@ -361,11 +351,8 @@ export var getClipboardAttrs = function getClipboardAttrs(_ref2) {
 };
 export var MediaCardInternal = function MediaCardInternal(props) {
   var mediaClient = useContext(MediaClientContext);
-  var _useAnnotationRangeDi = useAnnotationRangeDispatch(),
-    setHoverTarget = _useAnnotationRangeDi.setHoverTarget;
   return /*#__PURE__*/React.createElement(MediaCardView, _extends({}, props, {
-    mediaClient: mediaClient,
-    setHoverTarget: setHoverTarget
+    mediaClient: mediaClient
   }));
 };
 export var MediaCard = withImageLoader(MediaCardInternal);

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.18.0";
+var packageVersion = "109.18.1";
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

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

@@ -152,9 +152,11 @@ export var AnnotationRangeProvider = function AnnotationRangeProvider(_ref) {
     });
   }, []);
   var setHoverTarget = useCallback(function (target) {
+    // the HoverComponent expects an element deeply nested inside media, these classes work with the current implementation
+    var mediaNode = target.querySelector('.media-card-inline-player, .media-file-card-view');
     var range = document.createRange();
-    range.setStartBefore(target);
-    range.setEndAfter(target);
+    range.setStartBefore(mediaNode);
+    range.setEndAfter(mediaNode);
     dispatch({
       type: 'setHover',
       range: range

package/dist/types/ui/MediaCard.d.ts

@@ -49,7 +49,6 @@ export declare const mediaIdentifierMap: Map<string, Identifier>;
 export declare const getListOfIdentifiersFromDoc: (doc?: ADFEntity) => Identifier[];
 export declare class MediaCardView extends Component<MediaCardProps & {
     mediaClient?: MediaClient;
-    setHoverTarget?: (target: HTMLElement) => void;
 }, State> {
     state: State;
     componentDidMount(): Promise<void>;

package/dist/types-ts4.5/ui/MediaCard.d.ts

@@ -49,7 +49,6 @@ export declare const mediaIdentifierMap: Map<string, Identifier>;
 export declare const getListOfIdentifiersFromDoc: (doc?: ADFEntity) => Identifier[];
 export declare class MediaCardView extends Component<MediaCardProps & {
     mediaClient?: MediaClient;
-    setHoverTarget?: (target: HTMLElement) => void;
 }, State> {
     state: State;
     componentDidMount(): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/renderer",
-  "version": "109.18.0",
+  "version": "109.18.1",
   "description": "Renderer component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -71,7 +71,7 @@
     "@af/integration-testing": "*",
     "@af/visual-regression": "*",
     "@atlaskit/analytics-gas-types": "^5.1.0",
-    "@atlaskit/css-reset": "^6.8.0",
+    "@atlaskit/css-reset": "^6.9.0",
     "@atlaskit/editor-test-helpers": "^18.20.0",
     "@atlaskit/link-provider": "^1.9.0",
     "@atlaskit/link-test-helpers": "^7.0.0",