From 1c90a2dbcc476b4dc170f315891f5e441d9057d7 Mon Sep 17 00:00:00 2001 From: Brent Vatne Date: Thu, 7 May 2015 12:14:15 -0700 Subject: [PATCH] Move updated propTypes into new TransformPropTypes --- Libraries/Components/View/ViewStylePropTypes.js | 17 ----------------- Libraries/StyleSheet/TransformPropTypes.js | 10 +++++++++- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Libraries/Components/View/ViewStylePropTypes.js b/Libraries/Components/View/ViewStylePropTypes.js index 80f1a5a3a..c1f6b4b1c 100644 --- a/Libraries/Components/View/ViewStylePropTypes.js +++ b/Libraries/Components/View/ViewStylePropTypes.js @@ -36,23 +36,6 @@ var ViewStylePropTypes = { ), shadowOpacity: ReactPropTypes.number, shadowRadius: ReactPropTypes.number, - transform: ReactPropTypes.arrayOf( - ReactPropTypes.oneOfType([ - ReactPropTypes.shape({rotate: ReactPropTypes.string}), - ReactPropTypes.shape({scaleX: ReactPropTypes.number}), - ReactPropTypes.shape({scaleY: ReactPropTypes.number}), - ReactPropTypes.shape({translateX: ReactPropTypes.number}), - ReactPropTypes.shape({translateY: ReactPropTypes.number}) - ]) - ), - transformMatrix: ReactPropTypes.arrayOf(ReactPropTypes.number), - - // DEPRECATED - rotation: ReactPropTypes.number, - scaleX: ReactPropTypes.number, - scaleY: ReactPropTypes.number, - translateX: ReactPropTypes.number, - translateY: ReactPropTypes.number, }; module.exports = ViewStylePropTypes; diff --git a/Libraries/StyleSheet/TransformPropTypes.js b/Libraries/StyleSheet/TransformPropTypes.js index 9338f7ff5..c9f403f75 100644 --- a/Libraries/StyleSheet/TransformPropTypes.js +++ b/Libraries/StyleSheet/TransformPropTypes.js @@ -14,7 +14,15 @@ var ReactPropTypes = require('ReactPropTypes'); var TransformPropTypes = { - transform: ReactPropTypes.arrayOf(ReactPropTypes.object), + transform: ReactPropTypes.arrayOf( + ReactPropTypes.oneOfType([ + ReactPropTypes.shape({rotate: ReactPropTypes.string}), + ReactPropTypes.shape({scaleX: ReactPropTypes.number}), + ReactPropTypes.shape({scaleY: ReactPropTypes.number}), + ReactPropTypes.shape({translateX: ReactPropTypes.number}), + ReactPropTypes.shape({translateY: ReactPropTypes.number}) + ]) + ), transformMatrix: ReactPropTypes.arrayOf(ReactPropTypes.number), // DEPRECATED