Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/primefaces/primeng
Browse files Browse the repository at this point in the history
  • Loading branch information
cetincakiroglu committed Nov 22, 2023
2 parents 3d437c9 + 777a428 commit fe5b8b9
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
5 changes: 3 additions & 2 deletions src/app/components/calendar/calendar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3329,9 +3329,10 @@ export class Calendar implements OnInit, OnDestroy, ControlValueAccessor {
}

onTodayButtonClick(event: any) {
let date: Date = new Date();
let dateMeta = { day: date.getDate(), month: date.getMonth(), year: date.getFullYear(), otherMonth: date.getMonth() !== this.currentMonth || date.getFullYear() !== this.currentYear, today: true, selectable: true };
const date: Date = new Date();
const dateMeta = { day: date.getDate(), month: date.getMonth(), year: date.getFullYear(), otherMonth: date.getMonth() !== this.currentMonth || date.getFullYear() !== this.currentYear, today: true, selectable: true };

this.createMonths(date.getMonth(), date.getFullYear());
this.onDateSelect(event, dateMeta);
this.onTodayClick.emit(event);
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/multiselect/multiselect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1352,7 +1352,7 @@ export class MultiSelect implements OnInit, AfterViewInit, AfterContentInit, Aft
}

isEmpty() {
return !this._options() || (this._options() && this._options().length === 0);
return !this._options() || (this.visibleOptions() && this.visibleOptions().length === 0);
}

getOptionIndex(index, scrollerOptions) {
Expand Down
6 changes: 3 additions & 3 deletions src/app/components/table/table.css
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
.p-datatable-scrollable-table > .p-datatable-thead {
position: sticky;
top: 0;
z-index: 1;
z-index: 2;
}

.p-datatable-scrollable-table > .p-datatable-frozen-tbody {
Expand Down Expand Up @@ -84,7 +84,7 @@

.p-datatable-scrollable-table > .p-datatable-tbody > .p-rowgroup-header {
position: sticky;
z-index: 1;
z-index: 2;
}

/* Resizable */
Expand Down Expand Up @@ -163,7 +163,7 @@
display: flex;
align-items: center;
justify-content: center;
z-index: 2;
z-index: 3;
}

/* Filter */
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/table/table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5653,7 +5653,7 @@ export class ColumnFilterFormElement implements OnInit {
onModelChange(value: any) {
(<any>this.filterConstraint).value = value;

if (this.type === 'boolean' || value === '') {
if (this.type === 'date' || this.type === 'boolean' || value === '') {
this.dt._filter();
}
}
Expand Down

1 comment on commit fe5b8b9

@vercel
Copy link

@vercel vercel bot commented on fe5b8b9 Nov 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.