Remove the Mixin layer of indirection on ReactMultiChild

As mentioned in facebook#7581 (comment) we can remove the Mixin layer of indirection as it only exports a Mixin and I find it confusing.
vjeux · Aug 28, 2016 · 927105e · 927105e
1 parent 19b8ead
commit 927105e
Show file tree

Hide file tree

Showing 5 changed files with 309 additions and 323 deletions.
diff --git a/src/renderers/art/ReactART.js b/src/renderers/art/ReactART.js
@@ -93,7 +93,7 @@ function injectAfter(parentNode, referenceNode, node) {
 
 // ContainerMixin for components that can hold ART nodes
 
-const ContainerMixin = assign({}, ReactMultiChild.Mixin, {
+const ContainerMixin = assign({}, ReactMultiChild, {
 
   /**
    * Moves a child component to the supplied index.
@@ -144,7 +144,7 @@ const ContainerMixin = assign({}, ReactMultiChild.Mixin, {
    * @param {?object} nextChildren.
    * @param {ReactReconcileTransaction} transaction
    * @internal
-   * @override {ReactMultiChild.Mixin.updateChildren}
+   * @override {ReactMultiChild.updateChildren}
    */
   updateChildren: function(nextChildren, transaction, context) {
     this._updateChildren(nextChildren, transaction, context);

diff --git a/src/renderers/dom/shared/ReactDOMComponent.js b/src/renderers/dom/shared/ReactDOMComponent.js
@@ -1210,7 +1210,7 @@ ReactDOMComponent.Mixin = {
 Object.assign(
   ReactDOMComponent.prototype,
   ReactDOMComponent.Mixin,
-  ReactMultiChild.Mixin
+  ReactMultiChild
 );
 
 module.exports = ReactDOMComponent;
diff --git a/src/renderers/native/ReactNativeBaseComponent.js b/src/renderers/native/ReactNativeBaseComponent.js
@@ -224,7 +224,7 @@ ReactNativeBaseComponent.Mixin = {
  */
 Object.assign(
   ReactNativeBaseComponent.prototype,
-  ReactMultiChild.Mixin,
+  ReactMultiChild,
   ReactNativeBaseComponent.Mixin,
   NativeMethodsMixin
 );