From 18d58456777bc6db7abee2ee3882ce26396ab091 Mon Sep 17 00:00:00 2001
From: Paul-Xavier Ceccaldi <pix@wttj.co>
Date: Mon, 5 Aug 2019 14:19:28 +0000
Subject: [PATCH] fix: width='100%' prop on datetimepicker was not working

Signed-off-by: Paul-Xavier Ceccaldi <pix@wttj.co>
---
 src/components/DateTimePicker/styles.js | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/components/DateTimePicker/styles.js b/src/components/DateTimePicker/styles.js
index 0428d531ab..c8be41bc36 100644
--- a/src/components/DateTimePicker/styles.js
+++ b/src/components/DateTimePicker/styles.js
@@ -2,7 +2,7 @@ import styled, { css } from '@xstyled/styled-components'
 import { th } from '@xstyled/system'
 import ReactDatePicker from 'react-datepicker'
 
-import { componentSystem, system, wrapperSystem } from '../../utils/'
+import { componentSystem, wrapperSystem } from '../../utils/'
 import { fieldStyles } from '../../common/styles/form'
 
 // Only require CSS on client
@@ -23,34 +23,31 @@ const focusStyles = css`
   }
 `
 
-export const DatePicker = styled(ReactDatePicker)(
-  ({ connected }) => css`
-    ${fieldStyles};
-    ${focusStyles};
-    ${connected ? componentSystem : system};
-  `
-)
+export const DatePicker = styled(ReactDatePicker)`
+  ${fieldStyles};
+  ${focusStyles};
+  ${componentSystem};
+`
 
-export const TimePicker = styled(ReactDatePicker)(
-  ({ connected }) => css`
-    ${fieldStyles};
-    text-align: center;
-    ${focusStyles};
-    ${connected ? componentSystem : system};
-  `
-)
+export const TimePicker = styled(ReactDatePicker)`
+  ${fieldStyles};
+  text-align: center;
+  ${focusStyles};
+  ${componentSystem};
+`
 
 export const DateTimePicker = styled.div(
-  ({ connected, datePickerOnly, timePickerOnly }) => css`
+  ({ connected, datePickerOnly, timePickerOnly, width = 'auto' }) => css`
     position: relative;
-    display: flex;
+    display: ${width === 'auto' ? 'inline-flex' : 'flex'};
     flex-wrap: nowrap;
 
-    .react-datepicker-wrapper:first-child {
+    .react-datepicker-wrapper:first-child:not(:only-child) {
       margin-right: -1px;
     }
 
     .react-datepicker-wrapper {
+      flex-grow: 1;
       ${DatePicker} {
         border-top-right-radius: ${datePickerOnly ? null : 0};
         border-bottom-right-radius: ${datePickerOnly ? null : 0};
@@ -60,6 +57,9 @@ export const DateTimePicker = styled.div(
         border-bottom-left-radius: ${timePickerOnly ? null : 0};
       }
     }
+    .react-datepicker__input-container {
+      display: block;
+    }
     ${overridingStyles};
     ${connected ? null : wrapperSystem};
   `