From 126989b636e0df682c72c66b3efb31818bd6a60c Mon Sep 17 00:00:00 2001
From: Hans Muller <hansmuller@chromium.org>
Date: Tue, 3 Nov 2015 11:01:38 -0800
Subject: [PATCH 1/2] Adds FlexJustifyContent.collapse

---
 sky/packages/sky/lib/src/rendering/flex.dart |  5 +-
 sky/unit/test/widget/flex_test.dart          | 62 ++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/sky/packages/sky/lib/src/rendering/flex.dart b/sky/packages/sky/lib/src/rendering/flex.dart
index 5d32f41c99b..70ce5a7bac1 100644
--- a/sky/packages/sky/lib/src/rendering/flex.dart
+++ b/sky/packages/sky/lib/src/rendering/flex.dart
@@ -46,6 +46,8 @@ enum FlexJustifyContent {
   spaceBetween,
   /// Place the free space evenly between the children as well as before and after the first and last child
   spaceAround,
+  /// Do not expand to fill the free space. None of the children may specify a flex factor.
+  collapse,
 }
 
 /// How the children should be placed along the cross axis in a flex layout
@@ -337,7 +339,7 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
     int totalChildren = 0;
     assert(constraints != null);
     final double mainSize = (_direction == FlexDirection.horizontal) ? constraints.constrainWidth() : constraints.constrainHeight();
-    final bool canFlex = mainSize < double.INFINITY;
+    final bool canFlex = mainSize < double.INFINITY && justifyContent != FlexJustifyContent.collapse;
     double crossSize = 0.0;  // This is determined as we lay out the children
     double freeSpace = canFlex ? mainSize : 0.0;
     RenderBox child = firstChild;
@@ -478,6 +480,7 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin<RenderBox, Fl
     }
     switch (_justifyContent) {
       case FlexJustifyContent.start:
+      case FlexJustifyContent.collapse:
         leadingSpace = 0.0;
         betweenSpace = 0.0;
         break;
diff --git a/sky/unit/test/widget/flex_test.dart b/sky/unit/test/widget/flex_test.dart
index 87d354834ed..43f0b25c784 100644
--- a/sky/unit/test/widget/flex_test.dart
+++ b/sky/unit/test/widget/flex_test.dart
@@ -42,4 +42,66 @@ void main() {
       expect(didReceiveTap, isTrue);
     });
   });
+
+  test('Row, Column and FlexJustifyContent.collapse', () {
+    final Key flexKey = new Key('flexKey');
+
+    // Row without justifyContent: FlexJustifyContent.collapse
+    testWidgets((WidgetTester tester) {
+      tester.pumpWidget(new Center(
+        child: new Row([
+          new Container(width: 10.0, height: 100.0),
+          new Container(width: 30.0, height: 100.0)
+        ],
+          key: flexKey
+        )
+      ));
+      Size flexSize = tester.findElementByKey(flexKey).renderObject.size;
+      expect(flexSize.width, equals(800.0));
+      expect(flexSize.height, equals(100.0));
+
+      // Row with justifyContent: FlexJustifyContent.collapse
+      tester.pumpWidget(new Center(
+        child: new Row([
+          new Container(width: 10.0, height: 100.0),
+          new Container(width: 30.0, height: 100.0)
+        ],
+          key: flexKey,
+          justifyContent: FlexJustifyContent.collapse
+        )
+      ));
+      flexSize = tester.findElementByKey(flexKey).renderObject.size;
+      expect(flexSize.width, equals(40.0));
+      expect(flexSize.height, equals(100.0));
+    });
+
+    // Column without justifyContent: FlexJustifyContent.collapse
+    testWidgets((WidgetTester tester) {
+      tester.pumpWidget(new Center(
+        child: new Column([
+          new Container(width: 100.0, height: 100.0),
+          new Container(width: 100.0, height: 150.0)
+        ],
+          key: flexKey
+        )
+      ));
+      Size flexSize = tester.findElementByKey(flexKey).renderObject.size;
+      expect(flexSize.width, equals(100.0));
+      expect(flexSize.height, equals(600.0));
+
+      // Column with justifyContent: FlexJustifyContent.collapse
+      tester.pumpWidget(new Center(
+        child: new Column([
+          new Container(width: 100.0, height: 100.0),
+          new Container(width: 100.0, height: 150.0)
+        ],
+          key: flexKey,
+          justifyContent: FlexJustifyContent.collapse
+        )
+      ));
+      flexSize = tester.findElementByKey(flexKey).renderObject.size;
+      expect(flexSize.width, equals(100.0));
+      expect(flexSize.height, equals(250.0));
+    });
+  });
 }

From 3e8632b31423c144eb5f020691462721c6dd0c64 Mon Sep 17 00:00:00 2001
From: Hans Muller <hansmuller@chromium.org>
Date: Tue, 3 Nov 2015 11:10:41 -0800
Subject: [PATCH 2/2] fixed unit test dart analyzer-O

---
 sky/unit/test/widget/flex_test.dart | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/sky/unit/test/widget/flex_test.dart b/sky/unit/test/widget/flex_test.dart
index 43f0b25c784..34a2710f91b 100644
--- a/sky/unit/test/widget/flex_test.dart
+++ b/sky/unit/test/widget/flex_test.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 import 'package:test/test.dart';
 
@@ -56,9 +57,9 @@ void main() {
           key: flexKey
         )
       ));
-      Size flexSize = tester.findElementByKey(flexKey).renderObject.size;
-      expect(flexSize.width, equals(800.0));
-      expect(flexSize.height, equals(100.0));
+      RenderBox renderBox = tester.findElementByKey(flexKey).renderObject;
+      expect(renderBox.size.width, equals(800.0));
+      expect(renderBox.size.height, equals(100.0));
 
       // Row with justifyContent: FlexJustifyContent.collapse
       tester.pumpWidget(new Center(
@@ -70,9 +71,9 @@ void main() {
           justifyContent: FlexJustifyContent.collapse
         )
       ));
-      flexSize = tester.findElementByKey(flexKey).renderObject.size;
-      expect(flexSize.width, equals(40.0));
-      expect(flexSize.height, equals(100.0));
+      renderBox = tester.findElementByKey(flexKey).renderObject;
+      expect(renderBox.size.width, equals(40.0));
+      expect(renderBox.size.height, equals(100.0));
     });
 
     // Column without justifyContent: FlexJustifyContent.collapse
@@ -85,9 +86,9 @@ void main() {
           key: flexKey
         )
       ));
-      Size flexSize = tester.findElementByKey(flexKey).renderObject.size;
-      expect(flexSize.width, equals(100.0));
-      expect(flexSize.height, equals(600.0));
+      RenderBox renderBox = tester.findElementByKey(flexKey).renderObject;
+      expect(renderBox.size.width, equals(100.0));
+      expect(renderBox.size.height, equals(600.0));
 
       // Column with justifyContent: FlexJustifyContent.collapse
       tester.pumpWidget(new Center(
@@ -99,9 +100,9 @@ void main() {
           justifyContent: FlexJustifyContent.collapse
         )
       ));
-      flexSize = tester.findElementByKey(flexKey).renderObject.size;
-      expect(flexSize.width, equals(100.0));
-      expect(flexSize.height, equals(250.0));
+      renderBox = tester.findElementByKey(flexKey).renderObject;
+      expect(renderBox.size.width, equals(100.0));
+      expect(renderBox.size.height, equals(250.0));
     });
   });
 }