fix: drag and drop with position (microsoft#1180)

mxschmitt · web-flow · commit e7e0f5287ac0 · 2022-03-03T22:40:09.000+01:00
diff --git a/playwright/_impl/_frame.py b/playwright/_impl/_frame.py
@@ -547,8 +547,8 @@ async def drag_and_drop(
         self,
         source: str,
         target: str,
-        source_position: Position = None,
-        target_position: Position = None,
+        sourcePosition: Position = None,
+        targetPosition: Position = None,
         force: bool = None,
         noWaitAfter: bool = None,
         strict: bool = None,
diff --git a/playwright/_impl/_page.py b/playwright/_impl/_page.py
@@ -737,8 +737,8 @@ async def drag_and_drop(
         self,
         source: str,
         target: str,
-        source_position: Position = None,
-        target_position: Position = None,
+        sourcePosition: Position = None,
+        targetPosition: Position = None,
         force: bool = None,
         noWaitAfter: bool = None,
         timeout: float = None,
diff --git a/playwright/async_api/_generated.py b/playwright/async_api/_generated.py
@@ -4644,8 +4644,8 @@ async def drag_and_drop(
                 self._impl_obj.drag_and_drop(
                     source=source,
                     target=target,
-                    source_position=source_position,
-                    target_position=target_position,
+                    sourcePosition=source_position,
+                    targetPosition=target_position,
                     force=force,
                     noWaitAfter=no_wait_after,
                     strict=strict,
@@ -8782,8 +8782,8 @@ async def drag_and_drop(
                 self._impl_obj.drag_and_drop(
                     source=source,
                     target=target,
-                    source_position=source_position,
-                    target_position=target_position,
+                    sourcePosition=source_position,
+                    targetPosition=target_position,
                     force=force,
                     noWaitAfter=no_wait_after,
                     timeout=timeout,
diff --git a/playwright/sync_api/_generated.py b/playwright/sync_api/_generated.py
@@ -4588,8 +4588,8 @@ def drag_and_drop(
                 self._impl_obj.drag_and_drop(
                     source=source,
                     target=target,
-                    source_position=source_position,
-                    target_position=target_position,
+                    sourcePosition=source_position,
+                    targetPosition=target_position,
                     force=force,
                     noWaitAfter=no_wait_after,
                     strict=strict,
@@ -8591,8 +8591,8 @@ def drag_and_drop(
                 self._impl_obj.drag_and_drop(
                     source=source,
                     target=target,
-                    source_position=source_position,
-                    target_position=target_position,
+                    sourcePosition=source_position,
+                    targetPosition=target_position,
                     force=force,
                     noWaitAfter=no_wait_after,
                     timeout=timeout,
diff --git a/tests/async/test_locators.py b/tests/async/test_locators.py
@@ -599,6 +599,49 @@ async def test_drag_to(page: Page, server: Server) -> None:
     )
 
 
+async def test_drag_to_with_position(page: Page, server: Server):
+    await page.goto(server.EMPTY_PAGE)
+    await page.set_content(
+        """
+      <div style="width:100px;height:100px;background:red;" id="red">
+      </div>
+      <div style="width:100px;height:100px;background:blue;" id="blue">
+      </div>
+    """
+    )
+    events_handle = await page.evaluate_handle(
+        """
+        () => {
+        const events = [];
+        document.getElementById('red').addEventListener('mousedown', event => {
+            events.push({
+            type: 'mousedown',
+            x: event.offsetX,
+            y: event.offsetY,
+            });
+        });
+        document.getElementById('blue').addEventListener('mouseup', event => {
+            events.push({
+            type: 'mouseup',
+            x: event.offsetX,
+            y: event.offsetY,
+            });
+        });
+        return events;
+        }
+    """
+    )
+    await page.locator("#red").drag_to(
+        page.locator("#blue"),
+        source_position={"x": 34, "y": 7},
+        target_position={"x": 10, "y": 20},
+    )
+    assert await events_handle.json_value() == [
+        {"type": "mousedown", "x": 34, "y": 7},
+        {"type": "mouseup", "x": 10, "y": 20},
+    ]
+
+
 async def test_locator_query_should_filter_by_text(page: Page, server: Server) -> None:
     await page.set_content("<div>Foobar</div><div>Bar</div>")
     await expect(page.locator("div", has_text="Foo")).to_have_text("Foobar")
diff --git a/tests/async/test_page.py b/tests/async/test_page.py
@@ -1292,6 +1292,50 @@ async def test_drag_and_drop_helper_method(page: Page, server: Server):
     )
 
 
+async def test_drag_and_drop_with_position(page: Page, server: Server):
+    await page.goto(server.EMPTY_PAGE)
+    await page.set_content(
+        """
+      <div style="width:100px;height:100px;background:red;" id="red">
+      </div>
+      <div style="width:100px;height:100px;background:blue;" id="blue">
+      </div>
+    """
+    )
+    events_handle = await page.evaluate_handle(
+        """
+        () => {
+        const events = [];
+        document.getElementById('red').addEventListener('mousedown', event => {
+            events.push({
+            type: 'mousedown',
+            x: event.offsetX,
+            y: event.offsetY,
+            });
+        });
+        document.getElementById('blue').addEventListener('mouseup', event => {
+            events.push({
+            type: 'mouseup',
+            x: event.offsetX,
+            y: event.offsetY,
+            });
+        });
+        return events;
+        }
+    """
+    )
+    await page.drag_and_drop(
+        "#red",
+        "#blue",
+        source_position={"x": 34, "y": 7},
+        target_position={"x": 10, "y": 20},
+    )
+    assert await events_handle.json_value() == [
+        {"type": "mousedown", "x": 34, "y": 7},
+        {"type": "mouseup", "x": 10, "y": 20},
+    ]
+
+
 async def test_should_check_box_using_set_checked(page: Page):
     await page.set_content("`<input id='checkbox' type='checkbox'></input>`")
     await page.set_checked("input", True)
