Fix issue where drag preview wasn't reconnecting in reconnect flow (#…

…3353)

* Fix issue where drag preview wasn't reconnecting in `reconnect` flow

* fix: linting issues

* chore: cut semver

* fix: add default argument to reconnectDragPreview

Co-authored-by: Chris Trevino <chtrevin@microsoft.com>

.yarn/versions/f6cebe98.yml

@@ -0,0 +1,7 @@
+releases:
+  react-dnd: patch
+  react-dnd-test-utils: patch
+
+declined:
+  - react-dnd-documentation
+  - react-dnd-examples

packages/react-dnd/src/hooks/__tests__/useDrag.spec.tsx

@@ -2,7 +2,6 @@ import { useDrag } from '../useDrag'
 import { DndProvider } from '../../core'
 import { TestBackend } from 'react-dnd-test-backend'
 import { render, cleanup } from '@testing-library/react'
-import { nextTick } from 'process'
 
 describe('The useDrag hook', () => {
 	afterEach(cleanup)

packages/react-dnd/src/internals/SourceConnector.ts

@@ -93,11 +93,11 @@ export class SourceConnector implements Connector {
 	}
 
 	public reconnect(): void {
-		this.reconnectDragSource()
-		this.reconnectDragPreview()
+		const didChange = this.reconnectDragSource()
+		this.reconnectDragPreview(didChange)
 	}
 
-	private reconnectDragSource() {
+	private reconnectDragSource(): boolean {
 		const dragSource = this.dragSource
 		// if nothing has changed then don't resubscribe
 		const didChange =
@@ -110,11 +110,11 @@ export class SourceConnector implements Connector {
 		}
 
 		if (!this.handlerId) {
-			return
+			return didChange
 		}
 		if (!dragSource) {
 			this.lastConnectedDragSource = dragSource
-			return
+			return didChange
 		}
 
 		if (didChange) {
@@ -127,12 +127,14 @@ export class SourceConnector implements Connector {
 				this.dragSourceOptions,
 			)
 		}
+		return didChange
 	}
 
-	private reconnectDragPreview() {
+	private reconnectDragPreview(forceDidChange = false): void {
 		const dragPreview = this.dragPreview
 		// if nothing has changed then don't resubscribe
 		const didChange =
+			forceDidChange ||
 			this.didHandlerIdChange() ||
 			this.didConnectedDragPreviewChange() ||
 			this.didDragPreviewOptionsChange()

packages/test-utils/src/testingLibraryEvents.ts

@@ -27,7 +27,7 @@ export async function fireDrag(source: Element) {
 	})
 }
 
-export async function fireReleaseDrag(source: Element) {
+export async function fireReleaseDrag() {
 	await act(async () => {
 		fireEvent.drop(window)
 		await tick()