From 9b7f4a6816100fd922cbc3d121e8c096b833205b Mon Sep 17 00:00:00 2001
From: zombiej <smith3816@gmail.com>
Date: Sun, 28 Jun 2020 10:31:00 +0800
Subject: [PATCH 1/3] fix: Tabs popup can not trigger click at first time

---
 package.json       | 2 +-
 src/OptionList.tsx | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index fb09260d..dc0bae5b 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
   "dependencies": {
     "@babel/runtime": "^7.10.1",
     "classnames": "2.x",
-    "rc-select": "^11.0.0",
+    "rc-select": "^11.0.4",
     "rc-tree": "^3.1.0",
     "rc-util": "^5.0.1"
   }
diff --git a/src/OptionList.tsx b/src/OptionList.tsx
index 0ff39c87..3b5ed3f9 100644
--- a/src/OptionList.tsx
+++ b/src/OptionList.tsx
@@ -48,6 +48,8 @@ export interface OptionListProps<OptionsType extends object[]> {
   /** Tell Select that some value is now active to make accessibility work */
   onActiveValue: (value: RawValueType, index: number) => void;
   onScroll: React.UIEventHandler<HTMLDivElement>;
+
+  onMouseEnter: () => void;
 }
 
 const OptionList: React.RefForwardingComponent<RefOptionListProps, OptionListProps<DataNode[]>> = (
@@ -67,6 +69,7 @@ const OptionList: React.RefForwardingComponent<RefOptionListProps, OptionListPro
     onToggleOpen,
     open,
     notFoundContent,
+    onMouseEnter,
   } = props;
   const {
     checkable,
@@ -236,7 +239,7 @@ const OptionList: React.RefForwardingComponent<RefOptionListProps, OptionListPro
   }
 
   return (
-    <div onMouseDown={onListMouseDown}>
+    <div onMouseDown={onListMouseDown} onMouseEnter={onMouseEnter}>
       {activeEntity && open && (
         <span style={HIDDEN_STYLE} aria-live="assertive">
           {activeEntity.data.value}

From 7b10de337bf54a512f4b9bd2aa5af3d393d43c4f Mon Sep 17 00:00:00 2001
From: zombiej <smith3816@gmail.com>
Date: Sun, 28 Jun 2020 10:42:55 +0800
Subject: [PATCH 2/3] update snapshot

---
 package.json                                  |  2 +-
 .../Select.checkable.spec.js.snap             | 24 +++++++++----------
 tests/__snapshots__/Select.spec.js.snap       | 20 ++++++++--------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index dc0bae5b..d244d4ba 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "@babel/runtime": "^7.10.1",
     "classnames": "2.x",
     "rc-select": "^11.0.4",
-    "rc-tree": "^3.1.0",
+    "rc-tree": "^3.6.0",
     "rc-util": "^5.0.1"
   }
 }
diff --git a/tests/__snapshots__/Select.checkable.spec.js.snap b/tests/__snapshots__/Select.checkable.spec.js.snap
index 8e80bef4..c0f94d71 100644
--- a/tests/__snapshots__/Select.checkable.spec.js.snap
+++ b/tests/__snapshots__/Select.checkable.spec.js.snap
@@ -125,7 +125,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 1
                     style="display: flex; flex-direction: column;"
                   >
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked rc-tree-select-tree-treenode-leaf-last"
                     >
                       <span
                         class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
@@ -148,7 +148,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 1
                       </span>
                     </div>
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked rc-tree-select-tree-treenode-leaf-last"
                     >
                       <span
                         aria-hidden="true"
@@ -179,7 +179,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 1
                       </span>
                     </div>
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked rc-tree-select-tree-treenode-leaf-last"
                     >
                       <span
                         aria-hidden="true"
@@ -289,7 +289,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 2
                     style="display: flex; flex-direction: column;"
                   >
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
                     >
                       <span
                         class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
@@ -312,7 +312,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 2
                       </span>
                     </div>
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
                     >
                       <span
                         aria-hidden="true"
@@ -343,7 +343,7 @@ exports[`TreeSelect.checkable uncheck remove by selector not treeCheckStrictly 2
                       </span>
                     </div>
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
                     >
                       <span
                         aria-hidden="true"
@@ -513,7 +513,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 1`] = `
                     style="display: flex; flex-direction: column;"
                   >
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked filter-node"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked rc-tree-select-tree-treenode-leaf-last filter-node"
                     >
                       <span
                         class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
@@ -536,7 +536,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 1`] = `
                       </span>
                     </div>
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked filter-node"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked rc-tree-select-tree-treenode-leaf-last filter-node"
                     >
                       <span
                         aria-hidden="true"
@@ -567,7 +567,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 1`] = `
                       </span>
                     </div>
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked filter-node"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-checkbox-checked rc-tree-select-tree-treenode-leaf-last filter-node"
                     >
                       <span
                         aria-hidden="true"
@@ -674,7 +674,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 2`] = `
                     style="display: flex; flex-direction: column;"
                   >
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open filter-node"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last filter-node"
                     >
                       <span
                         class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
@@ -697,7 +697,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 2`] = `
                       </span>
                     </div>
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open filter-node"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last filter-node"
                     >
                       <span
                         aria-hidden="true"
@@ -728,7 +728,7 @@ exports[`TreeSelect.checkable uncheck remove by tree check 2`] = `
                       </span>
                     </div>
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open filter-node"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last filter-node"
                     >
                       <span
                         aria-hidden="true"
diff --git a/tests/__snapshots__/Select.spec.js.snap b/tests/__snapshots__/Select.spec.js.snap
index 933635f2..f4a4b974 100644
--- a/tests/__snapshots__/Select.spec.js.snap
+++ b/tests/__snapshots__/Select.spec.js.snap
@@ -80,7 +80,7 @@ exports[`TreeSelect.basic render renders TreeNode correctly 1`] = `
                     </span>
                   </div>
                   <div
-                    class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
+                    class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
                   >
                     <span
                       class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
@@ -128,7 +128,7 @@ exports[`TreeSelect.basic render renders TreeNode correctly 1`] = `
                     </span>
                   </div>
                   <div
-                    class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
+                    class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
                   >
                     <span
                       aria-hidden="true"
@@ -256,7 +256,7 @@ exports[`TreeSelect.basic render renders TreeNode correctly with falsy child 1`]
                     </span>
                   </div>
                   <div
-                    class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
+                    class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
                   >
                     <span
                       class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
@@ -304,7 +304,7 @@ exports[`TreeSelect.basic render renders TreeNode correctly with falsy child 1`]
                     </span>
                   </div>
                   <div
-                    class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
+                    class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
                   >
                     <span
                       aria-hidden="true"
@@ -539,7 +539,7 @@ exports[`TreeSelect.basic render renders treeDataSimpleMode correctly 1`] = `
                     style="display: flex; flex-direction: column;"
                   >
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
                     >
                       <span
                         class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher_open"
@@ -559,7 +559,7 @@ exports[`TreeSelect.basic render renders treeDataSimpleMode correctly 1`] = `
                       </span>
                     </div>
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
                     >
                       <span
                         aria-hidden="true"
@@ -663,7 +663,7 @@ exports[`TreeSelect.basic search nodes check tree changed by filter 1`] = `
                     style="display: flex; flex-direction: column;"
                   >
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open filter-node"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last filter-node"
                     >
                       <span
                         class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher-noop"
@@ -782,7 +782,7 @@ exports[`TreeSelect.basic search nodes check tree changed by filter 2`] = `
                       </span>
                     </div>
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-close"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-close rc-tree-select-tree-treenode-leaf-last"
                     >
                       <span
                         class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher-noop"
@@ -898,7 +898,7 @@ exports[`TreeSelect.basic search nodes filter node but not remove then 1`] = `
                       </span>
                     </div>
                     <div
-                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open"
+                      class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-open rc-tree-select-tree-treenode-leaf-last"
                     >
                       <span
                         class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher-noop"
@@ -1016,7 +1016,7 @@ exports[`TreeSelect.basic search nodes renders search input 1`] = `
                     </span>
                   </div>
                   <div
-                    class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-close"
+                    class="rc-tree-select-tree-treenode rc-tree-select-tree-treenode-switcher-close rc-tree-select-tree-treenode-leaf-last"
                   >
                     <span
                       class="rc-tree-select-tree-switcher rc-tree-select-tree-switcher-noop"

From 857e7e7c183163a421fcdd9ea8c49bdf34f2a34f Mon Sep 17 00:00:00 2001
From: zombiej <smith3816@gmail.com>
Date: Sun, 28 Jun 2020 10:55:00 +0800
Subject: [PATCH 3/3] fix test

---
 tests/Select.props.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/Select.props.spec.js b/tests/Select.props.spec.js
index 80c3faf0..d5ac5517 100644
--- a/tests/Select.props.spec.js
+++ b/tests/Select.props.spec.js
@@ -158,11 +158,12 @@ describe('TreeSelect.props', () => {
     it('set illegal value', () => {
       const wrapper = mount(
         createSelect({
+          placeholder: 'showMe',
           labelInValue: true,
           value: [null],
         }),
       );
-      expect(wrapper.getSelection(0).text()).toBe('');
+      expect(wrapper.find('.rc-tree-select-selection-placeholder').text()).toBe('showMe');
     });
   });