Skip to content

Commit f441f22

Browse files
revert base page
1 parent f4cc099 commit f441f22

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

modules/page_base.py

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
from typing import List, Union
1212

1313
from pynput.keyboard import Controller, Key
14-
from pynput.mouse import Button
15-
from pynput.mouse import Controller as MouseController
14+
from pynput.mouse import Button, Controller as MouseController
1615
from pypom import Page
1716
from selenium.common import NoAlertPresentException
1817
from selenium.common.exceptions import (
@@ -560,9 +559,7 @@ def triple_click(self, reference: Union[str, tuple, WebElement], labels=[]) -> P
560559
"""Actions helper: perform triple-click on a given element"""
561560
return self.multi_click(3, reference, labels)
562561

563-
def control_click(
564-
self, reference: Union[str, tuple, WebElement], labels=[]
565-
) -> Page:
562+
def control_click(self, reference: Union[str, tuple, WebElement], labels=[]) -> Page:
566563
"""Actions helper: perform control-click on given element"""
567564
element = self.fetch(reference, labels)
568565
if self.sys_platform() == "Darwin":
@@ -572,7 +569,7 @@ def control_click(
572569
self.actions.key_down(mod_key).click(element).key_up(mod_key).perform()
573570
return self
574571

575-
def middle_click(self, reference: Union[str, tuple, WebElement], labels=[]):
572+
def middle_click(self, reference: Union[str, tuple, WebElement], labels =[]):
576573
"""Perform a middle mouse click on desired element"""
577574
with self.driver.context(self.driver.CONTEXT_CONTENT):
578575
self.driver.maximize_window()
@@ -587,23 +584,14 @@ def middle_click(self, reference: Union[str, tuple, WebElement], labels=[]):
587584
outer_height = self.driver.execute_script("return window.outerHeight;")
588585
chrome_height = outer_height - inner_height
589586

590-
element_x = (
591-
window_position["x"]
592-
+ element_location["x"]
593-
+ (element_size["width"] / 2)
594-
)
595-
element_y = (
596-
window_position["y"]
597-
+ element_location["y"]
598-
+ (element_size["height"] / 2)
599-
+ chrome_height
600-
)
587+
element_x = window_position['x'] + element_location['x'] + (element_size['width'] / 2)
588+
element_y = window_position['y'] + element_location['y'] + (element_size['height'] / 2) + chrome_height
601589
mouse.position = (element_x, element_y)
602590

603591
time.sleep(1)
604592
mouse.click(Button.middle, 1)
605593
return self
606-
594+
607595
def context_click(
608596
self, reference: Union[str, tuple, WebElement], labels=[]
609597
) -> Page:

0 commit comments

Comments
 (0)