seleniumbase 4.47.6__tar.gz → 4.47.7__tar.gz

{seleniumbase-4.47.6/seleniumbase.egg-info → seleniumbase-4.47.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: seleniumbase
-Version: 4.47.6
+Version: 4.47.7
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -293,6 +293,7 @@ from seleniumbase import SB
 with SB(uc=True, test=True) as sb:
     url = "https://google.com/ncr"
     sb.activate_cdp_mode(url)
+    sb.click_if_visible('button:contains("Accept all")')
     sb.type('[name="q"]', "SeleniumBase GitHub page")
     sb.click('[value="Google Search"]')
     sb.sleep(4)  # The "AI Overview" sometimes loads

{seleniumbase-4.47.6 → seleniumbase-4.47.7}/README.md

@@ -93,6 +93,7 @@ from seleniumbase import SB
 with SB(uc=True, test=True) as sb:
     url = "https://google.com/ncr"
     sb.activate_cdp_mode(url)
+    sb.click_if_visible('button:contains("Accept all")')
     sb.type('[name="q"]', "SeleniumBase GitHub page")
     sb.click('[value="Google Search"]')
     sb.sleep(4)  # The "AI Overview" sometimes loads

{seleniumbase-4.47.6 → seleniumbase-4.47.7}/seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.47.6"
+__version__ = "4.47.7"

{seleniumbase-4.47.6 → seleniumbase-4.47.7}/seleniumbase/console_scripts/sb_mkdir.py

@@ -712,6 +712,9 @@ def main():
     data.append("        if not self.undetectable:")
     data.append("            self.get_new_driver(undetectable=True)")
     data.append('        self.open("https://google.com/ncr")')
+    data.append(
+        "        sb.click_if_visible('button:contains(\"Accept all\")')"
+    )
     data.append('        self.assert_title_contains("Google")')
     data.append("        self.save_screenshot_to_logs()")
     data.append('        self.type(HomePage.search_box, "github.com")')

{seleniumbase-4.47.6 → seleniumbase-4.47.7}/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-4.47.6 → seleniumbase-4.47.7}/seleniumbase/core/sb_cdp.py

@@ -66,6 +66,7 @@ class CDPMethods():
             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 @@ class CDPMethods():
             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,9 +806,9 @@ class CDPMethods():
             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 (
@@ -810,12 +816,24 @@ class CDPMethods():
                 "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 @@ class CDPMethods():
         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-4.47.6 → seleniumbase-4.47.7}/seleniumbase/plugins/sb_manager.py

@@ -13,6 +13,7 @@ from seleniumbase import SB
 with SB(uc=True, test=True) as sb:
     url = "https://google.com/ncr"
     sb.activate_cdp_mode(url)
+    sb.click_if_visible('button:contains("Accept all")')
     sb.type('[name="q"]', "SeleniumBase GitHub page")
     sb.click('[value="Google Search"]')
     sb.sleep(2)
@@ -148,6 +149,7 @@ def SB(
         with SB(uc=True, test=True) as sb:
             url = "https://google.com/ncr"
             sb.activate_cdp_mode(url)
+            sb.click_if_visible('button:contains("Accept all")')
             sb.type('[name="q"]', "SeleniumBase GitHub page")
             sb.click('[value="Google Search"]')
             sb.sleep(2)

{seleniumbase-4.47.6 → seleniumbase-4.47.7}/seleniumbase/undetected/cdp_driver/element.py

@@ -467,8 +467,8 @@ class Element:
                 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 @@ class Element:
             )
         )
 
+    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-4.47.6 → seleniumbase-4.47.7}/seleniumbase/undetected/cdp_driver/tab.py

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

{seleniumbase-4.47.6 → seleniumbase-4.47.7/seleniumbase.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: seleniumbase
-Version: 4.47.6
+Version: 4.47.7
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -293,6 +293,7 @@ from seleniumbase import SB
 with SB(uc=True, test=True) as sb:
     url = "https://google.com/ncr"
     sb.activate_cdp_mode(url)
+    sb.click_if_visible('button:contains("Accept all")')
     sb.type('[name="q"]', "SeleniumBase GitHub page")
     sb.click('[value="Google Search"]')
     sb.sleep(4)  # The "AI Overview" sometimes loads