@lumx/react 3.6.7-alpha.5 → 3.6.7-alpha.7

package/index.js

@@ -2668,8 +2668,7 @@ const DISABLED_SELECTOR = `[hidden], [tabindex="-1"], [disabled]:not([disabled="
 
 const isNotDisabled = element => !element.matches(DISABLED_SELECTOR);
 function getFocusableElements(element) {
-  const focusableElements = element.shadowRoot ? getFocusableElements(element.shadowRoot) : Array.from(element.querySelectorAll(TABBABLE_ELEMENTS_SELECTOR)).filter(isNotDisabled);
-  return focusableElements;
+  return Array.from(element.querySelectorAll(TABBABLE_ELEMENTS_SELECTOR)).filter(isNotDisabled);
 }
 
 /**
@@ -2713,6 +2712,7 @@ function useFocusTrap(focusZoneElement, focusElement) {
     if (!rootElement || !focusZoneElement) {
       return undefined;
     }
+    const focusZoneElementOrShadowRoot = focusZoneElement.shadowRoot || focusZoneElement;
 
     // Trap 'Tab' key down focus switch into the focus zone.
     const trapTabFocusInFocusZone = evt => {
@@ -2722,7 +2722,7 @@ function useFocusTrap(focusZoneElement, focusElement) {
       if (key !== 'Tab') {
         return;
       }
-      const focusable = getFirstAndLastFocusable(focusZoneElement);
+      const focusable = getFirstAndLastFocusable(focusZoneElementOrShadowRoot);
 
       // Prevent focus switch if no focusable available.
       if (!focusable.first) {
@@ -2730,14 +2730,18 @@ function useFocusTrap(focusZoneElement, focusElement) {
         return;
       }
       const activeElement = focusZoneElement.shadowRoot ? focusZoneElement.shadowRoot.activeElement : document.activeElement;
-      console.log('active', activeElement);
+      console.log('data', {
+        activeElement,
+        focusable,
+        focusZoneElementOrShadowRoot
+      });
       if (
       // No previous focus
       !activeElement ||
       // Previous focus is at the end of the focus zone.
       !evt.shiftKey && activeElement === focusable.last ||
       // Previous focus is outside the focus zone
-      !focusZoneElement.contains(activeElement)) {
+      !focusZoneElementOrShadowRoot.contains(activeElement)) {
         focusable.first.focus();
         evt.preventDefault();
         return;
@@ -2757,7 +2761,7 @@ function useFocusTrap(focusZoneElement, focusElement) {
     };
 
     // SETUP:
-    if (focusElement && focusZoneElement.contains(focusElement)) {
+    if (focusElement && focusZoneElementOrShadowRoot.contains(focusElement)) {
       // Focus the given element.
       focusElement.focus({
         preventScroll: true
@@ -2765,7 +2769,7 @@ function useFocusTrap(focusZoneElement, focusElement) {
     } else {
       var _getFirstAndLastFocus;
       // Focus the first focusable element in the zone.
-      (_getFirstAndLastFocus = getFirstAndLastFocusable(focusZoneElement).first) === null || _getFirstAndLastFocus === void 0 ? void 0 : _getFirstAndLastFocus.focus({
+      (_getFirstAndLastFocus = getFirstAndLastFocusable(focusZoneElementOrShadowRoot).first) === null || _getFirstAndLastFocus === void 0 ? void 0 : _getFirstAndLastFocus.focus({
         preventScroll: true
       });
     }