fix(web): memoize Zero provider opts to prevent reconnect churn

Wrap the opts object and derived context in useMemo so ZeroReactProvider
receives stable references across parent re-renders. Before this change
opts was rebuilt on every render of ZeroProvider, which can cause the
Rocicorp Zero client to churn its internal state / reconnect if it
compares props by reference.

Fixes #1097.
This commit is contained in:
Tim Ren 2026-04-15 20:07:12 +08:00
parent 656e061f84
commit 68e6acd504

View file

@ -6,7 +6,7 @@ import {
ZeroProvider as ZeroReactProvider, ZeroProvider as ZeroReactProvider,
} from "@rocicorp/zero/react"; } from "@rocicorp/zero/react";
import { useAtomValue } from "jotai"; import { useAtomValue } from "jotai";
import { useEffect, useRef } from "react"; import { useEffect, useMemo, useRef } from "react";
import { currentUserAtom } from "@/atoms/user/user-query.atoms"; import { currentUserAtom } from "@/atoms/user/user-query.atoms";
import { getBearerToken, handleUnauthorized, refreshAccessToken } from "@/lib/auth-utils"; import { getBearerToken, handleUnauthorized, refreshAccessToken } from "@/lib/auth-utils";
import { queries } from "@/zero/queries"; import { queries } from "@/zero/queries";
@ -43,19 +43,30 @@ function ZeroAuthSync() {
export function ZeroProvider({ children }: { children: React.ReactNode }) { export function ZeroProvider({ children }: { children: React.ReactNode }) {
const { data: user } = useAtomValue(currentUserAtom); const { data: user } = useAtomValue(currentUserAtom);
const hasUser = !!user?.id; const userId = user?.id;
const userID = hasUser ? String(user.id) : "anon"; const hasUser = !!userId;
const context = hasUser ? { userId: String(user.id) } : undefined; const userID = hasUser ? String(userId) : "anon";
// getBearerToken() returns a string (a primitive), so it's safe to read
// on every render — reference equality holds as long as the token is
// unchanged, which keeps the memoized `opts` below stable.
const auth = hasUser ? getBearerToken() || undefined : undefined; const auth = hasUser ? getBearerToken() || undefined : undefined;
const opts = { const context = useMemo(
userID, () => (hasUser ? { userId: String(userId) } : undefined),
schema, [hasUser, userId],
queries, );
context,
cacheURL, const opts = useMemo(
auth, () => ({
}; userID,
schema,
queries,
context,
cacheURL,
auth,
}),
[userID, context, auth],
);
return ( return (
<ZeroReactProvider {...opts}> <ZeroReactProvider {...opts}>