Merge pull request #14781 from eduardheller89/master

Fix #14590 and #12286 - Single dates not possible with calendar in range mode
primefaces · Mar 22, 2024 · 57d2950 · 57d2950
2 parents b72fb02 + ec3ca82
commit 57d2950
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/app/components/calendar/calendar.ts b/src/app/components/calendar/calendar.ts
@@ -2747,16 +2747,13 @@ export class Calendar implements OnInit, OnDestroy, ControlValueAccessor {
     }
 
     isValidSelection(value: any): boolean {
-        let isValid = true;
         if (this.isSingleSelection()) {
-            if (!this.isSelectable(value.getDate(), value.getMonth(), value.getFullYear(), false)) {
-                isValid = false;
-            }
-        } else if (value.every((v: any) => this.isSelectable(v.getDate(), v.getMonth(), v.getFullYear(), false))) {
-            if (this.isRangeSelection()) {
-                isValid = value.length > 1 && value[1] > value[0] ? true : false;
-            }
-        }
+            return this.isSelectable(value.getDate(), value.getMonth(), value.getFullYear(), false);
+        } 
+		let isValid = value.every((v: any) => this.isSelectable(v.getDate(), v.getMonth(), v.getFullYear(), false));
+		if (isValid && this.isRangeSelection()) {
+			isValid = value.length === 1 || (value.length > 1 && value[1] >= value[0]);
+		}
         return isValid;
     }