diff --git a/src/app/components/contextmenu/contextmenu.ts b/src/app/components/contextmenu/contextmenu.ts index 244b020b379..f4b223aa84a 100755 --- a/src/app/components/contextmenu/contextmenu.ts +++ b/src/app/components/contextmenu/contextmenu.ts @@ -931,7 +931,6 @@ export class ContextMenu implements OnInit, AfterContentInit, OnDestroy { this.moveOnTop(); this.appendOverlay(); this.bindGlobalListeners(); - this.onShow.emit(); DomHandler.focus(this.rootmenu.sublistViewChild.nativeElement); break; } @@ -970,7 +969,6 @@ export class ContextMenu implements OnInit, AfterContentInit, OnDestroy { } this.container = null; - this.onHide.emit(); } onTouchStart(event: MouseEvent) { @@ -985,6 +983,7 @@ export class ContextMenu implements OnInit, AfterContentInit, OnDestroy { hide() { this.visible.set(false); + this.onHide.emit(); this.activeItemPath.set([]); this.focusedItemInfo.set({ index: -1, level: 0, parentKey: '', item: null }); } @@ -1000,6 +999,7 @@ export class ContextMenu implements OnInit, AfterContentInit, OnDestroy { this.pageX = event.pageX; this.pageY = event.pageY; + this.onShow.emit(); this.visible() ? this.position() : this.visible.set(true); event.stopPropagation(); diff --git a/src/app/components/table/table.ts b/src/app/components/table/table.ts index 3f8c1234b09..1231926c4df 100644 --- a/src/app/components/table/table.ts +++ b/src/app/components/table/table.ts @@ -5455,7 +5455,9 @@ export class ColumnFilter implements AfterContentInit { removeConstraint(filterMeta: FilterMetadata) { this.dt.filters[this.field] = (this.dt.filters[this.field]).filter((meta) => meta !== filterMeta); - this.dt._filter(); + if (!this.showApplyButton) { + this.dt._filter(); + } DomHandler.focus(this.clearButtonViewChild.nativeElement); }