From a251faf8f7f9e0bde2acfbcd320d54b8869c4412 Mon Sep 17 00:00:00 2001
From: HarelM <harel.mazor@gmail.com>
Date: Thu, 9 Jul 2026 14:27:33 +0300
Subject: [PATCH] improve abstraction

---
 e2e/layer-editor.spec.ts | 11 ++-----
 e2e/layers-list.spec.ts  |  2 +-
 e2e/maputnik-driver.ts   | 62 ++++++++++++++++++----------------------
 e2e/modal-driver.ts      | 14 ++++-----
 e2e/modals.spec.ts       |  2 +-
 5 files changed, 39 insertions(+), 52 deletions(-)

diff --git a/e2e/layer-editor.spec.ts b/e2e/layer-editor.spec.ts
index 6729a254..c510315b 100644
--- a/e2e/layer-editor.spec.ts
+++ b/e2e/layer-editor.spec.ts
@@ -176,9 +176,7 @@ describe("layer editor", () => {
       await when.collapseGroupInLayerEditor();
       await when.collapseGroupInLayerEditor(1);
       await when.collapseGroupInLayerEditor(2);
-      await when.doWithin("spec-field:text-font", async () => {
-        await get.element(".maputnik-autocomplete input").first().click();
-      });
+      await when.clickWithin("spec-field:text-font", ".maputnik-autocomplete input");
       await then(get.element(".maputnik-autocomplete-menu-item")).shouldBeVisible();
       await then(get.element(".maputnik-autocomplete-menu-item")).shouldHaveLength(3);
     });
@@ -202,8 +200,7 @@ describe("layer editor", () => {
         layers: [{ id, type: "circle", source: "example" }],
       });
 
-      const sourceText = get.elementByText('"source"');
-      await sourceText.click();
+      await when.clickByText('"source"');
       await when.typeKeys('"');
 
       await then(get.element(".cm-lint-marker-error")).shouldExist();
@@ -239,9 +236,7 @@ describe("layer editor", () => {
       const header = get.elementByTestId("layer-editor.header");
       await then(header).shouldBeVisible();
 
-      await get
-        .element(".maputnik-scroll-container")
-        .evaluate((el) => el.scrollTo(0, el.scrollHeight));
+      await when.scrollToBottom(get.element(".maputnik-scroll-container"));
       await when.wait(200);
 
       await then(header).shouldBeVisible();
diff --git a/e2e/layers-list.spec.ts b/e2e/layers-list.spec.ts
index edc30b3b..786a1b3d 100644
--- a/e2e/layers-list.spec.ts
+++ b/e2e/layers-list.spec.ts
@@ -342,7 +342,7 @@ describe("layers list", () => {
       await then(header).shouldBeVisible();
 
       // Scroll the layer list container
-      await get.elementByTestId("layer-list").evaluate((el) => el.scrollTo(0, el.scrollHeight));
+      await when.scrollToBottom(get.elementByTestId("layer-list"));
       await when.wait(200);
       await then(header).shouldBeVisible();
       await then(get.elementByTestId("layer-list:add-layer")).shouldBeVisible();
diff --git a/e2e/maputnik-driver.ts b/e2e/maputnik-driver.ts
index 08463a4e..c08460c9 100644
--- a/e2e/maputnik-driver.ts
+++ b/e2e/maputnik-driver.ts
@@ -203,7 +203,6 @@ async function centerOf(locator: Locator): Promise<{ x: number; y: number }> {
 }
 
 export class MaputnikDriver {
-  private scope: Locator | null = null;
   private readonly recordedRequests = new Map<string, Request[]>();
   private readonly modalDriver = new ModalDriver(this);
 
@@ -217,12 +216,8 @@ export class MaputnikDriver {
 
   // ---- Element access ------------------------------------------------------
 
-  private root(): Page | Locator {
-    return this.scope ?? this.page;
-  }
-
   private testId(testId: string): Locator {
-    return this.root().locator(testIdSelector(testId));
+    return this.page.locator(testIdSelector(testId));
   }
 
   then = <T>(target: T) => new MaputnikAssertable(target, this.page);
@@ -307,16 +302,6 @@ export class MaputnikDriver {
 
     typeKeys: (keys: string) => typeSequence(this.page, keys),
 
-    doWithin: async (selector: string, fn: () => Promise<void> | void) => {
-      const previous = this.scope;
-      this.scope = (previous ?? this.page).locator(testIdSelector(selector));
-      try {
-        await fn();
-      } finally {
-        this.scope = previous;
-      }
-    },
-
     click: async (testId: string, index = 0) => {
       // Documentation buttons are wrapped in a <label>/.maputnik-doc-target that
       // Playwright treats as intercepting the click; bypass the check for them.
@@ -345,7 +330,23 @@ export class MaputnikDriver {
     },
 
     selectWithin: async (selector: string, value: string) => {
-      await this.root().locator(testIdSelector(selector)).locator("select").selectOption(value);
+      await this.testId(selector).locator("select").selectOption(value);
+    },
+
+    clickWithin: async (parentTestId: string, selector: string) => {
+      await this.testId(parentTestId).locator(selector).first().click();
+    },
+
+    clickByText: async (text: string) => {
+      await this.page.getByText(text).click();
+    },
+
+    clickByAttribute: async (attribute: string, value: string) => {
+      await this.page.locator(`[${attribute}="${value}"]`).click();
+    },
+
+    scrollToBottom: async (element: Locator) => {
+      await element.evaluate((el) => el.scrollTo(0, el.scrollHeight));
     },
 
     setValue: async (testId: string, text: string) => {
@@ -364,20 +365,18 @@ export class MaputnikDriver {
     },
 
     setValueToPropertyArray: async (selector: string, value: string) => {
-      await this.when.doWithin(selector, async () => {
-        const input = this.root().locator(".maputnik-array-block-content input").last();
-        await input.focus();
-        await typeSequence(this.page, "{selectall}" + value);
-      });
+      const block = this.testId(selector);
+      const input = block.locator(".maputnik-array-block-content input").last();
+      await input.focus();
+      await typeSequence(this.page, "{selectall}" + value);
     },
 
     addValueToPropertyArray: async (selector: string, value: string) => {
-      await this.when.doWithin(selector, async () => {
-        await this.root().locator(".maputnik-array-add-value").click();
-        const input = this.root().locator(".maputnik-array-block-content input").last();
-        await input.focus();
-        await typeSequence(this.page, "{selectall}" + value);
-      });
+      const block = this.testId(selector);
+      await block.locator(".maputnik-array-add-value").click();
+      const input = block.locator(".maputnik-array-block-content input").last();
+      await input.focus();
+      await typeSequence(this.page, "{selectall}" + value);
     },
 
     setStyle: async (
@@ -525,15 +524,10 @@ export class MaputnikDriver {
   public get = {
     isMac: () => isMac,
 
-    element: (selector: string) => this.root().locator(selector),
+    element: (selector: string) => this.page.locator(selector),
 
     elementByTestId: (testId: string) => this.testId(testId),
 
-    elementByText: (text: string) => this.root().getByText(text),
-
-    elementByAttribute: (attribute: string, value: string) =>
-      this.root().locator(`[${attribute}="${value}"]`),
-
     canvas: () => this.page.locator("canvas"),
 
     searchControl: () => this.page.locator(".maplibregl-ctrl-geocoder"),
diff --git a/e2e/modal-driver.ts b/e2e/modal-driver.ts
index aa567299..43d6a432 100644
--- a/e2e/modal-driver.ts
+++ b/e2e/modal-driver.ts
@@ -14,14 +14,12 @@ export class ModalDriver {
       await when.type("add-layer.layer-id.input", id);
 
       if (opts.layer) {
-        await when.doWithin("add-layer.layer-source-block", async () => {
-          const input = get.element("input");
-          await input.click();
-          await input.fill(opts.layer!);
-          // The source input is a controlled downshift combobox; wait for React
-          // to settle on the typed value before submitting.
-          await expect(input).toHaveValue(opts.layer!);
-        });
+        const input = get.elementByTestId("add-layer.layer-source-block").locator("input");
+        await input.click();
+        await input.fill(opts.layer);
+        // The source input is a controlled downshift combobox; wait for React to
+        // settle on the typed value before submitting.
+        await expect(input).toHaveValue(opts.layer);
         // Close the autocomplete menu so it does not intercept the add button.
         await get.elementByTestId("add-layer.layer-id.input").click();
       }
diff --git a/e2e/modals.spec.ts b/e2e/modals.spec.ts
index 03e34bcf..a1533cf7 100644
--- a/e2e/modals.spec.ts
+++ b/e2e/modals.spec.ts
@@ -271,7 +271,7 @@ describe("modals", () => {
       await when.click("modal:settings.close-modal");
       await when.click("nav:open");
 
-      await get.elementByAttribute("aria-label", "MapTiler Basic").click();
+      await when.clickByAttribute("aria-label", "MapTiler Basic");
       await when.wait(1000);
       await when.click("nav:settings");