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.

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

Jump to bottom

fix(slider): multiple times #5638

Merged
merged 1 commit into from
Oct 13, 2023
Merged

fix(slider): multiple times #5638

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
Binary file added __tests__/integration/snapshots/interaction/aapl-line-slider-filter/step2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 6 additions & 3 deletions __tests__/plots/interaction/appl-line-slider-filter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ export function dispatchValueChange(slider, values = [0.25, 0.75]) {
slider.update({ values });
slider.dispatchEvent(
new CustomEvent('valuechange', {
detail: {
value: [0.25, 0.75],
},
detail: { value: values },
}),
);
}
Expand All @@ -54,5 +52,10 @@ aaplLineSliderFilter.steps = ({ canvas }) => {
dispatchValueChange(s2);
},
},
{
changeState: () => {
dispatchValueChange(s1, [0.7, 0.9]);
},
},
];
};
21 changes: 11 additions & 10 deletions src/interaction/scrollbarFilter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,20 @@ export function ScrollbarFilter(options: any = {}) {
if (!scrollbars.length) return () => {};
const { scale } = view;
const { x: scaleX, y: scaleY } = scale;
const channelDomain = {
x: scaleX.getOptions().domain,
y: scaleY.getOptions().domain,

// The filtered domain, computed by the ratio attribute.
const initDomain = {
x: [...scaleX.getOptions().domain],
y: [...scaleY.getOptions().domain],
};
scaleX.update({
domain: scaleX.getOptions().expectedDomain,
});
scaleY.update({
domain: scaleY.getOptions().expectedDomain,
});

// The ordinal domain for each channel.
scaleX.update({ domain: scaleX.getOptions().expectedDomain });
scaleY.update({ domain: scaleY.getOptions().expectedDomain });

const interaction = SliderFilter({
...options,
channelDomain,
initDomain,
className: SCROLLBAR_CLASS_NAME,
prefix: 'scrollbar',
hasState: true,
Expand Down
40 changes: 23 additions & 17 deletions src/interaction/sliderFilter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@ import { invert, domainOf, abstractOf } from '../utils/scale';

export const SLIDER_CLASS_NAME = 'slider';

function filterDataByDomain(options, scaleOptions, prefix, hasState = false) {
function filterDataByDomain(
options,
scaleOptions,
prefix,
hasState = false,
channel0 = 'x',
channel1 = 'y',
) {
const { marks } = options;
const newMarks = marks.map((mark) =>
deepMix(
Expand All @@ -21,11 +28,12 @@ function filterDataByDomain(options, scaleOptions, prefix, hasState = false) {
scale: scaleOptions,
// Don't rerender sliders.
[prefix]: {
...(mark[prefix]?.x && {
x: { preserve: true, ...(hasState && { ratio: null }) },
...(mark[prefix]?.[channel0] && {
[channel0]: { preserve: true, ...(hasState && { ratio: null }) },
}),
...(mark[prefix]?.y && {
y: { preserve: true, ...(hasState && { ratio: null }) },
// Only remove ratio state with filtered channel.
...(mark[prefix]?.[channel1] && {
[channel1]: { preserve: true },
}),
},
animate: false,
Expand Down Expand Up @@ -58,7 +66,7 @@ function extentOf(domain) {
* @todo Support click to reset after fix click and dragend conflict.
*/
export function SliderFilter({
channelDomain,
initDomain = {},
className = SLIDER_CLASS_NAME,
prefix = 'slider',
setValue = (component, values) => component.setValues(values),
Expand Down Expand Up @@ -89,12 +97,10 @@ export function SliderFilter({
const emitHandlers = new Set<[string, (event: any) => void]>();

// Store current domain of x and y scale.
if (!channelDomain) {
channelDomain = {
x: scaleX.getOptions().domain,
y: scaleY.getOptions().domain,
};
}
const channelDomain = {
x: initDomain.x || scaleX.getOptions().domain,
y: initDomain.y || scaleY.getOptions().domain,
};

for (const slider of sliders) {
const { orientation } = slider.attributes;
Expand Down Expand Up @@ -152,13 +158,13 @@ export function SliderFilter({
setState(slider, (options) => ({
...filterDataByDomain(
options,
{
// Set nice to false to avoid modify domain.
[channel0]: { domain: domain0, nice: false },
[channel1]: { domain: domain1, nice: false },
},
// Set nice to false to avoid modify domain.
// Only update domain of current slider / scrollbar.
{ [channel0]: { domain: domain0, nice: false } },
prefix,
hasState,
channel0,
channel1,
),
paddingLeft,
paddingTop,
Expand Down
Loading