From b59dbdc5c904a6507003b6836e2517d42e4a2f33 Mon Sep 17 00:00:00 2001 From: Halit Aksoy Date: Fri, 15 Jul 2022 17:45:48 +0300 Subject: [PATCH] refactor HeaderBar --- src/components/HeaderBar.tsx | 97 ++++-------------------------------- 1 file changed, 11 insertions(+), 86 deletions(-) diff --git a/src/components/HeaderBar.tsx b/src/components/HeaderBar.tsx index 68c34c2..d1bdc24 100644 --- a/src/components/HeaderBar.tsx +++ b/src/components/HeaderBar.tsx @@ -7,8 +7,10 @@ import { getColorByBrightness } from "../util/ColorUtil"; import Button from "./Button"; import "@szhsin/react-menu/dist/index.css"; import "@szhsin/react-menu/dist/transitions/slide.css"; -//@ts-ignore -import MancalaIcon from "jsx:../mancala.svg"; +import HeaderbarIcon from "./headerbar/HeaderbarIcon"; +import HeaderbarTitle from "./headerbar/HeaderbarTitle"; +import Row from "./Row"; +import ThemeSwitchMenu from "./headerbar/ThemeSwitchMenu"; function renderNewGameButton( context: Context, @@ -54,15 +56,11 @@ const HeaderBar: FunctionComponent<{ ); return (
-
-
- -
-

- {context.texts.Mancala} -

-
-
+ + + + + {renderNewGameButton(context, game, onNewGameClick, userKeyWhoLeave, crashMessage)} {game && @@ -75,7 +73,7 @@ const HeaderBar: FunctionComponent<{ text={context.texts.Leave} onClick={onLeaveGameClick} /> )} -
+ + `}
) } export default HeaderBar; - -const ThemeSwitchMenu: FunctionComponent<{ context: Context, textColor: string }> = (props) => { - const { context, textColor } = props; - const menuButton = - light_mode - ; - const menuItems = context.themeManager.themes.map((theme, index) => { - 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} - - -
- ); -} -