@snapdragonsnursery/react-components 1.19.3 → 1.19.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snapdragonsnursery/react-components",
-  "version": "1.19.3",
+  "version": "1.19.4",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/ChildSearchModal.jsx

@@ -379,12 +379,56 @@ const ChildSearchModal = ({
     let displayYears = numericYears;
     let displayMonths = numericMonths;
 
-    if (displayMonths !== null && displayMonths >= 12) {
-      const additionalYears = Math.floor(displayMonths / 12);
-      if (additionalYears > 0) {
-        displayYears = (displayYears ?? 0) + additionalYears;
-        displayMonths = displayMonths % 12;
+    const normaliseMonths = (yearsValue, monthsValue) => {
+      if (monthsValue === null || Number.isNaN(monthsValue)) return null;
+      if (yearsValue === null || Number.isNaN(yearsValue)) {
+        return {
+          years: Math.floor(monthsValue / 12),
+          months: monthsValue % 12,
+        };
       }
+
+      const expectedMonthsTotal = yearsValue * 12;
+      let remainder = monthsValue;
+
+      if (remainder >= expectedMonthsTotal) {
+        remainder = remainder - expectedMonthsTotal;
+      }
+
+      if (remainder >= 12) {
+        remainder = remainder % 12;
+      }
+
+      if (remainder < 0) {
+        remainder = 0;
+      }
+
+      return {
+        years: yearsValue,
+        months: remainder,
+      };
+    };
+
+    if (displayMonths !== null && !Number.isNaN(displayMonths)) {
+      const normalised = normaliseMonths(
+        displayYears ?? null,
+        displayMonths ?? null
+      );
+
+      if (normalised) {
+        displayYears =
+          normalised.years !== undefined ? normalised.years : displayYears;
+        displayMonths = normalised.months ?? null;
+      }
+    }
+
+    if (
+      (displayYears === null || Number.isNaN(displayYears)) &&
+      displayMonths !== null &&
+      displayMonths >= 12
+    ) {
+      displayYears = Math.floor(displayMonths / 12);
+      displayMonths = displayMonths % 12;
     }
 
     const parts = [];