diff --git a/src/renderer/src/modules/entry-column/hooks.ts b/src/renderer/src/modules/entry-column/hooks.ts index dbd0b76dd..9ec298133 100644 --- a/src/renderer/src/modules/entry-column/hooks.ts +++ b/src/renderer/src/modules/entry-column/hooks.ts @@ -111,13 +111,15 @@ export const useEntriesByView = ({ // so we memo this previous data to avoid the flicker const prevEntryIdsRef = useRef(entryIds) + const isFetchingFirstPage = query.isFetching && !query.isFetchingNextPage + useEffect(() => { - if (!query.isFetching) { + if (!isFetchingFirstPage) { prevEntryIdsRef.current = entryIds setMergedEntries(entryIds) onReset?.() } - }, [query.isFetching]) + }, [isFetchingFirstPage]) const [mergedEntries, setMergedEntries] = useState([])