From a4e9fd97054f90e65fc4c9d925c5b24f183318b7 Mon Sep 17 00:00:00 2001 From: omuretsu <84951833+Snarling@users.noreply.github.com> Date: Mon, 2 Oct 2023 23:47:59 -0400 Subject: [PATCH] Update SourceFilesDev.tsx Remove unused sfData state variable Removed the custom coloring for the SF buttons from #830. Added a text indicator for the current SF level. Other minor organizational changes --- src/DevMenu/ui/SourceFilesDev.tsx | 112 ++++++++++++++---------------- 1 file changed, 52 insertions(+), 60 deletions(-) diff --git a/src/DevMenu/ui/SourceFilesDev.tsx b/src/DevMenu/ui/SourceFilesDev.tsx index d24a85f6a..8d25fee1a 100644 --- a/src/DevMenu/ui/SourceFilesDev.tsx +++ b/src/DevMenu/ui/SourceFilesDev.tsx @@ -1,67 +1,76 @@ -import React, { useState } from "react"; +import React, { useCallback } from "react"; -import Accordion from "@mui/material/Accordion"; -import AccordionSummary from "@mui/material/AccordionSummary"; -import AccordionDetails from "@mui/material/AccordionDetails"; +import { Accordion, AccordionSummary, AccordionDetails, Button, ButtonGroup, Typography } from "@mui/material"; import ExpandMoreIcon from "@mui/icons-material/ExpandMore"; +import { makeStyles } from "@mui/styles"; -import Typography from "@mui/material/Typography"; -import Button from "@mui/material/Button"; import { Player } from "@player"; -import ButtonGroup from "@mui/material/ButtonGroup"; +import { useRerender } from "../../ui/React/hooks"; // Update as additional BitNodes get implemented const validSFN = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]; -const initialState = validSFN.reduce((obj, sfN) => ({ ...obj, [sfN]: "" }), { "": "" }); +const useStyles = makeStyles({ + group: { + display: "inline-flex", + placeItems: "center", + }, + extraInfo: { + marginLeft: "0.5em", + }, +}); export function SourceFilesDev(): React.ReactElement { - const [sfData, setSfData] = useState(initialState); + const rerender = useRerender(); + const classes = useStyles(); - function setSF(sfN: number, sfLvl: number) { - return function () { + const setSF = useCallback( + (sfN: number, sfLvl: number) => () => { if (sfN === 9) { Player.hacknetNodes = []; } if (sfLvl === 0) { Player.sourceFiles.delete(sfN); - setSfData({ ...sfData, [sfN]: sfLvl }); + rerender(); return; } Player.sourceFiles.set(sfN, sfLvl); - setSfData({ ...sfData, [sfN]: sfLvl }); - }; - } + rerender(); + }, + [rerender], + ); - function setAllSF(sfLvl: number) { - return () => { - for (let i = 0; i < validSFN.length; i++) { - setSF(validSFN[i], sfLvl)(); - } - }; - } - - function clearExploits(): void { - Player.exploits = []; - } - - const setallButtonStyle = { borderColor: "", background: "black" }; - const ownedStyle = { borderColor: "green", background: "" }; - const notOwnedStyle = { borderColor: "", background: "black" }; + const setAllSF = useCallback((sfLvl: number) => () => validSFN.forEach((sfN) => setSF(sfN, sfLvl)()), [setSF]); + const clearExploits = () => (Player.exploits = []); const devLvls = [0, 1, 2, 3]; - const buttonGroup = (sfN?: number) => - devLvls.map((lvl) => { - return ( - - ); - }); + const buttonRow = (sfN?: number) => { + const title = sfN ? `SF-${sfN}` : "Set All"; + const level = sfN ? Player.sourceFileLvl(sfN) : 0; + return ( +