Skip to content

Corrigindo click duplo #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nurycaroline merged 1 commit into from
Mar 27, 2023
Merged

Corrigindo click duplo #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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 => {
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -187,6 +205,7 @@ class Select2 extends Component {
: null
}
<FlatList
keyboardShouldPersistTaps="handled"
style={styles.listOption}
data={this.dataRender || []}
keyExtractor={this.keyExtractor}
Expand All @@ -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>
Expand Down