From fcbf6c73c7e61e0e5167f0edd6026b6ae0478045 Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Tue, 16 Feb 2021 14:55:01 +0100
Subject: [PATCH] Set border and update message for same file/folder

---
 .../file-explorer/src/lib/file-explorer.tsx         | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/libs/remix-ui/file-explorer/src/lib/file-explorer.tsx b/libs/remix-ui/file-explorer/src/lib/file-explorer.tsx
index 63ac44ea01..0282074d23 100644
--- a/libs/remix-ui/file-explorer/src/lib/file-explorer.tsx
+++ b/libs/remix-ui/file-explorer/src/lib/file-explorer.tsx
@@ -339,7 +339,12 @@ export const FileExplorer = (props: FileExplorerProps) => {
     try {
       const exists = await fileManager.exists(dirName)
 
-      if (exists) return
+      if (exists) {
+        return modal('Rename File Failed', `A file or folder ${extractNameFromKey(newFolderPath)} already exists at this location. Please choose a different name.`, {
+          label: 'Close',
+          fn: () => {}
+        }, null)
+      }
       await fileManager.mkdir(dirName)
       setState(prevState => {
         return { ...prevState, focusElement: [{ key: newFolderPath, type: 'folder' }] }
@@ -379,7 +384,7 @@ export const FileExplorer = (props: FileExplorerProps) => {
       const exists = await fileManager.exists(newPath)
 
       if (exists) {
-        modal('Rename File Failed', 'File name already exists', {
+        modal('Rename File Failed', `A file or folder ${extractNameFromKey(newPath)} already exists at this location. Please choose a different name.`, {
           label: 'Close',
           fn: () => {}
         }, null)
@@ -894,8 +899,8 @@ export const FileExplorer = (props: FileExplorerProps) => {
     const labelClass = state.focusEdit.element === file.path
       ? 'bg-light' : state.focusElement.findIndex(item => item.key === file.path) !== -1
         ? 'bg-secondary' : state.mouseOverElement === file.path
-          ? 'bg-secondary' : (state.focusContext.element === file.path) && (state.focusEdit.element !== file.path)
-            ? 'bg-secondary' : ''
+          ? 'bg-light border' : (state.focusContext.element === file.path) && (state.focusEdit.element !== file.path)
+            ? 'bg-light border' : ''
 
     if (file.isDirectory) {
       return (