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

package/index.js

@@ -2680,7 +2680,6 @@ function getFocusableElements(element) {
  */
 function getFirstAndLastFocusable(parentElement) {
   const focusableElements = getFocusableElements(parentElement);
-  console.log('focusableElements', focusableElements);
 
   // First non disabled element.
   const first = focusableElements[0];
@@ -2724,26 +2723,21 @@ function useFocusTrap(focusZoneElement, focusElement) {
         return;
       }
       const focusable = getFirstAndLastFocusable(focusZoneElement);
-      console.log('data', {
-        focusable,
-        activeElement: document.activeElement,
-        endOfFocusZone: !evt.shiftKey && document.activeElement === focusable.last,
-        isInFocusZone: focusZoneElement.contains(document.activeElement)
-      });
 
       // Prevent focus switch if no focusable available.
       if (!focusable.first) {
         evt.preventDefault();
         return;
       }
+      const activeElement = focusZoneElement.shadowRoot ? focusZoneElement.shadowRoot.activeElement : document.activeElement;
+      console.log('active', activeElement);
       if (
       // No previous focus
-      !document.activeElement ||
+      !activeElement ||
       // Previous focus is at the end of the focus zone.
-      !evt.shiftKey && document.activeElement === focusable.last ||
+      !evt.shiftKey && activeElement === focusable.last ||
       // Previous focus is outside the focus zone
-      !focusZoneElement.contains(document.activeElement)) {
-        console.log('focus first');
+      !focusZoneElement.contains(activeElement)) {
         focusable.first.focus();
         evt.preventDefault();
         return;
@@ -2752,7 +2746,7 @@ function useFocusTrap(focusZoneElement, focusElement) {
       // Focus order reversed
       evt.shiftKey &&
       // Previous focus is at the start of the focus zone.
-      document.activeElement === focusable.first) {
+      activeElement === focusable.first) {
         focusable.last.focus();
         evt.preventDefault();
       }