mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2024-11-28 02:23:53 +01:00
Merge pull request #1298 from danielyxie/hotfix
fix terminal not saving state
This commit is contained in:
commit
48cfa14366
2
dist/engine.bundle.js
vendored
2
dist/engine.bundle.js
vendored
File diff suppressed because one or more lines are too long
@ -43,15 +43,23 @@ interface IProps {
|
||||
player: IPlayer;
|
||||
}
|
||||
|
||||
// Save command in case we de-load this screen.
|
||||
let command = "";
|
||||
|
||||
export function TerminalInput({ terminal, engine, player }: IProps): React.ReactElement {
|
||||
const terminalInput = useRef<HTMLInputElement>(null);
|
||||
|
||||
const [value, setValue] = useState("");
|
||||
const [value, setValue] = useState(command);
|
||||
const [possibilities, setPossibilities] = useState<string[]>([]);
|
||||
const classes = useStyles();
|
||||
|
||||
function saveValue(value: string): void {
|
||||
command = value;
|
||||
setValue(value);
|
||||
}
|
||||
|
||||
function handleValueChange(event: React.ChangeEvent<HTMLInputElement>): void {
|
||||
setValue(event.target.value);
|
||||
saveValue(event.target.value);
|
||||
setPossibilities([]);
|
||||
}
|
||||
|
||||
@ -66,13 +74,13 @@ export function TerminalInput({ terminal, engine, player }: IProps): React.React
|
||||
switch (mod.toLowerCase()) {
|
||||
case "backspace":
|
||||
if (start > 0 && start <= inputLength + 1) {
|
||||
setValue(inputText.substr(0, start - 1) + inputText.substr(start));
|
||||
saveValue(inputText.substr(0, start - 1) + inputText.substr(start));
|
||||
}
|
||||
break;
|
||||
case "deletewordbefore": // Delete rest of word before the cursor
|
||||
for (let delStart = start - 1; delStart > 0; --delStart) {
|
||||
if (inputText.charAt(delStart) === " ") {
|
||||
setValue(inputText.substr(0, delStart) + inputText.substr(start));
|
||||
saveValue(inputText.substr(0, delStart) + inputText.substr(start));
|
||||
return;
|
||||
}
|
||||
}
|
||||
@ -80,7 +88,7 @@ export function TerminalInput({ terminal, engine, player }: IProps): React.React
|
||||
case "deletewordafter": // Delete rest of word after the cursor
|
||||
for (let delStart = start + 1; delStart <= value.length + 1; ++delStart) {
|
||||
if (inputText.charAt(delStart) === " ") {
|
||||
setValue(inputText.substr(0, start) + inputText.substr(delStart));
|
||||
saveValue(inputText.substr(0, start) + inputText.substr(delStart));
|
||||
return;
|
||||
}
|
||||
}
|
||||
@ -160,7 +168,7 @@ export function TerminalInput({ terminal, engine, player }: IProps): React.React
|
||||
event.preventDefault();
|
||||
terminal.print(`[${player.getCurrentServer().hostname} ~${terminal.cwd()}]> ${value}`);
|
||||
terminal.executeCommands(engine, player, value);
|
||||
setValue("");
|
||||
saveValue("");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -207,7 +215,7 @@ export function TerminalInput({ terminal, engine, player }: IProps): React.React
|
||||
|
||||
const newValue = tabCompletion(command, arg, allPos, value);
|
||||
if (typeof newValue === "string" && newValue !== "") {
|
||||
setValue(newValue);
|
||||
saveValue(newValue);
|
||||
}
|
||||
if (Array.isArray(newValue)) {
|
||||
setPossibilities(newValue);
|
||||
@ -242,7 +250,7 @@ export function TerminalInput({ terminal, engine, player }: IProps): React.React
|
||||
--terminal.commandHistoryIndex;
|
||||
}
|
||||
const prevCommand = terminal.commandHistory[terminal.commandHistoryIndex];
|
||||
setValue(prevCommand);
|
||||
saveValue(prevCommand);
|
||||
const ref = terminalInput.current;
|
||||
if (ref) {
|
||||
setTimeout(function () {
|
||||
@ -272,11 +280,11 @@ export function TerminalInput({ terminal, engine, player }: IProps): React.React
|
||||
// Latest command, put nothing
|
||||
if (i == len || i == len - 1) {
|
||||
terminal.commandHistoryIndex = len;
|
||||
setValue("");
|
||||
saveValue("");
|
||||
} else {
|
||||
++terminal.commandHistoryIndex;
|
||||
const prevCommand = terminal.commandHistory[terminal.commandHistoryIndex];
|
||||
setValue(prevCommand);
|
||||
saveValue(prevCommand);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user