alma/Neah
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

courrier formatting

Browse Source
This commit is contained in:
alma 2025-04-30 18:02:21 +02:00
parent e61b0855bd
commit b2170dd9d5
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
hooks/use-email-state.ts
View File

@ -681,36 +681,43 @@ export const useEmailState = () => {
// Effect to load emails when folder changes // Effect to load emails when folder changes
useEffect(() => { useEffect(() => {
if (session?.user?.id && state.currentFolder) { if (session?.user?.id && state.currentFolder) {
// Skip if we're in the middle of pagination (handleLoadMore was just called) // CRITICAL FIX: REMOVE this check that's causing the problem
if (lastPageLoadedRef.current > 1) { // Instead, detect a real folder change and always load when that happens
console.log(`[DEBUG-FOLDER_EFFECT] Skipping folder load because we're in the middle of pagination (page ${state.page}, lastLoaded ${lastPageLoadedRef.current})`);
return;
}
// Extract account ID for consistent loading // Extract account ID for consistent loading
const { effectiveAccountId } = normalizeFolderAndAccount(state.currentFolder); const { effectiveAccountId } = normalizeFolderAndAccount(state.currentFolder);
// Track if the folder actually changed // Track if the folder actually changed
const folderChanged = prevFolderRef.current !== state.currentFolder; const folderChanged = prevFolderRef.current !== state.currentFolder;
if (folderChanged) { if (folderChanged) {
console.log(`[DEBUG-FOLDER_EFFECT] Folder changed from ${prevFolderRef.current} to ${state.currentFolder}`); console.log(`[DEBUG-FOLDER_EFFECT] Folder changed from ${prevFolderRef.current} to ${state.currentFolder}`);
prevFolderRef.current = state.currentFolder; prevFolderRef.current = state.currentFolder;
}
logEmailOp('FOLDER_CHANGE', `Loading emails for folder ${state.currentFolder} with account ${effectiveAccountId}`);
// CRITICAL FIX: Only reset page if the folder actually changed
if (folderChanged && state.page !== 1) {
console.log(`[DEBUG-FOLDER_EFFECT] Resetting page to 1 because folder changed`);
dispatch({ type: 'SET_PAGE', payload: 1 });
// Also reset the lastLoaded tracker // CRITICAL FIX: Always reset pagination state when folder actually changes
console.log(`[DEBUG-FOLDER_EFFECT] Folder changed - resetting pagination state`);
// Reset page to 1 AND reset lastPageLoadedRef to ensure we load
lastPageLoadedRef.current = 0; lastPageLoadedRef.current = 0;
if (state.page !== 1) {
console.log(`[DEBUG-FOLDER_EFFECT] Resetting page to 1 because folder changed`);
dispatch({ type: 'SET_PAGE', payload: 1 });
}
// CRITICAL FIX: Clear emails and set loading when folder changes
dispatch({ type: 'SET_EMAILS', payload: [] });
dispatch({ type: 'SET_LOADING', payload: true });
// CRITICAL FIX: Always load emails when folder changes, no matter what
console.log(`[DEBUG-FOLDER_EFFECT] Loading emails for new folder: ${state.currentFolder}`);
loadEmails(1, state.perPage, false);
return; // Exit early after handling folder change
} }
// CRITICAL FIX: Only load initial emails if we're on page 1 or the folder changed // If no folder change detected, only load if on page 1 and not already loaded
if (state.page === 1 || folderChanged) { if (state.page === 1 && lastPageLoadedRef.current === 0) {
// Load emails with the correct account ID (not appending since this is a folder change) logEmailOp('FOLDER_LOAD', `Loading initial emails for folder ${state.currentFolder}`);
loadEmails(state.page, state.perPage, false); loadEmails(state.page, state.perPage, false);
} }
} }