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

[@mantine/core] fix NumberInput increment bug #5926

Merged
merged 2 commits into from
Mar 26, 2024
Merged

[@mantine/core] fix NumberInput increment bug #5926

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43da888
[@mantine/core] fix numberinput increment bug
Kenzo-Wada Mar 14, 2024
0a3ba77
fix stype bug
Kenzo-Wada Mar 14, 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
59 changes: 27 additions & 32 deletions packages/@mantine/core/src/components/NumberInput/NumberInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,31 +38,6 @@ function isValidNumber(value: number | string | undefined): value is number {
);
}

interface GetDecrementedValueInput {
value: number;
min: number | undefined;
step: number | undefined;
allowNegative: boolean | undefined;
}

function getDecrementedValue({ value, min, step = 1, allowNegative }: GetDecrementedValueInput) {
const nextValue = value - step;

if (min !== undefined && nextValue < min) {
return min;
}

if (!allowNegative && nextValue < 0 && min === undefined) {
return value;
}

if (min !== undefined && min >= 0 && nextValue <= min) {
return nextValue;
}

return nextValue;
}

function isInRange(value: number | undefined, min: number | undefined, max: number | undefined) {
if (value === undefined) {
return true;
Expand Down Expand Up @@ -266,38 +241,58 @@ export const NumberInput = factory<NumberInputFactory>((_props, ref) => {
onValueChange?.(payload, event);
};

const getDecimalPlaces = (inputValue: number | string): number => {
const match = String(inputValue).match(/(?:\.(\d+))?(?:[eE]([+-]?\d+))?$/);
if (!match) {
return 0;
}
return Math.max(0, (match[1] ? match[1].length : 0) - (match[2] ? +match[2] : 0));
};

const incrementRef = useRef<() => void>();
incrementRef.current = () => {
let val: number;
const currentValuePrecision = getDecimalPlaces(_value);
const stepPrecision = getDecimalPlaces(step!);
const maxPrecision = Math.max(currentValuePrecision, stepPrecision);
const factor = 10 ** maxPrecision;

if (typeof _value !== 'number' || Number.isNaN(_value)) {
val = clamp(startValue!, min, max);
} else if (max !== undefined) {
val = _value + step! <= max ? _value + step! : max;
const incrementedValue = (Math.round(_value * factor) + Math.round(step! * factor)) / factor;
val = incrementedValue <= max ? incrementedValue : max;
} else {
val = _value + step!;
val = (Math.round(_value * factor) + Math.round(step! * factor)) / factor;
}

setValue(val);
const formattedValue = val.toFixed(maxPrecision);
setValue(parseFloat(formattedValue));
onValueChange?.(
{ floatValue: val, formattedValue: val.toString(), value: val.toString() },
{ floatValue: parseFloat(formattedValue), formattedValue, value: formattedValue },
{ source: 'increment' as any }
);
};

const decrementRef = useRef<() => void>();
decrementRef.current = () => {
let val: number;
const currentValuePrecision = getDecimalPlaces(_value);
const stepPrecision = getDecimalPlaces(step!);
const maxPrecision = Math.max(currentValuePrecision, stepPrecision);
const factor = 10 ** maxPrecision;

if (typeof _value !== 'number' || Number.isNaN(_value)) {
val = clamp(startValue!, min, max);
} else {
val = getDecrementedValue({ value: _value, min, step, allowNegative });
const decrementedValue = (Math.round(_value * factor) - Math.round(step! * factor)) / factor;
val = min !== undefined && decrementedValue < min ? min : decrementedValue;
}

setValue(val);
const formattedValue = val.toFixed(maxPrecision);
setValue(parseFloat(formattedValue));
onValueChange?.(
{ floatValue: val, formattedValue: val.toString(), value: val.toString() },
{ floatValue: parseFloat(formattedValue), formattedValue, value: formattedValue },
{ source: 'decrement' as any }
);
};
Expand Down
Loading