Commit 023147e

committed

allow for null children so conditional rendering is possible

1 parent 504f141 commit 023147eCopy full SHA for 023147e

File tree

+53

-3

lines changed

+53

-3

lines changed

Lines changed: 1 addition & 1 deletion

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export default class Transform2d extends React.Component {`
`12`	`12`	`translate: PropTypes.oneOfType([vec2GlMatrix, vec2Obj]),`
`13`	`13`	`scale: PropTypes.oneOfType([vec2GlMatrix, vec2Obj, PropTypes.number]),`
`14`	`14`	`rotate: PropTypes.number,`
`15`		`- children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]).isRequired,`
	`15`	`+ children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),`
`16`	`16`	`};`
`17`	`17`
`18`	`18`	`static defaultProps = {`
`@@ -29,6 +29,10 @@ export default class Transform2d extends React.Component {`
`29`	`29`	`const { children, parentMatrixWorld, multiplicationOrder, translate, scale, rotate } = this.props;`
`30`	`30`	`const { matrix, matrixWorld, vTranslation, vScale } = this;`
`31`	`31`
	`32`	`+ if (!children) {`
	`33`	`+ return null;`
	`34`	`+ }`
	`35`	`+`
`32`	`36`	`const theta = typeof rotate === 'number' ? rotate : 0;`
`33`	`37`
`34`	`38`	`mat2d.identity(matrix);`
`@@ -61,6 +65,10 @@ export default class Transform2d extends React.Component {`
`61`	`65`	`}`
`62`	`66`
`63`	`67`	`renderChild = child => {`
	`68`	`+ if (!child) {`
	`69`	`+ return null;`
	`70`	`+ }`
	`71`	`+`
`64`	`72`	`const { multiplicationOrder } = this.props;`
`65`	`73`	`const { matrixWorld } = this;`
`66`	`74`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ export default class Transform3d extends React.Component {`
`13`	`13`	`scale: PropTypes.oneOfType([vec3GlMatrix, vec3Obj, PropTypes.number]),`
`14`	`14`	`rotate: PropTypes.number,`
`15`	`15`	`rotateAxis: PropTypes.oneOfType([vec3GlMatrix, vec3Obj]),`
`16`		`- children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]).isRequired,`
	`16`	`+ children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),`
`17`	`17`	`};`
`18`	`18`
`19`	`19`	`static defaultProps = {`
`@@ -36,6 +36,10 @@ export default class Transform3d extends React.Component {`
`36`	`36`	`const { children, parentMatrixWorld, multiplicationOrder, translate, rotate, rotateAxis, scale } = this.props;`
`37`	`37`	`const { matrix, matrixWorld, vTranslation, vScale, vRotationAxis } = this;`
`38`	`38`
	`39`	`+ if (!children) {`
	`40`	`+ return null;`
	`41`	`+ }`
	`42`	`+`
`39`	`43`	`const theta = typeof rotate === 'number' ? rotate : 0;`
`40`	`44`
`41`	`45`	`mat4.identity(matrix);`
`@@ -69,6 +73,10 @@ export default class Transform3d extends React.Component {`
`69`	`73`	`}`
`70`	`74`
`71`	`75`	`renderChild = child => {`
	`76`	`+ if (!child) {`
	`77`	`+ return null;`
	`78`	`+ }`
	`79`	`+`
`72`	`80`	`const { multiplicationOrder } = this.props;`
`73`	`81`	`const { matrixWorld } = this;`
`74`	`82`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,23 @@ describe('<Transform2d />', () => {`
`79`	`79`	`expect(instance.matrixWorld[4]).toBeCloseTo(0, 6);`
`80`	`80`	`expect(instance.matrixWorld[5]).toBeCloseTo(10, 6);`
`81`	`81`	`});`
	`82`	`+`
	`83`	`+ it('renders null when no children passed through', () => {`
	`84`	`+ const wrapper = shallow(<Transform2d {...props} />);`
	`85`	`+ expect(wrapper.get(0)).toBe(null);`
	`86`	`+ });`
	`87`	`+`
	`88`	`+ it('renders null for a child which returns false', () => {`
	`89`	`+ // we're mainly testing this doesn't break rendering :)`
	`90`	`+ const wrapper = shallow(`
	`91`	`+ <Transform2d {...props}>`
	`92`	`+ <div />`
	`93`	`+ {false && <div />}`
	`94`	`+ </Transform2d>`
	`95`	`+ );`
	`96`	`+`
	`97`	`+ expect(wrapper.length).toBe(1);`
	`98`	`+ });`
`82`	`99`	`});`
`83`	`100`
`84`	`101`	`function runSharedTests() {`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,23 @@ describe('<Transform3d />', () => {`
`123`	`123`	`expect(instance.matrixWorld[14]).toBeCloseTo(20, 6);`
`124`	`124`	`expect(instance.matrixWorld[15]).toBeCloseTo(1, 6);`
`125`	`125`	`});`
	`126`	`+`
	`127`	`+ it('renders null when no children passed through', () => {`
	`128`	`+ const wrapper = shallow(<Transform3d {...props} />);`
	`129`	`+ expect(wrapper.get(0)).toBe(null);`
	`130`	`+ });`
	`131`	`+`
	`132`	`+ it('renders null for a child which returns false', () => {`
	`133`	`+ // we're mainly testing this doesn't break rendering :)`
	`134`	`+ const wrapper = shallow(`
	`135`	`+ <Transform3d {...props}>`
	`136`	`+ <div />`
	`137`	`+ {false && <div />}`
	`138`	`+ </Transform3d>`
	`139`	`+ );`
	`140`	`+`
	`141`	`+ expect(wrapper.length).toBe(1);`
	`142`	`+ });`
`126`	`143`	`});`
`127`	`144`
`128`	`145`	`function runSharedTests() {`

Comments

(0)