Skip to content

fix: Picker should open when click inside #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 26, 2022
Merged

fix: Picker should open when click inside #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d4e66a
fix: Picker should open when click inside
Oct 11, 2022
800bae4
fix: add picker test
Oct 25, 2022
b2a9733
Update src/Picker.tsx
wangmeijian Oct 25, 2022
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
10 changes: 4 additions & 6 deletions src/Picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,8 @@ function InnerPicker<DateType>(props: PickerProps<DateType>) {
}
};

const onInternalMouseUp: React.MouseEventHandler<HTMLDivElement> = (...args) => {
if (onMouseUp) {
onMouseUp(...args);
}
const onInternalClick: React.MouseEventHandler<HTMLDivElement> = (...args) => {
onClick?.(...args);

if (inputRef.current) {
inputRef.current.focus();
Expand Down Expand Up @@ -536,11 +534,11 @@ function InnerPicker<DateType>(props: PickerProps<DateType>) {
})}
style={style}
onMouseDown={onMouseDown}
onMouseUp={onInternalMouseUp}
onMouseUp={onMouseUp}
onMouseEnter={onMouseEnter}
onMouseLeave={onMouseLeave}
onContextMenu={onContextMenu}
onClick={onClick}
onClick={onInternalClick}
>
<div
className={classNames(`${prefixCls}-input`, {
Expand Down
22 changes: 16 additions & 6 deletions tests/picker.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,28 +617,38 @@ describe('Picker.Basic', () => {
expect(wrapper.find('input').prop('value')).toEqual('2020-1st');
});

it('click outside should also focus', () => {
const onMouseUp = jest.fn();
const wrapper = mount(<MomentPicker onMouseUp={onMouseUp} />);
it('Picker should open when click inside', () => {
const onClick = jest.fn();
const wrapper = mount(<MomentPicker onClick={onClick} />);
const inputElement = wrapper.find('input').instance() as any as HTMLInputElement;
inputElement.focus = jest.fn();

wrapper.find('.rc-picker').simulate('mouseUp');
wrapper.find('.rc-picker').simulate('click');
expect(inputElement.focus).toHaveBeenCalled();
expect(wrapper.isOpen()).toBeTruthy();

expect(onMouseUp).toHaveBeenCalled();
expect(onClick).toHaveBeenCalled();
});

it('not open when disabled', () => {
const wrapper = mount(<MomentPicker disabled />);
wrapper.find('.rc-picker').simulate('mouseUp');
wrapper.find('.rc-picker').simulate('click');
expect(wrapper.isOpen()).toBeFalsy();

wrapper.setProps({ disabled: false });
expect(wrapper.isOpen()).toBeFalsy();
});

it('not open when mouseup', () => {
const wrapper = mount(<MomentPicker />);
const inputElement = wrapper.find('input').instance() as any as HTMLInputElement;
inputElement.focus = jest.fn();

wrapper.find('.rc-picker').simulate('mouseup');
expect(inputElement.focus).toHaveBeenCalledTimes(0);
expect(wrapper.isOpen()).toBeFalsy();
});

it('defaultOpenValue in timePicker', () => {
resetWarned();
const onChange = jest.fn();
Expand Down