From 81d024924c819cae3b7af50f34f003e9beffb84b Mon Sep 17 00:00:00 2001
From: Felix Kling <fkling@fb.com>
Date: Fri, 20 Mar 2015 16:41:31 -0700
Subject: [PATCH] [react-native] Use SpreadProperty to make react-docgen happy

---
 .../Components/View/ViewStylePropTypes.js     |  8 ++---
 Libraries/Image/ImageStylePropTypes.js        | 28 +++++++--------
 Libraries/Text/TextStylePropTypes.js          | 35 +++++++++----------
 3 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/Libraries/Components/View/ViewStylePropTypes.js b/Libraries/Components/View/ViewStylePropTypes.js
index c049c3d53..3c226bcde 100644
--- a/Libraries/Components/View/ViewStylePropTypes.js
+++ b/Libraries/Components/View/ViewStylePropTypes.js
@@ -8,13 +8,11 @@
 var LayoutPropTypes = require('LayoutPropTypes');
 var ReactPropTypes = require('ReactPropTypes');
 
-var merge = require('merge');
-
 /**
  * Warning: Some of these properties may not be supported in all releases.
  */
-var ViewStylePropTypes = merge(
-  LayoutPropTypes, {
+var ViewStylePropTypes = {
+  ...LayoutPropTypes,
   backgroundColor: ReactPropTypes.string,
   borderColor: ReactPropTypes.string,
   borderTopColor: ReactPropTypes.string,
@@ -36,6 +34,6 @@ var ViewStylePropTypes = merge(
   scaleY: ReactPropTypes.number,
   translateX: ReactPropTypes.number,
   translateY: ReactPropTypes.number,
-});
+};
 
 module.exports = ViewStylePropTypes;
diff --git a/Libraries/Image/ImageStylePropTypes.js b/Libraries/Image/ImageStylePropTypes.js
index 3c67a7795..2973a72d6 100644
--- a/Libraries/Image/ImageStylePropTypes.js
+++ b/Libraries/Image/ImageStylePropTypes.js
@@ -9,23 +9,19 @@ var ImageResizeMode = require('ImageResizeMode');
 var LayoutPropTypes = require('LayoutPropTypes');
 var ReactPropTypes = require('ReactPropTypes');
 
-var merge = require('merge');
+var ImageStylePropTypes = {
+  ...LayoutPropTypes,
+  resizeMode: ReactPropTypes.oneOf(Object.keys(ImageResizeMode)),
+  backgroundColor: ReactPropTypes.string,
+  borderColor: ReactPropTypes.string,
+  borderWidth: ReactPropTypes.number,
+  borderRadius: ReactPropTypes.number,
 
-var ImageStylePropTypes = merge(
-  LayoutPropTypes,
-  {
-    resizeMode: ReactPropTypes.oneOf(Object.keys(ImageResizeMode)),
-    backgroundColor: ReactPropTypes.string,
-    borderColor: ReactPropTypes.string,
-    borderWidth: ReactPropTypes.number,
-    borderRadius: ReactPropTypes.number,
-
-    // iOS-Specific style to "tint" an image.
-    // It changes the color of all the non-transparent pixels to the tintColor
-    tintColor: ReactPropTypes.string,
-    opacity: ReactPropTypes.number,
-  }
-);
+  // iOS-Specific style to "tint" an image.
+  // It changes the color of all the non-transparent pixels to the tintColor
+  tintColor: ReactPropTypes.string,
+  opacity: ReactPropTypes.number,
+};
 
 // Image doesn't support padding correctly (#4841912)
 var unsupportedProps = Object.keys({
diff --git a/Libraries/Text/TextStylePropTypes.js b/Libraries/Text/TextStylePropTypes.js
index 0421794d2..acc91f699 100644
--- a/Libraries/Text/TextStylePropTypes.js
+++ b/Libraries/Text/TextStylePropTypes.js
@@ -8,25 +8,22 @@
 var ReactPropTypes = require('ReactPropTypes');
 var ViewStylePropTypes = require('ViewStylePropTypes');
 
-var merge = require('merge');
-
-var TextStylePropTypes = merge(
-  ViewStylePropTypes, {
-    fontFamily: ReactPropTypes.string,
-    fontSize: ReactPropTypes.number,
-    fontWeight: ReactPropTypes.oneOf(['normal' /*default*/, 'bold']),
-    fontStyle: ReactPropTypes.oneOf(['normal', 'italic']),
-    lineHeight: ReactPropTypes.number,
-    color: ReactPropTypes.string,
-    containerBackgroundColor: ReactPropTypes.string,
-    textAlign: ReactPropTypes.oneOf(
-      ['auto' /*default*/, 'left', 'right', 'center']
-    ),
-    writingDirection: ReactPropTypes.oneOf(
-      ['auto' /*default*/, 'ltr', 'rtl']
-    ),
-  }
-);
+var TextStylePropTypes = {
+  ...ViewStylePropTypes,
+  fontFamily: ReactPropTypes.string,
+  fontSize: ReactPropTypes.number,
+  fontWeight: ReactPropTypes.oneOf(['normal' /*default*/, 'bold']),
+  fontStyle: ReactPropTypes.oneOf(['normal', 'italic']),
+  lineHeight: ReactPropTypes.number,
+  color: ReactPropTypes.string,
+  containerBackgroundColor: ReactPropTypes.string,
+  textAlign: ReactPropTypes.oneOf(
+    ['auto' /*default*/, 'left', 'right', 'center']
+  ),
+  writingDirection: ReactPropTypes.oneOf(
+    ['auto' /*default*/, 'ltr', 'rtl']
+  ),
+};
 
 // Text doesn't support padding correctly (#4841912)
 var unsupportedProps = Object.keys({