Merge pull request #4355 from nathantalewis/expose-additional-date-picker-style

[DatePicker] Expose dialog container style

Author: oliviertassinari

src/DatePicker/DatePicker.js

@@ -39,6 +39,10 @@ class DatePicker extends Component {
      * prop with `value` taking precedence.
      */
     defaultDate: PropTypes.object,
+    /**
+     * Override the inline-styles of DatePickerDialog's Container element.
+     */
+    dialogContainerStyle: PropTypes.object,
     /**
      * Disables the year selection in the date picker.
      */
@@ -262,6 +266,7 @@ class DatePicker extends Component {
       className,
       container,
       defaultDate, // eslint-disable-line no-unused-vars
+      dialogContainerStyle,
       disableYearSelection,
       firstDayOfWeek,
       locale,
@@ -298,6 +303,7 @@ class DatePicker extends Component {
           autoOk={autoOk}
           cancelLabel={cancelLabel}
           container={container}
+          containerStyle={dialogContainerStyle}
           disableYearSelection={disableYearSelection}
           firstDayOfWeek={firstDayOfWeek}
           initialDate={this.state.dialogDate}

src/DatePicker/DatePickerDialog.js

@@ -13,6 +13,7 @@ class DatePickerDialog extends Component {
     autoOk: PropTypes.bool,
     cancelLabel: PropTypes.node,
     container: PropTypes.oneOf(['dialog', 'inline']),
+    containerStyle: PropTypes.object,
     disableYearSelection: PropTypes.bool,
     firstDayOfWeek: PropTypes.number,
     initialDate: PropTypes.object,
@@ -97,6 +98,7 @@ class DatePickerDialog extends Component {
       DateTimeFormat,
       cancelLabel,
       container,
+      containerStyle,
       disableYearSelection,
       initialDate,
       firstDayOfWeek,
@@ -130,7 +132,6 @@ class DatePickerDialog extends Component {
     return (
       <div {...other} ref="root">
         <Container
-          {...other}
           anchorEl={this.refs.root} // For Popover
           animation={PopoverAnimationFromTop} // For Popover
           bodyStyle={styles.dialogBodyContent}
@@ -139,7 +140,7 @@ class DatePickerDialog extends Component {
           repositionOnUpdate={true}
           open={open}
           onRequestClose={this.handleRequestClose}
-          style={styles.dialogBodyContent}
+          style={Object.assign(styles.dialogBodyContent, containerStyle)}
         >
           <EventListener
             target="window"