Skip to content

Commit

Permalink
Merge dev
Browse files Browse the repository at this point in the history
  • Loading branch information
cheton committed Mar 2, 2018
2 parents f593304 + 156a205 commit 4943151
Show file tree
Hide file tree
Showing 27 changed files with 22,911 additions and 31,033 deletions.
9 changes: 0 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,22 +166,14 @@ defaultDate | object or string | null |
minDate | object or string | null | The minimum selectable date. When set to null, there is no minimum.
maxDate | object or string | null | The maximum selectable date. When set to null, there is no maximum.
onSelect | function(date) | | Called when a date is selected.
navArrows | object | |
navArrows.prev | node | <i className="fa fa-angle-left" /> |
navArrows.next | node | <i className="fa fa-angle-right" /> |

#### DateInput

Name | Type | Default | Description
:--- | :--- | :------ | :----------
locale | string | 'en' |
dateFormat | string | 'YYYY-MM-DD' |
value | object or string | null |
defaultValue | object or string | null |
minDate | object or string | null | The minimum selectable date. When set to null, there is no minimum.
maxDate | object or string | null | The maximum selectable date. When set to null, there is no maximum.
onChange | function(value) | | Called when the value changes.
renderIcon | function(props) | |

#### TimeInput

Expand All @@ -190,7 +182,6 @@ Name | Type | Default | Description
value | string | '00:00:00' |
defaultValue | string | '00:00:00' |
onChange | function(value) | | Called when the value changes.
renderIcon | function(props) | |

## License

Expand Down
148 changes: 126 additions & 22 deletions dist/react-datepicker.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/react-datepicker.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions docs/1dada8ea59a31dad3dbb76472a3de6ba.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions docs/5ce48c51b8e3b5d666156ff739655a38.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4943151

Please sign in to comment.