Barchart: Fix tooltip erroneous header (#60741)

pull/60754/head
Nathan Marrs 3 years ago committed by GitHub
parent 7a679db08b
commit 283cdc184e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      public/app/plugins/panel/geomap/components/DataHoverRow.tsx
  2. 15
      public/app/plugins/panel/geomap/components/DataHoverView.tsx
  3. 2
      public/app/plugins/panel/heatmap/HeatmapHoverView.tsx

@ -24,5 +24,5 @@ export const DataHoverRow = ({ feature }: Props) => {
data = new ArrayDataFrame([properties]); data = new ArrayDataFrame([properties]);
} }
return <DataHoverView data={data} rowIndex={rowIndex} displayExemplarHeader={false} />; return <DataHoverView data={data} rowIndex={rowIndex} />;
}; };

@ -19,17 +19,10 @@ export interface Props {
columnIndex?: number | null; // the hover column columnIndex?: number | null; // the hover column
sortOrder?: SortOrder; sortOrder?: SortOrder;
mode?: TooltipDisplayMode | null; mode?: TooltipDisplayMode | null;
displayExemplarHeader?: boolean; header?: string;
} }
export const DataHoverView = ({ export const DataHoverView = ({ data, rowIndex, columnIndex, sortOrder, mode, header = undefined }: Props) => {
data,
rowIndex,
columnIndex,
sortOrder,
mode,
displayExemplarHeader = true,
}: Props) => {
const styles = useStyles2(getStyles); const styles = useStyles2(getStyles);
if (!data || rowIndex == null) { if (!data || rowIndex == null) {
@ -70,9 +63,9 @@ export const DataHoverView = ({
return ( return (
<div className={styles.wrapper}> <div className={styles.wrapper}>
{displayExemplarHeader && ( {header && (
<div className={styles.header}> <div className={styles.header}>
<span className={styles.title}>Exemplar</span> <span className={styles.title}>{header}</span>
</div> </div>
)} )}
<table className={styles.infoWrap}> <table className={styles.infoWrap}>

@ -28,7 +28,7 @@ type Props = {
export const HeatmapHoverView = (props: Props) => { export const HeatmapHoverView = (props: Props) => {
if (props.hover.seriesIdx === 2) { if (props.hover.seriesIdx === 2) {
return <DataHoverView data={props.data.exemplars} rowIndex={props.hover.dataIdx} />; return <DataHoverView data={props.data.exemplars} rowIndex={props.hover.dataIdx} header={'Exemplar'} />;
} }
return <HeatmapHoverCell {...props} />; return <HeatmapHoverCell {...props} />;
}; };

Loading…
Cancel
Save