Merge pull request ptomasroos#40 from fomahaut/master

Fix examples and README for ptomasroos#22, ptomasroos#38

Author: brentvatne

.gitignore

@@ -1 +1,3 @@
 npm-debug.log
+node_modules/
+.idea/

README.md

@@ -103,10 +103,8 @@ var CustomTabBar = React.createClass({
     var isTabActive = this.props.activeTab === page;
 
     return (
-      <TouchableOpacity key={name} onPress={() => this.props.goToPage(page)}>
-        <View style={[styles.tab]}>
-          <Text style={{color: isTabActive ? 'navy' : 'black', fontWeight: isTabActive ? 'bold' : 'normal'}}>{name}</Text>
-        </View>
+      <TouchableOpacity key={name} onPress={() => this.props.goToPage(page)} style={[styles.tab]}>
+        <Text style={{color: isTabActive ? 'navy' : 'black', fontWeight: isTabActive ? 'bold' : 'normal'}}>{name}</Text>
       </TouchableOpacity>
     );
   },

examples/FacebookTabsExample/FacebookTabBar.js

@@ -47,13 +47,11 @@ var FacebookTabBar = React.createClass({
     console.log(name);
 
     return (
-      <TouchableOpacity key={name} onPress={() => this.props.goToPage(page)}>
-        <View style={[styles.tab]}>
-          <Icon name={name} size={30} color='#3B5998' style={{width: 30, height: 30, position: 'absolute', top: 0, left: 20}}
-                ref={(icon) => { this.selectedTabIcons[page] = icon }}/>
-          <Icon name={name} size={30} color='#ccc' style={{width: 30, height: 30, position: 'absolute', top: 0, left: 20}}
-                ref={(icon) => { this.unselectedTabIcons[page] = icon }}/>
-        </View>
+      <TouchableOpacity key={name} onPress={() => this.props.goToPage(page)} style={[styles.tab]}>
+        <Icon name={name} size={30} color='#3B5998' style={{width: 30, height: 30, position: 'absolute', top: 0, left: 20}}
+              ref={(icon) => { this.selectedTabIcons[page] = icon }}/>
+        <Icon name={name} size={30} color='#ccc' style={{width: 30, height: 30, position: 'absolute', top: 0, left: 20}}
+              ref={(icon) => { this.unselectedTabIcons[page] = icon }}/>
       </TouchableOpacity>
     );
   },
@@ -62,11 +60,16 @@ var FacebookTabBar = React.createClass({
     var currentPage = this.props.activeTab;
 
     this.unselectedTabIcons.forEach((icon, i) => {
+      var iconRef = icon;
+
+      if(!icon.setNativeProps && icon !== null) {
+        iconRef = icon.refs.icon_image
+      }
       if (value - i >= 0 && value - i <= 1) {
-        icon.setNativeProps({opacity: value - i});
+        iconRef.setNativeProps({opacity: value - i});
       }
       if (i - value >= 0 &&  i - value <= 1) {
-        icon.setNativeProps({opacity: i - value});
+        iconRef.setNativeProps({opacity: i - value});
       }
     });
   },

examples/FacebookTabsExample/package.json

@@ -6,7 +6,7 @@
     "start": "node_modules/react-native/packager/packager.sh"
   },
   "dependencies": {
-    "react-native": "0.8.0",
+    "react-native": "0.9.0",
     "react-native-icons": "^0.2.0",
     "react-native-scrollable-tab-view": "^0.1.10"
   }

examples/RugbyExample/ScrollingTabBar.js

@@ -47,10 +47,8 @@ var ScrollingTabBar = React.createClass({
                                              extrapolate: 'clamp'});
 
     return (
-      <TouchableOpacity key={name} onPress={() => this.props.goToPage(page)}>
-        <Animated.View style={[styles.tab]}>
-          <Animated.Text style={{color}}>{name}</Animated.Text>
-        </Animated.View>
+      <TouchableOpacity key={name} onPress={() => this.props.goToPage(page)} style={[styles.tab]}>
+        <Animated.Text style={{color}}>{name}</Animated.Text>
       </TouchableOpacity>
     );
   },

examples/RugbyExample/package.json

@@ -6,6 +6,6 @@
     "start": "node_modules/react-native/packager/packager.sh"
   },
   "dependencies": {
-    "react-native": "^0.8.0"
+    "react-native": "^0.9.0"
   }
 }

package.json

@@ -25,7 +25,7 @@
   },
   "homepage": "https://github.com/brentvatne/react-native-scrollable-tab-view#readme",
   "peerDependencies": {
-    "react-native": ">=0.8.0 || 0.8.0-rc || 0.8.0-rc.2 || 0.9.0-rc || 0.10.0-rc"
+    "react-native": ">=0.9.0 || 0.9.0-rc || 0.10.0-rc || 0.11.0-rc"
   },
   "dependencies": {
     "rebound": "0.0.13"