From 0a63dc529d7feefe02f720103ff26ff5b67eb0b8 Mon Sep 17 00:00:00 2001
From: Nurielly Caroline Brizola <nurycaroline@gmail.com>
Date: Wed, 14 Oct 2020 10:10:36 -0300
Subject: [PATCH 1/7] Removing a fixed color

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 5c94a58..0bc877c 100644
--- a/index.js
+++ b/index.js
@@ -220,7 +220,7 @@ class Select2 extends Component {
                     preSelectedItem.length > 0
                         ? (
                             isSelectSingle
-                                ? <Text style={[styles.selectedTitlte, this.defaultFont, selectedTitleStyle, { color: '#333' }]}>{preSelectedItem[0].name}</Text>
+                            ? <Text style={[styles.selectedTitlte, this.defaultFont, selectedTitleStyle]}>{preSelectedItem[0].name}</Text>
                                 : <View style={styles.tagWrapper}>
                                     {
                                         preSelectedItem.map((tag, index) => {

From 1e0c02f94a0bee7b9fd9fbcb7a94f096607595ef Mon Sep 17 00:00:00 2001
From: Fhelipe Rodrigues <contatofhelipe@gmail.com>
Date: Tue, 21 Mar 2023 12:10:33 -0300
Subject: [PATCH 2/7] ref input + abrir modal com input focus

---
 index.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index 0bc877c..3f7150b 100644
--- a/index.js
+++ b/index.js
@@ -27,7 +27,8 @@ class Select2 extends Component {
         preSelectedItem: [],
         selectedItem: [],
         data: [],
-        keyword: ''
+        keyword: '',
+        inputRef: React.createRef(),
     }
     animatedHeight = new Animated.Value(INIT_HEIGHT);
 
@@ -131,13 +132,18 @@ class Select2 extends Component {
             isSelectSingle, cancelButtonText, selectButtonText, searchPlaceHolderText,
             selectedTitleStyle, buttonTextStyle, buttonStyle, showSearchBox
         } = this.props;
-        let { show, selectedItem, preSelectedItem } = this.state;
+        let { show, selectedItem, preSelectedItem, inputRef } = this.state;
         return (
             <TouchableOpacity
                 onPress={this.showModal}
                 activeOpacity={0.7}
                 style={[styles.container, style]}>
                 <Modal
+                    onModalShow={() => {
+                        setTimeout(() => {
+                            this.state.inputRef.current.focus()
+                        }, 100);
+                    }}
                     onBackdropPress={this.closeModal}
                     style={{
                         justifyContent: 'flex-end',
@@ -158,6 +164,7 @@ class Select2 extends Component {
                         {
                             showSearchBox
                                 ? <TextInput
+                                    ref={inputRef}
                                     underlineColorAndroid='transparent'
                                     returnKeyType='done'
                                     style={[styles.inputKeyword, this.defaultFont]}

From 0e548dc2fee06c9efe19deac72ab0c2965aa89d2 Mon Sep 17 00:00:00 2001
From: Fhelipe Rodrigues <contatofhelipe@gmail.com>
Date: Fri, 24 Mar 2023 12:16:08 -0300
Subject: [PATCH 3/7] corrigindo click duplo + fechar modal select

---
 index.js | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/index.js b/index.js
index 3f7150b..7b86657 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,6 @@
 //import liraries
 import React, { Component } from 'react';
-import { Text, StyleSheet, TouchableOpacity, View, FlatList, TextInput, Dimensions, Animated, Platform } from 'react-native';
+import { Text, StyleSheet, TouchableOpacity, View, FlatList, TextInput, Dimensions, Animated, Platform, Keyboard } from 'react-native';
 import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
 import Modal from 'react-native-modal';
 import Button from './lib/Button';
@@ -67,6 +67,19 @@ class Select2 extends Component {
         return defaultFontName ? { fontFamily: defaultFontName } : {};
     }
 
+
+    handleConfirm() {
+        let { onSelect } = this.props;
+        let { selectedItem } = this.state;
+        let selectedIds = [], selectedObjectItems = [];
+        selectedItem.map(item => {
+            selectedIds.push(item.id);
+            selectedObjectItems.push(item);
+        })
+        onSelect && onSelect(selectedIds, selectedObjectItems);
+        this.setState({ show: false, keyword: '', preSelectedItem: selectedItem });
+    }
+
     cancelSelection() {
         let { data, preSelectedItem } = this.state;
         data.map(item => {
@@ -95,6 +108,11 @@ class Select2 extends Component {
         data.map(item => {
             if (item.checked) selectedItem.push(item);
         })
+        if(isSelectSingle && item.checked) {
+            Keyboard.dismiss()
+            this.closeModal()
+            this.handleConfirm()
+        }
         this.setState({ data, selectedItem });
     }
     keyExtractor = (item, idx) => idx.toString();
@@ -128,11 +146,11 @@ class Select2 extends Component {
 
     render() {
         let {
-            style, modalStyle, title, onSelect, onRemoveItem, popupTitle, colorTheme,
+            style, modalStyle, title, onRemoveItem, popupTitle, colorTheme,
             isSelectSingle, cancelButtonText, selectButtonText, searchPlaceHolderText,
             selectedTitleStyle, buttonTextStyle, buttonStyle, showSearchBox
         } = this.props;
-        let { show, selectedItem, preSelectedItem, inputRef } = this.state;
+        let { show, preSelectedItem, inputRef } = this.state;
         return (
             <TouchableOpacity
                 onPress={this.showModal}
@@ -187,6 +205,7 @@ class Select2 extends Component {
                                 : null
                         }
                         <FlatList
+                            keyboardShouldPersistTaps="handled"
                             style={styles.listOption}
                             data={this.dataRender || []}
                             keyExtractor={this.keyExtractor}
@@ -205,21 +224,15 @@ class Select2 extends Component {
                                 backgroundColor='#fff'
                                 textStyle={buttonTextStyle}
                                 style={[styles.button, buttonStyle, { marginRight: 5, marginLeft: 10, borderWidth: 1, borderColor: colorTheme }]} />
+                            {!isSelectSingle &&
                             <Button
                                 defaultFont={this.defaultFont}
-                                onPress={() => {
-                                    let selectedIds = [], selectedObjectItems = [];
-                                    selectedItem.map(item => {
-                                        selectedIds.push(item.id);
-                                        selectedObjectItems.push(item);
-                                    })
-                                    onSelect && onSelect(selectedIds, selectedObjectItems);
-                                    this.setState({ show: false, keyword: '', preSelectedItem: selectedItem });
-                                }}
+                                onPress={this.handleConfirm}
                                 title={selectButtonText}
                                 backgroundColor={colorTheme}
                                 textStyle={buttonTextStyle}
                                 style={[styles.button, buttonStyle, { marginLeft: 5, marginRight: 10 }]} />
+                            }
                         </View>
                     </Animated.View>
                 </Modal>

From 4452211ea13c157b7237ebd58051f9a50afd4363 Mon Sep 17 00:00:00 2001
From: Fhelipe Rodrigues <fhelipe.rodrigues@fatec.sp.gov.br>
Date: Tue, 28 Mar 2023 11:56:14 -0300
Subject: [PATCH 4/7] ajute onSelect select single

---
 index.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index 7b86657..a9671ba 100644
--- a/index.js
+++ b/index.js
@@ -97,6 +97,7 @@ class Select2 extends Component {
     onItemSelected = (item, isSelectSingle) => {
         let selectedItem = [];
         let { data } = this.state;
+        let { onSelect } = this.props;
         item.checked = !item.checked;
         for (let index in data) {
             if (data[index].id === item.id) {
@@ -110,8 +111,15 @@ class Select2 extends Component {
         })
         if(isSelectSingle && item.checked) {
             Keyboard.dismiss()
-            this.closeModal()
-            this.handleConfirm()
+            let selectedIds = [], selectedObjectItems = [];
+            selectedItem.forEach(item => {
+                selectedIds.push(item.id);
+                selectedObjectItems.push(item);
+            })
+            if(onSelect) {
+                onSelect(selectedIds, selectedObjectItems);
+            }
+            this.setState({ show: false, keyword: '', preSelectedItem: selectedItem });
         }
         this.setState({ data, selectedItem });
     }

From cfb679df7a0495eb0e3a4fb4d114f00d23174b8f Mon Sep 17 00:00:00 2001
From: Fhelipe Rodrigues <fhelipe.rodrigues@fatec.sp.gov.br>
Date: Tue, 28 Mar 2023 14:55:41 -0300
Subject: [PATCH 5/7] evitando duplicidade

---
 index.js | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/index.js b/index.js
index a9671ba..88e3b81 100644
--- a/index.js
+++ b/index.js
@@ -68,11 +68,12 @@ class Select2 extends Component {
     }
 
 
-    handleConfirm() {
+    handleConfirm(recivedSelectedItem = []) {
         let { onSelect } = this.props;
         let { selectedItem } = this.state;
         let selectedIds = [], selectedObjectItems = [];
-        selectedItem.map(item => {
+        let itens = recivedSelectedItem.length ? recivedSelectedItem : selectedItem
+        itens.map(item => {
             selectedIds.push(item.id);
             selectedObjectItems.push(item);
         })
@@ -97,7 +98,6 @@ class Select2 extends Component {
     onItemSelected = (item, isSelectSingle) => {
         let selectedItem = [];
         let { data } = this.state;
-        let { onSelect } = this.props;
         item.checked = !item.checked;
         for (let index in data) {
             if (data[index].id === item.id) {
@@ -111,15 +111,7 @@ class Select2 extends Component {
         })
         if(isSelectSingle && item.checked) {
             Keyboard.dismiss()
-            let selectedIds = [], selectedObjectItems = [];
-            selectedItem.forEach(item => {
-                selectedIds.push(item.id);
-                selectedObjectItems.push(item);
-            })
-            if(onSelect) {
-                onSelect(selectedIds, selectedObjectItems);
-            }
-            this.setState({ show: false, keyword: '', preSelectedItem: selectedItem });
+            this.handleConfirm(selectedItem)
         }
         this.setState({ data, selectedItem });
     }
@@ -149,7 +141,7 @@ class Select2 extends Component {
             </Text>
         );
     }
-    closeModal = () => this.setState({ show: false });
+    closeModal = () => this.setState({ show: false, keyword: '' });
     showModal = () => this.setState({ show: true });
 
     render() {

From a21a1e49ea263a2db03155f33c22f04b4ba768b4 Mon Sep 17 00:00:00 2001
From: Fhelipe Rodrigues <fhelipe.rodrigues@fatec.sp.gov.br>
Date: Tue, 28 Mar 2023 15:08:19 -0300
Subject: [PATCH 6/7] iniciando com undefined

---
 index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index 88e3b81..aea6889 100644
--- a/index.js
+++ b/index.js
@@ -68,11 +68,13 @@ class Select2 extends Component {
     }
 
 
-    handleConfirm(recivedSelectedItem = []) {
+    handleConfirm(recivedSelectedItem) {
         let { onSelect } = this.props;
         let { selectedItem } = this.state;
         let selectedIds = [], selectedObjectItems = [];
-        let itens = recivedSelectedItem.length ? recivedSelectedItem : selectedItem
+        let itens = recivedSelectedItem && recivedSelectedItem.length > 0 
+            ? recivedSelectedItem 
+            : selectedItem
         itens.map(item => {
             selectedIds.push(item.id);
             selectedObjectItems.push(item);

From 7fc5901b216edcaffe228661ac1e8c8810c37461 Mon Sep 17 00:00:00 2001
From: Fhelipe Rodrigues <fhelipe.rodrigues@fatec.sp.gov.br>
Date: Tue, 28 Mar 2023 15:15:28 -0300
Subject: [PATCH 7/7] removendo length

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index aea6889..fbddfc4 100644
--- a/index.js
+++ b/index.js
@@ -72,7 +72,7 @@ class Select2 extends Component {
         let { onSelect } = this.props;
         let { selectedItem } = this.state;
         let selectedIds = [], selectedObjectItems = [];
-        let itens = recivedSelectedItem && recivedSelectedItem.length > 0 
+        let itens = recivedSelectedItem 
             ? recivedSelectedItem 
             : selectedItem
         itens.map(item => {