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

actually make work left and right

Browse Source
This commit is contained in:
Christopher Chedeau
2014-06-12 10:09:42 -07:00
parent cc11a535ce
commit 1c9749f93e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Layout.js
View File

@@ -491,6 +491,7 @@ var computeLayout = (function() {
if (leadingPos && trailingPos) { if (leadingPos && trailingPos) {
child.layout[dim[crossAxis]] = child.layout[dim[crossAxis]] =
node.layout[dim[crossAxis]] - node.layout[dim[crossAxis]] -
child.layout[pos[crossAxis]] -
getMargin(child, trailing[crossAxis]) - getMargin(child, trailing[crossAxis]) -
getPosition(child, trailing[crossAxis]); getPosition(child, trailing[crossAxis]);
} }

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

@@ -933,8 +933,8 @@ describe('Layout', function() {
{style: {width: 100}, children: [ {style: {width: 100}, children: [
{style: {right: 5, left: 5, position: 'absolute'}} {style: {right: 5, left: 5, position: 'absolute'}}
]}, ]},
{width: 0, height: 0, top: 0, left: 0, children: [ {width: 100, height: 0, top: 0, left: 0, children: [
{width: 5, height: 0, top: 0, left: -20} {width: 90, height: 0, top: 0, left: 5}
]} ]}
); );
}); });