@adamjanicki/ui 1.3.2 → 1.3.3

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,14 +1,15 @@
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useRef } 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]';
 /**
  * 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];
     useEffect(function () {
         if (!isActive || !trapRef.current)
             return;
@@ -17,28 +18,34 @@ var useFocusTrap = function (isActive) {
             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;
+                return event.preventDefault();
+            var activeEl = document.activeElement;
+            var firstEl = focusableElements[0];
+            var lastEl = focusableElements[focusableElements.length - 1];
+            var focusFirst = function () {
+                firstEl.focus();
+                event.preventDefault();
+            };
+            var focusLast = function () {
+                lastEl.focus();
+                event.preventDefault();
+            };
+            if (activeEl === firstEl && event.shiftKey) {
+                focusLast();
+            }
+            else if (activeEl === lastEl && !event.shiftKey) {
+                focusFirst();
             }
-            else {
-                // Tab
-                newIndex = ((currentIndex !== null && currentIndex !== void 0 ? currentIndex : -1) + 1) % focusableElements.length;
+            else if (!activeEl || !((_a = trapRef.current) === null || _a === void 0 ? void 0 : _a.contains(activeEl))) {
+                event.shiftKey ? focusLast() : focusFirst();
             }
-            (_a = focusableElements[newIndex]) === null || _a === void 0 ? void 0 : _a.focus();
-            setCurrentIndex(newIndex);
         };
         document.addEventListener("keydown", trapFocus);
         return function () {
             document.removeEventListener("keydown", trapFocus);
         };
-    }, [isActive, currentIndex]);
+    }, [isActive]);
     return trapRef;
 };
 export default useFocusTrap;

package/package.json

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