From 5e5a31715a49cceefa7137341254c08b3a1477e7 Mon Sep 17 00:00:00 2001
From: sawka <mike.sawka@gmail.com>
Date: Tue, 2 May 2023 12:41:38 -0700
Subject: [PATCH] css updates, removing collapsed, fix spacing in remotes modal

---
 src/linecomps.tsx | 58 ++++++----------------------
 src/lines.less    | 98 ++---------------------------------------------
 src/linesview.tsx |  6 ++-
 src/modals.less   |  1 +
 src/remotes.tsx   |  2 +-
 src/sh2.less      |  3 +-
 src/types.ts      |  3 +-
 7 files changed, 25 insertions(+), 146 deletions(-)

diff --git a/src/linecomps.tsx b/src/linecomps.tsx
index d35289c9..3980c46a 100644
--- a/src/linecomps.tsx
+++ b/src/linecomps.tsx
@@ -123,7 +123,7 @@ class LineCmd extends React.Component<{screen : LineContainerModel, line : LineT
 
     checkStateDiffLoad() : void {
         let {screen, line, staticRender, visible} = this.props;
-        if (staticRender || this.isCollapsed()) {
+        if (staticRender) {
             return;
         }
         if (!visible.get()) {
@@ -330,35 +330,17 @@ class LineCmd extends React.Component<{screen : LineContainerModel, line : LineT
         console.log("resize button");
     }
 
-    @boundMethod
-    handleCollapsedClick() {
-        let {overrideCollapsed} = this.props;
-        mobx.action(() => {
-            let isCollapsed = overrideCollapsed.get();
-            overrideCollapsed.set(!isCollapsed);
-        })();
-    }
-
-    isCollapsed() : boolean {
-        let {renderMode, overrideCollapsed} = this.props;
-        return (renderMode == "collapsed" && !overrideCollapsed.get());
-    }
-
     getTerminalRendererHeight(cmd : Cmd) : number {
         let {screen, line, width, topBorder, renderMode} = this.props;
-        let isCollapsed = this.isCollapsed();
         // header is 36px tall, padding+border = 6px
-        // collapsed header is 24px tall + 6px
         // zero-terminal is 0px
         // terminal-wrapper overhead is 11px (margin/padding)
         // inner-height, if zero-lines => 42
         //               else: 53+(lines*lineheight)
-        let height = (isCollapsed ? 30 : 42); // height of zero height terminal
-        if (!isCollapsed) {
-            let usedRows = screen.getUsedRows(lineutil.getRendererContext(line), line, cmd, width);
-            if (usedRows > 0) {
-                height = 53 + termHeightFromRows(usedRows, GlobalModel.termFontSize.get());
-            }
+        let height = 42; // height of zero height terminal
+        let usedRows = screen.getUsedRows(lineutil.getRendererContext(line), line, cmd, width);
+        if (usedRows > 0) {
+            height = 53 + termHeightFromRows(usedRows, GlobalModel.termFontSize.get());
         }
         return height;
     }
@@ -381,27 +363,19 @@ class LineCmd extends React.Component<{screen : LineContainerModel, line : LineT
     renderSimple() {
         let {screen, line, topBorder} = this.props;
         let cmd = screen.getCmd(line);
-        let isCollapsed = this.isCollapsed();
         let height : number = 0;
         if (isBlank(line.renderer) || line.renderer == "terminal") {
             height = this.getTerminalRendererHeight(cmd);
         }
         else {
-            let isCollapsed = this.isCollapsed();
-            if (isCollapsed) {
-                height = 24;
-            }
-            else {
-                let {screen, line, width} = this.props;
-                let usedRows = screen.getUsedRows(lineutil.getRendererContext(line), line, cmd, width);
-                height = 36 + usedRows;
-            }
+            let {screen, line, width} = this.props;
+            let usedRows = screen.getUsedRows(lineutil.getRendererContext(line), line, cmd, width);
+            height = 36 + usedRows;
         }
         let mainDivCn = cn(
             "line",
             "line-cmd",
             {"top-border": topBorder},
-            {"collapsed": isCollapsed},
         );
         return (
             <div className={mainDivCn} ref={this.lineRef} data-lineid={line.lineid} data-linenum={line.linenum} data-screenid={line.screenid} style={{height: height}}>
@@ -520,7 +494,6 @@ class LineCmd extends React.Component<{screen : LineContainerModel, line : LineT
         }, {name: "computed-isFocused"}).get();
         let isStatic = staticRender;
         let isRunning = cmd.isRunning()
-        let isCollapsed = this.isCollapsed();
         let isExpanded = this.isCmdExpanded.get();
         let rsdiff = this.rtnStateDiff.get();
         // console.log("render", "#" + line.linenum, termHeight, usedRows, cmd.getStatus(), (this.rtnStateDiff.get() != null), (!cmd.isRunning() ? "cmd-done" : "running"));
@@ -530,7 +503,6 @@ class LineCmd extends React.Component<{screen : LineContainerModel, line : LineT
             {"focus": isFocused},
             {"cmd-done": !isRunning},
             {"has-rtnstate": cmd.getRtnState()},
-            {"collapsed": isCollapsed},
             {"top-border": topBorder},
         );
         let rendererPlugin : RendererPluginType = null;
@@ -544,14 +516,8 @@ class LineCmd extends React.Component<{screen : LineContainerModel, line : LineT
                  ref={this.lineRef} onClick={this.handleClick}
                  data-lineid={line.lineid} data-linenum={line.linenum} data-screenid={line.screenid} data-cmdid={line.cmdid}>
                 <div key="focus" className={cn("focus-indicator", {"selected": isSelected}, {"active": isSelected && isFocused})}/>
-                <div key="header" className={cn("line-header", {"is-expanded": isExpanded}, {"is-collapsed": isCollapsed})}>
+                <div key="header" className={cn("line-header", {"is-expanded": isExpanded})}>
                     <LineAvatar line={line} cmd={cmd} onRightClick={this.onAvatarRightClick}/>
-                    <If condition={renderMode == "collapsed"}>
-                        <div key="collapsed" className="collapsed-indicator" title={isCollapsed ? "output collapsed, click to show" : "click to hide output" } onClick={this.handleCollapsedClick}>
-                            <If condition={isCollapsed}><i className="fa-sharp fa-solid fa-caret-right"/></If>
-                            <If condition={!isCollapsed}><i className="fa-sharp fa-solid fa-caret-down"/></If>
-                        </div>
-                    </If>
                     {this.renderMetaWrap(cmd)}
                     <div key="pin" title="Pin" className={cn("line-icon", {"active": line.pinned})} onClick={this.clickPin} style={{display: "none"}}>
                         <i className="fa-sharp fa-solid fa-thumbtack"/>
@@ -561,12 +527,12 @@ class LineCmd extends React.Component<{screen : LineContainerModel, line : LineT
                     </div>
                 </div>
                 <If condition={rendererPlugin == null && !isNoneRenderer}>
-                    <TerminalRenderer screen={screen} line={line} width={width} staticRender={staticRender} visible={visible} onHeightChange={this.handleHeightChange} collapsed={isCollapsed}/>
+                    <TerminalRenderer screen={screen} line={line} width={width} staticRender={staticRender} visible={visible} onHeightChange={this.handleHeightChange} collapsed={false}/>
                 </If>
                 <If condition={rendererPlugin != null}>
                     <SimpleBlobRenderer rendererContainer={screen} cmdId={line.cmdid} plugin={rendererPlugin} onHeightChange={this.handleHeightChange} initParams={this.makeRendererModelInitializeParams()}/>
                 </If>
-                <If condition={!isCollapsed && cmd.getRtnState()}>
+                <If condition={cmd.getRtnState()}>
                     <div key="rtnstate" className="cmd-rtnstate" style={{visibility: ((cmd.getStatus() == "done") ? "visible" : "hidden")}}>
                         <If condition={rsdiff == null || rsdiff == ""}>
                             <div className="cmd-rtnstate-label">state unchanged</div>
@@ -686,13 +652,11 @@ class LineText extends React.Component<{screen : LineContainerModel, line : Line
         let formattedTime = lineutil.getLineDateTimeStr(line.ts);
         let isSelected = mobx.computed(() => (screen.getSelectedLine() == line.linenum), {name: "computed-isSelected"}).get();
         let isFocused = mobx.computed(() => (screen.getFocusType() == "cmd"), {name: "computed-isFocused"}).get();
-        let isCollapsed = (renderMode == "collapsed");
         let mainClass = cn(
             "line",
             "line-text",
             "focus-parent",
             {"top-border": topBorder},
-            {"collapsed": isCollapsed},
         );
         return (
             <div className={mainClass} data-lineid={line.lineid} data-linenum={line.linenum} data-screenid={line.screenid} onClick={this.clickHandler}>
diff --git a/src/lines.less b/src/lines.less
index 8ae3eb9b..f0035a96 100644
--- a/src/lines.less
+++ b/src/lines.less
@@ -13,18 +13,6 @@
             color: #ddd;
         }
     }
-
-    &.collapsed {
-        .meta {
-            display: none;
-        }
-
-        min-height: 20px;
-    }
-
-    &.collapsed.top-border {
-        min-height: 26px;
-    }
 }
 
 .line.line-selected {
@@ -49,18 +37,6 @@
         height: 36px;
         width: 100%;
 
-        &.is-expanded {
-            height: auto;
-        }
-
-        &.is-collapsed {
-            height: 24px;
-        }
-
-        &.is-expanded.is-collapsed {
-            height: auto;
-        }
-        
         .meta-wrap {
             flex: 1 1 0px;
             min-width: 0;
@@ -70,10 +46,6 @@
             margin-left: 10px;
         }
 
-        .collapsed-indicator + .meta-wrap {
-            margin-left: 0;
-        }
-
         .line-icon {
             display: block;
             visibility: hidden;
@@ -127,13 +99,6 @@
             margin-left: 50px;
             .mono-font();
         }
-
-        &.collapsed {
-            height: 0;
-            padding: 0;
-            margin: 0;
-            overflow: hidden;
-        }
     }
 
     .terminal-wrapper {
@@ -147,13 +112,6 @@
             margin: 0;
         }
 
-        &.collapsed {
-            height: 0;
-            padding: 0;
-            margin: 0;
-            overflow: hidden;
-        }
-
         .terminal-connectelem {
             overflow-y: hidden;
             overflow-x: hidden;
@@ -217,46 +175,12 @@
     flex-shrink: 0;
     position: relative;
 
-    &.collapsed {
-        margin: 2px 5px 0px 5px;
-        padding: 0px 5px 0px 12px;
-
-        .avatar {
-            height: 20px;
-            width: 38px;
-            
-            &.num-4 {
-                font-size: 13px;
-            }
-            
-            &.num-5 {
-                font-size: 11px;
-            }
-            
-            &.num-6 {
-                font-size: 9px;
-            }
-        }
-
-        .meta-wrap .meta.meta-line1 {
-            display: none;
-        }
-
-        .focus-indicator {
-            height: calc(100% - 8px);
-            top: 4px;
-        }
-
-        .line-icon {
-            padding-top: 0;
-            padding-bottom: 0;
-            font-size: 20px;
-            margin-top: -4px;
-            margin-bottom: -2px;
-        }
+    .focus-indicator {
+        height: calc(100% - 7px);
+        top: 5px;
     }
 
-    &.top-border, &.collapsed.top-border {
+    &.top-border {
         border-top: 1px solid #777;
         padding-top: 5px;
         margin-top: 5px;
@@ -359,20 +283,6 @@
         }
     }
 
-    .collapsed-indicator {
-        width: 20px;
-        font-size: 20px;
-        color: white;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        cursor: pointer;
-        margin-left: 2px;
-        margin-right: 2px;
-        position: relative;
-        top: -2px;
-    }
-
     .meta {
         display: flex;
         flex-direction: row;
diff --git a/src/linesview.tsx b/src/linesview.tsx
index 7da27590..56184aa2 100644
--- a/src/linesview.tsx
+++ b/src/linesview.tsx
@@ -471,8 +471,12 @@ class LinesView extends React.Component<{screen : ScreenInterface, width : numbe
             // let lineElem = <Line key={line.lineid} line={line} screen={screen} width={width} visible={this.visibleMap.get(lineNumStr)} staticRender={this.staticRender.get()} onHeightChange={this.onHeightChange} overrideCollapsed={this.collapsedMap.get(lineNumStr)} topBorder={topBorder} renderMode={renderMode}/>;
             lineElements.push(lineElem);
         }
+        let linesClass = cn(
+            "lines",
+            (renderMode == "normal" ? "lines-expanded" : "lines-collapsed"),
+        );
         return (
-            <div key="lines" className="lines" onScroll={this.scrollHandler} ref={this.linesRef}>
+            <div key="lines" className={linesClass} onScroll={this.scrollHandler} ref={this.linesRef}>
                 <div className="lines-spacer"></div>
                 {lineElements}
             </div>
diff --git a/src/modals.less b/src/modals.less
index 2b41f068..10a989aa 100644
--- a/src/modals.less
+++ b/src/modals.less
@@ -345,6 +345,7 @@
                     display: flex;
                     flex-direction: row;
                     align-items: center;
+                    width: 135px;
                 }
 
                 .settings-field .settings-input .undo-icon {
diff --git a/src/remotes.tsx b/src/remotes.tsx
index 940b9865..5de1edb7 100644
--- a/src/remotes.tsx
+++ b/src/remotes.tsx
@@ -939,7 +939,7 @@ class RemotesModal extends React.Component<{model : RemotesModalModel}, {}> {
         return (
             <div key="add" onClick={this.clickAddRemote} className={cn("remote-menu-item add-remote")}>
                 <div>
-                    <i className="fa-sharp fa-solid fa-plus"/> Add Connection
+                    <i className="fa-sharp fa-solid fa-plus"/> Add SSH Connection
                 </div>
             </div>
         );
diff --git a/src/sh2.less b/src/sh2.less
index a8db8723..92b5da90 100644
--- a/src/sh2.less
+++ b/src/sh2.less
@@ -41,7 +41,8 @@
 @import "modals.less"; // includes settings
 @import "comps.less";  // includes terminal
 @import "tabs.less";
-@import "cmd.less";
+@import "cmdinput.less";
+@import "lines.less";
 
 // global settings / overrides
 
diff --git a/src/types.ts b/src/types.ts
index 738f9374..6a72ed68 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -80,7 +80,6 @@ type RemoteOptsType = {
 type RemoteType = {
     remotetype : string,
     remoteid : string,
-    physicalid : string,
     remotealias : string,
     remotecanonicalname : string,
     remotevars : Record<string, string>,
@@ -492,7 +491,7 @@ type HistorySearchParams = {
     filterCmds? : boolean,
 };
 
-type RenderModeType = "normal" | "collapsed";
+type RenderModeType = "normal" | "collapsed" | "expanded";
 
 type WebScreen = {
     screenid : string,