Update CDP Mode

Author: mdmintz

examples/cdp_mode/ReadMe.md

@@ -559,9 +559,9 @@ sb.cdp.assert_equal(first, second)
 sb.cdp.assert_not_equal(first, second)
 sb.cdp.assert_in(first, second)
 sb.cdp.assert_not_in(first, second)
+sb.cdp.js_scroll_into_view(selector)
 sb.cdp.scroll_into_view(selector)
 sb.cdp.scroll_to_y(y)
-sb.cdp.scroll_by_y(y)
 sb.cdp.scroll_to_top()
 sb.cdp.scroll_to_bottom()
 sb.cdp.scroll_up(amount=25)
@@ -730,6 +730,7 @@ element.flash(duration=0.5, color="EE4488")
 element.focus()
 element.gui_click(timeframe=0.25)
 element.highlight_overlay()
+element.is_in_viewport()
 element.mouse_click()
 element.mouse_drag(destination)
 element.mouse_move()

help_docs/cdp_mode_methods.md

@@ -187,8 +187,8 @@ sb.cdp.assert_equal(first, second)
 sb.cdp.assert_not_equal(first, second)
 sb.cdp.assert_in(first, second)
 sb.cdp.assert_not_in(first, second)
+sb.cdp.js_scroll_into_view(selector)
 sb.cdp.scroll_into_view(selector)
-sb.cdp.scroll_to_y(y)
 sb.cdp.scroll_by_y(y)
 sb.cdp.scroll_to_top()
 sb.cdp.scroll_to_bottom()
@@ -358,6 +358,7 @@ element.flash(duration=0.5, color="EE4488")
 element.focus()
 element.gui_click(timeframe=0.25)
 element.highlight_overlay()
+element.is_in_viewport()
 element.mouse_click()
 element.mouse_drag(destination)
 element.mouse_move()

seleniumbase/core/browser_launcher.py

@@ -942,6 +942,7 @@ def uc_open_with_cdp_mode(driver, url=None, **kwargs):
     cdp.assert_not_equal = CDPM.assert_not_equal
     cdp.assert_in = CDPM.assert_in
     cdp.assert_not_in = CDPM.assert_not_in
+    cdp.js_scroll_into_view = CDPM.js_scroll_into_view
     cdp.scroll_into_view = CDPM.scroll_into_view
     cdp.scroll_to_y = CDPM.scroll_to_y
     cdp.scroll_by_y = CDPM.scroll_by_y

seleniumbase/core/sb_cdp.py

@@ -66,6 +66,7 @@ def __add_sync_methods(self, element):
             lambda *args, **kwargs: self.__gui_click(element, *args, **kwargs)
         )
         element.highlight_overlay = lambda: self.__highlight_overlay(element)
+        element.is_in_viewport = lambda: self.__is_in_viewport(element)
         element.mouse_click = lambda: self.__mouse_click(element)
         element.click_with_offset = (
             lambda *args, **kwargs: self.__mouse_click_with_offset_async(
@@ -543,6 +544,11 @@ def __highlight_overlay(self, element):
             self.loop.run_until_complete(element.highlight_overlay_async())
         )
 
+    def __is_in_viewport(self, element):
+        return (
+            self.loop.run_until_complete(element.is_in_viewport_async())
+        )
+
     def __mouse_click(self, element):
         result = (
             self.loop.run_until_complete(element.mouse_click_async())
@@ -800,22 +806,34 @@ def click(self, selector, timeout=None, scroll=True):
             timeout = settings.SMALL_TIMEOUT
         self.__slow_mode_pause_if_set()
         element = self.find_element(selector, timeout=timeout)
-        if scroll:
-            element.scroll_into_view()
         tag_name = element.tag_name
+        current_url = self.get_current_url()
+
         if tag_name:
             tag_name = tag_name.lower().strip()
         if (
             tag_name in [
                 "a", "button", "canvas", "div", "input", "li", "span", "label"
             ]
             and "contains(" not in selector
+            and "://google" not in current_url
+            and "://www.google" not in current_url
         ):
+            if scroll:
+                element.scroll_into_view()
             try:
                 element.mouse_click()  # Simulated click (NOT PyAutoGUI)
             except Exception:
                 element.click()  # Standard CDP click
         else:
+            if scroll:
+                if "contains(" in selector:
+                    element.scroll_into_view()
+                else:
+                    try:
+                        self.js_scroll_into_view(selector)
+                    except Exception:
+                        element.scroll_into_view()
             element.click()  # Standard CDP click
         self.__slow_mode_pause_if_set()
         self.loop.run_until_complete(self.page.wait(0.2))
@@ -3109,6 +3127,17 @@ def assert_not_in(self, first, second):
         if first in second:
             raise AssertionError("%s is in %s" % (first, second))
 
+    def js_scroll_into_view(self, selector):
+        css_selector = self.__convert_to_css_if_xpath(selector)
+        css_selector = re.escape(css_selector)  # Add "\\" to special chars
+        css_selector = js_utils.escape_quotes_if_needed(css_selector)
+        js_code = (
+            "document.querySelector('%s')?.scrollIntoView();"
+            % css_selector
+        )
+        with suppress(Exception):
+            self.loop.run_until_complete(self.page.evaluate(js_code))
+
     def scroll_into_view(self, selector):
         self.find_element(selector).scroll_into_view()
         self.loop.run_until_complete(self.page.wait(0.1))

seleniumbase/undetected/cdp_driver/element.py

@@ -467,8 +467,8 @@ async def get_position_async(self, abs=False) -> Position:
                 raise Exception("Could not find position for %s " % self)
             pos = Position(quads[0])
             if abs:
-                scroll_y = (await self.tab.evaluate("window.scrollY")).value
-                scroll_x = (await self.tab.evaluate("window.scrollX")).value
+                scroll_y = (await self.tab.evaluate("window.scrollY"))
+                scroll_x = (await self.tab.evaluate("window.scrollX"))
                 abs_x = pos.left + scroll_x + (pos.width / 2)
                 abs_y = pos.top + scroll_y + (pos.height / 2)
                 pos.abs_x = abs_x
@@ -717,6 +717,31 @@ async def mouse_drag_async(
             )
         )
 
+    async def is_in_viewport_async(self):
+        try:
+            layout = await self.tab.send(
+                cdp.page.get_layout_metrics()
+            )
+            viewport = layout[4]
+            v_left = viewport.page_x
+            v_top = viewport.page_y
+            v_right = v_left + viewport.client_width
+            v_bottom = v_top + viewport.client_height
+            box = await self.tab.send(
+                cdp.dom.get_box_model(backend_node_id=self.backend_node_id)
+            )
+            quad = box.content
+            e_left = min(quad[0], quad[2], quad[4], quad[6])
+            e_top = min(quad[1], quad[3], quad[5], quad[7])
+            e_right = max(quad[0], quad[2], quad[4], quad[6])
+            e_bottom = max(quad[1], quad[3], quad[5], quad[7])
+            return (
+                e_left >= v_left and e_right <= v_right
+                and e_top >= v_top and e_bottom <= v_bottom
+            )
+        except Exception:
+            return False
+
     async def scroll_into_view_async(self):
         """Scrolls element into view."""
         try:

seleniumbase/undetected/cdp_driver/tab.py

@@ -226,7 +226,6 @@ async def find(
         except (Exception, TypeError):
             pass
         while not item:
-            await self
             item = await self.find_element_by_text(
                 text, best_match, return_enclosing_element
             )