Merge pull request #769 from ethereum/open-focus

Open manually created file
pull/738/head^2
yann300 4 years ago committed by GitHub
commit 9067c636e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      apps/remix-ide-e2e/src/commands/addFile.ts
  2. 15
      libs/remix-ui/file-explorer/src/lib/file-explorer.tsx

@ -24,7 +24,7 @@ function addFile (browser: NightwatchBrowser, name: string, content: NightwatchC
.sendKeys('*[data-id="treeViewLitreeViewItembrowser/blank"] .remixui_items', browser.Keys.ENTER)
.pause(2000)
.waitForElementVisible(`li[data-id="treeViewLitreeViewItembrowser/${name}"]`)
.click(`li[data-id="treeViewLitreeViewItembrowser/${name}"]`)
// .click(`li[data-id="treeViewLitreeViewItembrowser/${name}"]`)
.setEditorValue(content.content)
.pause(1000)
.perform(function () {

@ -285,7 +285,12 @@ export const FileExplorer = (props: FileExplorerProps) => {
const createFile = await fileManager.writeFile(newName, '')
if (!createFile) {
toast('Failed to create file ' + newName)
return toast('Failed to create file ' + newName)
} else {
await fileManager.open(newName)
setState(prevState => {
return { ...prevState, focusElement: [{ key: newName, type: 'file' }] }
})
}
}
})
@ -300,7 +305,9 @@ export const FileExplorer = (props: FileExplorerProps) => {
if (exists) return
await fileManager.mkdir(dirName)
// addFolder(parentFolder, newFolderPath)
setState(prevState => {
return { ...prevState, focusElement: [{ key: newFolderPath, type: 'folder' }] }
})
} catch (e) {
console.log('error: ', e)
toast('Failed to create folder: ' + newFolderPath)
@ -376,7 +383,7 @@ export const FileExplorer = (props: FileExplorerProps) => {
setState(prevState => {
const uniquePaths = [...new Set([...prevState.expandPath, ...expandPath])]
return { ...prevState, files, expandPath: uniquePaths, focusElement: [{ key: filePath, type: 'file' }] }
return { ...prevState, files, expandPath: uniquePaths }
})
if (filePath.includes('_test.sol')) {
plugin.event.trigger('newTestFileCreated', [filePath])
@ -393,7 +400,7 @@ export const FileExplorer = (props: FileExplorerProps) => {
setState(prevState => {
const uniquePaths = [...new Set([...prevState.expandPath, ...expandPath])]
return { ...prevState, files, expandPath: uniquePaths, focusElement: [{ key: folderPath, type: 'folder' }] }
return { ...prevState, files, expandPath: uniquePaths }
})
}

Loading…
Cancel
Save