From 54c4024f91634dd79b2bd7e990b1f7200b2e5a87 Mon Sep 17 00:00:00 2001 From: Rutika Pawar <183392827+twilight2294@users.noreply.github.com> Date: Tue, 10 Jun 2025 12:37:59 +0530 Subject: [PATCH 1/3] fix hour entry for time in per diem --- src/components/TimePicker/TimePicker.tsx | 48 ++++++++++++++++++------ 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/src/components/TimePicker/TimePicker.tsx b/src/components/TimePicker/TimePicker.tsx index 2c3aff898dbe..b3bb9c68b905 100644 --- a/src/components/TimePicker/TimePicker.tsx +++ b/src/components/TimePicker/TimePicker.tsx @@ -261,18 +261,44 @@ function TimePicker( // There is an active selection of the second digit newHour = trimmedText.substring(0, 2).padEnd(2, '0'); newSelection = trimmedText.length === 1 ? 1 : 2; - } else if (trimmedText.length === 1 && Number(trimmedText) <= 1) { - /* - The trimmed text is either 0 or 1. - We are either replacing hours with a single digit, or removing the last digit. - In both cases, we should append 0 to the remaining value. - Note: we must check the length of the filtered text to avoid incorrectly handling e.g. "01" as "1". - */ - newHour = `${trimmedText}0`; - newSelection = 1; + } else if (trimmedText.length === 1 && /^\d$/.test(trimmedText)) { + // Handles any single digit '0'-'9' + const digit = trimmedText[0]; + if (digit === '0') { + newHour = '00'; + newSelection = 1; + } else if (digit === '1') { + newHour = '01'; + // Check if it was a full replacement of a 2-digit hour field + if (selectionHour.start === 0 && typeof selectionHour.end === 'number' && selectionHour.end >= 2 && hours.length >= 2) { + newSelection = 2; + } else { + newSelection = 1; + } + } else { + // Digit is '2' through '9' + newHour = `0${digit}`; + newSelection = 2; + } } else { - newHour = trimmedText.substring(0, 2).padStart(2, '0'); - newSelection = 2; + // trimmedText.length is 0 or >= 2 + if (trimmedText.length === 0) { + newHour = '00'; + newSelection = 0; + } else { + let candidate = trimmedText.substring(0, 2); + if (/^\d\d$/.test(candidate)) { + // e.g. "05", "12" + newHour = candidate; + } else if (/^\d$/.test(candidate)) { + // e.g. "5" became candidate (should be rare here) + newHour = `0${candidate}`; + } else { + // Invalid input like "aa" + newHour = hours; // Revert to previous valid hours + } + newSelection = 2; + } } const newHourNumber = Number(newHour); From 045dde3f8f922f49fae41fa99788824a2b9216d0 Mon Sep 17 00:00:00 2001 From: Rutika Pawar <183392827+twilight2294@users.noreply.github.com> Date: Tue, 10 Jun 2025 12:43:31 +0530 Subject: [PATCH 2/3] fix esLint --- src/components/TimePicker/TimePicker.tsx | 27 ++++++++++++------------ 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/components/TimePicker/TimePicker.tsx b/src/components/TimePicker/TimePicker.tsx index b3bb9c68b905..07199376919b 100644 --- a/src/components/TimePicker/TimePicker.tsx +++ b/src/components/TimePicker/TimePicker.tsx @@ -281,24 +281,25 @@ function TimePicker( newSelection = 2; } } else { - // trimmedText.length is 0 or >= 2 + // Handle empty input or multiple digits if (trimmedText.length === 0) { newHour = '00'; newSelection = 0; + return; + } + + const candidate = trimmedText.substring(0, 2); + if (/^\d\d$/.test(candidate)) { + // e.g. "05", "12" + newHour = candidate; + } else if (/^\d$/.test(candidate)) { + // e.g. "5" became candidate (should be rare here) + newHour = `0${candidate}`; } else { - let candidate = trimmedText.substring(0, 2); - if (/^\d\d$/.test(candidate)) { - // e.g. "05", "12" - newHour = candidate; - } else if (/^\d$/.test(candidate)) { - // e.g. "5" became candidate (should be rare here) - newHour = `0${candidate}`; - } else { - // Invalid input like "aa" - newHour = hours; // Revert to previous valid hours - } - newSelection = 2; + // Invalid input like "aa" + newHour = hours; // Revert to previous valid hours } + newSelection = 2; } const newHourNumber = Number(newHour); From bad7eeb0989dde93e2c88e54005a3115bbe8dd90 Mon Sep 17 00:00:00 2001 From: Rutika Pawar <183392827+twilight2294@users.noreply.github.com> Date: Tue, 17 Jun 2025 22:12:20 +0530 Subject: [PATCH 3/3] fix prettier --- src/components/TimePicker/TimePicker.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/TimePicker/TimePicker.tsx b/src/components/TimePicker/TimePicker.tsx index 07199376919b..50bf066bdb66 100644 --- a/src/components/TimePicker/TimePicker.tsx +++ b/src/components/TimePicker/TimePicker.tsx @@ -287,7 +287,7 @@ function TimePicker( newSelection = 0; return; } - + const candidate = trimmedText.substring(0, 2); if (/^\d\d$/.test(candidate)) { // e.g. "05", "12"