Fixed scrolling an element into view only if it is not within a view.

Lullabot · Aug 16, 2024 · c5d7a74 · c5d7a74
1 parent 145fe8e
commit c5d7a74
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/Selenium2Driver.php b/src/Selenium2Driver.php
@@ -953,8 +953,19 @@ public function mouseOver(string $xpath)
     private function scrollElementIntoView(Element $element): void {
         $script = <<<JS
             var e = arguments[0];
-            e.scrollIntoView({ behavior: 'instant', block: 'end', inline: 'nearest' });
             var rect = e.getBoundingClientRect();
+            var inView = (
+                rect.top >= 0 &&
+                rect.left >= 0 &&
+                rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) &&
+                rect.right <= (window.innerWidth || document.documentElement.clientWidth)
+            );
+
+            if (!inView) {
+                e.scrollIntoView({ behavior: 'instant', block: 'end', inline: 'nearest' });
+                rect = e.getBoundingClientRect();
+            }
+
             return {'x': rect.left, 'y': rect.top};
         JS;