Merge branch 'master' into master

Author: crazycodeboy

README.zh.md

@@ -135,7 +135,7 @@ textStyle | View.propTypes.style | true | {color:'white'} | 自定义text的
 
 
 方法 | 类型 | 可选 | 描述
------------------ | -------- | -------- | ----------- 
+----------------- | -------- | -------- | ----------- | -----------
 show(text, duration) | function | false | 弹出提示框,单位是毫秒
 close() | function | true | 手动关闭提示框 
 

index.js

@@ -2,23 +2,24 @@
  * react-native-easy-toast
  * https://github.com/crazycodeboy/react-native-easy-toast
  * Email:crazycodeboy@gmail.com
- * Blog:http://www.devio.org/
+ * Blog:http://jiapenghui.com
  * @flow
  */
 
 import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 import {
  StyleSheet,
  View,
  Animated,
  Dimensions,
  Text,
+ ViewPropTypes as RNViewPropTypes,
 } from 'react-native'
 
 import PropTypes from 'prop-types';
-
+const ViewPropTypes = RNViewPropTypes || View.propTypes;
 export const DURATION = { 
- LENGTH_LONG: 2000, 
  LENGTH_SHORT: 500,
  FOREVER: 0,
 };
@@ -101,15 +102,15 @@ export default class Toast extends Component {
  pos = height - this.props.positionValue;
  break;
  }
- 
+
  const view = this.state.isShow ?
  <View
  style={[styles.container, { top: pos }]}
  pointerEvents="none"
-  >
+ >
  <Animated.View
  style={[styles.content, { opacity: this.state.opacityValue }, this.props.style]}
-  >
+ >
  <Text style={this.props.textStyle}>{this.state.text}</Text>
  </Animated.View>
  </View> : null;
@@ -122,7 +123,9 @@ const styles = StyleSheet.create({
  position: 'absolute',
  left: 0,
  right: 0,
+ elevation: 999,
  alignItems: 'center',
+ zIndex: 10000,
  },
  content: {
  backgroundColor: 'black',
@@ -135,17 +138,17 @@ const styles = StyleSheet.create({
 });
 
 Toast.propTypes = {
- style: PropTypes.any,
+ style: ViewPropTypes.style,
  position: PropTypes.oneOf([
  'top',
  'center',
  'bottom',
  ]),
- textStyle: PropTypes.any,
- positionValue: PropTypes.number,
- fadeInDuration: PropTypes.number,
- fadeOutDuration: PropTypes.number,
- opacity: PropTypes.number
+ textStyle: Text.propTypes.style,
+ positionValue:PropTypes.number,
+ fadeInDuration:PropTypes.number,
+ fadeOutDuration:PropTypes.number,
+ opacity:PropTypes.number
 }
 
 Toast.defaultProps = {

package.json

@@ -1,6 +1,6 @@
 {
  "name": "react-native-easy-toast",
- "version": "1.0.6",
+ "version": "1.0.9",
  "description": "A react native module to show toast like android, it works on iOS and Android.",
  "main": "index.js",
  "scripts": {
@@ -31,7 +31,11 @@
 "prop-types": "^15.6.0"
 },
  "peerDependencies": {
- "react-native": ">=0.20.0"
+ "react-native": ">=0.20.0",
+ "prop-types": "^15.5.7"
  },
- "homepage": "https://github.com/crazycodeboy/react-native-easy-toast#readme"
+ "homepage": "https://github.com/crazycodeboy/react-native-easy-toast#readme",
+ "dependencies": {
+ "prop-types": "^15.5.10"
+ }
 }