Skip to content

Commit c0fda31

Browse files
refactor(web): merged settings stay cached without "use memo" (pingdotgg#20765)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent a89a797 commit c0fda31

1 file changed

Lines changed: 7 additions & 17 deletions

File tree

‎apps/web/src/hooks/useSettings.ts‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -330,24 +330,12 @@ export function useMigrateModelPreferences(
330330
}, [clientSettings, environmentId, hydrated, migrate, settings]);
331331
}
332332

333-
// A hook of its own so callers passing an inline selector still get one merged
334-
// object per settings change instead of one per render.
335-
function useMergedEnvironmentSettings(
336-
serverSettings: ServerSettings,
337-
clientSettings: ClientSettings,
338-
): UnifiedSettings {
339-
"use memo";
333+
// Returns the merged object alone so the selector, often inline, cannot widen its cache key.
334+
function useMergedSettings(serverSettings: ServerSettings): UnifiedSettings {
335+
const clientSettings = useClientSettingsValue();
340336
return mergeEnvironmentSettings(serverSettings, clientSettings);
341337
}
342338

343-
function useMergedSettings<T>(
344-
serverSettings: ServerSettings,
345-
selector: ((settings: UnifiedSettings) => T) | undefined,
346-
): T {
347-
const merged = useMergedEnvironmentSettings(serverSettings, useClientSettingsValue());
348-
return selector ? selector(merged) : (merged as T);
349-
}
350-
351339
export function useClientSettings<T = ClientSettings>(
352340
selector?: (settings: ClientSettings) => T,
353341
): T {
@@ -511,7 +499,8 @@ export function useEnvironmentSettings<T = UnifiedSettings>(
511499
): T {
512500
const serverSettings = useAtomValue(serverEnvironment.settingsValueAtom(environmentId));
513501
useMigrateModelPreferences(environmentId, serverSettings);
514-
return useMergedSettings(serverSettings ?? DEFAULT_SERVER_SETTINGS, selector);
502+
const merged = useMergedSettings(serverSettings ?? DEFAULT_SERVER_SETTINGS);
503+
return selector ? selector(merged) : (merged as T);
515504
}
516505

517506
export function usePersistEnvironmentProviderInstanceMutation(environmentId: EnvironmentId) {
@@ -534,7 +523,8 @@ export function usePrimarySettings<T = UnifiedSettings>(
534523
environment?.environmentId ?? null,
535524
environment?.serverConfig?.settings ?? null,
536525
);
537-
return useMergedSettings(settings, selector);
526+
const merged = useMergedSettings(settings);
527+
return selector ? selector(merged) : (merged as T);
538528
}
539529

540530
export const PRIMARY_SETTINGS_UNAVAILABLE_MESSAGE =

0 commit comments

Comments
 (0)