Merge branch 'master' of https://github.com/primefaces/primeng

primefaces · Dec 17, 2024 · 8d31eb3 · 8d31eb3
2 parents 3fc8630 + e144f91
commit 8d31eb3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/primeng/src/inputmask/style/inputmaskstyle.ts b/packages/primeng/src/inputmask/style/inputmaskstyle.ts
@@ -6,7 +6,7 @@ p-inputmask {
     position: relative;
 }
 
-.p-icon-wrapper {
+.p-inputmask-clear-icon {
     position: absolute;
     top: 50%;
     margin-top: -0.5rem;

diff --git a/packages/primeng/src/table/table.ts b/packages/primeng/src/table/table.ts
@@ -38,7 +38,7 @@ import { FormsModule } from '@angular/forms';
 import { BlockableUI, FilterMatchMode, FilterMetadata, FilterOperator, FilterService, LazyLoadMeta, OverlayService, PrimeTemplate, ScrollerOptions, SelectItem, SharedModule, SortMeta, TableState, TranslationKeys } from 'primeng/api';
 import { BaseComponent } from 'primeng/basecomponent';
 import { Button, ButtonModule } from 'primeng/button';
-import { CalendarModule } from 'primeng/calendar';
+import { DatePickerModule } from 'primeng/datepicker';
 import { CheckboxModule } from 'primeng/checkbox';
 import { ConnectedOverlayScrollHandler, DomHandler } from 'primeng/dom';
 import { ArrowDownIcon } from 'primeng/icons/arrowdown';
@@ -6176,7 +6176,7 @@ export class ColumnFilter extends BaseComponent implements AfterContentInit {
                 ></p-inputNumber>
                 <p-checkbox [indeterminate]="true" [binary]="true" *ngSwitchCase="'boolean'" [ngModel]="filterConstraint?.value" (ngModelChange)="onModelChange($event)" />
 
-                <p-calendar [ariaLabel]="ariaLabel" *ngSwitchCase="'date'" [placeholder]="placeholder" [ngModel]="filterConstraint?.value" (ngModelChange)="onModelChange($event)" appendTo="body"></p-calendar>
+                <p-datepicker [ariaLabel]="ariaLabel" *ngSwitchCase="'date'" [placeholder]="placeholder" [ngModel]="filterConstraint?.value" (ngModelChange)="onModelChange($event)" appendTo="body"></p-datepicker>
             </ng-container>
         </ng-template>
     `,
@@ -6263,7 +6263,7 @@ export class ColumnFilterFormElement implements OnInit {
         FormsModule,
         ButtonModule,
         SelectButtonModule,
-        CalendarModule,
+        DatePickerModule,
         InputNumberModule,
         CheckboxModule,
         ScrollerModule,