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

ADD PropTypes and FIX ESLint #33

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ADD PropTypes and FIX ESLint #33

Show file tree
Hide file tree
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
80 changes: 41 additions & 39 deletions Example/index.android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,13 @@
/**
* Sample React Native App
* https://github.com/facebook/react-native
*/
'use strict';

var React = require('react-native');
var {
import React from 'react';
import {
AppRegistry,
StyleSheet,
Text,
View,
} = React;
var Tabs = require('react-native-tabs');

class Example extends React.Component {
constructor(props){
super(props);
this.state = {};
}
render() {
var self = this;
return (
<View style={styles.container}>
<Text style={styles.welcome}>
Welcome to React Native!
</Text>
<Text style={styles.instructions}>
Selected page: {this.state.page}
</Text>
<Tabs selected="second" style={{backgroundColor:'white'}}
onSelect={function(el){self.setState({page: el.props.name});return {style:{color:'red'}}}}>
<Text name="first">First</Text>
<Text name="second">Second</Text>
<Text name="third">Third</Text>
<Text name="fourth">Fourth</Text>
<Text name="fifth">Fifth</Text>
</Tabs>
</View>
);
}
}
} from 'react-native';
import Tabs from 'react-native-tabs';

var styles = StyleSheet.create({
const styles = StyleSheet.create({
container: {
flex: 1,
justifyContent: 'center',
Expand All @@ -60,4 +26,40 @@ var styles = StyleSheet.create({
},
});

class Example extends React.Component {
constructor(props) {
super(props);
this.state = { page: 'second' };
}
render() {
return (
<View style={styles.container}>
<Tabs
selected={this.state.page}
style={{ backgroundColor: 'white' }}
selectedStyle={{ color: 'red' }} onSelect={el => this.setState({ page: el.props.name })}
pressOpacity={1}
>
<Text name="first">First</Text>
<Text
name="second"
selectedIconStyle={{ borderTopWidth: 2, borderTopColor: 'red' }}
>
Second
</Text>
<Text name="third">Third</Text>
<Text name="fourth" selectedStyle={{ color: 'green' }}>Fourth</Text>
<Text name="fifth">Fifth</Text>
</Tabs>
<Text style={styles.welcome}>
Welcome to React Native
</Text>
<Text style={styles.instructions}>
Selected page: {this.state.page}
</Text>
</View>
);
}
}

AppRegistry.registerComponent('Example', () => Example);
81 changes: 41 additions & 40 deletions Example/index.ios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,13 @@
/**
* Sample React Native App
* https://github.com/facebook/react-native
*/
'use strict';

var React = require('react-native');
var {
import React from 'react';
import {
AppRegistry,
StyleSheet,
Text,
View,
} = React;
var Tabs = require('react-native-tabs');

class Example extends React.Component {
constructor(props){
super(props);
this.state = {page:'second'};
}
render() {
var self = this;
return (
<View style={styles.container}>
<Tabs selected={this.state.page} style={{backgroundColor:'white'}}
selectedStyle={{color:'red'}} onSelect={el=>this.setState({page:el.props.name})}
pressOpacity={1}>
<Text name="first">First</Text>
<Text name="second" selectedIconStyle={{borderTopWidth:2,borderTopColor:'red'}}>Second</Text>
<Text name="third">Third</Text>
<Text name="fourth" selectedStyle={{color:'green'}}>Fourth</Text>
<Text name="fifth">Fifth</Text>
</Tabs>
<Text style={styles.welcome}>
Welcome to React Native
</Text>
<Text style={styles.instructions}>
Selected page: {this.state.page}
</Text>
</View>
);
}
}
} from 'react-native';
import Tabs from 'react-native-tabs';

var styles = StyleSheet.create({
const styles = StyleSheet.create({
container: {
flex: 1,
justifyContent: 'center',
Expand All @@ -61,4 +26,40 @@ var styles = StyleSheet.create({
},
});

class Example extends React.Component {
constructor(props) {
super(props);
this.state = { page: 'second' };
}
render() {
return (
<View style={styles.container}>
<Tabs
selected={this.state.page}
style={{ backgroundColor: 'white' }}
selectedStyle={{ color: 'red' }} onSelect={el => this.setState({ page: el.props.name })}
pressOpacity={1}
>
<Text name="first">First</Text>
<Text
name="second"
selectedIconStyle={{ borderTopWidth: 2, borderTopColor: 'red' }}
>
Second
</Text>
<Text name="third">Third</Text>
<Text name="fourth" selectedStyle={{ color: 'green' }}>Fourth</Text>
<Text name="fifth">Fifth</Text>
</Tabs>
<Text style={styles.welcome}>
Welcome to React Native
</Text>
<Text style={styles.instructions}>
Selected page: {this.state.page}
</Text>
</View>
);
}
}

AppRegistry.registerComponent('Example', () => Example);
137 changes: 80 additions & 57 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,69 +1,92 @@
'use strict';

import React, {
Component
PropTypes,
Component,
} from 'react';

import {
StyleSheet,
View,
Text,
TouchableOpacity,
StyleSheet,
View,
Text,
TouchableOpacity,
} from 'react-native';

const styles = StyleSheet.create({
tabbarView: {
position: 'absolute',
bottom: 0,
right: 0,
left: 0,
height: 50,
opacity: 1,
backgroundColor: 'transparent',
flexDirection: 'row',
justifyContent: 'center',
alignItems: 'center',
},
iconView: {
flex: 1,
height: 50,
justifyContent: 'center',
alignItems: 'center',
},
});

const propTypes = {
onSelect: PropTypes.func,
selected: PropTypes.string,
children: PropTypes.array,
style: View.propTypes.style,
iconStyle: Text.propTypes.style,
selectedIconStyle: Text.propTypes.style,
selectedStyle: Text.propTypes.style,
};

class Tabs extends Component {
onSelect(el){
if (el.props.onSelect) {
el.props.onSelect(el);
} else if (this.props.onSelect) {
this.props.onSelect(el);
}

onSelect(el) {
if (el.props.onSelect) {
el.props.onSelect(el);
} else if (this.props.onSelect) {
this.props.onSelect(el);
}
}

render(){
const self = this;
let selected = this.props.selected
if (!selected){
React.Children.forEach(this.props.children.filter(c=>c), el=>{
if (!selected || el.props.initial){
selected = el.props.name || el.key;
}
});
render() {
const self = this;
let selected = this.props.selected;
if (!selected) {
React.Children.forEach(this.props.children.filter(c => c), el => {
if (!selected || el.props.initial) {
selected = el.props.name || el.key;
}
return (
<View style={[styles.tabbarView, this.props.style]}>
{React.Children.map(this.props.children.filter(c=>c),(el)=>
<TouchableOpacity key={el.props.name+"touch"}
style={[styles.iconView, this.props.iconStyle, (el.props.name || el.key) == selected ? this.props.selectedIconStyle || el.props.selectedIconStyle || {} : {} ]}
onPress={()=>!self.props.locked && self.onSelect(el)}
onLongPress={()=>self.onSelect(el)}
activeOpacity={el.props.pressOpacity}>
{selected == (el.props.name || el.key) ? React.cloneElement(el, {selected: true, style: [el.props.style, this.props.selectedStyle, el.props.selectedStyle]}) : el}
</TouchableOpacity>
)}
</View>
);
});
}
return (
<View style={[styles.tabbarView, this.props.style]}>
{React.Children.map(this.props.children.filter(c => c), (el) =>
<TouchableOpacity
key={`${el.props.name}touch`}
style={[
styles.iconView,
this.props.iconStyle,
(el.props.name || el.key) === selected ?
this.props.selectedIconStyle || el.props.selectedIconStyle || {} : {}]}
onPress={() => !self.props.locked && self.onSelect(el)}
onLongPress={() => self.onSelect(el)}
activeOpacity={el.props.pressOpacity}
>
{selected === (el.props.name || el.key) ?
React.cloneElement(el, {
selected: true,
style: [el.props.style, this.props.selectedStyle, el.props.selectedStyle],
}) : el
}
</TouchableOpacity>
)}
</View>
);
}
}
var styles = StyleSheet.create({
tabbarView: {
position:'absolute',
bottom:0,
right:0,
left:0,
height:50,
opacity:1,
backgroundColor:'transparent',
flexDirection: 'row',
justifyContent: 'center',
alignItems: 'center'
},
iconView: {
flex: 1,
height: 50,
justifyContent: 'center',
alignItems: 'center',
}
});

module.exports = Tabs;
Tabs.propTypes = propTypes;

export default Tabs;