From 57bf32cad9062fcdf7e88f9bf1a0459c4ea0949a Mon Sep 17 00:00:00 2001 From: Halit Aksoy Date: Thu, 14 Jul 2022 22:59:48 +0300 Subject: [PATCH] use styled-jsx in HeaderBar --- src/components/HeaderBar.tsx | 117 +++++++++++++++++++---------------- 1 file changed, 65 insertions(+), 52 deletions(-) diff --git a/src/components/HeaderBar.tsx b/src/components/HeaderBar.tsx index 202d479..e1f85a5 100644 --- a/src/components/HeaderBar.tsx +++ b/src/components/HeaderBar.tsx @@ -9,8 +9,8 @@ import "@szhsin/react-menu/dist/index.css"; import "@szhsin/react-menu/dist/transitions/slide.css"; function renderNewGameButton( - context: Context, game: - MancalaGame | undefined, + context: Context, + game: MancalaGame | undefined, onNewGameClick: () => void, userKeyWhoLeave: string | undefined, crashMessage: string | undefined): JSX.Element { @@ -51,31 +51,12 @@ const HeaderBar: FunctionComponent<{ context.themeManager.theme.textLightColor ); return ( -
-

+
+

{context.texts.Mancala}

-
-
- -
+
+ {renderNewGameButton(context, game, onNewGameClick, userKeyWhoLeave, crashMessage)} {game && !userKeyWhoLeave && @@ -88,6 +69,25 @@ const HeaderBar: FunctionComponent<{ onClick={onLeaveGameClick} /> )}
+
) } export default HeaderBar; @@ -100,33 +100,46 @@ const ThemeSwitchMenu: FunctionComponent<{ context: Context, textColor: string } light_mode ; const menuItems = context.themeManager.themes.map((theme, index) => { - return ( (event.target.style.background = - context.themeManager.theme.background)} - //@ts-ignore - onMouseOut={(event) => (event.target.style.background = "transparent")} - onClick={() => (context.themeManager.theme = theme)}> -
- {theme.name} - ); + const themeBackground = context.themeManager.theme.background; + return ( + (event.target.style.background = themeBackground)} + //@ts-ignore + onMouseOut={(event) => (event.target.style.background = "transparent")} + onClick={() => (context.themeManager.theme = theme)}> +
+ {theme.name} + + + ); }) - return ( - {menuItems} - ); + return ( +
+ + {menuItems} + + +
+ ); }