Checking element exists before focusing it

Fixes #737
liferay · May 18, 2017 · a1a894c · a1a894c
1 parent 99e1652
commit a1a894c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/ui/react/src/components/base/widget-focus-manager.js b/src/ui/react/src/components/base/widget-focus-manager.js
@@ -96,7 +96,7 @@
                     // is no need to focus it. Focusing of the active descendant (usually some button) is required
                     // in case of keyboard navigation, because the focused element might be not the first button,
                     // but the div element, which contains the button.
-                    if (document.activeElement !== activeDescendantEl && !this.props.focusFirstChild) {
+                    if (activeDescendantEl && document.activeElement !== activeDescendantEl && !this.props.focusFirstChild) {
                         if (this._descendants.indexOf(document.activeElement) === -1) {
                             activeDescendantEl.focus();
                         }