Skip to content

TagSpaces is an offline, open source, document manager with tagging support

By moving for more than one file, only the first is reflected in the current folder (#2033)

Stanimireea7018df342
diff --git a/src/renderer/hooks/DirectoryContentContextProvider.tsx b/src/renderer/hooks/DirectoryContentContextProvider.tsx
index 251750a9c..ab6849076 100644
--- a/src/renderer/hooks/DirectoryContentContextProvider.tsx
+++ b/src/renderer/hooks/DirectoryContentContextProvider.tsx
@@ -843,15 +843,24 @@ export const DirectoryContentContextProvider = ({
),
);
} else {
- const index = currentDirectoryEntries.current.findIndex((entry) =>
- entryPaths.includes(entry.path),
- );
- if (index > -1) {
+ const indexes = entryPaths
+ .map(function (path) {
+ return currentDirectoryEntries.current.findIndex(
+ (entry) => entry.path === path,
+ );
+ })
+ .sort((a, b) => b - a);
+ /*const uniqueIndexes = indexes
+ .filter(function (item, index) {
+ return indexes.indexOf(item) === index;
+ })*/
+
+ if (indexes.length > 0) {
// delete in place (for fs watcher events unlink/add in 20ms)
- currentDirectoryEntries.current.splice(index, 1);
- /*const entries = currentDirectoryEntries.filter(
- (entry) => !entryPaths.includes(entry.path),
- );*/
+ for (const index of indexes) {
+ currentDirectoryEntries.current.splice(index, 1);
+ }
+
setCurrentDirectoryEntries([...currentDirectoryEntries.current]); //entries);
}
}
diff --git a/src/renderer/hooks/SelectedEntryContextProvider.tsx b/src/renderer/hooks/SelectedEntryContextProvider.tsx
index b9fb18a95..facee0bdc 100644
--- a/src/renderer/hooks/SelectedEntryContextProvider.tsx
+++ b/src/renderer/hooks/SelectedEntryContextProvider.tsx
@@ -16,7 +16,13 @@
*
*/
-import React, { createContext, useEffect, useMemo, useState } from 'react';
+import React, {
+ createContext,
+ useEffect,
+ useMemo,
+ useReducer,
+ useRef,
+} from 'react';
import { TS } from '-/tagspaces.namespace';
import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
import useFirstRender from '-/utils/useFirstRender';
@@ -25,12 +31,14 @@ type SelectedEntryContextData = {
selectedEntries: TS.FileSystemEntry[];
lastSelectedEntryPath: string;
setSelectedEntries(entries: TS.FileSystemEntry[]);
+ selectEntry(entry: TS.FileSystemEntry, select?: boolean);
};
export const SelectedEntryContext = createContext<SelectedEntryContextData>({
selectedEntries: undefined,
lastSelectedEntryPath: undefined,
setSelectedEntries: undefined,
+ selectEntry: undefined,
});
export type SelectedEntryContextProviderProps = {
@@ -41,10 +49,9 @@ export const SelectedEntryContextProvider = ({
children,
}: SelectedEntryContextProviderProps) => {
const { currentLocation } = useCurrentLocationContext();
- const [selectedEntries, setSelectedEntries] = useState<TS.FileSystemEntry[]>(
- [],
- );
+ const selectedEntries = useRef<TS.FileSystemEntry[]>([]);
const firstRender = useFirstRender();
+ const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
useEffect(() => {
if (!firstRender && !currentLocation) {
@@ -59,18 +66,31 @@ export const SelectedEntryContextProvider = ({
}
return undefined;
}*/
- /*const setSelectedEntries = (entries: TS.FileSystemEntry[]) => {
- if (JSON.stringify(selectedEntries) !== JSON.stringify(entries)) {
- setSelectedEntriesInt(entries);
+ const setSelectedEntries = (entries: TS.FileSystemEntry[]) => {
+ selectedEntries.current = entries;
+ forceUpdate();
+ };
+
+ const selectEntry = (entry: TS.FileSystemEntry, select: boolean = true) => {
+ if (select) {
+ if (!selectedEntries.current.some((e) => e.path === entry.path)) {
+ selectedEntries.current = [...selectedEntries.current, entry];
+ }
+ } else {
+ //deselect
+ selectedEntries.current = selectedEntries.current.filter(
+ (data) => data.path !== entry.path,
+ );
}
- };*/
+ forceUpdate();
+ };
const lastSelectedEntryPath = useMemo(() => {
- if (selectedEntries && selectedEntries.length > 0) {
- return selectedEntries[selectedEntries.length - 1].path;
+ if (selectedEntries.current.length > 0) {
+ return selectedEntries.current[selectedEntries.current.length - 1].path;
}
return undefined;
- }, [selectedEntries]);
+ }, [selectedEntries.current]);
/*function getSelectedEntriesLength() {
return selectedEntries ? selectedEntries.length : 0;
@@ -78,12 +98,12 @@ export const SelectedEntryContextProvider = ({
const context = useMemo(() => {
return {
- selectedEntries,
- //lastSelectedEntry: lastSelectedEntry.current,
+ selectedEntries: selectedEntries.current,
lastSelectedEntryPath,
setSelectedEntries,
+ selectEntry,
};
- }, [selectedEntries]);
+ }, [selectedEntries.current]);
return (
<SelectedEntryContext.Provider value={context}>
diff --git a/src/renderer/perspectives/grid-perspective/components/GridCell.tsx b/src/renderer/perspectives/grid-perspective/components/GridCell.tsx
index fb6709ed2..23fe21b75 100644
--- a/src/renderer/perspectives/grid-perspective/components/GridCell.tsx
+++ b/src/renderer/perspectives/grid-perspective/components/GridCell.tsx
@@ -113,8 +113,6 @@ interface Props {
isLast?: boolean;
fsEntry: TS.FileSystemEntry;
style?: any;
- selectEntry: (fsEntry: TS.FileSystemEntry) => void;
- deselectEntry: (fsEntry: TS.FileSystemEntry) => void;
selectionMode: boolean;
handleTagMenu: (event: Object, tag: TS.Tag, entryPath: string) => void;
handleGridContextMenu: (event: Object, fsEntry: TS.FileSystemEntry) => void;
@@ -130,8 +128,6 @@ function GridCell(props: Props) {
handleGridContextMenu,
handleGridCellDblClick,
handleGridCellClick,
- selectEntry,
- deselectEntry,
selectionMode,
isLast,
} = props;
@@ -140,7 +136,7 @@ function GridCell(props: Props) {
const theme = useTheme();
const { entrySize, showEntriesDescription, showTags, thumbnailMode } =
usePerspectiveSettingsContext();
- const { selectedEntries } = useSelectedEntriesContext();
+ const { selectedEntries, selectEntry } = useSelectedEntriesContext();
const { addTags, editTagForEntry } = useTaggingActionsContext();
const { readOnlyMode } = useCurrentLocationContext();
const supportedFileTypes = useSelector(getSupportedFileTypes);
@@ -292,7 +288,7 @@ function GridCell(props: Props) {
onClick={(e) => {
e.stopPropagation();
if (selected) {
- deselectEntry(fSystemEntry);
+ selectEntry(fSystemEntry, false);
} else {
selectEntry(fSystemEntry);
}
diff --git a/src/renderer/perspectives/grid-perspective/components/MainContainer.tsx b/src/renderer/perspectives/grid-perspective/components/MainContainer.tsx
index 50b1d7348..91f81b8c1 100644
--- a/src/renderer/perspectives/grid-perspective/components/MainContainer.tsx
+++ b/src/renderer/perspectives/grid-perspective/components/MainContainer.tsx
@@ -62,7 +62,7 @@ function GridPerspective(props: Props) {
const { openRenameEntryDialog } = props;
const { openEntry, openPrevFile, openNextFile } = useOpenedEntryContext();
- const { entrySize, showDirectories } = usePerspectiveSettingsContext();
+ const { showDirectories } = usePerspectiveSettingsContext();
const { openDirectory, currentDirectoryPath } = useDirectoryContentContext();
const { openFileNatively, duplicateFile } = useFsActionsContext();
const dispatch: AppDispatch = useDispatch();
@@ -161,7 +161,7 @@ function GridPerspective(props: Props) {
};
const clearSelection = () => {
- handleSetSelectedEntries([]);
+ setSelectedEntries([]);
selectedEntryPath.current = undefined;
};
@@ -236,7 +236,7 @@ function GridPerspective(props: Props) {
setMouseX(event.clientX);
setMouseY(event.clientY);
if (selectedEntries.length > 0) {
- handleSetSelectedEntries([]);
+ setSelectedEntries([]);
}
perspectiveMode.current = false;
setDirContextMenuAnchorEl(event.currentTarget);
@@ -245,7 +245,7 @@ function GridPerspective(props: Props) {
const onClick = (event: React.MouseEvent<HTMLDivElement>) => {
event.preventDefault();
if (selectedEntries.length > 0) {
- handleSetSelectedEntries([]);
+ setSelectedEntries([]);
}
};
@@ -329,16 +329,6 @@ function GridPerspective(props: Props) {
) {
selected = true;
}
- const selectEntry = (fsEntry: TS.FileSystemEntry) => {
- handleSetSelectedEntries([...selectedEntries, fsEntry]);
- };
-
- const deselectEntry = (fsEntry: TS.FileSystemEntry) => {
- const newSelection = selectedEntries.filter(
- (data) => data.path !== fsEntry.path,
- );
- handleSetSelectedEntries(newSelection);
- };
const selectionMode = selectedEntries.length > 1;
return (
@@ -352,9 +342,7 @@ function GridPerspective(props: Props) {
selected={selected}
fsEntry={fsEntry}
isLast={isLast}
- selectEntry={selectEntry}
selectionMode={selectionMode}
- deselectEntry={deselectEntry}
handleTagMenu={handleTagMenu}
handleGridContextMenu={(
event: React.MouseEvent<HTMLDivElement>,
diff --git a/src/renderer/perspectives/list/components/MainContainer.tsx b/src/renderer/perspectives/list/components/MainContainer.tsx
index 0db6fea06..6d5300d80 100644
--- a/src/renderer/perspectives/list/components/MainContainer.tsx
+++ b/src/renderer/perspectives/list/components/MainContainer.tsx
@@ -59,7 +59,7 @@ function ListPerspective(props: Props) {
const { openRenameEntryDialog } = props;
const { openEntry, openPrevFile, openNextFile } = useOpenedEntryContext();
- const { entrySize, showDirectories } = usePerspectiveSettingsContext();
+ const { showDirectories } = usePerspectiveSettingsContext();
const { openDirectory, currentDirectoryPath } = useDirectoryContentContext();
const { openFileNatively, duplicateFile } = useFsActionsContext();
const dispatch: AppDispatch = useDispatch();
@@ -158,7 +158,7 @@ function ListPerspective(props: Props) {
};
const clearSelection = () => {
- handleSetSelectedEntries([]);
+ setSelectedEntries([]);
selectedEntryPath.current = undefined;
};
@@ -233,7 +233,7 @@ function ListPerspective(props: Props) {
setMouseX(event.clientX);
setMouseY(event.clientY);
if (selectedEntries.length > 0) {
- handleSetSelectedEntries([]);
+ setSelectedEntries([]);
}
perspectiveMode.current = false;
setDirContextMenuAnchorEl(event.currentTarget);
@@ -242,7 +242,7 @@ function ListPerspective(props: Props) {
const onClick = (event: React.MouseEvent<HTMLDivElement>) => {
event.preventDefault();
if (selectedEntries.length > 0) {
- handleSetSelectedEntries([]);
+ setSelectedEntries([]);
}
};
@@ -326,16 +326,6 @@ function ListPerspective(props: Props) {
) {
selected = true;
}
- const selectEntry = (fsEntry: TS.FileSystemEntry) => {
- handleSetSelectedEntries([...selectedEntries, fsEntry]);
- };
-
- const deselectEntry = (fsEntry: TS.FileSystemEntry) => {
- const newSelection = selectedEntries.filter(
- (data) => data.path !== fsEntry.path,
- );
- handleSetSelectedEntries(newSelection);
- };
const selectionMode = selectedEntries.length > 1;
return (
@@ -349,9 +339,7 @@ function ListPerspective(props: Props) {
selected={selected}
fsEntry={fsEntry}
isLast={isLast}
- selectEntry={selectEntry}
selectionMode={selectionMode}
- deselectEntry={deselectEntry}
handleTagMenu={handleTagMenu}
handleGridContextMenu={(
event: React.MouseEvent<HTMLDivElement>,
@@ -510,5 +498,4 @@ function ListPerspective(props: Props) {
</div>
);
}
-
export default ListPerspective;
diff --git a/src/renderer/perspectives/list/components/RowCell.tsx b/src/renderer/perspectives/list/components/RowCell.tsx
index 683fc18f7..ad55d50bc 100644
--- a/src/renderer/perspectives/list/components/RowCell.tsx
+++ b/src/renderer/perspectives/list/components/RowCell.tsx
@@ -96,8 +96,6 @@ interface Props {
isLast?: boolean;
fsEntry: TS.FileSystemEntry;
style?: any;
- selectEntry: (fsEntry: TS.FileSystemEntry) => void;
- deselectEntry: (fsEntry: TS.FileSystemEntry) => void;
selectionMode: boolean;
handleTagMenu: (event: Object, tag: TS.Tag, entryPath: string) => void;
handleGridContextMenu: (event: Object, fsEntry: TS.FileSystemEntry) => void;
@@ -131,15 +129,13 @@ function RowCell(props: Props) {
handleGridCellDblClick,
handleGridCellClick,
showEntriesDescription,
- selectEntry,
- deselectEntry,
selectionMode,
isLast,
} = props;
const { t } = useTranslation();
const theme = useTheme();
- const { selectedEntries } = useSelectedEntriesContext();
+ const { selectedEntries, selectEntry } = useSelectedEntriesContext();
const { entrySize, showTags, thumbnailMode } =
usePerspectiveSettingsContext();
const { addTags, editTagForEntry } = useTaggingActionsContext();
@@ -296,7 +292,7 @@ function RowCell(props: Props) {
onClick={(e) => {
e.stopPropagation();
if (selected) {
- deselectEntry(fSystemEntry);
+ selectEntry(fSystemEntry, false);
} else {
selectEntry(fSystemEntry);
}