From 7ec5c376d358c0c14c592eac181f397352217fc4 Mon Sep 17 00:00:00 2001 From: Anton Bondarenko Date: Wed, 27 May 2020 21:00:47 +0300 Subject: [PATCH] Fix touch backend bug in _getDropTargetId (#2507) --- packages/core/touch-backend/src/TouchBackendImpl.ts | 2 +- .../touch-backend/src/__tests__/TouchBackend.spec.ts | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/core/touch-backend/src/TouchBackendImpl.ts b/packages/core/touch-backend/src/TouchBackendImpl.ts index 756ad44f23..7b84fc33a0 100644 --- a/packages/core/touch-backend/src/TouchBackendImpl.ts +++ b/packages/core/touch-backend/src/TouchBackendImpl.ts @@ -563,8 +563,8 @@ export class TouchBackendImpl implements Backend { public _getDropTargetId = (node: Element): Identifier | undefined => { const keys = this.targetNodes.keys() let next = keys.next() - const targetId = next.value while (next.done === false) { + const targetId = next.value if (node === this.targetNodes.get(targetId)) { return targetId } else { diff --git a/packages/core/touch-backend/src/__tests__/TouchBackend.spec.ts b/packages/core/touch-backend/src/__tests__/TouchBackend.spec.ts index 57e819ddf6..10dd52222e 100644 --- a/packages/core/touch-backend/src/__tests__/TouchBackend.spec.ts +++ b/packages/core/touch-backend/src/__tests__/TouchBackend.spec.ts @@ -19,11 +19,14 @@ describe('TouchBackend', () => { }) it('can determine target ids', () => { - const mockNode = {} as HTMLElement + const mockNode1 = {} as HTMLElement + const mockNode2 = {} as HTMLElement const backend = TouchBackend(mockManager(), {}, {}) as TouchBackendImpl - backend.targetNodes.set('abc', mockNode) + backend.targetNodes.set('abc', mockNode1) + backend.targetNodes.set('def', mockNode2) - expect(backend._getDropTargetId(mockNode)).toEqual('abc') + expect(backend._getDropTargetId(mockNode1)).toEqual('abc') + expect(backend._getDropTargetId(mockNode2)).toEqual('def') expect(backend._getDropTargetId({} as Element)).toEqual(undefined) }) })