move state update

libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx

@@ -136,6 +136,9 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
       const versionFromQueryParameter = getSelectVersionFromQueryParam()
       if (versionFromQueryParameter.isURL) _updateVersionSelector(state.defaultVersion, versionFromQueryParameter.selectedVersion)
       else{
+        setState((prevState) => {
+          return {...prevState, selectedVersion: versionFromQueryParameter.selectedVersion}
+        })
         updateCurrentVersion(versionFromQueryParameter.selectedVersion)
         _updateVersionSelector(versionFromQueryParameter.selectedVersion)
       }
@@ -546,13 +549,6 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
       url = customUrl
       api.setCompilerQueryParameters({version: selectedVersion})
     } else {
-
-      setState((prevState) => {
-        return {
-          ...prevState,
-          selectedVersion,
-        }
-      })
       if (checkSpecialChars(selectedVersion)) {
         return console.log('loading ' + selectedVersion + ' not allowed, special chars not allowed.')
       }

libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx

@@ -184,6 +184,7 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
     })
     data.selectorList = selectorList
     data.selectorList.reverse()
+    data.selectorList.unshift(builtin)
     setState((prevState) => {
       return { ...prevState, solJsonBinData: data }
     })

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

@@ -1,5 +1,6 @@
 import { fileDecoration } from '@remix-ui/file-decorators'
 import { extractParentFromKey } from '@remix-ui/helper'
+import isElectron from 'is-electron'
 import React from 'react'
 import { action, FileTree, WorkspaceTemplate } from '../types'
 import { ROOT_PATH } from '../utils/constants'
@@ -175,13 +176,13 @@ const removePluginActions = (plugin, cb: (err: Error, result?: string | number |
 }
 
 const fileAdded = async (filePath: string) => {
-  /*
-  const path = extractParentFromKey(filePath) || ROOT_PATH
-  console.log('fileAdded', filePath, path)
-  const isExpanded = await plugin.call('filePanel', 'isExpanded', path)
+  if (isElectron()) {
+    const path = extractParentFromKey(filePath) || ROOT_PATH
+    console.log('fileAdded', filePath, path)
+    const isExpanded = await plugin.call('filePanel', 'isExpanded', path)
 
-  if(!isExpanded) return
-  */
+    if (!isExpanded) return
+  }
   
   await dispatch(fileAddedSuccess(filePath))
   if (filePath.includes('_test.sol')) {
@@ -192,14 +193,13 @@ const fileAdded = async (filePath: string) => {
 const folderAdded = async (folderPath: string) => {
   const provider = plugin.fileManager.currentFileProvider()
   const path = extractParentFromKey(folderPath) || ROOT_PATH
-  /*
-  
-  const isExpanded = await plugin.call('filePanel', 'isExpanded', path)
-
-  console.log('folderAdded', folderPath, path, isExpanded)
+  if (isElectron()) {
+    const isExpanded = await plugin.call('filePanel', 'isExpanded', path)
 
-  if(!isExpanded) return
-  */
+    console.log('folderAdded', folderPath, path, isExpanded)
+    if (!isExpanded) return
+  }
+  
   const promise: Promise<FileTree> = new Promise((resolve) => {
     provider.resolveDirectory(path, (error, fileTree: FileTree) => {
       if (error) console.error(error)

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

@@ -3,6 +3,7 @@ import {action, Actions, FileType, WorkspaceElement} from '../types'
 import * as _ from 'lodash'
 import {fileDecoration} from '@remix-ui/file-decorators'
 import {ROOT_PATH} from '../utils/constants'
+import isElectron from 'is-electron'
 export interface BrowserState {
   browser: {
     currentWorkspace: string
@@ -328,7 +329,7 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
               ? fileAdded(state, payload)
               : state.browser.files,
         expandPath:
-          state.mode === 'browser'
+          state.mode === 'browser' && !isElectron()
             ? [...new Set([...state.browser.expandPath, payload])]
             : state.browser.expandPath
       },
@@ -339,7 +340,7 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
               ? fileAdded(state, payload)
               : state.localhost.files,
         expandPath:
-            state.mode === 'localhost'
+            state.mode === 'localhost' 
               ? [...new Set([...state.localhost.expandPath, payload])]
               : state.localhost.expandPath
       }
@@ -358,7 +359,7 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
               ? fetchDirectoryContent(state, payload)
               : state.browser.files,
         expandPath:
-          state.mode === 'browser'
+          state.mode === 'browser' && !isElectron()
             ? [...new Set([...state.browser.expandPath, payload.folderPath])]
             : state.browser.expandPath
       },