[1.6] Fix scroll with values higher than possible (#419)

Author: enricodias

src/Input/Mouse.php

@@ -183,8 +183,11 @@ private function scroll(int $distanceY, int $distanceX = 0): self
         $scrollableArea = $this->page->getLayoutMetrics()->getCssContentSize();
         $visibleArea = $this->page->getLayoutMetrics()->getCssVisualViewport();
 
-        $distanceX = $this->getMaximumDistance($distanceX, $visibleArea['pageX'], $scrollableArea['width']);
-        $distanceY = $this->getMaximumDistance($distanceY, $visibleArea['pageY'], $scrollableArea['height']);
+        $maximumX = $scrollableArea['width'] - $visibleArea['clientWidth'];
+        $maximumY = $scrollableArea['height'] - $visibleArea['clientHeight'];
+
+        $distanceX = $this->getMaximumDistance($distanceX, $visibleArea['pageX'], $maximumX);
+        $distanceY = $this->getMaximumDistance($distanceY, $visibleArea['pageY'], $maximumY);
 
         $targetX = $visibleArea['pageX'] + $distanceX;
         $targetY = $visibleArea['pageY'] + $distanceY;
@@ -328,7 +331,7 @@ public function findElement(Selector $selector, int $position = 1): self
      *
      * @param int $distance Distance to scroll, positive or negative
      * @param int $current  Current position
-     * @param int $maximum  Maximum posible distance
+     * @param int $maximum  Maximum possible distance
      *
      * @return int allowed distance to scroll
      */

tests/MouseApiTest.php

@@ -85,13 +85,23 @@ public function testScroll(): void
         $windowScrollY = $page->evaluate('window.scrollY')->getReturnValue();
 
         $this->assertEquals(100, $windowScrollY);
+        $this->assertEquals(100, $page->mouse()->getPosition()['y']);
 
         // scrolling 100px up should revert the last action
         $page->mouse()->scrollUp(100);
 
         $windowScrollY = $page->evaluate('window.scrollY')->getReturnValue();
 
         $this->assertEquals(0, $windowScrollY);
+        $this->assertEquals(0, $page->mouse()->getPosition()['y']);
+
+        // try to scroll more than possible
+        $page->mouse()->scrollDown(10000);
+
+        $windowScrollY = $page->evaluate('window.scrollY')->getReturnValue();
+
+        $this->assertLessThan(10000, $windowScrollY);
+        $this->assertLessThan(10000, $page->mouse()->getPosition()['y']);
     }
 
     /**