Improve methods that scroll to elements

Author: mdmintz

seleniumbase/fixtures/base_case.py

@@ -12252,7 +12252,7 @@ def __click_with_offset(
             self.execute_script(script)
         try:
             element_location = element.location["y"]
-            element_location = element_location - 130 + y
+            element_location = element_location - constants.Scroll.Y_OFFSET + y
             if element_location < 0:
                 element_location = 0
             scroll_script = "window.scrollTo(0, %s);" % element_location
@@ -12352,8 +12352,8 @@ def __jquery_slow_scroll_to(self, selector, by="css selector"):
         selector = self.__make_css_match_first_element_only(selector)
         scroll_script = (
             """jQuery([document.documentElement, document.body]).animate({"""
-            """scrollTop: jQuery('%s').offset().top - 130}, %s);"""
-            % (selector, scroll_time_ms)
+            """scrollTop: jQuery('%s').offset().top - %s}, %s);"""
+            % (selector, constants.Scroll.Y_OFFSET, scroll_time_ms)
         )
         if js_utils.is_jquery_activated(self.driver):
             self.execute_script(scroll_script)

seleniumbase/fixtures/constants.py

@@ -138,7 +138,11 @@ class Values:
     # Demo Mode has slow scrolling to see where you are on the page better.
     # However, a regular slow scroll takes too long to cover big distances.
     # If the scroll distance is greater than SSMD, a slow scroll speeds up.
-    SSMD = 900  # Smooth Scroll Minimum Distance (for advanced slow scroll)
+    SSMD = 500  # Smooth Scroll Minimum Distance (for advanced slow scroll)
+
+
+class Scroll:
+    Y_OFFSET = 182
 
 
 class Warnings:

seleniumbase/fixtures/js_utils.py

@@ -1002,7 +1002,7 @@ def get_scroll_distance_to_element(driver, element):
         scroll_position = driver.execute_script("return window.scrollY;")
         element_location = None
         element_location = element.location["y"]
-        element_location = element_location - 130
+        element_location = element_location - constants.Scroll.Y_OFFSET
         if element_location < 0:
             element_location = 0
         distance = element_location - scroll_position
@@ -1026,7 +1026,7 @@ def scroll_to_element(driver, element):
         screen_width = driver.get_window_size()["width"]
     except Exception:
         element_location_x = 0
-    element_location_y = element_location_y - 130
+    element_location_y = element_location_y - constants.Scroll.Y_OFFSET
     if element_location_y < 0:
         element_location_y = 0
     element_location_x_fix = element_location_x - 400
@@ -1052,16 +1052,27 @@ def slow_scroll_to_element(driver, element, browser):
         scroll_to_element(driver, element)
         return
     scroll_position = driver.execute_script("return window.scrollY;")
-    element_location = None
+    element_location_y = None
     try:
-        element_location = element.location["y"]
+        element_location_y = element.location["y"]
     except Exception:
         element.location_once_scrolled_into_view
         return
-    element_location = element_location - 130
-    if element_location < 0:
-        element_location = 0
-    distance = element_location - scroll_position
+    try:
+        element_location_x = element.location["x"]
+        element_width = element.size["width"]
+        screen_width = driver.get_window_size()["width"]
+    except Exception:
+        element_location_x = 0
+    element_location_y = element_location_y - constants.Scroll.Y_OFFSET
+    if element_location_y < 0:
+        element_location_y = 0
+    element_location_x_fix = element_location_x - 400
+    if element_location_x_fix < 0:
+        element_location_x_fix = 0
+    if element_location_x + element_width <= screen_width:
+        element_location_x_fix = 0
+    distance = element_location_y - scroll_position
     if distance != 0:
         total_steps = int(abs(distance) / 50.0) + 2.0
         step_value = float(distance) / total_steps
@@ -1072,7 +1083,9 @@ def slow_scroll_to_element(driver, element, browser):
             scroll_script = "window.scrollTo(0, %s);" % new_position
             driver.execute_script(scroll_script)
     time.sleep(0.01)
-    scroll_script = "window.scrollTo(0, %s);" % element_location
+    scroll_script = "window.scrollTo(%s, %s);" % (
+        element_location_x_fix, element_location_y
+    )
     driver.execute_script(scroll_script)
     time.sleep(0.01)
     if distance > 430 or distance < -300: