Merge pull request #157 from tiqi-group/fix/handle_minus_sign_input

fix: correctly handling minus sign input in NumberComponent
This commit is contained in:
Mose Müller 2024-09-17 16:52:08 +02:00 committed by GitHub
commit 5388fd0d2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 27 additions and 15 deletions

View File

@ -132,6 +132,8 @@ const handleNumericKey = (
selectionStart: number, selectionStart: number,
selectionEnd: number, selectionEnd: number,
) => { ) => {
let newValue = value;
// Check if a number key or a decimal point key is pressed // Check if a number key or a decimal point key is pressed
if (key === "." && value.includes(".")) { if (key === "." && value.includes(".")) {
// Check if value already contains a decimal. If so, ignore input. // Check if value already contains a decimal. If so, ignore input.
@ -139,14 +141,34 @@ const handleNumericKey = (
return { value, selectionStart }; return { value, selectionStart };
} }
let newValue = value; // Handle minus sign input
if (key === "-") {
if (selectionStart === 0 && selectionEnd > selectionStart) {
// Replace selection with minus if selection starts at 0
newValue = "-" + value.slice(selectionEnd);
selectionStart = 1;
} else if (selectionStart === 0 && !value.startsWith("-")) {
// Add minus at the beginning if it doesn't exist
newValue = "-" + value;
selectionStart = 1;
} else if (
(selectionStart === 0 || selectionStart === 1) &&
value.startsWith("-")
) {
// Remove minus if it exists
newValue = value.slice(1);
selectionStart = 0;
}
return { value: newValue, selectionStart };
}
// Add the new key at the cursor's position // Add the new key at the cursor's position
if (selectionEnd > selectionStart) { if (selectionEnd > selectionStart) {
// If there is a selection, replace it with the key // If there is a selection, replace it with the key
newValue = value.slice(0, selectionStart) + key + value.slice(selectionEnd); newValue = value.slice(0, selectionStart) + key + value.slice(selectionEnd);
} else { } else {
// otherwise, append the key after the selection start // Otherwise, insert the key at the cursor position
newValue = value.slice(0, selectionStart) + key + value.slice(selectionStart); newValue = value.slice(0, selectionStart) + key + value.slice(selectionStart);
} }
@ -201,17 +223,7 @@ export const NumberComponent = React.memo((props: NumberComponentProps) => {
// Select everything when pressing Ctrl + a // Select everything when pressing Ctrl + a
inputTarget.setSelectionRange(0, value.length); inputTarget.setSelectionRange(0, value.length);
return; return;
} else if (key === "-") { } else if ((key >= "0" && key <= "9") || key === "-") {
if (selectionStart === 0 && !value.startsWith("-")) {
newValue = "-" + value;
selectionStart++;
} else if (value.startsWith("-") && selectionStart === 1) {
newValue = value.substring(1); // remove minus sign
selectionStart--;
} else {
return; // Ignore "-" pressed in other positions
}
} else if (key >= "0" && key <= "9") {
// Check if a number key or a decimal point key is pressed // Check if a number key or a decimal point key is pressed
({ value: newValue, selectionStart } = handleNumericKey( ({ value: newValue, selectionStart } = handleNumericKey(
key, key,

View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="theme-color" content="#000000" /> <meta name="theme-color" content="#000000" />
<meta name="description" content="Web site displaying a pydase UI." /> <meta name="description" content="Web site displaying a pydase UI." />
<script type="module" crossorigin src="/assets/index-DI9re3au.js"></script> <script type="module" crossorigin src="/assets/index-BjsjosWf.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-D2aktF3W.css"> <link rel="stylesheet" crossorigin href="/assets/index-D2aktF3W.css">
</head> </head>