From e7cd2ee19bc9e26b366e4340f011a66a7e5a9c82 Mon Sep 17 00:00:00 2001 From: catloversg <152669316+catloversg@users.noreply.github.com> Date: Wed, 14 Aug 2024 05:59:49 +0700 Subject: [PATCH] DEVMENU: Use Autocomplete instead of Select in augmentation tool (#1569) --- src/DevMenu/ui/AugmentationsDev.tsx | 55 +++++++++++++++-------------- src/Themes/ui/Theme.tsx | 10 ++++++ 2 files changed, 38 insertions(+), 27 deletions(-) diff --git a/src/DevMenu/ui/AugmentationsDev.tsx b/src/DevMenu/ui/AugmentationsDev.tsx index fcf238fda..f979917b4 100644 --- a/src/DevMenu/ui/AugmentationsDev.tsx +++ b/src/DevMenu/ui/AugmentationsDev.tsx @@ -1,16 +1,15 @@ import { Player } from "@player"; -import React, { useState } from "react"; +import React from "react"; import { Clear, ExpandMore } from "@mui/icons-material"; import { Accordion, AccordionDetails, AccordionSummary, + Autocomplete, Box, Button, IconButton, - MenuItem, - Select, - SelectChangeEvent, + TextField, Tooltip, Typography, } from "@mui/material"; @@ -19,17 +18,17 @@ import ReplyIcon from "@mui/icons-material/Reply"; import { AugmentationName } from "@enums"; export function AugmentationsDev(): React.ReactElement { - const [augmentation, setAugmentation] = useState(AugmentationName.Targeting1); - - function setAugmentationDropdown(event: SelectChangeEvent): void { - setAugmentation(event.target.value as AugmentationName); - } + const [augmentation, setAugmentation] = React.useState(null); function queueAug(): void { + if (!augmentation) { + return; + } if (Player.hasAugmentation(augmentation)) { return; } Player.queueAugmentation(augmentation); + setAugmentation(null); } function queueAllAugs(): void { @@ -39,6 +38,7 @@ export function AugmentationsDev(): React.ReactElement { } Player.queueAugmentation(augName); } + setAugmentation(null); } function clearAugs(): void { @@ -49,6 +49,10 @@ export function AugmentationsDev(): React.ReactElement { Player.queuedAugmentations = []; } + const options = Object.values(AugmentationName).filter( + (augmentationName) => !Player.hasAugmentation(augmentationName), + ); + return ( }> @@ -56,29 +60,26 @@ export function AugmentationsDev(): React.ReactElement { - + - - + renderInput={(params) => } + onChange={(_, augmentationName) => { + setAugmentation(augmentationName); + }} + > + diff --git a/src/Themes/ui/Theme.tsx b/src/Themes/ui/Theme.tsx index 8ec71a2d4..c0ef696b8 100644 --- a/src/Themes/ui/Theme.tsx +++ b/src/Themes/ui/Theme.tsx @@ -394,6 +394,16 @@ export function refreshTheme(): void { }, }, }, + MuiAutocomplete: { + styleOverrides: { + option: { + color: Settings.theme.primary, + }, + inputRoot: { + height: "100%", + }, + }, + }, }, });