@@ -287,7 +301,7 @@ class LineHeader extends React.Component<{ screen: LineContainerType; line: Line
}
render() {
- let { line, cmd } = this.props;
+ const { line, cmd } = this.props;
const hidePrompt = getIsHidePrompt(line);
return (
@@ -303,7 +317,7 @@ class SmallLineAvatar extends React.Component<{ line: LineType; cmd: Cmd; onRigh
render() {
const { line, cmd } = this.props;
const lineNumStr = (line.linenumtemp ? "~" : "#") + String(line.linenum);
- let status = cmd != null ? cmd.getStatus() : "done";
+ const status = cmd != null ? cmd.getStatus() : "done";
const exitcode = cmd != null ? cmd.getExitCode() : 0;
const isComment = line.linetype == "text";
let icon = null;
@@ -359,7 +373,7 @@ class RtnState extends React.Component<{ cmd: Cmd; line: LineType }> {
}
checkStateDiffLoad(): void {
- let cmd = this.props.cmd;
+ const cmd = this.props.cmd;
if (cmd == null || !cmd.getRtnState() || this.rtnStateDiffFetched) {
return;
}
@@ -406,7 +420,7 @@ class RtnState extends React.Component<{ cmd: Cmd; line: LineType }> {
}
render() {
- let { cmd } = this.props;
+ const { cmd } = this.props;
const rsdiff = this.rtnStateDiff.get();
const termFontSize = GlobalModel.getTermFontSize();
let rtnStateDiffSize = termFontSize - 2;
@@ -488,7 +502,7 @@ class LineCmd extends React.Component<
if (elem != null) {
curHeight = elem.offsetHeight;
}
- let linenum = line.linenum;
+ const linenum = line.linenum;
if (DebugHeightProblems && linenum >= MinLine && linenum <= MaxLine) {
heightLog[linenum] = heightLog[linenum] || {};
heightLog[linenum].heightArr = heightLog[linenum].heightArr || [];
@@ -685,7 +699,7 @@ class LineCmd extends React.Component<
const isFocused = mobx
.computed(
() => {
- let screenFocusType = screen.getFocusType();
+ const screenFocusType = screen.getFocusType();
return isPhysicalFocused && screenFocusType == "cmd";
},
{ name: "computed-isFocused" }
@@ -694,7 +708,7 @@ class LineCmd extends React.Component<
const shouldCmdFocus = mobx
.computed(
() => {
- let screenFocusType = screen.getFocusType();
+ const screenFocusType = screen.getFocusType();
return isSelected && screenFocusType == "cmd";
},
{ name: "computed-shouldCmdFocus" }
@@ -725,16 +739,9 @@ class LineCmd extends React.Component<
rendererPlugin = PluginModel.getRendererPluginByName(line.renderer);
}
const rendererType = lineutil.getRendererType(line);
- const hidePrompt = rendererPlugin?.hidePrompt;
const termFontSize = GlobalModel.getTermFontSize();
const containerType = screen.getContainerType();
const isMinimized = line.linestate["wave:min"] && containerType == appconst.LineContainer_Main;
- const lhv: LineChromeHeightVars = {
- numCmdLines: lineutil.countCmdLines(cmd.getCmdStr()),
- zeroHeight: isMinimized,
- hasLine2: !hidePrompt,
- };
- const chromeHeight = textmeasure.calcLineChromeHeight(GlobalModel.lineHeightEnv, lhv);
return (
-
-
- showing in sidebar =>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
focus line ({renderCmdText("L")})
-
+ showing in sidebar =>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ focus line ({renderCmdText("L")})
+
+
);
@@ -877,11 +893,6 @@ class LineText extends React.Component<
name: "computed-isSelected",
})
.get();
- const isFocused = mobx
- .computed(() => screen.getFocusType() == "cmd", {
- name: "computed-isFocused",
- })
- .get();
const mainClass = cn("line", "line-text", "focus-parent", { selected: isSelected });
return (
= mobx.IObservableValue
;
@@ -44,8 +43,8 @@ class HistoryKeybindings extends React.Component<{ inputObject: TextAreaInput },
if (GlobalModel.activeMainView != "session") {
return;
}
- let inputModel = GlobalModel.inputModel;
- let keybindManager = GlobalModel.keybindManager;
+ const inputModel = GlobalModel.inputModel;
+ const keybindManager = GlobalModel.keybindManager;
keybindManager.registerKeybinding("pane", "history", "generic:cancel", (waveEvent) => {
inputModel.resetHistory();
return true;
@@ -109,15 +108,15 @@ class CmdInputKeybindings extends React.Component<{ inputObject: TextAreaInput }
if (GlobalModel.activeMainView != "session") {
return;
}
- let inputObject = this.props.inputObject;
+ const inputObject = this.props.inputObject;
this.lastTab = false;
- let keybindManager = GlobalModel.keybindManager;
- let inputModel = GlobalModel.inputModel;
+ const keybindManager = GlobalModel.keybindManager;
+ const inputModel = GlobalModel.inputModel;
keybindManager.registerKeybinding("pane", "cmdinput", "cmdinput:autocomplete", (waveEvent) => {
- let lastTab = this.lastTab;
+ const lastTab = this.lastTab;
this.lastTab = true;
this.curPress = "tab";
- let curLine = inputModel.getCurLine();
+ const curLine = inputModel.getCurLine();
if (lastTab) {
GlobalModel.submitCommand(
"_compgen",
@@ -140,8 +139,8 @@ class CmdInputKeybindings extends React.Component<{ inputObject: TextAreaInput }
keybindManager.registerKeybinding("pane", "cmdinput", "generic:confirm", (waveEvent) => {
GlobalModel.closeTabSettings();
if (GlobalModel.inputModel.isEmpty()) {
- let activeWindow = GlobalModel.getScreenLinesForActiveScreen();
- let activeScreen = GlobalModel.getActiveScreen();
+ const activeWindow = GlobalModel.getScreenLinesForActiveScreen();
+ const activeScreen = GlobalModel.getActiveScreen();
if (activeScreen != null && activeWindow != null && activeWindow.lines.length > 0) {
activeScreen.setSelectedLine(0);
GlobalCommandRunner.screenSelectLine("E");
@@ -200,12 +199,12 @@ class CmdInputKeybindings extends React.Component<{ inputObject: TextAreaInput }
});
keybindManager.registerKeybinding("pane", "cmdinput", "generic:selectAbove", (waveEvent) => {
this.curPress = "historyupdown";
- let rtn = inputObject.arrowUpPressed();
+ const rtn = inputObject.arrowUpPressed();
return rtn;
});
keybindManager.registerKeybinding("pane", "cmdinput", "generic:selectBelow", (waveEvent) => {
this.curPress = "historyupdown";
- let rtn = inputObject.arrowDownPressed();
+ const rtn = inputObject.arrowDownPressed();
return rtn;
});
keybindManager.registerKeybinding("pane", "cmdinput", "generic:selectPageAbove", (waveEvent) => {
@@ -259,18 +258,18 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
historyFocused: OV = mobx.observable.box(false);
incVersion(): void {
- let v = this.version.get();
+ const v = this.version.get();
mobx.action(() => this.version.set(v + 1))();
}
getCurSP(): StrWithPos {
- let textarea = this.mainInputRef.current;
+ const textarea = this.mainInputRef.current;
if (textarea == null) {
return this.lastSP;
}
- let str = textarea.value;
- let pos = textarea.selectionStart;
- let endPos = textarea.selectionEnd;
+ const str = textarea.value;
+ const pos = textarea.selectionStart;
+ const endPos = textarea.selectionEnd;
if (pos != endPos) {
return { str, pos: appconst.NoStrPos };
}
@@ -278,7 +277,7 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
}
updateSP(): void {
- let curSP = this.getCurSP();
+ const curSP = this.getCurSP();
if (curSP.str == this.lastSP.str && curSP.pos == this.lastSP.pos) {
return;
}
@@ -287,7 +286,7 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
}
setFocus(): void {
- let inputModel = GlobalModel.inputModel;
+ const inputModel = GlobalModel.inputModel;
if (inputModel.historyShow.get()) {
this.historyInputRef.current.focus();
} else {
@@ -296,25 +295,25 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
}
getTextAreaMaxCols(): number {
- let taElem = this.mainInputRef.current;
+ const taElem = this.mainInputRef.current;
if (taElem == null) {
return 0;
}
- let cs = window.getComputedStyle(taElem);
- let padding = parseFloat(cs.paddingLeft) + parseFloat(cs.paddingRight);
- let borders = parseFloat(cs.borderLeft) + parseFloat(cs.borderRight);
- let contentWidth = taElem.clientWidth - padding - borders;
- let fontSize = getMonoFontSize(parseInt(cs.fontSize));
- let maxCols = Math.floor(contentWidth / Math.ceil(fontSize.width));
+ const cs = window.getComputedStyle(taElem);
+ const padding = parseFloat(cs.paddingLeft) + parseFloat(cs.paddingRight);
+ const borders = parseFloat(cs.borderLeft) + parseFloat(cs.borderRight);
+ const contentWidth = taElem.clientWidth - padding - borders;
+ const fontSize = getMonoFontSize(parseInt(cs.fontSize));
+ const maxCols = Math.floor(contentWidth / Math.ceil(fontSize.width));
return maxCols;
}
checkHeight(shouldFire: boolean): void {
- let elem = this.controlRef.current;
+ const elem = this.controlRef.current;
if (elem == null) {
return;
}
- let curHeight = elem.offsetHeight;
+ const curHeight = elem.offsetHeight;
if (this.lastHeight == curHeight) {
return;
}
@@ -325,9 +324,9 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
}
componentDidMount() {
- let activeScreen = GlobalModel.getActiveScreen();
+ const activeScreen = GlobalModel.getActiveScreen();
if (activeScreen != null) {
- let focusType = activeScreen.focusType.get();
+ const focusType = activeScreen.focusType.get();
if (focusType == "input") {
this.setFocus();
}
@@ -338,16 +337,16 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
}
componentDidUpdate() {
- let activeScreen = GlobalModel.getActiveScreen();
+ const activeScreen = GlobalModel.getActiveScreen();
if (activeScreen != null) {
- let focusType = activeScreen.focusType.get();
+ const focusType = activeScreen.focusType.get();
if (this.lastFocusType != focusType && focusType == "input") {
this.setFocus();
}
this.lastFocusType = focusType;
}
- let inputModel = GlobalModel.inputModel;
- let fcpos = inputModel.forceCursorPos.get();
+ const inputModel = GlobalModel.inputModel;
+ const fcpos = inputModel.forceCursorPos.get();
if (fcpos != null && fcpos != appconst.NoStrPos) {
if (this.mainInputRef.current != null) {
this.mainInputRef.current.selectionStart = fcpos;
@@ -364,24 +363,24 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
}
getLinePos(elem: any): { numLines: number; linePos: number } {
- let numLines = elem.value.split("\n").length;
- let linePos = elem.value.substr(0, elem.selectionStart).split("\n").length;
+ const numLines = elem.value.split("\n").length;
+ const linePos = elem.value.substr(0, elem.selectionStart).split("\n").length;
return { numLines, linePos };
}
arrowUpPressed(): boolean {
- let inputModel = GlobalModel.inputModel;
+ const inputModel = GlobalModel.inputModel;
if (!inputModel.isHistoryLoaded()) {
this.lastHistoryUpDown = true;
inputModel.loadHistory(false, 1, "screen");
return true;
}
- let currentRef = this.mainInputRef.current;
+ const currentRef = this.mainInputRef.current;
if (currentRef == null) {
return true;
}
- let linePos = this.getLinePos(currentRef);
- let lastHist = this.lastHistoryUpDown;
+ const linePos = this.getLinePos(currentRef);
+ const lastHist = this.lastHistoryUpDown;
if (!lastHist && linePos.linePos > 1) {
// regular arrow
return false;
@@ -392,16 +391,16 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
}
arrowDownPressed(): boolean {
- let inputModel = GlobalModel.inputModel;
+ const inputModel = GlobalModel.inputModel;
if (!inputModel.isHistoryLoaded()) {
return true;
}
- let currentRef = this.mainInputRef.current;
+ const currentRef = this.mainInputRef.current;
if (currentRef == null) {
return true;
}
- let linePos = this.getLinePos(currentRef);
- let lastHist = this.lastHistoryUpDown;
+ const linePos = this.getLinePos(currentRef);
+ const lastHist = this.lastHistoryUpDown;
if (!lastHist && linePos.linePos < linePos.numLines) {
// regular arrow
return false;
@@ -412,17 +411,17 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
}
scrollPage(up: boolean) {
- let inputModel = GlobalModel.inputModel;
- let infoScroll = inputModel.hasScrollingInfoMsg();
+ const inputModel = GlobalModel.inputModel;
+ const infoScroll = inputModel.hasScrollingInfoMsg();
if (infoScroll) {
- let div = document.querySelector(".cmd-input-info");
- let amt = pageSize(div);
+ const div = document.querySelector(".cmd-input-info");
+ const amt = pageSize(div);
scrollDiv(div, up ? -amt : amt);
}
}
modEnter() {
- let currentRef = this.mainInputRef.current;
+ const currentRef = this.mainInputRef.current;
if (currentRef == null) {
return;
}
@@ -454,21 +453,21 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
if (this.mainInputRef.current == null) {
return;
}
- let selStart = this.mainInputRef.current.selectionStart;
- let value = this.mainInputRef.current.value;
+ const selStart = this.mainInputRef.current.selectionStart;
+ const value = this.mainInputRef.current.value;
if (selStart > value.length) {
return;
}
- let cutValue = value.substr(0, selStart);
- let restValue = value.substr(selStart);
- let cmdLineUpdate = { str: restValue, pos: 0 };
+ const cutValue = value.substring(0, selStart);
+ const restValue = value.substring(selStart);
+ const cmdLineUpdate = { str: restValue, pos: 0 };
navigator.clipboard.writeText(cutValue);
GlobalModel.inputModel.updateCmdLine(cmdLineUpdate);
}
@boundMethod
controlP() {
- let inputModel = GlobalModel.inputModel;
+ const inputModel = GlobalModel.inputModel;
if (!inputModel.isHistoryLoaded()) {
this.lastHistoryUpDown = true;
inputModel.loadHistory(false, 1, "screen");
@@ -480,7 +479,7 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
@boundMethod
controlN() {
- let inputModel = GlobalModel.inputModel;
+ const inputModel = GlobalModel.inputModel;
inputModel.moveHistorySelection(-1);
this.lastHistoryUpDown = true;
}
@@ -490,15 +489,15 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
if (this.mainInputRef.current == null) {
return;
}
- let selStart = this.mainInputRef.current.selectionStart;
- let value = this.mainInputRef.current.value;
+ const selStart = this.mainInputRef.current.selectionStart;
+ const value = this.mainInputRef.current.value;
if (selStart > value.length) {
return;
}
let cutSpot = selStart - 1;
let initial = true;
for (; cutSpot >= 0; cutSpot--) {
- let ch = value[cutSpot];
+ const ch = value[cutSpot];
if (ch == " " && initial) {
continue;
}
@@ -511,10 +510,10 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
if (cutSpot == -1) {
cutSpot = 0;
}
- let cutValue = value.slice(cutSpot, selStart);
- let prevValue = value.slice(0, cutSpot);
- let restValue = value.slice(selStart);
- let cmdLineUpdate = { str: prevValue + restValue, pos: prevValue.length };
+ const cutValue = value.slice(cutSpot, selStart);
+ const prevValue = value.slice(0, cutSpot);
+ const restValue = value.slice(selStart);
+ const cmdLineUpdate = { str: prevValue + restValue, pos: prevValue.length };
navigator.clipboard.writeText(cutValue);
GlobalModel.inputModel.updateCmdLine(cmdLineUpdate);
}
@@ -524,26 +523,26 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
if (this.mainInputRef.current == null) {
return;
}
- let pastePromise = navigator.clipboard.readText();
+ const pastePromise = navigator.clipboard.readText();
pastePromise.then((clipText) => {
clipText = clipText ?? "";
- let selStart = this.mainInputRef.current.selectionStart;
- let selEnd = this.mainInputRef.current.selectionEnd;
- let value = this.mainInputRef.current.value;
+ const selStart = this.mainInputRef.current.selectionStart;
+ const selEnd = this.mainInputRef.current.selectionEnd;
+ const value = this.mainInputRef.current.value;
if (selStart > value.length || selEnd > value.length) {
return;
}
- let newValue = value.substr(0, selStart) + clipText + value.substr(selEnd);
- let cmdLineUpdate = { str: newValue, pos: selStart + clipText.length };
+ const newValue = value.substr(0, selStart) + clipText + value.substr(selEnd);
+ const cmdLineUpdate = { str: newValue, pos: selStart + clipText.length };
GlobalModel.inputModel.updateCmdLine(cmdLineUpdate);
});
}
@boundMethod
handleHistoryInput(e: any) {
- let inputModel = GlobalModel.inputModel;
+ const inputModel = GlobalModel.inputModel;
mobx.action(() => {
- let opts = mobx.toJS(inputModel.historyQueryOpts.get());
+ const opts = mobx.toJS(inputModel.historyQueryOpts.get());
opts.queryStr = e.target.value;
inputModel.setHistoryQueryOpts(opts);
})();
@@ -551,7 +550,7 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
@boundMethod
handleMainFocus(e: any) {
- let inputModel = GlobalModel.inputModel;
+ const inputModel = GlobalModel.inputModel;
if (inputModel.historyShow.get()) {
e.preventDefault();
if (this.historyInputRef.current != null) {
@@ -578,7 +577,7 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
@boundMethod
handleHistoryFocus(e: any) {
- let inputModel = GlobalModel.inputModel;
+ const inputModel = GlobalModel.inputModel;
if (!inputModel.historyShow.get()) {
e.preventDefault();
if (this.mainInputRef.current != null) {
@@ -604,53 +603,51 @@ class TextAreaInput extends React.Component<{ screen: Screen; onHeightChange: ()
}
render() {
- let model = GlobalModel;
- let inputModel = model.inputModel;
- let curLine = inputModel.getCurLine();
- let fcp = inputModel.forceCursorPos.get(); // for reaction
+ const model = GlobalModel;
+ const inputModel = model.inputModel;
+ const curLine = inputModel.getCurLine();
let displayLines = 1;
- let numLines = curLine.split("\n").length;
- let maxCols = this.getTextAreaMaxCols();
+ const numLines = curLine.split("\n").length;
+ const maxCols = this.getTextAreaMaxCols();
let longLine = false;
- let version = this.version.get(); // to force reactions
if (maxCols != 0 && curLine.length >= maxCols - 4) {
longLine = true;
}
if (numLines > 1 || longLine || inputModel.inputExpanded.get()) {
displayLines = 5;
}
- let disabled = inputModel.historyShow.get();
+ const disabled = inputModel.historyShow.get();
if (disabled) {
displayLines = 1;
}
- let activeScreen = GlobalModel.getActiveScreen();
+ const activeScreen = GlobalModel.getActiveScreen();
if (activeScreen != null) {
activeScreen.focusType.get(); // for reaction
}
- let termFontSize = GlobalModel.getTermFontSize();
- let fontSize = getMonoFontSize(termFontSize);
- let termPad = fontSize.pad;
- let computedInnerHeight = displayLines * fontSize.height + 2 * termPad;
- let computedOuterHeight = computedInnerHeight + 2 * termPad;
+ const termFontSize = GlobalModel.getTermFontSize();
+ const fontSize = getMonoFontSize(termFontSize);
+ const termPad = fontSize.pad;
+ const computedInnerHeight = displayLines * fontSize.height + 2 * termPad;
+ const computedOuterHeight = computedInnerHeight + 2 * termPad;
let shellType: string = "";
- let screen = GlobalModel.getActiveScreen();
+ const screen = GlobalModel.getActiveScreen();
if (screen != null) {
- let ri = screen.getCurRemoteInstance();
+ const ri = screen.getCurRemoteInstance();
if (ri != null && ri.shelltype != null) {
shellType = ri.shelltype;
}
if (shellType == "") {
- let rptr = screen.curRemote.get();
+ const rptr = screen.curRemote.get();
if (rptr != null) {
- let remote = GlobalModel.getRemote(rptr.remoteid);
+ const remote = GlobalModel.getRemote(rptr.remoteid);
if (remote != null) {
shellType = remote.defaultshelltype;
}
}
}
}
- let isMainInputFocused = this.mainInputFocused.get();
- let isHistoryFocused = this.historyFocused.get();
+ const isMainInputFocused = this.mainInputFocused.get();
+ const isHistoryFocused = this.historyFocused.get();
return (
{
mobx.action(() => {
@@ -87,7 +85,7 @@ class ScreenView extends React.Component<{ session: Session; screen: Screen }, {
}
handleResize() {
- let elem = this.screenViewRef.current;
+ const elem = this.screenViewRef.current;
if (elem == null) {
return;
}
@@ -107,13 +105,13 @@ class ScreenView extends React.Component<{ session: Session; screen: Screen }, {
}
render() {
- let { session, screen } = this.props;
- let screenWidth = this.width.get();
+ const { session, screen } = this.props;
+ const screenWidth = this.width.get();
if (screenWidth == null) {
return
;
}
if (session == null) {
- let sessionCount = GlobalModel.sessionList.length;
+ const sessionCount = GlobalModel.sessionList.length;
return (
@@ -133,7 +131,7 @@ class ScreenView extends React.Component<{ session: Session; screen: Screen }, {
);
}
if (screen == null) {
- let screens = GlobalModel.getSessionScreens(session.sessionId);
+ const screens = GlobalModel.getSessionScreens(session.sessionId);
return (
@@ -152,14 +150,14 @@ class ScreenView extends React.Component<{ session: Session; screen: Screen }, {
);
}
- let fontSize = GlobalModel.getTermFontSize();
- let dprStr = sprintf("%0.3f", GlobalModel.devicePixelRatio.get());
- let viewOpts = screen.viewOpts.get();
- let hasSidebar = viewOpts?.sidebar?.open;
+ const fontSize = GlobalModel.getTermFontSize();
+ const dprStr = sprintf("%0.3f", GlobalModel.devicePixelRatio.get());
+ const viewOpts = screen.viewOpts.get();
+ const hasSidebar = viewOpts?.sidebar?.open;
let winWidth = "100%";
let sidebarWidth = "0px";
if (hasSidebar) {
- let targetWidth = viewOpts?.sidebar?.width;
+ const targetWidth = viewOpts?.sidebar?.width;
let realWidth = 0;
if (util.isBlank(targetWidth) || screenWidth < MagicLayout.ScreenSidebarMinWidth * 2) {
realWidth = Math.floor(screenWidth / 2) - MagicLayout.ScreenSidebarWidthPadding;
@@ -168,7 +166,6 @@ class ScreenView extends React.Component<{ session: Session; screen: Screen }, {
if (targetPercent > 100) {
targetPercent = 100;
}
- let targetMul = targetPercent / 100;
realWidth = Math.floor((screenWidth * targetPercent) / 100);
realWidth = util.boundInt(
realWidth,
@@ -177,7 +174,7 @@ class ScreenView extends React.Component<{ session: Session; screen: Screen }, {
);
} else {
// screen is at least 400px wide
- let targetWidthNum = parseInt(targetWidth);
+ const targetWidthNum = parseInt(targetWidth);
realWidth = util.boundInt(
targetWidthNum,
MagicLayout.ScreenSidebarMinWidth,
@@ -382,9 +379,15 @@ class ScreenSidebar extends React.Component<{ screen: Screen; width: string }, {
}
}
+interface ScreenWindowViewProps {
+ session: Session;
+ screen: Screen;
+ width: string;
+}
+
// screen is not null
@mobxReact.observer
-class ScreenWindowView extends React.Component<{ session: Session; screen: Screen; width: string }, {}> {
+class ScreenWindowView extends React.Component
{
rszObs: ResizeObserver;
windowViewRef: React.RefObject;
@@ -402,7 +405,7 @@ class ScreenWindowView extends React.Component<{ session: Session; screen: Scree
}
setSize(width: number, height: number): void {
- let { screen } = this.props;
+ const { screen } = this.props;
if (screen == null) {
return;
}
@@ -418,10 +421,10 @@ class ScreenWindowView extends React.Component<{ session: Session; screen: Scree
componentDidMount() {
const { screen } = this.props;
- let wvElem = this.windowViewRef.current;
+ const wvElem = this.windowViewRef.current;
if (wvElem != null) {
- let width = wvElem.offsetWidth;
- let height = wvElem.offsetHeight;
+ const width = wvElem.offsetWidth;
+ const height = wvElem.offsetHeight;
this.setSize(width, height);
this.rszObs = new ResizeObserver(this.handleResize.bind(this));
this.rszObs.observe(wvElem);
@@ -444,16 +447,16 @@ class ScreenWindowView extends React.Component<{ session: Session; screen: Scree
if (entries.length == 0) {
return;
}
- let entry = entries[0];
- let width = entry.target.offsetWidth;
- let height = entry.target.offsetHeight;
+ const entry = entries[0];
+ const width = entry.target.offsetWidth;
+ const height = entry.target.offsetHeight;
mobx.action(() => {
this.setSize_debounced(width, height);
})();
}
getScreenLines(): ScreenLines {
- let { screen } = this.props;
+ const { screen } = this.props;
let win = GlobalModel.getScreenLinesById(screen.screenId);
if (win == null) {
win = GlobalModel.loadScreenLines(screen.screenId);
@@ -463,21 +466,16 @@ class ScreenWindowView extends React.Component<{ session: Session; screen: Scree
@boundMethod
toggleRenderMode() {
- let renderMode = this.renderMode.get();
+ const renderMode = this.renderMode.get();
mobx.action(() => {
this.renderMode.set(renderMode == "normal" ? "collapsed" : "normal");
})();
}
renderError(message: string, fade: boolean) {
- let { screen } = this.props;
+ const { screen, width } = this.props;
return (
-
+
{message}
@@ -488,8 +486,8 @@ class ScreenWindowView extends React.Component<{ session: Session; screen: Scree
@boundMethod
copyShareLink(): void {
- let { screen } = this.props;
- let shareLink = screen.getWebShareUrl();
+ const { screen } = this.props;
+ const shareLink = screen.getWebShareUrl();
if (shareLink == null) {
return;
}
@@ -506,22 +504,22 @@ class ScreenWindowView extends React.Component<{ session: Session; screen: Scree
@boundMethod
openScreenSettings(): void {
- let { screen } = this.props;
+ const { screen } = this.props;
mobx.action(() => {
GlobalModel.screenSettingsModal.set({ sessionId: screen.sessionId, screenId: screen.screenId });
})();
}
@boundMethod
- buildLineComponent(lineProps: LineFactoryProps): JSX.Element {
- let { screen } = this.props;
- let { line, ...restProps } = lineProps;
- let realLine: LineType = line as LineType;
+ buildLineComponent(lineProps: LineFactoryProps): React.JSX.Element {
+ const { screen } = this.props;
+ const { line, ...restProps } = lineProps;
+ const realLine: LineType = line as LineType;
return
;
}
determineVisibleLines(win: ScreenLines): LineType[] {
- let { screen } = this.props;
+ const { screen } = this.props;
if (screen.filterRunning.get()) {
return win.getRunningCmdLines();
}
@@ -530,16 +528,16 @@ class ScreenWindowView extends React.Component<{ session: Session; screen: Scree
@boundMethod
disableFilter() {
- let { screen } = this.props;
+ const { screen } = this.props;
mobx.action(() => {
screen.filterRunning.set(false);
})();
}
render() {
- let { session, screen } = this.props;
- let win = this.getScreenLines();
- if (win == null || !win.loaded.get()) {
+ const { session, screen, width } = this.props;
+ const win = this.getScreenLines();
+ if (!win.loaded.get()) {
return this.renderError("...", true);
}
if (win.loadError.get() != null) {
@@ -548,28 +546,25 @@ class ScreenWindowView extends React.Component<{ session: Session; screen: Scree
if (this.width.get() == 0) {
return this.renderError("", false);
}
- let cdata = GlobalModel.clientData.get();
+ const cdata = GlobalModel.clientData.get();
if (cdata == null) {
return this.renderError("loading client data", true);
}
- let isActive = screen.isActive();
- let lines = this.determineVisibleLines(win);
- let renderMode = this.renderMode.get();
+ const lines = this.determineVisibleLines(win);
+ const renderMode = this.renderMode.get();
return (
-
-
-
-
-
-
-
-
- [workspace="{session.name.get()}" tab="{screen.name.get()}"]
-
-
+
+
+
+
+
+
+
+ [workspace="{session.name.get()}" tab="{screen.name.get()}"]
+
-
+
;
}