mirror of
https://github.com/zhigang1992/react-native.git
synced 2026-04-23 03:50:11 +08:00
Updates from Fri 3 Apr
- Update deps order - core modules first | Amjad Masad - [ReactNative] Workaround double cmd+r bug | Christopher Chedeau - [react-native] Nicer error for undefined or string tag names | Ben Alpert - [ReactNative] Fix script load from local files | Tadeu Zagallo - [react_native] JS files from D1961099: Format stack trace on native side | Alex Kotliarskyi - [ReactNative] Cleanup TabBar and its example | Christopher Chedeau - [ReactNative] Allow recover from debugger error | Tadeu Zagallo - [react-native] Update react to 0.13.1, jstransform alongside | Ben Alpert - Fixed tap-to-zoom in Groups photo viewer | Sumeet Vaidya - Fix hitTest for auto | Tadeu Zagallo - [ReactNative] Unfork RKRootView | Tadeu Zagallo - [react-packager] Ignore dotfiles in file watching | Amjad Masad
This commit is contained in:
@@ -22,9 +22,8 @@ var {
|
||||
Text,
|
||||
View,
|
||||
} = React;
|
||||
var TabBarItemIOS = TabBarIOS.Item;
|
||||
var TabBarExample = React.createClass({
|
||||
|
||||
var TabBarExample = React.createClass({
|
||||
statics: {
|
||||
title: '<TabBarIOS>',
|
||||
description: 'Tab-based navigation.'
|
||||
@@ -42,19 +41,16 @@ var TabBarExample = React.createClass({
|
||||
return (
|
||||
<View style={[styles.tabContent, {backgroundColor: color}]}>
|
||||
<Text style={styles.tabText}>{pageText}</Text>
|
||||
<Text style={styles.tabText}>{this.state.presses} re-renders of this tab</Text>
|
||||
<Text style={styles.tabText}>{this.state.presses} re-renders of the More tab</Text>
|
||||
</View>
|
||||
);
|
||||
},
|
||||
|
||||
render: function() {
|
||||
return (
|
||||
<TabBarIOS
|
||||
selectedTab={this.state.selectedTab}>
|
||||
<TabBarItemIOS
|
||||
name="blueTab"
|
||||
icon={_ix_DEPRECATED('favorites')}
|
||||
accessibilityLabel="Blue Tab"
|
||||
<TabBarIOS>
|
||||
<TabBarIOS.Item
|
||||
title="Blue Tab"
|
||||
selected={this.state.selectedTab === 'blueTab'}
|
||||
onPress={() => {
|
||||
this.setState({
|
||||
@@ -62,12 +58,10 @@ var TabBarExample = React.createClass({
|
||||
});
|
||||
}}>
|
||||
{this._renderContent('#414A8C', 'Blue Tab')}
|
||||
</TabBarItemIOS>
|
||||
<TabBarItemIOS
|
||||
accessibilityLabel="Red Tab"
|
||||
name="redTab"
|
||||
icon={_ix_DEPRECATED('history')}
|
||||
badgeValue={this.state.notifCount ? String(this.state.notifCount) : null}
|
||||
</TabBarIOS.Item>
|
||||
<TabBarIOS.Item
|
||||
systemIcon="history"
|
||||
badge={this.state.notifCount > 0 ? this.state.notifCount : undefined}
|
||||
selected={this.state.selectedTab === 'redTab'}
|
||||
onPress={() => {
|
||||
this.setState({
|
||||
@@ -76,11 +70,9 @@ var TabBarExample = React.createClass({
|
||||
});
|
||||
}}>
|
||||
{this._renderContent('#783E33', 'Red Tab')}
|
||||
</TabBarItemIOS>
|
||||
<TabBarItemIOS
|
||||
name="greenTab"
|
||||
icon={_ix_DEPRECATED('more')}
|
||||
accessibilityLabel="Green Tab"
|
||||
</TabBarIOS.Item>
|
||||
<TabBarIOS.Item
|
||||
systemIcon="more"
|
||||
selected={this.state.selectedTab === 'greenTab'}
|
||||
onPress={() => {
|
||||
this.setState({
|
||||
@@ -89,7 +81,7 @@ var TabBarExample = React.createClass({
|
||||
});
|
||||
}}>
|
||||
{this._renderContent('#21551C', 'Green Tab')}
|
||||
</TabBarItemIOS>
|
||||
</TabBarIOS.Item>
|
||||
</TabBarIOS>
|
||||
);
|
||||
},
|
||||
@@ -107,14 +99,4 @@ var styles = StyleSheet.create({
|
||||
},
|
||||
});
|
||||
|
||||
// This is needed because the actual image may not exist as a file and
|
||||
// is used by the native code to load a system image.
|
||||
// TODO(nicklockwood): How can this fit our require system?
|
||||
function _ix_DEPRECATED(imageUri) {
|
||||
return {
|
||||
uri: imageUri,
|
||||
isStatic: true,
|
||||
};
|
||||
}
|
||||
|
||||
module.exports = TabBarExample;
|
||||
|
||||
Reference in New Issue
Block a user