From 8c848613e79ed381b2d48d546eb327d45598ebc0 Mon Sep 17 00:00:00 2001
From: liaoxuezhi <liaoxuezhi@baidu.com>
Date: Fri, 6 Dec 2019 22:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20select=20=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=96=B0=E5=A2=9E=E6=8C=89=E9=92=AE=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Select.tsx | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/Select.tsx b/src/components/Select.tsx
index aad66316..15950cdf 100644
--- a/src/components/Select.tsx
+++ b/src/components/Select.tsx
@@ -332,6 +332,7 @@ export class Select extends React.Component<SelectProps, SelectState> {
 
   onFocus(e: any) {
     this.props.disabled ||
+      this.state.isOpen ||
       this.setState(
         {
           isFocused: true
@@ -537,16 +538,15 @@ export class Select extends React.Component<SelectProps, SelectState> {
     );
   }
 
-  renderOuter(
-    {
-      selectedItem,
-      getItemProps,
-      highlightedIndex,
-      inputValue,
-      isOpen
-    }: ControllerStateAndHelpers<any>,
-    getInputProps: any
-  ) {
+  renderOuter({
+    selectedItem,
+    getItemProps,
+    highlightedIndex,
+    inputValue,
+    isOpen,
+    getToggleButtonProps,
+    getInputProps
+  }: ControllerStateAndHelpers<any>) {
     const {
       popOverContainer,
       options,
@@ -786,7 +786,7 @@ export class Select extends React.Component<SelectProps, SelectState> {
         itemToString={item => (item ? item[labelField] : '')}
       >
         {(options: ControllerStateAndHelpers<any>) => {
-          const {isOpen, getInputProps} = options;
+          const {isOpen} = options;
           return (
             <div
               tabIndex={disabled ? -1 : 0}
@@ -822,7 +822,7 @@ export class Select extends React.Component<SelectProps, SelectState> {
               ) : null}
 
               <span className={cx('Select-arrow')} />
-              {isOpen ? this.renderOuter(options, getInputProps) : null}
+              {isOpen ? this.renderOuter(options) : null}
             </div>
           );
         }}