From 456fa571217abad00c962a8298fdb9e9d620799e Mon Sep 17 00:00:00 2001 From: Matt Gustin Date: Wed, 7 Jun 2017 17:04:32 -0500 Subject: [PATCH] Change deprecated View.propTypes to ViewPropTypes --- example/CustomActions.js | 5 +++-- example/CustomView.js | 6 +++--- src/Actions.js | 3 ++- src/Avatar.js | 10 +++++----- src/Bubble.js | 21 +++++++++++---------- src/Day.js | 5 +++-- src/InputToolbar.js | 7 ++++--- src/LoadEarlier.js | 7 ++++--- src/Message.js | 5 +++-- src/MessageImage.js | 3 ++- src/MessageText.js | 5 +++-- src/Send.js | 3 ++- src/Time.js | 5 +++-- 13 files changed, 48 insertions(+), 37 deletions(-) diff --git a/example/CustomActions.js b/example/CustomActions.js index 1d6532d41..006aa9467 100644 --- a/example/CustomActions.js +++ b/example/CustomActions.js @@ -4,6 +4,7 @@ import { StyleSheet, TouchableOpacity, View, + ViewPropTypes, Text, } from 'react-native'; @@ -197,7 +198,7 @@ CustomActions.propTypes = { onSend: React.PropTypes.func, options: React.PropTypes.object, icon: React.PropTypes.func, - containerStyle: View.propTypes.style, - wrapperStyle: View.propTypes.style, + containerStyle: ViewPropTypes.style, + wrapperStyle: ViewPropTypes.style, iconTextStyle: Text.propTypes.style, }; diff --git a/example/CustomView.js b/example/CustomView.js index b2b72763b..18c0f0b64 100644 --- a/example/CustomView.js +++ b/example/CustomView.js @@ -5,7 +5,7 @@ import { Platform, StyleSheet, TouchableOpacity, - View, + ViewPropTypes, } from 'react-native'; export default class CustomView extends React.Component { @@ -64,6 +64,6 @@ CustomView.defaultProps = { CustomView.propTypes = { currentMessage: React.PropTypes.object, - containerStyle: View.propTypes.style, - mapViewStyle: View.propTypes.style, + containerStyle: ViewPropTypes.style, + mapViewStyle: ViewPropTypes.style, }; diff --git a/src/Actions.js b/src/Actions.js index e74c4b6c9..dc939ab0a 100644 --- a/src/Actions.js +++ b/src/Actions.js @@ -4,6 +4,7 @@ import { Text, TouchableOpacity, View, + ViewPropTypes, } from 'react-native'; export default class Actions extends React.Component { @@ -104,6 +105,6 @@ Actions.propTypes = { optionTintColor: React.PropTypes.string, icon: React.PropTypes.func, onPressActionButton: React.PropTypes.func, - containerStyle: View.propTypes.style, + containerStyle: ViewPropTypes.style, iconTextStyle: Text.propTypes.style, }; diff --git a/src/Avatar.js b/src/Avatar.js index 416844744..ab26873e6 100644 --- a/src/Avatar.js +++ b/src/Avatar.js @@ -1,5 +1,5 @@ import React from "react"; -import {Image, StyleSheet, View} from "react-native"; +import {Image, StyleSheet, View, ViewPropTypes} from "react-native"; import GiftedAvatar from "./GiftedAvatar"; import {isSameUser, isSameDay, warnDeprecated} from "./utils"; @@ -98,12 +98,12 @@ Avatar.propTypes = { nextMessage: React.PropTypes.object, onPressAvatar: React.PropTypes.func, containerStyle: React.PropTypes.shape({ - left: View.propTypes.style, - right: View.propTypes.style, + left: ViewPropTypes.style, + right: ViewPropTypes.style, }), imageStyle: React.PropTypes.shape({ - left: View.propTypes.style, - right: View.propTypes.style, + left: ViewPropTypes.style, + right: ViewPropTypes.style, }), //TODO: remove in next major release isSameDay: React.PropTypes.func, diff --git a/src/Bubble.js b/src/Bubble.js index 2152719f5..790030903 100644 --- a/src/Bubble.js +++ b/src/Bubble.js @@ -5,6 +5,7 @@ import { StyleSheet, TouchableWithoutFeedback, View, + ViewPropTypes, } from 'react-native'; import MessageText from './MessageText'; @@ -237,25 +238,25 @@ Bubble.propTypes = { nextMessage: React.PropTypes.object, previousMessage: React.PropTypes.object, containerStyle: React.PropTypes.shape({ - left: View.propTypes.style, - right: View.propTypes.style, + left: ViewPropTypes.style, + right: ViewPropTypes.style, }), wrapperStyle: React.PropTypes.shape({ - left: View.propTypes.style, - right: View.propTypes.style, + left: ViewPropTypes.style, + right: ViewPropTypes.style, }), bottomContainerStyle: React.PropTypes.shape({ - left: View.propTypes.style, - right: View.propTypes.style, + left: ViewPropTypes.style, + right: ViewPropTypes.style, }), tickStyle: Text.propTypes.style, containerToNextStyle: React.PropTypes.shape({ - left: View.propTypes.style, - right: View.propTypes.style, + left: ViewPropTypes.style, + right: ViewPropTypes.style, }), containerToPreviousStyle: React.PropTypes.shape({ - left: View.propTypes.style, - right: View.propTypes.style, + left: ViewPropTypes.style, + right: ViewPropTypes.style, }), //TODO: remove in next major release isSameDay: React.PropTypes.func, diff --git a/src/Day.js b/src/Day.js index 8b45c9a6e..785916aa4 100644 --- a/src/Day.js +++ b/src/Day.js @@ -3,6 +3,7 @@ import { StyleSheet, Text, View, + ViewPropTypes, } from 'react-native'; import moment from 'moment/min/moment-with-locales.min'; @@ -70,8 +71,8 @@ Day.defaultProps = { Day.propTypes = { currentMessage: React.PropTypes.object, previousMessage: React.PropTypes.object, - containerStyle: View.propTypes.style, - wrapperStyle: View.propTypes.style, + containerStyle: ViewPropTypes.style, + wrapperStyle: ViewPropTypes.style, textStyle: Text.propTypes.style, //TODO: remove in next major release isSameDay: React.PropTypes.func, diff --git a/src/InputToolbar.js b/src/InputToolbar.js index 9f7050e4d..d0b7064d1 100644 --- a/src/InputToolbar.js +++ b/src/InputToolbar.js @@ -2,6 +2,7 @@ import React from 'react'; import { StyleSheet, View, + ViewPropTypes, } from 'react-native'; import Composer from './Composer'; @@ -93,7 +94,7 @@ InputToolbar.propTypes = { renderSend: React.PropTypes.func, renderComposer: React.PropTypes.func, onPressActionButton: React.PropTypes.func, - containerStyle: View.propTypes.style, - primaryStyle: View.propTypes.style, - accessoryStyle: View.propTypes.style, + containerStyle: ViewPropTypes.style, + primaryStyle: ViewPropTypes.style, + accessoryStyle: ViewPropTypes.style, }; diff --git a/src/LoadEarlier.js b/src/LoadEarlier.js index e21e73b02..9ff26aaa8 100644 --- a/src/LoadEarlier.js +++ b/src/LoadEarlier.js @@ -6,6 +6,7 @@ import { Text, TouchableOpacity, View, + ViewPropTypes, } from 'react-native'; export default class LoadEarlier extends React.Component { @@ -94,8 +95,8 @@ LoadEarlier.propTypes = { onLoadEarlier: React.PropTypes.func, isLoadingEarlier: React.PropTypes.bool, label: React.PropTypes.string, - containerStyle: View.propTypes.style, - wrapperStyle: View.propTypes.style, + containerStyle: ViewPropTypes.style, + wrapperStyle: ViewPropTypes.style, textStyle: Text.propTypes.style, - activityIndicatorStyle: View.propTypes.style, + activityIndicatorStyle: ViewPropTypes.style, }; diff --git a/src/Message.js b/src/Message.js index 659285bce..b9aec09b5 100644 --- a/src/Message.js +++ b/src/Message.js @@ -1,6 +1,7 @@ import React from 'react'; import { View, + ViewPropTypes, StyleSheet, } from 'react-native'; @@ -107,7 +108,7 @@ Message.propTypes = { previousMessage: React.PropTypes.object, user: React.PropTypes.object, containerStyle: React.PropTypes.shape({ - left: View.propTypes.style, - right: View.propTypes.style, + left: ViewPropTypes.style, + right: ViewPropTypes.style, }), }; diff --git a/src/MessageImage.js b/src/MessageImage.js index 2d7d9e3a5..6fad07842 100644 --- a/src/MessageImage.js +++ b/src/MessageImage.js @@ -3,6 +3,7 @@ import { Image, StyleSheet, View, + ViewPropTypes, Dimensions, } from 'react-native'; import Lightbox from 'react-native-lightbox'; @@ -57,7 +58,7 @@ MessageImage.defaultProps = { MessageImage.propTypes = { currentMessage: React.PropTypes.object, - containerStyle: View.propTypes.style, + containerStyle: ViewPropTypes.style, imageStyle: Image.propTypes.style, imageProps: React.PropTypes.object, lightboxProps: React.PropTypes.object, diff --git a/src/MessageText.js b/src/MessageText.js index 32eec6d09..dd28e9e3e 100644 --- a/src/MessageText.js +++ b/src/MessageText.js @@ -4,6 +4,7 @@ import { StyleSheet, Text, View, + ViewPropTypes, } from 'react-native'; import ParsedText from 'react-native-parsed-text'; @@ -120,8 +121,8 @@ MessageText.propTypes = { position: React.PropTypes.oneOf(['left', 'right']), currentMessage: React.PropTypes.object, containerStyle: React.PropTypes.shape({ - left: View.propTypes.style, - right: View.propTypes.style, + left: ViewPropTypes.style, + right: ViewPropTypes.style, }), textStyle: React.PropTypes.shape({ left: Text.propTypes.style, diff --git a/src/Send.js b/src/Send.js index 7585d2c86..facf71fcf 100644 --- a/src/Send.js +++ b/src/Send.js @@ -4,6 +4,7 @@ import { Text, TouchableOpacity, View, + ViewPropTypes, } from 'react-native'; export default class Send extends React.Component { @@ -59,6 +60,6 @@ Send.propTypes = { text: React.PropTypes.string, onSend: React.PropTypes.func, label: React.PropTypes.string, - containerStyle: View.propTypes.style, + containerStyle: ViewPropTypes.style, textStyle: Text.propTypes.style, }; diff --git a/src/Time.js b/src/Time.js index c95a4d937..703f01a2b 100644 --- a/src/Time.js +++ b/src/Time.js @@ -3,6 +3,7 @@ import { StyleSheet, Text, View, + ViewPropTypes, } from 'react-native'; import moment from 'moment/min/moment-with-locales.min'; @@ -69,8 +70,8 @@ Time.propTypes = { position: React.PropTypes.oneOf(['left', 'right']), currentMessage: React.PropTypes.object, containerStyle: React.PropTypes.shape({ - left: View.propTypes.style, - right: View.propTypes.style, + left: ViewPropTypes.style, + right: ViewPropTypes.style, }), textStyle: React.PropTypes.shape({ left: Text.propTypes.style,