From d3489979ccc90c978b6c9790db5833046c1de465 Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 12 Nov 2026 10:22:14 +0800 Subject: [PATCH] fix: preserve callbacks while a refresh is pending --- client/refreshUtils.js | 11 +++++++++-- test/refreshUtils.spec.ts | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 test/refreshUtils.spec.ts diff --git a/client/refreshUtils.js b/client/refreshUtils.js index dfde53e..fdbbfee 100644 --- a/client/refreshUtils.js +++ b/client/refreshUtils.js @@ -76,6 +76,8 @@ function createDebounceUpdate() { * @type {number | undefined} */ let refreshTimeout; + /** @type {Array} */ + let callbacks = []; /** * Performs React Refresh on a delay. @@ -83,15 +85,20 @@ function createDebounceUpdate() { * @returns {void} */ const enqueueUpdate = (callback) => { + if (callback) { + callbacks.push(callback); + } if (typeof refreshTimeout !== 'undefined') { return; } refreshTimeout = setTimeout(() => { refreshTimeout = undefined; + const pendingCallbacks = callbacks; + callbacks = []; performReactRefresh(); - if (callback) { - callback(); + for (const pendingCallback of pendingCallbacks) { + pendingCallback(); } }, 30); }; diff --git a/test/refreshUtils.spec.ts b/test/refreshUtils.spec.ts new file mode 100644 index 0000000..a04c5ec --- /dev/null +++ b/test/refreshUtils.spec.ts @@ -0,0 +1,38 @@ +import { performReactRefresh } from 'react-refresh/runtime'; +import { rs } from 'rstack/test'; +import { enqueueUpdate } from '../client/refreshUtils.js'; + +rs.mock('react-refresh/runtime', () => ({ + performReactRefresh: rs.fn(), +})); + +afterEach(() => { + rs.useRealTimers(); + rs.resetAllMocks(); +}); + +it.each([true, false])( + 'preserves pending callbacks (first call has callback: %s)', + (hasFirstCallback) => { + rs.useFakeTimers(); + const calls: string[] = []; + rs.mocked(performReactRefresh).mockImplementation(() => { + calls.push('refresh'); + }); + + enqueueUpdate(hasFirstCallback ? () => calls.push('first') : undefined); + rs.advanceTimersByTime(10); + enqueueUpdate(() => calls.push('second')); + expect(calls).toEqual([]); + + rs.advanceTimersByTime(20); + const expected = hasFirstCallback + ? ['refresh', 'first', 'second'] + : ['refresh', 'second']; + expect(calls).toEqual(expected); + + enqueueUpdate(); + rs.advanceTimersByTime(30); + expect(calls).toEqual([...expected, 'refresh']); + }, +);