-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Price input: Get rid of stepper, improve validation, and use Text instead of Numeric input #6307
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.
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
Draft
mirekm
wants to merge
4
commits into
main
Choose a base branch
from
fix/update-money-input
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
cf0aec3
Get rid of spinner, improve validation, and Text instead of Number
mirekm 4764ec3
Revert unrelated CI workflow change
mirekm 8a50caa
Remove dead hideSpinboxes style (input is now type=text)
mirekm 1944a85
Add shared PriceFieldChangeEvent type, remove dead ?? fallback
mirekm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| export { default } from "./PriceField"; | ||
| export * from "./PriceField"; | ||
| export type { PriceFieldChangeEvent, PriceFieldProps } from "./PriceField"; | ||
| export { PriceField } from "./PriceField"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,30 @@ | ||
| import { FormChange } from "@dashboard/hooks/useForm"; | ||
| import { TextFieldProps } from "@material-ui/core"; | ||
| import { useMemo } from "react"; | ||
|
|
||
| import { SEPARATOR_CHARACTERS } from "./consts"; | ||
| import { findPriceSeparator, getCurrencyDecimalPoints } from "./utils"; | ||
| import { formatPriceInput, getCurrencyDecimalPoints } from "./utils"; | ||
|
|
||
| /** | ||
| * Hook for handling price input with currency-aware decimal validation. | ||
| * - Filters non-numeric input | ||
| * - Limits decimal places based on currency (e.g., 2 for USD, 0 for JPY) | ||
| * - Normalizes decimal separator to dot (10,50 → 10.50) | ||
| */ | ||
| export function usePriceField(currency: string | undefined, onChange: FormChange) { | ||
| const minValue = 0; | ||
| const maxDecimalLength = useMemo(() => getCurrencyDecimalPoints(currency), [currency]); | ||
| const handleChange: FormChange = e => { | ||
| let value = e.target.value; | ||
| const splitCharacter = findPriceSeparator(value); | ||
| const [integerPart, decimalPart] = value.split(splitCharacter); | ||
|
|
||
| if ((maxDecimalLength ?? 0) === 0 && decimalPart) { | ||
| // This shouldn't happen - decimal character should be ignored | ||
| value = integerPart; | ||
| } | ||
|
|
||
| if (decimalPart?.length && maxDecimalLength && decimalPart.length > maxDecimalLength) { | ||
| const shortenedDecimalPart = decimalPart.slice(0, maxDecimalLength); | ||
| const maxDecimalPlaces = useMemo(() => getCurrencyDecimalPoints(currency), [currency]); | ||
|
|
||
| value = `${integerPart}${splitCharacter}${shortenedDecimalPart}`; | ||
| } | ||
| const handleChange: FormChange = e => { | ||
| const rawValue = String(e.target.value ?? ""); | ||
| const formattedValue = formatPriceInput(rawValue, maxDecimalPlaces); | ||
|
|
||
| onChange({ | ||
| target: { | ||
| name: e.target.name, | ||
| value: value ? parseFloat(value) : null, | ||
| value: formattedValue || null, | ||
| }, | ||
| }); | ||
| }; | ||
| const handleKeyDown: TextFieldProps["onKeyDown"] = e => { | ||
| // Disallow entering e (exponent) | ||
| if (e.key === "e" || e.key === "E" || e.key === "-") { | ||
| e.preventDefault(); | ||
| } | ||
|
|
||
| // ignore separator input when currency doesn't support decimal values | ||
| if ( | ||
| (maxDecimalLength ?? 0) === 0 && | ||
| SEPARATOR_CHARACTERS.some(separator => e.key === separator) | ||
| ) { | ||
| e.preventDefault(); | ||
| } | ||
| }; | ||
| const step = 1 / Math.pow(10, maxDecimalLength ?? 2); | ||
|
|
||
| return { | ||
| onChange: handleChange, | ||
| onKeyDown: handleKeyDown, | ||
| minValue, | ||
| step, | ||
| }; | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The previous implementation relied on
usePriceFieldto enforce currency-specific decimal precision (including blocking decimal input for zero-decimal currencies like JPY) and to normalize pasted values with locale-specific separators. The newMoneyCellEditnow only usesstepand a basicparseFloat, somaxDecimalPlacesis not actually used to constrain the input and users can enter more fractional digits than the currency allows (and even fractions for zero-decimal currencies), which is inconsistent withPriceFieldand may lead to invalid values being submitted. Consider either reusingformatPriceInput/usePriceFieldhere or applying similar decimal-length trimming insidehandleChangeso that the datagrid editor respectsmaxDecimalPlacesin the same way as other price inputs.