Skip to content
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

Jump to bottom

fix proptypes #94

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

fix proptypes #94

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
100b818
Update index.js
fattahmuhyiddeen Sep 9, 2018
7de0f06
Update index.js
fattahmuhyiddeen Sep 9, 2018
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
74 changes: 36 additions & 38 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
'use strict';

import React,{
PropTypes
} from 'react';
import React from 'react'
import PropTypes from 'prop-types';

import {
View,
Expand All @@ -24,21 +22,21 @@ const propTypes = {
data: PropTypes.array,
onChange: PropTypes.func,
initValue: PropTypes.string,
style: View.propTypes.style,
selectStyle: View.propTypes.style,
optionStyle: View.propTypes.style,
optionTextStyle: Text.propTypes.style,
sectionStyle: View.propTypes.style,
sectionTextStyle: Text.propTypes.style,
cancelStyle: View.propTypes.style,
cancelTextStyle: Text.propTypes.style,
overlayStyle: View.propTypes.style,
cancelText: PropTypes.string
style: PropTypes.object,
selectStyle: PropTypes.object,
optionStyle: PropTypes.object,
optionTextStyle: PropTypes.object,
sectionStyle: PropTypes.object,
sectionTextStyle: PropTypes.object,
cancelStyle: PropTypes.object,
cancelTextStyle: PropTypes.object,
overlayStyle: PropTypes.object,
cancelText: PropTypes.object
};

const defaultProps = {
data: [],
onChange: ()=> {},
onChange: () => { },
initValue: 'Select me!',
style: {},
selectStyle: {},
Expand Down Expand Up @@ -74,47 +72,47 @@ export default class ModalPicker extends BaseComponent {
}

componentDidMount() {
this.setState({selected: this.props.initValue});
this.setState({cancelText: this.props.cancelText});
this.setState({ selected: this.props.initValue });
this.setState({ cancelText: this.props.cancelText });
}

componentWillReceiveProps(nextProps) {
if (nextProps.initValue != this.props.initValue) {
this.setState({selected: nextProps.initValue});
}
if (nextProps.initValue != this.props.initValue) {
this.setState({ selected: nextProps.initValue });
}
}

onChange(item) {
this.props.onChange(item);
this.setState({selected: item.label});
this.setState({ selected: item.label });
this.close();
}

close() {
this.setState({
modalVisible: false
});
this.setState({
modalVisible: false
});
}

open() {
this.setState({
modalVisible: true
});
this.setState({
modalVisible: true
});
}

renderSection(section) {
return (
<View key={section.key} style={[styles.sectionStyle,this.props.sectionStyle]}>
<Text style={[styles.sectionTextStyle,this.props.sectionTextStyle]}>{section.label}</Text>
<View key={section.key} style={[styles.sectionStyle, this.props.sectionStyle]}>
<Text style={[styles.sectionTextStyle, this.props.sectionTextStyle]}>{section.label}</Text>
</View>
);
}

renderOption(option) {
return (
<TouchableOpacity key={option.key} onPress={()=>this.onChange(option)}>
<TouchableOpacity key={option.key} onPress={() => this.onChange(option)}>
<View style={[styles.optionStyle, this.props.optionStyle]}>
<Text style={[styles.optionTextStyle,this.props.optionTextStyle]}>{option.label}</Text>
<Text style={[styles.optionTextStyle, this.props.optionTextStyle]}>{option.label}</Text>
</View>
</TouchableOpacity>)
}
Expand All @@ -129,18 +127,18 @@ export default class ModalPicker extends BaseComponent {
});

return (
<View style={[styles.overlayStyle, this.props.overlayStyle]} key={'modalPicker'+(componentIndex++)}>
<View style={[styles.overlayStyle, this.props.overlayStyle]} key={'modalPicker' + (componentIndex++)}>
<View style={styles.optionContainer}>
<ScrollView keyboardShouldPersistTaps>
<View style={{paddingHorizontal:10}}>
<View style={{ paddingHorizontal: 10 }}>
{options}
</View>
</ScrollView>
</View>
<View style={styles.cancelContainer}>
<TouchableOpacity onPress={this.close}>
<View style={[styles.cancelStyle, this.props.cancelStyle]}>
<Text style={[styles.cancelTextStyle,this.props.cancelTextStyle]}>{this.props.cancelText}</Text>
<Text style={[styles.cancelTextStyle, this.props.cancelTextStyle]}>{this.props.cancelText}</Text>
</View>
</TouchableOpacity>
</View>
Expand All @@ -150,7 +148,7 @@ export default class ModalPicker extends BaseComponent {

renderChildren() {

if(this.props.children) {
if (this.props.children) {
return this.props.children;
}
return (
Expand All @@ -163,9 +161,9 @@ export default class ModalPicker extends BaseComponent {
render() {

const dp = (
<Modal transparent={true} ref="modal" visible={this.state.modalVisible} onRequestClose={this.close} animationType={this.state.animationType}>
{this.renderOptionList()}
</Modal>
<Modal transparent={true} ref="modal" visible={this.state.modalVisible} onRequestClose={this.close} animationType={this.state.animationType}>
{this.renderOptionList()}
</Modal>
);

return (
Expand Down