Merge pull request #5884 from KumJungMin/fix/range-picker-year

fix(DatePicker): highlight range of year in yearMode
primefaces · Jun 27, 2024 · 064e172 · 064e172
2 parents c70a9e8 + 9393704
commit 064e172
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/packages/primevue/src/datepicker/DatePicker.vue b/packages/primevue/src/datepicker/DatePicker.vue
@@ -736,17 +736,18 @@ export default {
             }
         },
         isYearSelected(year) {
-            if (this.isComparable()) {
-                let value = this.isRangeSelection() ? this.modelValue[0] : this.modelValue;
+            if (!this.isComparable()) return false;
 
-                if (this.isMultipleSelection()) {
-                    return value.some((currentValue) => currentValue.getFullYear() === year);
-                } else {
-                    return value.getFullYear() === year;
-                }
-            }
+            if (this.isMultipleSelection()) {
+                return this.modelValue.some((currentValue) => currentValue.getFullYear() === year);
+            } else if (this.isRangeSelection()) {
+                const start = this.modelValue[0] ? this.modelValue[0].getFullYear() : null;
+                const end = this.modelValue[1] ? this.modelValue[1].getFullYear() : null;
 
-            return false;
+                return start === year || end === year || (start < year && end > year);
+            } else {
+                return value.getFullYear() === year;
+            }
         },
         isDateEquals(value, dateMeta) {
             if (value) return value.getDate() === dateMeta.day && value.getMonth() === dateMeta.month && value.getFullYear() === dateMeta.year;