Skip to content

[_]: fix/fetch folder items after sending items to trash #1852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xabg2 merged 5 commits into from
Feb 12, 2026
+10 −16
Merged

[_]: fix/fetch folder items after sending items to trash #1852

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe1c580
feat: fetch folder items after sending items to trash
xabg2 Feb 11, 2026
98e7bf6
Merge branch 'master' into fix/fetch-items-after-deletion
xabg2 Feb 12, 2026
ee7348f
fix: check if there are shared items
xabg2 Feb 12, 2026
b27f783
Merge branch 'fix/fetch-items-after-deletion' of github.com:internxt/…
xabg2 Feb 12, 2026
7f158f8
fix: add current folder id as callback dependency
xabg2 Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions src/views/Drive/components/DriveExplorer/components/DriveExplorerList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,16 +270,14 @@ const DriveExplorerList: React.FC<DriveExplorerListProps> = memo((props) => {
);

const moveToTrash = useCallback(
(item: ContextMenuDriveItem) => {
const driveItem = item as DriveItemData;

if (isSelectedSharedItem) {
(items: ContextMenuDriveItem[]) => {
if (isSelectedSharedItems) {
props.onOpenStopSharingAndMoveToTrashDialog();
} else {
moveItemsToTrash([driveItem]);
moveItemsToTrash(items as DriveItemData[], () => dispatch(fetchSortedFolderContentThunk(currentFolderId)));
}
},
[isSelectedSharedItem, props.onOpenStopSharingAndMoveToTrashDialog, moveItemsToTrash],
[isSelectedSharedItems, props.onOpenStopSharingAndMoveToTrashDialog, moveItemsToTrash, dispatch, currentFolderId],
);

const selectedItemsContextMenu = contextMenuSelectedItems({
Expand All @@ -295,9 +293,7 @@ const DriveExplorerList: React.FC<DriveExplorerListProps> = memo((props) => {
workspaceCredentials,
});
},
moveToTrash: () => {
isSelectedSharedItems ? props.onOpenStopSharingAndMoveToTrashDialog() : moveItemsToTrash(props.selectedItems);
},
moveToTrash: () => moveToTrash(props.selectedItems),
});

const multipleSelectedTrashItemsContextMenu = contextMenuMultipleSelectedTrashItems({
Expand Down Expand Up @@ -354,7 +350,7 @@ const DriveExplorerList: React.FC<DriveExplorerListProps> = memo((props) => {
renameItem: renameItem,
moveItem: moveItem,
downloadItem: downloadItem,
moveToTrash: moveToTrash,
moveToTrash: () => moveToTrash(props.selectedItems),
});

const selectedFileMenu = contextMenuDriveNotSharedLink({
Expand All @@ -365,7 +361,7 @@ const DriveExplorerList: React.FC<DriveExplorerListProps> = memo((props) => {
renameItem: renameItem,
moveItem: moveItem,
downloadItem: downloadItem,
moveToTrash: moveToTrash,
moveToTrash: () => moveToTrash(props.selectedItems),
});

const shareWithTeam = () => {
Expand All @@ -381,7 +377,7 @@ const DriveExplorerList: React.FC<DriveExplorerListProps> = memo((props) => {
renameItem: renameItem,
moveItem: moveItem,
downloadItem: downloadItem,
moveToTrash: moveToTrash,
moveToTrash: () => moveToTrash(props.selectedItems),
});

const workspaceFolderMenu = contextMenuWorkspaceFolder({
Expand All @@ -392,7 +388,7 @@ const DriveExplorerList: React.FC<DriveExplorerListProps> = memo((props) => {
renameItem: renameItem,
moveItem: moveItem,
downloadItem: downloadItem,
moveToTrash: moveToTrash,
moveToTrash: () => moveToTrash(props.selectedItems),
});

const getContextMenu = () => {
Expand Down Expand Up @@ -502,9 +498,7 @@ const DriveExplorerList: React.FC<DriveExplorerListProps> = memo((props) => {
keyBoardShortcutActions={{
onBackspaceKeyPressed: () => {
if (props.selectedItems.length) {
isSelectedSharedItems
? props.onOpenStopSharingAndMoveToTrashDialog()
: moveItemsToTrash(props.selectedItems);
moveToTrash(props.selectedItems);
}
},
onRKeyPressed: () => {
Expand Down
Loading