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

GraphNG: uPlot 1.6.10 (#34759)

Browse Source
This commit is contained in:
Leon Sorokin 2021-05-26 11:46:24 -05:00 committed by GitHub
parent cebe67ab01
commit 1dd5d6ffb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grafana-data/src/transformations/transformers/joinDataFrames.ts
View File

@ -217,7 +217,7 @@ export function outerJoinDataFrames(options: JoinOptions): DataFrame | undefined
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
// Copied from uplot // Copied from uplot
export type AlignedData = [number[], ...Array<Array<number | null>>]; export type AlignedData = [number[], ...Array<Array<number | null | undefined>>];
// nullModes // nullModes
const NULL_REMOVE = 0; // nulls are converted to undefined (e.g. for spanGaps: true) const NULL_REMOVE = 0; // nulls are converted to undefined (e.g. for spanGaps: true)

2
packages/grafana-ui/package.json
View File

@ -72,7 +72,7 @@
"react-transition-group": "4.4.1", "react-transition-group": "4.4.1",
"slate": "0.47.8", "slate": "0.47.8",
"tinycolor2": "1.4.1", "tinycolor2": "1.4.1",
"uplot": "1.6.9" "uplot": "1.6.10"
}, },
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "16.0.0", "@rollup/plugin-commonjs": "16.0.0",

2
packages/grafana-ui/src/components/uPlot/Plot.tsx
View File

@ -51,7 +51,7 @@ export class UPlotChart extends React.Component<PlotProps, UPlotChartState> {
return; return;
} }
this.props.config.addHook('setSize', (u) => { this.props.config.addHook('setSize', (u) => {
const canvas = u.root.querySelector<HTMLDivElement>('.u-over'); const canvas = u.over;
if (!canvas) { if (!canvas) {
return; return;
} }

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

@ -53,12 +53,12 @@ export const TooltipPlugin: React.FC<TooltipPluginProps> = ({
}; };
if (plotCtx && plotCtx.plot) { if (plotCtx && plotCtx.plot) {
plotCtx.plot.root.querySelector('.u-over')!.addEventListener('mouseleave', plotMouseLeave); plotCtx.plot.over.addEventListener('mouseleave', plotMouseLeave);
} }
return () => { return () => {
if (plotCtx && plotCtx.plot) { if (plotCtx && plotCtx.plot) {
plotCtx.plot.root.querySelector('.u-over')!.removeEventListener('mouseleave', plotMouseLeave); plotCtx.plot.over.removeEventListener('mouseleave', plotMouseLeave);
} }
}; };
}, [plotCtx.plot?.root, setCoords]); }, [plotCtx.plot?.root, setCoords]);

10
packages/grafana-ui/src/components/uPlot/utils.ts
View File

@ -119,8 +119,8 @@ export function findMidPointYPosition(u: uPlot, idx: number) {
for (let i = 1; i < u.data.length; i++) { for (let i = 1; i < u.data.length; i++) {
const sData = u.data[i]; const sData = u.data[i];
const sVal = sData[idx]; const sVal = sData[idx];
if (sVal !== null) { if (sVal != null) {
if (max === null) { if (max == null) {
max = sVal; max = sVal;
} else { } else {
if (sVal > max) { if (sVal > max) {
@ -128,7 +128,7 @@ export function findMidPointYPosition(u: uPlot, idx: number) {
sMaxIdx = i; sMaxIdx = i;
} }
} }
if (min === null) { if (min == null) {
min = sVal; min = sVal;
} else { } else {
if (sVal < min) { if (sVal < min) {
@ -139,10 +139,10 @@ export function findMidPointYPosition(u: uPlot, idx: number) {
} }
} }
if (min === null && max === null) { if (min == null && max == null) {
// no tooltip to show // no tooltip to show
y = undefined; y = undefined;
} else if (min !== null && max !== null) { } else if (min != null && max != null) {
// find median position // find median position
y = (u.valToPos(min, u.series[sMinIdx].scale!) + u.valToPos(max, u.series[sMaxIdx].scale!)) / 2; y = (u.valToPos(min, u.series[sMinIdx].scale!) + u.valToPos(max, u.series[sMaxIdx].scale!)) / 2;
} else { } else {

4
public/app/plugins/panel/barchart/bars.ts
View File

@ -72,7 +72,7 @@ export function getConfig(opts: BarsOptions, theme: GrafanaTheme2) {
walkTwo(groupWidth, barWidth, sidx - 1, numGroups, barsPerGroup, xDim, null, (ix, x0, wid) => { walkTwo(groupWidth, barWidth, sidx - 1, numGroups, barsPerGroup, xDim, null, (ix, x0, wid) => {
let left = Math.round(xOff + (_dir === 1 ? x0 : xDim - x0 - wid)); let left = Math.round(xOff + (_dir === 1 ? x0 : xDim - x0 - wid));
let barWid = Math.round(wid); let barWid = Math.round(wid);
const canvas = u.root.querySelector<HTMLDivElement>('.u-over'); const canvas = u.over;
const bbox = canvas?.getBoundingClientRect(); const bbox = canvas?.getBoundingClientRect();
if (dataY[ix] != null) { if (dataY[ix] != null) {
@ -291,7 +291,7 @@ export function getConfig(opts: BarsOptions, theme: GrafanaTheme2) {
barMark.style.background = 'rgba(255,255,255,0.4)'; barMark.style.background = 'rgba(255,255,255,0.4)';
const init = (u: uPlot) => { const init = (u: uPlot) => {
let over = u.root.querySelector('.u-over')! as HTMLElement; let over = u.over;
over.style.overflow = 'hidden'; over.style.overflow = 'hidden';
over.appendChild(barMark); over.appendChild(barMark);
}; };

2
public/app/plugins/panel/state-timeline/timeline.ts
View File

@ -348,7 +348,7 @@ export function getConfig(opts: TimelineCoreOptions) {
}; };
const init = (u: uPlot) => { const init = (u: uPlot) => {
let over = u.root.querySelector('.u-over')! as HTMLElement; let over = u.over;
over.style.overflow = 'hidden'; over.style.overflow = 'hidden';
hoverMarks.forEach((m) => { hoverMarks.forEach((m) => {
over.appendChild(m); over.appendChild(m);

2
public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
View File

@ -75,7 +75,7 @@ export const ContextMenuPlugin: React.FC<ContextMenuPluginProps> = ({
}; };
config.addHook('init', (u) => { config.addHook('init', (u) => {
const canvas = u.root.querySelector<HTMLDivElement>('.u-over'); const canvas = u.over;
plotCanvas.current = canvas || undefined; plotCanvas.current = canvas || undefined;
plotCanvas.current?.addEventListener('mousedown', onMouseCapture); plotCanvas.current?.addEventListener('mousedown', onMouseCapture);
plotCanvas.current?.addEventListener('mouseleave', () => {}); plotCanvas.current?.addEventListener('mouseleave', () => {});

8
yarn.lock
View File

@ -22041,10 +22041,10 @@ update-notifier@^2.5.0:
semver-diff "^2.0.0" semver-diff "^2.0.0"
xdg-basedir "^3.0.0" xdg-basedir "^3.0.0"
uplot@1.6.9: uplot@1.6.10:
version "1.6.9" version "1.6.10"
resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.9.tgz#0f10e10b5882cb80eb58d63f870b8a77e8d95962" resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.10.tgz#6dd1adf3180203777f5c369ef6f6aab312661943"
integrity sha512-uWIegRdqbqJwnB5SDBt29lyJIgHLIqt5AnwlLGxuA3gKKXGtY7d68RR6oDF2u5pK9jpIb1djrQnm5n0BiAnUgA== integrity sha512-9MIscZoF+gA6Y6EAFTZl3zBU4MDaSbJ9Qy4nQ3LaXifGuluAhq4UuQOADKC6qZJjC9QoepeZ2eh7LpJn2xbLSQ==
upper-case@^1.1.1: upper-case@^1.1.1:
version "1.1.3" version "1.1.3"