d5-testing-library 2.0.0-alpha.0 → 2.0.0-alpha.10

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

@@ -1,27 +1,22 @@
-import * as selenium_webdriver from 'selenium-webdriver';
-import { Browser, WebDriver, WebElement, By, Condition } from 'selenium-webdriver';
+import { Locator, Page } from '@playwright/test';
+import * as playwright_core from 'playwright-core';
 
-type DriverType = typeof Browser;
-type BrowserList = DriverType[keyof DriverType];
 type IConfig = {
     auth: {
-        host: string;
         login: string;
         password: string;
     };
-    timeout: number;
-    browser: BrowserList;
-    headless?: 'true' | 'false';
 };
 declare function config(cfg?: IConfig): IConfig;
 
-declare abstract class AbstractElement {
-    driver: WebDriver;
+declare abstract class AbstractElement<TLocator extends Locator | Promise<Locator> = Locator> {
+    page: Page;
     protected elementCssSelector: string;
-    protected constructor(driver: WebDriver, elementCssSelector?: string);
+    protected constructor(page: Page, elementCssSelector?: string);
     protected getFullCssSelector(): string;
     protected joinRelativeCssSelectors(selectors: string[]): string;
-    getElement(): Promise<WebElement>;
+    protected syncLocator(): Locator;
+    getLocator(): TLocator;
     getAttribute(attr: string): Promise<string>;
     getClasses(): Promise<string>;
     getDataTestId(): Promise<string>;
@@ -30,8 +25,7 @@ declare abstract class AbstractElement {
 
 declare abstract class AbstractPage extends AbstractElement {
     protected url: string;
-    protected host: string;
-    constructor(driver: WebDriver);
+    constructor(page: Page);
     private prependHash;
     protected goToUrl(url: string): Promise<void>;
     protected get path(): string;
@@ -40,16 +34,12 @@ declare abstract class AbstractPage extends AbstractElement {
 }
 
 declare class LoginPage extends AbstractPage {
-    usernameField: By;
-    passwordField: By;
-    loginButton: By;
     locate(): Promise<void>;
     get path(): string;
     enterUsername(username: string): Promise<void>;
     enterPassword(password: string): Promise<void>;
     clickLoginButton(): Promise<void>;
     loginWith(username: string, password: string): Promise<void>;
-    authorize(): Promise<void>;
 }
 
 declare const byTestIdCssSelector: (testId: string, element?: string) => string;
@@ -58,75 +48,46 @@ declare const byTestIdCssSelector: (testId: string, element?: string) => string;
  *
  * @param {string} testId - The test ID of the element.
  * @param {string} [element='div'] - The HTML tag name of the element (optional).
- * @returns {By} - The By locator object.
+ * @returns {string} - Path string.
  */
-declare const byTestId: (testId: string, element?: string) => By;
+declare const byTestId: (testId: string, element?: string) => string;
 declare const readonlyLocator = "readonly";
 declare const disabledLocator = "disabled";
 
-/**
- * Creates a WebDriver instance for the specified browser.
- * If no browser parameter is provided, it uses the default browser specified in the configuration.
- * The default timeout is also set based on the configuration.
- *
- * @param {BrowserList} browser - The browser to create the WebDriver instance for.
- * @returns {Promise<WebDriver>} A promise that resolves to the WebDriver instance.
- */
-declare const createDriver: (browser?: BrowserList) => Promise<WebDriver>;
-
-declare const elementIsNotPresent: (locator: By) => Condition<boolean>;
-
-type WithElement$1 = {
-    element: WebElement;
-};
-type WithBy$1 = {
-    by: By;
-};
-type Args$1 = {
-    timeout?: number;
-    errorMessage?: string;
-    driver: WebDriver;
-};
-type ArgsWithElement$1 = Args$1 & WithElement$1;
-type ArgsWithWithBy$1 = Args$1 & WithBy$1;
-declare function waitElementIsVisible(args: ArgsWithElement$1): Promise<void>;
-declare function waitElementIsVisible(args: ArgsWithWithBy$1): Promise<void>;
-
-type WithElement = {
-    element: WebElement;
-};
-type WithBy = {
-    by: By;
+type WithLocator = {
+    locator: Locator;
 };
 type Args = {
     timeout?: number;
     errorMessage?: string;
-    driver: WebDriver;
 };
-type ArgsWithElement = Args & WithElement;
-type ArgsWithWithBy = Args & WithBy;
-declare function waitElementIsClickable(args: ArgsWithElement): Promise<void>;
-declare function waitElementIsClickable(args: ArgsWithWithBy): Promise<void>;
+type ArgsWithWithLocator = Args & WithLocator;
+/**
+ * Waits until a specified web element is visible within a given timeout.
+ *
+ * @param {ArgsWithWithLocator} params - The parameters for the wait function.
+ * @param {number} [params.timeout] - The maximum time to wait for the element to be visible, in milliseconds. If not provided, the default timeout is used.
+ * @param {Locator} [params.locator] - The locator of the element to wait for.
+ * @returns {Promise<void>} A promise that resolves when the element becomes visible.
+ */
+declare function waitElementIsVisible({ timeout, locator }: ArgsWithWithLocator): Promise<void>;
 
-interface WaiteParams {
-    condition: (driver: WebDriver) => Promise<boolean>;
+interface PlaywrightWaitParams {
+    condition: () => Promise<boolean>;
     timeout?: number;
     errorMessage?: string;
-    driver: WebDriver;
+    page: Page;
 }
-declare function safeWait(condition: WaiteParams['condition'], driver: WebDriver, errorMessage?: string, timeout?: number): Promise<void>;
-
-declare function signIn(driver?: WebDriver): Promise<WebDriver>;
-
 /**
- * Clicks on a specified web element.
+ * Safely waits for a condition using Playwright, catching any errors and continuing to wait.
  *
- * @param {WebElement} webElement - The web element to click on.
- * @param {WebDriver} [driver] - The web driver instance to use. If not provided, the default driver from the configuration is used.
- * @returns {Promise<void>} A promise that resolves when the click action is complete.
+ * @param {function} condition - A function that returns a promise resolving to a boolean indicating if the condition is met.
+ * @param {Page} page - The Playwright page instance to use.
+ * @param {string} [errorMessage] - The error message to display if the wait times out.
+ * @param {number} [timeout] - The maximum time to wait for the condition, in milliseconds.
+ * @returns {Promise<void>} A promise that resolves when the condition is met or rejects if timeout occurs.
  */
-declare const click: (webElement: WebElement, driver: WebDriver) => Promise<void>;
-declare const contextMenu: (webElement: WebElement, driver: WebDriver) => Promise<void>;
+declare function wait(condition: PlaywrightWaitParams['condition'], page: Page, errorMessage?: string, timeout?: number): Promise<void>;
 
 interface Editor {
     setValue(value: any): Promise<void>;
@@ -135,6 +96,7 @@ interface Editor {
     clear?(): Promise<void>;
     isReadonly?(): Promise<boolean>;
     isDisabled?(): Promise<boolean>;
+    download?(): Promise<string>;
 }
 declare enum ControlClass {
     Text = "text-control",
@@ -148,16 +110,17 @@ declare enum ControlClass {
     SingleDateRange = "single-date-range-control",
     BooleanSelector = "buttons-group",
     ButtonGroup = "button-group-field",
-    HeaderFilterDictionary = "header-filter-dictionary"
+    HeaderFilterDictionary = "header-filter-dictionary",
+    FileUploader = "file-uploader"
 }
 
 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, driver: WebDriver);
+    constructor(parentCssSelector: string, elementCssSelector: string, page: Page);
     protected getFullCssSelector(): string;
     isReadonly(): Promise<boolean>;
     isDisabled(): Promise<boolean>;
@@ -167,8 +130,8 @@ declare abstract class AbstractDXEditorWithInput extends AbstractElementWithPare
     private clearStrategy;
     protected setClearStrategy(strategy: ClearStrategy): void;
     protected getInputCssSelector(): string;
-    getInputElement(): Promise<selenium_webdriver.WebElement>;
-    protected getInputValue(): Promise<string>;
+    getInputLocator(): Locator;
+    protected getInputValue(): Promise<string | null>;
     protected setInputValue(value: string): Promise<void>;
     clear(): Promise<void>;
     abstract setValue(value: any): Promise<void>;
@@ -176,35 +139,35 @@ declare abstract class AbstractDXEditorWithInput extends AbstractElementWithPare
 }
 
 declare class TextEditor extends AbstractDXEditorWithInput {
-    constructor(parentCssSelector: string, elementCssSelector: string, driver: WebDriver);
+    constructor(parentCssSelector: string, elementCssSelector: string, page: Page);
     getValue(): Promise<string | null>;
     setValue(value: string): Promise<void>;
 }
 
 declare class NumberEditor extends AbstractDXEditorWithInput {
-    constructor(parentCssSelector: string, elementCssSelector: string, driver: WebDriver);
+    constructor(parentCssSelector: string, elementCssSelector: string, page: Page);
     getValue(): Promise<number | null>;
     setValue(value: any): Promise<void>;
 }
 
-declare const editorFactory: (parentCssSelector: string, elementCssSelector: string, driver: WebDriver) => Promise<Editor>;
+declare const editorFactory: (parentCssSelector: string, elementCssSelector: string, page: Page) => Promise<Editor>;
 
 interface ISubsystemItem {
-    driver: WebDriver;
-    bySelector: By;
+    page: Page;
+    bySelector: string;
 }
 declare class SubsystemItem {
     private readonly bySelector;
-    private readonly driver;
-    constructor({ driver, bySelector }: ISubsystemItem);
-    getElement(): Promise<selenium_webdriver.WebElement>;
+    private readonly page;
+    constructor({ page, bySelector }: ISubsystemItem);
+    getElement(): playwright_core.Locator;
     getTitle(): Promise<string>;
     click(): Promise<void>;
 }
 
 declare class SubsystemsPanel extends AbstractElement {
     private header;
-    constructor(driver: WebDriver);
+    constructor(page: Page);
     headerTitle(): Promise<string>;
     protected getSearchComponent(): TextEditor;
     /**
@@ -252,33 +215,36 @@ declare class SubsystemsPanel extends AbstractElement {
 interface Button {
     click(): Promise<void>;
     isDisabled(): Promise<boolean>;
-    isDisplayed(): Promise<boolean>;
+    isVisible(): Promise<boolean>;
     getTitle(): Promise<string>;
     isPressed?(): Promise<boolean>;
+    getLocator(): Locator;
 }
 declare abstract class AbstractButton extends AbstractElementWithParent implements Button {
-    protected constructor(parentCssSelector: string, elementCssSelector: string, driver: WebDriver);
+    protected constructor(parentCssSelector: string, elementCssSelector: string, page: Page);
     protected abstract buttonNotDisplayedError(): string;
+    protected get button(): Locator;
+    getLocator(): Locator;
     click(): Promise<void>;
     isDisabled(): Promise<boolean>;
-    isDisplayed(): Promise<boolean>;
+    isVisible(): Promise<boolean>;
     isPressed(): Promise<boolean>;
     abstract getTitle(): Promise<string>;
 }
 
 declare abstract class DXButton extends AbstractButton {
-    protected getText(): Promise<string>;
+    protected getText(): Promise<string | null>;
 }
 
 declare class FormButton extends DXButton {
     private readonly name;
-    constructor(parentCssSelector: string, formName: string, name: string, driver: WebDriver);
+    constructor(parentCssSelector: string, formName: string, name: string, page: Page);
     protected buttonNotDisplayedError(): string;
     getTitle(): Promise<string>;
 }
 
 interface Group<TItem = unknown> {
-    isDisplayed(): Promise<boolean>;
+    isVisible(): Promise<boolean>;
     click?(): Promise<void>;
     itemClick?(name: string): Promise<void>;
     item?(name: string): TItem;
@@ -287,14 +253,14 @@ interface Group<TItem = unknown> {
 
 declare class FormGroup extends AbstractElementWithParent implements Group {
     private groupInstance;
-    constructor(parentCssSelector: string, formName: string, name: string, driver: WebDriver);
+    constructor(parentCssSelector: string, formName: string, name: string, page: Page);
     private initInstance;
     /**
      * Возвращает булевое значение доступна ли группа
      * @example
-     * expect(await tableList.group('MainSuperPanel').isDisplayed();
+     * expect(await tableList.group('MainSuperPanel').isVisible();
      */
-    isDisplayed(): Promise<boolean>;
+    isVisible(): Promise<boolean>;
     /**
      * Клик по элементам группы.
      * Метод работает если у группы есть дочерние элементы, например элементы аккордеона или вкладки таб панели.
@@ -317,11 +283,11 @@ declare class FormGroup extends AbstractElementWithParent implements Group {
     isActive(): Promise<boolean>;
 }
 
-declare class AbstractForm extends AbstractPage {
+declare abstract class AbstractForm extends AbstractPage {
     protected containerCssSelector: string;
     private _formName;
-    protected containerBy: By;
-    protected getContainerElement: () => selenium_webdriver.WebElementPromise;
+    protected get container(): Locator;
+    protected constructor(page: Page);
     set formName(name: string);
     get formName(): string;
     /**
@@ -349,7 +315,7 @@ interface SubFormOptions {
 }
 declare abstract class Form extends AbstractForm {
     protected popupContainerCssSelector: string;
-    protected constructor(driver: WebDriver);
+    protected constructor(page: Page);
     protected isModal(): Promise<boolean>;
     protected isFullScreen(): Promise<boolean>;
     /**
@@ -358,6 +324,7 @@ declare abstract class Form extends AbstractForm {
      * const listForm = new MyForm();
      * //...
      * expect(await listForm.getTitleText()).toBe('MyFormTitle');
+     * Получение заголовка на форме
      */
     getTitleText(): Promise<string>;
     protected setSubFormMode(): void;
@@ -370,19 +337,26 @@ declare abstract class Form extends AbstractForm {
      * expect(await form.subForm(name));
      */
     subForm(name: string, options?: SubFormOptions): Promise<unknown>;
+    protected getContainerElement(): Locator;
 }
 
 declare class EditorButton extends AbstractElementWithParent {
     private readonly name;
-    constructor(parentCssSelector: string, name: string, driver: WebDriver);
+    constructor(parentCssSelector: string, name: string, page: Page);
     protected buttonNotDisplayedError(): string;
     click(): Promise<void>;
-    isDisplayed(): Promise<boolean>;
+    isVisible(): Promise<boolean>;
 }
 
 declare class AbstractEditor extends AbstractElementWithParent implements Editor {
     protected editor: Editor;
-    constructor(parentCssSelector: string, elementCssSelector: string, driver: WebDriver);
+    protected _titleCssSelector: string;
+    constructor({ parentCssSelector, elementCssSelector, titleCssSelector, page }: {
+        parentCssSelector: string;
+        elementCssSelector: string;
+        titleCssSelector: string;
+        page: Page;
+    });
     protected initEditor(): Promise<void>;
     /**
      * Возвращает значение в поле
@@ -425,12 +399,12 @@ declare class AbstractEditor extends AbstractElementWithParent implements Editor
      */
     isDisabled(): Promise<boolean>;
     /**
-     * Возвращает значение true|false в зависимости isDisplayed поле или нет
+     * Возвращает значение true|false в зависимости isVisible поле или нет
      * @example
-     * expect(await formEdit.field('NumberFld').isDisplayed()).toBe(true);
-     * expect(await formEdit.field('TextFld').isDisplayed()).toBe(false);
+     * expect(await formEdit.field('NumberFld').isVisible()).toBe(true);
+     * expect(await formEdit.field('TextFld').isVisible()).toBe(false);
      */
-    isDisplayed(): Promise<boolean>;
+    isVisible(): Promise<boolean>;
     /**
      * Находит кнопку на поле по имени
      * @example
@@ -439,16 +413,30 @@ declare class AbstractEditor extends AbstractElementWithParent implements Editor
      * await form.field('Name').button('editorButton).click()
      */
     button(name: string): EditorButton;
+    /**
+     * Повертає загловок едітора
+     * @example
+     * expect(await formEdit.field('NumberFld').title()).toBe('Title1');
+     * expect(await formEdit.field('TextFld').title()).toBe('Title2`);
+     */
+    title(): Promise<string>;
+    /**
+     * Вивантажує файл і повертає назву файла. Доступний тільки для поля FileUploader.
+     * @example
+     * const fileName = await formEdit.field('FileField').downloadFile();
+     * expect(filename()).toBe('file.pdf');
+     */
+    download(): Promise<string>;
 }
 
 declare class FormField extends AbstractEditor {
-    constructor(parentCssSelector: string, formName: string, name: string, driver: WebDriver);
+    constructor(parentCssSelector: string, formName: string, name: string, page: Page);
 }
 
 declare class FormEdit extends Form {
     saveButtonId: string;
     closeButtonId: string;
-    constructor(driver: WebDriver);
+    constructor(page: Page);
     private getButtonCssSelector;
     /**
      * Находит поле формы редактирования по имени
@@ -485,36 +473,35 @@ declare class FormEdit extends Form {
 }
 
 declare abstract class AbstractDropDownMenuList extends AbstractElementWithParent {
-    protected abstract getButtonNameBy(name: string): By;
-    protected abstract getButtonTitleBy(name: string): By;
-    protected buttonNotDisplayedError(name: string): string;
+    protected abstract getButtonNameBy(name: string): string;
+    protected abstract getButtonTitleBy(name: string): string;
     private clickItemBy;
     private getElementByPath;
     clickButton(name: string | string[]): Promise<void>;
     clickButtonByTitle(title: string | string[]): Promise<void>;
-    getMenuItemElementByTitle(title: string | string[]): Promise<WebElement>;
-    getMenuItemElementByName(name: string | string[]): Promise<WebElement>;
+    getMenuItemElementByTitle(title: string | string[]): Promise<Locator>;
+    getMenuItemElementByName(name: string | string[]): Promise<Locator>;
     isVisible(): Promise<boolean>;
 }
 
 declare abstract class AbstractDropDownMenuButton extends AbstractElementWithParent {
     private readonly _list;
-    protected constructor(parentCssSelector: string, elementCssSelector: string, list: AbstractDropDownMenuList, driver: WebDriver);
+    protected constructor(parentCssSelector: string, elementCssSelector: string, list: AbstractDropDownMenuList, page: Page);
     protected openDropdownMenu(): Promise<void>;
     clickButton(name: string | string[]): Promise<void>;
     clickButtonByTitle(title: string | string[]): Promise<void>;
-    getMenuItemElementByTitle(title: string | string[]): Promise<WebElement>;
-    getMenuItemElementByName(name: string | string[]): Promise<WebElement>;
+    getMenuItemElementByTitle(title: string | string[]): Promise<Locator>;
+    getMenuItemElementByName(name: string | string[]): Promise<Locator>;
 }
 
 declare class ToolbarMenu extends AbstractDropDownMenuButton {
-    constructor(parentCssSelector: string, formName: string, name: string, driver: WebDriver);
+    constructor(parentCssSelector: string, formName: string, name: string, page: Page);
     private checkNameValue;
     private checkTitleValue;
     private buttonByName;
     private buttonByTitle;
-    buttonIsDisplayed(name: string | string[]): Promise<boolean>;
-    buttonByTitleIsDisplayed(title: string | string[]): Promise<boolean>;
+    buttonIsVisible(name: string | string[]): Promise<boolean>;
+    buttonByTitleIsVisible(title: string | string[]): Promise<boolean>;
     buttonTitle(name: string | string[]): Promise<string>;
     buttonIsDisabled(name: string | string[]): Promise<boolean>;
     buttonByTitleIsDisabled(title: string | string[]): Promise<boolean>;
@@ -526,27 +513,27 @@ declare class ToolbarItem extends AbstractElementWithParent implements Button {
     private _button;
     private readonly _formName;
     private readonly _itemName;
-    constructor(parentCssSelector: string, formName: string, itemName: string, driver: WebDriver);
+    constructor(parentCssSelector: string, formName: string, itemName: string, page: Page);
     private init;
     click(): Promise<void>;
     isDisabled(): Promise<boolean>;
-    isDisplayed(): Promise<boolean>;
+    isVisible(): Promise<boolean>;
     isPressed(): Promise<boolean>;
     getTitle(): Promise<string>;
     get menu(): ToolbarMenu;
 }
 
-declare class Cell extends AbstractElementWithParent {
+declare class Cell extends AbstractElementWithParent<Promise<Locator>> {
     private _index;
-    private getCellIndex;
-    constructor(parentCssSelector: string, getCellIndex: () => Promise<number>, driver: WebDriver, index?: number);
+    private readonly getCellIndex;
+    constructor(parentCssSelector: string, getCellIndex: () => Promise<number>, page: Page, index?: number);
     private set index(value);
     private getBooleanValue;
     private getTagsValue;
     private getNumberValue;
     private getDateValue;
-    getElement(): Promise<WebElement>;
-    getValue(): Promise<string | number | 1 | 0 | string[] | Date | Date[]>;
+    getLocator(): Promise<Locator>;
+    getValue(): Promise<string | number | 1 | 0 | string[] | Date | Date[] | null>;
     getIndex(): number;
 }
 
@@ -556,17 +543,17 @@ interface ConstructorParams$1 {
     name?: string;
     caption?: string;
     index?: number;
-    driver: WebDriver;
+    page: Page;
 }
-declare class Column extends AbstractElementWithParent {
+declare class Column extends AbstractElementWithParent<Promise<Locator>> {
     private _index;
     private _caption;
     private _name;
     protected headerCssSelector: string | undefined;
-    constructor({ parentCssSelector, headerCssSelector, name, caption, index, driver }: ConstructorParams$1);
+    constructor({ parentCssSelector, headerCssSelector, name, caption, index, page }: ConstructorParams$1);
     private set index(value);
     private get index();
-    getElement(): Promise<WebElement>;
+    getLocator(): Promise<Locator>;
     private getColumnHeaderIndexBy;
     private getIndexByCaption;
     private getIndexByName;
@@ -585,10 +572,10 @@ declare class Row extends AbstractElementWithParent {
      * @param parentCssSelector
      * @param fixedTableContentCssSelector
      * @param index починається з 0 (в getCssRowByIndexSelector додається +1)
-     * @param driver
+     * @param page
      * @param getColumnBy
      */
-    constructor(parentCssSelector: string, fixedTableContentCssSelector: string, index: number, driver: WebDriver, getColumnBy?: (_: {
+    constructor(parentCssSelector: string, fixedTableContentCssSelector: string, index: number, page: Page, getColumnBy?: (_: {
         title?: string;
         name?: string;
     }) => Column);
@@ -611,19 +598,19 @@ declare abstract class DXContextMenuList extends AbstractDropDownMenuList {
     /**
      * @param parentCssSelector
      * @param classNames - Список класів. Починається з крапки
-     * @param driver
+     * @param page
      */
-    protected constructor(parentCssSelector: string, classNames: string, driver: WebDriver);
-    protected getButtonTitleBy(title: string): By;
+    protected constructor(parentCssSelector: string, classNames: string, page: Page);
+    protected getButtonTitleBy(title: string): string;
     isVisible(): Promise<boolean>;
 }
 
 declare class ContextMenu extends DXContextMenuList {
     private readonly _formName;
-    private _initFn;
-    constructor(cssClass: string, formName: string, driver: WebDriver);
+    private _initFn?;
+    constructor(cssClass: string, formName: string, page: Page);
     setInit(cb: () => Promise<void>): this;
-    protected getButtonNameBy(name: string): By;
+    protected getButtonNameBy(name: string): string;
     clickButtonByTitle(title: string | string[]): Promise<void>;
     clickButton(name: string | string[]): Promise<void>;
 }
@@ -635,7 +622,7 @@ interface ConstructorParams {
     contextMenuCssSelector: string;
     tableContentCssSelector: string;
     formName: string;
-    driver: WebDriver;
+    page: Page;
 }
 declare class Table extends AbstractElementWithParent {
     protected formName: string;
@@ -643,7 +630,7 @@ declare class Table extends AbstractElementWithParent {
     protected contextMenuCssSelector: string;
     protected fixedTableContentCssSelector: string;
     protected tableContentCssSelector: string;
-    constructor({ parentCssSelector, contextMenuCssSelector, tableContentCssSelector, headerCssSelector, fixedTableContentCssSelector, formName, driver }: ConstructorParams);
+    constructor({ parentCssSelector, contextMenuCssSelector, tableContentCssSelector, headerCssSelector, fixedTableContentCssSelector, formName, page }: ConstructorParams);
     private getColumnBy;
     /**
      * Отримати рядок по індексу.
@@ -654,8 +641,8 @@ declare class Table extends AbstractElementWithParent {
      * @param index починається з 0
      */
     getColumnByIndex(index: number): Column;
-    getColumnByTitle: (title: string) => Column;
-    getColumnByName: (name: string) => Column;
+    getColumnByTitle(title: string): Column;
+    getColumnByName(name: string): Column;
     /**
      * Вибрати рядок по індексу.
      * @param index починається з 0
@@ -667,10 +654,10 @@ declare class Table extends AbstractElementWithParent {
      * @param indexes починається з 0
      */
     selectRowsByIndexes(indexes: number[]): Promise<void>;
-    protected getRowElements(timeout?: number): Promise<selenium_webdriver.WebElement[]>;
+    protected getRowElements(): Locator;
     getRows(): Promise<Row[]>;
     getColumns(): Promise<Column[]>;
-    element(): Promise<selenium_webdriver.WebElement>;
+    element(): Locator;
     /**
      * Находит поле когда форма находится в состоянии редактирования
      * @example
@@ -710,7 +697,7 @@ declare class Table extends AbstractElementWithParent {
      * @returns {Promise<string>} Повертає значення комірки
      *
      * @example
-     * const table = new Table(driver);
+     * const table = new Table(page);
      *
      * // Отримання значення комірки 'Name' в першому рядку (індекс 0)
      * const cellValue = await table.getCellValueByCellName('Name', 0);
@@ -723,7 +710,7 @@ declare class Table extends AbstractElementWithParent {
      * @returns {Promise<boolean>} Повертає true, якщо таблиця порожня, false - якщо містить рядки
      *
      * @example
-     * const table = new Table(driver);
+     * const table = new Table(page);
      *
      * // Перевірка чи порожня таблиця
      * const empty = await table.isEmpty();
@@ -739,7 +726,7 @@ declare class Table extends AbstractElementWithParent {
      * @throws {Error} Викидає помилку, якщо очікування перевищує тайм-аут
      *
      * @example
-     * const table = new Table(driver);
+     * const table = new Table(page);
      *
      * // Очікування, поки таблиця не стане порожньою
      * await table.waitRowsCount(0);
@@ -754,7 +741,7 @@ declare class Table extends AbstractElementWithParent {
 declare class FormFilterField extends AbstractEditor {
     private readonly formName;
     private readonly name;
-    constructor(parentCssSelector: string, formName: string, name: string, driver: WebDriver);
+    constructor(parentCssSelector: string, formName: string, name: string, page: Page);
     /**
      * Возвращает значение в поле
      * @example
@@ -817,7 +804,7 @@ declare class FormFilterField extends AbstractEditor {
 declare class PanelFilterField extends AbstractEditor {
     private readonly formName;
     private readonly name;
-    constructor(parentCssSelector: string, formName: string, name: string, driver: WebDriver);
+    constructor(parentCssSelector: string, formName: string, name: string, page: Page);
     /**
      * Возвращает значение в поле
      * @example
@@ -881,7 +868,7 @@ declare class FilterPanel extends AbstractElement {
     private readonly _formName;
     private get filterPanelSelector();
     private filterPanelButtons;
-    constructor(formName: string, driver: WebDriver);
+    constructor(formName: string, page: Page);
     /**
      * Возвращает фильтр на панели фильтрации
      * @returns {PanelFilterField}
@@ -896,7 +883,7 @@ declare class FilterPanel extends AbstractElement {
 }
 
 declare class HeaderFilterField extends AbstractEditor {
-    constructor(parentCssSelector: string, formName: string, name: string, driver: WebDriver);
+    constructor(parentCssSelector: string, formName: string, name: string, page: Page);
     getValue(): Promise<any>;
     setValue(value: any): Promise<void>;
     clear(): Promise<void>;
@@ -908,11 +895,12 @@ declare class HeaderFilterField extends AbstractEditor {
 interface IFilterOperations {
     parentCssSelector: string;
     filterTestID: string;
-    driver: WebDriver;
+    page: Page;
 }
 declare class FilterOperation extends AbstractElementWithParent {
     private readonly _testId;
-    constructor({ parentCssSelector, filterTestID, driver, }: IFilterOperations);
+    constructor({ parentCssSelector, filterTestID, page }: IFilterOperations);
+    private popup;
     private initOperationWidget;
     setOperation(operationName: string): Promise<void>;
     getOperation(): Promise<any>;
@@ -920,15 +908,16 @@ declare class FilterOperation extends AbstractElementWithParent {
     getIsBlank(): Promise<boolean>;
 }
 
-declare class ColumnFilter extends AbstractElement {
+declare class ColumnFilter {
     private readonly _formName;
     private readonly _name;
-    private _column;
-    constructor(formName: string, name: string, column: Column, driver: WebDriver);
+    private readonly _column;
+    private readonly page;
+    constructor(formName: string, name: string, column: Column, page: Page);
     private getApplyButton;
     private getCancelButton;
-    protected apply(): Promise<void>;
-    protected cancel(): Promise<void>;
+    private apply;
+    private cancel;
     protected initFilter(): Promise<HeaderFilterField>;
     /**
      * Возвращает значение в поле
@@ -972,7 +961,7 @@ declare class ColumnFilter extends AbstractElement {
      * @example
      * expect(await form.columnFilter('NumberFld').getOperation()).toBe("=");
      */
-    getOperation(): Promise<any>;
+    getOperation(): Promise<string>;
     /**
      * Устанавливает операцию 'isblank' для фильтра
      * @example
@@ -994,7 +983,7 @@ declare class ListForm extends Form {
     protected fixedTableContentCssSelector: string;
     protected tableContentCssSelector: string;
     protected contextMenuCssSelector: string;
-    constructor(driver: WebDriver);
+    constructor(page: Page);
     /**
      * Находит таблицу
      * @example
@@ -1032,11 +1021,11 @@ declare class ListForm extends Form {
 }
 
 declare class TreeView extends ListForm {
-    constructor(driver: WebDriver);
+    constructor(page: Page);
 }
 
 declare class ReportForm extends FormEdit {
-    constructor(driver: WebDriver);
+    constructor(page: Page);
     /**
      * Знаходить поле/фільтр у формі репорту за ім'ям
      * @example
@@ -1049,13 +1038,13 @@ declare class ReportForm extends FormEdit {
 
 declare class DialogButton extends AbstractButton implements Button {
     private readonly text;
-    constructor(parentCssSelector: string, text: string, driver: WebDriver);
-    getElement(): Promise<WebElement>;
+    constructor(parentCssSelector: string, text: string, page: Page);
+    getLocator(): Locator;
     protected buttonNotDisplayedError(): string;
     getTitle(): Promise<string>;
 }
 declare class Dialog extends AbstractElement {
-    constructor(driver: WebDriver);
+    constructor(page: Page);
     private get titleSelector();
     private get textSelector();
     private get buttonsSelector();
@@ -1066,4 +1055,4 @@ declare class Dialog extends AbstractElement {
 
 declare function ApiRequest(objectName: string, operation: string): any;
 
-export { AbstractPage, ApiRequest, ControlClass, Dialog, type Editor, FilterPanel, FormEdit, FormField, FormFilterField, ListForm, LoginPage, NumberEditor, PanelFilterField, ReportForm, SubsystemsPanel, TextEditor, TreeView, byTestId, byTestIdCssSelector, click, config, contextMenu, createDriver, disabledLocator, editorFactory, elementIsNotPresent, readonlyLocator, signIn, safeWait as wait, waitElementIsClickable, waitElementIsVisible };
+export { AbstractPage, ApiRequest, ControlClass, Dialog, type Editor, FilterPanel, FormEdit, FormField, FormFilterField, ListForm, LoginPage, NumberEditor, PanelFilterField, ReportForm, SubsystemsPanel, TextEditor, TreeView, byTestId, byTestIdCssSelector, config, disabledLocator, editorFactory, readonlyLocator, wait, waitElementIsVisible };