From 02ccda197c1853fb8e6b9c3186d1404eaa691f62 Mon Sep 17 00:00:00 2001 From: Snarling <84951833+Snarling@users.noreply.github.com> Date: Mon, 18 Apr 2022 07:41:09 -0400 Subject: [PATCH 1/2] WIP --- src/Terminal/ui/TerminalInput.tsx | 74 ++++++++++++++----------------- 1 file changed, 33 insertions(+), 41 deletions(-) diff --git a/src/Terminal/ui/TerminalInput.tsx b/src/Terminal/ui/TerminalInput.tsx index afaf7604b..7866147d3 100644 --- a/src/Terminal/ui/TerminalInput.tsx +++ b/src/Terminal/ui/TerminalInput.tsx @@ -4,7 +4,7 @@ import { Theme } from "@mui/material/styles"; import makeStyles from "@mui/styles/makeStyles"; import createStyles from "@mui/styles/createStyles"; import TextField from "@mui/material/TextField"; -import Tooltip from "@mui/material/Tooltip"; +import Popper from "@mui/material/Popper"; import { KEY } from "../../utils/helpers/keyCodes"; import { ITerminal } from "../ITerminal"; @@ -376,46 +376,38 @@ export function TerminalInput({ terminal, router, player }: IProps): React.React return ( <> - 0 ? ( - <> - - Possible autocomplete candidate: - - - {possibilities.join(" ")} - - - ) : ( - "" - ) - } - > - - [{player.getCurrentServer().hostname} ~{terminal.cwd()}]>  - - ), - spellCheck: false, - onKeyDown: onKeyDown, - }} - > - + + [{player.getCurrentServer().hostname} ~{terminal.cwd()}]>  + + ), + spellCheck: false, + onBlur: ()=>setPossibilities([]), + onKeyDown: onKeyDown, + }} + > + 0} anchorEl={terminalInput.current} placement={"top-end"}> + + Possible autocomplete candidate: + + + {possibilities.join(" ")} + + ); } From f466a880eb10b490aabff957df7442fb4ca664d5 Mon Sep 17 00:00:00 2001 From: Snarling <84951833+Snarling@users.noreply.github.com> Date: Mon, 18 Apr 2022 07:55:59 -0400 Subject: [PATCH 2/2] Fix style + Format/Lint --- src/Terminal/ui/TerminalInput.tsx | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Terminal/ui/TerminalInput.tsx b/src/Terminal/ui/TerminalInput.tsx index 7866147d3..a5fa70c0b 100644 --- a/src/Terminal/ui/TerminalInput.tsx +++ b/src/Terminal/ui/TerminalInput.tsx @@ -3,8 +3,9 @@ import Typography from "@mui/material/Typography"; import { Theme } from "@mui/material/styles"; import makeStyles from "@mui/styles/makeStyles"; import createStyles from "@mui/styles/createStyles"; -import TextField from "@mui/material/TextField"; +import Paper from "@mui/material/Paper"; import Popper from "@mui/material/Popper"; +import TextField from "@mui/material/TextField"; import { KEY } from "../../utils/helpers/keyCodes"; import { ITerminal } from "../ITerminal"; @@ -396,17 +397,19 @@ export function TerminalInput({ terminal, router, player }: IProps): React.React ), spellCheck: false, - onBlur: ()=>setPossibilities([]), + onBlur: () => setPossibilities([]), onKeyDown: onKeyDown, }} > 0} anchorEl={terminalInput.current} placement={"top-end"}> - - Possible autocomplete candidate: - - - {possibilities.join(" ")} - + + + Possible autocomplete candidates: + + + {possibilities.join(" ")} + + );