@skyux/core 6.0.0-beta.8 → 6.0.0-beta.9

package/fesm2020/skyux-core.mjs

@@ -116,6 +116,9 @@ class SkyCoreAdapterService {
      * @return Returns `true` if a child element with autofocus is found.
      */
     applyAutoFocus(elementRef) {
+        if (!elementRef) {
+            return false;
+        }
         const elementWithAutoFocus = elementRef.nativeElement.querySelector('[autofocus]');
         // Child was found with the autofocus property. Set focus and return true.
         if (elementWithAutoFocus) {
@@ -138,11 +141,13 @@ class SkyCoreAdapterService {
      */
     getFocusableChildrenAndApplyFocus(elementRef, containerSelector, focusOnContainerIfNoChildrenFound = false) {
         const containerElement = elementRef.nativeElement.querySelector(containerSelector);
-        const focusableChildren = this.getFocusableChildren(containerElement);
-        // Focus first focusable child if available. Otherwise, set focus on container.
-        if (!this.focusFirstElement(focusableChildren) &&
-            focusOnContainerIfNoChildrenFound) {
-            containerElement.focus();
+        if (containerElement) {
+            const focusableChildren = this.getFocusableChildren(containerElement);
+            // Focus first focusable child if available. Otherwise, set focus on container.
+            if (!this.focusFirstElement(focusableChildren) &&
+                focusOnContainerIfNoChildrenFound) {
+                containerElement.focus();
+            }
         }
     }
     /**
@@ -152,6 +157,9 @@ class SkyCoreAdapterService {
      * @param options - Options for getting focusable children.
      */
     getFocusableChildren(element, options) {
+        if (!element) {
+            return [];
+        }
         let elements = Array.prototype.slice.call(element.querySelectorAll(SKY_TABBABLE_SELECTOR));
         // Unless ignoreTabIndex = true, filter out elements with tabindex = -1.
         if (!options || !options.ignoreTabIndex) {