From 88d1fd832c4077d6e1ec8a613e0acef8c76b39ac Mon Sep 17 00:00:00 2001
From: zombiej <smith3816@gmail.com>
Date: Fri, 3 Jul 2020 16:01:48 +0800
Subject: [PATCH 1/2] fix: RangePicker logic

---
 src/RangePicker.tsx  | 2 +-
 tests/range.spec.tsx | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/RangePicker.tsx b/src/RangePicker.tsx
index 9ae0c4bd3..fa8d41885 100644
--- a/src/RangePicker.tsx
+++ b/src/RangePicker.tsx
@@ -682,8 +682,8 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
     return {
       label,
       onClick: () => {
-        // triggerChangeOld(newValues);
         triggerChange(newValues, null);
+        triggerOpen(false, mergedActivePickerIndex);
       },
       onMouseEnter: () => {
         setRangeHoverValue(newValues);
diff --git a/tests/range.spec.tsx b/tests/range.spec.tsx
index 36483ffab..f6053a7a1 100644
--- a/tests/range.spec.tsx
+++ b/tests/range.spec.tsx
@@ -336,10 +336,10 @@ 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');
@@ -347,8 +347,10 @@ describe('Picker.Range', () => {
         [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');
@@ -356,6 +358,7 @@ describe('Picker.Range', () => {
         [expect.anything(), expect.anything()],
         ['2000-01-01', '2010-11-11'],
       );
+      expect(wrapper.isOpen()).toBeFalsy();
     });
 
     it('hover className', () => {

From f4b34be996326ab8c0fb48e8c3868be1ac37935f Mon Sep 17 00:00:00 2001
From: zombiej <smith3816@gmail.com>
Date: Fri, 3 Jul 2020 16:12:44 +0800
Subject: [PATCH 2/2] fix ci

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 22988dc73..7075eeae4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -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: