maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-29 13:06:03 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix empty priceFilter bug

Browse source
This commit is contained in:
Janne Koivistoinen 2019-05-24 17:22:40 +03:00
parent 0083708e37
commit a068611536
1 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/forms/PriceFilterForm/PriceFilterForm.js
View file

@ -13,20 +13,20 @@ const DEBOUNCE_WAIT_TIME = 400;
// Helper function to parse value for min handle
// Value needs to be between slider's minimum value and current maximum value
const parseMin = (min, currentMax) => value => {
if (isNaN(value)) {
return min;
}
const parsedValue = Number.parseInt(value, 10);
if (isNaN(parsedValue)) {
return '';
}
return parsedValue < min ? min : parsedValue > currentMax ? currentMax : parsedValue;
};
// Helper function to parse value for max handle
// Value needs to be between slider's max value and current minimum value
const parseMax = (max, currentMin) => value => {
if (isNaN(value)) {
return max;
}
const parsedValue = Number.parseInt(value, 10);
if (isNaN(parsedValue)) {
return '';
}
return parsedValue < currentMin ? currentMin : parsedValue > max ? max : parsedValue;
};
@ -47,14 +47,30 @@ const PriceFilterFormComponent = props => {
const handleChange = debounce(
formState => {
if (formState.dirty) {
onChange(formState.values);
const { minPrice, maxPrice, ...restValues } = formState.values;
onChange({
minPrice: minPrice === '' ? rest.min : minPrice,
maxPrice: maxPrice === '' ? rest.max : maxPrice,
...restValues,
});
}
},
DEBOUNCE_WAIT_TIME,
{ leading: false, trailing: true }
);
const formCallbacks = liveEdit ? { onSubmit: () => null } : { onSubmit, onCancel, onClear };
const handleSubmit = values => {
const { minPrice, maxPrice, ...restValues } = values;
return onSubmit({
minPrice: minPrice === '' ? rest.min : minPrice,
maxPrice: maxPrice === '' ? rest.max : maxPrice,
...restValues,
});
};
const formCallbacks = liveEdit
? { onSubmit: () => null }
: { onSubmit: handleSubmit, onCancel, onClear };
return (
<FinalForm
{...rest}
@ -76,7 +92,9 @@ const PriceFilterFormComponent = props => {
max,
step,
} = formRenderProps;
const { minPrice, maxPrice } = values;
const { minPrice: minPriceRaw, maxPrice: maxPriceRaw } = values;
const minPrice = typeof minPriceRaw !== 'string' ? minPriceRaw : min;
const maxPrice = typeof maxPriceRaw !== 'string' ? maxPriceRaw : max;
const handleCancel = () => {
// reset the final form to initialValues