TagSpaces is an offline, open source, document manager with tagging support
fix Thumbnail generation in pagination
sytolk7ff1e931d484
diff --git a/app/components/RenderPerspective.tsx b/app/components/RenderPerspective.tsxindex 3e2b8144e..eb12abff4 100644--- a/app/components/RenderPerspective.tsx+++ b/app/components/RenderPerspective.tsx@@ -39,11 +39,11 @@ function GridPerspectiveAsync(props) {return (<React.Suspense fallback={<LoadingLazy />}><SortedDirContextProvider>- <PaginationContextProvider>- <ThumbGenerationContextProvider>+ <ThumbGenerationContextProvider>+ <PaginationContextProvider><GridPerspective {...props} />- </ThumbGenerationContextProvider>- </PaginationContextProvider>+ </PaginationContextProvider>+ </ThumbGenerationContextProvider></SortedDirContextProvider></React.Suspense>);diff --git a/app/hooks/PaginationContextProvider.tsx b/app/hooks/PaginationContextProvider.tsxindex 1e0e5b1eb..eee5a1590 100644--- a/app/hooks/PaginationContextProvider.tsx+++ b/app/hooks/PaginationContextProvider.tsx@@ -22,6 +22,7 @@ import { defaultSettings } from '-/perspectives/grid-perspective';import { useSortedDirContext } from '-/perspectives/grid-perspective/hooks/useSortedDirContext';import { TS } from '-/tagspaces.namespace';import { loadCurrentDirMeta } from '-/services/meta-loader';+import { useThumbGenerationContext } from '-/hooks/useThumbGenerationContext';type PaginationContextData = {page: number;@@ -48,6 +49,7 @@ export const PaginationContextProvider = ({currentDirectoryEntries,updateCurrentDirEntries} = useDirectoryContentContext();+ const { generateThumbnails } = useThumbGenerationContext();const { settings, sortedDirContent } = useSortedDirContext();const [page, setPage] = useState<number>(initPage);@@ -86,13 +88,16 @@ export const PaginationContextProvider = ({function setCurrentPage(currentPage: number) {setPage(currentPage);- return loadCurrentDirMeta(- currentDirectoryPath,- currentDirectoryEntries,- getPageFiles(currentPage, sortedDirContent)- ).then(entries => {- updateCurrentDirEntries(entries);- return true;+ const entries = getPageFiles(currentPage, sortedDirContent);+ return generateThumbnails(entries).then(() => {+ return loadCurrentDirMeta(+ currentDirectoryPath,+ currentDirectoryEntries,+ entries+ ).then(entries => {+ updateCurrentDirEntries(entries);+ return true;+ });});}diff --git a/app/hooks/ThumbGenerationContextProvider.tsx b/app/hooks/ThumbGenerationContextProvider.tsxindex 1ee9f047c..c45b695fa 100644--- a/app/hooks/ThumbGenerationContextProvider.tsx+++ b/app/hooks/ThumbGenerationContextProvider.tsx@@ -42,12 +42,12 @@ import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';import { loadCurrentDirMeta } from '-/services/meta-loader';type ThumbGenerationContextData = {- generateThumbnails: (dirEntries: TS.FileSystemEntry[]) => void;+ generateThumbnails: (dirEntries: TS.FileSystemEntry[]) => Promise<boolean>;};export const ThumbGenerationContext = createContext<ThumbGenerationContextData>({- generateThumbnails: () => {}+ generateThumbnails: undefined});@@ -100,7 +100,6 @@ export const ThumbGenerationContextProvider = ({if (entries &&entries.length > 0 &&- genThumbnailsEnabled() &&isGeneratingThumbs.current === false) {generateThumbnails(entries).then(() => {@@ -154,8 +153,8 @@ export const ThumbGenerationContextProvider = ({if (AppConfig.isWeb || // not in web modePlatformIO.haveObjectStoreSupport() || // not in object store mode- PlatformIO.haveWebDavSupport() // not in webdav mode- // genThumbnails() // enabled in the settings+ PlatformIO.haveWebDavSupport() || // not in webdav mode+ !genThumbnailsEnabled() // enabled in the settings) {return Promise.resolve(false);}