This repository has been archived by the owner on Jul 12, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 145
Add Single Date Picker #1069
Merged
Merged
Add Single Date Picker #1069
Changes from 1 commit
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
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 |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| /** @format */ | ||
| /** | ||
| * External dependencies | ||
| */ | ||
| import 'core-js/fn/object/assign'; | ||
| import 'core-js/fn/array/from'; | ||
| import { __, sprintf } from '@wordpress/i18n'; | ||
| import { Component } from '@wordpress/element'; | ||
| import { Dropdown, DatePicker as WpDatePicker } from '@wordpress/components'; | ||
| import { partial } from 'lodash'; | ||
| import { TAB } from '@wordpress/keycodes'; | ||
| import moment from 'moment'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import DateInput from './input'; | ||
| import { toMoment } from '@woocommerce/date'; | ||
| import { H, Section } from '../section'; | ||
| import PropTypes from 'prop-types'; | ||
|
|
||
| class DatePicker extends Component { | ||
| constructor( props ) { | ||
| super( props ); | ||
|
|
||
| this.onDateChange = this.onDateChange.bind( this ); | ||
| this.onInputChange = this.onInputChange.bind( this ); | ||
| } | ||
|
|
||
| handleKeyDown( isOpen, onToggle, { keyCode } ) { | ||
| if ( TAB === keyCode && isOpen ) { | ||
| onToggle(); | ||
| } | ||
| } | ||
|
|
||
| handleFocus( isOpen, onToggle ) { | ||
| if ( ! isOpen ) { | ||
| onToggle(); | ||
| } | ||
| } | ||
|
|
||
| onDateChange( onToggle, dateString ) { | ||
| const { onUpdate, dateFormat } = this.props; | ||
| const date = moment( dateString ); | ||
| onUpdate( { | ||
| date, | ||
| text: dateString ? date.format( dateFormat ) : '', | ||
| error: null, | ||
| } ); | ||
| onToggle(); | ||
| } | ||
|
|
||
| onInputChange( event ) { | ||
| const value = event.target.value; | ||
| const { dateFormat } = this.props; | ||
| const date = toMoment( dateFormat, value ); | ||
| const error = date ? null : __( 'Invalid date', 'wc-admin' ); | ||
|
|
||
| this.props.onUpdate( { | ||
| date, | ||
| text: value, | ||
| error: value.length > 0 ? error : null, | ||
| } ); | ||
| } | ||
|
|
||
| render() { | ||
| const { date, text, dateFormat, error } = this.props; | ||
| // @TODO: make upstream Gutenberg change to invalidate certain days. | ||
| // const isOutsideRange = getOutsideRange( invalidDays ); | ||
| return ( | ||
| <Dropdown | ||
| position="bottom center" | ||
| focusOnMount={ false } | ||
| renderToggle={ ( { isOpen, onToggle } ) => ( | ||
| <DateInput | ||
| value={ text } | ||
| onChange={ this.onInputChange } | ||
| dateFormat={ dateFormat } | ||
| label={ __( 'Choose a date', 'wc-admin' ) } | ||
| error={ error } | ||
| describedBy={ sprintf( | ||
| __( 'Date input describing a selected date in format %s', 'wc-admin' ), | ||
| dateFormat | ||
| ) } | ||
| onFocus={ partial( this.handleFocus, isOpen, onToggle ) } | ||
| aria-expanded={ isOpen } | ||
| focusOnMount={ false } | ||
| onKeyDown={ partial( this.handleKeyDown, isOpen, onToggle ) } | ||
| errorPosition="top center" | ||
| /> | ||
| ) } | ||
| renderContent={ ( { onToggle } ) => ( | ||
| <Section component={ false }> | ||
| <H className="woocommerce-calendar__date-picker-title"> | ||
| { __( 'select a date', 'wc-admin' ) } | ||
| </H> | ||
| <div className="woocommerce-calendar__react-dates is-core-datepicker"> | ||
| <WpDatePicker | ||
| currentDate={ date } | ||
| onChange={ partial( this.onDateChange, onToggle ) } | ||
| /> | ||
| </div> | ||
| </Section> | ||
| ) } | ||
| /> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| DatePicker.propTypes = { | ||
| /** | ||
| * A moment date object representing the selected date. `null` for no selection. | ||
| */ | ||
| date: PropTypes.object, | ||
| /** | ||
| * The date in human-readable format. Displayed in the text input. | ||
| */ | ||
| text: PropTypes.string, | ||
| /** | ||
| * A string error message, shown to the user. | ||
| */ | ||
| error: PropTypes.string, | ||
| /** | ||
| * (Coming Soon) Optionally invalidate certain days. `past`, `future`, `none`, or function are accepted. | ||
| * A function will be passed to react-dates' `isOutsideRange` prop | ||
| */ | ||
| invalidDays: PropTypes.oneOfType( [ | ||
| PropTypes.oneOf( [ 'past', 'future', 'none' ] ), | ||
| PropTypes.func, | ||
| ] ), | ||
| /** | ||
| * A function called upon selection of a date or input change. | ||
| */ | ||
| onUpdate: PropTypes.func.isRequired, | ||
| /** | ||
| * The date format in moment.js-style tokens. | ||
| */ | ||
| dateFormat: PropTypes.string.isRequired, | ||
| }; | ||
|
|
||
| export default DatePicker; |
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,30 +1,60 @@ | ||
| ```jsx | ||
| import { DateRange } from '@woocommerce/components'; | ||
| import { DateRange, DatePicker } from '@woocommerce/components'; | ||
| import moment from 'moment'; | ||
|
|
||
| const dateFormat = 'MM/DD/YYYY'; | ||
|
|
||
| const MyDateRange = withState( { | ||
| after: moment( '2018-09-10' ), | ||
| afterText: '09/10/2018', | ||
| before: moment( '2018-09-20' ), | ||
| beforeText: '09/20/2018', | ||
| } )( ( { after, afterText, before, beforeText, setState } ) => { | ||
| function onUpdate( { after, afterText, before, beforeText } ) { | ||
| setState( { after, afterText, before, beforeText } ); | ||
| after: null, | ||
| afterText: '', | ||
| before: null, | ||
| beforeText: '', | ||
| afterError: null, | ||
| beforeError: null, | ||
| focusedInput: 'startDate', | ||
| } )( ( { after, afterText, before, beforeText, afterError, beforeError, focusedInput, setState } ) => { | ||
| function onRangeUpdate( update ) { | ||
| setState( update ); | ||
| } | ||
|
|
||
|
|
||
| function onDatePickerUpdate( { date, text, error } ) { | ||
| setState( { | ||
| after: date, | ||
| afterText: text, | ||
| afterError: error, | ||
| } ); | ||
| } | ||
|
|
||
| return ( | ||
| <DateRange | ||
| after={ after } | ||
| afterText={ afterText } | ||
| before={ before } | ||
| beforeText={ beforeText } | ||
| onUpdate={ onUpdate } | ||
| shortDateFormat={ dateFormat } | ||
| focusedInput="startDate" | ||
| invalidDays="none" | ||
| /> | ||
| <div> | ||
| <H>Date Range Picker</H> | ||
| <Section component={ false }> | ||
| <DateRange | ||
| after={ after } | ||
| afterText={ afterText } | ||
| before={ before } | ||
| beforeText={ beforeText } | ||
| onUpdate={ onRangeUpdate } | ||
| shortDateFormat={ dateFormat } | ||
| focusedInput={ focusedInput } | ||
| invalidDays="future" | ||
| /> | ||
| </Section> | ||
|
|
||
| <H>Date Picker</H> | ||
| <Section component={ false }> | ||
| <DatePicker | ||
| date={ after } | ||
| text={ afterText } | ||
| error={ afterError } | ||
| onUpdate={ onDatePickerUpdate } | ||
| dateFormat={ dateFormat } | ||
| invalidDays="none" | ||
| onUpdate={ onDatePickerUpdate } | ||
| invalidDays="future" | ||
| /> | ||
| </Section> | ||
| </div> | ||
| ) | ||
| } ); | ||
| ``` | ||
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.
note to self:
invalidDaysandonUpdateare duplicated