fixes expanding

libs/remix-ui/workspace/src/lib/actions/events.ts

@@ -68,7 +68,7 @@ export const listenOnPluginEvents = (filePanelPlugin) => {
     let currentCheck = ''
     for (const value of paths) {
       currentCheck = currentCheck + '/' + value
-      //await folderAdded(currentCheck)
+      await folderAdded(currentCheck)
     }
   })
 }
@@ -192,6 +192,7 @@ const fileAdded = async (filePath: string) => {
 const folderAdded = async (folderPath: string) => {
   const provider = plugin.fileManager.currentFileProvider()
   const path = extractParentFromKey(folderPath) || ROOT_PATH
+  console.log('folderAdded', path)
   if (isElectron()) {
     const isExpanded = await plugin.call('filePanel', 'isExpanded', path)
     if (!isExpanded) return

libs/remix-ui/workspace/src/lib/components/flat-tree.tsx

@@ -203,6 +203,7 @@ export const FlatTree = (props: FlatTreeProps) => {
         <Popover id='popover-basic'
           placement='top'
           ref={ref}
+          className='popover'
           style={
             {
               position: 'fixed',

libs/remix-ui/workspace/src/lib/reducers/workspace.ts

@@ -347,7 +347,9 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
     const fd = fileAdded(state, payload)
     const dir = extractParentFromKey(payload)
     console.log('FILE_ADDED_SUCCESS', payload, dir)
-    const flatTree = flattenTree(fd, state.browser.expandPath)
+    const browserExpandPath = state.mode === 'browser'  && !isElectron() ? [...new Set([...state.browser.expandPath, payload])] : state.browser.expandPath
+    const localhostExpandPath = state.mode === 'localhost' ? [...new Set([...state.localhost.expandPath, payload])] : state.localhost.expandPath
+    const flatTree = flattenTree(fd, state.mode === 'browser'? browserExpandPath : localhostExpandPath)
     return {
       ...state,
       browser: {
@@ -358,9 +360,7 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
               : state.browser.files,
         flatTree: state.mode === 'browser' ? flatTree : state.browser.flatTree,
         expandPath:
-          state.mode === 'browser' && !isElectron()
+          browserExpandPath
-            ? [...new Set([...state.browser.expandPath, payload])]
-            : state.browser.expandPath
       },
       localhost: {
         ...state.localhost,
@@ -370,9 +370,7 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
               : state.localhost.files,
         flatTree: state.mode === 'localhost' ? flatTree : state.localhost.flatTree,
         expandPath:
-            state.mode === 'localhost' 
+            localhostExpandPath
-              ? [...new Set([...state.localhost.expandPath, payload])]
-              : state.localhost.expandPath
       }
     }
   }
@@ -381,7 +379,9 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
     const payload = action.payload
     const fd = fetchDirectoryContent(state, payload)
     console.log('FOLDER_ADDED_SUCCESS', payload)
-    const flatTree = flattenTree(fd, state.browser.expandPath)
+    const browserExpandPath = state.mode === 'browser'  && !isElectron() ? [...new Set([...state.browser.expandPath, payload.folderPath])] : state.browser.expandPath
+    const localhostExpandPath = state.mode === 'localhost' ? [...new Set([...state.localhost.expandPath, payload.folderPath])] : state.localhost.expandPath
+    const flatTree = flattenTree(fd, state.mode === 'browser'? browserExpandPath : localhostExpandPath)
     return {
       ...state,
       browser: {
@@ -392,9 +392,7 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
               : state.browser.files,
         flatTree: state.mode === 'browser' ? flatTree : state.browser.flatTree,
         expandPath:
-          state.mode === 'browser' && !isElectron()
+          browserExpandPath
-            ? [...new Set([...state.browser.expandPath, payload.folderPath])]
-            : state.browser.expandPath
       },
       localhost: {
         ...state.localhost,
@@ -404,14 +402,7 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
               : state.localhost.files,
         flatTree: state.mode === 'localhost' ? flatTree : state.localhost.flatTree,
         expandPath:
-            state.mode === 'localhost'
+            localhostExpandPath
-              ? [
-                ...new Set([
-                  ...state.localhost.expandPath,
-                  payload.folderPath
-                ])
-              ]
-              : state.localhost.expandPath
       }
     }
   }
@@ -419,7 +410,10 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
   case 'FILE_REMOVED_SUCCESS': {
     const payload = action.payload
     const fd = fileRemoved(state, payload)
-    const flatTree = flattenTree(fd, state.browser.expandPath)
+    const browserExpandPath = state.mode === 'browser'  && !isElectron() ? [...state.browser.expandPath.filter((path) => path !== payload)] : state.browser.expandPath
+    const localhostExpandPath = state.mode === 'localhost' ? [...state.localhost.expandPath.filter((path) => path !== payload)] : state.localhost.expandPath
+    const flatTree = flattenTree(fd, state.mode === 'browser'? browserExpandPath : localhostExpandPath)
+    
     return {
       ...state,
       browser: {
@@ -430,9 +424,7 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
               : state.browser.files,
         flatTree: state.mode === 'browser' ? flatTree : state.browser.flatTree,
         expandPath:
-            state.mode === 'browser'
+          browserExpandPath
-              ? [...state.browser.expandPath.filter((path) => path !== payload)]
-              : state.browser.expandPath
       },
       localhost: {
         ...state.localhost,
@@ -442,9 +434,7 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
               : state.localhost.files,
         flatTree: state.mode === 'localhost' ? flatTree : state.localhost.flatTree,
         expandPath:
-            state.mode === 'localhost'
+            localhostExpandPath
-              ? [...state.browser.expandPath.filter((path) => path !== payload)]
-              : state.localhost.expandPath
       }
     }
   }
@@ -902,6 +892,7 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
 }
 
 const flattenTree = (files, expandPath: string[]) =>{
+  console.log('flattenTree', files, expandPath)
   const flatTree = {}
   const mapChild = (file: FileType) => {
     flatTree[file.path] = file