Merge master into typings-2.0

* Changed Files
This commit is contained in:
Paul van Brenk
2016-08-18 14:53:30 -07:00
34 changed files with 498 additions and 327 deletions
+3 -3
View File
@@ -45,16 +45,16 @@ declare module __ReactDnd {
spec: DropTargetSpec<P>,
collect: DropTargetCollector,
options?: DndOptions<P>
): (componentClass: React.ComponentClass<P>) => DndComponentClass<P>;
): (componentClass: React.ComponentClass<P> | React.StatelessComponent<P>) => DndComponentClass<P>;
export function DragDropContext<P>(
backend: Backend
): (componentClass: React.ComponentClass<P>) => ContextComponentClass<P>;
): <P>(componentClass: React.ComponentClass<P> | React.StatelessComponent<P>) => ContextComponentClass<P>;
export function DragLayer<P>(
collect: DragLayerCollector,
options?: DndOptions<P>
): (componentClass: React.ComponentClass<P>) => DndComponentClass<P>;
): (componentClass: React.ComponentClass<P> | React.StatelessComponent<P>) => DndComponentClass<P>;
type DragSourceCollector = (connect: DragSourceConnector, monitor: DragSourceMonitor) => Object;
type DropTargetCollector = (connect: DropTargetConnector, monitor: DropTargetMonitor) => Object;