IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tooltip: fix time label mismatched with cursor & hover points (#37615)

Browse Source
This commit is contained in:
Leon Sorokin 2021-08-05 22:33:26 -05:00 committed by GitHub
parent ef19e2edce
commit cf1c2c374f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/grafana-ui/src/components/uPlot/plugins/TooltipPlugin.tsx
View File

@ -29,6 +29,15 @@ interface TooltipPluginProps {
renderTooltip?: (alignedFrame: DataFrame, seriesIdx: number | null, datapointIdx: number | null) => React.ReactNode;
}
const eqArrays = (a: any[], b: any[]) => {
for (let i = 0; i < a.length; i++) {
if (a[i] !== b[i]) {
return false;
}
}
return true;
};
const TOOLTIP_OFFSET = 10;
/**
@ -114,13 +123,16 @@ export const TooltipPlugin: React.FC<TooltipPluginProps> = ({
})(u);
});
} else {
config.addHook('setLegend', (u) => {
setFocusedPointIdx(u.cursor.idx!);
setFocusedPointIdxs(u.cursor.idxs!.slice());
});
let prevIdx: number | null = null;
let prevIdxs: Array<number | null> | null = null;
// default series/datapoint idx retireval
config.addHook('setCursor', (u) => {
if (u.cursor.idx !== prevIdx || prevIdxs == null || !eqArrays(prevIdxs, u.cursor.idxs!)) {
setFocusedPointIdx((prevIdx = u.cursor.idx!));
setFocusedPointIdxs((prevIdxs = u.cursor.idxs!.slice()));
}
const bbox = plotCtx.getCanvasBoundingBox();
if (!bbox) {
return;
@ -138,7 +150,7 @@ export const TooltipPlugin: React.FC<TooltipPluginProps> = ({
setFocusedSeriesIdx(idx);
});
}
}, [plotCtx, config, setFocusedPointIdx, setFocusedSeriesIdx, setCoords]);
}, [plotCtx, config]);
if (!plotInstance || focusedPointIdx === null || (!isActive && sync === DashboardCursorSync.Crosshair)) {
return null;