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

Update ReactShadowNode to not add CSSNode children if parent has measure defined 

Summary: See inline comment for rationale

Reviewed By: emilsjolander

Differential Revision: D4154168

fbshipit-source-id: 6d428d4e9f4a68c88bb994ded88c817bee744563
This commit is contained in:
Andy Street 2016-11-14 07:09:43 -08:00 committed by Facebook Github Bot
parent 07ef5a8fe9
commit 10e0aec62f
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java
View File

@ -142,7 +142,11 @@ public class ReactShadowNode {
mChildren.add(i, child);
child.mParent = this;
mCSSNode.addChildAt(child.mCSSNode, i);
// If a CSS node has measure defined, the layout algorithm will not visit its children. Even
// more, it asserts that you don't add children to nodes with measure functions.
if (!mCSSNode.isMeasureDefined()) {
mCSSNode.addChildAt(child.mCSSNode, i);
}
markUpdated();
int increase = child.mIsLayoutOnly ? child.mTotalNativeChildren : 1;
@ -159,7 +163,9 @@ public class ReactShadowNode {
ReactShadowNode removed = mChildren.remove(i);
removed.mParent = null;
mCSSNode.removeChildAt(i);
if (!mCSSNode.isMeasureDefined()) {
mCSSNode.removeChildAt(i);
}
markUpdated();
int decrease = removed.mIsLayoutOnly ? removed.mTotalNativeChildren : 1;
@ -191,7 +197,9 @@ public class ReactShadowNode {
int decrease = 0;
for (int i = getChildCount() - 1; i >= 0; i--) {
mCSSNode.removeChildAt(i);
if (!mCSSNode.isMeasureDefined()) {
mCSSNode.removeChildAt(i);
}
ReactShadowNode toRemove = getChildAt(i);
toRemove.mParent = null;
decrease += toRemove.mIsLayoutOnly ? toRemove.mTotalNativeChildren : 1;
@ -633,6 +641,12 @@ public class ReactShadowNode {
}
public void setMeasureFunction(CSSNodeAPI.MeasureFunction measureFunction) {
if ((measureFunction == null ^ mCSSNode.isMeasureDefined()) &&
getChildCount() != 0) {
throw new RuntimeException(
"Since a node with a measure function does not add any native CSSLayout children, it's " +
"not safe to transition to/from having a measure function unless a node has no children");
}
mCSSNode.setMeasureFunction(measureFunction);
}