fix terminal

pull/5370/head
bunsenstraat 3 years ago committed by Aniket
parent e2aabb23c1
commit 0dabbc1a83
  1. 2
      libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
  2. 20
      libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx

@ -214,7 +214,7 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
<p className="mb-1"><a className="text-primary" target="_blank" href={labels[type].link}>{ labels[type].link }</a></p>
<div className=""><label>TOKEN:</label>
<div className="text-secondary mb-0 h6">
<input id="gistaccesstoken" data-id="settingsTabGistAccessToken" type="password" className="form-control" onChange={(e) => handleSaveTokenState(e, type)} value={ tokenValue[type] } />
<input id="gistaccesstoken" data-id="settingsTabGistAccessToken" type="password" className="form-control" onChange={(e) => handleSaveTokenState(e, type)} value={ tokenValue[type] || '' } />
<div className="d-flex justify-content-end pt-2">
<CopyToClipboard content={tokenValue[type]} data-id='copyToClipboardCopyIcon' />
<input className="btn btn-sm btn-primary ml-2" id="savegisttoken" data-id="settingsTabSaveGistToken" onClick={() => saveToken(type)} value="Save" type="button" disabled={tokenValue === ''}></input>

@ -86,8 +86,8 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
scriptRunnerDispatch({ type: 'html', payload: { message: [html ? html.innerText ? html.innerText : html : null] } })
},
log: (message, type) => {
scriptRunnerDispatch({ type: type ? type : 'log', payload: { message: [message] } })
log: (message) => {
scriptRunnerDispatch({ type: 'log', payload: { message: [message] } })
}
})
}, [])
@ -549,6 +549,11 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
<div className="px-4 block" data-id="block" key={i}><span className={x.style}>{ msg }</span></div>
)
} else if (typeof msg === 'object') {
if (msg.value && isHtml(msg.value)) {
return (
<div className={classNameBlock} data-id="block" key={i}><span className={x.style}>{ parse(msg.value) } </span></div>
)
}
let stringified
try {
stringified = JSON.stringify(msg)
@ -609,4 +614,13 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
)
}
export default RemixUiTerminal
function isHtml (value) {
if (!value.indexOf) return false
return value.indexOf('<div') !== -1
|| value.indexOf('<span') !== -1
|| value.indexOf('<p') !== -1
|| value.indexOf('<label') !== -1
|| value.indexOf('<b') !== -1
}
export default RemixUiTerminal
Loading…
Cancel
Save