Skip to content

🐛(search) fix double request and flickering on search #596

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
jbpenrath merged 1 commit into from
Mar 19, 2026
Merged

🐛(search) fix double request and flickering on search #596

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 16 additions & 10 deletions src/frontend/src/features/providers/mailbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { useRouter } from "next/router";
import usePrevious from "@/hooks/use-previous";
import { useSearchParams } from "next/navigation";
import { MAILBOX_FOLDERS } from "../layouts/components/mailbox-panel/components/mailbox-list";
import { useDebounceCallback } from "@/hooks/use-debounce-callback";

type QueryState = {
status: QueryStatus,
Expand Down Expand Up @@ -141,7 +140,7 @@ export const MailboxProvider = ({ children }: PropsWithChildren) => {
const threadQueryKey = useMemo(() => {
const queryKey = ['threads', selectedMailbox?.id];
if (searchParams.get('search')) {
return [...queryKey, 'search', searchParams.toString()];
return [...queryKey, 'search'];
}
return [...queryKey, searchParams.toString()];
}, [selectedMailbox?.id, searchParams]);
Expand Down Expand Up @@ -463,12 +462,6 @@ export const MailboxProvider = ({ children }: PropsWithChildren) => {
await queryClient.invalidateQueries({ queryKey: ['messages', selectedThread.id] });
}
}
const resetSearchQueryDebounced = useDebounceCallback(() => {
queryClient.resetQueries(
{ predicate: ({ queryKey}) => queryKey.includes('search') },
);
}, 500);

const invalidateThreadsStats = async () => {
await queryClient.invalidateQueries({
queryKey: ['threads', 'stats', selectedMailbox?.id],
Expand Down Expand Up @@ -602,9 +595,22 @@ export const MailboxProvider = ({ children }: PropsWithChildren) => {
}, [selectedMailbox?.id, searchParams.toString()]);

useEffect(() => {
if (searchParams.get('search') !== previousSearchParams?.get('search')) {
resetSearchQueryDebounced();
const previousSearch = previousSearchParams?.get('search');
const currentSearch = searchParams.get('search');

if (previousSearch && !currentSearch) {
// Exiting search mode: purge cached search results so re-entering
// search doesn't briefly flash stale results from the previous query.
queryClient.removeQueries({
queryKey: ['threads', selectedMailbox?.id, 'search'],
exact: true,
});
} else if (previousSearch && currentSearch && currentSearch !== previousSearch) {
// Search term changed while already in search mode:
// reset the query to force a refetch with the new params.
queryClient.resetQueries({ queryKey: ['threads', selectedMailbox?.id, 'search'] });
}

unselectThread();
}, [hasSearchParamsChanged])

Expand Down
Loading