From fe1c580310b4013f8aa80ac93b0d0105d54376d1 Mon Sep 17 00:00:00 2001 From: Xavier Abad Date: Wed, 11 Feb 2026 21:24:32 +0100 Subject: [PATCH 1/3] feat: fetch folder items after sending items to trash --- .../components/DriveExplorerList.tsx | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/views/Drive/components/DriveExplorer/components/DriveExplorerList.tsx b/src/views/Drive/components/DriveExplorer/components/DriveExplorerList.tsx index b3749e34ba..3402237b07 100644 --- a/src/views/Drive/components/DriveExplorer/components/DriveExplorerList.tsx +++ b/src/views/Drive/components/DriveExplorer/components/DriveExplorerList.tsx @@ -270,16 +270,14 @@ const DriveExplorerList: React.FC = memo((props) => { ); const moveToTrash = useCallback( - (item: ContextMenuDriveItem) => { - const driveItem = item as DriveItemData; - + (items: ContextMenuDriveItem[]) => { if (isSelectedSharedItem) { props.onOpenStopSharingAndMoveToTrashDialog(); } else { - moveItemsToTrash([driveItem]); + moveItemsToTrash(items as DriveItemData[], () => dispatch(fetchSortedFolderContentThunk(currentFolderId))); } }, - [isSelectedSharedItem, props.onOpenStopSharingAndMoveToTrashDialog, moveItemsToTrash], + [isSelectedSharedItem, props.onOpenStopSharingAndMoveToTrashDialog, moveItemsToTrash, dispatch], ); const selectedItemsContextMenu = contextMenuSelectedItems({ @@ -295,9 +293,7 @@ const DriveExplorerList: React.FC = memo((props) => { workspaceCredentials, }); }, - moveToTrash: () => { - isSelectedSharedItems ? props.onOpenStopSharingAndMoveToTrashDialog() : moveItemsToTrash(props.selectedItems); - }, + moveToTrash: () => moveToTrash(props.selectedItems), }); const multipleSelectedTrashItemsContextMenu = contextMenuMultipleSelectedTrashItems({ @@ -354,7 +350,7 @@ const DriveExplorerList: React.FC = memo((props) => { renameItem: renameItem, moveItem: moveItem, downloadItem: downloadItem, - moveToTrash: moveToTrash, + moveToTrash: () => moveToTrash(props.selectedItems), }); const selectedFileMenu = contextMenuDriveNotSharedLink({ @@ -365,7 +361,7 @@ const DriveExplorerList: React.FC = memo((props) => { renameItem: renameItem, moveItem: moveItem, downloadItem: downloadItem, - moveToTrash: moveToTrash, + moveToTrash: () => moveToTrash(props.selectedItems), }); const shareWithTeam = () => { @@ -381,7 +377,7 @@ const DriveExplorerList: React.FC = memo((props) => { renameItem: renameItem, moveItem: moveItem, downloadItem: downloadItem, - moveToTrash: moveToTrash, + moveToTrash: () => moveToTrash(props.selectedItems), }); const workspaceFolderMenu = contextMenuWorkspaceFolder({ @@ -392,7 +388,7 @@ const DriveExplorerList: React.FC = memo((props) => { renameItem: renameItem, moveItem: moveItem, downloadItem: downloadItem, - moveToTrash: moveToTrash, + moveToTrash: () => moveToTrash(props.selectedItems), }); const getContextMenu = () => { @@ -502,9 +498,7 @@ const DriveExplorerList: React.FC = memo((props) => { keyBoardShortcutActions={{ onBackspaceKeyPressed: () => { if (props.selectedItems.length) { - isSelectedSharedItems - ? props.onOpenStopSharingAndMoveToTrashDialog() - : moveItemsToTrash(props.selectedItems); + moveToTrash(props.selectedItems); } }, onRKeyPressed: () => { From ee7348f8b9b684df02de328fcdc3b03d3313490e Mon Sep 17 00:00:00 2001 From: Xavier Abad Date: Thu, 12 Feb 2026 08:49:50 +0100 Subject: [PATCH 2/3] fix: check if there are shared items --- .../components/DriveExplorer/components/DriveExplorerList.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Drive/components/DriveExplorer/components/DriveExplorerList.tsx b/src/views/Drive/components/DriveExplorer/components/DriveExplorerList.tsx index 3402237b07..d8aead3cdb 100644 --- a/src/views/Drive/components/DriveExplorer/components/DriveExplorerList.tsx +++ b/src/views/Drive/components/DriveExplorer/components/DriveExplorerList.tsx @@ -271,13 +271,13 @@ const DriveExplorerList: React.FC = memo((props) => { const moveToTrash = useCallback( (items: ContextMenuDriveItem[]) => { - if (isSelectedSharedItem) { + if (isSelectedSharedItems) { props.onOpenStopSharingAndMoveToTrashDialog(); } else { moveItemsToTrash(items as DriveItemData[], () => dispatch(fetchSortedFolderContentThunk(currentFolderId))); } }, - [isSelectedSharedItem, props.onOpenStopSharingAndMoveToTrashDialog, moveItemsToTrash, dispatch], + [isSelectedSharedItems, props.onOpenStopSharingAndMoveToTrashDialog, moveItemsToTrash, dispatch], ); const selectedItemsContextMenu = contextMenuSelectedItems({ From 7f158f8e15abb796f30d026a94a97b1c29f52fff Mon Sep 17 00:00:00 2001 From: Xavier Abad Date: Thu, 12 Feb 2026 12:38:23 +0100 Subject: [PATCH 3/3] fix: add current folder id as callback dependency --- .../components/DriveExplorer/components/DriveExplorerList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Drive/components/DriveExplorer/components/DriveExplorerList.tsx b/src/views/Drive/components/DriveExplorer/components/DriveExplorerList.tsx index d8aead3cdb..35b1ec10c0 100644 --- a/src/views/Drive/components/DriveExplorer/components/DriveExplorerList.tsx +++ b/src/views/Drive/components/DriveExplorer/components/DriveExplorerList.tsx @@ -277,7 +277,7 @@ const DriveExplorerList: React.FC = memo((props) => { moveItemsToTrash(items as DriveItemData[], () => dispatch(fetchSortedFolderContentThunk(currentFolderId))); } }, - [isSelectedSharedItems, props.onOpenStopSharingAndMoveToTrashDialog, moveItemsToTrash, dispatch], + [isSelectedSharedItems, props.onOpenStopSharingAndMoveToTrashDialog, moveItemsToTrash, dispatch, currentFolderId], ); const selectedItemsContextMenu = contextMenuSelectedItems({