Add minTime and maxTime support to TimeInput.tsx
#5819
Merged
Conversation
This file contains 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
snturk
commented
Feb 24, 2024
Comment on lines
+258
to
+271
| minTime={ | ||
| _value && minDate && _value.toDateString() === minDate.toDateString() | ||
| ? minTime != null | ||
| ? minTime | ||
| : undefined | ||
| : undefined | ||
| } | ||
| maxTime={ | ||
| _value && maxDate && _value.toDateString() === maxDate.toDateString() | ||
| ? maxTime != null | ||
| ? maxTime | ||
| : undefined | ||
| : undefined | ||
| } |
There was a problem hiding this comment.
Open to ideas to write more readable
snturk
commented
Feb 24, 2024
Comment on lines
61
to
98
| const onTimeChange = (event: React.ChangeEvent<HTMLInputElement>) => { | ||
| if (minTime !== undefined && maxTime !== undefined) { | ||
| const val = event.currentTarget.value; | ||
|
|
||
| if (val) { | ||
| const [hours, minutes, seconds] = val.split(':').map(Number); | ||
| const isValid = | ||
| (hours.toString().length === 2 || hours === 0) && | ||
| (minutes.toString().length === 2 || minutes === 0) && | ||
| (withSeconds ? seconds.toString().length === 2 || seconds === 0 : true); | ||
|
|
||
| if (isValid) { | ||
| if (minTime) { | ||
| const [minHours, minMinutes, minSeconds] = minTime.split(':').map(Number); | ||
|
|
||
| if ( | ||
| hours < minHours || | ||
| (hours === minHours && minutes < minMinutes) || | ||
| (withSeconds && hours === minHours && minutes === minMinutes && seconds < minSeconds) | ||
| ) { | ||
| event.currentTarget.value = minTime; | ||
| } | ||
| } | ||
|
|
||
| if (maxTime) { | ||
| const [maxHours, maxMinutes, maxSeconds] = maxTime.split(':').map(Number); | ||
|
|
||
| if ( | ||
| hours > maxHours || | ||
| (hours === maxHours && minutes > maxMinutes) || | ||
| (withSeconds && hours === maxHours && minutes === maxMinutes && seconds > maxSeconds) | ||
| ) { | ||
| event.currentTarget.value = maxTime; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
I'm not 100% sure this is easily readable, the method can be split into small functions if requested.
|
@rtivital could you please review? |
|
It does not seem to work 2024-02-26.16.04.07.mov |
|
|
@rtivital Hi, fixed both tasks and added Min Date & Max Date strings to the component's storybook. |
snturk
force-pushed
the
fix/4596/min_max_timeinput
branch
from
efbcdaa to
1060800
Compare
|
Several other issues: 2024-02-26.21.24.01.mov |
|
Time value must be clamped after the dropdown is closed |
|
@rtivital Hi, fixed other issues and tested corner cases, also added a new story to test min & max time for time input |
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes: #4596