Skip to content

fix: fix numbers with leading zeroes after decimal point #333

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

Closed
Rioskill wants to merge 1 commit into from
Closed

fix: fix numbers with leading zeroes after decimal point #333

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
25 changes: 25 additions & 0 deletions src/lib/core/components/Form/Controller/utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,14 @@ import type {
UpdateStoreParams,
} from './types';

/*
* Stores original string representation of numbers
* used for correct intermediate representations of number
* to display in cases when they are otherwise changed by conversion
* e.g., 0.0 -> 0
*/
const originalNumberStringMap = new Map<string, string>();

const isErrorMutatorCorrect = (errorMutator: {value: ValidateError} | typeof EMPTY_MUTATOR) =>
errorMutator !== EMPTY_MUTATOR &&
(isString(errorMutator.value) ||
Expand Down Expand Up @@ -144,6 +152,15 @@ export const getRender = <DirtyValue extends FieldValue, SpecType extends Spec>(
Layout,
}: GetRenderParams<DirtyValue, SpecType>) => {
const render = (props: FieldRenderProps<DirtyValue>) => {
if (originalNumberStringMap.has(name)) {
const originalString = originalNumberStringMap.get(name);
if (Number(originalString) === Number(props.input.value)) {
props.input.value = originalString as DirtyValue;
} else {
originalNumberStringMap.delete(name);
}
}

if (inputEntity && isCorrectSpec(spec) && isString(name)) {
if (!spec.viewSpec.hidden) {
const {layoutProps, inputProps} = spec.viewSpec;
Expand Down Expand Up @@ -297,6 +314,12 @@ export const getFieldMethods = <
const error = validate?.(transformArrOut(_value)) || errorMutator;
let value = transformArrIn(_value);

if (typeof value === 'string' && /^[0-9]+.[0-9]*0+$/.test(value)) {
originalNumberStringMap.set(store.name, value);
} else {
originalNumberStringMap.delete(store.name);
}

if (isNumberSpec(spec) && !error) {
value = (isNil(value) || value === '' ? undefined : Number(value)) as DirtyValue;
}
Expand Down Expand Up @@ -383,6 +406,8 @@ export const getFieldMethods = <
) => {
const {name, spec} = store;

originalNumberStringMap.delete(store.name);

if (isArraySpec(spec) || isObjectSpec(spec)) {
return onChange(store, {
valOrSetter: (currentValue) =>
Expand Down