Merge branch 'master' of github.com:strapi/buffet into develop

Author: soupette

packages/buffetjs-custom/src/components/DateTime/index.js

@@ -8,7 +8,7 @@ import React, { useState, useEffect } from 'react';
 import moment from 'moment';
 import PropTypes from 'prop-types';
 import momentPropTypes from 'react-moment-proptypes';
-
+import { isEmpty, cloneDeep } from 'lodash';
 import { DatePicker, TimePicker } from '@buffetjs/core';
 import Wrapper from './Wrapper';
 
@@ -46,18 +46,18 @@ function DateTime({
   step,
   ...rest
 }) {
-  const [timestamp, setTimestamp] = useState('');
+  const [timestamp, setTimestamp] = useState(null);
   const [isInit, setIsInit] = useState(false);
-  const setTime = time => {
+  const setData = time => {
     const [hour, minute, second] = time.split(':');
     const timeObj = {
       hour,
       minute,
       second,
     };
-    const currentDate = timestamp || moment();
+    const currentDate = isEmpty(timestamp) ? moment() : cloneDeep(timestamp);
+    currentDate.set('hours', timeObj.hour);
 
-    currentDate.set(timeObj);
     setDate(currentDate);
   };
   const setDate = (date, time) => {
@@ -77,7 +77,7 @@ function DateTime({
 
       setDate(newDate);
     } else {
-      setTimestamp('');
+      setTimestamp(null);
     }
 
     setIsInit(true);
@@ -103,11 +103,11 @@ function DateTime({
         name="time"
         disabled={disabled}
         onChange={({ target }) => {
-          setTime(target.value);
+          setData(target.value);
         }}
         seconds={false}
         tabIndex={tabIndex}
-        value={getTimeString(timestamp)}
+        value={getTimeString(timestamp) || ''}
         step={step}
       />
     </Wrapper>

packages/buffetjs-custom/src/components/DateTime/tests/index.test.js

@@ -75,11 +75,9 @@ describe('<DateTime />', () => {
     };
     const renderedComponent = mount(<DateTime {...props} />);
     const timepicker = renderedComponent.find(TimePicker);
-    const updatedValue = '10:10:10';
 
-    act(() => {
-      timepicker.props().onChange({ target: { value: updatedValue } });
-    });
+    const mock = { target: { value: '10' } };
+    timepicker.simulate('change', mock);
 
     const expected = value
       .set('hour', 10)