Remove the Mixin layer of indirection on ReactCompositeComponent (#7599)

As mentioned in https://github.com/facebook/react/pull/7581#issuecomment-242952042 we can remove the Mixin layer of indirection as it only exports a Mixin and I find it confusing.
This commit is contained in:
Christopher Chedeau
2016-08-28 16:46:53 -07:00
committed by GitHub
parent dbe3584340
commit dd0c65c6aa
3 changed files with 5 additions and 11 deletions
@@ -126,7 +126,7 @@ var nextMountID = 1;
/**
* @lends {ReactCompositeComponent.prototype}
*/
var ReactCompositeComponentMixin = {
var ReactCompositeComponent = {
/**
* Base constructor for all composite component.
@@ -1169,10 +1169,4 @@ var ReactCompositeComponentMixin = {
};
var ReactCompositeComponent = {
Mixin: ReactCompositeComponentMixin,
};
module.exports = ReactCompositeComponent;
@@ -24,7 +24,7 @@ var ReactCompositeComponentWrapper = function(element) {
};
Object.assign(
ReactCompositeComponentWrapper.prototype,
ReactCompositeComponent.Mixin,
ReactCompositeComponent,
{
_instantiateReactComponent: instantiateReactComponent,
}
+3 -3
View File
@@ -419,15 +419,15 @@ var ShallowComponentWrapper = function(element) {
};
Object.assign(
ShallowComponentWrapper.prototype,
ReactCompositeComponent.Mixin, {
ReactCompositeComponent, {
_constructComponent:
ReactCompositeComponent.Mixin._constructComponentWithoutOwner,
ReactCompositeComponent._constructComponentWithoutOwner,
_instantiateReactComponent: function(element) {
return new NoopInternalComponent(element);
},
_replaceNodeWithMarkup: function() {},
_renderValidatedComponent:
ReactCompositeComponent.Mixin
ReactCompositeComponent
._renderValidatedComponentWithoutOwnerOrContext,
}
);