Merge pull request #15808 from rosenthalj/SemiFixAdvanceFilter

Fixed #15804 - Advance Filtering is broken (revert PR #15594 changes)
primefaces · Jun 13, 2024 · 85275a9 · 85275a9
2 parents 8088fb9 + b48aaaa
commit 85275a9
Showing 1 changed file with 0 additions and 17 deletions.
diff --git a/src/app/components/table/table.ts b/src/app/components/table/table.ts
@@ -5395,8 +5395,6 @@ export class ColumnFilter implements AfterContentInit {
 
     overlayId: any;
 
-    applyHasBeenClicked: boolean = false;
-
     get fieldConstraints(): FilterMetadata[] | undefined | null {
         return this.dt.filters ? <FilterMetadata[]>this.dt.filters[<string>this.field] : null;
     }
@@ -5651,11 +5649,6 @@ export class ColumnFilter implements AfterContentInit {
     }
 
     onEscape() {
-        if (this.hasFilterNotBeenApplied()) {
-            this.clearFilter();
-        }
-        this.applyHasBeenClicked = false;
-        this.overlayVisible = false;
         this.icon?.nativeElement.focus();
     }
 
@@ -5755,10 +5748,6 @@ export class ColumnFilter implements AfterContentInit {
         return false;
     }
 
-    hasFilterNotBeenApplied(): boolean {
-        return this.hasFilter() && !this.applyHasBeenClicked;
-    }
-
     isOutsideClicked(event: any): boolean {
         return !(
             DomHandler.hasClass(this.overlay?.nextElementSibling, 'p-overlay') ||
@@ -5833,10 +5822,6 @@ export class ColumnFilter implements AfterContentInit {
     }
 
     hide() {
-        if (this.hasFilterNotBeenApplied()) {
-            this.clearFilter();
-        }
-        this.applyHasBeenClicked = false;
         this.overlayVisible = false;
         this.cd.markForCheck();
     }
@@ -5849,14 +5834,12 @@ export class ColumnFilter implements AfterContentInit {
     }
 
     clearFilter() {
-        this.applyHasBeenClicked = false;
         this.initFieldFilterConstraint();
         this.dt._filter();
         if (this.hideOnClear) this.hide();
     }
 
     applyFilter() {
-        this.applyHasBeenClicked = true;
         this.dt._filter();
         this.hide();
     }