Merge pull request #12530 from mmorgan4x/focus-trap-anchor-fix

fixed: issue where focustrap was skipping over anchor tags when tabbing #12527
primefaces · Jan 26, 2023 · addafba · addafba
2 parents b6cfb8c + a6babe0
commit addafba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/app/components/dom/domhandler.spec.ts b/src/app/components/dom/domhandler.spec.ts
@@ -66,12 +66,15 @@ describe('DomHandler', () => {
         const element = document.createElement('div');
         const childEl = document.createElement('p');
         const childEl2 = document.createElement('a');
-        const childEl3 = document.createElement('button');
+        const childEl3 = document.createElement('a');
+        const childEl4 = document.createElement('button');
+        childEl2.setAttribute('href', 'https://www.primefaces.org/primeng/');
         element.appendChild(childEl);
         element.appendChild(childEl2);
         element.appendChild(childEl3);
+        element.appendChild(childEl4);
         document.body.appendChild(element);
-        expect(DomHandler.getFocusableElements(element).length).toEqual(1);
+        expect(DomHandler.getFocusableElements(element).length).toEqual(2);
     });
 
     it('should get the next focusable element', () => {

diff --git a/src/app/components/dom/domhandler.ts b/src/app/components/dom/domhandler.ts
@@ -607,7 +607,7 @@ export class DomHandler {
         let focusableElements = DomHandler.find(
             element,
             `button:not([tabindex = "-1"]):not([disabled]):not([style*="display:none"]):not([hidden]),
-                [href][clientHeight][clientWidth]:not([tabindex = "-1"]):not([disabled]):not([style*="display:none"]):not([hidden]),
+                [href]:not([tabindex = "-1"]):not([disabled]):not([style*="display:none"]):not([hidden]),
                 input:not([tabindex = "-1"]):not([disabled]):not([style*="display:none"]):not([hidden]), select:not([tabindex = "-1"]):not([disabled]):not([style*="display:none"]):not([hidden]),
                 textarea:not([tabindex = "-1"]):not([disabled]):not([style*="display:none"]):not([hidden]), [tabIndex]:not([tabIndex = "-1"]):not([disabled]):not([style*="display:none"]):not([hidden]),
                 [contenteditable]:not([tabIndex = "-1"]):not([disabled]):not([style*="display:none"]):not([hidden]):not(.p-disabled)`