From b6203aea86aaddcd279d693290d17f8bd06c9188 Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Wed, 21 Feb 2024 17:18:08 +0100
Subject: [PATCH] first v

---
 .../lib/components/remix-ui-terminal-bar.tsx  | 14 ++--
 .../remix-ui-terminal-menu-buttons.tsx        | 10 ++-
 .../lib/components/remix-ui-terminal-menu.tsx | 14 ++--
 .../src/lib/remix-ui-terminal-wrapper.tsx     |  8 +--
 .../terminal/src/lib/remix-ui-terminal.tsx    |  5 +-
 .../terminal/src/lib/types/terminalTypes.ts   |  6 +-
 .../remix-ui-terminal-menu-xterm.tsx          | 45 ++++++------
 .../lib/components/remix-ui-xterminals.tsx    | 20 +++---
 libs/remix-ui/xterm/src/lib/css/index.css     | 71 +------------------
 9 files changed, 71 insertions(+), 122 deletions(-)

diff --git a/libs/remix-ui/terminal/src/lib/components/remix-ui-terminal-bar.tsx b/libs/remix-ui/terminal/src/lib/components/remix-ui-terminal-bar.tsx
index 0321ec7ffe..f88efce844 100644
--- a/libs/remix-ui/terminal/src/lib/components/remix-ui-terminal-bar.tsx
+++ b/libs/remix-ui/terminal/src/lib/components/remix-ui-terminal-bar.tsx
@@ -22,16 +22,20 @@ export const RemixUITerminalBar = (props: RemixUiTerminalProps) => {
 
   return (<>
     <div className="remix_ui_terminal_bar d-flex">
-      <div className="remix_ui_terminal_menu d-flex w-100 align-items-center position-relative border-top border-dark bg-light" ref={terminalMenu} data-id="terminalToggleMenu">
+      <div
+        className="remix_ui_terminal_menu d-flex w-100 align-items-center position-relative border-top border-dark bg-light"
+        ref={terminalMenu}
+        data-id="terminalToggleMenu"
+      >
         <RemixUITerminalMenuToggle {...props} />
         {platform ===  appPlatformTypes.desktop ?
-          <>
+          <div className='d-flex flex-row w-100 justify-content-between '>
             <RemixUITerminalMenuButtons {...props} />
             {xtermState.showOutput? <RemixUITerminalMenu {...props} />: <RemixUIXtermMenu {...props} />}
-          </> :
+          </div> :
           <RemixUITerminalMenu {...props} />
         }
-
       </div>
-    </div></>)
+    </div></>
+  )
 }
\ No newline at end of file
diff --git a/libs/remix-ui/terminal/src/lib/components/remix-ui-terminal-menu-buttons.tsx b/libs/remix-ui/terminal/src/lib/components/remix-ui-terminal-menu-buttons.tsx
index 4201e74d13..1ae7a63f1f 100644
--- a/libs/remix-ui/terminal/src/lib/components/remix-ui-terminal-menu-buttons.tsx
+++ b/libs/remix-ui/terminal/src/lib/components/remix-ui-terminal-menu-buttons.tsx
@@ -17,9 +17,13 @@ export const RemixUITerminalMenuButtons = (props: RemixUiTerminalProps) => {
   }
 
   return (
-    <div>
-      <button className={`btn btn-sm btn-secondary mr-2 ${!xtermState.showOutput ? 'xterm-btn-none' : 'xterm-btn-active'}`} onClick={selectOutput}>output</button>
-      <button className={`btn btn-sm btn-secondary ${xtermState.terminalsEnabled ? '' : 'd-none'} ${xtermState.showOutput ? 'xterm-btn-none' : 'xterm-btn-active'}`} onClick={showTerminal}><span className="far fa-terminal border-0 ml-1"></span></button>
+    <div className='d-flex flex-row align-items-center'>
+      <button id="tabOutput" className={`btn btn-sm border-secondary mr-2 border ${!xtermState.showOutput ? 'd-none' : ' btn-secondary'}`} onClick={selectOutput}>
+        Output
+      </button>
+      <button id="tabXTerm" className={`btn btn-sm border-secondary ${xtermState.terminalsEnabled ? 'btn-secondary' : 'd-none'}`} onClick={showTerminal}>
+        <span className="far fa-terminal border-0 ml-1"></span>
+      </button>
     </div>
   )
 }
\ No newline at end of file
diff --git a/libs/remix-ui/terminal/src/lib/components/remix-ui-terminal-menu.tsx b/libs/remix-ui/terminal/src/lib/components/remix-ui-terminal-menu.tsx
index 0bd6eae755..f24695079d 100644
--- a/libs/remix-ui/terminal/src/lib/components/remix-ui-terminal-menu.tsx
+++ b/libs/remix-ui/terminal/src/lib/components/remix-ui-terminal-menu.tsx
@@ -26,12 +26,7 @@ export const RemixUITerminalMenu = (props: RemixUiTerminalProps) => {
     dispatch({ type: 'search', payload: arg0 })
   }
 
-  return (<>
-    <div className="mx-2 remix_ui_terminal_console" id="clearConsole" data-id="terminalClearConsole" onClick={handleClearConsole}>
-      <CustomTooltip placement="top" tooltipId="terminalClear" tooltipClasses="text-nowrap" tooltipText={<FormattedMessage id="terminal.clearConsole" />}>
-        <i className="fas fa-ban" aria-hidden="true"></i>
-      </CustomTooltip>
-    </div>
+  return (<div className='d-flex flex-row align-items-center'>
     <CustomTooltip placement="top" tooltipId="terminalClear" tooltipClasses="text-nowrap" tooltipText={<FormattedMessage id="terminal.pendingTransactions" />}>
       <div className="mx-2">0</div>
     </CustomTooltip>
@@ -72,5 +67,10 @@ export const RemixUITerminalMenu = (props: RemixUiTerminalProps) => {
         data-id="terminalInputSearch"
       />
     </div>
-  </>)
+    <div className="mx-2 remix_ui_terminal_console" id="clearConsole" data-id="terminalClearConsole" onClick={handleClearConsole}>
+      <CustomTooltip placement="top" tooltipId="terminalClear" tooltipClasses="text-nowrap" tooltipText={<FormattedMessage id="terminal.clearConsole" />}>
+        <i className="fas fa-ban" aria-hidden="true"></i>
+      </CustomTooltip>
+    </div>
+  </div>)
 }
\ No newline at end of file
diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal-wrapper.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal-wrapper.tsx
index 4c0f439ebc..d21123eaef 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal-wrapper.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal-wrapper.tsx
@@ -23,10 +23,10 @@ export const RemixUITerminalWrapper = (props: RemixUiTerminalProps) => {
       <RemixUITerminalBar {...props} />
       {platform !== appPlatformTypes.desktop && <RemixUiTerminal {...props} />}
       {platform === appPlatformTypes.desktop &&
-                <>
-                  <RemixUiTerminal visible={xtermState.showOutput} plugin={props.plugin} onReady={props.onReady} />
-                  <RemixUiXterminals {...props} />
-                </>
+        <>
+          <RemixUiTerminal visible={xtermState.showOutput} plugin={props.plugin} onReady={props.onReady} />
+          <RemixUiXterminals {...props} />
+        </>
       }
     </TerminalContext.Provider>
   </>)
diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
index c48eff1d12..f3c6c983e8 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -579,9 +579,8 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
   const classNameBlock = 'remix_ui_terminal_block px-4 py-1 text-break'
 
   return (
-    ( !props.visible? <></>: 
-      <div style={{ flexGrow: 1 }} className="remix_ui_terminal_panel" ref={panelRef}>
-
+    ( props.visible &&
+      <div style={{ flexGrow: 1 }} className="remix_ui_terminal_panel h-100" ref={panelRef}>
         <div tabIndex={-1} className="remix_ui_terminal_container d-flex h-100 m-0 flex-column" data-id="terminalContainer">
           {handleAutoComplete()}
           <div className="position-relative d-flex flex-column-reverse h-100">
diff --git a/libs/remix-ui/terminal/src/lib/types/terminalTypes.ts b/libs/remix-ui/terminal/src/lib/types/terminalTypes.ts
index 5977707fcc..52e667badb 100644
--- a/libs/remix-ui/terminal/src/lib/types/terminalTypes.ts
+++ b/libs/remix-ui/terminal/src/lib/types/terminalTypes.ts
@@ -31,7 +31,7 @@ export const SEARCH = 'search'
 export const SET_ISVM = 'setIsVM'
 
 export interface RemixUiTerminalProps {
-    plugin: any,
-    onReady: (api: any) => void,
-    visible: boolean,
+  plugin: any,
+  onReady: (api: any) => void,
+  visible: boolean,
 }
diff --git a/libs/remix-ui/xterm/src/lib/components/remix-ui-terminal-menu-xterm.tsx b/libs/remix-ui/xterm/src/lib/components/remix-ui-terminal-menu-xterm.tsx
index 931265b40d..4da0a3a3bc 100644
--- a/libs/remix-ui/xterm/src/lib/components/remix-ui-terminal-menu-xterm.tsx
+++ b/libs/remix-ui/xterm/src/lib/components/remix-ui-terminal-menu-xterm.tsx
@@ -26,30 +26,35 @@ export const RemixUIXtermMenu = (props: RemixUiTerminalProps) => {
   }
 
   return (<>
-    <div className={`${xtermState.showOutput ? 'd-none' : ''}`}>
-      <button className="btn btn-sm btn-secondary mr-2" onClick={async () => onClearTerminal()}>
-        <CustomTooltip tooltipText={<FormattedMessage id='xterm.clear' defaultMessage='Clear terminal' />}>
-          <span className="far fa-ban border-0 p-0 m-0"></span>
-        </CustomTooltip>
-      </button>
-      <button className="btn btn-sm btn-secondary" onClick={async () => onCreateTerminal()}>
+    <div className={`d-flex flex-row align-items-center ${xtermState.showOutput ? 'd-none' : ''}`}>
+      <div className="mx-2" onClick={async () => onCreateTerminal()}>
         <CustomTooltip tooltipText={<FormattedMessage id='xterm.new' defaultMessage='New terminal' />}>
-          <span className="far fa-plus border-0 p-0 m-0"></span>
+          <i className="fas fa-plus border-0 p-0 m-0"></i>
+        </CustomTooltip>
+      </div>
+      <div className=''>
+        {xtermState.shells.length}
+        <CustomTooltip tooltipText={<FormattedMessage id='xterm.shells' defaultMessage='Shells' />}>
+          <Dropdown as={ButtonGroup}>
+            <Dropdown.Toggle split variant="" id="dropdown-split-basic" />
+            <Dropdown.Menu className='custom-dropdown-items remixui_menuwidth'>
+              {xtermState.shells.map((shell, index) => {
+                return (<Dropdown.Item key={index} onClick={async () => await onCreateTerminal(shell)}>{shell}</Dropdown.Item>)
+              })}
+            </Dropdown.Menu>
+          </Dropdown>
         </CustomTooltip>
-      </button>
-      <Dropdown as={ButtonGroup}>
-        <Dropdown.Toggle split variant="secondary" id="dropdown-split-basic" />
-        <Dropdown.Menu className='custom-dropdown-items remixui_menuwidth'>
-          {xtermState.shells.map((shell, index) => {
-            return (<Dropdown.Item key={index} onClick={async () => await onCreateTerminal(shell)}>{shell}</Dropdown.Item>)
-          })}
-        </Dropdown.Menu>
-      </Dropdown>
-      <button className="btn ml-2 btn-sm btn-secondary" onClick={onCloseTerminal}>
+      </div>
+      <div className="mx-2" onClick={onCloseTerminal}>
         <CustomTooltip tooltipText={<FormattedMessage id='xterm.close' defaultMessage='Close terminal' />}>
-          <span className="far fa-trash border-0 ml-1"></span>
+          <i className="far fa-trash border-0 ml-1"></i>
+        </CustomTooltip>
+      </div>
+      <div className="mx-2" onClick={async () => onClearTerminal()}>
+        <CustomTooltip tooltipText={<FormattedMessage id='xterm.clear' defaultMessage='Clear Terminal' />}>
+          <i className="fas fa-ban border-0 p-0 m-0"></i>
         </CustomTooltip>
-      </button>
+      </div>
     </div>
   </>)
 }
\ No newline at end of file
diff --git a/libs/remix-ui/xterm/src/lib/components/remix-ui-xterminals.tsx b/libs/remix-ui/xterm/src/lib/components/remix-ui-xterminals.tsx
index 04760cff04..54ab6630a6 100644
--- a/libs/remix-ui/xterm/src/lib/components/remix-ui-xterminals.tsx
+++ b/libs/remix-ui/xterm/src/lib/components/remix-ui-xterminals.tsx
@@ -141,27 +141,31 @@ export const RemixUiXterminals = (props: RemixUiXterminalsProps) => {
   }, [xtermState.showOutput])
 
   return (<>
-    <div className='remix-ui-xterminals-container'>
+    <div style={{ flexGrow: 1 }} className='d-flex flex-row h-100'>
       <>
-
-        <div className={`remix-ui-xterminals-section ${xtermState.showOutput ? 'd-none' : 'd-flex'} `}>
+        { xtermState.showOutput && <div className={`flex-row w-100 h-100 d-flex`}>
           {terminals.map((xtermState) => {
             return (
-              <div className={`h-100 xterm-terminal ${xtermState.hidden ? 'hide-xterm' : 'show-xterm'}`} key={xtermState.pid} data-id={`remixUIXT${xtermState.pid}`}>
+              <div className={`h-100 w-100 ${xtermState.hidden ? 'd-none' : 'd-block'}`} key={xtermState.pid} data-id={`remixUIXT${xtermState.pid}`}>
                 <RemixUiXterm theme={theme} setTerminalRef={setTerminalRef} timeStamp={xtermState.timeStamp} send={send} resize={resize} pid={xtermState.pid} plugin={plugin}></RemixUiXterm>
               </div>
             )
           })}
-          <div className='remix-ui-xterminals-buttons border-left'>
+          <div className='d-flex flex-column border-left xterm-panel-left'>
             {terminals.map((xtermState, index) => {
-              return (<button key={index} onClick={async () => selectTerminal(xtermState)} className={`btn btn-sm mt-2 btn-secondary ${xtermState.hidden ? 'xterm-btn-none' : 'xterm-btn-active'}`}><span className="fa fa-terminal border-0 p-0 m-0"></span></button>)
+              return (<button
+                key={index}
+                onClick={async () => selectTerminal(xtermState)}
+                className={`btn btn-sm mt-2 ${xtermState.hidden ? 'border border-secondary' : 'btn-secondary'}`}
+              >
+                <span className="fa fa-terminal border-0 p-0 m-0"></span>
+              </button>)
             })}
           </div>
         </div>
+        }
       </>
     </div>
-
-
   </>)
 }
 
diff --git a/libs/remix-ui/xterm/src/lib/css/index.css b/libs/remix-ui/xterm/src/lib/css/index.css
index d7a13a031f..23098fd6ba 100644
--- a/libs/remix-ui/xterm/src/lib/css/index.css
+++ b/libs/remix-ui/xterm/src/lib/css/index.css
@@ -1,70 +1,3 @@
-.remix-ui-xterminals-container {
-    display: flex;
-    flex-direction: row;
-    flex: 1;
-}
-.xterm-panel {
-    display: flex;
-    flex-direction: column;
-    flex: 1;
-}
-
-.remix-ui-xterminals-buttons {
-    display: flex;
-    flex-direction: column;
-}
-
-.hide-xterm{
-    display: none;
-}
-
-.show-xterm{
-    display: block;
-}
-
-.xterm-btn-active {
-    background-color: var(--primary);
-}
-.xterm-btn-none {
-    background-color: var(--secondary);
-}
-
-.xterm-terminal {
-    flex-grow: 1;
-    height: 100%;
-    width: 100%;
-}
-
-.xterm-panel-header-right {
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-end;
-    align-self: flex-end;
-}
-
-.xterm-panel-header {
-    display: flex;
-    flex-direction: row;
-    
-}
-
-.xterm-panel-header-left {
-    display: flex;
-    flex-direction: row;
-    flex-grow: 1;
-}
-
-.remix-ui-xterminals-section {
-    display: flex;
-    flex-direction: row;
-    width: 100%;
-    z-index: 3;
-}
-
-.hide-terminals {
-    width: 0;
-}
-
-.show-terminals {
-    width: 100%;
+.xterm-panel-left {
+  overflow: scroll;
 }