From bda94c960fc73982aa868ae980d688657ea7b287 Mon Sep 17 00:00:00 2001 From: Aniket-Engg Date: Fri, 13 May 2022 14:49:54 +0530 Subject: [PATCH 1/3] fix all tabs closing --- apps/remix-ide/src/app/panels/tab-proxy.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/remix-ide/src/app/panels/tab-proxy.js b/apps/remix-ide/src/app/panels/tab-proxy.js index f9a11c2b93..d6d2b58ec0 100644 --- a/apps/remix-ide/src/app/panels/tab-proxy.js +++ b/apps/remix-ide/src/app/panels/tab-proxy.js @@ -153,6 +153,10 @@ export class TabProxy extends Plugin { displayName, () => this.emit('switchApp', name), () => { + if(name === 'home' && this.loadedTabs.length === 1 && this.loadedTabs[0].id === "home") { + const files = Object.keys(this.editor.sessions) + files.forEach(filepath => this.editor.discard(filepath)) + } this.emit('closeApp', name) this.call('manager', 'deactivatePlugin', name) }, From b9429e2133ffe2fd9f4025d4a1427890e8049661 Mon Sep 17 00:00:00 2001 From: Aniket-Engg Date: Mon, 16 May 2022 14:03:01 +0530 Subject: [PATCH 2/3] fix current file --- apps/remix-ide/src/app/editor/editor.js | 1 + libs/remix-ui/editor/src/lib/remix-ui-editor.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/remix-ide/src/app/editor/editor.js b/apps/remix-ide/src/app/editor/editor.js index 9fe194eeab..9bf7e3fec6 100644 --- a/apps/remix-ide/src/app/editor/editor.js +++ b/apps/remix-ide/src/app/editor/editor.js @@ -143,6 +143,7 @@ class Editor extends Plugin { this.on('fileManager', 'fileClosed', (name) => { if (name === this.currentFile) { this.currentFile = null + this.renderComponent() } }) this.on('theme', 'themeLoaded', (theme) => { diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx index 7bc0efe7b0..0c718a8865 100644 --- a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx +++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx @@ -228,7 +228,7 @@ export const EditorUI = (props: EditorUIProps) => { useEffect(() => { - if (!editorRef.current) return + if (!editorRef.current || !props.currentFile) return currentFileRef.current = props.currentFile const file = editorModelsState[props.currentFile] editorRef.current.setModel(file.model) From 7615896d8ade3b2e14202867943add069d0122f2 Mon Sep 17 00:00:00 2001 From: Aniket-Engg Date: Mon, 16 May 2022 14:04:31 +0530 Subject: [PATCH 3/3] space added --- apps/remix-ide/src/app/panels/tab-proxy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/remix-ide/src/app/panels/tab-proxy.js b/apps/remix-ide/src/app/panels/tab-proxy.js index d6d2b58ec0..ec8026c517 100644 --- a/apps/remix-ide/src/app/panels/tab-proxy.js +++ b/apps/remix-ide/src/app/panels/tab-proxy.js @@ -153,7 +153,7 @@ export class TabProxy extends Plugin { displayName, () => this.emit('switchApp', name), () => { - if(name === 'home' && this.loadedTabs.length === 1 && this.loadedTabs[0].id === "home") { + if (name === 'home' && this.loadedTabs.length === 1 && this.loadedTabs[0].id === "home") { const files = Object.keys(this.editor.sessions) files.forEach(filepath => this.editor.discard(filepath)) }