Allow cancelling gamepad binding

Can be cancelled by pressing the Esc key.

Also fix when polling gets triggered (whoops).

Author: data-enabler

http/button-mapper.js

@@ -62,8 +62,12 @@ export function ButtonMapper({
 
   const [target, setTarget] = useState(/** @type {[string, keyof Mapping]|null} */ (null));
   useEffect(() => {
+    if (!target) {
+      return;
+    }
     return waitForGamepadInput(padInput => {
-      if (!target) {
+      setTarget(null);
+      if (!padInput) {
         return;
       }
       setNewMappings((/** @type {Mappings} */ m) => {
@@ -81,7 +85,6 @@ export function ButtonMapper({
         };
         return updated;
       });
-      setTarget(null);
     });
   }, [target, setTarget, setNewMappings]);
 

http/mapping.js

@@ -257,7 +257,7 @@ function ignoreDeadzone(val) {
 }
 
 /**
- * @param {function(PadInput): void} callback
+ * @param {function(PadInput|null): void} callback
  * @returns {function(): void} a cancel/cleanup function
  */
 export function waitForGamepadInput(callback) {
@@ -290,8 +290,18 @@ export function waitForGamepadInput(callback) {
   }
   const interval = setInterval(findPressedInput, 100);
 
+  /** @type {function(KeyboardEvent): void} */
+  const cancelHandler = e => {
+    if (e.key === 'Escape') {
+      e.preventDefault();
+      callback(null);
+    }
+  }
+  document.addEventListener('keydown', cancelHandler);
+
   return function cleanup() {
     clearInterval(interval);
+    document.removeEventListener('keydown', cancelHandler);
   };
 }