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

handle negative margin and min padding correctly

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-22 17:33:08 -07:00
parent 01ccc098c9
commit 3dbd168938
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Layout.js
View File

@@ -135,7 +135,6 @@ var computeLayout = (function() {
return !isUndefined(node.style[pos]);
}
function getPosition(node, pos) {
if (pos in node.style) {
return node.style[pos];
@@ -293,15 +292,15 @@ var computeLayout = (function() {
}
}
}
mainPos += getPaddingAndBorder(node, trailing[mainAxis]);
crossDim += getPaddingAndBorder(node, leading[crossAxis]) +
getPaddingAndBorder(node, trailing[crossAxis]);
crossDim += getPaddingAndBorderAxis(node, crossAxis);
if (isUndefined(node.layout[dim[mainAxis]]) && !mainDimInStyle) {
node.layout[dim[mainAxis]] = mainPos > 0 ? mainPos : 0;
node.layout[dim[mainAxis]] = fmaxf(mainPos, getPaddingAndBorderAxis(node, mainAxis));
}
if (isUndefined(node.layout[dim[crossAxis]])) {
node.layout[dim[crossAxis]] = crossDim > 0 ? crossDim : 0;
node.layout[dim[crossAxis]] = fmaxf(crossDim, getPaddingAndBorderAxis(node, crossAxis));
}
for (var/*int*/ i = 0; i < node.children.length; ++i) {

11
src/__tests__/Layout-test.js
View File

@@ -733,7 +733,16 @@ describe('Layout', function() {
);
});
it('should handle negative margin and min padding correctly', function() {
testLayout(
{style: {borderRightWidth: 1, flexDirection: 'row'}, children: [
{style: {marginRight: -8}}
]},
{width: 1, height: 0, top: 0, left: 0, children: [
{width: 0, height: 0, top: 0, left: 0}
]}
)
});