flex > height in case of conflict

2014-04-06 19:21:06 -07:00
parent 5d8d13b05b
commit a91915d8d2
2 changed files with 15 additions and 1 deletions
--- a/src/Layout.js
+++ b/src/Layout.js
@@ -80,7 +80,7 @@ function computeLayout(node) {
    var children = node.children || emptyArray;

    var mainDimInStyle = dim[mainAxis] in node.style;
-    if (mainDimInStyle) {
+    if (node.layout[dim[mainAxis]] === undefined && mainDimInStyle) {
      node.layout[dim[mainAxis]] = node.style[dim[mainAxis]];
    }