Java: Expose extra functionality on CSSNode

This change is needed to support inline views on React Native for Android.
facebook · Jul 6, 2016 · ef3397b · ef3397b
1 parent 6e05325
commit ef3397b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/src/java/src/com/facebook/csslayout/CSSNode.java b/src/java/src/com/facebook/csslayout/CSSNode.java
@@ -23,7 +23,7 @@
 
 /**
  * A CSS Node. It has a style object you can manipulate at {@link #style}. After calling
- * {@link #calculateLayout()}, {@link #layout} will be filled with the results of the layout.
+ * {@link #calculateLayout(CSSLayoutContext, float, float)}, {@link #layout} will be filled with the results of the layout.
  */
 public class CSSNode {
 
@@ -71,6 +71,11 @@ public static interface MeasureFunction {
   private LayoutState mLayoutState = LayoutState.DIRTY;
   private boolean mIsTextNode = false;
 
+  public static final Iterable<CSSNode> NO_CSS_NODES = new ArrayList<CSSNode>(0);
+  public Iterable<CSSNode> getChildrenIterable() {
+    return mChildren == null ? NO_CSS_NODES : mChildren;
+  }
+
   public int getChildCount() {
     return mChildren == null ? 0 : mChildren.size();
   }
@@ -146,8 +151,8 @@ public boolean isTextNode() {
   /**
    * Performs the actual layout and saves the results in {@link #layout}
    */
-  public void calculateLayout(CSSLayoutContext layoutContext) {
-    LayoutEngine.layoutNode(layoutContext, this, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED, null);
+  public void calculateLayout(CSSLayoutContext layoutContext, float availableWidth, float availableHeight) {
+    LayoutEngine.layoutNode(layoutContext, this, availableWidth, availableHeight, null);
   }
 
   /**

diff --git a/src/java/tests/com/facebook/csslayout/LayoutCachingTest.java b/src/java/tests/com/facebook/csslayout/LayoutCachingTest.java
@@ -44,11 +44,11 @@ public void testCachesFullTree() {
     root.addChildAt(c1, 1);
     c0.addChildAt(c0c0, 0);
 
-    root.calculateLayout(layoutContext);
+    root.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
     assertTreeHasNewLayout(true, root);
     markLayoutAppliedForTree(root);
 
-    root.calculateLayout(layoutContext);
+    root.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
     assertTrue(root.hasNewLayout());
     assertTreeHasNewLayout(false, c0);
     assertTreeHasNewLayout(false, c1);
@@ -70,12 +70,12 @@ public void testInvalidatesCacheWhenChildAdded() {
     c0.addChildAt(c0c0, 0);
     c0c0.addChildAt(c1c0, 0);
 
-    root.calculateLayout(layoutContext);
+    root.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
     markLayoutAppliedForTree(root);
 
     c0.addChildAt(c0c1, 1);
 
-    root.calculateLayout(layoutContext);
+    root.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
     assertTrue(root.hasNewLayout());
     assertTrue(c0.hasNewLayout());
     assertTrue(c0c1.hasNewLayout());
@@ -97,11 +97,11 @@ public void testInvalidatesCacheWhenEnumPropertyChanges() {
     root.addChildAt(c1, 1);
     c0.addChildAt(c0c0, 0);
 
-    root.calculateLayout(layoutContext);
+    root.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
     markLayoutAppliedForTree(root);
 
     c1.setAlignSelf(CSSAlign.CENTER);
-    root.calculateLayout(layoutContext);
+    root.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
 
     assertTrue(root.hasNewLayout());
     assertTrue(c1.hasNewLayout());
@@ -121,11 +121,11 @@ public void testInvalidatesCacheWhenFloatPropertyChanges() {
     root.addChildAt(c1, 1);
     c0.addChildAt(c0c0, 0);
 
-    root.calculateLayout(layoutContext);
+    root.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
     markLayoutAppliedForTree(root);
 
     c1.setMargin(Spacing.LEFT, 10);
-    root.calculateLayout(layoutContext);
+    root.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
 
     assertTrue(root.hasNewLayout());
     assertTrue(c1.hasNewLayout());
@@ -147,11 +147,11 @@ public void testInvalidatesFullTreeWhenParentWidthChanges() {
     c0.addChildAt(c0c0, 0);
     c1.addChildAt(c1c0, 0);
 
-    root.calculateLayout(layoutContext);
+    root.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
     markLayoutAppliedForTree(root);
 
     c0.setStyleWidth(200);
-    root.calculateLayout(layoutContext);
+    root.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
 
     assertTrue(root.hasNewLayout());
     assertTrue(c0.hasNewLayout());
@@ -173,11 +173,11 @@ public void testDoesNotInvalidateCacheWhenPropertyIsTheSame() {
     c0.addChildAt(c0c0, 0);
     root.setStyleWidth(200);
 
-    root.calculateLayout(layoutContext);
+    root.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
     markLayoutAppliedForTree(root);
 
     root.setStyleWidth(200);
-    root.calculateLayout(layoutContext);
+    root.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
 
     assertTrue(root.hasNewLayout());
     assertTreeHasNewLayout(false, c0);
@@ -195,11 +195,11 @@ public void testInvalidateCacheWhenHeightChangesPosition() {
     root.addChildAt(c1, 1);
     c1.addChildAt(c1c0, 0);
 
-    root.calculateLayout(layoutContext);
+    root.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
     markLayoutAppliedForTree(root);
 
     c0.setStyleHeight(100);
-    root.calculateLayout(layoutContext);
+    root.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
 
     assertTrue(root.hasNewLayout());
     assertTrue(c0.hasNewLayout());
@@ -218,7 +218,7 @@ public void testInvalidatesOnNewMeasureFunction() {
     root.addChildAt(c1, 1);
     c0.addChildAt(c0c0, 0);
 
-    root.calculateLayout(layoutContext);
+    root.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
     markLayoutAppliedForTree(root);
 
     c1.setMeasureFunction(new CSSNode.MeasureFunction() {
@@ -229,7 +229,7 @@ public void measure(CSSNode node, float width, CSSMeasureMode widthMode, float h
       }
     });
 
-    root.calculateLayout(layoutContext);
+    root.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
 
     assertTrue(root.hasNewLayout());
     assertTrue(c1.hasNewLayout());

diff --git a/src/java/tests/com/facebook/csslayout/LayoutEngineTest.java b/src/java/tests/com/facebook/csslayout/LayoutEngineTest.java
@@ -80,7 +80,7 @@ public TestCSSNode getChildAt(int i) {
 
   private static void test(String message, CSSNode style, CSSNode expectedLayout) {
     CSSLayoutContext layoutContext = new CSSLayoutContext();
-    style.calculateLayout(layoutContext);
+    style.calculateLayout(layoutContext, CSSConstants.UNDEFINED, CSSConstants.UNDEFINED);
     assertLayoutsEqual(message, style, expectedLayout);
   }