Skip to content
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.

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

feat(xychart): improve performance when hovering with tooltip #1842

Merged
merged 1 commit into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 36 additions & 24 deletions packages/visx-demo/src/sandboxes/visx-xychart/ExampleControls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,31 @@ import getAnimatedOrUnanimatedComponents from './getAnimatedOrUnanimatedComponen
const dateScaleConfig = { type: 'band', paddingInner: 0.3 } as const;
const temperatureScaleConfig = { type: 'linear' } as const;
const numTicks = 4;
const data = cityTemperature.slice(225, 275);
const dataMissingValues = data.map((d, i) =>
i === 10 || i === 11
? { ...d, 'San Francisco': 'nope', 'New York': 'notanumber', Austin: 'null' }
: d,
);
const dataSmall = data.slice(0, 15);
const dataSmallMissingValues = dataMissingValues.slice(0, 15);
const withMissingValues = (cityTemperatures: CityTemperature[]) =>
cityTemperatures.map((d, i) =>
i === 10 || i === 11
? { ...d, 'San Francisco': 'nope', 'New York': 'notanumber', Austin: 'null' }
: d,
);
const addYears = (cityTemperatures: CityTemperature[], years: number) =>
cityTemperatures.map((d) => {
const date = new Date(d.date);
date.setFullYear(date.getFullYear() + years);
return {
...d,
date: date.toISOString().slice(0, 10),
};
});
const data = {
small: cityTemperature.slice(225, 240),
regular: cityTemperature.slice(225, 275),
large: [...cityTemperature, ...addYears(cityTemperature, 1), ...addYears(cityTemperature, 2)],
};
const dataMissingValues = {
small: withMissingValues(data.small),
regular: withMissingValues(data.regular),
large: withMissingValues(data.large),
};
const getDate = (d: CityTemperature) => d.date;
const getSfTemperature = (d: CityTemperature) => Number(d['San Francisco']);
const getNegativeSfTemperature = (d: CityTemperature) => -getSfTemperature(d);
Expand Down Expand Up @@ -128,7 +145,7 @@ export default function ExampleControls({ children }: ControlsProps) {
const [annotationLabelPosition, setAnnotationLabelPosition] = useState({ dx: -40, dy: -20 });
const [annotationDataIndex, setAnnotationDataIndex] = useState(defaultAnnotationDataIndex);
const [negativeValues, setNegativeValues] = useState(false);
const [fewerDatum, setFewerDatum] = useState(false);
const [dataSize, setDataSize] = useState<keyof typeof data>('regular');
const [missingValues, setMissingValues] = useState(false);
const [glyphComponent, setGlyphComponent] = useState<'star' | 'cross' | 'circle' | '🍍'>('star');
const [curveType, setCurveType] = useState<'linear' | 'cardinal' | 'step'>('linear');
Expand Down Expand Up @@ -302,13 +319,7 @@ export default function ExampleControls({ children }: ControlsProps) {
(curveType === 'cardinal' && curveCardinal) ||
(curveType === 'step' && curveStep) ||
curveLinear,
data: fewerDatum
? missingValues
? dataSmallMissingValues
: dataSmall
: missingValues
? dataMissingValues
: data,
data: (missingValues ? dataMissingValues : data)[dataSize],
editAnnotationLabelPosition,
numTicks,
renderBarGroup: renderBarStackOrGroup === 'bargroup',
Expand Down Expand Up @@ -370,14 +381,15 @@ export default function ExampleControls({ children }: ControlsProps) {
/>
missing values
</label>
<label>
<input
type="checkbox"
onChange={() => setFewerDatum(!fewerDatum)}
checked={fewerDatum}
/>
fewer datum
</label>
</div>
<div>
<strong>data size</strong>
{Object.keys(data).map((size: keyof typeof data) => (
<label key={size}>
<input type="radio" onChange={() => setDataSize(size)} checked={dataSize === size} />
{size}
</label>
))}
</div>

{/** theme */}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { useCallback, useRef } from 'react';
import React, { memo, useCallback, useRef } from 'react';
import { animated, useSpring } from '@react-spring/web';
// @ts-expect-error no types
import { interpolatePath } from 'd3-interpolate-path';
import debounce from 'lodash/debounce';

export default function AnimatedPath({
function AnimatedPath({
d,
stroke = 'transparent',
fill = 'transparent',
Expand Down Expand Up @@ -44,3 +44,5 @@ export default function AnimatedPath({
/>
);
}

export default memo(AnimatedPath);
Loading