@skbkontur/playwright-react-ui-components 1.13.2 → 1.14.0-beta.2

package/build/src/components/DropdownMenu.js

@@ -50,46 +50,51 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DropdownMenu = void 0;
 var test_1 = require("@playwright/test");
 var react_ui_1 = require("@skbkontur/react-ui");
 var MenuFooter_1 = require("@skbkontur/react-ui/components/MenuFooter");
 var Portal_1 = require("./Portal");
-var BaseComponent_1 = require("./BaseComponent");
 var utils_1 = require("../utils");
 var assertions_1 = require("../assertions");
 var ComponentList_1 = require("./ComponentList");
 var MenuItem_1 = require("./MenuItem");
 var dataTidSelector_1 = require("../utils/dataTidSelector");
+var MenuComponent_1 = require("./MenuComponent");
+var LocatorSymbols_1 = require("../matchers/component/LocatorSymbols");
 var DropdownMenu = /** @class */ (function (_super) {
     __extends(DropdownMenu, _super);
     function DropdownMenu(rootLocator) {
         var _this = _super.call(this, rootLocator) || this;
         _this.rootLocator = rootLocator;
+        _this[_a] = function () { return _this.buttonLocator; };
+        _this[_b] = function () { return _this.getItemsLocator(); };
+        _this[_c] = function () { return _this.buttonLocator; };
         _this.buttonLocator = rootLocator.locator('button');
         _this.portal = new Portal_1.Portal(rootLocator.locator('noscript'));
         return _this;
     }
     DropdownMenu.prototype.getText = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0: return [4 /*yield*/, this.buttonLocator.innerText(options)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 1: return [2 /*return*/, _d.sent()];
                 }
             });
         });
     };
     DropdownMenu.prototype.isMenuOpened = function () {
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0: return [4 /*yield*/, this.waitFor()];
                     case 1:
-                        _a.sent();
+                        _d.sent();
                         return [4 /*yield*/, this.portal.isVisible()];
-                    case 2: return [2 /*return*/, _a.sent()];
+                    case 2: return [2 /*return*/, _d.sent()];
                 }
             });
         });
@@ -98,21 +103,21 @@ var DropdownMenu = /** @class */ (function (_super) {
         return __awaiter(this, arguments, void 0, function (text, options) {
             var items;
             if (options === void 0) { options = { closedAfterSelect: true }; }
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0: return [4 /*yield*/, this.getMenuItemsLocator(text)];
                     case 1:
-                        items = _a.sent();
+                        items = _d.sent();
                         return [4 /*yield*/, items.first().click()];
                     case 2:
-                        _a.sent();
+                        _d.sent();
                         if (!options.closedAfterSelect) return [3 /*break*/, 4];
                         // note: ожидание закрытия меню, чтобы не было гонок
                         return [4 /*yield*/, this.portal.expect().toBeHidden()];
                     case 3:
                         // note: ожидание закрытия меню, чтобы не было гонок
-                        _a.sent();
-                        _a.label = 4;
+                        _d.sent();
+                        _d.label = 4;
                     case 4: return [2 /*return*/];
                 }
             });
@@ -122,27 +127,27 @@ var DropdownMenu = /** @class */ (function (_super) {
         return __awaiter(this, arguments, void 0, function (dataTid, options) {
             var container, item;
             if (options === void 0) { options = { closedAfterSelect: true }; }
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0: return [4 /*yield*/, this.getPortalContainer()];
                     case 1:
-                        container = _a.sent();
+                        container = _d.sent();
                         item = container.locator((0, dataTidSelector_1.getDataTidSelector)(dataTid));
                         return [4 /*yield*/, item.count()];
                     case 2:
-                        if ((_a.sent()) > 1) {
+                        if ((_d.sent()) > 1) {
                             throw Error('DataTid должен быть уникальным');
                         }
                         return [4 /*yield*/, item.click()];
                     case 3:
-                        _a.sent();
+                        _d.sent();
                         if (!options.closedAfterSelect) return [3 /*break*/, 5];
                         // note: ожидание закрытия меню, чтобы не было гонок
                         return [4 /*yield*/, this.portal.expect().toBeHidden()];
                     case 4:
                         // note: ожидание закрытия меню, чтобы не было гонок
-                        _a.sent();
-                        _a.label = 5;
+                        _d.sent();
+                        _d.label = 5;
                     case 5: return [2 /*return*/];
                 }
             });
@@ -152,21 +157,21 @@ var DropdownMenu = /** @class */ (function (_super) {
         return __awaiter(this, arguments, void 0, function (index, options) {
             var items;
             if (options === void 0) { options = { closedAfterSelect: true }; }
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0: return [4 /*yield*/, this.getMenuItemsLocator()];
                     case 1:
-                        items = _a.sent();
+                        items = _d.sent();
                         return [4 /*yield*/, items.nth(index).click()];
                     case 2:
-                        _a.sent();
+                        _d.sent();
                         if (!options.closedAfterSelect) return [3 /*break*/, 4];
                         // note: ожидание закрытия меню, чтобы не было гонок
                         return [4 /*yield*/, this.portal.expect().toBeHidden()];
                     case 3:
                         // note: ожидание закрытия меню, чтобы не было гонок
-                        _a.sent();
-                        _a.label = 4;
+                        _d.sent();
+                        _d.label = 4;
                     case 4: return [2 /*return*/];
                 }
             });
@@ -174,11 +179,11 @@ var DropdownMenu = /** @class */ (function (_super) {
     };
     DropdownMenu.prototype.click = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0: return [4 /*yield*/, this.buttonLocator.click(options)];
                     case 1:
-                        _a.sent();
+                        _d.sent();
                         return [2 /*return*/];
                 }
             });
@@ -186,14 +191,14 @@ var DropdownMenu = /** @class */ (function (_super) {
     };
     DropdownMenu.prototype.focus = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0: return [4 /*yield*/, (0, test_1.expect)(this.buttonLocator).toBeEnabled()];
                     case 1:
-                        _a.sent();
+                        _d.sent();
                         return [4 /*yield*/, this.buttonLocator.focus(options)];
                     case 2:
-                        _a.sent();
+                        _d.sent();
                         return [2 /*return*/];
                 }
             });
@@ -201,22 +206,18 @@ var DropdownMenu = /** @class */ (function (_super) {
     };
     DropdownMenu.prototype.blur = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0: return [4 /*yield*/, this.buttonLocator.blur(options)];
                     case 1:
-                        _a.sent();
+                        _d.sent();
                         return [2 /*return*/];
                 }
             });
         });
     };
     DropdownMenu.prototype.getTooltip = function (type) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, (0, utils_1.getTooltip)(type, this)];
-            });
-        });
+        return (0, utils_1.getTooltip)(type, this);
     };
     /**
      * Возвращает список меню по data-tid'ам из react-ui:
@@ -227,14 +228,14 @@ var DropdownMenu = /** @class */ (function (_super) {
     DropdownMenu.prototype.getMenuItems = function () {
         return __awaiter(this, void 0, void 0, function () {
             var container;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0: return [4 /*yield*/, this.getPortalContainer()];
                     case 1:
-                        container = _a.sent();
+                        container = _d.sent();
                         return [4 /*yield*/, container.locator((0, dataTidSelector_1.getDataTidSelector)(react_ui_1.SpinnerDataTids.root)).waitFor({ state: 'hidden' })];
                     case 2:
-                        _a.sent();
+                        _d.sent();
                         return [2 /*return*/, new ComponentList_1.ComponentList(container, function (locator) {
                                 return locator
                                     .locator((0, dataTidSelector_1.getDataTidSelector)(react_ui_1.MenuItemDataTids.root))
@@ -249,23 +250,23 @@ var DropdownMenu = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var items;
             var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0: return [4 /*yield*/, this.getMenuItems()];
                     case 1:
-                        items = _a.sent();
+                        items = _d.sent();
                         return [4 /*yield*/, items.getFirstItemByPredicate(function (item) { return __awaiter(_this, void 0, void 0, function () {
                                 var itemText;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
+                                return __generator(this, function (_d) {
+                                    switch (_d.label) {
                                         case 0: return [4 /*yield*/, item.getText()];
                                         case 1:
-                                            itemText = _a.sent();
+                                            itemText = _d.sent();
                                             return [2 /*return*/, itemText.toLowerCase() === text.toLowerCase()];
                                     }
                                 });
                             }); })];
-                    case 2: return [2 /*return*/, _a.sent()];
+                    case 2: return [2 /*return*/, _d.sent()];
                 }
             });
         });
@@ -273,11 +274,11 @@ var DropdownMenu = /** @class */ (function (_super) {
     DropdownMenu.prototype.getMenuItemByIndex = function (index) {
         return __awaiter(this, void 0, void 0, function () {
             var items;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0: return [4 /*yield*/, this.getMenuItems()];
                     case 1:
-                        items = _a.sent();
+                        items = _d.sent();
                         return [2 /*return*/, items.getItemByIndex(index)];
                 }
             });
@@ -289,11 +290,11 @@ var DropdownMenu = /** @class */ (function (_super) {
     DropdownMenu.prototype.getMenuItemsLocator = function (byText) {
         return __awaiter(this, void 0, void 0, function () {
             var container, items;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0: return [4 /*yield*/, this.getPortalContainer()];
                     case 1:
-                        container = _a.sent();
+                        container = _d.sent();
                         items = container.locator((0, dataTidSelector_1.getDataTidSelector)(react_ui_1.MenuItemDataTids.root));
                         return [2 /*return*/, !byText ? items : items.getByText(byText)];
                 }
@@ -302,20 +303,21 @@ var DropdownMenu = /** @class */ (function (_super) {
     };
     DropdownMenu.prototype.getPortalContainer = function () {
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0: return [4 /*yield*/, this.isMenuOpened()];
                     case 1:
-                        if (!!(_a.sent())) return [3 /*break*/, 3];
+                        if (!!(_d.sent())) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.buttonLocator.click()];
                     case 2:
-                        _a.sent();
-                        _a.label = 3;
+                        _d.sent();
+                        _d.label = 3;
                     case 3: return [2 /*return*/, this.portal.getContainer()];
                 }
             });
         });
     };
     return DropdownMenu;
-}(BaseComponent_1.BaseComponent));
+}(MenuComponent_1.MenuComponent));
 exports.DropdownMenu = DropdownMenu;
+_a = LocatorSymbols_1.toTextElementLocator, _b = LocatorSymbols_1.toItemsElementLocator, _c = LocatorSymbols_1.toFocusableElementLocator;

package/build/src/components/FileUploader.d.ts

@@ -5,9 +5,11 @@ import { Label } from './Label';
 import { type TooltipType } from '../utils';
 import { FileUploaderAssertions } from '../assertions';
 import type { ClickOptions, IsDisabledOptions, SetInputFilesOptions } from '../options';
+import { toControlElementLocator } from '../matchers/component/LocatorSymbols';
 export declare class FileUploader extends BaseComponent {
-    private readonly inputLocator;
+    readonly inputLocator: Locator;
     readonly files: ComponentList<File>;
+    readonly [toControlElementLocator]: () => Locator;
     constructor(rootLocator: Locator);
     isDisabled(options?: IsDisabledOptions): Promise<boolean>;
     setInputFiles(files: string | ReadonlyArray<string> | {

package/build/src/components/FileUploader.js

@@ -50,6 +50,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileUploader = void 0;
 var BaseComponent_1 = require("./BaseComponent");
@@ -58,31 +59,33 @@ var Label_1 = require("./Label");
 var utils_1 = require("../utils");
 var assertions_1 = require("../assertions");
 var dataTidSelector_1 = require("../utils/dataTidSelector");
+var LocatorSymbols_1 = require("../matchers/component/LocatorSymbols");
 var FileUploader = /** @class */ (function (_super) {
     __extends(FileUploader, _super);
     function FileUploader(rootLocator) {
         var _this = _super.call(this, rootLocator) || this;
+        _this[_a] = function () { return _this.inputLocator; };
         _this.inputLocator = rootLocator.locator('input');
         _this.files = new ComponentList_1.ComponentList(rootLocator, function (locator) { return locator.locator((0, dataTidSelector_1.getDataTidSelector)('FileUploader__file')); }, function (locator) { return new File(locator); });
         return _this;
     }
     FileUploader.prototype.isDisabled = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.inputLocator.isDisabled(options)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 1: return [2 /*return*/, _b.sent()];
                 }
             });
         });
     };
     FileUploader.prototype.setInputFiles = function (files, options) {
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.inputLocator.setInputFiles(files, options)];
                     case 1:
-                        _a.sent();
+                        _b.sent();
                         return [2 /*return*/];
                 }
             });
@@ -91,19 +94,19 @@ var FileUploader = /** @class */ (function (_super) {
     FileUploader.prototype.removeAllFiles = function (options) {
         return __awaiter(this, void 0, void 0, function () {
             var files, i;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.files.getItems()];
                     case 1:
-                        files = _a.sent();
+                        files = _b.sent();
                         i = files.length - 1;
-                        _a.label = 2;
+                        _b.label = 2;
                     case 2:
                         if (!(i >= 0)) return [3 /*break*/, 5];
                         return [4 /*yield*/, files[i].remove(options)];
                     case 3:
-                        _a.sent();
-                        _a.label = 4;
+                        _b.sent();
+                        _b.label = 4;
                     case 4:
                         i--;
                         return [3 /*break*/, 2];
@@ -116,24 +119,24 @@ var FileUploader = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var file;
             var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.files.getFirstItemByPredicate(function (file) { return __awaiter(_this, void 0, void 0, function () {
                             var fileName;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
                                     case 0: return [4 /*yield*/, file.name.getText()];
                                     case 1:
-                                        fileName = _a.sent();
+                                        fileName = _b.sent();
                                         return [2 /*return*/, fileName.toLowerCase() === name.toLowerCase()];
                                 }
                             });
                         }); })];
                     case 1:
-                        file = _a.sent();
+                        file = _b.sent();
                         return [4 /*yield*/, file.remove(options)];
                     case 2:
-                        _a.sent();
+                        _b.sent();
                         return [2 /*return*/];
                 }
             });
@@ -142,14 +145,14 @@ var FileUploader = /** @class */ (function (_super) {
     FileUploader.prototype.removeFileByIndex = function (index, options) {
         return __awaiter(this, void 0, void 0, function () {
             var file;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.files.getItemByIndex(index)];
                     case 1:
-                        file = _a.sent();
+                        file = _b.sent();
                         return [4 /*yield*/, file.remove(options)];
                     case 2:
-                        _a.sent();
+                        _b.sent();
                         return [2 /*return*/];
                 }
             });
@@ -159,35 +162,32 @@ var FileUploader = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var files;
             var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.files.getItems()];
                     case 1:
-                        files = _a.sent();
-                        return [4 /*yield*/, Promise.all(files.map(function (file) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                                switch (_a.label) {
+                        files = _b.sent();
+                        return [4 /*yield*/, Promise.all(files.map(function (file) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_b) {
+                                switch (_b.label) {
                                     case 0: return [4 /*yield*/, file.name.getText()];
-                                    case 1: return [2 /*return*/, _a.sent()];
+                                    case 1: return [2 /*return*/, _b.sent()];
                                 }
                             }); }); }))];
-                    case 2: return [2 /*return*/, _a.sent()];
+                    case 2: return [2 /*return*/, _b.sent()];
                 }
             });
         });
     };
     FileUploader.prototype.getTooltip = function (type) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, (0, utils_1.getTooltip)(type, this)];
-            });
-        });
+        return (0, utils_1.getTooltip)(type, this);
     };
     FileUploader.prototype.expect = function () {
-        return new assertions_1.FileUploaderAssertions(this, this.inputLocator);
+        return new assertions_1.FileUploaderAssertions(this);
     };
     return FileUploader;
 }(BaseComponent_1.BaseComponent));
 exports.FileUploader = FileUploader;
+_a = LocatorSymbols_1.toControlElementLocator;
 var File = /** @class */ (function (_super) {
     __extends(File, _super);
     function File(rootLocator) {
@@ -199,11 +199,11 @@ var File = /** @class */ (function (_super) {
     }
     File.prototype.remove = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.icon.click(options)];
                     case 1:
-                        _a.sent();
+                        _b.sent();
                         return [2 /*return*/];
                 }
             });

package/build/src/components/FxInput.d.ts

@@ -3,9 +3,13 @@ import { BaseComponent } from './BaseComponent';
 import { type TooltipType } from '../utils';
 import { FxInputAssertions } from '../assertions';
 import type { BlurOptions, ClearOptions, ClickOptions, FillOptions, FocusOptions, InputValueOptions, IsDisabledOptions, IsVisibleOptions, PressOptions, PressSequentiallyOptions } from '../options';
+import { toControlElementLocator, toValueElementLocator, toFocusableElementLocator } from '../matchers/component/LocatorSymbols';
 export declare class FxInput extends BaseComponent {
     readonly autoButtonLocator: Locator;
     readonly inputLocator: Locator;
+    readonly [toControlElementLocator]: () => Locator;
+    readonly [toValueElementLocator]: () => Locator;
+    readonly [toFocusableElementLocator]: () => Locator;
     constructor(rootLocator: Locator);
     isDisabled(options?: IsDisabledOptions): Promise<boolean>;
     getValue(options?: InputValueOptions): Promise<string>;