Skip to content

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

On pagination with more then 100 files tmbs only for the first 100 fi… (#2269)

Stanimir1eb6192fead6
diff --git a/src/renderer/hooks/DirectoryContentContextProvider.tsx b/src/renderer/hooks/DirectoryContentContextProvider.tsx
index 845b41bbc..2684ed01a 100644
--- a/src/renderer/hooks/DirectoryContentContextProvider.tsx
+++ b/src/renderer/hooks/DirectoryContentContextProvider.tsx
@@ -612,9 +612,12 @@ export const DirectoryContentContextProvider = ({
return defaultGridSettings;
}
- function setCurrentDirectoryEntries(dirEntries, reflect = true) {
- currentDirectoryEntries.current = dirEntries;
- if (reflect) {
+ function setCurrentDirectoryEntries(dirEntries: TS.FileSystemEntry[]) {
+ if (dirEntries && dirEntries.length > 0) {
+ currentDirectoryEntries.current = dirEntries; //[...dirEntries];
+ forceUpdate();
+ } else if (currentDirectoryEntries.current.length > 0) {
+ currentDirectoryEntries.current = [];
forceUpdate();
}
}
@@ -799,20 +802,20 @@ export const DirectoryContentContextProvider = ({
// Fetch directory metadata
const meta = await getDirMeta(directoryPath, location);
-
+ // Update directory metadata
+ if (meta) {
+ directoryMeta.current = meta;
+ currentDirectoryDirs.current = meta.customOrder?.folders || [];
+ currentDirectoryFiles.current = meta.customOrder?.files || [];
+ }
// Load directory content
const entries = await loadDirectoryContentInt(
directoryPath,
location,
showHiddenEntries,
);
-
- // Update directory metadata
- if (meta) {
- directoryMeta.current = meta;
- currentDirectoryDirs.current = meta.customOrder?.folders || [];
- currentDirectoryFiles.current = meta.customOrder?.files || [];
- } else {
+ // set default directory metadata
+ if (!meta) {
currentDirectoryFiles.current = [];
// add defaultColumnsToShow
const columnsToShow = entries
@@ -847,7 +850,6 @@ export const DirectoryContentContextProvider = ({
}
}
- // Set current directory entries
setCurrentDirectoryEntries(entries);
return entries;
@@ -1530,7 +1532,6 @@ export const DirectoryContentContextProvider = ({
isSearching,
sendDirMessage,
getPerspective,
- setCurrentDirectoryEntries,
updateCurrentDirEntry,
setSearchQuery,
loadDirectoryContent,
diff --git a/src/renderer/hooks/PaginationContextProvider.tsx b/src/renderer/hooks/PaginationContextProvider.tsx
index 0a773eea8..be1f90bdb 100644
--- a/src/renderer/hooks/PaginationContextProvider.tsx
+++ b/src/renderer/hooks/PaginationContextProvider.tsx
@@ -26,13 +26,15 @@ import { useEditedEntryMetaContext } from '-/hooks/useEditedEntryMetaContext';
type PaginationContextData = {
page: number;
- pageFiles: TS.FileSystemEntry[];
+ //pageFiles: TS.FileSystemEntry[];
+ getResentPageFiles: () => TS.FileSystemEntry[];
setCurrentPage: (page?: number) => void;
};
export const PaginationContext = createContext<PaginationContextData>({
page: 1,
- pageFiles: [],
+ //pageFiles: [],
+ getResentPageFiles: undefined,
setCurrentPage: undefined,
});
@@ -63,11 +65,15 @@ export const PaginationContextProvider = ({
console.debug('meta loaded')
);
}*/
- }, [currentDirectoryPath, searchQuery]); //, isSearchMode isMetaFolderExist]);
+ }, [currentDirectoryPath, searchQuery, settings]); //, isSearchMode isMetaFolderExist]);
- const pageFiles: TS.FileSystemEntry[] = useMemo(() => {
+ /*const pageFiles: TS.FileSystemEntry[] = useMemo(() => {
return getPageFiles(page, sortedDirContent);
- }, [page, sortedDirContent, settings]);
+ }, [page, sortedDirContent, settings]);*/
+
+ function getResentPageFiles() {
+ return getPageFiles(page, sortedDirContent);
+ }
function getPageFiles(currentPage: number, dirContent: TS.FileSystemEntry[]) {
const gridPageLimit =
@@ -109,10 +115,10 @@ export const PaginationContextProvider = ({
const context = useMemo(() => {
return {
page,
- pageFiles,
+ getResentPageFiles,
setCurrentPage,
};
- }, [page, pageFiles, currentDirectoryPath, settings]);
+ }, [page, currentDirectoryPath, sortedDirContent, settings]);
return (
<PaginationContext.Provider value={context}>
diff --git a/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx b/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx
index 60ea8038a..5fff15a98 100644
--- a/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx
+++ b/src/renderer/hooks/PerspectiveSettingsContextProvider.tsx
@@ -108,7 +108,7 @@ export const PerspectiveSettingsContextProvider = ({
settings.current = getSettings(getPerspective(), directoryMeta);
forceUpdate();
}
- }, [currentDirectoryPath]); //, directoryMeta]);
+ }, [currentDirectoryPath, directoryMeta]);
useEffect(() => {
if (!firstRender && metaActions && metaActions.length > 0) {
diff --git a/src/renderer/hooks/ThumbGenerationContextProvider.tsx b/src/renderer/hooks/ThumbGenerationContextProvider.tsx
index ce9c17c3a..fdbc1ca00 100644
--- a/src/renderer/hooks/ThumbGenerationContextProvider.tsx
+++ b/src/renderer/hooks/ThumbGenerationContextProvider.tsx
@@ -82,7 +82,7 @@ export const ThumbGenerationContextProvider = ({
const { saveBinaryFilePromise, createDirectoryPromise } =
usePlatformFacadeContext();
const { metaActions } = useEditedEntryMetaContext();
- const { pageFiles } = usePaginationContext();
+ const { getResentPageFiles } = usePaginationContext();
const { setGeneratingThumbs } = useNotificationContext();
const useGenerateThumbnails = useSelector(getUseGenerateThumbnails);
const enableWS = useSelector(getEnableWS);
@@ -151,6 +151,7 @@ export const ThumbGenerationContextProvider = ({
}
if (genThumbs) {
let genEntries;
+ const pageFiles = getResentPageFiles();
if (entries.length > 0) {
genEntries = entries;
} else if (pageFiles && pageFiles.length > 0) {
diff --git a/src/renderer/perspectives/grid/components/GridPagination.tsx b/src/renderer/perspectives/grid/components/GridPagination.tsx
index 0c97a66c9..f01dea7a4 100644
--- a/src/renderer/perspectives/grid/components/GridPagination.tsx
+++ b/src/renderer/perspectives/grid/components/GridPagination.tsx
@@ -93,7 +93,7 @@ function GridPagination(props: Props) {
const { directoryMeta, getAllPropertiesPromise } =
useDirectoryContentContext();
const { sortedDirContent } = useSortedDirContext();
- const { page, pageFiles, setCurrentPage } = usePaginationContext();
+ const { page, getResentPageFiles, setCurrentPage } = usePaginationContext();
const { openEntry } = useOpenedEntryContext();
const thumbDialogContext = Pro?.contextProviders?.ThumbDialogContext
? useContext<TS.ThumbDialogContextData>(
@@ -104,6 +104,7 @@ function GridPagination(props: Props) {
const currentLocation = findLocation();
const theme = useTheme();
+ const pageFiles = getResentPageFiles();
const showPagination = sortedDirContent.length !== pageFiles.length;
const paginationCount = showPagination
? Math.ceil(sortedDirContent.length / gridPageLimit)