Fix primefaces#5863: Calendar enabledDates evaluated last

melloware · Jan 31, 2024 · 4ba6808 · 4ba6808
1 parent ad59eb0
commit 4ba6808
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/components/lib/calendar/Calendar.js b/components/lib/calendar/Calendar.js
@@ -2286,26 +2286,34 @@ export const Calendar = React.memo(
         };
 
         const isDayDisabled = (day, month, year) => {
+            let isDisabled = false;
+
+            // first check for disabled dates
             if (props.disabledDates) {
                 if (props.disabledDates.some((d) => d.getFullYear() === year && d.getMonth() === month && d.getDate() === day)) {
-                    return true;
-                }
-            } else if (props.enabledDates) {
-                if (!props.enabledDates.some((d) => d.getFullYear() === year && d.getMonth() === month && d.getDate() === day)) {
-                    return true;
+                    isDisabled = true;
                 }
             }
 
-            if (props.disabledDays && currentView === 'date') {
+            // next if not disabled then check for disabled days
+            if (!isDisabled && props.disabledDays && currentView === 'date') {
                 let weekday = new Date(year, month, day);
                 let weekdayNumber = weekday.getDay();
 
                 if (props.disabledDays.indexOf(weekdayNumber) !== -1) {
-                    return true;
+                    isDisabled = true;
                 }
             }
 
-            return false;
+            // last check for enabled dates to force dates enabled
+            if (props.enabledDates) {
+                // possible re-enable already disabled date
+                if (props.enabledDates.some((d) => d.getFullYear() === year && d.getMonth() === month && d.getDate() === day)) {
+                    isDisabled = !isDisabled;
+                }
+            }
+
+            return isDisabled;
         };
 
         const isMonthYearDisabled = (month, year) => {