Merge pull request #19 from navedqb/4824--fix-console-log-errors-in-i…

…nplace fix: Improve focusable element handling
qburst · Nov 15, 2023 · ae90cc0 · ae90cc0
2 parents 1ae9ef3 + 186e91b
commit ae90cc0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/components/lib/focustrap/FocusTrap.js b/components/lib/focustrap/FocusTrap.js
@@ -40,7 +40,7 @@ const FocusTrap = BaseFocusTrap.extend('focustrap', {
                                     : DomHandler.getFirstFocusableElement(el, this.getComputedSelector(el.$_pfocustrap_focusableselector))
                                 : DomHandler.getFirstFocusableElement(_el);
 
-                            return ObjectUtils.isNotEmpty(focusableElement) ? focusableElement : findNextFocusableElement(_el.nextSibling);
+                            return ObjectUtils.isNotEmpty(focusableElement) ? focusableElement : _el.nextSibling ? findNextFocusableElement(_el.nextSibling) : null;
                         };
 
                         DomHandler.focus(findNextFocusableElement(mutation.nextSibling));