Update css-layout dependency

Adam Comella · rozele · commit 104aa49fc403 · 2016-08-02T10:58:16.000-04:00
The updated version of css-layout includes significant changes which make the layout engine conform closer to the W3C spec. For details, see facebook/yoga#185 The inline view implementation had to be modified slightly due to a change in the layout engine. In the updated layout engine, nodes with a measure function are treated as leaves. Consequently, nodes with a mesaure function (e.g. Text) do not have their children laid out automatically. To fix this, Text nodes now manually invoke the layout engine on each of their inline views.
diff --git a/ReactWindows/ReactNative/Views/Text/ReactSpanShadowNode.cs b/ReactWindows/ReactNative/Views/Text/ReactSpanShadowNode.cs
@@ -127,5 +127,23 @@ public override void UpdateInline(Inline inline)
             inline.FontWeight = _fontWeight ?? FontWeights.Normal;
             inline.FontFamily = _fontFamily != null ? new FontFamily(_fontFamily) : FontFamily.XamlAutoFontFamily;
         }
+
+        /// <summary>
+        /// This method will be called by <see cref="UIManagerModule"/> once
+        /// per batch, before calculating layout. This will only be called for
+        /// nodes that are marked as updated with <see cref="MarkUpdated"/> or
+        /// require layout (i.e., marked with <see cref="dirty"/>).
+        /// </summary>
+        public override void OnBeforeLayout()
+        {
+            // Run flexbox on the children which are inline views.
+            foreach (var child in this.Children)
+            {
+                if (!(child is ReactRunShadowNode) && !(child is ReactSpanShadowNode))
+                {
+                    child.CalculateLayout();
+                }
+            }
+        }
     }
 }
diff --git a/ReactWindows/ReactNative/Views/Text/ReactTextShadowNode.cs b/ReactWindows/ReactNative/Views/Text/ReactTextShadowNode.cs
@@ -267,5 +267,23 @@ private void UpdateTextBlockCore(RichTextBlock textBlock, bool measureOnly)
                     0);
             }
         }
+
+        /// <summary>
+        /// This method will be called by <see cref="UIManagerModule"/> once
+        /// per batch, before calculating layout. This will only be called for
+        /// nodes that are marked as updated with <see cref="MarkUpdated"/> or
+        /// require layout (i.e., marked with <see cref="dirty"/>).
+        /// </summary>
+        public override void OnBeforeLayout()
+        {
+            // Run flexbox on the children which are inline views.
+            foreach (var child in this.Children)
+            {
+                if (!(child is ReactRunShadowNode) && !(child is ReactSpanShadowNode))
+                {
+                    child.CalculateLayout();
+                }
+            }
+        }
     }
 }
diff --git a/ReactWindows/ReactNative/project.json b/ReactWindows/ReactNative/project.json
@@ -1,6 +1,6 @@
 ﻿{
   "dependencies": {
-    "Facebook.CSSLayout": "2.0.0-pre",
+    "Facebook.CSSLayout": "2.0.1-pre",
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
     "Newtonsoft.Json": "9.0.1",
     "System.Reactive": "3.0.0",

Original file line number	Diff line number	Diff line change
`@@ -267,5 +267,23 @@ private void UpdateTextBlockCore(RichTextBlock textBlock, bool measureOnly)`
`267`	`267`	`0);`
`268`	`268`	`}`
`269`	`269`	`}`
	`270`	`+`
	`271`	`+ /// <summary>`
	`272`	`+ /// This method will be called by <see cref="UIManagerModule"/> once`
	`273`	`+ /// per batch, before calculating layout. This will only be called for`
	`274`	`+ /// nodes that are marked as updated with <see cref="MarkUpdated"/> or`
	`275`	`+ /// require layout (i.e., marked with <see cref="dirty"/>).`
	`276`	`+ /// </summary>`
	`277`	`+ public override void OnBeforeLayout()`
	`278`	`+ {`
	`279`	`+ // Run flexbox on the children which are inline views.`
	`280`	`+ foreach (var child in this.Children)`
	`281`	`+ {`
	`282`	`+ if (!(child is ReactRunShadowNode) && !(child is ReactSpanShadowNode))`
	`283`	`+ {`
	`284`	`+ child.CalculateLayout();`
	`285`	`+ }`
	`286`	`+ }`
	`287`	`+ }`
`270`	`288`	`}`
`271`	`289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
`3`		`- "Facebook.CSSLayout": "2.0.0-pre",`
	`3`	`+ "Facebook.CSSLayout": "2.0.1-pre",`
`4`	`4`	`"Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",`
`5`	`5`	`"Newtonsoft.Json": "9.0.1",`
`6`	`6`	`"System.Reactive": "3.0.0",`