Skip to content

Fixes to ContextSubscriber #3434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 7, 2016
Merged

Fixes to ContextSubscriber #3434

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 32 additions & 20 deletions modules/ContextUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,30 @@ import React, { PropTypes } from 'react'
// https://github.com/facebook/react/issues/2517
// https://github.com/reactjs/react-router/issues/470

export function createContextProvider(name, contextType = PropTypes.any) {
const contextProviderShape = PropTypes.shape({
subscribe: PropTypes.func.isRequired,
eventIndex: PropTypes.number.isRequired
})

function makeContextName(name) {
return `@@contextSubscriber/${name}`
}

export function createContextProvider(name) {
const contextName = makeContextName(name)

const ContextProvider = React.createClass({
propTypes: {
children: PropTypes.node.isRequired
},

contextTypes: {
[name]: contextType
},

childContextTypes: {
[name]: contextType
[contextName]: contextProviderShape.isRequired
},

getChildContext() {
return {
[name]: {
...this.context[name],
[contextName]: {
subscribe: this.subscribe,
eventIndex: this.eventIndex
}
Expand Down Expand Up @@ -58,41 +64,41 @@ export function createContextProvider(name, contextType = PropTypes.any) {
return ContextProvider
}

export function connectToContext(WrappedComponent, name, contextType = PropTypes.any) {
export function connectToContext(WrappedComponent, name) {
const contextName = makeContextName(name)

const ContextSubscriber = React.createClass({
contextTypes: {
[name]: contextType
[contextName]: contextProviderShape
},

getInitialState() {
if (!this.context[name]) {
if (!this.context[contextName]) {
return {}
}

return {
lastRenderedEventIndex: this.context[name].eventIndex
lastRenderedEventIndex: this.context[contextName].eventIndex
}
},

componentDidMount() {
if (!this.context[name]) {
if (!this.context[contextName]) {
return
}

this.unsubscribe = this.context[name].listen(eventIndex => {
if (eventIndex !== this.state.lastRenderedEventIndex) {
this.setState({ lastRenderedEventIndex: eventIndex })
}
})
this.unsubscribe = this.context[contextName].subscribe(
this.handleContextUpdate
)
},

componentWillReceiveProps() {
if (!this.context[name]) {
if (!this.context[contextName]) {
return
}

this.setState({
lastRenderedEventIndex: this.context[name].eventIndex
lastRenderedEventIndex: this.context[contextName].eventIndex
})
},

Expand All @@ -105,6 +111,12 @@ export function connectToContext(WrappedComponent, name, contextType = PropTypes
this.unsubscribe = null
},

handleContextUpdate(eventIndex) {
Copy link
Member

Choose a reason for hiding this comment

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

Just curious: Why the method extraction?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No particular reason. Felt like I might as well take advantage of the autobinding in React.createClass.

if (eventIndex !== this.state.lastRenderedEventIndex) {
this.setState({ lastRenderedEventIndex: eventIndex })
}
},

render() {
return <WrappedComponent {...this.props} />
}
Expand Down