Merge pull request #1242 from seleniumbase/improve-recorder-and-click-with-offset

Improve Recorder Mode and click_with_offset()

Author: mdmintz

help_docs/method_summary.md

@@ -130,7 +130,7 @@ self.click_if_visible(selector, by=By.CSS_SELECTOR)
 
 self.click_active_element()
 
-self.click_with_offset(selector, x, y, by=By.CSS_SELECTOR, mark=False, timeout=None)
+self.click_with_offset(selector, x, y, by=By.CSS_SELECTOR, mark=None, timeout=None)
 
 self.is_selected(selector, by=By.CSS_SELECTOR, timeout=None)
 # Duplicates: self.is_checked(selector, by=By.CSS_SELECTOR, timeout=None)

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "2.4.16"
+__version__ = "2.4.17"

seleniumbase/extensions/recorder.zip

@@ -1734,12 +1734,13 @@ def click_active_element(self):
             self.__slow_mode_pause_if_active()
 
     def click_with_offset(
-        self, selector, x, y, by=By.CSS_SELECTOR, mark=False, timeout=None
+        self, selector, x, y, by=By.CSS_SELECTOR, mark=None, timeout=None
     ):
         """
         Click an element at an {X,Y}-offset location.
         {0,0} is the top-left corner of the element.
         If mark==True, will draw a dot at location. (Useful for debugging)
+        In Demo Mode, mark becomes True unless set to False. (Default: None)
         """
         from selenium.webdriver.common.action_chains import ActionChains
 
@@ -1752,23 +1753,26 @@ def click_with_offset(
         element = page_actions.wait_for_element_visible(
             self.driver, selector, by, timeout
         )
-        self.__demo_mode_highlight_if_active(selector, by)
+        if self.demo_mode:
+            self.highlight(selector, by=by, loops=1)
+        elif self.slow_mode:
+            self.__slow_scroll_to_element(element)
+        if self.demo_mode and mark is None:
+            mark = True
         if mark:
             selector = self.convert_to_css_selector(selector, by=by)
             selector = re.escape(selector)
             selector = self.__escape_quotes_if_needed(selector)
-            px = x - 2
-            if px < 0:
-                px = 0
-            py = y - 2
-            if py < 0:
-                py = 0
+            px = x - 3
+            py = y - 3
             script = (
                 "var canvas = document.querySelector('%s');"
                 "var ctx = canvas.getContext('2d');"
+                "ctx.fillStyle = '#F8F808';"
+                "ctx.fillRect(%s, %s, 7, 7);"
                 "ctx.fillStyle = '#F80808';"
-                "ctx.fillRect(%s, %s, 5, 5);"
-                % (selector, px, py)
+                "ctx.fillRect(%s+1, %s+1, 5, 5);"
+                % (selector, px, py, px, py)
             )
             self.execute_script(script)
         try:
@@ -3739,6 +3743,19 @@ def __process_recorded_actions(self):
                     sb_actions.append('self.%s("%s")' % (method, action[1]))
                 else:
                     sb_actions.append("self.%s('%s')" % (method, action[1]))
+            elif action[0] == "canva":
+                method = "click_with_offset"
+                selector = action[1][0]
+                p_x = action[1][1]
+                p_y = action[1][2]
+                if '"' not in selector:
+                    sb_actions.append(
+                        'self.%s("%s", %s, %s)' % (method, selector, p_x, p_y)
+                    )
+                else:
+                    sb_actions.append(
+                        "self.%s('%s', %s, %s)" % (method, selector, p_x, p_y)
+                    )
             elif action[0] == "input" or action[0] == "js_ty":
                 method = "type"
                 if action[0] == "js_ty":

seleniumbase/fixtures/base_case.py

@@ -198,6 +198,7 @@
     basic_tags.push('h1');
     basic_tags.push('h2');
     basic_tags.push('h3');
+    basic_tags.push('canvas');
     basic_tags.push('center');
     basic_tags.push('input');
     basic_tags.push('textarea');
@@ -625,7 +626,7 @@
         }
         else
             document.recorded_actions.push(['click', selector, href, d_now]);
-        // hover_click() if dropdown.
+        // hover_click()
         if (el.parentElement.classList.contains('dropdown-content') &&
             el.parentElement.parentElement.classList.contains('dropdown'))
         {
@@ -641,6 +642,15 @@
             document.recorded_actions.pop();
             document.recorded_actions.push(['h_clk', pa_s, ch_s, d_now]);
         }
+        else if (tag_name === 'canvas')
+        {
+            rect = el.getBoundingClientRect();
+            p_x = event.clientX - rect.left;
+            p_y = event.clientY - rect.top;
+            c_offset = [selector, p_x, p_y];
+            document.recorded_actions.pop();
+            document.recorded_actions.push(['canva', c_offset, href, d_now]);
+        }
     }
     else if (ra_len > 0 &&
         document.recorded_actions[ra_len-1][0] === 'mo_dn' &&