Geomap: Fix tooltip display (#54245)

pull/54359/head^2
Adela Almasan 3 years ago committed by GitHub
parent 4a0a6c8fd4
commit 07dcb64e38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      public/app/plugins/panel/geomap/GeomapPanel.tsx
  2. 14
      public/app/plugins/panel/geomap/GeomapTooltip.tsx

@ -371,8 +371,8 @@ export class GeomapPanel extends Component<Props, State> {
const hover = toLonLat(this.map.getCoordinateFromPixel(pixel));
const { hoverPayload } = this;
hoverPayload.pageX = mouse.offsetX;
hoverPayload.pageY = mouse.offsetY;
hoverPayload.pageX = mouse.pageX;
hoverPayload.pageY = mouse.pageY;
hoverPayload.point = {
lat: hover[1],
lon: hover[0],

@ -2,7 +2,7 @@ import { useDialog } from '@react-aria/dialog';
import { useOverlay } from '@react-aria/overlays';
import React, { createRef } from 'react';
import { VizTooltipContainer } from '@grafana/ui';
import { Portal, VizTooltipContainer } from '@grafana/ui';
import { ComplexDataHoverView } from './components/ComplexDataHoverView';
import { GeomapHoverPayload } from './event';
@ -21,11 +21,13 @@ export const GeomapTooltip = ({ ttip, onClose, isOpen }: Props) => {
return (
<>
{ttip && ttip.layers && (
<VizTooltipContainer position={{ x: ttip.pageX, y: ttip.pageY }} offset={{ x: 10, y: 10 }} allowPointerEvents>
<section ref={ref} {...overlayProps} {...dialogProps}>
<ComplexDataHoverView layers={ttip.layers} isOpen={isOpen} onClose={onClose} />
</section>
</VizTooltipContainer>
<Portal>
<VizTooltipContainer position={{ x: ttip.pageX, y: ttip.pageY }} offset={{ x: 10, y: 10 }} allowPointerEvents>
<section ref={ref} {...overlayProps} {...dialogProps}>
<ComplexDataHoverView layers={ttip.layers} isOpen={isOpen} onClose={onClose} />
</section>
</VizTooltipContainer>
</Portal>
)}
</>
);

Loading…
Cancel
Save