carbon-react 125.0.1 → 125.0.2

package/esm/components/numeral-date/numeral-date.component.js

@@ -22,13 +22,52 @@ import Logger from "../../__internal__/utils/logger";
 let deprecateUncontrolledWarnTriggered = false;
 export const ALLOWED_DATE_FORMATS = [["dd", "mm", "yyyy"], ["mm", "dd", "yyyy"], ["yyyy", "mm", "dd"], ["dd", "mm"], ["mm", "dd"], ["mm", "yyyy"]];
 const incorrectDateFormatMessage = "Forbidden prop dateFormat supplied to NumeralDate. " + "Only one of these date formats is allowed: " + "['dd', 'mm', 'yyyy'], " + "['mm', 'dd', 'yyyy'], " + "['yyyy', 'mm', 'dd'], " + "['dd', 'mm'], " + "['mm', 'dd'], " + "['mm', 'yyyy']";
-const isDayValid = day => day ? +day > 0 && +day < 32 : true;
-const isMonthValid = month => month ? +month > 0 && +month < 13 : true;
-const isYearValid = year => year ? +year > 1799 && +year < 2201 : true;
-const validations = {
-  dd: isDayValid,
-  mm: isMonthValid,
-  yyyy: isYearValid
+const getMonthsForLocale = localeName => {
+  const year = new Date().getFullYear();
+  const {
+    format
+  } = new Intl.DateTimeFormat(localeName, {
+    month: "long"
+  });
+  return [...Array(12).keys()].map(m => format(new Date(Date.UTC(year, m))));
+};
+const validationMessages = (locale, month, daysInMonth) => ({
+  dd: locale.numeralDate.validation.day(month ? getMonthsForLocale(locale.locale())[+month - 1] : undefined, daysInMonth),
+  mm: locale.numeralDate.validation.month(),
+  yyyy: locale.numeralDate.validation.year()
+});
+const getDaysInMonth = (month, year) => {
+  if (month && (+month > 12 || +month < 1)) {
+    return 31;
+  }
+  const currentDate = new Date();
+  const computedYear = +(year || currentDate.getFullYear());
+  const computedMonth = +(month || currentDate.getMonth() + 1);
+
+  // passing 0 as the third argument ensures we handle for months being 0 indexed
+  return new Date(computedYear, computedMonth, 0).getDate();
+};
+const validate = (locale, {
+  dd,
+  mm,
+  yyyy
+}) => {
+  const failed = {
+    dd: "",
+    mm: "",
+    yyyy: ""
+  };
+  const daysInMonth = getDaysInMonth(mm, yyyy);
+  if (dd && (+dd > daysInMonth || +dd < 1)) {
+    failed.dd = validationMessages(locale, mm, String(daysInMonth)).dd;
+  }
+  if (mm && (+mm > 12 || +mm < 1)) {
+    failed.mm = validationMessages(locale).mm;
+  }
+  if (yyyy && (+yyyy < 1800 || +yyyy > 2200)) {
+    failed.yyyy = validationMessages(locale).yyyy;
+  }
+  return failed;
 };
 const getDateLabel = (datePart, locale) => {
   switch (datePart) {
@@ -99,11 +138,6 @@ export const NumeralDate = ({
     const modeSwitchedMessage = "Input elements should not switch from uncontrolled to controlled (or vice versa). " + "Decide between using a controlled or uncontrolled input element for the lifetime of the component";
     !(isControlled.current === (value !== undefined)) ? process.env.NODE_ENV !== "production" ? invariant(false, modeSwitchedMessage) : invariant(false) : void 0;
   }, [value]);
-  const validationMessages = {
-    dd: locale.numeralDate.validation.day(),
-    mm: locale.numeralDate.validation.month(),
-    yyyy: locale.numeralDate.validation.year()
-  };
   const [dateValue, setDateValue] = useState({
     ...(initialValue || Object.fromEntries(dateFormat.map(datePart => [datePart, ""])))
   });
@@ -137,15 +171,13 @@ export const NumeralDate = ({
       }
     }
   };
-  const handleBlur = datePart => {
+  const handleBlur = () => {
     const internalValidationEnabled = enableInternalError || enableInternalWarning;
     /* istanbul ignore else */
     if (internalValidationEnabled) {
-      const newDatePart = dateValue[datePart];
-      const errorMessage = validations[datePart](newDatePart) ? "" : validationMessages[datePart];
       setInternalMessages(prev => ({
         ...prev,
-        [datePart]: errorMessage
+        ...validate(locale, dateValue)
       }));
     }
     setTimeout(() => {
@@ -239,6 +271,7 @@ export const NumeralDate = ({
       readOnly: readOnly,
       value: dateValue[datePart],
       onChange: e => handleChange(e, datePart),
+      onBlur: handleBlur,
       ref: element => {
         refs.current[index] = element;
         if (!inputRef) {
@@ -250,7 +283,6 @@ export const NumeralDate = ({
           inputRef.current = element;
         }
       },
-      onBlur: () => handleBlur(datePart),
       error: !!internalError,
       warning: !!internalWarning,
       info: !!info

package/esm/locales/__internal__/pl-pl.js

@@ -126,7 +126,12 @@ const plPL = {
   },
   numeralDate: {
     validation: {
-      day: () => "Dzień musi być liczbą w zakresie 1-31.",
+      day: (month, daysInMonth) => {
+        if (month && daysInMonth) {
+          return `Dzień W ${month} musi być liczbą zakresie 1-${daysInMonth}.`;
+        }
+        return "Dzień musi być liczbą w zakresie 1-31.";
+      },
       month: () => "Miesiąć musi być liczbą w zakresie 1-12.",
       year: () => "Rok musi być liczbą w zakresie 1800-2200."
     },

package/esm/locales/en-gb.js

@@ -91,7 +91,12 @@ const enGB = {
   },
   numeralDate: {
     validation: {
-      day: () => "Day should be a number within a 1-31 range.",
+      day: (month, daysInMonth) => {
+        if (month && daysInMonth) {
+          return `Day in ${month} should be a number within 1-${daysInMonth}.`;
+        }
+        return "Day should be a number within a 1-31 range.";
+      },
       month: () => "Month should be a number within a 1-12 range.",
       year: () => "Year should be a number within a 1800-2200 range."
     },

package/esm/locales/locale.d.ts

@@ -74,7 +74,7 @@ interface Locale {
     };
     numeralDate: {
         validation: {
-            day: () => string;
+            day: (month?: string, daysInMonth?: string) => string;
             month: () => string;
             year: () => string;
         };

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

@@ -31,13 +31,52 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 let deprecateUncontrolledWarnTriggered = false;
 const ALLOWED_DATE_FORMATS = exports.ALLOWED_DATE_FORMATS = [["dd", "mm", "yyyy"], ["mm", "dd", "yyyy"], ["yyyy", "mm", "dd"], ["dd", "mm"], ["mm", "dd"], ["mm", "yyyy"]];
 const incorrectDateFormatMessage = "Forbidden prop dateFormat supplied to NumeralDate. " + "Only one of these date formats is allowed: " + "['dd', 'mm', 'yyyy'], " + "['mm', 'dd', 'yyyy'], " + "['yyyy', 'mm', 'dd'], " + "['dd', 'mm'], " + "['mm', 'dd'], " + "['mm', 'yyyy']";
-const isDayValid = day => day ? +day > 0 && +day < 32 : true;
-const isMonthValid = month => month ? +month > 0 && +month < 13 : true;
-const isYearValid = year => year ? +year > 1799 && +year < 2201 : true;
-const validations = {
-  dd: isDayValid,
-  mm: isMonthValid,
-  yyyy: isYearValid
+const getMonthsForLocale = localeName => {
+  const year = new Date().getFullYear();
+  const {
+    format
+  } = new Intl.DateTimeFormat(localeName, {
+    month: "long"
+  });
+  return [...Array(12).keys()].map(m => format(new Date(Date.UTC(year, m))));
+};
+const validationMessages = (locale, month, daysInMonth) => ({
+  dd: locale.numeralDate.validation.day(month ? getMonthsForLocale(locale.locale())[+month - 1] : undefined, daysInMonth),
+  mm: locale.numeralDate.validation.month(),
+  yyyy: locale.numeralDate.validation.year()
+});
+const getDaysInMonth = (month, year) => {
+  if (month && (+month > 12 || +month < 1)) {
+    return 31;
+  }
+  const currentDate = new Date();
+  const computedYear = +(year || currentDate.getFullYear());
+  const computedMonth = +(month || currentDate.getMonth() + 1);
+
+  // passing 0 as the third argument ensures we handle for months being 0 indexed
+  return new Date(computedYear, computedMonth, 0).getDate();
+};
+const validate = (locale, {
+  dd,
+  mm,
+  yyyy
+}) => {
+  const failed = {
+    dd: "",
+    mm: "",
+    yyyy: ""
+  };
+  const daysInMonth = getDaysInMonth(mm, yyyy);
+  if (dd && (+dd > daysInMonth || +dd < 1)) {
+    failed.dd = validationMessages(locale, mm, String(daysInMonth)).dd;
+  }
+  if (mm && (+mm > 12 || +mm < 1)) {
+    failed.mm = validationMessages(locale).mm;
+  }
+  if (yyyy && (+yyyy < 1800 || +yyyy > 2200)) {
+    failed.yyyy = validationMessages(locale).yyyy;
+  }
+  return failed;
 };
 const getDateLabel = (datePart, locale) => {
   switch (datePart) {
@@ -108,11 +147,6 @@ const NumeralDate = ({
     const modeSwitchedMessage = "Input elements should not switch from uncontrolled to controlled (or vice versa). " + "Decide between using a controlled or uncontrolled input element for the lifetime of the component";
     !(isControlled.current === (value !== undefined)) ? process.env.NODE_ENV !== "production" ? (0, _invariant.default)(false, modeSwitchedMessage) : (0, _invariant.default)(false) : void 0;
   }, [value]);
-  const validationMessages = {
-    dd: locale.numeralDate.validation.day(),
-    mm: locale.numeralDate.validation.month(),
-    yyyy: locale.numeralDate.validation.year()
-  };
   const [dateValue, setDateValue] = (0, _react.useState)({
     ...(initialValue || Object.fromEntries(dateFormat.map(datePart => [datePart, ""])))
   });
@@ -146,15 +180,13 @@ const NumeralDate = ({
       }
     }
   };
-  const handleBlur = datePart => {
+  const handleBlur = () => {
     const internalValidationEnabled = enableInternalError || enableInternalWarning;
     /* istanbul ignore else */
     if (internalValidationEnabled) {
-      const newDatePart = dateValue[datePart];
-      const errorMessage = validations[datePart](newDatePart) ? "" : validationMessages[datePart];
       setInternalMessages(prev => ({
         ...prev,
-        [datePart]: errorMessage
+        ...validate(locale, dateValue)
       }));
     }
     setTimeout(() => {
@@ -248,6 +280,7 @@ const NumeralDate = ({
       readOnly: readOnly,
       value: dateValue[datePart],
       onChange: e => handleChange(e, datePart),
+      onBlur: handleBlur,
       ref: element => {
         refs.current[index] = element;
         if (!inputRef) {
@@ -259,7 +292,6 @@ const NumeralDate = ({
           inputRef.current = element;
         }
       },
-      onBlur: () => handleBlur(datePart),
       error: !!internalError,
       warning: !!internalWarning,
       info: !!info

package/lib/locales/__internal__/pl-pl.js

@@ -133,7 +133,12 @@ const plPL = {
   },
   numeralDate: {
     validation: {
-      day: () => "Dzień musi być liczbą w zakresie 1-31.",
+      day: (month, daysInMonth) => {
+        if (month && daysInMonth) {
+          return `Dzień W ${month} musi być liczbą zakresie 1-${daysInMonth}.`;
+        }
+        return "Dzień musi być liczbą w zakresie 1-31.";
+      },
       month: () => "Miesiąć musi być liczbą w zakresie 1-12.",
       year: () => "Rok musi być liczbą w zakresie 1800-2200."
     },

package/lib/locales/en-gb.js

@@ -97,7 +97,12 @@ const enGB = {
   },
   numeralDate: {
     validation: {
-      day: () => "Day should be a number within a 1-31 range.",
+      day: (month, daysInMonth) => {
+        if (month && daysInMonth) {
+          return `Day in ${month} should be a number within 1-${daysInMonth}.`;
+        }
+        return "Day should be a number within a 1-31 range.";
+      },
       month: () => "Month should be a number within a 1-12 range.",
       year: () => "Year should be a number within a 1800-2200 range."
     },

package/lib/locales/locale.d.ts

@@ -74,7 +74,7 @@ interface Locale {
     };
     numeralDate: {
         validation: {
-            day: () => string;
+            day: (month?: string, daysInMonth?: string) => string;
             month: () => string;
             year: () => string;
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-react",
-  "version": "125.0.1",
+  "version": "125.0.2",
   "description": "A library of reusable React components for easily building user interfaces.",
   "files": [
     "lib",