fix: focus on IE for SVG (#721)

SAP · Aug 9, 2019 · 52517c4 · 52517c4
1 parent 1357c16
commit 52517c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/base/src/FocusHelper.js b/packages/base/src/FocusHelper.js
@@ -65,12 +65,12 @@ class FocusHelper {
 
 			if (child.nodeType === 1 && !FocusHelper.isHidden(child)) {
 				if (FocusHelper.hasTabIndex(child)) {
-					return child;
+					return (child && typeof child.focus === "function") ? child : null;
 				}
 
 				focusableDescendant = FocusHelper.findFocusableElement(child, forward);
 				if (focusableDescendant) {
-					return focusableDescendant;
+					return (focusableDescendant && typeof focusableDescendant.focus === "function") ? focusableDescendant : null;
 				}
 			}
 

diff --git a/packages/main/src/Popup.js b/packages/main/src/Popup.js
@@ -421,7 +421,7 @@ class Popup extends UI5Element {
 			element = element.shadowRoot.activeElement;
 		}
 
-		this._lastFocusableElement = element;
+		this._lastFocusableElement = (element && typeof element.focus === "function") ? element : null;
 	}
 
 	resetFocus() {