Skip to content

Removing a fixed color #36

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

Open
nurycaroline wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Removing a fixed color #36

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0a63dc5
Removing a fixed color
nurycaroline Oct 14, 2020
1e0c02f
ref input + abrir modal com input focus
oFhelipe Mar 21, 2023
5b3de30
Merge pull request #1 from oFhelipe/master
nurycaroline Mar 22, 2023
0e548dc
corrigindo click duplo + fechar modal select
oFhelipe Mar 24, 2023
87ebb72
Merge pull request #2 from oFhelipe/master
nurycaroline Mar 27, 2023
4452211
ajute onSelect select single
oFhelipe Mar 28, 2023
cfb679d
evitando duplicidade
oFhelipe Mar 28, 2023
a21a1e4
iniciando com undefined
oFhelipe Mar 28, 2023
7fc5901
removendo length
oFhelipe Mar 28, 2023
d0bb260
Merge pull request #3 from oFhelipe/master
nurycaroline Mar 28, 2023
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
52 changes: 37 additions & 15 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 All @@ -27,7 +27,8 @@ class Select2 extends Component {
preSelectedItem: [],
selectedItem: [],
data: [],
keyword: ''
keyword: '',
inputRef: React.createRef(),
}
animatedHeight = new Animated.Value(INIT_HEIGHT);

Expand Down Expand Up @@ -66,6 +67,22 @@ class Select2 extends Component {
return defaultFontName ? { fontFamily: defaultFontName } : {};
}


handleConfirm(recivedSelectedItem) {
let { onSelect } = this.props;
let { selectedItem } = this.state;
let selectedIds = [], selectedObjectItems = [];
let itens = recivedSelectedItem
? recivedSelectedItem
: selectedItem
itens.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 @@ -94,6 +111,10 @@ class Select2 extends Component {
data.map(item => {
if (item.checked) selectedItem.push(item);
})
if(isSelectSingle && item.checked) {
Keyboard.dismiss()
this.handleConfirm(selectedItem)
}
this.setState({ data, selectedItem });
}
keyExtractor = (item, idx) => idx.toString();
Expand Down Expand Up @@ -122,22 +143,27 @@ class Select2 extends Component {
</Text>
);
}
closeModal = () => this.setState({ show: false });
closeModal = () => this.setState({ show: false, keyword: '' });
showModal = () => this.setState({ show: true });

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 } = this.state;
let { show, 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',
Expand All @@ -158,6 +184,7 @@ class Select2 extends Component {
{
showSearchBox
? <TextInput
ref={inputRef}
underlineColorAndroid='transparent'
returnKeyType='done'
style={[styles.inputKeyword, this.defaultFont]}
Expand All @@ -180,6 +207,7 @@ class Select2 extends Component {
: null
}
<FlatList
keyboardShouldPersistTaps="handled"
style={styles.listOption}
data={this.dataRender || []}
keyExtractor={this.keyExtractor}
Expand All @@ -198,29 +226,23 @@ 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>
{
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) => {
Expand Down