feat: implement context click (#302)

Kaartje2go · Oct 26, 2022 · 31d2987 · 31d2987
1 parent fcc3569
commit 31d2987
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/packages/dullahan-adapter-playwright/src/DullahanAdapterPlaywright.ts b/packages/dullahan-adapter-playwright/src/DullahanAdapterPlaywright.ts
@@ -503,7 +503,7 @@ export default class DullahanAdapterPlaywright extends DullahanAdapter<DullahanA
         });
     }
 
-    public async click(selector: string): Promise<void> {
+    public async click(selector: string, button: 'left' | 'right' = 'left'): Promise<void> {
         const {page} = this;
 
         if (!page) {
@@ -527,7 +527,7 @@ export default class DullahanAdapterPlaywright extends DullahanAdapter<DullahanA
             throw new AdapterError(DullahanErrorMessage.findElementResult(findOptions));
         }
 
-        await element.click();
+        await element.click({ button });
     }
 
     public async clickAt(x: number, y: number): Promise<void> {

diff --git a/packages/dullahan-adapter-puppeteer/src/DullahanAdapterPuppeteer.ts b/packages/dullahan-adapter-puppeteer/src/DullahanAdapterPuppeteer.ts
@@ -513,7 +513,7 @@ export default class DullahanAdapterPuppeteer extends DullahanAdapter<DullahanAd
         });
     }
 
-    public async click(selector: string): Promise<void> {
+    public async click(selector: string, button: 'left' | 'right' = 'left'): Promise<void> {
         const {page, options: {useTouch}} = this;
 
         if (!page) {
@@ -541,7 +541,7 @@ export default class DullahanAdapterPuppeteer extends DullahanAdapter<DullahanAd
             return element.tap();
         }
 
-        await element.click();
+        await element.click({ button });
     }
 
     public async clickAt(x: number, y: number): Promise<void> {

diff --git a/packages/dullahan-adapter-selenium-4/src/DullahanAdapterSelenium4.ts b/packages/dullahan-adapter-selenium-4/src/DullahanAdapterSelenium4.ts
@@ -615,7 +615,7 @@ export default class DullahanAdapterSelenium4 extends DullahanAdapter<DullahanAd
         }), timeout);
     }
 
-    public async click(selector: string): Promise<void> {
+    public async click(selector: string, button: 'left' | 'right' = 'left'): Promise<void> {
         const {driver, supportsPromises, options:{useActions}} = this;
 
         if (!driver) {
@@ -652,13 +652,21 @@ export default class DullahanAdapterSelenium4 extends DullahanAdapter<DullahanAd
             await driver.executeScript<void>(emitFakeEvent, 'mousemove', x, y, element);
             await driver.executeScript<void>(emitFakeEvent, 'mousedown', x, y, element);
             await driver.executeScript<void>(emitFakeEvent, 'mouseup', x, y, element);
+            if (button === 'right') {
+                return driver.executeScript<void>(emitFakeEvent, 'contextmenu', x, y, element);
+            }
             return driver.executeScript<void>(emitFakeEvent, 'click', x, y, element);
         }
 
-        await driver.actions().move({
+        let intermediate = driver.actions().move({
             origin: element,
             duration: 0
-        }).click().perform();
+        });
+        if (button === 'right') {
+            await intermediate.contextClick().perform();
+        } else {
+            await intermediate.click().perform();
+        }
     }
 
     public async clickAt(x: number, y: number): Promise<void> {
@@ -1109,12 +1117,12 @@ export default class DullahanAdapterSelenium4 extends DullahanAdapter<DullahanAd
 
         if (seleniumRemoteUrl) {
             const builder = new Builder().forBrowser(browserName, browserVersion).usingServer(seleniumRemoteUrl);
-            
+
             builder.usingHttpAgent(new Agent({
                 keepAlive: true,
                 keepAliveMsecs: 30 * 1000
             }));
-            
+
             builder.withCapabilities(builder.getCapabilities().merge({
                 browser: browserName,
                 browser_version: browserVersion

diff --git a/packages/dullahan/src/adapter/DullahanAdapter.ts b/packages/dullahan/src/adapter/DullahanAdapter.ts
@@ -53,7 +53,7 @@ export abstract class DullahanAdapter<
 
     public abstract clearText(selector: string, count: number): Promise<void>;
 
-    public abstract click(selector: string): Promise<void>;
+    public abstract click(selector: string, button?: 'left' | 'right'): Promise<void>;
 
     public abstract clickAt(x: number, y: number): Promise<void>;
 

diff --git a/packages/dullahan/src/browser_helpers/emitFakeEvent.ts b/packages/dullahan/src/browser_helpers/emitFakeEvent.ts
@@ -1,4 +1,4 @@
-type MouseEvents = 'mousedown' | 'mouseup' | 'click' | 'mousemove';
+type MouseEvents = 'mousedown' | 'mouseup' | 'click' | 'mousemove' | 'contextmenu';
 
 export type EmitFakeEventOptions = {
     type: MouseEvents;