Merge branch 'ReactWindows' of https://github.com/ReactWindows/react-native into issue-388

mattpodwysocki · mattpodwysocki · commit e3352aabaaee · 2016-05-20T10:49:24.000-04:00
diff --git a/ReactWindows/ReactNative/Views/Picker/ReactPickerShadowNode.cs b/ReactWindows/ReactNative/Views/Picker/ReactPickerShadowNode.cs
@@ -17,7 +17,7 @@ public ReactPickerShadowNode()
             MeasureFunction = MeasurePicker;
         }
 
-        private static MeasureOutput MeasurePicker(CSSNode node, float width, float height)
+        private static MeasureOutput MeasurePicker(CSSNode node, float width, CSSMeasureMode widthMode, float height, CSSMeasureMode heightMode)
         {
             return new MeasureOutput(width, 40);
         }
diff --git a/ReactWindows/ReactNative/Views/Progress/ProgressBarShadowNode.cs b/ReactWindows/ReactNative/Views/Progress/ProgressBarShadowNode.cs
@@ -10,7 +10,7 @@ public ProgressBarShadowNode()
             MeasureFunction = MeasureProgressBar;
         }
 
-        private static MeasureOutput MeasureProgressBar(CSSNode node, float width, float height)
+        private static MeasureOutput MeasureProgressBar(CSSNode node, float width, CSSMeasureMode widthMode, float height, CSSMeasureMode heightMode)
         {
             var adjustedHeight = CSSConstants.IsUndefined(height) ? 4 : height; 
             return new MeasureOutput(width, adjustedHeight);
diff --git a/ReactWindows/ReactNative/Views/Switch/ReactSwitchShadowNode.cs b/ReactWindows/ReactNative/Views/Switch/ReactSwitchShadowNode.cs
@@ -16,7 +16,7 @@ public ReactSwitchShadowNode()
             MeasureFunction = MeasureSwitch;
         }
 
-        private static MeasureOutput MeasureSwitch(CSSNode node, float width, float height)
+        private static MeasureOutput MeasureSwitch(CSSNode node, float width, CSSMeasureMode widthMode, float height, CSSMeasureMode heightMode)
         {
             // TODO: figure out how to properly measure the switch.
             // We are currently blocked until we switch to a UWP-specific React
diff --git a/ReactWindows/ReactNative/Views/Text/ReactTextShadowNode.cs b/ReactWindows/ReactNative/Views/Text/ReactTextShadowNode.cs
@@ -121,12 +121,29 @@ public override void OnCollectExtraUpdates(UIViewOperationQueue uiViewOperationQ
 
             if (_inline != null)
             {
+                var _paddings = new Thickness()
+                {
+                    Left =  float.IsNaN(GetPadding(CSSSpacingType.Left)) ?
+                                float.IsNaN(GetPadding(CSSSpacingType.Horizontal)) ?
+                                    float.IsNaN(GetPadding(CSSSpacingType.All)) ? 0 : 
+                                    GetPadding(CSSSpacingType.All) :
+                                GetPadding(CSSSpacingType.Horizontal) :
+                            GetPadding(CSSSpacingType.Left),
+                    Top =   float.IsNaN(GetPadding(CSSSpacingType.Top)) ?
+                                float.IsNaN(GetPadding(CSSSpacingType.Vertical)) ?
+                                    float.IsNaN(GetPadding(CSSSpacingType.All)) ? 0 :
+                                    GetPadding(CSSSpacingType.All) :
+                                GetPadding(CSSSpacingType.Vertical) :
+                            GetPadding(CSSSpacingType.Top),
+                };
+
                 var args = Tuple.Create(
                     _inline,
                     _textAlignment,
                     _lineHeight,
                     _numberOfLines,
-                    _letterSpacing);
+                    _letterSpacing,
+                    _paddings);
 
                 uiViewOperationQueue.EnqueueUpdateExtraData(ReactTag, args);
             }
@@ -371,7 +388,7 @@ private static void ThrowException(string property)
             throw new InvalidOperationException("Property "  + property + " is supported only on the outermost text block.");
         }
 
-        private static MeasureOutput MeasureText(CSSNode node, float width, float height)
+        private static MeasureOutput MeasureText(CSSNode node, float width, CSSMeasureMode widthMode, float height, CSSMeasureMode heightMode)
         {
             // This is not a terribly efficient way of projecting the height of
             // the text elements. It requires that we have access to the
@@ -394,7 +411,7 @@ private static MeasureOutput MeasureText(CSSNode node, float width, float height
                 textBlock.CharacterSpacing = textNode._letterSpacing;
                 textBlock.LineHeight = textNode._lineHeight;
                 textBlock.MaxLines = textNode._numberOfLines;
-                textBlock.TextAlignment = (TextAlignment)textNode._textAlignment;
+                textBlock.TextAlignment = textNode._textAlignment;
 
                 textBlock.Inlines.Add(ReactTextShadowNodeInlineVisitor.Apply(node));
 
diff --git a/ReactWindows/ReactNative/Views/Text/ReactTextViewManager.cs b/ReactWindows/ReactNative/Views/Text/ReactTextViewManager.cs
@@ -40,7 +40,7 @@ public override ReactTextShadowNode CreateShadowNodeInstance()
         /// <param name="extraData">The aggregated virtual node changes.</param>
         public override void UpdateExtraData(TextBlock root, object extraData)
         {
-            var textUpdate = (Tuple<Inline, TextAlignment, double, int, int>)extraData;
+            var textUpdate = (Tuple<Inline, TextAlignment, double, int, int, Thickness>)extraData;
             var inline = textUpdate.Item1;
 
             root.Inlines.Clear();
@@ -49,7 +49,8 @@ public override void UpdateExtraData(TextBlock root, object extraData)
             root.TextAlignment = textUpdate.Item2;
             root.LineHeight = textUpdate.Item3;
             root.MaxLines = textUpdate.Item4;
-            root.CharacterSpacing = textUpdate.Item5;     
+            root.CharacterSpacing = textUpdate.Item5; 
+            root.Padding = textUpdate.Item6;
         }
 
         /// <summary>
diff --git a/ReactWindows/ReactNative/Views/TextInput/ReactTextInputShadowNode.cs b/ReactWindows/ReactNative/Views/TextInput/ReactTextInputShadowNode.cs
@@ -87,7 +87,7 @@ public override void OnCollectExtraUpdates(UIViewOperationQueue uiViewOperationQ
             }
         }
 
-        private MeasureOutput MeasureText(CSSNode node, float width, float height)
+        private MeasureOutput MeasureText(CSSNode node, float width, CSSMeasureMode widthMode, float height, CSSMeasureMode heightMode)
         {
             _computedPadding = GetComputedPadding();
 
diff --git a/ReactWindows/References/Facebook.CSSLayout.dll b/ReactWindows/References/Facebook.CSSLayout.dll

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public ReactPickerShadowNode()`
`17`	`17`	`MeasureFunction = MeasurePicker;`
`18`	`18`	`}`
`19`	`19`
`20`		`- private static MeasureOutput MeasurePicker(CSSNode node, float width, float height)`
	`20`	`+ private static MeasureOutput MeasurePicker(CSSNode node, float width, CSSMeasureMode widthMode, float height, CSSMeasureMode heightMode)`
`21`	`21`	`{`
`22`	`22`	`return new MeasureOutput(width, 40);`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public ProgressBarShadowNode()`
`10`	`10`	`MeasureFunction = MeasureProgressBar;`
`11`	`11`	`}`
`12`	`12`
`13`		`- private static MeasureOutput MeasureProgressBar(CSSNode node, float width, float height)`
	`13`	`+ private static MeasureOutput MeasureProgressBar(CSSNode node, float width, CSSMeasureMode widthMode, float height, CSSMeasureMode heightMode)`
`14`	`14`	`{`
`15`	`15`	`var adjustedHeight = CSSConstants.IsUndefined(height) ? 4 : height;`
`16`	`16`	`return new MeasureOutput(width, adjustedHeight);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public ReactSwitchShadowNode()`
`16`	`16`	`MeasureFunction = MeasureSwitch;`
`17`	`17`	`}`
`18`	`18`
`19`		`- private static MeasureOutput MeasureSwitch(CSSNode node, float width, float height)`
	`19`	`+ private static MeasureOutput MeasureSwitch(CSSNode node, float width, CSSMeasureMode widthMode, float height, CSSMeasureMode heightMode)`
`20`	`20`	`{`
`21`	`21`	`// TODO: figure out how to properly measure the switch.`
`22`	`22`	`// We are currently blocked until we switch to a UWP-specific React`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public override void OnCollectExtraUpdates(UIViewOperationQueue uiViewOperationQ`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`- private MeasureOutput MeasureText(CSSNode node, float width, float height)`
	`90`	`+ private MeasureOutput MeasureText(CSSNode node, float width, CSSMeasureMode widthMode, float height, CSSMeasureMode heightMode)`
`91`	`91`	`{`
`92`	`92`	`_computedPadding = GetComputedPadding();`
`93`	`93`