fix: #13695 || Calendar: disabledDate Template Broken

primefaces · Sep 25, 2023 · fa3cca6 · fa3cca6
1 parent 396297a
commit fa3cca6
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/app/components/calendar/calendar.ts b/src/app/components/calendar/calendar.ts
@@ -173,8 +173,13 @@ export const CALENDAR_VALUE_ACCESSOR: any = {
                                             <td *ngFor="let date of week" [ngClass]="{ 'p-datepicker-other-month': date.otherMonth, 'p-datepicker-today': date.today }">
                                                 <ng-container *ngIf="date.otherMonth ? showOtherMonths : true">
                                                     <span [ngClass]="{ 'p-highlight': isSelected(date), 'p-disabled': !date.selectable }" (click)="onDateSelect($event, date)" draggable="false" (keydown)="onDateCellKeydown($event, date, i)" pRipple>
-                                                        <ng-container *ngIf="!dateTemplate">{{ date.day }}</ng-container>
-                                                        <ng-container *ngTemplateOutlet="dateTemplate; context: { $implicit: date }"></ng-container>
+                                                        <ng-container *ngIf="!dateTemplate && (date.selectable || !disabledDateTemplate)">{{ date.day }}</ng-container>
+                                                         <ng-container *ngIf="date.selectable || !disabledDateTemplate">
+                                                            <ng-container *ngTemplateOutlet="dateTemplate; context: { $implicit: date }"></ng-container>
+                                                         </ng-container>
+                                                        <ng-container *ngIf="!date.selectable">
+                                                            <ng-container *ngTemplateOutlet="disabledDateTemplate; context: { $implicit: date }"></ng-container>
+                                                        </ng-container>
                                                     </span>
                                                 </ng-container>
                                             </td>