status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[react-native] Use SpreadProperty to make react-docgen happy

This commit is contained in:
Felix Kling 2015-03-20 16:41:31 -07:00
parent ca3be21484
commit 81d024924c
3 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Libraries/Components/View/ViewStylePropTypes.js
View File

@ -8,13 +8,11 @@
var LayoutPropTypes = require('LayoutPropTypes'); var LayoutPropTypes = require('LayoutPropTypes');
var ReactPropTypes = require('ReactPropTypes'); var ReactPropTypes = require('ReactPropTypes');
var merge = require('merge');
/** /**
* Warning: Some of these properties may not be supported in all releases. * Warning: Some of these properties may not be supported in all releases.
*/ */
var ViewStylePropTypes = merge( var ViewStylePropTypes = {
LayoutPropTypes, { ...LayoutPropTypes,
backgroundColor: ReactPropTypes.string, backgroundColor: ReactPropTypes.string,
borderColor: ReactPropTypes.string, borderColor: ReactPropTypes.string,
borderTopColor: ReactPropTypes.string, borderTopColor: ReactPropTypes.string,
@ -36,6 +34,6 @@ var ViewStylePropTypes = merge(
scaleY: ReactPropTypes.number, scaleY: ReactPropTypes.number,
translateX: ReactPropTypes.number, translateX: ReactPropTypes.number,
translateY: ReactPropTypes.number, translateY: ReactPropTypes.number,
}); };
module.exports = ViewStylePropTypes; module.exports = ViewStylePropTypes;

10
Libraries/Image/ImageStylePropTypes.js
View File

@ -9,11 +9,8 @@ var ImageResizeMode = require('ImageResizeMode');
var LayoutPropTypes = require('LayoutPropTypes'); var LayoutPropTypes = require('LayoutPropTypes');
var ReactPropTypes = require('ReactPropTypes'); var ReactPropTypes = require('ReactPropTypes');
var merge = require('merge'); var ImageStylePropTypes = {
...LayoutPropTypes,
var ImageStylePropTypes = merge(
LayoutPropTypes,
{
resizeMode: ReactPropTypes.oneOf(Object.keys(ImageResizeMode)), resizeMode: ReactPropTypes.oneOf(Object.keys(ImageResizeMode)),
backgroundColor: ReactPropTypes.string, backgroundColor: ReactPropTypes.string,
borderColor: ReactPropTypes.string, borderColor: ReactPropTypes.string,
@ -24,8 +21,7 @@ var ImageStylePropTypes = merge(
// It changes the color of all the non-transparent pixels to the tintColor // It changes the color of all the non-transparent pixels to the tintColor
tintColor: ReactPropTypes.string, tintColor: ReactPropTypes.string,
opacity: ReactPropTypes.number, opacity: ReactPropTypes.number,
} };
);
// Image doesn't support padding correctly (#4841912) // Image doesn't support padding correctly (#4841912)
var unsupportedProps = Object.keys({ var unsupportedProps = Object.keys({

9
Libraries/Text/TextStylePropTypes.js
View File

@ -8,10 +8,8 @@
var ReactPropTypes = require('ReactPropTypes'); var ReactPropTypes = require('ReactPropTypes');
var ViewStylePropTypes = require('ViewStylePropTypes'); var ViewStylePropTypes = require('ViewStylePropTypes');
var merge = require('merge'); var TextStylePropTypes = {
...ViewStylePropTypes,
var TextStylePropTypes = merge(
ViewStylePropTypes, {
fontFamily: ReactPropTypes.string, fontFamily: ReactPropTypes.string,
fontSize: ReactPropTypes.number, fontSize: ReactPropTypes.number,
fontWeight: ReactPropTypes.oneOf(['normal' /*default*/, 'bold']), fontWeight: ReactPropTypes.oneOf(['normal' /*default*/, 'bold']),
@ -25,8 +23,7 @@ var TextStylePropTypes = merge(
writingDirection: ReactPropTypes.oneOf( writingDirection: ReactPropTypes.oneOf(
['auto' /*default*/, 'ltr', 'rtl'] ['auto' /*default*/, 'ltr', 'rtl']
), ),
} };
);
// Text doesn't support padding correctly (#4841912) // Text doesn't support padding correctly (#4841912)
var unsupportedProps = Object.keys({ var unsupportedProps = Object.keys({