Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions client/refreshUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,22 +76,29 @@ function createDebounceUpdate() {
* @type {number | undefined}
*/
let refreshTimeout;
/** @type {Array<function(): void>} */
let callbacks = [];

/**
* Performs React Refresh on a delay.
* @param {function(): void} [callback]
* @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);
};
Expand Down
38 changes: 38 additions & 0 deletions test/refreshUtils.spec.ts
Original file line number Diff line number Diff line change
@@ -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']);
},
);
Loading