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

Update css-layout from github

Browse Source 
Summary:Update to latest master version of css-layout. Update integration in RCTShadow(Root)View to match.

This solves the issue with items not strechting vertically in column layouts (https://github.com/facebook/css-layout/issues/127)

Reviewed By: vjeux

Differential Revision: D3120699

fb-gh-sync-id: beba162e1255d3527e1160e9bd414a712cb10713
fbshipit-source-id: beba162e1255d3527e1160e9bd414a712cb10713
This commit is contained in:
Pieter De Baets
2016-04-04 04:08:19 -07:00
committed by Facebook Github Bot 7
parent 5387e09dc7
commit d95757037a
8 changed files with 80 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ReactAndroid/src/main/java/com/facebook/csslayout/LayoutEngine.java
View File

@@ -7,7 +7,7 @@
*/
// NOTE: this file is auto-copied from https://github.com/facebook/css-layout
// @generated SignedSource<<dcc87213906997ff353adb1148c8e77c>>
// @generated SignedSource<<1d6f1ec2d1fbd24c5176f48d5005c0d5>>
package com.facebook.csslayout;
@@ -207,6 +207,10 @@ public class LayoutEngine {
node.lastLayout.parentMaxWidth = parentMaxWidth;
node.lastLayout.parentMaxHeight = parentMaxHeight;
for (int i = 0, childCount = node.getChildCount(); i < childCount; i++) {
node.getChildAt(i).layout.resetResult();
}
layoutNodeImpl(layoutContext, node, parentMaxWidth, parentMaxHeight, parentDirection);
node.lastLayout.copy(node.layout);
} else {
@@ -222,10 +226,6 @@ public class LayoutEngine {
float parentMaxWidth,
float parentMaxHeight,
CSSDirection parentDirection) {
for (int i = 0, childCount = node.getChildCount(); i < childCount; i++) {
node.getChildAt(i).layout.resetResult();
}
/** START_GENERATED **/
CSSDirection direction = resolveDirection(node, parentDirection);

2
ReactAndroid/src/main/java/com/facebook/csslayout/README
View File

@@ -1,7 +1,7 @@
The source of truth for css-layout is: https://github.com/facebook/css-layout
The code here should be kept in sync with GitHub.
HEAD at the time this code was synced: https://github.com/facebook/css-layout/commit/3f0f4be2e868a9af4f3ed1e019f71efbc814e8a2
HEAD at the time this code was synced: https://github.com/facebook/css-layout/commit/68e0b0cc58dcdf023651905d39c0e8147141b123
There is generated code in:
- README (this file)

2
ReactAndroid/src/main/java/com/facebook/csslayout/README.facebook
View File

@@ -1,7 +1,7 @@
The source of truth for css-layout is: https://github.com/facebook/css-layout
The code here should be kept in sync with GitHub.
HEAD at the time this code was synced: https://github.com/facebook/css-layout/commit/3f0f4be2e868a9af4f3ed1e019f71efbc814e8a2
HEAD at the time this code was synced: https://github.com/facebook/css-layout/commit/68e0b0cc58dcdf023651905d39c0e8147141b123
There is generated code in:
- README.facebook (this file)

5
ReactAndroid/src/main/java/com/facebook/csslayout/syncFromGithub.sh
View File

@@ -46,7 +46,7 @@ popd
SRC=$GITHUB/src/java/src/com/facebook/csslayout
TESTS=$GITHUB/src/java/tests/com/facebook/csslayout
FBA_SRC=.
FBA_SRC=$ROOT/java/com/facebook/catalyst/js/react-native-github/ReactAndroid/src/main/java/com/facebook/csslayout/
FBA_TESTS=$ROOT/javatests/com/facebook/csslayout
echo "Copying src files over..."
@@ -94,5 +94,6 @@ There is generated code in:
The code was generated by running 'make' in the css-layout folder and copied to React Native.
" > $FBA_SRC/README
echo "Done."
echo "fbandroid was updated. Please also update the fbobjc version under" \
"fbobjc/Libraries/FBReactKit/js/react-native-github/React/Layout/Layout.c."
echo "Please run buck test //javatests/com/facebook/csslayout"