chore: update datetime widget and deprecate date widget (#2615)

packages/netlify-cms-widget-date/src/DateControl.js

@@ -6,6 +6,19 @@ import reactDateTimeStyles from 'react-datetime/css/react-datetime.css';
 import DateTime from 'react-datetime';
 import moment from 'moment';
 
+import { once } from 'lodash';
+import { oneLine } from 'common-tags';
+
+const warnDeprecated = once(() =>
+  console.warn(oneLine`
+  Netlify CMS config: the date widget has been deprecated and will
+  be removed in the next major release. Please use the datetime widget instead.
+`),
+);
+
+/**
+ * `date` widget is deprecated in favor of the `datetime` widget
+ */
 export default class DateControl extends React.Component {
   static propTypes = {
     field: PropTypes.object.isRequired,
@@ -41,6 +54,7 @@ export default class DateControl extends React.Component {
   formats = this.getFormats();
 
   componentDidMount() {
+    warnDeprecated();
     const { value } = this.props;
 
     /**

packages/netlify-cms-widget-datetime/src/DateTimeControl.js

@@ -1,10 +1,122 @@
+/** @jsx jsx */
 import React from 'react';
-import NetlifyCmsWidgetDate from 'netlify-cms-widget-date';
+import PropTypes from 'prop-types';
-
+import { jsx, css } from '@emotion/core';
-const DateControl = NetlifyCmsWidgetDate.controlComponent;
+import reactDateTimeStyles from 'react-datetime/css/react-datetime.css';
+import DateTime from 'react-datetime';
+import moment from 'moment';
 
 export default class DateTimeControl extends React.Component {
+  static propTypes = {
+    field: PropTypes.object.isRequired,
+    forID: PropTypes.string,
+    onChange: PropTypes.func.isRequired,
+    classNameWrapper: PropTypes.string.isRequired,
+    setActiveStyle: PropTypes.func.isRequired,
+    setInactiveStyle: PropTypes.func.isRequired,
+    value: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),
+  };
+
+  getFormats() {
+    const { field } = this.props;
+    const format = field.get('format');
+
+    // dateFormat and timeFormat are strictly for modifying
+    // input field with the date/time pickers
+    const dateFormat = field.get('dateFormat');
+    // show time-picker? false hides it, true shows it using default format
+    let timeFormat = field.get('timeFormat');
+    if (typeof timeFormat === 'undefined') {
+      timeFormat = true;
+    }
+
+    return {
+      format,
+      dateFormat,
+      timeFormat,
+    };
+  }
+
+  formats = this.getFormats();
+
+  componentDidMount() {
+    const { value } = this.props;
+
+    /**
+     * Set the current date as default value if no default value is provided. An
+     * empty string means the value is intentionally blank.
+     */
+    if (!value && value !== '') {
+      setTimeout(() => {
+        this.handleChange(new Date());
+      }, 0);
+    }
+  }
+
+  // Date is valid if datetime is a moment or Date object otherwise it's a string.
+  // Handle the empty case, if the user wants to empty the field.
+  isValidDate = datetime =>
+    moment.isMoment(datetime) || datetime instanceof Date || datetime === '';
+
+  handleChange = datetime => {
+    /**
+     * Set the date only if it is valid.
+     */
+    if (!this.isValidDate(datetime)) {
+      return;
+    }
+
+    const { onChange } = this.props;
+    const { format } = this.formats;
+
+    /**
+     * Produce a formatted string only if a format is set in the config.
+     * Otherwise produce a date object.
+     */
+    if (format) {
+      const formattedValue = moment(datetime).format(format);
+      onChange(formattedValue);
+    } else {
+      const value = moment.isMoment(datetime) ? datetime.toDate() : datetime;
+      onChange(value);
+    }
+  };
+
+  onBlur = datetime => {
+    const { setInactiveStyle } = this.props;
+
+    if (!this.isValidDate(datetime)) {
+      const parsedDate = moment(datetime);
+
+      if (parsedDate.isValid()) {
+        this.handleChange(datetime);
+      } else {
+        window.alert('The date you entered is invalid.');
+      }
+    }
+
+    setInactiveStyle();
+  };
+
   render() {
-    return <DateControl {...this.props} includeTime />;
+    const { forID, value, classNameWrapper, setActiveStyle } = this.props;
+    const { format, dateFormat, timeFormat } = this.formats;
+    return (
+      <div
+        css={css`
+          ${reactDateTimeStyles};
+        `}
+      >
+        <DateTime
+          dateFormat={dateFormat}
+          timeFormat={timeFormat}
+          value={moment(value, format)}
+          onChange={this.handleChange}
+          onFocus={setActiveStyle}
+          onBlur={this.onBlur}
+          inputProps={{ className: classNameWrapper, id: forID }}
+        />
+      </div>
+    );
   }
 }

packages/netlify-cms-widget-datetime/src/DateTimePreview.js

@@ -0,0 +1,13 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { WidgetPreviewContainer } from 'netlify-cms-ui-default';
+
+const DatePreview = ({ value }) => (
+  <WidgetPreviewContainer>{value ? value.toString() : null}</WidgetPreviewContainer>
+);
+
+DatePreview.propTypes = {
+  value: PropTypes.object,
+};
+
+export default DatePreview;

packages/netlify-cms-widget-datetime/src/index.js

@@ -1,7 +1,6 @@
 import controlComponent from './DateTimeControl';
-import NetlifyCmsWidgetDate from 'netlify-cms-widget-date';
+import previewComponent from './DateTimePreview';
 
-const previewComponent = NetlifyCmsWidgetDate.previewComponent;
 const Widget = (opts = {}) => ({
   name: 'datetime',
   controlComponent,

website/content/docs/widgets/date.md

@@ -1,8 +1,10 @@
 ---
 title: date
-label: "Date"
+label: 'Date'
 ---
 
+_**Deprecation notice**: the date widget has been deprecated and will be removed in the next major release. Please use the datetime widget instead._
+
 The date widget translates a date picker input to a date string. For saving date and time together, use the datetime widget.
 
 - **Name:** `date`
@@ -14,10 +16,10 @@ The date widget translates a date picker input to a date string. For saving date
   - `dateFormat`: optional; boolean or Moment.js [tokens](https://momentjs.com/docs/#/parsing/string-format/). If `true` use default locale format.
   - `timeFormat`: optional; boolean or Moment.js [tokens](https://momentjs.com/docs/#/parsing/string-format/). If `true` use default locale format, `false` hides time-picker. Defaults to false.
 - **Example:**
-    ```yaml
+  ```yaml
-    - label: "Birthdate"
+  - label: 'Birthdate'
-      name: "birthdate"
+    name: 'birthdate'
-      widget: "date"
+    widget: 'date'
-      default: ""
+    default: ''
-      format: "MMM Do YY"
+    format: 'MMM Do YY'
-    ```
+  ```