Correct DecoratedComponent type to be TargetClass

lukyth · Oct 30, 2018 · b101a83 · b101a83
1 parent 33c6c50
commit b101a83
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/packages/react-dnd/src/DragSource.ts b/packages/react-dnd/src/DragSource.ts
@@ -85,9 +85,7 @@ export default function DragSource<Props, CollectedProps = {}, DragObject = {}>(
 			registerHandler: registerSource,
 			createMonitor: createSourceMonitor,
 			createConnector: createSourceConnector,
-			DecoratedComponent: (DecoratedComponent as any) as React.ComponentType<
-				Props
-			>,
+			DecoratedComponent,
 			getType,
 			collect,
 			options,

diff --git a/packages/react-dnd/src/DropTarget.ts b/packages/react-dnd/src/DropTarget.ts
@@ -78,9 +78,7 @@ export default function DropTarget<Props, CollectedProps = {}>(
 			registerHandler: registerTarget,
 			createMonitor: createTargetMonitor,
 			createConnector: createTargetConnector,
-			DecoratedComponent: (DecoratedComponent as any) as React.ComponentType<
-				Props
-			>,
+			DecoratedComponent,
 			getType,
 			collect,
 			options,

diff --git a/packages/react-dnd/src/decorateHandler.tsx b/packages/react-dnd/src/decorateHandler.tsx
@@ -13,8 +13,8 @@ const invariant = require('invariant')
 const hoistStatics = require('hoist-non-react-statics')
 const shallowEqual = require('shallowequal')
 
-export interface DecorateHandlerArgs<Props, ItemIdType> {
-	DecoratedComponent: React.ComponentType<Props>
+export interface DecorateHandlerArgs<Props, TargetClass, ItemIdType> {
+	DecoratedComponent: TargetClass
 	createHandler: any
 	createMonitor: any
 	createConnector: any
@@ -25,7 +25,11 @@ export interface DecorateHandlerArgs<Props, ItemIdType> {
 	options: any
 }
 
-export default function decorateHandler<Props, TargetClass, ItemIdType>({
+export default function decorateHandler<
+	Props,
+	TargetClass extends React.ComponentType<any>,
+	ItemIdType
+>({
 	DecoratedComponent,
 	createHandler,
 	createMonitor,
@@ -35,7 +39,7 @@ export default function decorateHandler<Props, TargetClass, ItemIdType>({
 	getType,
 	collect,
 	options,
-}: DecorateHandlerArgs<Props, ItemIdType>): TargetClass &
+}: DecorateHandlerArgs<Props, TargetClass, ItemIdType>): TargetClass &
 	DndComponentClass<Props> {
 	const { arePropsEqual = shallowEqual } = options
 	const Decorated: any = DecoratedComponent