d5-testing-library 2.0.0-alpha.13 → 2.0.0-alpha.15

package/dist/{FormEdit-N37GKB3D.mjs → FormEdit-V5FY7PL5.mjs}

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

package/dist/{ListForm-5IEPHR73.mjs → ListForm-DB2J5ED6.mjs}

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

package/dist/{TreeView-VBE3G4KU.mjs → TreeView-VOVTTSRC.mjs}

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

package/dist/{chunk-VB77YEH6.mjs → chunk-XN4OIA4L.mjs}

@@ -3320,15 +3320,15 @@ async function classDependencyInjector(formType) {
   let SubFormFactoryClass;
   switch (formType) {
     case "1" /* LIST */:
-      SubFormFactoryClass = (await import("./ListForm-5IEPHR73.mjs")).default;
+      SubFormFactoryClass = (await import("./ListForm-DB2J5ED6.mjs")).default;
       break;
     case "3" /* TREE */:
-      SubFormFactoryClass = (await import("./TreeView-VBE3G4KU.mjs")).default;
+      SubFormFactoryClass = (await import("./TreeView-VOVTTSRC.mjs")).default;
       break;
     case "2" /* EDIT */:
     case "99" /* FREE_FORM */:
     case "4" /* REPORT */:
-      SubFormFactoryClass = (await import("./FormEdit-N37GKB3D.mjs")).default;
+      SubFormFactoryClass = (await import("./FormEdit-V5FY7PL5.mjs")).default;
       break;
     default:
       throw new Error(`Unsupported form type ${formType}`);
@@ -3412,6 +3412,12 @@ var Form = class extends AbstractForm {
     };
     return new SubForm(this.page);
   }
+  async getButtonCssSelector(buttonId) {
+    if (await this.isModal()) {
+      return `${this.popupContainerCssSelector} ${buttonId}`;
+    }
+    return buttonId;
+  }
   getContainerElement() {
     return this.page.locator(this.containerCssSelector);
   }
@@ -4102,12 +4108,6 @@ var FormEdit = class extends Form {
     super(page);
     this.popupContainerCssSelector = `.popup.form-edit-${this.formName}`;
   }
-  async getButtonCssSelector(buttonId) {
-    if (await this.isModal()) {
-      return `${this.popupContainerCssSelector} ${buttonId}`;
-    }
-    return buttonId;
-  }
   /**
    * Находит поле формы редактирования по имени
    * @example
@@ -4789,19 +4789,18 @@ var TagBox = class extends AbstractDXEditorWithInput {
     return this.dropdownList.listItem(text);
   }
   async setTagBoxInputValue(values) {
-    const lastElement = values[values.length - 1];
-    const input = this.getInputLocator();
-    await input.click();
     for (const value of values) {
-      await this.selectOption(input, value, lastElement);
+      const input = this.getInputLocator();
+      await input.click();
+      await this.selectOption(input, value);
+      await this.confirmSelection();
     }
-    await this.confirmSelection();
   }
   async waitOptionSelection(value) {
     const option = this.page.locator(`.dx-overlay-wrapper .dx-list-item[aria-selected="true"] >> text=${value}`);
     await option.waitFor({ state: "visible", timeout: 5e3 });
   }
-  async selectOption(input, value, lastElement) {
+  async selectOption(input, value) {
     try {
       await dropDownOptionClick(value, this.page, false);
     } catch {
@@ -4809,9 +4808,6 @@ var TagBox = class extends AbstractDXEditorWithInput {
       await dropDownOptionClick(value, this.page, true);
     }
     await this.waitOptionSelection(value);
-    if (value !== lastElement) {
-      await input.pressSequentially("");
-    }
   }
   async confirmSelection() {
     const btnOk = this.page.locator(BTN_OK_SELECTOR);
@@ -6467,6 +6463,8 @@ var DATAGRID_CONTENT_CSS_SELECTOR = ".dx-datagrid-content .dx-datagrid-table.dx-
 var FIXED_DATAGRID_CONTENT_CSS_SELECTOR = ".dx-datagrid-sticky-columns .dx-datagrid-content .dx-datagrid-table.dx-datagrid-table-fixed";
 var CONTEXT_MENU_CSS_SELECTOR = ".dx-datagrid";
 var ListForm = class extends Form {
+  closeButtonId = "#cancel";
+  selectButtonId = "#select";
   headerCssSelector;
   fixedTableContentCssSelector;
   tableContentCssSelector;
@@ -6533,6 +6531,14 @@ var ListForm = class extends Form {
   get filterPanel() {
     return new FilterPanel(this.formName, this.page);
   }
+  async closeButtonClick() {
+    const css = await this.getButtonCssSelector(this.closeButtonId);
+    await this.page.locator(css).click();
+  }
+  async selectButtonClick() {
+    const css = await this.getButtonCssSelector(this.selectButtonId);
+    await this.page.locator(css).click();
+  }
 };
 
 export {

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

@@ -808,19 +808,18 @@ var init_TagBox = __esm({
         return this.dropdownList.listItem(text);
       }
       async setTagBoxInputValue(values) {
-        const lastElement = values[values.length - 1];
-        const input = this.getInputLocator();
-        await input.click();
         for (const value of values) {
-          await this.selectOption(input, value, lastElement);
+          const input = this.getInputLocator();
+          await input.click();
+          await this.selectOption(input, value);
+          await this.confirmSelection();
         }
-        await this.confirmSelection();
       }
       async waitOptionSelection(value) {
         const option = this.page.locator(`.dx-overlay-wrapper .dx-list-item[aria-selected="true"] >> text=${value}`);
         await option.waitFor({ state: "visible", timeout: 5e3 });
       }
-      async selectOption(input, value, lastElement) {
+      async selectOption(input, value) {
         try {
           await dropDownOptionClick(value, this.page, false);
         } catch {
@@ -828,9 +827,6 @@ var init_TagBox = __esm({
           await dropDownOptionClick(value, this.page, true);
         }
         await this.waitOptionSelection(value);
-        if (value !== lastElement) {
-          await input.pressSequentially("");
-        }
       }
       async confirmSelection() {
         const btnOk = this.page.locator(BTN_OK_SELECTOR);
@@ -4053,6 +4049,8 @@ var init_ListForm = __esm({
     FIXED_DATAGRID_CONTENT_CSS_SELECTOR = ".dx-datagrid-sticky-columns .dx-datagrid-content .dx-datagrid-table.dx-datagrid-table-fixed";
     CONTEXT_MENU_CSS_SELECTOR = ".dx-datagrid";
     ListForm = class extends Form {
+      closeButtonId = "#cancel";
+      selectButtonId = "#select";
       headerCssSelector;
       fixedTableContentCssSelector;
       tableContentCssSelector;
@@ -4119,6 +4117,14 @@ var init_ListForm = __esm({
       get filterPanel() {
         return new FilterPanel(this.formName, this.page);
       }
+      async closeButtonClick() {
+        const css = await this.getButtonCssSelector(this.closeButtonId);
+        await this.page.locator(css).click();
+      }
+      async selectButtonClick() {
+        const css = await this.getButtonCssSelector(this.selectButtonId);
+        await this.page.locator(css).click();
+      }
     };
   }
 });
@@ -4271,6 +4277,12 @@ var init_Form = __esm({
         };
         return new SubForm(this.page);
       }
+      async getButtonCssSelector(buttonId) {
+        if (await this.isModal()) {
+          return `${this.popupContainerCssSelector} ${buttonId}`;
+        }
+        return buttonId;
+      }
       getContainerElement() {
         return this.page.locator(this.containerCssSelector);
       }
@@ -4297,12 +4309,6 @@ var init_FormEdit = __esm({
         super(page);
         this.popupContainerCssSelector = `.popup.form-edit-${this.formName}`;
       }
-      async getButtonCssSelector(buttonId) {
-        if (await this.isModal()) {
-          return `${this.popupContainerCssSelector} ${buttonId}`;
-        }
-        return buttonId;
-      }
       /**
        * Находит поле формы редактирования по имени
        * @example

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

@@ -383,6 +383,7 @@ declare abstract class Form extends AbstractForm {
      * expect(await form.subForm(name));
      */
     subForm(name: string, options?: SubFormOptions): Promise<unknown>;
+    protected getButtonCssSelector(buttonId: string): Promise<string>;
     protected getContainerElement(): Locator;
 }
 
@@ -487,7 +488,6 @@ declare class FormEdit extends Form {
     saveButtonId: string;
     closeButtonId: string;
     constructor(page: Page);
-    private getButtonCssSelector;
     /**
      * Находит поле формы редактирования по имени
      * @example
@@ -1029,6 +1029,8 @@ declare class ColumnFilter {
 }
 
 declare class ListForm extends Form {
+    closeButtonId: string;
+    selectButtonId: string;
     protected headerCssSelector: string;
     protected fixedTableContentCssSelector: string;
     protected tableContentCssSelector: string;
@@ -1068,6 +1070,8 @@ declare class ListForm extends Form {
      * expect(listForm.filterPanel());
      */
     get filterPanel(): FilterPanel;
+    closeButtonClick(): Promise<void>;
+    selectButtonClick(): Promise<void>;
 }
 
 declare class TreeView extends ListForm {

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

@@ -383,6 +383,7 @@ declare abstract class Form extends AbstractForm {
      * expect(await form.subForm(name));
      */
     subForm(name: string, options?: SubFormOptions): Promise<unknown>;
+    protected getButtonCssSelector(buttonId: string): Promise<string>;
     protected getContainerElement(): Locator;
 }
 
@@ -487,7 +488,6 @@ declare class FormEdit extends Form {
     saveButtonId: string;
     closeButtonId: string;
     constructor(page: Page);
-    private getButtonCssSelector;
     /**
      * Находит поле формы редактирования по имени
      * @example
@@ -1029,6 +1029,8 @@ declare class ColumnFilter {
 }
 
 declare class ListForm extends Form {
+    closeButtonId: string;
+    selectButtonId: string;
     protected headerCssSelector: string;
     protected fixedTableContentCssSelector: string;
     protected tableContentCssSelector: string;
@@ -1068,6 +1070,8 @@ declare class ListForm extends Form {
      * expect(listForm.filterPanel());
      */
     get filterPanel(): FilterPanel;
+    closeButtonClick(): Promise<void>;
+    selectButtonClick(): Promise<void>;
 }
 
 declare class TreeView extends ListForm {

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

@@ -25,7 +25,7 @@ import {
   readonlyLocator,
   wait,
   waitElementIsVisible_default
-} from "./chunk-VB77YEH6.mjs";
+} from "./chunk-XN4OIA4L.mjs";
 export {
   AbstractPage,
   ApiRequest,

package/dist/d5-testing-library.mjs

@@ -25,7 +25,7 @@ import {
   readonlyLocator,
   wait,
   waitElementIsVisible_default
-} from "./chunk-VB77YEH6.mjs";
+} from "./chunk-XN4OIA4L.mjs";
 export {
   AbstractPage,
   ApiRequest,

package/package.json

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