-
-
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
[RFR] Add <DateTimeInput> #2332
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 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 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 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,9 +1,9 @@ | ||
| import React from 'react'; | ||
| import FormField from './FormField'; | ||
|
|
||
| export default BaseComponent => { | ||
| export default (BaseComponent, fieldProps = {}) => { | ||
| const WithFormField = props => ( | ||
| <FormField component={BaseComponent} {...props} /> | ||
| <FormField component={BaseComponent} {...fieldProps} {...props} /> | ||
| ); | ||
| return WithFormField; | ||
| }; | ||
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 |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import TextField from '@material-ui/core/TextField'; | ||
| import { addField, FieldTitle } from 'ra-core'; | ||
|
|
||
| import sanitizeRestProps from './sanitizeRestProps'; | ||
|
|
||
| const leftPad = (nb = 2) => value => ('0'.repeat(nb) + value).slice(-nb); | ||
| const leftPad4 = leftPad(4); | ||
| const leftPad2 = leftPad(2); | ||
|
|
||
| /** | ||
| * @param {Date} v value to convert | ||
| * @returns {String} A standardized datetime (yyyy-MM-ddThh:mm), to be passed to an <input type="datetime-local" /> | ||
| */ | ||
| const convertDateToString = v => { | ||
| if (!(v instanceof Date) || isNaN(v)) return ''; | ||
| const yyyy = leftPad4(v.getFullYear()); | ||
| const MM = leftPad2(v.getMonth() + 1); | ||
| const dd = leftPad2(v.getDate()); | ||
| const hh = leftPad2(v.getHours()); | ||
| const mm = leftPad2(v.getMinutes()); | ||
| return `${yyyy}-${MM}-${dd}T${hh}:${mm}`; | ||
| }; | ||
|
|
||
| // yyyy-MM-ddThh:mm | ||
| const dateTimeRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}$/; | ||
|
|
||
| /** | ||
| * Converts a date from the Redux store, with timezone, to a date string | ||
| * without timezone for use in an <input type="datetime-local" />. | ||
| * | ||
| * @param {Mixed} value date string or object | ||
| * @param {String} Date string, formatted as yyyy-MM-ddThh:mm | ||
| */ | ||
| const format = value => { | ||
| // null, undefined and empty string values should not go through convertDateToString | ||
| // otherwise, it returns undefined and will make the input an uncontrolled one. | ||
| if (value == null || value === '') { | ||
| return ''; | ||
| } | ||
| // valid dates should not be converted | ||
| if (dateTimeRegex.test(value)) { | ||
| return value; | ||
| } | ||
|
|
||
| const finalValue = typeof value instanceof Date ? value : new Date(value); | ||
| return convertDateToString(finalValue); | ||
| }; | ||
|
|
||
| /** | ||
| * Converts a datetime string without timezone to a date object | ||
| * with timezone, using the browser timezone. | ||
| * | ||
| * @param {String} value Date string, formatted as yyyy-MM-ddThh:mm | ||
| * @return {Date} | ||
| */ | ||
| const parse = value => new Date(value); | ||
|
|
||
| /** | ||
| * Input component for entering a date and a time with timezone, using the browser locale | ||
| */ | ||
| export const DateTimeInput = ({ | ||
| className, | ||
| meta: { touched, error }, | ||
| input, | ||
| isRequired, | ||
| label, | ||
| options, | ||
| source, | ||
| resource, | ||
| ...rest | ||
| }) => ( | ||
| <TextField | ||
| {...input} | ||
| className={className} | ||
| type="datetime-local" | ||
| margin="normal" | ||
| error={!!(touched && error)} | ||
| helperText={touched && error} | ||
| label={ | ||
| <FieldTitle | ||
| label={label} | ||
| source={source} | ||
| resource={resource} | ||
| isRequired={isRequired} | ||
| /> | ||
| } | ||
| InputLabelProps={{ | ||
| shrink: true, | ||
| }} | ||
| {...options} | ||
| {...sanitizeRestProps(rest)} | ||
| value={input.value} | ||
| /> | ||
| ); | ||
|
|
||
| DateTimeInput.propTypes = { | ||
| classes: PropTypes.object, | ||
| className: PropTypes.string, | ||
| input: PropTypes.object, | ||
| isRequired: PropTypes.bool, | ||
| label: PropTypes.string, | ||
| meta: PropTypes.object, | ||
| options: PropTypes.object, | ||
| resource: PropTypes.string, | ||
| source: PropTypes.string, | ||
| }; | ||
|
|
||
| DateTimeInput.defaultProps = { | ||
| options: {}, | ||
| }; | ||
|
|
||
| export default addField(DateTimeInput, { format, parse }); |
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
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.
This should be documented though