1.升级demo依赖框架

zbtang · zbtang · commit c7ff97371ee7 · 2017-09-26T14:41:21.000+08:00
2.添加selectedItemStyle
diff --git a/.gitignore b/.gitignore
@@ -33,4 +33,5 @@ local.properties
 node_modules/
 npm-debug.log
 
-rn-viewpager-*
+rn-viewpager-*
+.tmp
diff --git a/RNViewPagerDemo/app/components/common/navigator/XNavigator.js b/RNViewPagerDemo/app/components/common/navigator/XNavigator.js
@@ -4,7 +4,8 @@
 
 'use strict'
 
-import { StyleSheet, Navigator, Platform, View, Text, Image, BackAndroid } from 'react-native'
+import { StyleSheet, Platform, View, Text, Image, BackAndroid } from 'react-native'
+import { Navigator } from 'react-native-deprecated-custom-components'
 import { PropTypes } from 'react'
 import React from 'react'
 import XNavBarStyle from './XNavBarStyle'
@@ -51,7 +52,7 @@ export default class XNavigator extends React.Component {
                 {...this.props}
                 ref={this._setNavigatorRef}
                 style={[XNavigatorStyles.navigator, this.props.style]}
-                sceneStyle={[XNavigatorStyles.scene, {paddingTop: sencePaddingTop}, this.props.sceneStyle]}
+                sceneStyle={StyleSheet.flatten([XNavigatorStyles.scene, {paddingTop: sencePaddingTop}, this.props.sceneStyle])}
                 navigationBar={this._renderNavigationBar()}
                 configureScene={route => this._routeRenderer.configureScene(route)}
                 renderScene={this._renderScene}
diff --git a/RNViewPagerDemo/app/components/common/navigator/XRouteRenderer.js b/RNViewPagerDemo/app/components/common/navigator/XRouteRenderer.js
@@ -7,9 +7,9 @@ import {
     StyleSheet,
     Text,
     TouchableOpacity,
-    View,
-    Navigator
+    View
 } from 'react-native'
+import { Navigator } from 'react-native-deprecated-custom-components'
 import XNavigatorStyles from './XNavigatorStyles'
 import { BackIcon } from './XNavigatorIcons'
 
@@ -28,8 +28,8 @@ class NavigationBarRouteMapper {
             <View style={XNavigatorStyles.barTitle} >
                 <Text style={[XNavigatorStyles.barTitleText, this._titleStyle]} allowFontScaling={false} >
                     {shortenTitle(route.getTitle(this._navigator, index, state))}
-                </Text>
-            </View>
+                </Text >
+            </View >
         )
     }
 
@@ -60,7 +60,7 @@ class NavigationBarRouteMapper {
                     allowFontScaling={false}
                 >
                     {title}
-                </Text>
+                </Text >
             )
         }
         return (
@@ -71,7 +71,7 @@ class NavigationBarRouteMapper {
             >
                 <BackIcon style={[XNavigatorStyles.barButtonIcon, this._barButtonIconStyle]} />
                 {buttonText}
-            </TouchableOpacity>
+            </TouchableOpacity >
         )
     }
 
@@ -93,7 +93,7 @@ class NavigationBarRouteMapper {
                     allowFontScaling={false}
                 >
                     {title}
-                </Text>
+                </Text >
             )
         if (imgSource)
             buttonImage = (
@@ -111,7 +111,7 @@ class NavigationBarRouteMapper {
             >
                 {buttonImage}
                 {buttonText}
-            </TouchableOpacity>
+            </TouchableOpacity >
         )
     }
 }
@@ -186,9 +186,9 @@ export default class ExRouteRenderer {
     }
 
     onBackPress () {
-        if (!this._navigator)return
+        if (!this._navigator) return
         let currentRoutes = this._navigator.getCurrentRoutes()
-        if (!currentRoutes && currentRoutes.length == 0)return
+        if (!currentRoutes && currentRoutes.length == 0) return
         let currentRoute = currentRoutes[currentRoutes.length - 1]
 
         if (currentRoute.onBackPress) return currentRoute.onBackPress(this._navigator)
diff --git a/RNViewPagerDemo/app/pages/DotIndicatorInListPage.js b/RNViewPagerDemo/app/pages/DotIndicatorInListPage.js
@@ -0,0 +1,62 @@
+/**
+ * Created by tangzhibin on 16/7/19.
+ */
+
+'use strict'
+import React, { Component } from 'react'
+import { StyleSheet, View, Text, TouchableOpacity, Image, ListView } from 'react-native'
+import { IndicatorViewPager, PagerDotIndicator } from 'rn-viewpager'
+
+export default class DotIndicatorInListPage extends Component {
+    constructor (props) {
+        super(props)
+        this._renderHeader = this._renderHeader.bind(this)
+        var ds = new ListView.DataSource({rowHasChanged: (r1, r2) => r1 !== r2})
+        this.state = {dataSource: ds.cloneWithRows(['row 1', 'row 2', 'row 2', 'row 3', 'row 4'])}
+    }
+
+    render () {
+        return (
+            <ListView
+                style={{flex: 1}}
+                dataSource={this.state.dataSource}
+                renderRow={(rowData) => <Text>{rowData}</Text>}
+                renderHeader={this._renderHeader}
+            />
+        )
+    }
+
+    _renderHeader () {
+        return (
+            <IndicatorViewPager
+                style={{height: 200}}
+                indicator={this._renderIndicator()}
+                autoPlayEnable
+                onPageSelected={(p) => console.log(p)}
+            >
+                <View style={{backgroundColor: 'red'}} />
+                <View style={{backgroundColor: 'green'}} />
+                <View style={{backgroundColor: 'yellow'}} />
+            </IndicatorViewPager>
+        )
+    }
+
+    _renderIndicator () {
+        return (
+            <PagerDotIndicator
+                pageCount={3}
+                style={{bottom: 16}}
+                dotStyle={{backgroundColor: '#FFFFFF88'}}
+            />
+        )
+    }
+
+}
+
+const styles = StyleSheet.create({
+    bannerImg: {
+        flex: 1,
+        height: 100,
+        width: 300
+    }
+})
diff --git a/RNViewPagerDemo/ios/RNViewPagerDemo.xcodeproj/project.pbxproj b/RNViewPagerDemo/ios/RNViewPagerDemo.xcodeproj/project.pbxproj
@@ -25,7 +25,7 @@
 		2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
 		2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		2D02E4C21E0B4AEC006451C7 /* libRCTAnimation-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */; };
+		2D02E4C21E0B4AEC006451C7 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157351DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
 		2D02E4C31E0B4AEC006451C7 /* libRCTImage-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */; };
 		2D02E4C41E0B4AEC006451C7 /* libRCTLinking-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E881DF850E9000B6D8A /* libRCTLinking-tvOS.a */; };
 		2D02E4C51E0B4AEC006451C7 /* libRCTNetwork-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E8C1DF850E9000B6D8A /* libRCTNetwork-tvOS.a */; };
@@ -102,6 +102,34 @@
 			remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192;
 			remoteInfo = React;
 		};
+		181B21C21F7A1E2C002F02AC /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7;
+			remoteInfo = "third-party";
+		};
+		181B21C41F7A1E2C002F02AC /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3D383D3C1EBD27B6005632C8;
+			remoteInfo = "third-party-tvOS";
+		};
+		181B21C61F7A1E2C002F02AC /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 139D7E881E25C6D100323FB7;
+			remoteInfo = "double-conversion";
+		};
+		181B21C81F7A1E2C002F02AC /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 3D383D621EBD27B9005632C8;
+			remoteInfo = "double-conversion-tvOS";
+		};
 		2D02E4911E0B4A5D006451C7 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
@@ -289,7 +317,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				2D02E4C91E0B4AEC006451C7 /* libReact.a in Frameworks */,
-				2D02E4C21E0B4AEC006451C7 /* libRCTAnimation-tvOS.a in Frameworks */,
+				2D02E4C21E0B4AEC006451C7 /* libRCTAnimation.a in Frameworks */,
 				2D02E4C31E0B4AEC006451C7 /* libRCTImage-tvOS.a in Frameworks */,
 				2D02E4C41E0B4AEC006451C7 /* libRCTLinking-tvOS.a in Frameworks */,
 				2D02E4C51E0B4AEC006451C7 /* libRCTNetwork-tvOS.a in Frameworks */,
@@ -411,6 +439,10 @@
 				3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
 				3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
 				3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
+				181B21C31F7A1E2C002F02AC /* libthird-party.a */,
+				181B21C51F7A1E2C002F02AC /* libthird-party.a */,
+				181B21C71F7A1E2C002F02AC /* libdouble-conversion.a */,
+				181B21C91F7A1E2C002F02AC /* libdouble-conversion.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -419,7 +451,7 @@
 			isa = PBXGroup;
 			children = (
 				5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */,
-				5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */,
+				5E9157351DD0AC6500FF2AA8 /* libRCTAnimation.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -706,6 +738,34 @@
 			remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		181B21C31F7A1E2C002F02AC /* libthird-party.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libthird-party.a";
+			remoteRef = 181B21C21F7A1E2C002F02AC /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		181B21C51F7A1E2C002F02AC /* libthird-party.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libthird-party.a";
+			remoteRef = 181B21C41F7A1E2C002F02AC /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		181B21C71F7A1E2C002F02AC /* libdouble-conversion.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libdouble-conversion.a";
+			remoteRef = 181B21C61F7A1E2C002F02AC /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		181B21C91F7A1E2C002F02AC /* libdouble-conversion.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libdouble-conversion.a";
+			remoteRef = 181B21C81F7A1E2C002F02AC /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -804,10 +864,10 @@
 			remoteRef = 5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */ = {
+		5E9157351DD0AC6500FF2AA8 /* libRCTAnimation.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
-			path = "libRCTAnimation-tvOS.a";
+			path = libRCTAnimation.a;
 			remoteRef = 5E9157341DD0AC6500FF2AA8 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
@@ -874,7 +934,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh";
+			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
 		};
 		2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/RNViewPagerDemo/package.json b/RNViewPagerDemo/package.json
@@ -7,9 +7,10 @@
 		"test": "jest"
 	},
 	"dependencies": {
-		"react": "~15.4.1",
-		"react-native": "0.42.3",
-		"rn-viewpager": "^1.2.2"
+		"react": "16.0.0-alpha.12",
+		"react-native": "^0.48.4",
+		"react-native-deprecated-custom-components": "^0.1.1",
+		"rn-viewpager": "^1.2.4"
 	},
 	"devDependencies": {
 		"babel-jest": "19.0.0",
diff --git a/RNViewPagerDemo/yarn.lock b/RNViewPagerDemo/yarn.lock
diff --git a/package.json b/package.json
diff --git a/viewpager/indicator/PagerTitleIndicator.js b/viewpager/indicator/PagerTitleIndicator.js

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ import {`
`7`	`7`	`StyleSheet,`
`8`	`8`	`Text,`
`9`	`9`	`TouchableOpacity,`
`10`		`- View,`
`11`		`- Navigator`
	`10`	`+ View`
`12`	`11`	`} from 'react-native'`
	`12`	`+import { Navigator } from 'react-native-deprecated-custom-components'`
`13`	`13`	`import XNavigatorStyles from './XNavigatorStyles'`
`14`	`14`	`import { BackIcon } from './XNavigatorIcons'`
`15`	`15`
`@@ -28,8 +28,8 @@ class NavigationBarRouteMapper {`
`28`	`28`	`<View style={XNavigatorStyles.barTitle} >`
`29`	`29`	`<Text style={[XNavigatorStyles.barTitleText, this._titleStyle]} allowFontScaling={false} >`
`30`	`30`	`{shortenTitle(route.getTitle(this._navigator, index, state))}`
`31`		`- </Text>`
`32`		`- </View>`
	`31`	`+ </Text >`
	`32`	`+ </View >`
`33`	`33`	`)`
`34`	`34`	`}`
`35`	`35`
`@@ -60,7 +60,7 @@ class NavigationBarRouteMapper {`
`60`	`60`	`allowFontScaling={false}`
`61`	`61`	`>`
`62`	`62`	`{title}`
`63`		`- </Text>`
	`63`	`+ </Text >`
`64`	`64`	`)`
`65`	`65`	`}`
`66`	`66`	`return (`
`@@ -71,7 +71,7 @@ class NavigationBarRouteMapper {`
`71`	`71`	`>`
`72`	`72`	`<BackIcon style={[XNavigatorStyles.barButtonIcon, this._barButtonIconStyle]} />`
`73`	`73`	`{buttonText}`
`74`		`- </TouchableOpacity>`
	`74`	`+ </TouchableOpacity >`
`75`	`75`	`)`
`76`	`76`	`}`
`77`	`77`
`@@ -93,7 +93,7 @@ class NavigationBarRouteMapper {`
`93`	`93`	`allowFontScaling={false}`
`94`	`94`	`>`
`95`	`95`	`{title}`
`96`		`- </Text>`
	`96`	`+ </Text >`
`97`	`97`	`)`
`98`	`98`	`if (imgSource)`
`99`	`99`	`buttonImage = (`
`@@ -111,7 +111,7 @@ class NavigationBarRouteMapper {`
`111`	`111`	`>`
`112`	`112`	`{buttonImage}`
`113`	`113`	`{buttonText}`
`114`		`- </TouchableOpacity>`
	`114`	`+ </TouchableOpacity >`
`115`	`115`	`)`
`116`	`116`	`}`
`117`	`117`	`}`
`@@ -186,9 +186,9 @@ export default class ExRouteRenderer {`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`onBackPress () {`
`189`		`- if (!this._navigator)return`
	`189`	`+ if (!this._navigator) return`
`190`	`190`	`let currentRoutes = this._navigator.getCurrentRoutes()`
`191`		`- if (!currentRoutes && currentRoutes.length == 0)return`
	`191`	`+ if (!currentRoutes && currentRoutes.length == 0) return`
`192`	`192`	`let currentRoute = currentRoutes[currentRoutes.length - 1]`
`193`	`193`
`194`	`194`	`if (currentRoute.onBackPress) return currentRoute.onBackPress(this._navigator)`