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
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ describe.skipIf(isWebKit)('<NumberField.ScrubAreaCursor />', () => {

const { user } = await render(
<NumberField.Root>
<NumberField.Input />
<NumberField.ScrubArea data-testid="scrub-area">
<NumberField.ScrubAreaCursor data-testid="scrub-area-cursor" />
</NumberField.ScrubArea>
Expand Down Expand Up @@ -129,4 +130,44 @@ describe.skipIf(isWebKit)('<NumberField.ScrubAreaCursor />', () => {
Element.prototype.requestPointerLock = originalRequestPointerLock;
}
});

it('does not render after a quick tap when pointer lock resolves later', async () => {
const originalRequestPointerLock = Element.prototype.requestPointerLock;

try {
// Simulate pointer lock resolving after the user already released the pointer (tap)
Element.prototype.requestPointerLock = sinon.stub().returns(
new Promise((resolve) => {
setTimeout(resolve, 30);
}),
);

const { user } = await render(
<NumberField.Root>
<NumberField.Input />
<NumberField.ScrubArea data-testid="scrub-area">
<NumberField.ScrubAreaCursor data-testid="scrub-area-cursor" />
</NumberField.ScrubArea>
</NumberField.Root>,
);

const scrubArea = screen.getByTestId('scrub-area');

await act(async () => {
// Quick press and release (tap)
await user.pointer({ target: scrubArea, keys: '[MouseLeft>]', pointerName: 'mouse' });
await user.pointer({ target: scrubArea, keys: '[/MouseLeft]', pointerName: 'mouse' });
window.dispatchEvent(new Event('pointerup'));
// Wait longer than the delayed pointer lock resolution
await new Promise((resolve) => {
setTimeout(resolve, 50);
});
});

// After a tap, the scrub cursor should not remain rendered
expect(screen.queryByTestId('scrub-area-cursor')).to.equal(null);
} finally {
Element.prototype.requestPointerLock = originalRequestPointerLock;
}
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,11 @@ export const NumberFieldScrubArea = React.forwardRef(function NumberFieldScrubAr
} catch (error) {
setIsPointerLockDenied(true);
} finally {
ReactDOM.flushSync(() => {
onScrubbingChange(true, event.nativeEvent);
});
if (isScrubbingRef.current) {
ReactDOM.flushSync(() => {
onScrubbingChange(true, event.nativeEvent);
});
}
}
}
},
Expand Down
Loading