d5-testing-library 2.0.0-alpha.6 → 2.0.0-alpha.8

package/dist/{FormEdit-KTRSSTSI.mjs → FormEdit-F4IGBNF3.mjs}

@@ -1,6 +1,6 @@
 import {
   FormEdit
-} from "./chunk-N4PDOG6U.mjs";
+} from "./chunk-XG4PWBWZ.mjs";
 export {
   FormEdit as default
 };

package/dist/{ListForm-H7E4GQWM.mjs → ListForm-6TUI3ZIO.mjs}

@@ -1,6 +1,6 @@
 import {
   ListForm
-} from "./chunk-N4PDOG6U.mjs";
+} from "./chunk-XG4PWBWZ.mjs";
 export {
   ListForm as default
 };

package/dist/{TreeView-Q7YDCHQZ.mjs → TreeView-YEVTT5PJ.mjs}

@@ -1,6 +1,6 @@
 import {
   TreeView
-} from "./chunk-N4PDOG6U.mjs";
+} from "./chunk-XG4PWBWZ.mjs";
 export {
   TreeView as default
 };

package/dist/{chunk-N4PDOG6U.mjs → chunk-XG4PWBWZ.mjs}

@@ -2859,11 +2859,14 @@ var AbstractElement = class {
   joinRelativeCssSelectors(selectors) {
     return selectors.join(" ");
   }
-  getLocator() {
+  syncLocator() {
     return this.page.locator(`css=${this.getFullCssSelector()}`);
   }
+  getLocator() {
+    return this.syncLocator();
+  }
   async getAttribute(attr) {
-    const locator = this.getLocator();
+    const locator = this.syncLocator();
     if (await locator.isVisible()) {
       return locator.getAttribute(attr);
     }
@@ -3317,15 +3320,15 @@ async function classDependencyInjector(formType) {
   let SubFormFactoryClass;
   switch (formType) {
     case "1" /* LIST */:
-      SubFormFactoryClass = (await import("./ListForm-H7E4GQWM.mjs")).default;
+      SubFormFactoryClass = (await import("./ListForm-6TUI3ZIO.mjs")).default;
       break;
     case "3" /* TREE */:
-      SubFormFactoryClass = (await import("./TreeView-Q7YDCHQZ.mjs")).default;
+      SubFormFactoryClass = (await import("./TreeView-YEVTT5PJ.mjs")).default;
       break;
     case "2" /* EDIT */:
     case "99" /* FREE_FORM */:
     case "4" /* REPORT */:
-      SubFormFactoryClass = (await import("./FormEdit-KTRSSTSI.mjs")).default;
+      SubFormFactoryClass = (await import("./FormEdit-F4IGBNF3.mjs")).default;
       break;
     default:
       throw new Error(`Unsupported form type ${formType}`);
@@ -3487,14 +3490,14 @@ var Cell = class extends AbstractElementWithParent {
     }
     return getDate(value);
   }
-  async element() {
+  async getLocator() {
     if (this._index == null) {
       this.index = await this.getCellIndex();
     }
-    return this.getLocator();
+    return this.syncLocator();
   }
   async getValue() {
-    const cellEl = await this.element();
+    const cellEl = await this.getLocator();
     const cellElClass = await cellEl.getAttribute("class") ?? "";
     if (cellElClass.includes("boolean-column" /* Boolean */)) return this.getBooleanValue(cellEl);
     if (cellElClass.includes("tags-column" /* Tags */)) return this.getTagsValue(cellEl);
@@ -3652,9 +3655,9 @@ var Column = class extends AbstractElementWithParent {
   get index() {
     return this._index;
   }
-  async element() {
+  async getLocator() {
     await this.getIndex();
-    return this.getLocator();
+    return this.syncLocator();
   }
   async getColumnHeaderIndexBy(cssSelector) {
     const column = this.page.locator(`${this.parentCssSelector} ${this.headerCssSelector} ${cssSelector}`);
@@ -3667,7 +3670,7 @@ var Column = class extends AbstractElementWithParent {
     return this.getColumnHeaderIndexBy(getColumnByNameCssSelector(this._name));
   }
   async caption() {
-    const el = await this.element();
+    const el = await this.getLocator();
     const text = await el.innerText();
     return text?.trim() ?? null;
   }
@@ -5100,12 +5103,11 @@ var DX_TEXTEDITOR_EMPTY3 = "dx-texteditor-empty";
 var CUSTOM_OPTION_LIST_SELECTOR = "custom-list";
 var SELECT_BOX_OPTION_TEXT_CONTAINER_CLASS2 = "d5-multi-select-item";
 var TAG_BOX_LIST_ITEM_SELECTOR = '.dx-overlay-wrapper .dx-list-item[aria-selected="true"]';
-var combinedOptionHeaderFilterDictValueXpath = (value) => `//div[contains(@class, '${SELECT_BOX_OPTION_TEXT_CONTAINER_CLASS2}') and contains(text(), '${value}')]`;
 var dropDownHeaderFilterDictionaryOptionClick = async (optionValue, page, dataTEST = "", delay = true) => {
   const calendarPopoverSelector = byTestIdCssSelector(`${dataTEST}`);
   const calendarPopover = page.locator(calendarPopoverSelector);
   const customOptionList = calendarPopover.locator(`.${CUSTOM_OPTION_LIST_SELECTOR}`);
-  const optElement = customOptionList.locator(`xpath=${combinedOptionHeaderFilterDictValueXpath(optionValue)}`);
+  const optElement = customOptionList.locator(`.${SELECT_BOX_OPTION_TEXT_CONTAINER_CLASS2}`, { hasText: optionValue });
   try {
     await optElement.waitFor({ state: "visible", timeout: delay ? void 0 : 600 });
     await optElement.click();
@@ -5129,9 +5131,8 @@ var HeaderFilterDictionary = class extends AbstractDXEditorWithInput {
       await this.selectOption(inputEl, value, lastElement);
     }
   }
-  async waitOptionSelection() {
-    const selectedItem = this.page.locator(TAG_BOX_LIST_ITEM_SELECTOR);
-    await selectedItem.waitFor({ state: "visible" });
+  async waitOptionSelection(value) {
+    await this.page.locator(`${TAG_BOX_LIST_ITEM_SELECTOR}`).filter({ hasText: value }).first().waitFor({ state: "visible" });
   }
   async selectOption(inputEl, value, lastElement) {
     try {
@@ -5144,13 +5145,14 @@ var HeaderFilterDictionary = class extends AbstractDXEditorWithInput {
     } catch (error) {
       throw error;
     }
-    await this.waitOptionSelection();
+    await this.waitOptionSelection(value);
   }
   async getHeaderFilterDictionaryInputValue() {
     if (await this.isHeaderFilterDictionaryEmpty()) {
       return [];
     }
     const tags = this.page.locator(`${this.getFullCssSelector()} .${DX_TAG_CONTAINER2} ${TAGS_SELECTOR2}`);
+    await tags.first().waitFor({ state: "visible" });
     const count = await tags.count();
     const values = [];
     for (let i = 0; i < count; i++) {
@@ -5609,7 +5611,7 @@ var Table = class extends AbstractElementWithParent {
         [row] = await this.getSelectedRows();
       }
       if (!row) throw new Error("No row available row for context menu");
-      const cellElement = await row.getCell(fieldName).element();
+      const cellElement = await row.getCell(fieldName).getLocator();
       await cellElement.click({ button: "right" });
     });
   }
@@ -6017,7 +6019,7 @@ var ColumnFilter = class {
     await this.getCancelButton().click();
   }
   async initFilter() {
-    const columnEl = await this._column.element();
+    const columnEl = await this._column.getLocator();
     await columnEl.hover();
     const headerFilterIcon = columnEl.locator(HEADER_FILTER_ICON);
     await headerFilterIcon.waitFor({ state: "visible" });

package/dist/cjs/d5-testing-library.cjs

@@ -76,11 +76,14 @@ var init_AbstractElement = __esm({
       joinRelativeCssSelectors(selectors) {
         return selectors.join(" ");
       }
-      getLocator() {
+      syncLocator() {
         return this.page.locator(`css=${this.getFullCssSelector()}`);
       }
+      getLocator() {
+        return this.syncLocator();
+      }
       async getAttribute(attr) {
-        const locator = this.getLocator();
+        const locator = this.syncLocator();
         if (await locator.isVisible()) {
           return locator.getAttribute(attr);
         }
@@ -1175,7 +1178,7 @@ var init_DateEditor = __esm({
 });
 
 // src/pageObjects/elements/Editors/HeaderFilterDictionary.ts
-var TAGS_SELECTOR2, DX_TAG_CONTAINER2, DX_TEXTEDITOR_EMPTY3, CUSTOM_OPTION_LIST_SELECTOR, SELECT_BOX_OPTION_TEXT_CONTAINER_CLASS2, TAG_BOX_LIST_ITEM_SELECTOR, combinedOptionHeaderFilterDictValueXpath, dropDownHeaderFilterDictionaryOptionClick, HeaderFilterDictionary;
+var TAGS_SELECTOR2, DX_TAG_CONTAINER2, DX_TEXTEDITOR_EMPTY3, CUSTOM_OPTION_LIST_SELECTOR, SELECT_BOX_OPTION_TEXT_CONTAINER_CLASS2, TAG_BOX_LIST_ITEM_SELECTOR, dropDownHeaderFilterDictionaryOptionClick, HeaderFilterDictionary;
 var init_HeaderFilterDictionary = __esm({
   "src/pageObjects/elements/Editors/HeaderFilterDictionary.ts"() {
     "use strict";
@@ -1188,12 +1191,11 @@ var init_HeaderFilterDictionary = __esm({
     CUSTOM_OPTION_LIST_SELECTOR = "custom-list";
     SELECT_BOX_OPTION_TEXT_CONTAINER_CLASS2 = "d5-multi-select-item";
     TAG_BOX_LIST_ITEM_SELECTOR = '.dx-overlay-wrapper .dx-list-item[aria-selected="true"]';
-    combinedOptionHeaderFilterDictValueXpath = (value) => `//div[contains(@class, '${SELECT_BOX_OPTION_TEXT_CONTAINER_CLASS2}') and contains(text(), '${value}')]`;
     dropDownHeaderFilterDictionaryOptionClick = async (optionValue, page, dataTEST = "", delay = true) => {
       const calendarPopoverSelector = byTestIdCssSelector(`${dataTEST}`);
       const calendarPopover = page.locator(calendarPopoverSelector);
       const customOptionList = calendarPopover.locator(`.${CUSTOM_OPTION_LIST_SELECTOR}`);
-      const optElement = customOptionList.locator(`xpath=${combinedOptionHeaderFilterDictValueXpath(optionValue)}`);
+      const optElement = customOptionList.locator(`.${SELECT_BOX_OPTION_TEXT_CONTAINER_CLASS2}`, { hasText: optionValue });
       try {
         await optElement.waitFor({ state: "visible", timeout: delay ? void 0 : 600 });
         await optElement.click();
@@ -1217,9 +1219,8 @@ var init_HeaderFilterDictionary = __esm({
           await this.selectOption(inputEl, value, lastElement);
         }
       }
-      async waitOptionSelection() {
-        const selectedItem = this.page.locator(TAG_BOX_LIST_ITEM_SELECTOR);
-        await selectedItem.waitFor({ state: "visible" });
+      async waitOptionSelection(value) {
+        await this.page.locator(`${TAG_BOX_LIST_ITEM_SELECTOR}`).filter({ hasText: value }).first().waitFor({ state: "visible" });
       }
       async selectOption(inputEl, value, lastElement) {
         try {
@@ -1232,13 +1233,14 @@ var init_HeaderFilterDictionary = __esm({
         } catch (error) {
           throw error;
         }
-        await this.waitOptionSelection();
+        await this.waitOptionSelection(value);
       }
       async getHeaderFilterDictionaryInputValue() {
         if (await this.isHeaderFilterDictionaryEmpty()) {
           return [];
         }
         const tags = this.page.locator(`${this.getFullCssSelector()} .${DX_TAG_CONTAINER2} ${TAGS_SELECTOR2}`);
+        await tags.first().waitFor({ state: "visible" });
         const count = await tags.count();
         const values = [];
         for (let i = 0; i < count; i++) {
@@ -2000,14 +2002,14 @@ var init_Cell = __esm({
         }
         return getDate(value);
       }
-      async element() {
+      async getLocator() {
         if (this._index == null) {
           this.index = await this.getCellIndex();
         }
-        return this.getLocator();
+        return this.syncLocator();
       }
       async getValue() {
-        const cellEl = await this.element();
+        const cellEl = await this.getLocator();
         const cellElClass = await cellEl.getAttribute("class") ?? "";
         if (cellElClass.includes("boolean-column" /* Boolean */)) return this.getBooleanValue(cellEl);
         if (cellElClass.includes("tags-column" /* Tags */)) return this.getTagsValue(cellEl);
@@ -2166,9 +2168,9 @@ var init_Column = __esm({
       get index() {
         return this._index;
       }
-      async element() {
+      async getLocator() {
         await this.getIndex();
-        return this.getLocator();
+        return this.syncLocator();
       }
       async getColumnHeaderIndexBy(cssSelector) {
         const column = this.page.locator(`${this.parentCssSelector} ${this.headerCssSelector} ${cssSelector}`);
@@ -2181,7 +2183,7 @@ var init_Column = __esm({
         return this.getColumnHeaderIndexBy(getColumnByNameCssSelector(this._name));
       }
       async caption() {
-        const el = await this.element();
+        const el = await this.getLocator();
         const text = await el.innerText();
         return text?.trim() ?? null;
       }
@@ -2682,7 +2684,7 @@ var init_Table = __esm({
             [row] = await this.getSelectedRows();
           }
           if (!row) throw new Error("No row available row for context menu");
-          const cellElement = await row.getCell(fieldName).element();
+          const cellElement = await row.getCell(fieldName).getLocator();
           await cellElement.click({ button: "right" });
         });
       }
@@ -3561,7 +3563,7 @@ var init_ColumnFilter = __esm({
         await this.getCancelButton().click();
       }
       async initFilter() {
-        const columnEl = await this._column.element();
+        const columnEl = await this._column.getLocator();
         await columnEl.hover();
         const headerFilterIcon = columnEl.locator(HEADER_FILTER_ICON);
         await headerFilterIcon.waitFor({ state: "visible" });

package/dist/cjs/d5-testing-library.d.ts

@@ -1,4 +1,4 @@
-import { Page, Locator } from '@playwright/test';
+import { Locator, Page } from '@playwright/test';
 import * as playwright_core from 'playwright-core';
 
 type IConfig = {
@@ -9,13 +9,14 @@ type IConfig = {
 };
 declare function config(cfg?: IConfig): IConfig;
 
-declare abstract class AbstractElement {
+declare abstract class AbstractElement<TLocator extends Locator | Promise<Locator> = Locator> {
     page: Page;
     protected elementCssSelector: string;
     protected constructor(page: Page, elementCssSelector?: string);
     protected getFullCssSelector(): string;
     protected joinRelativeCssSelectors(selectors: string[]): string;
-    getLocator(): Locator;
+    protected syncLocator(): Locator;
+    getLocator(): TLocator;
     getAttribute(attr: string): Promise<string>;
     getClasses(): Promise<string>;
     getDataTestId(): Promise<string>;
@@ -115,7 +116,7 @@ interface ClearStrategy {
     clear(editor: Editor): Promise<void>;
 }
 
-declare abstract class AbstractElementWithParent extends AbstractElement {
+declare abstract class AbstractElementWithParent<TLocator extends Locator | Promise<Locator> = Locator> extends AbstractElement<TLocator> {
     protected parentCssSelector: string;
     constructor(parentCssSelector: string, elementCssSelector: string, page: Page);
     protected getFullCssSelector(): string;
@@ -513,7 +514,7 @@ declare class ToolbarItem extends AbstractElementWithParent implements Button {
     get menu(): ToolbarMenu;
 }
 
-declare class Cell extends AbstractElementWithParent {
+declare class Cell extends AbstractElementWithParent<Promise<Locator>> {
     private _index;
     private readonly getCellIndex;
     constructor(parentCssSelector: string, getCellIndex: () => Promise<number>, page: Page, index?: number);
@@ -522,7 +523,7 @@ declare class Cell extends AbstractElementWithParent {
     private getTagsValue;
     private getNumberValue;
     private getDateValue;
-    element(): Promise<Locator>;
+    getLocator(): Promise<Locator>;
     getValue(): Promise<string | number | 1 | 0 | string[] | Date | Date[] | null>;
     getIndex(): number;
 }
@@ -535,7 +536,7 @@ interface ConstructorParams$1 {
     index?: number;
     page: Page;
 }
-declare class Column extends AbstractElementWithParent {
+declare class Column extends AbstractElementWithParent<Promise<Locator>> {
     private _index;
     private _caption;
     private _name;
@@ -543,7 +544,7 @@ declare class Column extends AbstractElementWithParent {
     constructor({ parentCssSelector, headerCssSelector, name, caption, index, page }: ConstructorParams$1);
     private set index(value);
     private get index();
-    element(): Promise<Locator>;
+    getLocator(): Promise<Locator>;
     private getColumnHeaderIndexBy;
     private getIndexByCaption;
     private getIndexByName;

package/dist/d5-testing-library.d.mts

@@ -1,4 +1,4 @@
-import { Page, Locator } from '@playwright/test';
+import { Locator, Page } from '@playwright/test';
 import * as playwright_core from 'playwright-core';
 
 type IConfig = {
@@ -9,13 +9,14 @@ type IConfig = {
 };
 declare function config(cfg?: IConfig): IConfig;
 
-declare abstract class AbstractElement {
+declare abstract class AbstractElement<TLocator extends Locator | Promise<Locator> = Locator> {
     page: Page;
     protected elementCssSelector: string;
     protected constructor(page: Page, elementCssSelector?: string);
     protected getFullCssSelector(): string;
     protected joinRelativeCssSelectors(selectors: string[]): string;
-    getLocator(): Locator;
+    protected syncLocator(): Locator;
+    getLocator(): TLocator;
     getAttribute(attr: string): Promise<string>;
     getClasses(): Promise<string>;
     getDataTestId(): Promise<string>;
@@ -115,7 +116,7 @@ interface ClearStrategy {
     clear(editor: Editor): Promise<void>;
 }
 
-declare abstract class AbstractElementWithParent extends AbstractElement {
+declare abstract class AbstractElementWithParent<TLocator extends Locator | Promise<Locator> = Locator> extends AbstractElement<TLocator> {
     protected parentCssSelector: string;
     constructor(parentCssSelector: string, elementCssSelector: string, page: Page);
     protected getFullCssSelector(): string;
@@ -513,7 +514,7 @@ declare class ToolbarItem extends AbstractElementWithParent implements Button {
     get menu(): ToolbarMenu;
 }
 
-declare class Cell extends AbstractElementWithParent {
+declare class Cell extends AbstractElementWithParent<Promise<Locator>> {
     private _index;
     private readonly getCellIndex;
     constructor(parentCssSelector: string, getCellIndex: () => Promise<number>, page: Page, index?: number);
@@ -522,7 +523,7 @@ declare class Cell extends AbstractElementWithParent {
     private getTagsValue;
     private getNumberValue;
     private getDateValue;
-    element(): Promise<Locator>;
+    getLocator(): Promise<Locator>;
     getValue(): Promise<string | number | 1 | 0 | string[] | Date | Date[] | null>;
     getIndex(): number;
 }
@@ -535,7 +536,7 @@ interface ConstructorParams$1 {
     index?: number;
     page: Page;
 }
-declare class Column extends AbstractElementWithParent {
+declare class Column extends AbstractElementWithParent<Promise<Locator>> {
     private _index;
     private _caption;
     private _name;
@@ -543,7 +544,7 @@ declare class Column extends AbstractElementWithParent {
     constructor({ parentCssSelector, headerCssSelector, name, caption, index, page }: ConstructorParams$1);
     private set index(value);
     private get index();
-    element(): Promise<Locator>;
+    getLocator(): Promise<Locator>;
     private getColumnHeaderIndexBy;
     private getIndexByCaption;
     private getIndexByName;

package/dist/d5-testing-library.legacy-esm.js

@@ -23,7 +23,7 @@ import {
   readonlyLocator,
   wait,
   waitElementIsVisible_default
-} from "./chunk-N4PDOG6U.mjs";
+} from "./chunk-XG4PWBWZ.mjs";
 export {
   AbstractPage,
   ApiRequest,

package/dist/d5-testing-library.mjs

@@ -23,7 +23,7 @@ import {
   readonlyLocator,
   wait,
   waitElementIsVisible_default
-} from "./chunk-N4PDOG6U.mjs";
+} from "./chunk-XG4PWBWZ.mjs";
 export {
   AbstractPage,
   ApiRequest,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "d5-testing-library",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-alpha.8",
   "description": "e2e testing D5 projects",
   "main": "dist/cjs/d5-testing-library.cjs",
   "module": "dist/d5-testing-library.legacy-esm.js",