Remove classic function API, use decorator desugaring instead

modules/configureDragDrop.js

@@ -9,11 +9,11 @@ import invariant from 'invariant';
 
 const DEFAULT_KEY = '__default__';
 
-function configureDragDrop(InnerComponent, configure, collect, {
+export default function configureDragDrop(configure, collect, {
   arePropsEqual = shallowEqualScalar,
   managerKey = 'dragDropManager'
 }: options = {}) {
-  return class DragDropContainer extends Component {
+  return DecoratedComponent => class DragDropHandler extends Component {
     static contextTypes = {
       [managerKey]: PropTypes.object.isRequired
     }
@@ -99,18 +99,10 @@ function configureDragDrop(InnerComponent, configure, collect, {
 
     render() {
       return (
-        <InnerComponent {...this.props}
-                        {...this.state}
-                        ref={this.setComponentRef} />
+        <DecoratedComponent {...this.props}
+                            {...this.state}
+                            ref={this.setComponentRef} />
       );
     }
   };
-}
-
-export default function(...args) {
-  if (typeof args[2] === 'function') {
-    return configureDragDrop(...args);
-  } else {
-    return (DecoratedComponent) => configureDragDrop(DecoratedComponent, ...args);
-  }
 }

modules/configureDragDropContext.js

@@ -1,7 +1,7 @@
 import React, { Component, PropTypes } from 'react';
 import { DragDropManager } from 'dnd-core';
 
-function configureDragDropContext(InnerComponent, backendFactories) {
+export default function configureDragDropContext(backendFactories) {
   const childContextTypes = {};
   const childContext = {};
 
@@ -16,25 +16,15 @@ function configureDragDropContext(InnerComponent, backendFactories) {
     childContext[key] = new DragDropManager(backendFactories[key]);
   });
 
-  class DragDropContext extends Component {
+  return DecoratedComponent => class DragDropContext extends Component {
     static childContextTypes = childContextTypes;
 
     getChildContext() {
       return childContext;
     }
 
     render() {
-      return <InnerComponent {...this.props} />;
+      return <DecoratedComponent {...this.props} />;
     }
-  }
-
-  return DragDropContext;
-}
-
-export default function(...args) {
-  if (args.length === 1) {
-    return (DecoratedComponent) => configureDragDropContext(DecoratedComponent, ...args);
-  } else {
-    return configureDragDropContext(...args);
-  }
+  };
 }