Commit c1a6993

jlo1gitim

authored and

committed

Stretch row so child items fill container list (#67)

1 parent c3a1170 commit c1a6993Copy full SHA for c1a6993

File tree

+14

-13

lines changed

+14

-13

lines changed

Lines changed: 14 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -153,12 +153,16 @@ export default class Row extends Component {`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`render() {`
`156`		`- const {children, style} = this.props;`
	`156`	`+ const {children, style, horizontal} = this.props;`
	`157`	`+ const rowStyle = [`
	`158`	`+ style, styles.container, this._animatedLocation.getLayout(),`
	`159`	`+ horizontal ? styles.horizontalContainer : styles.verticalContainer,`
	`160`	`+ ];`
`157`	`161`
`158`	`162`	`return (`
`159`	`163`	`<Animated.View`
`160`	`164`	`{...this._panResponder.panHandlers}`
`161`		`- style={[style,styles.container,this._animatedLocation.getLayout()]}`
	`165`	`+ style={rowStyle}`
`162`	`166`	`onLayout={this._onLayout}>`
`163`	`167`	`{children}`
`164`	`168`	`</Animated.View>`
`@@ -231,4 +235,12 @@ const styles = StyleSheet.create({`
`231`	`235`	`container: {`
`232`	`236`	`position: 'absolute',`
`233`	`237`	`},`
	`238`	`+ horizontalContainer: {`
	`239`	`+ top: 0,`
	`240`	`+ bottom: 0,`
	`241`	`+ },`
	`242`	`+ verticalContainer: {`
	`243`	`+ left: 0,`
	`244`	`+ right: 0,`
	`245`	`+ },`
`234`	`246`	`});`

Lines changed: 0 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -209,15 +209,6 @@ export default class SortableList extends Component {`
`209`	`209`	`const {horizontal, rowActivationTime, sortingEnabled, renderRow} = this.props;`
`210`	`210`	`const {animated, order, data, activeRowKey, releasedRowKey, rowsLayouts} = this.state;`
`211`	`211`
`212`		`- let rowHeight = 0;`
`213`		`- let rowWidth = 0;`
`214`		`-`
`215`		`- if (rowsLayouts) {`
`216`		`- Object.keys(rowsLayouts).forEach((key) => {`
`217`		`- rowHeight = Math.max(rowHeight, rowsLayouts[key].height);`
`218`		`- rowWidth = Math.max(rowWidth, rowsLayouts[key].width);`
`219`		`- });`
`220`		`- }`
`221`	`212`
`222`	`213`	`let nextX = 0;`
`223`	`214`	`let nextY = 0;`
`@@ -228,11 +219,9 @@ export default class SortableList extends Component {`
`228`	`219`
`229`	`220`	`if (rowsLayouts) {`
`230`	`221`	`if (horizontal) {`
`231`		`- style.height = rowHeight;`
`232`	`222`	`location.x = nextX;`
`233`	`223`	`nextX += rowsLayouts[key].width;`
`234`	`224`	`} else {`
`235`		`- style.width = rowWidth;`
`236`	`225`	`location.y = nextY;`
`237`	`226`	`nextY += rowsLayouts[key].height;`
`238`	`227`	`}`

Comments

(0)