spectator menu bug fix

mafia-rust · Oct 10, 2024 · c311f80 · c311f80
1 parent a35651c
commit c311f80
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/client/src/menu/Anchor.tsx b/client/src/menu/Anchor.tsx
@@ -49,7 +49,7 @@ export default function Anchor(props: Readonly<{
     const [mobile, setMobile] = useState<boolean>(false);
 
     useEffect(() => {
-        const onResize = () => setMobile(window.innerWidth <= MOBILE_MAX_WIDTH_PX)
+        const onResize = () => {setMobile(window.innerWidth <= MOBILE_MAX_WIDTH_PX)}
         onResize();
 
         window.addEventListener("resize", onResize);

diff --git a/client/src/menu/game/HeaderMenu.tsx b/client/src/menu/game/HeaderMenu.tsx
@@ -171,7 +171,7 @@ function VerdictButton(props: Readonly<{ verdict: Verdict }>) {
     </Button>
 }
 
-function MenuButtons(props: Readonly<{ chatMenuNotification: boolean }>): ReactElement {
+function MenuButtons(props: Readonly<{ chatMenuNotification: boolean }>): ReactElement | null {
     const roleState = usePlayerState(
         clientState => clientState.roleState,
         ["yourRoleState"]

diff --git a/client/src/menu/spectator/SpectatorGameScreen.tsx b/client/src/menu/spectator/SpectatorGameScreen.tsx
@@ -7,7 +7,7 @@ import ChatMenu from "../game/gameScreenContent/ChatMenu";
 import PlayerListMenu from "../game/gameScreenContent/PlayerListMenu";
 import GraveyardMenu from "../game/gameScreenContent/GraveyardMenu";
 import HeaderMenu from "../game/HeaderMenu";
-import { MenuController, ContentMenu, useMenuController } from "../game/GameScreen";
+import { MenuController, ContentMenu, useMenuController, MenuControllerContext } from "../game/GameScreen";
 import { MobileContext } from "../Anchor";
 
 
@@ -56,18 +56,20 @@ export default function SpectatorGameScreen(): ReactElement {
 
 
     return (
-        <div className="game-screen spectator-game-screen">
-            <div className="header">
-                <HeaderMenu chatMenuNotification={false}/>
+        <MenuControllerContext.Provider value={contentController}>
+            <div className="game-screen spectator-game-screen">
+                <div className="header">
+                    <HeaderMenu chatMenuNotification={false}/>
+                </div>
+                {showStartedScreen 
+                    ? <PhaseStartedScreen/>
+                    : <div className="content">
+                        {contentController.menuOpen(ContentMenu.ChatMenu) && <ChatMenu/>}
+                        {contentController.menuOpen(ContentMenu.PlayerListMenu) && <PlayerListMenu/>}
+                        {contentController.menuOpen(ContentMenu.GraveyardMenu) && <GraveyardMenu/>}
+                    </div>}
             </div>
-            {showStartedScreen 
-                ? <PhaseStartedScreen/>
-                : <div className="content">
-                    {contentController.menuOpen(ContentMenu.ChatMenu) && <ChatMenu/>}
-                    {contentController.menuOpen(ContentMenu.PlayerListMenu) && <PlayerListMenu/>}
-                    {contentController.menuOpen(ContentMenu.GraveyardMenu) && <GraveyardMenu/>}
-                </div>}
-        </div>
+        </MenuControllerContext.Provider>
     );
 
 }
diff --git a/server/src/listener.rs b/server/src/listener.rs
@@ -249,7 +249,7 @@ impl Listener{
     }
 
     pub fn on_disconnect(&mut self, connection: Connection) -> Result<(), &'static str> {
-        self.set_player_outside_lobby(connection.get_address(), true);
+        let _ = self.delete_player(connection.get_address(), true);
         Ok(())
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -249,7 +249,7 @@ impl Listener{ @@
         }
         pub fn on_disconnect(&mut self, connection: Connection) -> Result<(), &'static str> {
-            self.set_player_outside_lobby(connection.get_address(), true);
+            let _ = self.delete_player(connection.get_address(), true);
             Ok(())
         }
@@ Expand Down @@