lenix 1.7.22 → 1.7.24

package/nui/focus.ts

@@ -2,26 +2,15 @@ import { Request } from '../shared/types.ts'
 import { fetchNui } from './fetch.ts'
 
 /**
- * Requests keyboard and cursor focus for the NUI browser.
+ * Sets the keyboard and cursor focus state for the NUI browser.
  */
-export const focus = (exclude?: 'keyboard' | 'cursor'): Promise<true> => {
-	return fetchNui<Request<true, '__nuiFocus', {
-		keyboard: boolean,
-		cursor: boolean
-	}>>('__nuiFocus', { keyboard: exclude === 'keyboard' ? false : true, cursor: exclude === 'cursor' ? false : true })
-}
+export const setFocus = (
+	keyboard: boolean,
+	cursor: boolean
+) => fetchNui<Request<true, '__nuiFocus', {
+	keyboard: boolean,
+	cursor: boolean
+}>>('__nuiFocus', { keyboard, cursor })
 
-export const unFocus = (
-	key: KeyboardEvent['key'],
-	onEvent: () => void
-) => {
-	
-	const handler = (e: KeyboardEvent) => {
-	 if (e.key !== key) return
-
-	 onEvent()
-	}
-	
-	window.addEventListener('keydown', handler)
-	return () => window.removeEventListener('keydown', handler)
-}
+export const focus = () => setFocus(true, true);
+export const unFocus = () => setFocus(false, false);

package/nui/index.ts

@@ -8,3 +8,4 @@
 export * from './on.ts'
 export * from './fetch.ts'
 export * from './focus.ts'
+export * from './keydown.ts'

package/nui/keydown.ts

@@ -0,0 +1,22 @@
+const keyHandlers = new Map<string, Set<() => void>>()
+
+window.addEventListener("keydown", (event) => {
+	keyHandlers.get(event.key)?.forEach((handler) => handler())
+})
+
+export const onKeyDown = (
+	key: KeyboardEvent["key"],
+	handler: () => void
+) => {
+	const handlers = keyHandlers.get(key) ?? new Set()
+	handlers.add(handler)
+	keyHandlers.set(key, handlers)
+
+	return () => {
+		handlers.delete(handler)
+
+		if (handlers.size === 0) {
+			keyHandlers.delete(key)
+		}
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lenix",
-  "version": "1.7.22",
+  "version": "1.7.24",
   "description": "Typed FiveM utilities for client, server, shared, and NUI scripts",
   "author": "Lenix",
   "license": "MIT",