fix: tab open incosistency

tact-lang · Sep 18, 2024 · 8b32a17 · 8b32a17
1 parent 2fc5e49
commit 8b32a17
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/components/workspace/Editor/Editor.tsx b/src/components/workspace/Editor/Editor.tsx
@@ -71,6 +71,10 @@ const Editor: FC<Props> = ({ className = '' }) => {
     }
   };
 
+  const updateFileSaveCounter = () => {
+    setSaveFileCounter((prev) => prev + 1);
+  };
+
   useEffect(() => {
     async function loadMonacoEditor() {
       const monaco = await import('monaco-editor');
@@ -115,9 +119,7 @@ const Editor: FC<Props> = ({ className = '' }) => {
 
   useEffect(() => {
     if (!isLoaded) return;
-    EventEmitter.on('SAVE_FILE', () => {
-      setSaveFileCounter((prev) => prev + 1);
-    });
+    EventEmitter.on('SAVE_FILE', updateFileSaveCounter);
 
     // If file is changed e.g. in case of build process then force update in editor
     EventEmitter.on('FORCE_UPDATE_FILE', (filePath: string) => {
@@ -132,7 +134,7 @@ const Editor: FC<Props> = ({ className = '' }) => {
       });
     });
     return () => {
-      EventEmitter.off('SAVE_FILE');
+      EventEmitter.off('SAVE_FILE', updateFileSaveCounter);
       EventEmitter.off('FORCE_UPDATE_FILE');
     };
   }, [isLoaded]);

diff --git a/src/components/workspace/Tabs/Tabs.tsx b/src/components/workspace/Tabs/Tabs.tsx
@@ -27,7 +27,10 @@ const Tabs: FC = () => {
 
   useEffect(() => {
     EventEmitter.on('FILE_SAVED', onFileSave);
-  }, []);
+    return () => {
+      EventEmitter.off('FILE_SAVED', onFileSave);
+    };
+  }, [updateFileDirty]);
 
   if (fileTab.items.length === 0) {
     return <></>;

diff --git a/src/hooks/fileTabs.hooks.ts b/src/hooks/fileTabs.hooks.ts
@@ -1,6 +1,7 @@
 import fileSystem from '@/lib/fs';
 import { IDEContext, IFileTab } from '@/state/IDE.context';
 import EventEmitter from '@/utility/eventEmitter';
+import cloneDeep from 'lodash.clonedeep';
 import { useContext } from 'react';
 
 const useFileTab = () => {
@@ -39,7 +40,7 @@ const useFileTab = () => {
           ...parsedSetting,
         };
       }
-      setFileTab(parsedSetting.tab);
+      setFileTab(cloneDeep(parsedSetting.tab));
 
       await fileSystem.writeFile(
         settingPath,
@@ -102,12 +103,11 @@ const useFileTab = () => {
       updatedTab = { items: updatedItems, active: newActiveTab };
     }
 
-    setFileTab(updatedTab);
     syncTabSettings(updatedTab);
   };
 
   const updateFileDirty = (filePath: string, isDirty: boolean) => {
-    const updatedItems = fileTab.items.map((item) => {
+    const updatedItems = cloneDeep(fileTab).items.map((item) => {
       if (item.path === filePath) {
         return { ...item, isDirty: isDirty };
       }