mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

fix xterm

Browse Source
desktopmerge
bunsenstraat 1 year ago
parent 6f0d08f1db
commit e9cf78e46d
1 changed files with 64 additions and 38 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 80
      libs/remix-ui/xterm/src/lib/components/remix-ui-xterminals.tsx

80
libs/remix-ui/xterm/src/lib/components/remix-ui-xterminals.tsx
Unescape View File

@ -42,7 +42,7 @@ export const RemixUiXterminals = (props: RemixUiXterminalsProps) => {
const removed = prevState.filter(xtermState => xtermState.pid !== pid) const removed = prevState.filter(xtermState => xtermState.pid !== pid)
if (removed.length > 0) if (removed.length > 0)
removed[removed.length - 1].hidden = false removed[removed.length - 1].hidden = false
if(removed.length === 0) if (removed.length === 0)
setShowOutput(true) setShowOutput(true)
return [...removed] return [...removed]
}) })
@ -79,11 +79,13 @@ export const RemixUiXterminals = (props: RemixUiXterminalsProps) => {
const writeToTerminal = (data: string, pid: number) => { const writeToTerminal = (data: string, pid: number) => {
setTerminals(prevState => { setTerminals(prevState => {
const terminal = prevState.find(xtermState => xtermState.pid === pid) const terminal = prevState.find(xtermState => xtermState.pid === pid)
if (terminal) {
if (terminal.ref && terminal.ref.terminal) { if (terminal.ref && terminal.ref.terminal) {
terminal.ref.terminal.write(data) terminal.ref.terminal.write(data)
} else { } else {
terminal.queue += data terminal.queue += data
} }
}
return [...prevState] return [...prevState]
}) })
} }
@ -166,14 +168,14 @@ export const RemixUiXterminals = (props: RemixUiXterminalsProps) => {
<div className={`xterm-panel-header-right ${showOutput ? 'd-none' : ''}`}> <div className={`xterm-panel-header-right ${showOutput ? 'd-none' : ''}`}>
<Dropdown as={ButtonGroup}> <Dropdown as={ButtonGroup}>
<button className="btn btn-sm btn-secondary" onClick={async() => createTerminal()}><span className="far fa-plus border-0 p-0 m-0"></span></button> <button className="btn btn-sm btn-secondary" onClick={async () => createTerminal()}><span className="far fa-plus border-0 p-0 m-0"></span></button>
<Dropdown.Toggle split variant="secondary" id="dropdown-split-basic" /> <Dropdown.Toggle split variant="secondary" id="dropdown-split-basic" />
<Dropdown.Menu className='custom-dropdown-items remixui_menuwidth'> <Dropdown.Menu className='custom-dropdown-items remixui_menuwidth'>
{shells.map((shell, index) => { {shells.map((shell, index) => {
return (<Dropdown.Item key={index} onClick={async() => await createTerminal(shell)}>{shell}</Dropdown.Item>) return (<Dropdown.Item key={index} onClick={async () => await createTerminal(shell)}>{shell}</Dropdown.Item>)
})} })}
</Dropdown.Menu> </Dropdown.Menu>
</Dropdown> </Dropdown>
@ -212,28 +214,52 @@ export const RemixUiXterminals = (props: RemixUiXterminalsProps) => {
} }
const themeCollection = [ const themeCollection = [
{ themeName: 'HackerOwl', backgroundColor: '#011628', textColor: '#babbcc', {
shapeColor: '#8694a1',fillColor: '#011C32'}, themeName: 'HackerOwl', backgroundColor: '#011628', textColor: '#babbcc',
{ themeName: 'Cerulean', backgroundColor: '#ffffff', textColor: '#343a40', shapeColor: '#8694a1', fillColor: '#011C32'
shapeColor: '#343a40',fillColor: '#f8f9fa'}, },
{ themeName: 'Cyborg', backgroundColor: '#060606', textColor: '#adafae', {
shapeColor: '#adafae', fillColor: '#222222'}, themeName: 'Cerulean', backgroundColor: '#ffffff', textColor: '#343a40',
{ themeName: 'Dark', backgroundColor: '#222336', textColor: '#babbcc', shapeColor: '#343a40', fillColor: '#f8f9fa'
shapeColor: '#babbcc',fillColor: '#2a2c3f'}, },
{ themeName: 'Flatly', backgroundColor: '#ffffff', textColor: '#343a40', {
shapeColor: '#7b8a8b',fillColor: '#ffffff'}, themeName: 'Cyborg', backgroundColor: '#060606', textColor: '#adafae',
{ themeName: 'Black', backgroundColor: '#1a1a1a', textColor: '#babbcc', shapeColor: '#adafae', fillColor: '#222222'
shapeColor: '#b5b4bc',fillColor: '#1f2020'}, },
{ themeName: 'Light', backgroundColor: '#eef1f6', textColor: '#3b445e', {
shapeColor: '#343a40',fillColor: '#ffffff'}, themeName: 'Dark', backgroundColor: '#222336', textColor: '#babbcc',
{ themeName: 'Midcentury', backgroundColor: '#DBE2E0', textColor: '#11556c', shapeColor: '#babbcc', fillColor: '#2a2c3f'
shapeColor: '#343a40',fillColor: '#eeede9'}, },
{ themeName: 'Spacelab', backgroundColor: '#ffffff', textColor: '#343a40', {
shapeColor: '#333333', fillColor: '#eeeeee'}, themeName: 'Flatly', backgroundColor: '#ffffff', textColor: '#343a40',
{ themeName: 'Candy', backgroundColor: '#d5efff', textColor: '#11556c', shapeColor: '#7b8a8b', fillColor: '#ffffff'
shapeColor: '#343a40',fillColor: '#fbe7f8' }, },
{ themeName: 'Violet', backgroundColor: '#f1eef6', textColor: '#3b445e', {
shapeColor: '#343a40',fillColor: '#f8fafe' }, themeName: 'Black', backgroundColor: '#1a1a1a', textColor: '#babbcc',
{ themeName: 'Pride', backgroundColor: '#f1eef6', textColor: '#343a40', shapeColor: '#b5b4bc', fillColor: '#1f2020'
shapeColor: '#343a40',fillColor: '#f8fafe' }, },
{
themeName: 'Light', backgroundColor: '#eef1f6', textColor: '#3b445e',
shapeColor: '#343a40', fillColor: '#ffffff'
},
{
themeName: 'Midcentury', backgroundColor: '#DBE2E0', textColor: '#11556c',
shapeColor: '#343a40', fillColor: '#eeede9'
},
{
themeName: 'Spacelab', backgroundColor: '#ffffff', textColor: '#343a40',
shapeColor: '#333333', fillColor: '#eeeeee'
},
{
themeName: 'Candy', backgroundColor: '#d5efff', textColor: '#11556c',
shapeColor: '#343a40', fillColor: '#fbe7f8'
},
{
themeName: 'Violet', backgroundColor: '#f1eef6', textColor: '#3b445e',
shapeColor: '#343a40', fillColor: '#f8fafe'
},
{
themeName: 'Pride', backgroundColor: '#f1eef6', textColor: '#343a40',
shapeColor: '#343a40', fillColor: '#f8fafe'
},
] ]
Write Preview
Loading…
Cancel
Save