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

fix stretch with margin

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-15 17:53:38 -07:00
parent 1a0cce4f42
commit 930c4dc700
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spec/LayoutSpec.js
View File

@@ -456,6 +456,17 @@ describe('Layout', function() {
);
});
it('should layout alignItems stretch and margin', function() {
testLayout(
{style: {alignItems: 'stretch'}, children: [
{style: {marginLeft: 10}}
]},
{width: 10, height: 0, top: 0, left: 0, children: [
{width: 0, height: 0, top: 0, left: 10}
]}
);
});
it('should layout randomly', function() {
function RNG(seed) {
this.state = seed;
@@ -496,8 +507,8 @@ describe('Layout', function() {
randMinMax(node, 0.1, 'marginBottom', 0, 20);
randEnum(node, 0.1, 'flexDirection', ['row', 'column']);
randEnum(node, 0.1, 'justifyContent', ['flex-start', 'center', 'flex-end', 'space-between', 'space-around']);
randEnum(node, 0.1, 'alignItems', ['flex-start', 'center', 'flex-end']);
randEnum(node, 0.1, 'alignSelf', ['flex-start', 'center', 'flex-end']);
randEnum(node, 0.1, 'alignItems', ['flex-start', 'center', 'flex-end', 'stretch']);
randEnum(node, 0.1, 'alignSelf', ['flex-start', 'center', 'flex-end', 'stretch']);
randEnum(node, 0.1, 'flex', ['none', 1]);
randChildren(node, 0.2);
return node;

4
src/Layout.js
View File

@@ -189,7 +189,9 @@ function computeLayout(node) {
} else if (alignItem === 'flex-end') {
leadingCrossDim = remainingCrossDim;
} else if (alignItem === 'stretch') {
child.layout[dim[crossAxis]] = getDimWithMargin(node, crossAxis);
child.layout[dim[crossAxis]] = node.layout[dim[crossAxis]] -
getMargin(leading[crossAxis], child) -
getMargin(trailing[crossAxis], child);
}
child.layout[pos[crossAxis]] += leadingCrossDim;
});