diff --git a/src/app/debugger/remix-debugger/src/ui/EthdebuggerUI.js b/src/app/debugger/remix-debugger/src/ui/EthdebuggerUI.js
index edb50a72b7..e6ffa2ff13 100644
--- a/src/app/debugger/remix-debugger/src/ui/EthdebuggerUI.js
+++ b/src/app/debugger/remix-debugger/src/ui/EthdebuggerUI.js
@@ -169,12 +169,18 @@ EthdebuggerUI.prototype.debug = function (tx) {
}
EthdebuggerUI.prototype.render = function () {
- this.browserView = yo`
- ${this.txBrowser.render()}
-
`
+ this.debuggerPanelsView = yo``
+ this.debuggerHeadPanelsView = yo``
+ this.stepManagerView = yo``
+
var view = yo`
- ${this.browserView}
+
+ ${this.txBrowser.render()}
+ ${this.debuggerHeadPanelsView}
+ ${this.stepManagerView}
+
${this.statusMessage}
+ ${this.debuggerPanelsView}
`
if (!this.view) {
this.view = view
@@ -187,6 +193,7 @@ EthdebuggerUI.prototype.unLoad = function () {
// this.debugger.codeManager.clear()
// this.debugger.stepManager.reset()
this.debugger.unLoad()
+ yo.update(this.debuggerHeadPanelsView, yo``)
yo.update(this.debuggerPanelsView, yo``)
yo.update(this.stepManagerView, yo``)
if (this.vmDebugger) this.vmDebugger.remove()
@@ -233,8 +240,9 @@ EthdebuggerUI.prototype.startDebugging = function (blockNumber, txIndex, tx) {
})
this.vmDebugger = new VmDebugger(this, this.debugger.traceManager, this.debugger.codeManager, this.debugger.solidityProxy, this.debugger.callTree)
- this.browserView.appendChild(this.stepManager.render())
- this.view.appendChild(this.vmDebugger.render())
+ yo.update(this.debuggerHeadPanelsView, this.vmDebugger.renderHead())
+ yo.update(this.debuggerPanelsView, this.vmDebugger.render())
+ yo.update(this.stepManagerView, this.stepManager.render())
this.debugger.debug(tx)
diff --git a/src/app/debugger/remix-debugger/src/ui/VmDebugger.js b/src/app/debugger/remix-debugger/src/ui/VmDebugger.js
index 608e8ba746..37b9322548 100644
--- a/src/app/debugger/remix-debugger/src/ui/VmDebugger.js
+++ b/src/app/debugger/remix-debugger/src/ui/VmDebugger.js
@@ -64,12 +64,9 @@ function VmDebugger (_parentUI, _traceManager, _codeManager, _solidityProxy, _ca
self.solidityState.storageResolver = storageResolver
self.solidityLocals.storageResolver = storageResolver
self.fullStoragesChangesPanel.storageResolver = storageResolver
- self.headView.style.display = 'block'
- self.view.style.display = 'block'
})
_parent.event.register('traceUnloaded', this, function () {
- self.headView.style.display = 'none'
- self.view.style.display = 'none'
+ if (!self.view) return
})
_parent.callTree.event.register('callTreeReady', () => {
if (!self.view) return
@@ -87,7 +84,7 @@ function VmDebugger (_parentUI, _traceManager, _codeManager, _solidityProxy, _ca
}
VmDebugger.prototype.renderHead = function () {
- var headView = yo`
+ var headView = yo`
${this.asmCode.render()}
${this.stepDetail.render()}
@@ -105,7 +102,7 @@ VmDebugger.prototype.remove = function () {
}
VmDebugger.prototype.render = function () {
- var view = yo`
+ var view = yo`
${this.solidityLocals.render()}
${this.solidityState.render()}