DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Correctly size cross axis when measuring flex basis

Browse Source
This commit is contained in:
Emil Sjolander
2016-06-29 13:20:56 +01:00
parent d878091c4b
commit ca34ff4446
17 changed files with 362 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Layout-test-utils.js
View File

@@ -548,15 +548,14 @@ var layoutTestUtils = (function() {
if (text === texts.small) {
return {
width: Math.min(textSizes.smallWidth, width),
height: textSizes.smallHeight
height: textSizes.smallWidth > width ? textSizes.bigHeight : textSizes.smallHeight
};
}
if (text === texts.big) {
var res = {
width: width >= textSizes.bigWidth ? textSizes.bigWidth : Math.max(textSizes.bigMinWidth, width),
height: width >= textSizes.bigWidth ? textSizes.smallHeight : textSizes.bigHeight
return {
width: Math.min(textSizes.bigWidth, width),
height: textSizes.bigWidth > width ? textSizes.bigHeight : textSizes.smallHeight
};
return res;
}
};
// Name of the function is used in DOM tests as a text in the measured node
@@ -566,9 +565,13 @@ var layoutTestUtils = (function() {
},
measureWithRatio2: function() {
var fn = function(width, widthMode, height, heightMode) {
if (widthMode !== 'undefined') {
if (widthMode === 'exactly') {
height = width * 2;
} else if (heightMode !== 'undefined') {
} else if (heightMode === 'exactly') {
width = height * 2;
} else if (widthMode === 'at-most') {
height = width * 2;
} else if (heightMode === 'at-most') {
width = height * 2;
} else {
// This should be Infinity, but it would be pain to transpile,