fix: Keyboard not showing up on iOS when focus

react-component · Sep 15, 2020 · c1defbd · c1defbd
1 parent 4e1e69d
commit c1defbd
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/src/Selector/index.tsx b/src/Selector/index.tsx
@@ -197,12 +197,8 @@ const Selector: React.RefForwardingComponent<RefSelectorProps, SelectorProps> =
     pastedTextRef.current = value;
   };
 
-  const onMouseDown: React.MouseEventHandler<HTMLElement> = event => {
-    const inputMouseDown = getInputMouseDown();
-    if (event.target !== inputRef.current) {
-      if (!inputMouseDown) {
-        event.preventDefault();
-      }
+  const onClick = ({ target }) => {
+    if (target !== inputRef.current) {
       // Should focus input if click the selector
       const isIE = (document.body.style as any).msTouchAction !== undefined;
       if (isIE) {
@@ -213,6 +209,13 @@ const Selector: React.RefForwardingComponent<RefSelectorProps, SelectorProps> =
         inputRef.current.focus();
       }
     }
+  };
+
+  const onMouseDown: React.MouseEventHandler<HTMLElement> = event => {
+    const inputMouseDown = getInputMouseDown();
+    if (event.target !== inputRef.current && !inputMouseDown) {
+      event.preventDefault();
+    }
 
     if ((mode !== 'combobox' && (!showSearch || !inputMouseDown)) || !open) {
       if (open) {
@@ -240,7 +243,12 @@ const Selector: React.RefForwardingComponent<RefSelectorProps, SelectorProps> =
   );
 
   return (
-    <div ref={domRef} className={`${prefixCls}-selector`} onMouseDown={onMouseDown}>
+    <div
+      ref={domRef}
+      className={`${prefixCls}-selector`}
+      onClick={onClick}
+      onMouseDown={onMouseDown}
+    >
       {selectNode}
     </div>
   );