Skip to content

making the app faster #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MrgSub merged 2 commits into from
Apr 5, 2025
Merged

making the app faster #587

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8088a8f
making the app faster
R44VC0RP Apr 5, 2025
1f4d419
Merge branch 'staging' of https://github.com/Mail-0/Zero into staging
R44VC0RP Apr 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions apps/mail/components/mail/mail-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import { useTranslations } from 'next-intl';
import { Button } from '../ui/button';
import items from './demo.json';
import { toast } from 'sonner';
import { useQueryState } from 'nuqs';
const HOVER_DELAY = 1000; // ms before prefetching

const Thread = memo(
Expand Down Expand Up @@ -63,8 +64,8 @@ const Thread = memo(
const hasPrefetched = useRef<boolean>(false);
const isMailSelected = useMemo(() => {
const threadId = message.threadId ?? message.id;
return threadId === threadIdParam;
}, [message.id, message.threadId, threadIdParam]);
return threadId === threadIdParam || threadId === mail.selected;
}, [message.id, message.threadId, threadIdParam, mail.selected]);

const isMailBulkSelected = mail.bulkSelected.includes(message.id);

Expand Down Expand Up @@ -329,9 +330,9 @@ export const MailList = memo(({ isCompact }: MailListProps) => {
const [mail, setMail] = useMail();
const { data: session } = useSession();
const t = useTranslations();
const router = useRouter();
const searchParams = useSearchParams();
const threadIdParam = searchParams.get('threadId');
const router = useRouter();
const [threadId, setThreadId] = useQueryState('threadId');

const sessionData = useMemo(
() => ({
Expand Down Expand Up @@ -510,10 +511,9 @@ export const MailList = memo(({ isCompact }: MailListProps) => {
return;
}

// TODO: Look into making this more performant
if (selectMode === 'range') {
const lastSelectedItem =
mail.bulkSelected[mail.bulkSelected.length - 1] ?? threadIdParam ?? message.id;
mail.bulkSelected[mail.bulkSelected.length - 1] ?? threadId ?? message.id;

const mailsIndex = items.map((m) => m.id);
const startIdx = mailsIndex.indexOf(lastSelectedItem);
Expand Down Expand Up @@ -542,11 +542,21 @@ export const MailList = memo(({ isCompact }: MailListProps) => {
return;
}

void markAsRead({ ids: [message.threadId ?? message.id] });

router.push(`/mail/inbox?threadId=${message.threadId ?? message.id}`);
const messageThreadId = message.threadId ?? message.id;

// Update local state immediately for optimistic UI
setMail(prev => ({ ...prev, selected: messageThreadId }));

// Update URL param without navigation
void setThreadId(messageThreadId);

// Mark as read in background
markAsRead({ ids: [messageThreadId] }).catch((error) => {
console.error('Failed to mark email as read:', error);
toast.error(t('common.mail.failedToMarkAsRead'));
});
},
[getSelectMode, folder, searchParams, items, handleMouseEnter],
[getSelectMode, setThreadId, items, handleMouseEnter, t, setMail],
);

const isEmpty = items.length === 0;
Expand Down