Commit 486daf4b authored by tizah's avatar tizah Committed by davidzagi93@gmail.com

olved conflicts on package.json dding method to the terminal.ts

parent 7b044213
...@@ -18,7 +18,7 @@ export interface RemixUiTerminalProps { ...@@ -18,7 +18,7 @@ export interface RemixUiTerminalProps {
export const RemixUiTerminal = (props: RemixUiTerminalProps) => { export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
const [toggleDownUp, setToggleDownUp] = useState('fa-angle-double-down') const [toggleDownUp, setToggleDownUp] = useState('fa-angle-double-down')
const [inserted, setInserted] = useState(false)
// events // events
useEffect(() => { useEffect(() => {
// window.addEventListener('resize', function () { // window.addEventListener('resize', function () {
...@@ -46,6 +46,16 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => { ...@@ -46,6 +46,16 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
} }
console.log(props.event, 'event.trigger') console.log(props.event, 'event.trigger')
} }
const reattached = (event) => {
let el = event.currentTarget
var isBottomed = el.scrollHeight - el.scrollTop - el.clientHeight < 30
if (isBottomed) {
}
}
return ( return (
<div> <div>
<div className="bar"> <div className="bar">
...@@ -91,7 +101,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => { ...@@ -91,7 +101,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
</div> </div>
</div> </div>
</div> </div>
<div className="terminal_container" data-id="terminalContainer" > <div className="terminal_container" data-id="terminalContainer" >
{/* onScroll=${throttle(reattach, 10)} onkeydown=${focusinput} */} {/* onScroll=${throttle(reattach, 10)} onkeydown=${focusinput} */}
{/* {props.autoCompletePopup.render()} */} {/* {props.autoCompletePopup.render()} */}
{console.log({ props })} {console.log({ props })}
...@@ -103,6 +113,8 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => { ...@@ -103,6 +113,8 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
zIndex: -1 zIndex: -1
}}></div> }}></div>
<div className="terminal"> <div className="terminal">
<div id="journal" className="journal" data-id="terminalJournal">
</div>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
"onchange": "onchange apps/remix-ide/build/app.js -- npm-run-all lint", "onchange": "onchange apps/remix-ide/build/app.js -- npm-run-all lint",
"remixd": "nx build remixd && nx serve remixd --folder=./apps/remix-ide/contracts --remixide=http://127.0.0.1:8080", "remixd": "nx build remixd && nx serve remixd --folder=./apps/remix-ide/contracts --remixide=http://127.0.0.1:8080",
"selenium": "selenium-standalone start", "selenium": "selenium-standalone start",
"selenium-install": "selenium-standalone install", "selenium-install": "selenium-standalone install",
"sourcemap": "exorcist --root ../ apps/remix-ide/build/app.js.map > apps/remix-ide/build/app.js", "sourcemap": "exorcist --root ../ apps/remix-ide/build/app.js.map > apps/remix-ide/build/app.js",
"test-browser": "npm-run-all -lpr selenium make-mock-compiler serve browsertest", "test-browser": "npm-run-all -lpr selenium make-mock-compiler serve browsertest",
"watch": "watchify apps/remix-ide/src/index.js -dv -p browserify-reload -o apps/remix-ide/build/app.js --exclude solc", "watch": "watchify apps/remix-ide/src/index.js -dv -p browserify-reload -o apps/remix-ide/build/app.js --exclude solc",
......
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