Moved to using public method for wrapped element

Author: emanlove

src/SeleniumLibrary/keywords/element.py

@@ -17,7 +17,7 @@
 from typing import List, Optional, Tuple, Union
 
 from SeleniumLibrary.utils import is_noney
-from SeleniumLibrary.utils.events.event import _unwrap_eventfiring_elements
+from SeleniumLibrary.utils.events.event import _unwrap_eventfiring_element
 from robot.utils import plural_or_not, is_truthy
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.keys import Keys
@@ -642,7 +642,8 @@ def _click_with_action_chain(self, locator):
         self.info(f"Clicking '{locator}' using an action chain.")
         action = ActionChains(self.driver)
         element = self.find_element(locator)
-        element = _unwrap_eventfiring_elements(self.driver, element)
+        # _unwrap_eventfiring_element can be removed when minimum required Selenium is 4.0 or greater.
+        element = _unwrap_eventfiring_element(element)
         action.move_to_element(element)
         action.click()
         action.perform()
@@ -658,7 +659,8 @@ def _click_with_modifier(self, locator, tag, modifier):
         element = self.find_element(locator, tag=tag[0], required=False)
         if not element:
             element = self.find_element(locator, tag=tag[1])
-        element = _unwrap_eventfiring_elements(self.driver, element)
+        # _unwrap_eventfiring_element can be removed when minimum required Selenium is 4.0 or greater.
+        element = _unwrap_eventfiring_element(element)
         action.click(element)
         for item in modifier:
             action.key_up(item)
@@ -678,15 +680,10 @@ def click_element_at_coordinates(self, locator, xoffset, yoffset):
             f"Clicking element '{locator}' at coordinates x={xoffset}, y={yoffset}."
         )
         element = self.find_element(locator)
-        element = _unwrap_eventfiring_elements(self.driver,element)
+        # _unwrap_eventfiring_element can be removed when minimum required Selenium is 4.0 or greater.
+        element = _unwrap_eventfiring_element(element)
         action = ActionChains(self.driver)
-        # Try/except can be removed when minimum required Selenium is 4.0 or greater.
-        #try:
         action.move_to_element(element)
-        #except AttributeError:
-        #    self.debug("Workaround for Selenium 3 bug.")
-        #    element = element.wrapped_element
-        #    action.move_to_element(element)
         action.move_by_offset(xoffset, yoffset)
         action.click()
         action.perform()
@@ -700,7 +697,8 @@ def double_click_element(self, locator: str):
         """
         self.info(f"Double clicking element '{locator}'.")
         element = self.find_element(locator)
-        element = _unwrap_eventfiring_elements(self.driver, element)
+        # _unwrap_eventfiring_element can be removed when minimum required Selenium is 4.0 or greater.
+        element = _unwrap_eventfiring_element(element)
         action = ActionChains(self.driver)
         action.double_click(element).perform()
 
@@ -726,14 +724,9 @@ def scroll_element_into_view(self, locator: str):
         New in SeleniumLibrary 3.2.0
         """
         element = self.find_element(locator)
-        element = _unwrap_eventfiring_elements(self.driver, element)
-        # Try/except can be removed when minimum required Selenium is 4.0 or greater.
-        #try:
+        # _unwrap_eventfiring_element can be removed when minimum required Selenium is 4.0 or greater.
+        element = _unwrap_eventfiring_element(element)
         ActionChains(self.driver).move_to_element(element).perform()
-        #except AttributeError:
-        #    self.debug("Workaround for Selenium 3 bug.")
-        #    element = element.wrapped_element
-        #    ActionChains(self.driver).move_to_element(element).perform()
 
     @keyword
     def drag_and_drop(self, locator: str, target: str):
@@ -747,8 +740,11 @@ def drag_and_drop(self, locator: str, target: str):
         | `Drag And Drop` | css:div#element | css:div.target |
         """
         element = self.find_element(locator)
-        element = _unwrap_eventfiring_elements(self.driver, element)
+        # _unwrap_eventfiring_element can be removed when minimum required Selenium is 4.0 or greater.
+        element = _unwrap_eventfiring_element(element)
         target = self.find_element(target)
+        # _unwrap_eventfiring_element can be removed when minimum required Selenium is 4.0 or greater.
+        target = _unwrap_eventfiring_element(target)
         action = ActionChains(self.driver)
         action.drag_and_drop(element, target).perform()
 
@@ -766,7 +762,8 @@ def drag_and_drop_by_offset(self, locator: str, xoffset: int, yoffset: int):
         | `Drag And Drop By Offset` | myElem | 50 | -35 | # Move myElem 50px right and 35px down |
         """
         element = self.find_element(locator)
-        element = _unwrap_eventfiring_elements(self.driver, element)
+        # _unwrap_eventfiring_element can be removed when minimum required Selenium is 4.0 or greater.
+        element = _unwrap_eventfiring_element(element)
         action = ActionChains(self.driver)
         action.drag_and_drop_by_offset(element, xoffset, yoffset)
         action.perform()
@@ -785,7 +782,8 @@ def mouse_down(self, locator: str):
         """
         self.info(f"Simulating Mouse Down on element '{locator}'.")
         element = self.find_element(locator)
-        element = _unwrap_eventfiring_elements(self.driver, element)
+        # _unwrap_eventfiring_element can be removed when minimum required Selenium is 4.0 or greater.
+        element = _unwrap_eventfiring_element(element)
         action = ActionChains(self.driver)
         action.click_and_hold(element).perform()
 
@@ -798,18 +796,13 @@ def mouse_out(self, locator: str):
         """
         self.info(f"Simulating Mouse Out on element '{locator}'.")
         element = self.find_element(locator)
-        element = _unwrap_eventfiring_elements(self.driver, element)
+        # _unwrap_eventfiring_element can be removed when minimum required Selenium is 4.0 or greater.
+        element = _unwrap_eventfiring_element(element)
         size = element.size
         offsetx = (size["width"] / 2) + 1
         offsety = (size["height"] / 2) + 1
         action = ActionChains(self.driver)
-        # Try/except can be removed when minimum required Selenium is 4.0 or greater.
-        #try:
         action.move_to_element(element)
-        #except AttributeError:
-        #    self.debug("Workaround for Selenium 3 bug.")
-        #    element = element.wrapped_element
-        #    action.move_to_element(element)
         action.move_by_offset(offsetx, offsety)
         action.perform()
 
@@ -822,15 +815,10 @@ def mouse_over(self, locator: str):
         """
         self.info(f"Simulating Mouse Over on element '{locator}'.")
         element = self.find_element(locator)
-        element = _unwrap_eventfiring_elements(self.driver,element)
+        # _unwrap_eventfiring_element can be removed when minimum required Selenium is 4.0 or greater.
+        element = _unwrap_eventfiring_element(element)
         action = ActionChains(self.driver)
-        # Try/except can be removed when minimum required Selenium is 4.0 or greater.
-        #try:
         action.move_to_element(element).perform()
-        #except AttributeError:
-        #    self.debug("Workaround for Selenium 3 bug.")
-        #    element = element.wrapped_element
-        #    action.move_to_element(element).perform()
 
     @keyword
     def mouse_up(self, locator: str):
@@ -841,14 +829,16 @@ def mouse_up(self, locator: str):
         """
         self.info(f"Simulating Mouse Up on element '{locator}'.")
         element = self.find_element(locator)
-        element = _unwrap_eventfiring_elements(self.driver, element)
+        # _unwrap_eventfiring_element can be removed when minimum required Selenium is 4.0 or greater.
+        element = _unwrap_eventfiring_element(element)
         ActionChains(self.driver).release(element).perform()
 
     @keyword
     def open_context_menu(self, locator: str):
         """Opens the context menu on the element identified by ``locator``."""
         element = self.find_element(locator)
-        element = _unwrap_eventfiring_elements(self.driver, element)
+        # _unwrap_eventfiring_element can be removed when minimum required Selenium is 4.0 or greater.
+        element = _unwrap_eventfiring_element(element)
         action = ActionChains(self.driver)
         action.context_click(element).perform()
 
@@ -937,7 +927,8 @@ def press_keys(self, locator: Optional[str] = None, *keys: str):
         if not is_noney(locator):
             self.info(f"Sending key(s) {keys} to {locator} element.")
             element = self.find_element(locator)
-            element = _unwrap_eventfiring_elements(self.driver, element)
+            # _unwrap_eventfiring_element can be removed when minimum required Selenium is 4.0 or greater.
+            element = _unwrap_eventfiring_element(element)
             ActionChains(self.driver).click(element).perform()
         else:
             self.info(f"Sending key(s) {keys} to page.")
@@ -991,7 +982,8 @@ def mouse_down_on_link(self, locator: str):
         using ``id``, ``name``, ``href`` and the link text.
         """
         element = self.find_element(locator, tag="link")
-        element = _unwrap_eventfiring_elements(self.driver, element)
+        # _unwrap_eventfiring_element can be removed when minimum required Selenium is 4.0 or greater.
+        element = _unwrap_eventfiring_element(element)
         action = ActionChains(self.driver)
         action.click_and_hold(element).perform()
 
@@ -1034,7 +1026,8 @@ def mouse_down_on_image(self, locator: str):
         using ``id``, ``name``, ``src`` and ``alt``.
         """
         element = self.find_element(locator, tag="image")
-        element = _unwrap_eventfiring_elements(self.driver, element)
+        # _unwrap_eventfiring_element can be removed when minimum required Selenium is 4.0 or greater.
+        element = _unwrap_eventfiring_element(element)
         action = ActionChains(self.driver)
         action.click_and_hold(element).perform()
 

src/SeleniumLibrary/utils/events/event.py

@@ -15,14 +15,15 @@
 # limitations under the License.
 
 import abc
-from selenium.webdriver.support.event_firing_webdriver import EventFiringWebDriver
+from selenium.webdriver.support.event_firing_webdriver import EventFiringWebElement
+from robot.api import logger
 
 class Event:
     @abc.abstractmethod
     def trigger(self, *args, **kwargs):
         pass
 
-def _unwrap_eventfiring_elements(ef_driver,elements):
+def  _unwrap_eventfiring_element(element):
     """ Workaround for Selenium 3 bug.
 
         References:
@@ -32,11 +33,11 @@ def _unwrap_eventfiring_elements(ef_driver,elements):
         https://github.com/SeleniumHQ/selenium/issues/6604
 
     """
-    if not isinstance(ef_driver,EventFiringWebDriver) or selenium_major_version() >= 4:
-        return elements
-    unwrapped_elements = ef_driver._unwrap_element_args(elements)
-    return unwrapped_elements
-
+    logger.debug("Workaround for Selenium 3 bug.")
+    if not isinstance(element,EventFiringWebElement) or selenium_major_version() >= 4:
+        return element
+    return element.wrapped_element
+    
 def selenium_major_version():
     import selenium
     selenium_version = selenium.__version__