@@ -705,7 +634,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
})
} else if (x.name === KNOWN_TRANSACTION) {
return x.message
- .filter((x) => includeSearch(x, searchInput))
+ .filter((x) => includeSearch(x, terminalState.searchInput))
.map((trans) => {
return (
@@ -738,7 +667,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
)
})
} else if (Array.isArray(x.message)) {
- if (searchInput !== '') return []
+ if (terminalState.searchInput !== '') return []
return x.message.map((msg, i) => {
// strictly check condition on 0, false, except undefined, NaN.
// if you type `undefined`, terminal automatically throws error, it's error message: "undefined" is not valid JSON
diff --git a/libs/remix-ui/terminal/src/lib/types/terminalTypes.ts b/libs/remix-ui/terminal/src/lib/types/terminalTypes.ts
index 29d5af476a..52e667badb 100644
--- a/libs/remix-ui/terminal/src/lib/types/terminalTypes.ts
+++ b/libs/remix-ui/terminal/src/lib/types/terminalTypes.ts
@@ -23,11 +23,15 @@ export const WARN = 'warn'
export const ERROR = 'error'
export const SCRIPT = 'script'
export const CLEAR_CONSOLE = 'clearconsole'
+export const TOGGLE = 'toggle'
+export const SET_OPEN = 'setOpen'
export const LISTEN_ON_NETWORK = 'listenOnNetWork'
export const CMD_HISTORY = 'cmdHistory'
+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/index.ts b/libs/remix-ui/xterm/src/index.ts
index d0850bef79..6d438dd286 100644
--- a/libs/remix-ui/xterm/src/index.ts
+++ b/libs/remix-ui/xterm/src/index.ts
@@ -1,2 +1,5 @@
export * from './lib/components/remix-ui-xterm'
-export * from './lib/components/remix-ui-xterminals'
\ No newline at end of file
+export * from './lib/components/remix-ui-xterminals'
+export * from './lib/reducer'
+export * from './lib/types'
+export * from './lib/actions'
\ No newline at end of file
diff --git a/libs/remix-ui/xterm/src/lib/actions/index.ts b/libs/remix-ui/xterm/src/lib/actions/index.ts
new file mode 100644
index 0000000000..956c850296
--- /dev/null
+++ b/libs/remix-ui/xterm/src/lib/actions/index.ts
@@ -0,0 +1,12 @@
+import { Actions } from "@remix-ui/xterm"
+import { Plugin } from "@remixproject/engine"
+
+export const createTerminal = async (shell: string = '', plugin: Plugin, workingDir: string, dispatch: React.Dispatch
) => {
+ const shells: string[] = await plugin.call('xterm', 'getShells')
+ dispatch({ type: 'ADD_SHELLS', payload: shells })
+ const pid = await plugin.call('xterm', 'createTerminal', workingDir, shell)
+ dispatch({ type: 'SHOW_OUTPUT', payload: false })
+ dispatch({ type: 'HIDE_ALL_TERMINALS', payload: null })
+ dispatch({ type: 'ADD_TERMINAL', payload: { pid, queue: '', timeStamp: Date.now(), ref: null, hidden: false } })
+
+}
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
new file mode 100644
index 0000000000..a2732762a8
--- /dev/null
+++ b/libs/remix-ui/xterm/src/lib/components/remix-ui-terminal-menu-xterm.tsx
@@ -0,0 +1,59 @@
+import { CustomTooltip } from '@remix-ui/helper';
+import { TerminalContext } from '@remix-ui/terminal';
+import { createTerminal } from '@remix-ui/xterm';
+import React, { useState, useEffect, useRef, useContext } from 'react' // eslint-disable-line
+import { Dropdown, ButtonGroup } from 'react-bootstrap';
+import { FormattedMessage } from 'react-intl';
+import { RemixUiTerminalProps } from "../../../../terminal/src/lib/types/terminalTypes";
+
+export const RemixUIXtermMenu = (props: RemixUiTerminalProps) => {
+ const { xtermState, dispatchXterm } = useContext(TerminalContext)
+
+ function onClearTerminal(): void | PromiseLike {
+ const terminal = xtermState.terminals.find(xtermState => xtermState.hidden === false)
+ if (terminal && terminal.ref && terminal.ref.terminal)
+ terminal.ref.terminal.clear()
+ }
+
+ function onCreateTerminal(shell?: string): void | PromiseLike {
+ createTerminal(shell, props.plugin, xtermState.workingDir, dispatchXterm)
+ }
+
+ function onCloseTerminal(): void | PromiseLike {
+ const pid = xtermState.terminals.find(xtermState => xtermState.hidden === false).pid
+ if (pid)
+ props.plugin.call('xterm', 'closeTerminal', pid)
+ }
+
+ return (<>
+
+
onCreateTerminal()}>
+ }>
+
+
+
+
+ }>
+
+
+
+ {xtermState.shells.map((shell, index) => {
+ return ( await onCreateTerminal(shell)}>{shell})
+ })}
+
+
+
+
+
+ }>
+
+
+
+
onClearTerminal()}>
+ }>
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {shells.map((shell, index) => {
- return ( await createTerminal(shell)}>{shell})
- })}
-
-
-
-
-
+ {
<>
-
-
+ {
{terminals.map((xtermState) => {
return (
-
-
+
+
)
})}
-
+
{terminals.map((xtermState, index) => {
- return ()
+ return ()
})}
+ }
-
-
-
+
}
)
}
@@ -313,4 +226,4 @@ const themeCollection = [
themeName: 'Pride', backgroundColor: '#f1eef6', textColor: '#343a40',
shapeColor: '#343a40', fillColor: '#f8fafe'
},
-]
\ No newline at end of file
+]
diff --git a/libs/remix-ui/xterm/src/lib/components/xterm-wrap.tsx b/libs/remix-ui/xterm/src/lib/components/xterm-wrap.tsx
index 03b54ccf6f..4998c3e750 100644
--- a/libs/remix-ui/xterm/src/lib/components/xterm-wrap.tsx
+++ b/libs/remix-ui/xterm/src/lib/components/xterm-wrap.tsx
@@ -232,6 +232,6 @@ export class Xterm extends React.Component
{
}
render() {
- return
+ return
}
}
\ No newline at end of file
diff --git a/libs/remix-ui/xterm/src/lib/css/index.css b/libs/remix-ui/xterm/src/lib/css/index.css
index d7a13a031f..5912949212 100644
--- a/libs/remix-ui/xterm/src/lib/css/index.css
+++ b/libs/remix-ui/xterm/src/lib/css/index.css
@@ -1,70 +1,4 @@
-.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-y: scroll;
+ margin-bottom: 2.1rem;
}
diff --git a/libs/remix-ui/xterm/src/lib/reducer/index.ts b/libs/remix-ui/xterm/src/lib/reducer/index.ts
new file mode 100644
index 0000000000..a96d218523
--- /dev/null
+++ b/libs/remix-ui/xterm/src/lib/reducer/index.ts
@@ -0,0 +1,70 @@
+import { Actions, xTerminalUiState } from "@remix-ui/xterm"
+
+export const xTerminInitialState: xTerminalUiState = {
+ terminalsEnabled: false,
+ terminals: [],
+ shells: [],
+ showOutput: true,
+ workingDir: ''
+}
+
+export const xtermReducer = (state = xTerminInitialState, action: Actions) => {
+ switch (action.type) {
+ case 'ENABLE_TERMINALS':
+ return {
+ ...state,
+ terminalsEnabled: true
+ }
+ case 'DISABLE_TERMINALS':
+ return {
+ ...state,
+ terminalsEnabled: false
+ }
+ case 'ADD_TERMINAL':
+ return {
+ ...state,
+ terminals: [...state.terminals, action.payload]
+ }
+ case 'HIDE_TERMINAL':
+ return {
+ ...state,
+ terminals: state.terminals.map(terminal => terminal.pid === action.payload ? { ...terminal, hidden: true } : terminal)
+ }
+ case 'SHOW_TERMINAL':
+ return {
+ ...state,
+ terminals: state.terminals.map(terminal => terminal.pid === action.payload ? { ...terminal, hidden: false } : terminal)
+ }
+ case 'HIDE_ALL_TERMINALS':
+ return {
+ ...state,
+ terminals: state.terminals.map(terminal => ({ ...terminal, hidden: true }))
+ }
+ case 'REMOVE_TERMINAL': {
+ const removed = state.terminals.filter(xtermState => xtermState.pid !== action.payload)
+ if (removed.length > 0)
+ removed[removed.length - 1].hidden = false
+ return {
+ ...state,
+ terminals: removed
+ }
+ }
+ case 'ADD_SHELLS':
+ return {
+ ...state,
+ shells: action.payload
+ }
+ case 'SHOW_OUTPUT':
+ return {
+ ...state,
+ showOutput: action.payload
+ }
+ case 'SET_WORKING_DIR':
+ return {
+ ...state,
+ workingDir: action.payload
+ }
+ default:
+ return state
+ }
+}
diff --git a/libs/remix-ui/xterm/src/lib/types/index.ts b/libs/remix-ui/xterm/src/lib/types/index.ts
new file mode 100644
index 0000000000..170441acb9
--- /dev/null
+++ b/libs/remix-ui/xterm/src/lib/types/index.ts
@@ -0,0 +1,36 @@
+
+export interface xtermState {
+ pid: number
+ queue: string
+ timeStamp: number
+ ref: any
+ hidden: boolean
+}
+
+export interface xTerminalUiState {
+ terminalsEnabled: boolean
+ terminals: xtermState[]
+ shells: string[]
+ showOutput: boolean
+ workingDir: string
+}
+
+export interface ActionPayloadTypes {
+ ENABLE_TERMINALS: undefined,
+ DISABLE_TERMINALS: undefined,
+ ADD_TERMINAL: xtermState,
+ HIDE_TERMINAL: number,
+ SHOW_TERMINAL: number,
+ HIDE_ALL_TERMINALS: undefined,
+ REMOVE_TERMINAL: number,
+ ADD_SHELLS: string[],
+ SHOW_OUTPUT: boolean
+ SET_WORKING_DIR: string
+}
+
+export interface Action {
+ type: T,
+ payload: ActionPayloadTypes[T]
+}
+
+export type Actions = {[A in keyof ActionPayloadTypes]: Action}[keyof ActionPayloadTypes]
\ No newline at end of file