vitalif
/
react-toolbox
1
0
Fork 0
Code Issues Pull Requests Releases 12 Wiki Activity

Merge branch 'dev' of https://github.com/pepesenaris/react-toolbox into pepesenaris-dev 

* 'dev' of https://github.com/pepesenaris/react-toolbox:
  Add optional cancel handler in dialog dismiss
old
Javi Velasco 2016-10-22 16:53:08 +02:00
parent a1e6dd2379 dc46b0aa6d
commit 4231f86c45
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/date_picker/DatePicker.js
View File

@ -36,6 +36,7 @@ const factory = (Input, DatePickerDialog) => {
okLabel: PropTypes.string,
onChange: PropTypes.func,
onClick: PropTypes.func,
onDismiss: PropTypes.func,
onEscKeyDown: PropTypes.func,
onKeyPress: PropTypes.func,
onOverlayClick: PropTypes.func,
@ -103,7 +104,7 @@ const factory = (Input, DatePickerDialog) => {
const { active, // eslint-disable-line
autoOk, cancelLabel, inputClassName, inputFormat, locale, maxDate, minDate,
okLabel, onEscKeyDown, onOverlayClick, readonly, sundayFirstDayOfWeek, value,
...others } = this.props;
onDismiss, ...others } = this.props;
const finalInputFormat = inputFormat || time.formatDate;
const date = Object.prototype.toString.call(value) === '[object Date]' ? value : undefined;
const formattedDate = date === undefined ? '' : finalInputFormat(value, locale);
@ -134,8 +135,8 @@ const factory = (Input, DatePickerDialog) => {
maxDate={maxDate}
minDate={minDate}
name={this.props.name}
onDismiss={onDismiss || this.handleDismiss}
okLabel={okLabel}
onDismiss={this.handleDismiss}
onEscKeyDown={onEscKeyDown || this.handleDismiss}
onOverlayClick={onOverlayClick || this.handleDismiss}
onSelect={this.handleSelect}