-
-
Notifications
You must be signed in to change notification settings - Fork 5.2k
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
Fix(input): Set DateInput and DateTimeInput to uncontrolled input #9543
Open
arimet
wants to merge
3
commits into
master
Choose a base branch
from
fix/dateInput
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
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.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,42 +35,120 @@ export const DateInput = ({ | |
defaultValue, | ||
format = getStringFromDate, | ||
label, | ||
name, | ||
source, | ||
resource, | ||
helperText, | ||
margin, | ||
onBlur, | ||
onChange, | ||
onFocus, | ||
parse, | ||
validate, | ||
variant, | ||
...rest | ||
}: DateInputProps) => { | ||
const { field, fieldState, formState, id, isRequired } = useInput({ | ||
const { | ||
field, | ||
fieldState: { error, invalid, isTouched }, | ||
formState: { isSubmitted }, | ||
id, | ||
isRequired, | ||
} = useInput({ | ||
defaultValue, | ||
name, | ||
format, | ||
parse, | ||
onBlur, | ||
onChange, | ||
resource, | ||
source, | ||
validate, | ||
...rest, | ||
}); | ||
const [renderCount, setRenderCount] = React.useState(1); | ||
|
||
const initialDefaultValueRef = React.useRef(field.value); | ||
|
||
React.useEffect(() => { | ||
const initialDateValue = | ||
new Date(initialDefaultValueRef.current).getTime() || null; | ||
|
||
const fieldDateValue = new Date(field.value).getTime() || null; | ||
|
||
if (initialDateValue !== fieldDateValue) { | ||
setRenderCount(r => r + 1); | ||
parse | ||
? field.onChange(parse(field.value)) | ||
: field.onChange(field.value); | ||
initialDefaultValueRef.current = field.value; | ||
} | ||
}, [setRenderCount, parse, field]); | ||
|
||
const { onBlur: onBlurFromField } = field; | ||
const hasFocus = React.useRef(false); | ||
|
||
// update the input text when the user types in the input | ||
const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => { | ||
if (onChange) { | ||
onChange(event); | ||
} | ||
if ( | ||
typeof event.target === 'undefined' || | ||
typeof event.target.value === 'undefined' | ||
) { | ||
return; | ||
} | ||
const target = event.target; | ||
|
||
const newValue = | ||
target.valueAsDate !== undefined && | ||
target.valueAsDate !== null && | ||
!isNaN(new Date(target.valueAsDate).getTime()) | ||
? parse | ||
? parse(target.valueAsDate) | ||
: getStringFromDate(target.valueAsDate) | ||
: parse | ||
? parse(target.value) | ||
: getStringFromDate(target.value); | ||
|
||
// if value empty, set it to null | ||
if (newValue === '') { | ||
field.onChange(null); | ||
return; | ||
} | ||
|
||
field.onChange(newValue); | ||
}; | ||
|
||
const handleFocus = (event: React.FocusEvent<HTMLInputElement>) => { | ||
if (onFocus) { | ||
onFocus(event); | ||
} | ||
hasFocus.current = true; | ||
}; | ||
|
||
const handleBlur = () => { | ||
if (onBlurFromField) { | ||
onBlurFromField(); | ||
} | ||
hasFocus.current = false; | ||
}; | ||
|
||
const { error, invalid, isTouched } = fieldState; | ||
const { isSubmitted } = formState; | ||
const renderHelperText = | ||
helperText !== false || ((isTouched || isSubmitted) && invalid); | ||
|
||
const { ref, name } = field; | ||
|
||
console.log('field', field); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
||
return ( | ||
<TextField | ||
id={id} | ||
{...field} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why remove |
||
className={clsx('ra-input', `ra-input-${source}`, className)} | ||
name={name} | ||
inputRef={ref} | ||
defaultValue={format(initialDefaultValueRef.current)} | ||
key={renderCount} | ||
type="date" | ||
onChange={handleChange} | ||
onFocus={handleFocus} | ||
onBlur={handleBlur} | ||
className={clsx('ra-input', `ra-input-${source}`, className)} | ||
size="small" | ||
variant={variant} | ||
margin={margin} | ||
|
@@ -133,7 +211,7 @@ const getStringFromDate = (value: string | Date) => { | |
// null, undefined and empty string values should not go through dateFormatter | ||
// otherwise, it returns undefined and will make the input an uncontrolled one. | ||
if (value == null || value === '') { | ||
return ''; | ||
return null; | ||
} | ||
|
||
if (value instanceof Date) { | ||
|
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
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.
Why have a different logic for
onBlur
andonFocus
?