From ebdee7a02701cd2558e1bec9f63bfcdecd159816 Mon Sep 17 00:00:00 2001
From: Erkan Tairi <erkan.tairi@gmail.com>
Date: Thu, 12 Jul 2018 14:10:37 +0200
Subject: [PATCH 1/3] Change DateTimeFormat type to func and add cancelLabel

---
 src/DateTimePicker.jsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/DateTimePicker.jsx b/src/DateTimePicker.jsx
index 232d194..f15ed66 100644
--- a/src/DateTimePicker.jsx
+++ b/src/DateTimePicker.jsx
@@ -18,12 +18,13 @@ export default class DateTimePicker extends Component {
     DatePicker: PropTypes.func.isRequired,
     TimePicker: PropTypes.func.isRequired,
 
-    DateTimeFormat: PropTypes.object,
+    DateTimeFormat: PropTypes.func,
     locale: PropTypes.string,
 
     format: PropTypes.string,
     timePickerDelay: PropTypes.number,
     okLabel: PropTypes.string,
+    cancelLabel: PropTypes.string,
     name: PropTypes.string,
     showCurrentDateByDefault: PropTypes.bool,
     returnMomentDate: PropTypes.bool,
@@ -68,6 +69,7 @@ export default class DateTimePicker extends Component {
   static defaultProps = {
     customValue: undefined,
     okLabel: 'OK',
+    cancelLabel: 'Cancel',
     minDate: undefined,
     maxDate: undefined,
     name: 'datepicker',
@@ -207,7 +209,7 @@ export default class DateTimePicker extends Component {
       firstDayOfWeek, textFieldClassName, autoOkDatePicker,
       datePickerMode, disableYearSelection, shouldDisableDate,
       hideCalendarDate, openToYearSelection, timePickerBodyStyle,
-      okLabel, autoOkTimePicker, timePickerDialogStyle, clearIconStyle, style, textFieldStyle,
+      cancelLabel, okLabel, autoOkTimePicker, timePickerDialogStyle, clearIconStyle, style, textFieldStyle,
       minutesStep,
       timePickerDelay,
       showCurrentDateByDefault,
@@ -253,6 +255,7 @@ export default class DateTimePicker extends Component {
           initialDate={this.getDateOrCurrentTime()}
           maxDate={this.getDateOrNull(maxDate)}
           minDate={this.getDateOrNull(minDate)}
+          cancelLabel={cancelLabel}
           okLabel={okLabel}
           autoOk={autoOkDatePicker}
           firstDayOfWeek={firstDayOfWeek}
@@ -264,8 +267,8 @@ export default class DateTimePicker extends Component {
           shouldDisableDate={shouldDisableDate}
           hideCalendarDate={hideCalendarDate}
           openToYearSelection={openToYearSelection}
-          DateTimeFormat = { DateTimeFormat }
-          locale = { locale }
+          DateTimeFormat = {DateTimeFormat}
+          locale = {locale}
         />
 
         <TimePicker
@@ -275,6 +278,7 @@ export default class DateTimePicker extends Component {
           bodyStyle={timePickerBodyStyle}
           onShow={onTimePickerShow}
           format={timeFormat}
+          cancelLabel={cancelLabel}
           okLabel={okLabel}
           autoOk={autoOkTimePicker}
           style={timePickerDialogStyle}

From ec6ecf03c5aefe1eb84c93fc87bdde6a0eae6d5f Mon Sep 17 00:00:00 2001
From: Erkan Tairi <erkan.tairi@gmail.com>
Date: Thu, 12 Jul 2018 16:56:37 +0200
Subject: [PATCH 2/3] Add style to props

---
 src/DateTimePicker.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DateTimePicker.jsx b/src/DateTimePicker.jsx
index f15ed66..bce3fa1 100644
--- a/src/DateTimePicker.jsx
+++ b/src/DateTimePicker.jsx
@@ -208,7 +208,7 @@ export default class DateTimePicker extends Component {
       clearIcon, maxDate, minDate, timeFormat,
       firstDayOfWeek, textFieldClassName, autoOkDatePicker,
       datePickerMode, disableYearSelection, shouldDisableDate,
-      hideCalendarDate, openToYearSelection, timePickerBodyStyle,
+      hideCalendarDate, openToYearSelection, timePickerBodyStyle, style,
       cancelLabel, okLabel, autoOkTimePicker, timePickerDialogStyle, clearIconStyle, style, textFieldStyle,
       minutesStep,
       timePickerDelay,

From e545a1431c4d39bbbb8d95a6a1484bd2270de822 Mon Sep 17 00:00:00 2001
From: Erkan Tairi <erkan.tairi@gmail.com>
Date: Thu, 12 Jul 2018 17:13:29 +0200
Subject: [PATCH 3/3] Change to Object.assign for combining styles

---
 src/DateTimePicker.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/DateTimePicker.jsx b/src/DateTimePicker.jsx
index bce3fa1..7dcb75e 100644
--- a/src/DateTimePicker.jsx
+++ b/src/DateTimePicker.jsx
@@ -208,7 +208,7 @@ export default class DateTimePicker extends Component {
       clearIcon, maxDate, minDate, timeFormat,
       firstDayOfWeek, textFieldClassName, autoOkDatePicker,
       datePickerMode, disableYearSelection, shouldDisableDate,
-      hideCalendarDate, openToYearSelection, timePickerBodyStyle, style,
+      hideCalendarDate, openToYearSelection, timePickerBodyStyle,
       cancelLabel, okLabel, autoOkTimePicker, timePickerDialogStyle, clearIconStyle, style, textFieldStyle,
       minutesStep,
       timePickerDelay,
@@ -228,13 +228,13 @@ export default class DateTimePicker extends Component {
     } = this.props;
 
     return (
-      <div style={{ ...styles.container, style }} className={this.props.className}>
+      <div style={Object.assign({}, styles.container, style)} className={this.props.className}>
         <TextField
           onFocus={this.handleFocus}
           className={textFieldClassName}
           onClick={this.openDatePicker}
           value={this.getDisplayTime()}
-          style={{ ...styles.textField, ...textFieldStyle }}
+          style={Object.assign({}, styles.textField, textFieldStyle)}
           disabled={disabled}
           {...other}
         />
@@ -243,7 +243,7 @@ export default class DateTimePicker extends Component {
           clearIcon
             ? <IconButton
               onClick={this.clearState}
-              style={{ ...styles.clearIcon, ...clearIconStyle }}
+              style={Object.assign({}, styles.clearIcon, clearIconStyle)}
               disabled={disabled}>
               { clearIcon }
             </IconButton>