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
4 changes: 2 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ function renderToString(vnode, context, opts, inner, isSvgMode, selectValue) {
// the context value as `this.context` just for this component.
let cxType = nodeName.contextType;
let provider = cxType && context[cxType.__c];
let cctx = cxType != null ? (provider ? provider.props.value : cxType._defaultValue) : context;
let cctx = cxType != null ? (provider ? provider.props.value : cxType.__) : context;

// stateless functional components
rendered = nodeName.call(vnode.__c, props, cctx);
Expand All @@ -95,7 +95,7 @@ function renderToString(vnode, context, opts, inner, isSvgMode, selectValue) {
// class-based components
let cxType = nodeName.contextType;
let provider = cxType && context[cxType.__c];
let cctx = cxType != null ? (provider ? provider.props.value : cxType._defaultValue) : context;
let cctx = cxType != null ? (provider ? provider.props.value : cxType.__) : context;

// c = new nodeName(props, context);
c = vnode.__c = new nodeName(props, cctx);
Expand Down
17 changes: 17 additions & 0 deletions test/context.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,21 @@ describe('context', () => {
<section>value is: </section>
`);
});

it('should support default context value with absent provider', () => {
const { Consumer } = createContext('correct');
let rendered = renderJsx(
<Consumer>
{(value) => (
<section>
value is: {value}
</section>
)}
</Consumer>
);

expect(rendered).to.equal(dedent`
<section>value is: correct</section>
`);
});
});