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
4 changes: 2 additions & 2 deletions packages/@react-aria/numberfield/src/useNumberField.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export function useNumberField(props: AriaNumberFieldProps, state: NumberFieldSt
validationState,
label,
formatOptions,
onBlur,
onBlur = () => {},
onFocus,
onFocusChange,
onKeyDown,
Expand Down Expand Up @@ -204,8 +204,8 @@ export function useNumberField(props: AriaNumberFieldProps, state: NumberFieldSt

let inputProps = mergeProps(
spinButtonProps,
textFieldProps,
focusProps,
textFieldProps,
{
// override the spinbutton role, we can't focus a spin button with VO
role: null,
Expand Down
13 changes: 12 additions & 1 deletion packages/@react-spectrum/numberfield/test/NumberField.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ describe('NumberField', function () {
let onKeyUpSpy = jest.fn();

beforeAll(() => {
jest.useFakeTimers('legacy');
jest.useFakeTimers();
});

afterAll(() => {
Expand Down Expand Up @@ -283,6 +283,17 @@ describe('NumberField', function () {
expect(onBlurSpy).toHaveBeenCalledTimes(2); // blur spy is called after each blur
});

it.each`
Name
${'NumberField'}
`('$Name fires state change then blur', () => {
let {textField} = renderNumberField({onChange: onChangeSpy, onBlur: onBlurSpy, step: 5});
act(() => {textField.focus();});
typeText(textField, '3');
userEvent.tab();
expect(onChangeSpy.mock.invocationCallOrder[0]).toBeLessThan(onBlurSpy.mock.invocationCallOrder[0]);
});

it.each`
Name
${'NumberField'}
Expand Down