Skip to content

Fix slider debouncing, fix slider steps, fix slider clear #148

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

Merged
dauglyon merged 3 commits into from
Feb 27, 2024
Merged

Fix slider debouncing, fix slider steps, fix slider clear #148

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d3a671
Fix slider debouncing, fix slider steps
dauglyon Feb 27, 2024
45eed0b
fix filter clear issues
dauglyon Feb 27, 2024
dd5aa8b
integer slider step should be 1
dauglyon Feb 27, 2024
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
70 changes: 58 additions & 12 deletions src/features/collections/CollectionDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,10 @@ const DateRangeFilterControls = ({
const { error: maxError } = getFieldState('max', formState);
const dispatch = useAppDispatch();
const sliderTimeout = useRef<number>();
const [sliderPosition, setSliderPosition] = useState<[string, string]>([
values.min,
values.max,
]);

const setFilterRange = () => {
const validState = getValues();
Expand Down Expand Up @@ -471,6 +475,21 @@ const DateRangeFilterControls = ({
setFilterRange();
});

useEffect(() => {
//Set slider position from values
setSliderPosition([values.min, values.max]);
}, [values.min, values.max]);

const [filterMin, filterMax] = [filter.min_value, filter.max_value];
useEffect(() => {
//Clear when the filter is cleared
if (!filter.value) {
setValue('min', formatDate(filterMin));
setValue('max', formatDate(filterMax));
setSliderPosition([formatDate(filterMin), formatDate(filterMax)]);
}
}, [filter.value, filterMax, filterMin, setValue]);

return (
<Stack>
<Stack direction="row" spacing={2}>
Expand Down Expand Up @@ -499,9 +518,10 @@ const DateRangeFilterControls = ({
size="small"
disableSwap
getAriaLabel={() => `filter range for column ${column}`}
value={[parseDate(values.min), parseDate(values.max)]}
value={sliderPosition.map(parseDate)}
min={filter.min_value}
max={filter.max_value}
step={(filter.max_value - filter.min_value) / 100}
valueLabelFormat={formatDate}
marks={[filter.min_value, filter.max_value].map((v) => ({
value: v,
Expand All @@ -511,11 +531,14 @@ const DateRangeFilterControls = ({
const range = newValue as [number, number];
setValue('min', formatDate(range[0]));
setValue('max', formatDate(range[1]));
// Debounce setting the filter state from the slider for better UX
if (sliderTimeout.current) clearTimeout(sliderTimeout.current);
sliderTimeout.current = window.setTimeout(() => {
submit();
}, 100);
const sliderRange: [string, string] = [
formatDate(range[0]),
formatDate(range[1]),
];
setSliderPosition(sliderRange);
const thisTimeout = (sliderTimeout.current = window.setTimeout(() => {
if (sliderTimeout.current === thisTimeout) submit();
}, 100));
}}
valueLabelDisplay="auto"
/>
Expand Down Expand Up @@ -552,6 +575,10 @@ const RangeFilterControls = ({
const { error: maxError } = getFieldState('max', formState);
const dispatch = useAppDispatch();
const sliderTimeout = useRef<number>();
const [sliderPosition, setSliderPosition] = useState<[number, number]>([
values.min,
values.max,
]);

const setFilterRange = () => {
const validState = getValues();
Expand Down Expand Up @@ -582,6 +609,21 @@ const RangeFilterControls = ({
setFilterRange();
});

useEffect(() => {
//Set slider position from values
setSliderPosition([values.min, values.max]);
}, [values.min, values.max]);

const [filterMin, filterMax] = [filter.min_value, filter.max_value];
useEffect(() => {
//Clear when the filter is cleared
if (!filter.value) {
setValue('min', filterMin);
setValue('max', filterMax);
setSliderPosition([filterMin, filterMax]);
}
}, [filter.value, filterMax, filterMin, setValue]);

return (
<Stack>
<Stack direction="row" spacing={2}>
Expand Down Expand Up @@ -614,9 +656,14 @@ const RangeFilterControls = ({
size="small"
disableSwap
getAriaLabel={() => `filter range for column ${column}`}
value={[values.min, values.max]}
value={sliderPosition}
min={filter.min_value}
max={filter.max_value}
step={
filter.type === 'int'
? 1
: (filter.max_value - filter.min_value) / 100
}
marks={[filter.min_value, filter.max_value].map((v) => ({
value: v,
label: v,
Expand All @@ -625,11 +672,10 @@ const RangeFilterControls = ({
const range = newValue as [number, number];
setValue('min', range[0]);
setValue('max', range[1]);
// Debounce setting the filter state from the slider for better UX
if (sliderTimeout.current) clearTimeout(sliderTimeout.current);
sliderTimeout.current = window.setTimeout(() => {
submit();
}, 100);
setSliderPosition([range[0], range[1]]);
const thisTimeout = (sliderTimeout.current = window.setTimeout(() => {
if (sliderTimeout.current === thisTimeout) submit();
}, 100));
}}
valueLabelDisplay="auto"
/>
Expand Down