Commit b6a913a2 authored by gxkai's avatar gxkai

fix: 暂时移除高亮

parent 177fb686
...@@ -283,7 +283,6 @@ export class VerticalIcons extends Plugin { ...@@ -283,7 +283,6 @@ export class VerticalIcons extends Plugin {
${this.iconKind.analysis} ${this.iconKind.analysis}
${this.iconKind.debugging} ${this.iconKind.debugging}
${this.iconKind.none} ${this.iconKind.none}
${this.iconKind.settings}
</div> </div>
</div> </div>
` `
......
...@@ -185,9 +185,6 @@ export class MainView { ...@@ -185,9 +185,6 @@ export class MainView {
<div class=${css.mainview}> <div class=${css.mainview}>
${self.tabProxy.renderTabsbar()} ${self.tabProxy.renderTabsbar()}
${self._view.editor} ${self._view.editor}
<div>
<!--iframe hack-->
</div>
${self._view.mainPanel} ${self._view.mainPanel}
${self._components.contextView.render()} ${self._components.contextView.render()}
${self._view.terminal} ${self._view.terminal}
......
...@@ -161,6 +161,7 @@ export const EditorUI = (props: EditorUIProps) => { ...@@ -161,6 +161,7 @@ export const EditorUI = (props: EditorUIProps) => {
} }
props.editorAPI.getFontSize = () => { props.editorAPI.getFontSize = () => {
debugger
if (!editorRef.current) return if (!editorRef.current) return
return Number(editorRef.current.getFontSize()) return Number(editorRef.current.getFontSize())
} }
......
...@@ -511,7 +511,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => { ...@@ -511,7 +511,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
<div className="mb-2"> <div className="mb-2">
<label className="remixui_compilerLabel form-check-label" htmlFor="versionSelector"> <label className="remixui_compilerLabel form-check-label" htmlFor="versionSelector">
编译 编译
{/*<button className="far fa-plus-square border-0 p-0 mx-2 btn-sm" onClick={promptCompiler} title="Add a custom compiler with URL"></button>*/} {/* <button className="far fa-plus-square border-0 p-0 mx-2 btn-sm" onClick={promptCompiler} title="Add a custom compiler with URL"></button> */}
</label> </label>
<select value={ state.selectedVersion || state.defaultVersion } onChange={(e) => handleLoadVersion(e.target.value) } className="custom-select" id="versionSelector" disabled={state.allversions.length <= 0}> <select value={ state.selectedVersion || state.defaultVersion } onChange={(e) => handleLoadVersion(e.target.value) } className="custom-select" id="versionSelector" disabled={state.allversions.length <= 0}>
{ state.allversions.length <= 0 && <option disabled data-id={state.selectedVersion === state.defaultVersion ? 'selected' : ''}>{ state.defaultVersion }</option> } { state.allversions.length <= 0 && <option disabled data-id={state.selectedVersion === state.defaultVersion ? 'selected' : ''}>{ state.defaultVersion }</option> }
...@@ -525,15 +525,15 @@ export const CompilerContainer = (props: CompilerContainerProps) => { ...@@ -525,15 +525,15 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
} }
</select> </select>
</div> </div>
{/*<div className="mb-2 remixui_nightlyBuilds custom-control custom-checkbox">*/} {/* <div className="mb-2 remixui_nightlyBuilds custom-control custom-checkbox"> */}
{/* <input className="mr-2 custom-control-input" id="nightlies" type="checkbox" onChange={handleNightliesChange} checked={state.includeNightlies} />*/} {/* <input className="mr-2 custom-control-input" id="nightlies" type="checkbox" onChange={handleNightliesChange} checked={state.includeNightlies} /> */}
{/* <label htmlFor="nightlies" data-id="compilerNightliesBuild" className="form-check-label custom-control-label">Include nightly builds</label>*/} {/* <label htmlFor="nightlies" data-id="compilerNightliesBuild" className="form-check-label custom-control-label">Include nightly builds</label> */}
{/*</div>*/} {/* </div> */}
<div className="mb-2"> <div className="mb-2">
<label className="remixui_compilerLabel form-check-label" htmlFor="compilierLanguageSelector">语言</label> <label className="remixui_compilerLabel form-check-label" htmlFor="compilierLanguageSelector">语言</label>
<select onChange={(e) => handleLanguageChange(e.target.value)} value={state.language} className="custom-select" id="compilierLanguageSelector" title="Available since v0.5.7"> <select onChange={(e) => handleLanguageChange(e.target.value)} value={state.language} className="custom-select" id="compilierLanguageSelector" title="Available since v0.5.7">
<option value='Solidity'>Solidity</option> <option value='Solidity'>Solidity</option>
<option value='Yul'>Yul</option> {/* <option value='Yul'>Yul</option> */}
</select> </select>
</div> </div>
<div className="mb-2"> <div className="mb-2">
......
...@@ -60,7 +60,9 @@ export const TabsUI = (props: TabsUIProps) => { ...@@ -60,7 +60,9 @@ export const TabsUI = (props: TabsUIProps) => {
active active
}) })
}, []) }, [])
const handleSelect = (index) => {
props.onSelect(index); currentIndexRef.current = index; setSelectedIndex(index)
}
return ( return (
<div className="remix-ui-tabs header nav nav-tabs"> <div className="remix-ui-tabs header nav nav-tabs">
<div className="d-flex flex-row justify-content-center align-items-center left-icon"> <div className="d-flex flex-row justify-content-center align-items-center left-icon">
...@@ -68,7 +70,7 @@ export const TabsUI = (props: TabsUIProps) => { ...@@ -68,7 +70,7 @@ export const TabsUI = (props: TabsUIProps) => {
<span data-id="tabProxyZoomIn" className="btn btn-sm px-1 fas fa-search-plus text-dark" title="Zoom in" onClick={() => props.onZoomIn()}></span> <span data-id="tabProxyZoomIn" className="btn btn-sm px-1 fas fa-search-plus text-dark" title="Zoom in" onClick={() => props.onZoomIn()}></span>
<i className="d-flex flex-row justify-content-center align-items-center far fa-sliders-v px-1" title="press F1 when focusing the editor to show advanced configuration settings"></i> <i className="d-flex flex-row justify-content-center align-items-center far fa-sliders-v px-1" title="press F1 when focusing the editor to show advanced configuration settings"></i>
</div> </div>
<Tabs className="tab-scroll" selectedIndex={selectedIndex} onSelect={index => { props.onSelect(index); currentIndexRef.current = index; setSelectedIndex(index) }} > <Tabs className="tab-scroll" selectedIndex={selectedIndex} onSelect={index => { handleSelect(index) }} >
<TabList>{props.tabs.map((tab, i) => <Tab key={tab.name}>{renderTab(tab, i)}</Tab>)}</TabList> <TabList>{props.tabs.map((tab, i) => <Tab key={tab.name}>{renderTab(tab, i)}</Tab>)}</TabList>
{props.tabs.map((tab) => <TabPanel key={tab.name} ></TabPanel>)} {props.tabs.map((tab) => <TabPanel key={tab.name} ></TabPanel>)}
</Tabs> </Tabs>
......
...@@ -82,7 +82,6 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => { ...@@ -82,7 +82,6 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
const scrollToBottom = () => { const scrollToBottom = () => {
messagesEndRef.current.scrollIntoView({ behavior: 'smooth' }) messagesEndRef.current.scrollIntoView({ behavior: 'smooth' })
} }
useEffect(() => { useEffect(() => {
scriptRunnerDispatch({ type: 'html', payload: { message: logHtmlResponse } }) scriptRunnerDispatch({ type: 'html', payload: { message: logHtmlResponse } })
}, [logHtmlResponse]) }, [logHtmlResponse])
...@@ -116,7 +115,6 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => { ...@@ -116,7 +115,6 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
useEffect(() => { useEffect(() => {
scrollToBottom() scrollToBottom()
}, [newstate.journalBlocks.length, logHtmlResponse.length, toaster]) }, [newstate.journalBlocks.length, logHtmlResponse.length, toaster])
function execute (file, cb) { function execute (file, cb) {
function _execute (content, cb) { function _execute (content, cb) {
if (!content) { if (!content) {
...@@ -190,9 +188,11 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => { ...@@ -190,9 +188,11 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
} }
} }
const handleMinimizeTerminal = (e) => { const handleMinimizeTerminal = (e?:any) => {
if (e) {
e.preventDefault() e.preventDefault()
e.stopPropagation() e.stopPropagation()
}
if (toggleDownUp === 'fa-angle-double-down') { if (toggleDownUp === 'fa-angle-double-down') {
setToggleDownUp('fa-angle-double-up') setToggleDownUp('fa-angle-double-up')
event.trigger('resize', []) event.trigger('resize', [])
...@@ -202,7 +202,6 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => { ...@@ -202,7 +202,6 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
setToggleDownUp('fa-angle-double-down') setToggleDownUp('fa-angle-double-down')
} }
} }
const focusinput = () => { const focusinput = () => {
inputEl.current.focus() inputEl.current.focus()
} }
...@@ -511,7 +510,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => { ...@@ -511,7 +510,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
}}></div> }}></div>
<div className="terminal"> <div className="terminal">
<div id='journal' className='journal' data-id='terminalJournal'> <div id='journal' className='journal' data-id='terminalJournal'>
{/*{!clearConsole && <TerminalWelcomeMessage packageJson={version}/>}*/} {/* {!clearConsole && <TerminalWelcomeMessage packageJson={version}/>} */}
{newstate.journalBlocks && newstate.journalBlocks.map((x, index) => { {newstate.journalBlocks && newstate.journalBlocks.map((x, index) => {
if (x.name === EMPTY_BLOCK) { if (x.name === EMPTY_BLOCK) {
return ( return (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment