@vitus-labs/hooks 2.0.0-beta.0 → 2.0.0-beta.2

package/lib/index.d.ts

@@ -108,6 +108,9 @@ type UseFocusTrap = (ref: {
  * Traps keyboard focus within the referenced container.
  * Tab and Shift+Tab cycle through focusable elements inside.
  * Useful for modals, dialogs, and dropdown menus.
+ *
+ * Focusable elements are cached and only re-queried when DOM mutations
+ * inside the container add/remove nodes — not on every Tab keypress.
  */
 declare const useFocusTrap: UseFocusTrap;
 //#endregion

package/lib/index.js

@@ -27,24 +27,21 @@ const useBreakpoint = () => {
 	});
 	useEffect(() => {
 		if (sorted.length === 0) return void 0;
-		const mqls = [];
+		let raf = 0;
 		const update = () => {
+			raf = 0;
 			const width = window.innerWidth;
 			let match = sorted[0]?.[0];
 			for (const [name, min] of sorted) if (width >= min) match = name;
 			setCurrent(match);
 		};
-		for (const [, min] of sorted) {
-			const mql = window.matchMedia(`(min-width: ${min}px)`);
-			const handler = () => update();
-			mql.addEventListener("change", handler);
-			mqls.push({
-				mql,
-				handler
-			});
-		}
+		const onResize = () => {
+			if (raf === 0) raf = requestAnimationFrame(update);
+		};
+		window.addEventListener("resize", onResize, { passive: true });
 		return () => {
-			for (const { mql, handler } of mqls) mql.removeEventListener("change", handler);
+			if (raf !== 0) cancelAnimationFrame(raf);
+			window.removeEventListener("resize", onResize);
 		};
 	}, [sorted]);
 	return current;
@@ -254,14 +251,27 @@ const wrapFocus = (e, target) => {
 * Traps keyboard focus within the referenced container.
 * Tab and Shift+Tab cycle through focusable elements inside.
 * Useful for modals, dialogs, and dropdown menus.
+*
+* Focusable elements are cached and only re-queried when DOM mutations
+* inside the container add/remove nodes — not on every Tab keypress.
 */
 const useFocusTrap = (ref, enabled = true) => {
 	useEffect(() => {
 		if (!enabled) return void 0;
+		const container = ref.current;
+		if (!container) return void 0;
+		let focusable = null;
+		const refresh = () => {
+			focusable = container.querySelectorAll(FOCUSABLE);
+		};
+		refresh();
+		const observer = new MutationObserver(refresh);
+		observer.observe(container, {
+			childList: true,
+			subtree: true
+		});
 		const handler = (e) => {
-			if (e.key !== "Tab" || !ref.current) return;
-			const focusable = ref.current.querySelectorAll(FOCUSABLE);
-			if (focusable.length === 0) return;
+			if (e.key !== "Tab" || !focusable || focusable.length === 0) return;
 			const first = focusable[0];
 			const last = focusable[focusable.length - 1];
 			const active = document.activeElement;
@@ -269,7 +279,10 @@ const useFocusTrap = (ref, enabled = true) => {
 			else if (!e.shiftKey && active === last) wrapFocus(e, first);
 		};
 		document.addEventListener("keydown", handler);
-		return () => document.removeEventListener("keydown", handler);
+		return () => {
+			observer.disconnect();
+			document.removeEventListener("keydown", handler);
+		};
 	}, [ref, enabled]);
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitus-labs/hooks",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.2",
   "license": "MIT",
   "author": "Vit Bokisch <vit@bokisch.cz>",
   "maintainers": [
@@ -52,7 +52,7 @@
     "node": ">= 18"
   },
   "peerDependencies": {
-    "@vitus-labs/core": "2.0.0-alpha.27",
+    "@vitus-labs/core": "2.0.0-beta.2",
     "react": ">= 19",
     "react-native": ">= 0.76"
   },
@@ -62,11 +62,10 @@
     }
   },
   "devDependencies": {
-    "@vitus-labs/core": "2.0.0-beta.0",
-    "@vitus-labs/tools-rolldown": "1.10.0",
-    "@vitus-labs/tools-storybook": "1.10.0",
-    "@vitus-labs/tools-typescript": "1.10.0",
-    "react-native": ">=0.76.0"
-  },
-  "gitHead": "dd8b9f356086ecd8bfb69c87fcad1e8bfa9ab1f4"
+    "@vitus-labs/core": "workspace:*",
+    "@vitus-labs/tools-rolldown": "2.2.0",
+    "@vitus-labs/tools-storybook": "2.2.0",
+    "@vitus-labs/tools-typescript": "2.1.0",
+    "react-native": ">=0.84.1"
+  }
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023-present Vit Bokisch
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.