Skip to content

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

Prev and next file buttons do not respect the current sorting (#2034)

Stanimir5b0fa69830a9
diff --git a/src/renderer/components/EntryContainer.tsx b/src/renderer/components/EntryContainer.tsx
index dc59546b9..642e2ff5d 100644
--- a/src/renderer/components/EntryContainer.tsx
+++ b/src/renderer/components/EntryContainer.tsx
@@ -69,6 +69,7 @@ import { useNotificationContext } from '-/hooks/useNotificationContext';
import { toFsEntry } from '-/services/utils-io';
import { usePlatformFacadeContext } from '-/hooks/usePlatformFacadeContext';
import { SaveIcon, EditIcon } from '-/components/CommonIcons';
+import { useRendererListenerContext } from '-/hooks/useRendererListenerContext';
//const defaultSplitSize = '7.86%'; // '7.2%'; // 103;
// const bufferedSplitResize = buffer({
@@ -84,13 +85,12 @@ function EntryContainer() {
const {
openedEntries,
closeAllFiles,
- openNextFile,
- openPrevFile,
updateOpenedFile,
reloadOpenedFile,
toggleEntryFullWidth,
isEntryInFullWidth,
} = useOpenedEntryContext();
+ const { openPrevFile, openNextFile } = useRendererListenerContext();
const { saveDescription } = useDescriptionContext();
const { readOnlyMode, switchLocationTypeByID, switchCurrentLocationType } =
useCurrentLocationContext();
diff --git a/src/renderer/components/EntryContainerNav.tsx b/src/renderer/components/EntryContainerNav.tsx
index 7e1f7d123..077c1e478 100644
--- a/src/renderer/components/EntryContainerNav.tsx
+++ b/src/renderer/components/EntryContainerNav.tsx
@@ -7,9 +7,8 @@ import PrevDocumentIcon from '@mui/icons-material/KeyboardArrowUp';
import NextDocumentIcon from '@mui/icons-material/KeyboardArrowDown';
import Tooltip from '-/components/Tooltip';
import { useTranslation } from 'react-i18next';
-import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
import { getKeyBindingObject } from '-/reducers/settings';
-import { adjustKeyBinding } from '-/components/dialogs/KeyboardDialog';
+import { useRendererListenerContext } from '-/hooks/useRendererListenerContext';
interface Props {
isFile: boolean;
@@ -20,7 +19,7 @@ function EntryContainerNav(props: Props) {
const { isFile, startClosingEntry } = props;
const keyBindings = useSelector(getKeyBindingObject);
const { t } = useTranslation();
- const { openNextFile, openPrevFile } = useOpenedEntryContext();
+ const { openNextFile, openPrevFile } = useRendererListenerContext();
const theme = useTheme();
return (
diff --git a/src/renderer/components/RenderPerspective.tsx b/src/renderer/components/RenderPerspective.tsx
index f98499c4d..0f3f67662 100644
--- a/src/renderer/components/RenderPerspective.tsx
+++ b/src/renderer/components/RenderPerspective.tsx
@@ -28,6 +28,7 @@ import { SortedDirContextProvider } from '-/perspectives/grid-perspective/hooks/
import { PaginationContextProvider } from '-/hooks/PaginationContextProvider';
import { ThumbGenerationContextProvider } from '-/hooks/ThumbGenerationContextProvider';
import { PerspectiveSettingsContextProvider } from '-/hooks/PerspectiveSettingsContextProvider';
+import { RendererListenerContextProvider } from '-/hooks/RendererListenerContextProvider';
const GridPerspective = React.lazy(
() =>
@@ -39,13 +40,15 @@ function GridPerspectiveAsync(props) {
return (
<React.Suspense fallback={<LoadingLazy />}>
<SortedDirContextProvider>
- <PaginationContextProvider>
- <ThumbGenerationContextProvider>
- <PerspectiveSettingsContextProvider>
- <GridPerspective {...props} />
- </PerspectiveSettingsContextProvider>
- </ThumbGenerationContextProvider>
- </PaginationContextProvider>
+ <RendererListenerContextProvider>
+ <PaginationContextProvider>
+ <ThumbGenerationContextProvider>
+ <PerspectiveSettingsContextProvider>
+ <GridPerspective {...props} />
+ </PerspectiveSettingsContextProvider>
+ </ThumbGenerationContextProvider>
+ </PaginationContextProvider>
+ </RendererListenerContextProvider>
</SortedDirContextProvider>
</React.Suspense>
);
@@ -59,13 +62,15 @@ function ListPerspectiveAsync(props) {
return (
<React.Suspense fallback={<LoadingLazy />}>
<SortedDirContextProvider>
- <PaginationContextProvider>
- <ThumbGenerationContextProvider>
- <PerspectiveSettingsContextProvider>
- <ListPerspective {...props} />
- </PerspectiveSettingsContextProvider>
- </ThumbGenerationContextProvider>
- </PaginationContextProvider>
+ <RendererListenerContextProvider>
+ <PaginationContextProvider>
+ <ThumbGenerationContextProvider>
+ <PerspectiveSettingsContextProvider>
+ <ListPerspective {...props} />
+ </PerspectiveSettingsContextProvider>
+ </ThumbGenerationContextProvider>
+ </PaginationContextProvider>
+ </RendererListenerContextProvider>
</SortedDirContextProvider>
</React.Suspense>
);
@@ -109,11 +114,13 @@ if (Pro && Pro.Perspectives && Pro.Perspectives.KanBanPerspective) {
function KanBanPerspectiveAsync(props) {
return (
<React.Suspense fallback={<LoadingLazy />}>
- <ThumbGenerationContextProvider>
- <PerspectiveSettingsContextProvider>
- <KanBanPerspective {...props} />
- </PerspectiveSettingsContextProvider>
- </ThumbGenerationContextProvider>
+ <RendererListenerContextProvider>
+ <ThumbGenerationContextProvider>
+ <PerspectiveSettingsContextProvider>
+ <KanBanPerspective {...props} />
+ </PerspectiveSettingsContextProvider>
+ </ThumbGenerationContextProvider>
+ </RendererListenerContextProvider>
</React.Suspense>
);
}
diff --git a/src/renderer/containers/Root.tsx b/src/renderer/containers/Root.tsx
index 98d4e13c9..ecbbb05d9 100644
--- a/src/renderer/containers/Root.tsx
+++ b/src/renderer/containers/Root.tsx
@@ -70,9 +70,7 @@ export default function Root({ store, persistor }: RootType) {
<FsActionsContextProvider>
<TaggingActionsContextProvider>
<IOActionsContextProvider>
- <RendererListenerContextProvider>
- <MainPage />
- </RendererListenerContextProvider>
+ <MainPage />
</IOActionsContextProvider>
</TaggingActionsContextProvider>
</FsActionsContextProvider>
diff --git a/src/renderer/hooks/OpenedEntryContextProvider.tsx b/src/renderer/hooks/OpenedEntryContextProvider.tsx
index 7c4395e6f..ed362be1a 100644
--- a/src/renderer/hooks/OpenedEntryContextProvider.tsx
+++ b/src/renderer/hooks/OpenedEntryContextProvider.tsx
@@ -96,8 +96,6 @@ type OpenedEntryContextData = {
) => Promise<boolean>;
openEntry: (path?: string, showDetails?) => void;
openFsEntry: (fsEntry?: TS.FileSystemEntry, showDetails?) => void;
- openNextFile: (path?: string) => void;
- openPrevFile: (path?: string) => void;
toggleEntryFullWidth: () => void;
openLink: (url: string, options?) => void;
goForward: () => void;
@@ -133,8 +131,6 @@ export const OpenedEntryContext = createContext<OpenedEntryContextData>({
updateOpenedFile: () => Promise.resolve(false),
openEntry: () => {},
openFsEntry: () => {},
- openNextFile: () => {},
- openPrevFile: () => {},
toggleEntryFullWidth: () => {},
openLink: () => {},
goForward: () => {},
@@ -159,7 +155,6 @@ export const OpenedEntryContextProvider = ({
const { openLocation, currentLocation, getLocationPath } =
useCurrentLocationContext();
const {
- currentDirectoryEntries,
currentDirectoryPath,
currentDirectoryPerspective,
currentLocationPath,
@@ -759,37 +754,6 @@ export const OpenedEntryContextProvider = ({
}
}
- function openNextFile(path?: string) {
- const nextFile = getNextFile(
- path,
- selectedEntries && selectedEntries.length > 0
- ? selectedEntries[selectedEntries.length - 1].path
- : undefined,
- currentDirectoryEntries,
- );
- if (nextFile !== undefined) {
- openFsEntry(nextFile);
- // dispatch(actions.setLastSelectedEntry(nextFile.path));
- setSelectedEntries([nextFile]);
- return nextFile;
- }
- }
-
- function openPrevFile(path?: string) {
- const prevFile = getPrevFile(
- path,
- selectedEntries && selectedEntries.length > 0
- ? selectedEntries[selectedEntries.length - 1].path
- : undefined,
- currentDirectoryEntries,
- );
- if (prevFile !== undefined) {
- openFsEntry(prevFile);
- // dispatch(actions.setLastSelectedEntry(prevFile.path));
- setSelectedEntries([prevFile]);
- }
- }
-
function toggleEntryFullWidth() {
isEntryInFullWidth.current = !isEntryInFullWidth.current;
forceUpdate();
@@ -1118,8 +1082,6 @@ export const OpenedEntryContextProvider = ({
updateOpenedFile,
openEntry,
openFsEntry,
- openNextFile,
- openPrevFile,
toggleEntryFullWidth,
goForward,
goBack,
diff --git a/src/renderer/hooks/RendererListenerContextProvider.tsx b/src/renderer/hooks/RendererListenerContextProvider.tsx
index dc19bc460..1fbae64cc 100644
--- a/src/renderer/hooks/RendererListenerContextProvider.tsx
+++ b/src/renderer/hooks/RendererListenerContextProvider.tsx
@@ -24,11 +24,20 @@ import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';
import AppConfig from '-/AppConfig';
import { actions as SettingsActions } from '-/reducers/settings';
import { Extensions } from '../../main/types';
+import { getNextFile, getPrevFile } from '-/services/utils-io';
+import { useSortedDirContext } from '-/perspectives/grid-perspective/hooks/useSortedDirContext';
+import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';
-type RendererListenerContextData = {};
+type RendererListenerContextData = {
+ openNextFile: (path?: string) => void;
+ openPrevFile: (path?: string) => void;
+};
export const RendererListenerContext =
- createContext<RendererListenerContextData>({});
+ createContext<RendererListenerContextData>({
+ openNextFile: undefined,
+ openPrevFile: undefined,
+ });
export type RendererListenerContextProviderProps = {
children: React.ReactNode;
@@ -43,9 +52,10 @@ export const RendererListenerContextProvider = ({
children,
}: RendererListenerContextProviderProps) => {
const dispatch: AppDispatch = useDispatch();
+ const { selectedEntries, setSelectedEntries } = useSelectedEntriesContext();
const { setSearchQuery } = useDirectoryContentContext();
- const { goForward, goBack, openNextFile, openPrevFile } =
- useOpenedEntryContext();
+ const { goForward, goBack, openFsEntry } = useOpenedEntryContext();
+ const { sortedDirContent } = useSortedDirContext();
useEffect(() => {
if (AppConfig.isElectron) {
@@ -183,7 +193,7 @@ export const RendererListenerContextProvider = ({
destroy();
};
}
- }, [openNextFile, openPrevFile]);
+ }, [sortedDirContent, selectedEntries]);
function destroy() {
if (window.electronIO.ipcRenderer) {
@@ -194,9 +204,43 @@ export const RendererListenerContextProvider = ({
}
}
+ function openNextFile(path?: string) {
+ const nextFile = getNextFile(
+ path,
+ selectedEntries && selectedEntries.length > 0
+ ? selectedEntries[selectedEntries.length - 1].path
+ : undefined,
+ sortedDirContent,
+ );
+ if (nextFile !== undefined) {
+ openFsEntry(nextFile);
+ // dispatch(actions.setLastSelectedEntry(nextFile.path));
+ setSelectedEntries([nextFile]);
+ return nextFile;
+ }
+ }
+
+ function openPrevFile(path?: string) {
+ const prevFile = getPrevFile(
+ path,
+ selectedEntries && selectedEntries.length > 0
+ ? selectedEntries[selectedEntries.length - 1].path
+ : undefined,
+ sortedDirContent,
+ );
+ if (prevFile !== undefined) {
+ openFsEntry(prevFile);
+ // dispatch(actions.setLastSelectedEntry(prevFile.path));
+ setSelectedEntries([prevFile]);
+ }
+ }
+
const context = useMemo(() => {
- return {};
- }, []);
+ return {
+ openNextFile,
+ openPrevFile,
+ };
+ }, [sortedDirContent, selectedEntries]);
return (
<RendererListenerContext.Provider value={context}>
diff --git a/src/renderer/hooks/useRendererListenerContext.tsx b/src/renderer/hooks/useRendererListenerContext.tsx
new file mode 100644
index 000000000..d8173e3da
--- /dev/null
+++ b/src/renderer/hooks/useRendererListenerContext.tsx
@@ -0,0 +1,24 @@
+/**
+ * TagSpaces - universal file and folder organizer
+ * Copyright (C) 2023-present TagSpaces UG (haftungsbeschraenkt)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License (version 3) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+import { useContext } from 'react';
+
+import { RendererListenerContext } from './RendererListenerContextProvider';
+
+export const useRendererListenerContext = () =>
+ useContext(RendererListenerContext);
diff --git a/src/renderer/perspectives/grid-perspective/components/MainContainer.tsx b/src/renderer/perspectives/grid-perspective/components/MainContainer.tsx
index 75555041e..b970b3034 100644
--- a/src/renderer/perspectives/grid-perspective/components/MainContainer.tsx
+++ b/src/renderer/perspectives/grid-perspective/components/MainContainer.tsx
@@ -53,6 +53,7 @@ import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';
import { useFsActionsContext } from '-/hooks/useFsActionsContext';
import { usePerspectiveSettingsContext } from '-/hooks/usePerspectiveSettingsContext';
import { GridCellsStyleContextProvider } from '-/perspectives/grid-perspective/hooks/GridCellsStyleProvider';
+import { useRendererListenerContext } from '-/hooks/useRendererListenerContext';
interface Props {
openRenameEntryDialog: () => void;
@@ -61,7 +62,8 @@ interface Props {
function GridPerspective(props: Props) {
const { openRenameEntryDialog } = props;
- const { openEntry, openPrevFile, openNextFile } = useOpenedEntryContext();
+ const { openEntry } = useOpenedEntryContext();
+ const { openPrevFile, openNextFile } = useRendererListenerContext();
const { showDirectories } = usePerspectiveSettingsContext();
const { openDirectory, currentDirectoryPath } = useDirectoryContentContext();
const { openFileNatively, duplicateFile } = useFsActionsContext();
diff --git a/src/renderer/perspectives/list/components/MainContainer.tsx b/src/renderer/perspectives/list/components/MainContainer.tsx
index 6d5300d80..1049f288f 100644
--- a/src/renderer/perspectives/list/components/MainContainer.tsx
+++ b/src/renderer/perspectives/list/components/MainContainer.tsx
@@ -50,6 +50,7 @@ import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';
import { useFsActionsContext } from '-/hooks/useFsActionsContext';
import { usePerspectiveSettingsContext } from '-/hooks/usePerspectiveSettingsContext';
import { ListCellsStyleContextProvider } from '../hooks/ListCellsStyleProvider';
+import { useRendererListenerContext } from '-/hooks/useRendererListenerContext';
interface Props {
openRenameEntryDialog: () => void;
@@ -58,7 +59,8 @@ interface Props {
function ListPerspective(props: Props) {
const { openRenameEntryDialog } = props;
- const { openEntry, openPrevFile, openNextFile } = useOpenedEntryContext();
+ const { openEntry } = useOpenedEntryContext();
+ const { openPrevFile, openNextFile } = useRendererListenerContext();
const { showDirectories } = usePerspectiveSettingsContext();
const { openDirectory, currentDirectoryPath } = useDirectoryContentContext();
const { openFileNatively, duplicateFile } = useFsActionsContext();