Initial implementation of flexWrap

2014-12-12 12:03:31 +00:00
parent 28243156e4
commit 10fb645777
12 changed files with 930 additions and 607 deletions
--- a/src/tests/Layout-test.js
+++ b/src/tests/Layout-test.js
@@ -1144,12 +1144,11 @@ describe('Layout', function() {
    );
  });

-  xit('should layout flex-wrap', function() {
+  it('should layout flex-wrap', function() {
    testLayout(
      {style: {flexWrap: 'wrap', flexDirection: 'row', width: 100}, children: [
        {style: {width: 40, height: 10}},
        {style: {width: 40, height: 10}},
-        {style: {flex: 1}},
        {style: {width: 40, height: 10}},
      ]},
      {width: 100, height: 20, top: 0, left: 0, children: [