Add timeout options to the click_if_visible() methods

Author: mdmintz

help_docs/method_summary.md

@@ -126,7 +126,7 @@ self.click_visible_elements(selector, by="css selector", limit=0, timeout=None)
 
 self.click_nth_visible_element(selector, number, by="css selector", timeout=None)
 
-self.click_if_visible(selector, by="css selector")
+self.click_if_visible(selector, by="css selector", timeout=0)
 
 self.click_active_element()
 
@@ -356,9 +356,9 @@ self.click_xpath(xpath)
 
 self.js_click(selector, by="css selector", all_matches=False, scroll=True)
 
-self.js_click_if_present(selector, by="css selector")
+self.js_click_if_present(selector, by="css selector", timeout=0)
 
-self.js_click_if_visible(selector, by="css selector")
+self.js_click_if_visible(selector, by="css selector", timeout=0)
 
 self.js_click_all(selector, by="css selector")
 

seleniumbase/fixtures/base_case.py

@@ -1902,13 +1902,24 @@ def click_nth_visible_element(
         ):
             self.__switch_to_newest_window_if_not_blank()
 
-    def click_if_visible(self, selector, by="css selector"):
+    def click_if_visible(self, selector, by="css selector", timeout=0):
         """If the page selector exists and is visible, clicks on the element.
         This method only clicks on the first matching element found.
-        (Use click_visible_elements() to click all matching elements.)"""
+        Use click_visible_elements() to click all matching elements.
+        If a "timeout" is provided, waits that long for the element
+        to appear before giving up and returning without a click()."""
         self.wait_for_ready_state_complete()
         if self.is_element_visible(selector, by=by):
             self.click(selector, by=by)
+        elif timeout > 0:
+            try:
+                self.wait_for_element_visible(
+                    selector, by=by, timeout=timeout
+                )
+            except Exception:
+                pass
+            if self.is_element_visible(selector, by=by):
+                self.click(selector, by=by)
 
     def click_active_element(self):
         self.wait_for_ready_state_complete()
@@ -5292,19 +5303,41 @@ def js_click(
             pass
         self.__demo_mode_pause_if_active()
 
-    def js_click_if_present(self, selector, by="css selector"):
+    def js_click_if_present(self, selector, by="css selector", timeout=0):
         """If the page selector exists, js_click() the element.
-        This method only clicks on the first matching element found."""
+        This method only clicks on the first matching element found.
+        If a "timeout" is provided, waits that long for the element to
+        be present before giving up and returning without a js_click()."""
         self.wait_for_ready_state_complete()
         if self.is_element_present(selector, by=by):
             self.js_click(selector, by=by)
+        elif timeout > 0:
+            try:
+                self.wait_for_element_present(
+                    selector, by=by, timeout=timeout
+                )
+            except Exception:
+                pass
+            if self.is_element_present(selector, by=by):
+                self.js_click(selector, by=by)
 
-    def js_click_if_visible(self, selector, by="css selector"):
+    def js_click_if_visible(self, selector, by="css selector", timeout=0):
         """If the page selector exists and is visible, js_click() the element.
-        This method only clicks on the first matching element found."""
+        This method only clicks on the first matching element found.
+        If a "timeout" is provided, waits that long for the element
+        to appear before giving up and returning without a js_click()."""
         self.wait_for_ready_state_complete()
         if self.is_element_visible(selector, by=by):
             self.js_click(selector, by=by)
+        elif timeout > 0:
+            try:
+                self.wait_for_element_visible(
+                    selector, by=by, timeout=timeout
+                )
+            except Exception:
+                pass
+            if self.is_element_visible(selector, by=by):
+                self.js_click(selector, by=by)
 
     def js_click_all(self, selector, by="css selector"):
         """Clicks all matching elements using pure JS. (No jQuery)"""