move propTypes and normalizeColor

src/apis/StyleSheet/TransformPropTypes.js

@@ -1,49 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * @flow
- */
-
-import { PropTypes } from 'react'
-
-const ArrayOfNumberPropType = PropTypes.arrayOf(PropTypes.number)
-const numberOrString = PropTypes.oneOfType([ PropTypes.number, PropTypes.string ])
-
-const TransformMatrixPropType = function (
-  props : Object,
-  propName : string,
-  componentName : string
-) : ?Error {
-  if (props.transform && props.transformMatrix) {
-    return new Error(
-      'transformMatrix and transform styles cannot be used on the same ' +
-      'component'
-    )
-  }
-  return ArrayOfNumberPropType(props, propName, componentName)
-}
-
-const TransformPropTypes = {
-  transform: PropTypes.arrayOf(
-    PropTypes.oneOfType([
-      PropTypes.shape({ perspective: numberOrString }),
-      PropTypes.shape({ rotate: numberOrString }),
-      PropTypes.shape({ rotateX: numberOrString }),
-      PropTypes.shape({ rotateY: numberOrString }),
-      PropTypes.shape({ rotateZ: numberOrString }),
-      PropTypes.shape({ scale: numberOrString }),
-      PropTypes.shape({ scaleX: numberOrString }),
-      PropTypes.shape({ scaleY: numberOrString }),
-      PropTypes.shape({ skewX: numberOrString }),
-      PropTypes.shape({ skewY: numberOrString }),
-      PropTypes.shape({ translateX: numberOrString }),
-      PropTypes.shape({ translateY: numberOrString }),
-      PropTypes.shape({ translateZ: numberOrString }),
-      PropTypes.shape({ translate3d: PropTypes.string })
-    ])
-  ),
-  transformMatrix: TransformMatrixPropType
-}
-
-module.exports = TransformPropTypes

src/components/Image/ImageStylePropTypes.js

@@ -1,8 +1,8 @@
 import { PropTypes } from 'react'
-import BorderPropTypes from '../../apis/StyleSheet/BorderPropTypes'
-import ColorPropType from '../../apis/StyleSheet/ColorPropType'
-import LayoutPropTypes from '../../apis/StyleSheet/LayoutPropTypes'
-import TransformPropTypes from '../../apis/StyleSheet/TransformPropTypes'
+import BorderPropTypes from '../../propTypes/BorderPropTypes'
+import ColorPropType from '../../propTypes/ColorPropType'
+import LayoutPropTypes from '../../propTypes/LayoutPropTypes'
+import TransformPropTypes from '../../propTypes/TransformPropTypes'
 import ImageResizeMode from './ImageResizeMode'
 
 const hiddenOrVisible = PropTypes.oneOf([ 'hidden', 'visible' ])

src/components/Image/index.js

@@ -6,7 +6,7 @@ import ImageStylePropTypes from './ImageStylePropTypes'
 import resolveAssetSource from './resolveAssetSource'
 import React, { Component, PropTypes } from 'react'
 import StyleSheet from '../../apis/StyleSheet'
-import StyleSheetPropType from '../../apis/StyleSheet/StyleSheetPropType'
+import StyleSheetPropType from '../../propTypes/StyleSheetPropType'
 import View from '../View'
 
 const STATUS_ERRORED = 'ERRORED'

src/components/ScrollView/index.js

@@ -13,7 +13,7 @@ import ReactDOM from 'react-dom'
 import ScrollResponder from '../../modules/ScrollResponder'
 import ScrollViewBase from './ScrollViewBase'
 import StyleSheet from '../../apis/StyleSheet'
-import StyleSheetPropType from '../../apis/StyleSheet/StyleSheetPropType'
+import StyleSheetPropType from '../../propTypes/StyleSheetPropType'
 import View from '../View'
 import ViewStylePropTypes from '../View/ViewStylePropTypes'
 

src/components/Text/TextStylePropTypes.js

@@ -1,5 +1,5 @@
 import { PropTypes } from 'react'
-import ColorPropType from '../../apis/StyleSheet/ColorPropType'
+import ColorPropType from '../../propTypes/ColorPropType'
 import ViewStylePropTypes from '../View/ViewStylePropTypes'
 
 const { number, oneOf, oneOfType, string } = PropTypes

src/components/Text/index.js

@@ -2,7 +2,7 @@ import applyNativeMethods from '../../modules/applyNativeMethods'
 import createReactDOMComponent from '../../modules/createReactDOMComponent'
 import { Component, PropTypes } from 'react'
 import StyleSheet from '../../apis/StyleSheet'
-import StyleSheetPropType from '../../apis/StyleSheet/StyleSheetPropType'
+import StyleSheetPropType from '../../propTypes/StyleSheetPropType'
 import TextStylePropTypes from './TextStylePropTypes'
 
 class Text extends Component {

src/components/Touchable/Touchable.js

@@ -15,7 +15,7 @@
 /* @edit start */
 const BoundingDimensions = require('./BoundingDimensions');
 const keyMirror = require('fbjs/lib/keyMirror');
-const normalizeColor = require('../../apis/StyleSheet/normalizeColor');
+const normalizeColor = require('../../modules/normalizeColor');
 const Position = require('./Position');
 const React = require('react');
 const TouchEventUtils = require('fbjs/lib/TouchEventUtils');

src/components/Touchable/TouchableBounce.js

@@ -13,7 +13,7 @@
 'use strict';
 
 var Animated = require('../../apis/Animated');
-var EdgeInsetsPropType = require('../../apis/StyleSheet/EdgeInsetsPropType');
+var EdgeInsetsPropType = require('../../propTypes/EdgeInsetsPropType');
 var NativeMethodsMixin = require('../../modules/NativeMethodsMixin');
 var React = require('react');
 var StyleSheet = require('../../apis/StyleSheet');

src/components/Touchable/TouchableHighlight.js

@@ -14,7 +14,7 @@
 
 // Note (avik): add @flow when Flow supports spread properties in propTypes
 
-var ColorPropType = require('../../apis/StyleSheet/ColorPropType');
+var ColorPropType = require('../../propTypes/ColorPropType');
 var NativeMethodsMixin = require('../../modules/NativeMethodsMixin');
 var React = require('react');
 var StyleSheet = require('../../apis/StyleSheet');

src/components/Touchable/TouchableWithoutFeedback.js

@@ -12,7 +12,7 @@
  */
 'use strict';
 
-var EdgeInsetsPropType = require('../../apis/StyleSheet/EdgeInsetsPropType');
+var EdgeInsetsPropType = require('../../propTypes/EdgeInsetsPropType');
 var React = require('react');
 var TimerMixin = require('react-timer-mixin');
 var Touchable = require('./Touchable');

src/components/View/ViewStylePropTypes.js

@@ -1,8 +1,8 @@
 import { PropTypes } from 'react'
-import BorderPropTypes from '../../apis/StyleSheet/BorderPropTypes'
-import ColorPropType from '../../apis/StyleSheet/ColorPropType'
-import LayoutPropTypes from '../../apis/StyleSheet/LayoutPropTypes'
-import TransformPropTypes from '../../apis/StyleSheet/TransformPropTypes'
+import BorderPropTypes from '../../propTypes/BorderPropTypes'
+import ColorPropType from '../../propTypes/ColorPropType'
+import LayoutPropTypes from '../../propTypes/LayoutPropTypes'
+import TransformPropTypes from '../../propTypes/TransformPropTypes'
 
 const { number, oneOf, string } = PropTypes
 const autoOrHiddenOrVisible = oneOf([ 'auto', 'hidden', 'visible' ])

src/components/View/index.js

@@ -3,7 +3,7 @@ import createNativeComponent from '../../modules/createNativeComponent'
 import normalizeNativeEvent from '../../apis/PanResponder/normalizeNativeEvent'
 import { Component, PropTypes } from 'react'
 import StyleSheet from '../../apis/StyleSheet'
-import StyleSheetPropType from '../../apis/StyleSheet/StyleSheetPropType'
+import StyleSheetPropType from '../../propTypes/StyleSheetPropType'
 import ViewStylePropTypes from './ViewStylePropTypes'
 
 class View extends Component {

src/index.js

@@ -38,9 +38,9 @@ import NativeModules from './modules/NativeModules'
 
 // propTypes
 
-import ColorPropType from './apis/StyleSheet/ColorPropType'
-import EdgeInsetsPropType from './apis/StyleSheet/EdgeInsetsPropType'
-import PointPropType from './apis/StyleSheet/PointPropType'
+import ColorPropType from './propTypes/ColorPropType'
+import EdgeInsetsPropType from './propTypes/EdgeInsetsPropType'
+import PointPropType from './propTypes/PointPropType'
 
 const ReactNative = {
   // top-level API

src/propTypes/BorderPropTypes.js

@@ -1,5 +1,5 @@
 import { PropTypes } from 'react'
-import ColorPropType from '../../apis/StyleSheet/ColorPropType'
+import ColorPropType from './ColorPropType'
 
 const numberOrString = PropTypes.oneOfType([ PropTypes.number, PropTypes.string ])
 const BorderStylePropType = PropTypes.oneOf([ 'solid', 'dotted', 'dashed' ])

src/propTypes/ColorPropType.js

@@ -13,7 +13,7 @@
 import { PropTypes } from 'react'
 import ReactPropTypeLocationNames from 'react/lib/ReactPropTypeLocationNames'
 
-var normalizeColor = require('./normalizeColor');
+var normalizeColor = require('../modules/normalizeColor');
 
 var colorPropType = function(isRequired, props, propName, componentName, location, propFullName) {
   var color = props[propName];

src/propTypes/StyleSheetPropType.js

@@ -6,7 +6,7 @@
  */
 
 import createStrictShapeTypeChecker from './createStrictShapeTypeChecker'
-import flattenStyle from './flattenStyle'
+import flattenStyle from '../modules/flattenStyle'
 
 module.exports = function StyleSheetPropType(shape) {
   const shapePropType = createStrictShapeTypeChecker(shape)

src/propTypes/TransformPropTypes.js

@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * @flow
+ */
+
+import { PropTypes } from 'react'
+
+const { arrayOf, number, oneOfType, shape, string } = PropTypes
+const ArrayOfNumberPropType = arrayOf(number)
+const numberOrString = oneOfType([ number, string ])
+
+const TransformMatrixPropType = function (
+  props : Object,
+  propName : string,
+  componentName : string
+) : ?Error {
+  if (props.transform && props.transformMatrix) {
+    return new Error(
+      'transformMatrix and transform styles cannot be used on the same ' +
+      'component'
+    )
+  }
+  return ArrayOfNumberPropType(props, propName, componentName)
+}
+
+const TransformPropTypes = {
+  transform: arrayOf(
+    oneOfType([
+      shape({ perspective: numberOrString }),
+      shape({ rotate: string }),
+      shape({ rotateX: string }),
+      shape({ rotateY: string }),
+      shape({ rotateZ: string }),
+      shape({ scale: number }),
+      shape({ scaleX: number }),
+      shape({ scaleY: number }),
+      shape({ skewX: string }),
+      shape({ skewY: string }),
+      shape({ translateX: numberOrString }),
+      shape({ translateY: numberOrString }),
+      shape({ translateZ: numberOrString }),
+      shape({ translate3d: string })
+    ])
+  ),
+  transformMatrix: TransformMatrixPropType
+}
+
+module.exports = TransformPropTypes