Merge pull request #16107 from primefaces/issue-16106

Fixed #16106 - Password | Tooltip with tooltipEvent='focus' is never …
primefaces · Aug 1, 2024 · 9eee5df · 9eee5df
2 parents 4016d6d + 9ae775f
commit 9eee5df
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/src/app/components/tooltip/tooltip.ts b/src/app/components/tooltip/tooltip.ts
@@ -185,11 +185,7 @@ export class Tooltip implements AfterViewInit, OnDestroy {
                     this.focusListener = this.onFocus.bind(this);
                     this.blurListener = this.onBlur.bind(this);
 
-                    let target = this.el.nativeElement.querySelector('.p-component');
-
-                    if (!target) {
-                        target = this.getTarget(this.el.nativeElement);
-                    }
+                    let target = this.getTarget(this.el.nativeElement);
 
                     target.addEventListener('focus', this.focusListener);
                     target.addEventListener('blur', this.blurListener);
@@ -605,7 +601,7 @@ export class Tooltip implements AfterViewInit, OnDestroy {
     }
 
     getTarget(el: Element) {
-        return DomHandler.hasClass(el, 'p-inputwrapper') ? DomHandler.findSingle(el, 'input') : el;
+        return DomHandler.hasClass(el, 'p-inputwrapper') ? DomHandler.findSingle(el, 'input') : el.querySelector('.p-component') || el;
     }
 
     preAlign(position: string) {
@@ -672,11 +668,9 @@ export class Tooltip implements AfterViewInit, OnDestroy {
             this.el.nativeElement.removeEventListener('click', this.clickListener);
         }
         if (tooltipEvent === 'focus' || tooltipEvent === 'both') {
-            let target = this.el.nativeElement.querySelector('.p-component');
-
-            if (!target) {
-                target = this.getTarget(this.el.nativeElement);
-            }
+
+             let target = this.getTarget(this.el.nativeElement);
+
 
             target.removeEventListener('focus', this.focusListener);
             target.removeEventListener('blur', this.blurListener);
@@ -740,3 +734,4 @@ export class Tooltip implements AfterViewInit, OnDestroy {
     declarations: [Tooltip]
 })
 export class TooltipModule {}
+