Skip to content
This repository has been archived by the owner on Aug 1, 2018. It is now read-only.

Support React.Fragment #84

Merged
merged 3 commits into from
Mar 26, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
16 changes: 16 additions & 0 deletions src/__tests__/__node__/prepare-render.node.js
Original file line number Diff line number Diff line change
Expand Up @@ -386,3 +386,19 @@ tape('Preparing an async app with componentWillReceiveProps option', t => {
t.end();
});
});

tape('Preparing a Fragment', t => {
const app = (
<React.Fragment>
<span>1</span>
<span>2</span>
</React.Fragment>
);
const p = prepare(app);
t.ok(p instanceof Promise, 'prepare returns a promise');
p.then(() => {
const wrapper = shallow(<div>{app}</div>);
t.equal(wrapper.find('span').length, 2, 'has two children');
t.end();
});
});
5 changes: 4 additions & 1 deletion src/prepare.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ function prepareElement(element, context) {
return Promise.resolve([null, context]);
}
const {type, props} = element;
if (typeof type === 'string') {
if (
typeof type === 'string' ||
type.toString() === React.Fragment.toString()

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not type === React.Fragment?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is better, updated. Thanks!

) {
return Promise.resolve([props.children, context]);
}
if (!isReactCompositeComponent(type)) {
Expand Down