From ecfff2261737f8ffa928c005882308d5d87e65f2 Mon Sep 17 00:00:00 2001 From: Punyapal Shah <53343069+MrPunyapal@users.noreply.github.com> Date: Thu, 5 Nov 2026 01:56:32 +0530 Subject: [PATCH] perf: skip unrelated cross-tab storage updates in recent searches --- resources/js/hooks/use-recent-searches.ts | 37 ++++++-- tests/Unit/RecentSearchesStorage.test.tsx | 109 ++++++++++++++++++++++ 2 files changed, 136 insertions(+), 10 deletions(-) create mode 100644 tests/Unit/RecentSearchesStorage.test.tsx diff --git a/resources/js/hooks/use-recent-searches.ts b/resources/js/hooks/use-recent-searches.ts index a752eb029c..1a0625510a 100644 --- a/resources/js/hooks/use-recent-searches.ts +++ b/resources/js/hooks/use-recent-searches.ts @@ -1,16 +1,29 @@ -import { useSyncExternalStore } from 'react'; +import { useCallback, useSyncExternalStore } from 'react'; import { readStorage, writeStorage } from '@/lib/storage'; -const listeners = new Set<() => void>(); +const listeners = new Map void>>(); const keyFor = (userId: string): string => `recent-searches:${userId}`; -function subscribe(listener: () => void) { - listeners.add(listener); - window.addEventListener('storage', listener); +function subscribe(userId: string | null, listener: () => void) { + const userListeners = listeners.get(userId) ?? new Set(); + userListeners.add(listener); + listeners.set(userId, userListeners); + const onStorage = (event: StorageEvent) => { + if ( + event.key === null || + (userId !== null && event.key === keyFor(userId)) + ) { + listener(); + } + }; + window.addEventListener('storage', onStorage); return () => { - listeners.delete(listener); - window.removeEventListener('storage', listener); + userListeners.delete(listener); + if (userListeners.size === 0) { + listeners.delete(userId); + } + window.removeEventListener('storage', onStorage); }; } @@ -43,17 +56,21 @@ export function rememberSearch(userId: string | null, query: string): void { ), ].slice(0, 3); writeStorage(keyFor(userId), JSON.stringify(recent)); - listeners.forEach((listener) => listener()); + listeners.get(userId)?.forEach((listener) => listener()); } export function clearRecentSearches(userId: string): void { writeStorage(keyFor(userId), ''); - listeners.forEach((listener) => listener()); + listeners.get(userId)?.forEach((listener) => listener()); } export function useRecentSearches(userId: string | null): string[] { + const subscribeToUser = useCallback( + (listener: () => void) => subscribe(userId, listener), + [userId], + ); const stored = useSyncExternalStore( - subscribe, + subscribeToUser, () => (userId === null ? '' : readStorage(keyFor(userId))), () => '', ); diff --git a/tests/Unit/RecentSearchesStorage.test.tsx b/tests/Unit/RecentSearchesStorage.test.tsx new file mode 100644 index 0000000000..6bcf386744 --- /dev/null +++ b/tests/Unit/RecentSearchesStorage.test.tsx @@ -0,0 +1,109 @@ +/// +import assert from 'node:assert/strict'; +import * as React from 'react'; +import { afterEach, test, vi } from 'vite-plus/test'; + +const notifications: ReturnType[] = []; +const unsubscribers: (() => void)[] = []; +const subscriptions: ((listener: () => void) => () => void)[] = []; +let previousCallback: ((listener: () => void) => () => void) | undefined; +let previousUserId: string | null | undefined; +vi.doMock('react', () => ({ + ...React, + useCallback: ( + callback: (listener: () => void) => () => void, + dependencies: unknown[], + ) => { + const [userId] = dependencies as [string | null]; + if (previousCallback === undefined || previousUserId !== userId) { + previousCallback = callback; + previousUserId = userId; + } + + return previousCallback; + }, + useSyncExternalStore: ( + subscribe: (callback: () => void) => () => void, + snapshot: () => string, + ) => { + const previousSubscription = subscriptions.at(-1); + subscriptions.push(subscribe); + if (previousSubscription !== subscribe) { + const notify = vi.fn(); + notifications.push(notify); + unsubscribers.push(subscribe(notify)); + } + return snapshot(); + }, +})); +afterEach(() => { + unsubscribers.splice(0).forEach((unsubscribe) => unsubscribe()); + notifications.splice(0); + subscriptions.splice(0); + previousCallback = undefined; + previousUserId = undefined; + vi.unstubAllGlobals(); +}); + +test('ignores unrelated and other-account changes but reacts to storage clears', async () => { + const handlers = new Set<(event: { key: string | null }) => void>(); + const storage = new Map(); + vi.stubGlobal('window', { + localStorage: { + getItem: (key: string) => storage.get(key) ?? null, + setItem: (key: string, value: string) => storage.set(key, value), + removeItem: (key: string) => storage.delete(key), + }, + addEventListener: ( + _type: string, + listener: (event: { key: string | null }) => void, + ) => handlers.add(listener), + removeEventListener: ( + _type: string, + listener: (event: { key: string | null }) => void, + ) => handlers.delete(listener), + }); + const { rememberSearch, useRecentSearches } = + await import('../../resources/js/hooks/use-recent-searches'); + assert.deepEqual(useRecentSearches('user-a'), []); + assert.deepEqual(useRecentSearches('user-a'), []); + assert.equal(subscriptions[0], subscriptions[1]); + assert.deepEqual(useRecentSearches('user-b'), []); + + const dispatch = (key: string | null) => + handlers.forEach((listener) => listener({ key })); + dispatch('chat-dock'); + dispatch('voice-note-volume'); + dispatch('recent-searches:other-user'); + assert.deepEqual( + notifications.map(({ mock }) => mock.calls.length), + [0, 0], + ); + + dispatch('recent-searches:user-a'); + assert.deepEqual( + notifications.map(({ mock }) => mock.calls.length), + [1, 0], + ); + + dispatch('recent-searches:user-b'); + assert.deepEqual( + notifications.map(({ mock }) => mock.calls.length), + [1, 1], + ); + + dispatch(null); + assert.deepEqual( + notifications.map(({ mock }) => mock.calls.length), + [2, 2], + ); + + rememberSearch('user-a', 'term'); + assert.deepEqual( + notifications.map(({ mock }) => mock.calls.length), + [3, 2], + ); + + unsubscribers.splice(0).forEach((unsubscribe) => unsubscribe()); + assert.equal(handlers.size, 0); +});