Skip to content

chore: update the types to remove typing issues around uplot #10204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hkang1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: update the types to remove typing issues around uplot #10204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions webui/react/src/components/UPlot/UPlotChart/closestPointPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import _ from 'lodash';
import { CheckpointsDict } from 'pages/TrialDetails/TrialDetailsMetrics';
import { throttle } from 'throttle-debounce';
import uPlot, { Plugin } from 'uplot';

import { CheckpointsDict } from 'pages/TrialDetails/TrialDetailsMetrics';
import { findInsertionIndex } from 'utils/array';
import { distance } from 'utils/chart';

Expand Down Expand Up @@ -52,8 +51,8 @@ export const closestPointPlugin = ({
// find idx range
// note: assuming X data to be sorted, uPlot behaves odd if that's false
const cursorValX = uPlot.posToVal(cursorLeft, 'x');
const idxMax = findInsertionIndex(uPlot.data[0], cursorValX + distValX) - 1;
const idxMin = findInsertionIndex(uPlot.data[0], cursorValX - distValX);
const idxMax = findInsertionIndex(Array.from(uPlot.data[0]), cursorValX + distValX) - 1;
const idxMin = findInsertionIndex(Array.from(uPlot.data[0]), cursorValX - distValX);

// find y value range
const cursorValY = uPlot.posToVal(cursorTop, yScale);
Expand Down
7 changes: 3 additions & 4 deletions webui/react/src/components/UPlot/UPlotScatter/useScatterPointTooltipPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { UPlotData } from 'components/UPlot/types';
import { useCallback, useMemo, useRef } from 'react';
import uPlot, { Plugin } from 'uplot';

import { UPlotData } from 'components/UPlot/types';
import { isNumber } from 'utils/data';
import { humanReadableNumber } from 'utils/number';
import { generateAlphaNumeric } from 'utils/string';
Expand Down Expand Up @@ -85,7 +84,7 @@ const useScatterPointTooltipPlugin = (props: Props = {}): Plugin => {
const y = yData[dataIndex];
if (x == null || y == null) return;

const keyValues = u.data[seriesIndex]
const keyValues = Array.from(u.data[seriesIndex])
.map((data: unknown, index: number) => {
if (data == null) return null;

Expand Down Expand Up @@ -147,7 +146,7 @@ const useScatterPointTooltipPlugin = (props: Props = {}): Plugin => {
rootRef.current?.appendChild(tooltipRef.current);
},
setCursor: (u: uPlot) => {
uPlotRef.current.dataIndex = u.cursor.dataIdx?.(u, 1, 0, 0);
uPlotRef.current.dataIndex = u.cursor.dataIdx?.(u, 1, 0, 0) ?? undefined;

if (uPlotRef.current.dataIndex != null) {
setTooltip(u);
Expand Down