Skip to content
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

Jump to bottom

[#9627] Fix create-react-class isMounted ordering issue #9638

Merged
merged 2 commits into from
Jun 12, 2017
Merged

[#9627] Fix create-react-class isMounted ordering issue #9638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe10889
[#9627] Fix create-react-class isMounted ordering issue
mridgway May 9, 2017
4c679da
Revert changes to integration test
gaearon Jun 12, 2017
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
10 changes: 7 additions & 3 deletions addons/create-react-class/factory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,10 +585,13 @@ function factory(ReactComponent, isValidElement, ReactNoopUpdateQueue) {
}
}

var IsMountedMixin = {
var IsMountedPreMixin = {
componentDidMount: function () {
this.__isMounted = true;
},
}
};

var IsMountedPostMixin = {
componentWillUnmount: function () {
this.__isMounted = false;
}
Expand Down Expand Up @@ -680,8 +683,9 @@ function factory(ReactComponent, isValidElement, ReactNoopUpdateQueue) {

injectedMixins.forEach(mixSpecIntoComponent.bind(null, Constructor));

mixSpecIntoComponent(Constructor, IsMountedMixin);
mixSpecIntoComponent(Constructor, IsMountedPreMixin);
mixSpecIntoComponent(Constructor, spec);
mixSpecIntoComponent(Constructor, IsMountedPostMixin);

// Initialize the defaultProps property after all mixins have been merged.
if (Constructor.getDefaultProps) {
Expand Down
26 changes: 25 additions & 1 deletion addons/create-react-class/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,25 @@ describe('ReactClass-spec', () => {
var instance;
var Component = createReactClass({
displayName: 'MyComponent',
mixins: [
{
componentWillMount() {
this.log('mixin.componentWillMount');
},
componentDidMount() {
this.log('mixin.componentDidMount');
},
componentWillUpdate() {
this.log('mixin.componentWillUpdate');
},
componentDidUpdate() {
this.log('mixin.componentDidUpdate');
},
componentWillUnmount() {
this.log('mixin.componentWillUnmount');
},
},
],
log(name) {
ops.push(`${name}: ${this.isMounted()}`);
},
Expand Down Expand Up @@ -430,13 +449,18 @@ describe('ReactClass-spec', () => {
instance.log('after unmount');
expect(ops).toEqual([
'getInitialState: false',
'mixin.componentWillMount: false',
'componentWillMount: false',
'render: false',
'mixin.componentDidMount: true',
'componentDidMount: true',
'mixin.componentWillUpdate: true',
'componentWillUpdate: true',
'render: true',
'mixin.componentDidUpdate: true',
'componentDidUpdate: true',
'componentWillUnmount: false',
'mixin.componentWillUnmount: true',
'componentWillUnmount: true',
'after unmount: false',
]);

Expand Down