carbon-react 101.4.0 → 101.4.1

package/lib/__internal__/date/date.js

@@ -7,6 +7,8 @@ exports.default = void 0;
 
 var _moment = _interopRequireDefault(require("moment"));
 
+require("moment/min/locales");
+
 var _lodash = require("lodash");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -161,14 +163,12 @@ const DateHelper = {
    * formats - given accepted formats
    * locale - current locale
    * strict - moment js strict mode
-   * sanitize - should value be sanitized before parsing
    */
   _defaultMomentOptions: (locale, formats) => {
     return {
       locale,
       formats,
-      strict: true,
-      sanitize: true
+      strict: true
     };
   },
 
@@ -185,7 +185,7 @@ const DateHelper = {
     value,
     options,
     locale,
-    formats,
+    formats = [],
     format
   }) {
     const opts = (0, _lodash.merge)(DateHelper._defaultMomentOptions(locale, formats), options, {
@@ -193,8 +193,7 @@ const DateHelper = {
       formats,
       format
     });
-    const val = opts.sanitize ? DateHelper.sanitizeDateInput(value) : value;
-    return (0, _moment.default)(val, [format, ...opts.formats], opts.locale, opts.strict);
+    return (0, _moment.default)(value, [format, isoDateFormat, ...opts.formats], opts.locale, opts.strict);
   },
 
   formatDateToCurrentLocale({
@@ -206,9 +205,6 @@ const DateHelper = {
     return DateHelper.formatValue({
       value,
       formatTo: format,
-      options: {
-        formats: [format]
-      },
       locale,
       formats,
       format

package/lib/components/date/date.component.js

@@ -167,13 +167,11 @@ let BaseDateInput = /*#__PURE__*/function (_React$Component) {
         _this.reformatVisibleDate();
 
         if (_this.props.onBlur && !_this.state.isDatePickerOpen) {
-          const dateWithSlashes = _date.default.sanitizeDateInput(_this.state.visibleValue);
-
           const event = _this.buildCustomEvent({
             target: _this.input,
             type: "blur"
           }, _date.default.formatValue({
-            value: dateWithSlashes,
+            value: _this.state.visibleValue,
             ..._this.localeData
           }));
 
@@ -365,10 +363,8 @@ let BaseDateInput = /*#__PURE__*/function (_React$Component) {
       } = _this.props;
       const value = ev.target.value.formattedValue || ev.target.value;
 
-      const dateWithSlashes = _date.default.sanitizeDateInput(value);
-
       const isValidDate = _date.default.isValidDate({
-        value: dateWithSlashes,
+        value,
         ..._this.localeData
       });
 
@@ -378,7 +374,7 @@ let BaseDateInput = /*#__PURE__*/function (_React$Component) {
 
       if (isValidDate || _this.canBeEmptyValues(value)) {
         isoDateString = _date.default.formatValue({
-          value: dateWithSlashes,
+          value,
           ..._this.localeData
         });
 
@@ -440,9 +436,6 @@ let BaseDateInput = /*#__PURE__*/function (_React$Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "buildCustomEvent", (ev, isoFormattedValue) => {
-      const {
-        type
-      } = ev;
       const {
         id,
         name,
@@ -477,7 +470,7 @@ let BaseDateInput = /*#__PURE__*/function (_React$Component) {
           ...(validRawValue && {
             rawValue: isoFormattedValue
           }),
-          ...(type === "blur" && {
+          ...(!validRawValue && {
             formattedValue: value,
             rawValue: value
           })
@@ -488,15 +481,19 @@ let BaseDateInput = /*#__PURE__*/function (_React$Component) {
 
     _defineProperty(_assertThisInitialized(_this), "renderDatePicker", dateRangeProps => {
       if (!_this.state.isDatePickerOpen) return null;
-      let {
+      const {
         visibleValue
       } = _this.state;
+      let isoValue = "";
 
-      if (!_date.default.isValidDate({
+      if (_date.default.isValidDate({
         value: visibleValue,
         ..._this.localeData
       })) {
-        visibleValue = "";
+        isoValue = _date.default.formatValue({
+          value: visibleValue,
+          ..._this.localeData
+        });
       }
 
       return /*#__PURE__*/_react.default.createElement("div", {
@@ -506,7 +503,7 @@ let BaseDateInput = /*#__PURE__*/function (_React$Component) {
         inputElement: _this.inputPresentationRef,
         selectedDate: _this.state.selectedDate,
         handleDateSelect: _this.handleDateSelect,
-        inputDate: visibleValue,
+        inputDate: isoValue,
         disablePortal: _this.props.disablePortal
       }, dateRangeProps)));
     });
@@ -642,7 +639,7 @@ function generateAdjustedValue({
   formats,
   format
 }) {
-  if (value !== undefined && canReturnValue(value, allowEmptyValue, locale, formats, format)) {
+  if (value !== undefined && canReturnValue(value, allowEmptyValue)) {
     return _date.default.formatDateToCurrentLocale({
       value,
       locale,
@@ -651,7 +648,7 @@ function generateAdjustedValue({
     });
   }
 
-  if (canReturnValue(defaultValue, allowEmptyValue, locale, formats, format)) {
+  if (canReturnValue(defaultValue, allowEmptyValue)) {
     return _date.default.formatDateToCurrentLocale({
       value: defaultValue,
       locale,
@@ -668,25 +665,20 @@ function generateAdjustedValue({
   });
 }
 
-function isValidInitialFormat(value, locale, formats, format) {
+function isValidInitialFormat(value) {
   return _date.default.isValidDate({
     value,
-    options: {
-      defaultValue: hiddenDateFormat
-    },
-    locale,
-    formats,
-    format
+    format: hiddenDateFormat
   });
 }
 
-function canReturnValue(value, allowEmptyValue, locale, formats, format) {
+function canReturnValue(value, allowEmptyValue) {
   if (!allowEmptyValue && value && value.length) {
     const message = "The Date component must be initialised with a value in the iso (YYYY-MM-DD) format";
-    (0, _invariant.default)(isValidInitialFormat(value, locale, formats, format), message);
+    (0, _invariant.default)(isValidInitialFormat(value), message);
   }
 
-  return isValidInitialFormat(value, locale, formats, format) || allowEmptyValue && !value;
+  return isValidInitialFormat(value) || allowEmptyValue && !value;
 }
 
 const DateInput = (0, _withUniqueIdProps.default)(BaseDateInput);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "101.4.0",
+  "version": "101.4.1",
   "description": "A library of reusable React components for easily building user interfaces.",
   "engineStrict": true,
   "engines": {
@@ -62,18 +62,18 @@
     "@semantic-release/changelog": "^6.0.1",
     "@semantic-release/exec": "^6.0.2",
     "@semantic-release/git": "^10.0.1",
-    "@storybook/addon-a11y": "^6.3.6",
-    "@storybook/addon-actions": "^6.3.6",
-    "@storybook/addon-controls": "^6.3.7",
-    "@storybook/addon-docs": "^6.3.6",
+    "@storybook/addon-a11y": "^6.3.12",
+    "@storybook/addon-actions": "^6.3.12",
+    "@storybook/addon-controls": "^6.3.12",
+    "@storybook/addon-docs": "^6.3.12",
     "@storybook/addon-google-analytics": "^6.2.9",
-    "@storybook/addon-links": "^6.3.6",
-    "@storybook/addon-toolbars": "^6.3.8",
-    "@storybook/addon-viewport": "^6.3.6",
-    "@storybook/addons": "^6.3.6",
-    "@storybook/components": "^6.3.6",
-    "@storybook/react": "^6.3.6",
-    "@storybook/theming": "^6.3.6",
+    "@storybook/addon-links": "^6.3.12",
+    "@storybook/addon-toolbars": "^6.3.12",
+    "@storybook/addon-viewport": "^6.3.12",
+    "@storybook/addons": "^6.3.12",
+    "@storybook/components": "^6.3.12",
+    "@storybook/react": "^6.3.12",
+    "@storybook/theming": "^6.3.12",
     "@types/enzyme": "^3.10.3",
     "@types/enzyme-adapter-react-16": "^1.0.5",
     "@types/jest": "^26.0.19",