Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-29 19:13:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1288 from danielyxie/dev

Browse Source 
fix term issues
This commit is contained in:
hydroflame 2021-09-17 03:08:42 -04:00 committed by GitHub
commit affc79a499
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/engine.bundle.js vendored
View File

File diff suppressed because one or more lines are too long

24
dist/vendor.bundle.js vendored
View File

File diff suppressed because one or more lines are too long

6
src/Terminal/ui/TerminalInput.tsx
View File

@ -4,6 +4,8 @@ import { Theme } from "@mui/material/styles";
import makeStyles from "@mui/styles/makeStyles"; import makeStyles from "@mui/styles/makeStyles";
import createStyles from "@mui/styles/createStyles"; import createStyles from "@mui/styles/createStyles";
import TextField from "@mui/material/TextField"; import TextField from "@mui/material/TextField";
import Paper from "@mui/material/Paper";
import { KEY } from "../../../utils/helpers/keyCodes"; import { KEY } from "../../../utils/helpers/keyCodes";
import { ITerminal } from "../ITerminal"; import { ITerminal } from "../ITerminal";
import { IEngine } from "../../IEngine"; import { IEngine } from "../../IEngine";
@ -326,14 +328,14 @@ export function TerminalInput({ terminal, engine, player }: IProps): React.React
return ( return (
<> <>
{possibilities.length > 0 && ( {possibilities.length > 0 && (
<> <Paper square>
<Typography classes={{ root: classes.preformatted }} color={"primary"} paragraph={false}> <Typography classes={{ root: classes.preformatted }} color={"primary"} paragraph={false}>
Possible autocomplete candidate: Possible autocomplete candidate:
</Typography> </Typography>
<Typography classes={{ root: classes.preformatted }} color={"primary"} paragraph={false}> <Typography classes={{ root: classes.preformatted }} color={"primary"} paragraph={false}>
{possibilities.join(" ")} {possibilities.join(" ")}
</Typography> </Typography>
</> </Paper>
)} )}
<TextField <TextField
variant="standard" variant="standard"

7
src/Terminal/ui/TerminalRoot.tsx
View File

@ -101,8 +101,13 @@ export function TerminalRoot({ terminal, engine, player }: IProps): React.ReactE
</ListItem> </ListItem>
); );
})} })}
{terminal.action !== null && (
<ListItem classes={{ root: classes.nopadding }}>
<ActionTimer terminal={terminal} />{" "}
</ListItem>
)}
</List> </List>
{terminal.action !== null && <ActionTimer terminal={terminal} />}
<div ref={scrollHook}></div> <div ref={scrollHook}></div>
</Box> </Box>
<Box position="sticky" bottom={0} width="100%" px={1}> <Box position="sticky" bottom={0} width="100%" px={1}>