From 325ab792e2fe407ad047e69b49b213edfbe3ccda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=A2=E6=98=8E=E5=90=9B?= Date: Tue, 7 Sep 2021 23:28:24 +0800 Subject: [PATCH 1/2] fix(plugin:mirror): incorrect use of the function 'positionMirror' fix #506 --- src/Draggable/Plugins/Mirror/Mirror.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Draggable/Plugins/Mirror/Mirror.js b/src/Draggable/Plugins/Mirror/Mirror.js index 21febd97..f426714f 100644 --- a/src/Draggable/Plugins/Mirror/Mirror.js +++ b/src/Draggable/Plugins/Mirror/Mirror.js @@ -502,7 +502,7 @@ function removeMirrorID({mirror, ...args}) { * @return {Promise} * @private */ -function positionMirror({withFrame = false, initial = false} = {}) { +function positionMirror({raf = false, initial = false} = {}) { return ({ mirror, sensorEvent, @@ -556,7 +556,7 @@ function positionMirror({withFrame = false, initial = false} = {}) { resolve(result); }, - {frame: withFrame}, + {raf}, ); }; } From 2178e7148d7dabb5735cbdb0bba3545e700e0b60 Mon Sep 17 00:00:00 2001 From: JuFeng Zhang Date: Wed, 8 Sep 2021 20:29:17 +0800 Subject: [PATCH 2/2] test: fix mirror moved test --- src/Draggable/Plugins/Mirror/tests/Mirror.test.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Draggable/Plugins/Mirror/tests/Mirror.test.js b/src/Draggable/Plugins/Mirror/tests/Mirror.test.js index a3d78c4a..416b18fa 100644 --- a/src/Draggable/Plugins/Mirror/tests/Mirror.test.js +++ b/src/Draggable/Plugins/Mirror/tests/Mirror.test.js @@ -230,17 +230,16 @@ describe('Mirror', () => { moveMouse(document.body); + await waitForPromisesToResolve(); + waitForRequestAnimationFrame(); await waitForPromisesToResolve(); expect(mirrorMovedHandler).toHaveBeenCalledWithEvent(MirrorMovedEvent); expect(mirrorMovedHandler).toHaveBeenCalledWithEventProperties({ - dragEvent: mirrorMoveEvent.dragEvent, mirror: mirrorMoveEvent.mirror, source: mirrorMoveEvent.source, originalSource: mirrorMoveEvent.originalSource, sourceContainer: mirrorMoveEvent.sourceContainer, - sensorEvent: mirrorMoveEvent.sensorEvent, - originalEvent: mirrorMoveEvent.originalEvent, }); releaseMouse(draggable.source);