@adamjanicki/ui 1.3.2 → 1.3.4

package/hooks/useFocusTrap.d.ts

@@ -2,7 +2,8 @@
  * A hook for trapping focus within an element.
  *
  * @param isActive true if the element is active, false otherwise
+ * `true` by default
  * @returns ref object that must be passed to the element that should be trapped
  */
-declare const useFocusTrap: <T extends HTMLElement>(isActive: boolean) => import("react").MutableRefObject<T | null>;
+declare const useFocusTrap: <T extends HTMLElement>(isActive?: boolean) => import("react").MutableRefObject<T | null>;
 export default useFocusTrap;

package/hooks/useFocusTrap.js

@@ -1,44 +1,57 @@
-import { useEffect, useRef, useState } from "react";
-var focusableElementsString = 'a[href], area[href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), iframe, object, embed, [tabindex="0"], [contenteditable]';
+import { useEffect, useRef, useCallback } from "react";
+var selector = 'a[href], area[href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), iframe, object, embed, [tabindex="0"], [contenteditable]';
 /**
  * A hook for trapping focus within an element.
  *
  * @param isActive true if the element is active, false otherwise
+ * `true` by default
  * @returns ref object that must be passed to the element that should be trapped
  */
 var useFocusTrap = function (isActive) {
+    if (isActive === void 0) { isActive = true; }
     var trapRef = useRef(null);
-    var _a = useState(undefined), currentIndex = _a[0], setCurrentIndex = _a[1];
+    var focusableElements = useRef(null);
+    var updateFocusableElements = useCallback(function () {
+        if (trapRef.current) {
+            focusableElements.current = trapRef.current.querySelectorAll(selector);
+        }
+    }, []);
     useEffect(function () {
         if (!isActive || !trapRef.current)
             return;
-        var focusableElements = trapRef.current.querySelectorAll(focusableElementsString);
-        var trapFocus = function (event) {
+        updateFocusableElements();
+        var handleKeyDown = function (event) {
             var _a;
             if (event.key !== "Tab")
                 return;
-            event.preventDefault();
-            if (focusableElements.length === 0)
-                return;
-            var newIndex = currentIndex;
-            if (event.shiftKey) {
-                // Shift + Tab
-                newIndex =
-                    ((currentIndex !== null && currentIndex !== void 0 ? currentIndex : 0) - 1 + focusableElements.length) %
-                        focusableElements.length;
+            if (!focusableElements.current ||
+                focusableElements.current.length === 0) {
+                return event.preventDefault();
+            }
+            var activeElement = document.activeElement;
+            var firstEl = focusableElements.current[0];
+            var lastEl = focusableElements.current[focusableElements.current.length - 1];
+            if (event.shiftKey && activeElement === firstEl) {
+                lastEl.focus();
+                event.preventDefault();
+            }
+            else if (!event.shiftKey && activeElement === lastEl) {
+                firstEl.focus();
+                event.preventDefault();
             }
-            else {
-                // Tab
-                newIndex = ((currentIndex !== null && currentIndex !== void 0 ? currentIndex : -1) + 1) % focusableElements.length;
+            else if (!((_a = trapRef.current) === null || _a === void 0 ? void 0 : _a.contains(activeElement))) {
+                (event.shiftKey ? lastEl : firstEl).focus();
+                event.preventDefault();
             }
-            (_a = focusableElements[newIndex]) === null || _a === void 0 ? void 0 : _a.focus();
-            setCurrentIndex(newIndex);
         };
-        document.addEventListener("keydown", trapFocus);
+        var observer = new MutationObserver(updateFocusableElements);
+        observer.observe(trapRef.current, { childList: true, subtree: true });
+        document.addEventListener("keydown", handleKeyDown);
         return function () {
-            document.removeEventListener("keydown", trapFocus);
+            document.removeEventListener("keydown", handleKeyDown);
+            observer.disconnect();
         };
-    }, [isActive, currentIndex]);
+    }, [isActive, updateFocusableElements]);
     return trapRef;
 };
 export default useFocusTrap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adamjanicki/ui",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "Basic UI components and hooks for React in TypeScript",
   "main": "./index.js",
   "types": "./index.d.ts",