Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/diff/children.js
Original file line number Diff line number Diff line change
Expand Up @@ -427,13 +427,14 @@ function insert(parentVNode, oldDom, parentDom, isMounting) {
*/
export function toChildArray(children, out) {
out = out || [];
if (children == NULL || typeof children == 'boolean') {
} else if (isArray(children)) {
children.some(child => {
toChildArray(child, out);
});
} else {
out.push(children);
if (children != NULL && typeof children != 'boolean') {
if (isArray(children)) {
children.some(child => {
toChildArray(child, out);
});
} else {
out.push(children);
}
}
return out;
}
Expand Down
30 changes: 30 additions & 0 deletions test/browser/toChildArray.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,36 @@ describe('toChildArray', () => {
expect(scratch.innerHTML).to.equal('<div></div>');
});

it('filters nullish and boolean values', () => {
expect(toChildArray(null)).to.deep.equal([]);
expect(toChildArray(undefined)).to.deep.equal([]);
expect(toChildArray(false)).to.deep.equal([]);
expect(toChildArray(true)).to.deep.equal([]);
});

it('preserves zero and empty string values', () => {
expect(toChildArray(0)).to.deep.equal([0]);
expect(toChildArray('')).to.deep.equal(['']);
});

it('flattens sparse nested arrays', () => {
const nested = [0, ''];
nested.length = 3;
const sparse = [null];
sparse[2] = [undefined, false, nested];
sparse[4] = true;
sparse[6] = 'last';

expect(toChildArray(sparse)).to.deep.equal([0, '', 'last']);
});

it('flattens Array subclasses', () => {
class ChildrenArray extends Array {}
const children = new ChildrenArray('first', [null, 'second']);

expect(toChildArray(children)).to.deep.equal(['first', 'second']);
});

it('should skip a function child', () => {
const child = num => num.toFixed(2);
render(<Foo>{child}</Foo>, scratch);
Expand Down
Loading