Merge pull request #1546 from Snarling/char-overview-overhaul

Character Overview Overhaul

src/ui/React/CharacterOverview.tsx

@@ -8,11 +8,8 @@ import { numeralWrapper } from "../../ui/numeralFormat";
 import { Reputation } from "./Reputation";
 
 import Table from "@mui/material/Table";
-import TableBody from "@mui/material/TableBody";
 import TableCell from "@mui/material/TableCell";
 import TableRow from "@mui/material/TableRow";
-import Paper from "@mui/material/Paper";
-import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
 import IconButton from "@mui/material/IconButton";
@@ -150,10 +147,7 @@ export function CharacterOverview({ save }: IProps): React.ReactElement {
 
   const classes = useStyles();
   return (
-    <Paper square>
+    <Table sx={{ display: "block", m: 1 }}>
-      <Box m={1}>
-        <Table size="small">
-          <TableBody>
       <TableRow>
         <TableCell component="th" scope="row" classes={{ root: classes.cellNone }}>
           <Typography classes={{ root: classes.hp }}>HP&nbsp;</Typography>
@@ -191,9 +185,7 @@ export function CharacterOverview({ save }: IProps): React.ReactElement {
           <Typography classes={{ root: classes.hack }}>Hack&nbsp;</Typography>
         </TableCell>
         <TableCell align="right" classes={{ root: classes.cell }}>
-                <Typography classes={{ root: classes.hack }}>
+          <Typography classes={{ root: classes.hack }}>{numeralWrapper.formatSkill(player.hacking_skill)}</Typography>
-                  {numeralWrapper.formatSkill(player.hacking_skill)}
-                </Typography>
         </TableCell>
         <TableCell align="right" classes={{ root: classes.cell }}>
           <Typography id="overview-hack-hook" classes={{ root: classes.hack }}>
@@ -207,9 +199,7 @@ export function CharacterOverview({ save }: IProps): React.ReactElement {
           <Typography classes={{ root: classes.combat }}>Str&nbsp;</Typography>
         </TableCell>
         <TableCell align="right" classes={{ root: classes.cellNone }}>
-                <Typography classes={{ root: classes.combat }}>
+          <Typography classes={{ root: classes.combat }}>{numeralWrapper.formatSkill(player.strength)}</Typography>
-                  {numeralWrapper.formatSkill(player.strength)}
-                </Typography>
         </TableCell>
         <TableCell align="right" classes={{ root: classes.cellNone }}>
           <Typography id="overview-str-hook" classes={{ root: classes.combat }}>
@@ -237,9 +227,7 @@ export function CharacterOverview({ save }: IProps): React.ReactElement {
           <Typography classes={{ root: classes.combat }}>Dex&nbsp;</Typography>
         </TableCell>
         <TableCell align="right" classes={{ root: classes.cellNone }}>
-                <Typography classes={{ root: classes.combat }}>
+          <Typography classes={{ root: classes.combat }}>{numeralWrapper.formatSkill(player.dexterity)}</Typography>
-                  {numeralWrapper.formatSkill(player.dexterity)}
-                </Typography>
         </TableCell>
         <TableCell align="right" classes={{ root: classes.cellNone }}>
           <Typography id="overview-dex-hook" classes={{ root: classes.combat }}>
@@ -303,9 +291,6 @@ export function CharacterOverview({ save }: IProps): React.ReactElement {
           </IconButton>
         </TableCell>
       </TableRow>
-          </TableBody>
     </Table>
-      </Box>
-    </Paper>
   );
 }

src/ui/React/Overview.tsx

@@ -1,17 +1,29 @@
 import React, { useState } from "react";
 
 import makeStyles from "@mui/styles/makeStyles";
-import Box from "@mui/material/Box";
 import Collapse from "@mui/material/Collapse";
 import Fab from "@mui/material/Fab";
+import Paper from "@mui/material/Paper";
 import VisibilityOffIcon from "@mui/icons-material/VisibilityOff";
 import VisibilityIcon from "@mui/icons-material/Visibility";
 import { use } from "../Context";
 import { Page } from "../Router";
 
 const useStyles = makeStyles({
-  nobackground: {
+  visibilityToggle: {
-    backgroundColor: "#0000",
+    backgroundColor: "transparent",
+    position: "absolute",
+    top: "100%",
+    right: 0,
+  },
+  overviewContainer: {
+    position: "fixed",
+    top: 0,
+    right: 0,
+    zIndex: 1500,
+    display: "flex",
+    justifyContent: "flex-end",
+    flexDirection: "column",
   },
 });
 
@@ -30,16 +42,13 @@ export function Overview({ children }: IProps): React.ReactElement {
   } else {
     icon = <VisibilityIcon color="primary" />;
   }
+
   return (
-    <div style={{ position: "fixed", top: 0, right: 0, zIndex: 1500 }}>
+    <Paper square classes={{ root: classes.overviewContainer }}>
-      <Box display="flex" justifyContent="flex-end" flexDirection={"column"}>
       <Collapse in={open}>{children}</Collapse>
-        <Box display="flex" justifyContent="flex-end">
+      <Fab size="small" classes={{ root: classes.visibilityToggle }} onClick={() => setOpen((old) => !old)}>
-          <Fab classes={{ root: classes.nobackground }} onClick={() => setOpen((old) => !old)}>
         {icon}
       </Fab>
-        </Box>
+    </Paper>
-      </Box>
-    </div>
   );
 }