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
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ var nextMountID = 1;
/**
* @lends {ReactCompositeComponent.prototype}
*/
var ReactCompositeComponentMixin = {
var ReactCompositeComponent = {

/**
* Base constructor for all composite component.
Expand Down Expand Up @@ -1169,10 +1169,4 @@ var ReactCompositeComponentMixin = {

};

var ReactCompositeComponent = {

Mixin: ReactCompositeComponentMixin,

};

module.exports = ReactCompositeComponent;
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var ReactCompositeComponentWrapper = function(element) {
};
Object.assign(
ReactCompositeComponentWrapper.prototype,
ReactCompositeComponent.Mixin,
ReactCompositeComponent,
{
_instantiateReactComponent: instantiateReactComponent,
}
Expand Down
6 changes: 3 additions & 3 deletions src/test/ReactTestUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
);
Expand Down