Commita626975

committed

apply row count on canvas only

1 parentf5d21fa commita626975Copy full SHA for a626975

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -213,15 +213,15 @@ class GridLayout extends React.Component<GridLayoutProps, GridLayoutState> {`
`213`	`213`	`*@return {String} Container height in pixels.`
`214`	`214`	`*/`
`215`	`215`	`containerHeight():string{`
`216`		`-const{ margin, rowHeight, fixedRowCount}=this.propsasRequired<GridLayoutProps>;`
	`216`	`+const{ margin, rowHeight, fixedRowCount, isCanvas}=this.propsasRequired<GridLayoutProps>;`
`217`	`217`	`const{ extraHeight, emptyRows}=this.props;`
`218`	`218`	`constpositionParams=genPositionParams(this.props);`
`219`		`-`
`220`	`219`	`const{ containerPadding}=positionParams;`
`221`	`220`	`constlayout=this.getUILayout(undefined,true);`
	`221`	`+`
`222`	`222`	`letnbRow=bottom(layout);`
`223`		`-if(!_.isNil(emptyRows)&&(_.size(layout)===0\|\|fixedRowCount)){`
`224`		`-nbRow=emptyRows;// === Infinity ? 0 : emptyRows;`
	`223`	`+if(!_.isNil(emptyRows)&&(_.size(layout)===0\|\|(fixedRowCount&&isCanvas))){`
	`224`	`+nbRow=emptyRows;`
`225`	`225`	`}`
`226`	`226`	`constcontainerHeight=Math.max(`
`227`	`227`	`nbRowrowHeight+(nbRow-1)margin[1]+containerPadding[1]*2`

Comments

(0)