@lumx/react 3.9.4-alpha.0 → 3.9.4-alpha.1

package/index.js

@@ -12125,11 +12125,11 @@ function useKeyNavigate(element, onNext, onPrevious) {
 }
 
 /**
- * Classname set on elements whose focus was blocked.
+ * Data attribute set on elements whose focus was blocked.
  * This is to easily find elements that have been tempered with,
  * and not elements whose focus was already initially blocked.
- * */
-const BLOCKED_FOCUS_CLASSNAME = 'focus-blocked';
+ */
+const BLOCKED_FOCUS = 'data-focus-blocked';
 
 /**
  * Manage how slides must behave when visible or not.
@@ -12141,91 +12141,88 @@ const useSlideFocusManagement = _ref => {
     slidesRef
   } = _ref;
   const [slide, setSlide] = React__default.useState(null);
-  useEffect(() => {
-    var _slidesRef$current;
+  const [focusableElementSet, setFocusableElementSet] = React__default.useState();
+  React__default.useEffect(() => {
     if (!slide) {
       return undefined;
     }
-    const isUserActivated = (slidesRef === null || slidesRef === void 0 ? void 0 : (_slidesRef$current = slidesRef.current) === null || _slidesRef$current === void 0 ? void 0 : _slidesRef$current.dataset.lumxUserActivated) === 'true';
-    let focusableElements = [];
-
-    /**
-     * Display given slide to screen readers and, if focus was blocked, restore focus on elements.
-     */
-    const enableSlide = () => {
-      slide.removeAttribute('inert');
-      slide.setAttribute('aria-hidden', 'false');
-      // Find elements we have blocked focus on
-      // (won't be necessary once "inert" gets sufficient browser support)
-      focusableElements = Array.from(slide.querySelectorAll(`.${BLOCKED_FOCUS_CLASSNAME}`));
-      for (const focusableElement of focusableElements) {
-        focusableElement.removeAttribute('tabindex');
-        focusableElement.classList.remove(BLOCKED_FOCUS_CLASSNAME);
+    // Update the slide's focusable element list (including the blocked elements)
+    const updateFocusableElements = () => setFocusableElementSet(function () {
+      let set = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Set();
+      // TODO: remove when `inert` gets sufficient browser support
+      const focusedBlocked = Array.from(slide.querySelectorAll(`[${BLOCKED_FOCUS}]`));
+      for (const element of focusedBlocked) {
+        set.add(element);
       }
-    };
+      for (const element of getFocusableElements(slide)) {
+        set.add(element);
+      }
+      return set;
+    });
 
-    /**
-     * Hide given slide from screen readers and block focus on all focusable elements within.
-     */
-    const blockSlide = () => {
+    // Observe changes in the content of the slide
+    const observer = new MutationObserver(mutationsList => {
+      if (mutationsList.some(mutation => mutation.type === 'childList')) {
+        updateFocusableElements();
+      }
+    });
+    updateFocusableElements();
+    observer.observe(slide, {
+      attributes: true,
+      childList: true,
+      subtree: true
+    });
+    return observer.disconnect();
+  }, [slide]);
+  useEffect(() => {
+    if (!slide || !focusableElementSet) {
+      return;
+    }
+    const focusableElements = Array.from(focusableElementSet);
+    if (!isSlideDisplayed) {
+      /* Block slide */
       slide.setAttribute('inert', '');
       slide.setAttribute('aria-hidden', 'true');
-      focusableElements = getFocusableElements(slide);
+
+      // TODO: remove when `inert` gets sufficient browser support
       for (const focusableElement of focusableElements) {
         focusableElement.setAttribute('tabindex', '-1');
-        focusableElement.classList.add(BLOCKED_FOCUS_CLASSNAME);
+        focusableElement.setAttribute(BLOCKED_FOCUS, '');
       }
-    };
-    const handleDisplay = () => {
-      if (isSlideDisplayed) {
-        enableSlide();
-      } else {
-        blockSlide();
-      }
-    };
+    } else {
+      var _slidesRef$current;
+      /* Un-block slide */
+      slide.removeAttribute('inert');
+      slide.removeAttribute('aria-hidden');
 
-    // Create an observer instance linked to the callback function
-    // (won't be necessary once "inert" gets sufficient browser support)
-    const observer = new MutationObserver(mutationsList => {
-      for (const mutation of mutationsList) {
-        if (mutation.type === 'childList') {
-          handleDisplay();
-        }
+      // TODO: remove when `inert` gets sufficient browser support
+      for (const focusableElement of focusableElements) {
+        focusableElement.removeAttribute('tabindex');
+        focusableElement.removeAttribute(BLOCKED_FOCUS);
       }
-    });
-    handleDisplay();
 
-    // Change focus on slide displayed
-    if (isSlideDisplayed && isUserActivated) {
-      var _elementToFocus;
-      let elementToFocus = slide;
+      // Change focus on slide displayed
+      const isUserActivated = (slidesRef === null || slidesRef === void 0 ? void 0 : (_slidesRef$current = slidesRef.current) === null || _slidesRef$current === void 0 ? void 0 : _slidesRef$current.dataset.lumxUserActivated) === 'true';
+      if (isUserActivated) {
+        var _elementToFocus;
+        let elementToFocus = slide;
 
-      // We have exactly one focusable element => focus it
-      if (focusableElements.length === 1) {
-        // eslint-disable-next-line prefer-destructuring
-        elementToFocus = focusableElements[0];
-      }
+        // We have exactly one focusable element => focus it
+        if (focusableElementSet.size === 1) {
+          // eslint-disable-next-line prefer-destructuring
+          elementToFocus = focusableElements[0];
+        }
 
-      // We have not focusable element => focus the pagination item
-      if (focusableElements.length === 0) {
-        elementToFocus = document.querySelector(`[aria-controls="${slide === null || slide === void 0 ? void 0 : slide.id}"]`);
+        // We have not focusable element => focus the pagination item
+        if (focusableElementSet.size === 0) {
+          elementToFocus = document.querySelector(`[aria-controls="${slide === null || slide === void 0 ? void 0 : slide.id}"]`);
+        }
+        (_elementToFocus = elementToFocus) === null || _elementToFocus === void 0 ? void 0 : _elementToFocus.focus({
+          preventScroll: true
+        });
       }
-      (_elementToFocus = elementToFocus) === null || _elementToFocus === void 0 ? void 0 : _elementToFocus.focus({
-        preventScroll: true
-      });
     }
-
-    /** If slide is hidden, start observing for elements to block focus  */
-    if (!isSlideDisplayed) {
-      observer.observe(slide, {
-        attributes: true,
-        childList: true,
-        subtree: true
-      });
-      return () => observer.disconnect();
-    }
-    return undefined;
-  }, [isSlideDisplayed, slide, slidesRef]);
+  }, [focusableElementSet, isSlideDisplayed, slide, slidesRef]);
   return setSlide;
 };