feat: add the target component props to the collector funtion signature

this will allow collector functions to encode logic based on incoming props of the component
react-dnd · Mar 21, 2019 · 2a7a237 · 2a7a237
1 parent 1d7207e
commit 2a7a237
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/packages/examples/src/00 Chessboard/BoardSquare.tsx b/packages/examples/src/00 Chessboard/BoardSquare.tsx
@@ -32,7 +32,7 @@ const squareTarget = {
 	},
 }
 
-const collect: DropTargetCollector<CollectedProps> = (
+const collect: DropTargetCollector<CollectedProps, BoardSquareProps> = (
 	connect: DropTargetConnector,
 	monitor: DropTargetMonitor,
 ) => {

diff --git a/packages/react-dnd/src/DragSource.ts b/packages/react-dnd/src/DragSource.ts
@@ -27,7 +27,7 @@ const isPlainObject = require('lodash/isPlainObject')
 export default function DragSource<Props, CollectedProps = {}, DragObject = {}>(
 	type: SourceType | ((props: Props) => SourceType),
 	spec: DragSourceSpec<Props, DragObject>,
-	collect: DragSourceCollector<CollectedProps>,
+	collect: DragSourceCollector<CollectedProps, Props>,
 	options: DndOptions<Props> = {},
 ) {
 	checkDecoratorArguments(

diff --git a/packages/react-dnd/src/DropTarget.ts b/packages/react-dnd/src/DropTarget.ts
@@ -20,7 +20,7 @@ const isPlainObject = require('lodash/isPlainObject')
 export default function DropTarget<Props, CollectedProps = {}>(
 	type: TargetType | ((props: Props) => TargetType),
 	spec: DropTargetSpec<Props>,
-	collect: DropTargetCollector<CollectedProps>,
+	collect: DropTargetCollector<CollectedProps, Props>,
 	options: DndOptions<Props> = {},
 ) {
 	checkDecoratorArguments(

diff --git a/packages/react-dnd/src/decorateHandler.tsx b/packages/react-dnd/src/decorateHandler.tsx
@@ -178,6 +178,7 @@ export default function decorateHandler<Props, ItemIdType>({
 			const nextState = collect(
 				this.handlerConnector.hooks,
 				this.handlerMonitor,
+				this.props,
 			)
 
 			if (process.env.NODE_ENV !== 'production') {

diff --git a/packages/react-dnd/src/interfaces/classApi.ts b/packages/react-dnd/src/interfaces/classApi.ts
@@ -171,14 +171,16 @@ export interface DropTargetConnector {
 	dropTarget(): ConnectDropTarget
 }
 
-export type DragSourceCollector<CollectedProps> = (
+export type DragSourceCollector<CollectedProps, TargetProps> = (
 	connect: DragSourceConnector,
 	monitor: DragSourceMonitor,
+	props: TargetProps,
 ) => CollectedProps
 
-export type DropTargetCollector<CollectedProps> = (
+export type DropTargetCollector<CollectedProps, TargetProps> = (
 	connect: DropTargetConnector,
 	monitor: DropTargetMonitor,
+	props: TargetProps,
 ) => CollectedProps
 
 export type DragLayerCollector<TargetProps, CollectedProps> = (