kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-28 12:15:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updates from Tue 9 Jun

Browse Source
This commit is contained in:
Spencer Ahrens
2015-06-09 17:20:30 -07:00
parent 2f78b8ace6 3102fc5df9
commit 205e2659a1
104 changed files with 3914 additions and 1357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Libraries/StyleSheet/flattenStyle.js
View File

@@ -13,7 +13,6 @@
var StyleSheetRegistry = require('StyleSheetRegistry');
var invariant = require('invariant');
var mergeIntoFast = require('mergeIntoFast');
type Atom = number | bool | Object | Array<?Atom>
type StyleObj = Atom | Array<?StyleObj>
@@ -25,10 +24,7 @@ function getStyle(style) {
return style;
}
// TODO: Flow 0.7.0 doesn't refine bools properly so we have to use `any` to
// tell it that this can't be a bool anymore. Should be fixed in 0.8.0,
// after which this can take a ?StyleObj.
function flattenStyle(style: any): ?Object {
function flattenStyle(style: ?StyleObj): ?Object {
if (!style) {
return undefined;
}
@@ -42,7 +38,13 @@ function flattenStyle(style: any): ?Object {
for (var i = 0; i < style.length; ++i) {
var computedStyle = flattenStyle(style[i]);
if (computedStyle) {
mergeIntoFast(result, computedStyle);
for (var key in computedStyle) {
result[key] = computedStyle[key];
if (__DEV__) {
var value = computedStyle[key];
}
}
}
}
return result;

2
Libraries/StyleSheet/precomputeStyle.js
View File

@@ -127,7 +127,7 @@ function _convertToRadians(value: string): number {
function _validateTransform(key, value, transformation) {
invariant(
!value.getValue,
'You passed an animated value or spring to a normal component. ' +
'You passed an Animated.Value to a normal component. ' +
'You need to wrap that component in an Animated. For example, ' +
'replace <View /> by <Animated.View />.'
);