fix: Selection flashing on both source editor and file explorer

kubeshop · Aug 31, 2021 · 1b6a867 · 1b6a867
1 parent 0abaf49
commit 1b6a867
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/components/molecules/Monaco/Monaco.tsx b/src/components/molecules/Monaco/Monaco.tsx
@@ -360,16 +360,18 @@ const Monaco = (props: {editorHeight: string}) => {
         </HiddenInputContainer>
       </MonacoButtons>
       <MonacoContainer ref={containerRef}>
-        <MonacoEditor
-          width={width}
-          height={editorHeight}
-          language="yaml"
-          theme={KUBESHOP_MONACO_THEME}
-          value={code}
-          options={options}
-          onChange={onChange}
-          editorDidMount={editorDidMount}
-        />
+        {firstCodeLoadedOnEditor && (
+          <MonacoEditor
+            width={width}
+            height={editorHeight}
+            language="yaml"
+            theme={KUBESHOP_MONACO_THEME}
+            value={code}
+            options={options}
+            onChange={onChange}
+            editorDidMount={editorDidMount}
+          />
+        )}
       </MonacoContainer>
     </>
   );

diff --git a/src/components/organisms/FileTreePane/FileTreePane.tsx b/src/components/organisms/FileTreePane/FileTreePane.tsx
@@ -295,7 +295,7 @@ const FileTreePane = () => {
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selectedResourceId]);
+  }, [selectedResourceId, tree]);
 
   useEffect(() => {
     // removes any highlight when a file is selected