Skip to content

Commit bc9de3c

Browse files
authored
fix: RangePicker logic (#98)
* fix: RangePicker logic * fix ci
1 parent b91467b commit bc9de3c

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
paths:
1414
- node_modules
1515
key: v1-dependencies-{{ checksum "package.json" }}
16+
- run: cp node_modules/father-build/template/tsconfig.json ./
1617
- run: npm run lint
1718
test:
1819
docker:

src/RangePicker.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,8 +682,8 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
682682
return {
683683
label,
684684
onClick: () => {
685-
// triggerChangeOld(newValues);
686685
triggerChange(newValues, null);
686+
triggerOpen(false, mergedActivePickerIndex);
687687
},
688688
onMouseEnter: () => {
689689
setRangeHoverValue(newValues);

tests/range.spec.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,26 +336,29 @@ describe('Picker.Range', () => {
336336
/>,
337337
);
338338

339-
wrapper.openPicker();
340339
let testNode;
341340

342341
// Basic
342+
wrapper.openPicker();
343343
testNode = wrapper.find('.rc-picker-ranges li span').first();
344344
expect(testNode.text()).toEqual('test');
345345
testNode.simulate('click');
346346
expect(onChange).toHaveBeenCalledWith(
347347
[expect.anything(), expect.anything()],
348348
['1989-11-28', '1990-09-03'],
349349
);
350+
expect(wrapper.isOpen()).toBeFalsy();
350351

351352
// Function
353+
wrapper.openPicker();
352354
testNode = wrapper.find('.rc-picker-ranges li span').last();
353355
expect(testNode.text()).toEqual('func');
354356
testNode.simulate('click');
355357
expect(onChange).toHaveBeenCalledWith(
356358
[expect.anything(), expect.anything()],
357359
['2000-01-01', '2010-11-11'],
358360
);
361+
expect(wrapper.isOpen()).toBeFalsy();
359362
});
360363

361364
it('hover className', () => {

0 commit comments

Comments
 (0)