From faf9252253c5c4223da616456bd9146a000d3459 Mon Sep 17 00:00:00 2001
From: gitstart <bot@gitstart.com>
Date: Wed, 7 Dec 2022 08:18:06 +0000
Subject: [PATCH] fix: row click event trigger on menu item click

---
 .../to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.js  | 4 ++++
 studio/localStores/storageExplorer/StorageExplorerStore.js    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.js b/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.js
index ebf400f1ea1..efc6aa48d98 100644
--- a/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.js
+++ b/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.js
@@ -307,6 +307,10 @@ const FileExplorerRow = ({
           className={`flex items-center justify-end ${
             view === STORAGE_VIEWS.LIST ? 'flex-grow' : 'w-[10%]'
           }`}
+          onClick={(event) =>
+            // Stops click event from this div, to resolve an issue with menu item's click event triggering unexpected row select
+            event.stopPropagation()
+          }
         >
           {item.status === STORAGE_ROW_STATUS.LOADING ? (
             <IconLoader
diff --git a/studio/localStores/storageExplorer/StorageExplorerStore.js b/studio/localStores/storageExplorer/StorageExplorerStore.js
index f3bcfd79a4b..deff03b454e 100644
--- a/studio/localStores/storageExplorer/StorageExplorerStore.js
+++ b/studio/localStores/storageExplorer/StorageExplorerStore.js
@@ -1176,7 +1176,7 @@ class StorageExplorerStore {
     const files = await this.getAllItemsAlongFolder(folder)
     await this.deleteFiles(files, isDeleteFolder)
 
-    const isFolderOpen = this.openedFolders[this.openedFolders.length - 1].name === folder.name
+    const isFolderOpen = this.openedFolders[this.openedFolders.length - 1]?.name === folder.name
     if (isFolderOpen) {
       this.popColumnAtIndex(folder.columnIndex)
       this.popOpenedFoldersAtIndex(folder.columnIndex - 1)