Made a few small navigation improvements (#9686)

microsoft · Oct 24, 2023 · 32748bf · 32748bf
1 parent 03ea84b
commit 32748bf
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/kiosk/src/Components/AddingGame.tsx b/kiosk/src/Components/AddingGame.tsx
@@ -48,7 +48,7 @@ const AddingGame: React.FC<IProps> = ({ kiosk }) => {
             }
             playSoundEffect("switch");
         }
-        if (menuButtonSelected && kiosk.gamepadManager.isAButtonPressed()) {
+        if ((menuButtonSelected && kiosk.gamepadManager.isAButtonPressed()) || kiosk.gamepadManager.isBButtonPressed()) {
             tickEvent("kiosk.toMainMenu");
             kiosk.showMainMenu();
             playSoundEffect("select");
@@ -61,6 +61,7 @@ const AddingGame: React.FC<IProps> = ({ kiosk }) => {
         if (qrCodeButtonSelected && kiosk.gamepadManager.isAButtonPressed()) {
             tickEvent("kiosk.newKioskCode");
             setRenderQRCode(true);
+            playSoundEffect("select");
         }
     };
 

diff --git a/kiosk/src/Components/GameOver.tsx b/kiosk/src/Components/GameOver.tsx
@@ -4,6 +4,7 @@ import AddGameButton from "./AddGameButton";
 import configData from "../config.json";
 import { KioskState } from "../Models/KioskState";
 import { tickEvent } from "../browserUtils";
+import { playSoundEffect } from "../Services/SoundEffectService";
 
 interface IProps {
     kiosk: Kiosk;
@@ -15,21 +16,25 @@ const GameOver: React.FC<IProps> = ({ kiosk }) => {
     const gameId = kiosk.launchedGame;
 
     const updateLoop = () => {
-        if (kiosk.gamepadManager.isLeftPressed()) {
+        if (!retryButtonSelected && kiosk.gamepadManager.isLeftPressed()) {
             setRetryButtonState(true);
             setHomeButtonState(false);
+            playSoundEffect("switch");
         }
-        if (kiosk.gamepadManager.isRightPressed()) {
+        if (!homeButtonSelected && kiosk.gamepadManager.isRightPressed()) {
             setHomeButtonState(true);
             setRetryButtonState(false);
+            playSoundEffect("switch");
         }
         if (homeButtonSelected && kiosk.gamepadManager.isAButtonPressed()) {
             tickEvent("kiosk.gameOver.mainMenu");
+            playSoundEffect("select");
             kiosk.navigate(KioskState.MainMenu);
         }
 
         if (retryButtonSelected && kiosk.gamepadManager.isAButtonPressed()) {
             tickEvent("kiosk.gameOver.retry");
+            playSoundEffect("select");
             kiosk.launchGame(gameId);
         }
     };
@@ -48,6 +53,12 @@ const GameOver: React.FC<IProps> = ({ kiosk }) => {
         };
     });
 
+    useEffect(() => {
+        // When returning from another screen, block the A button until it is released to avoid launching the selected game.
+        kiosk.gamepadManager.clear();
+        kiosk.gamepadManager.blockAPressUntilRelease();
+    }, []);
+
     return (
         <div className="gameOverPage">
             <h1>GAME OVER</h1>

diff --git a/kiosk/src/Components/MainMenu.tsx b/kiosk/src/Components/MainMenu.tsx
@@ -84,6 +84,7 @@ const MainMenu: React.FC<IProps> = ({ kiosk }) => {
 
     useEffect(() => {
         // When returning from another screen, block the A button until it is released to avoid launching the selected game.
+        kiosk.gamepadManager.clear();
         kiosk.gamepadManager.blockAPressUntilRelease();
     }, []);
 

diff --git a/kiosk/src/Models/GamepadManager.ts b/kiosk/src/Models/GamepadManager.ts
@@ -257,4 +257,9 @@ export class GamepadManager {
     blockAPressUntilRelease() {
         this.blockingAPressed = true;
     }
+
+    clear() {
+        this.keyboardManager.clear();
+        // Not possible to clear gamepad state at the moment
+    }
 }