Skip to content

fix: RangePicker logic #98

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 2 commits into from
Jul 3, 2020
Merged

fix: RangePicker logic #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88d1fd8
fix: RangePicker logic
zombieJ Jul 3, 2020
f4b34be
fix ci
zombieJ Jul 3, 2020
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
1 change: 1 addition & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
paths:
- node_modules
key: v1-dependencies-{{ checksum "package.json" }}
- run: cp node_modules/father-build/template/tsconfig.json ./
- run: npm run lint
test:
docker:
Expand Down
2 changes: 1 addition & 1 deletion src/RangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,8 +682,8 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
return {
label,
onClick: () => {
// triggerChangeOld(newValues);
triggerChange(newValues, null);
triggerOpen(false, mergedActivePickerIndex);
},
onMouseEnter: () => {
setRangeHoverValue(newValues);
Expand Down
5 changes: 4 additions & 1 deletion tests/range.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,26 +336,29 @@ describe('Picker.Range', () => {
/>,
);

wrapper.openPicker();
let testNode;

// Basic
wrapper.openPicker();
testNode = wrapper.find('.rc-picker-ranges li span').first();
expect(testNode.text()).toEqual('test');
testNode.simulate('click');
expect(onChange).toHaveBeenCalledWith(
[expect.anything(), expect.anything()],
['1989-11-28', '1990-09-03'],
);
expect(wrapper.isOpen()).toBeFalsy();

// Function
wrapper.openPicker();
testNode = wrapper.find('.rc-picker-ranges li span').last();
expect(testNode.text()).toEqual('func');
testNode.simulate('click');
expect(onChange).toHaveBeenCalledWith(
[expect.anything(), expect.anything()],
['2000-01-01', '2010-11-11'],
);
expect(wrapper.isOpen()).toBeFalsy();
});

it('hover className', () => {
Expand Down