@skbkontur/playwright-react-ui-components 1.18.0-beta.1 → 1.18.0-beta.2

package/build/src/assertions/CurrencyLabelAssertions.d.ts

@@ -0,0 +1,8 @@
+import { BaseComponentAssertions } from './BaseComponentAssertions';
+import type { CurrencyLabel } from '../components';
+import type { CurrencyLabelAssertionOptions } from '../options';
+export declare class CurrencyLabelAssertions extends BaseComponentAssertions {
+    private readonly currencyLabel;
+    constructor(currencyLabel: CurrencyLabel);
+    toHaveValue(value: string | number, assertionOptions?: CurrencyLabelAssertionOptions): Promise<void>;
+}

package/build/src/assertions/CurrencyLabelAssertions.js

@@ -0,0 +1,103 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CurrencyLabelAssertions = void 0;
+var CurrencyHelper_1 = require("@skbkontur/react-ui/components/CurrencyInput/CurrencyHelper");
+var extensions_1 = require("../extensions");
+var BaseComponentAssertions_1 = require("./BaseComponentAssertions");
+/**
+ * Если `assertionOptions` не определен или в нем нет такого `key` - берем значение из `baseOptions`
+ * Иначе берем значение `key` из `assertionOptions`
+ */
+function pickOption(baseOptions, assertionOptions, key) {
+    var _a;
+    if (assertionOptions === undefined || !(key in assertionOptions)) {
+        return (_a = baseOptions[key]) !== null && _a !== void 0 ? _a : undefined;
+    }
+    return assertionOptions[key];
+}
+var CurrencyLabelAssertions = /** @class */ (function (_super) {
+    __extends(CurrencyLabelAssertions, _super);
+    function CurrencyLabelAssertions(currencyLabel) {
+        var _this = _super.call(this, currencyLabel) || this;
+        _this.currencyLabel = currencyLabel;
+        return _this;
+    }
+    CurrencyLabelAssertions.prototype.toHaveValue = function (value, assertionOptions) {
+        return __awaiter(this, void 0, void 0, function () {
+            var baseOptions, format, formattedValue, text;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        baseOptions = (_a = this.currencyLabel.options) !== null && _a !== void 0 ? _a : {};
+                        format = {
+                            currencySymbol: pickOption(baseOptions, assertionOptions, 'currencySymbol'),
+                            fractionDigits: pickOption(baseOptions, assertionOptions, 'fractionDigits'),
+                            hideTrailingZeros: pickOption(baseOptions, assertionOptions, 'hideTrailingZeros'),
+                        };
+                        formattedValue = typeof value === 'number' ? CurrencyHelper_1.CurrencyHelper.format(value, format) : CurrencyHelper_1.CurrencyHelper.formatString(value, format);
+                        text = format.currencySymbol ? "".concat(formattedValue, "\u00A0").concat(format.currencySymbol) : formattedValue;
+                        return [4 /*yield*/, (0, extensions_1.expect)(this.currencyLabel.rootLocator).toHaveText(text, {
+                                timeout: assertionOptions === null || assertionOptions === void 0 ? void 0 : assertionOptions.timeout,
+                            })];
+                    case 1:
+                        _b.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return CurrencyLabelAssertions;
+}(BaseComponentAssertions_1.BaseComponentAssertions));
+exports.CurrencyLabelAssertions = CurrencyLabelAssertions;

package/build/src/assertions/index.d.ts

@@ -11,6 +11,7 @@ export { RadioAssertions } from './RadioAssertions';
 export { RadioGroupAssertions } from './RadioGroupAssertions';
 export { InputAssertions } from './InputAssertions';
 export { CurrencyInputAssertions } from './CurrencyInputAssertions';
+export { CurrencyLabelAssertions } from './CurrencyLabelAssertions';
 export { TokenAssertions } from './TokenAssertions';
 export { TokenInputAssertions } from './TokenInputAssertions';
 export { TextareaAssertions } from './TextareaAssertions';

package/build/src/assertions/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PagingAssertions = exports.KebabAssertions = exports.FxInputAssertions = exports.FileUploaderAssertions = exports.DateInputAssertions = exports.AutocompleteAssertions = exports.SpinnerAssertions = exports.LoaderAssertions = exports.TabAssertions = exports.TabsAssertions = exports.LinkAssertions = exports.ToggleAssertions = exports.SelectAssertions = exports.ToastAssertions = exports.DropdownAssertions = exports.DropdownMenuAssertions = exports.DateRangePickerAssertions = exports.DatePickerAssertions = exports.TextareaAssertions = exports.TokenInputAssertions = exports.TokenAssertions = exports.CurrencyInputAssertions = exports.InputAssertions = exports.RadioGroupAssertions = exports.RadioAssertions = exports.MenuItemAssertations = exports.LabelAssertions = exports.ComponentListAssertions = exports.ComboBoxAssertions = exports.CheckboxAssertions = exports.TooltipAssertions = exports.PortalAssertions = exports.ButtonAssertions = exports.BaseComponentAssertions = void 0;
+exports.PagingAssertions = exports.KebabAssertions = exports.FxInputAssertions = exports.FileUploaderAssertions = exports.DateInputAssertions = exports.AutocompleteAssertions = exports.SpinnerAssertions = exports.LoaderAssertions = exports.TabAssertions = exports.TabsAssertions = exports.LinkAssertions = exports.ToggleAssertions = exports.SelectAssertions = exports.ToastAssertions = exports.DropdownAssertions = exports.DropdownMenuAssertions = exports.DateRangePickerAssertions = exports.DatePickerAssertions = exports.TextareaAssertions = exports.TokenInputAssertions = exports.TokenAssertions = exports.CurrencyLabelAssertions = exports.CurrencyInputAssertions = exports.InputAssertions = exports.RadioGroupAssertions = exports.RadioAssertions = exports.MenuItemAssertations = exports.LabelAssertions = exports.ComponentListAssertions = exports.ComboBoxAssertions = exports.CheckboxAssertions = exports.TooltipAssertions = exports.PortalAssertions = exports.ButtonAssertions = exports.BaseComponentAssertions = void 0;
 var BaseComponentAssertions_1 = require("./BaseComponentAssertions");
 Object.defineProperty(exports, "BaseComponentAssertions", { enumerable: true, get: function () { return BaseComponentAssertions_1.BaseComponentAssertions; } });
 var ButtonAssertions_1 = require("./ButtonAssertions");
@@ -27,6 +27,8 @@ var InputAssertions_1 = require("./InputAssertions");
 Object.defineProperty(exports, "InputAssertions", { enumerable: true, get: function () { return InputAssertions_1.InputAssertions; } });
 var CurrencyInputAssertions_1 = require("./CurrencyInputAssertions");
 Object.defineProperty(exports, "CurrencyInputAssertions", { enumerable: true, get: function () { return CurrencyInputAssertions_1.CurrencyInputAssertions; } });
+var CurrencyLabelAssertions_1 = require("./CurrencyLabelAssertions");
+Object.defineProperty(exports, "CurrencyLabelAssertions", { enumerable: true, get: function () { return CurrencyLabelAssertions_1.CurrencyLabelAssertions; } });
 var TokenAssertions_1 = require("./TokenAssertions");
 Object.defineProperty(exports, "TokenAssertions", { enumerable: true, get: function () { return TokenAssertions_1.TokenAssertions; } });
 var TokenInputAssertions_1 = require("./TokenInputAssertions");

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

@@ -2,9 +2,8 @@ import type { Locator, Page } from '@playwright/test';
 import { BaseComponentAssertions } from '../assertions';
 import type { ClickOptions, GetAttributeOptions, HoverOptions, IsVisibleOptions, ScrollIntoViewIfNeededOptions, WaitForOptions } from '../options';
 import { toVisibleElementLocator, toRootElementLocator, toHaveAttributeElementLocator } from '../matchers/component/LocatorSymbols';
-import type { Tooltip } from './Tooltip';
 export declare abstract class BaseComponent {
-    rootLocator: Locator;
+    readonly rootLocator: Locator;
     readonly page: Page;
     readonly [toVisibleElementLocator]: () => Locator;
     readonly [toRootElementLocator]: () => Locator;
@@ -19,6 +18,5 @@ export declare abstract class BaseComponent {
     waitFor(options?: WaitForOptions): Promise<void>;
     hasAttribute(name: string, options?: GetAttributeOptions): Promise<boolean>;
     getAttribute(name: string, options?: GetAttributeOptions): Promise<string | null>;
-    getTooltipAsync<TTooltip extends Tooltip>(TooltipClass: new (target: BaseComponent) => TTooltip, customId?: string): Promise<TTooltip>;
     expect(): BaseComponentAssertions;
 }

package/build/src/components/BaseComponent.js

@@ -157,21 +157,6 @@ var BaseComponent = /** @class */ (function () {
             });
         });
     };
-    BaseComponent.prototype.getTooltipAsync = function (TooltipClass, customId) {
-        return __awaiter(this, void 0, void 0, function () {
-            var tooltip;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        tooltip = new TooltipClass(this);
-                        return [4 /*yield*/, tooltip.initAsync(customId)];
-                    case 1:
-                        _d.sent();
-                        return [2 /*return*/, tooltip];
-                }
-            });
-        });
-    };
     BaseComponent.prototype.expect = function () {
         return new assertions_1.BaseComponentAssertions(this);
     };

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

@@ -0,0 +1,22 @@
+import type { Locator } from '@playwright/test';
+import { BaseComponent } from './BaseComponent';
+import { CurrencyLabelAssertions } from '../assertions';
+import { type TooltipType } from '../utils';
+import type { GetAttributeOptions, InnerTextOptions } from '../options';
+export type CurrencyLabelOptions = {
+    /** Символ валюты */
+    currencySymbol?: string;
+    /** Минимальное количество отображаемых знаков после запятой */
+    fractionDigits?: number;
+    /** Убирает лишние нули после запятой */
+    hideTrailingZeros?: boolean;
+};
+export declare class CurrencyLabel extends BaseComponent {
+    readonly rootLocator: Locator;
+    readonly options: CurrencyLabelOptions;
+    constructor(rootLocator: Locator, options?: CurrencyLabelOptions);
+    isDisabled(options?: GetAttributeOptions): Promise<boolean>;
+    getText(options?: InnerTextOptions): Promise<string>;
+    getTooltip(type: TooltipType): Promise<import("./Tooltip").Tooltip>;
+    expect(): CurrencyLabelAssertions;
+}

package/build/src/components/{ValidationTooltip.js → CurrencyLabel.js}

@@ -51,57 +51,38 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ValidationTooltip = void 0;
-var Tooltip_1 = require("./Tooltip");
-var Portal_1 = require("./Portal");
-function isFocusable(value) {
-    return typeof (value === null || value === void 0 ? void 0 : value.focus) === 'function';
-}
-var ValidationTooltip = /** @class */ (function (_super) {
-    __extends(ValidationTooltip, _super);
-    function ValidationTooltip(targetControl) {
-        var _this = _super.call(this, targetControl) || this;
-        _this.portal = new Portal_1.Portal(_this.targetControl.rootLocator.locator('../../noscript'));
+exports.CurrencyLabel = void 0;
+var BaseComponent_1 = require("./BaseComponent");
+var assertions_1 = require("../assertions");
+var utils_1 = require("../utils");
+var CurrencyLabel = /** @class */ (function (_super) {
+    __extends(CurrencyLabel, _super);
+    function CurrencyLabel(rootLocator, options) {
+        if (options === void 0) { options = {}; }
+        var _this = _super.call(this, rootLocator) || this;
+        _this.rootLocator = rootLocator;
+        _this.options = options;
         return _this;
     }
-    ValidationTooltip.prototype.showAsync = function () {
+    CurrencyLabel.prototype.isDisabled = function (options) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.targetControl.rootLocator.press('Tab')];
-                    case 1:
-                        _a.sent();
-                        if (!isFocusable(this.targetControl)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.targetControl.focus()];
-                    case 2:
-                        _a.sent();
-                        return [3 /*break*/, 5];
-                    case 3: return [4 /*yield*/, this.targetControl.rootLocator.focus()];
-                    case 4:
-                        _a.sent();
-                        _a.label = 5;
-                    case 5: return [2 /*return*/];
+                    case 0: return [4 /*yield*/, this.getAttribute(utils_1.DataVisualState.Disabled, options)];
+                    case 1: return [2 /*return*/, (_a.sent()) !== null];
                 }
             });
         });
     };
-    ValidationTooltip.prototype.initAsync = function (customTid) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.portal.rootLocator.count()];
-                    case 1:
-                        if ((_a.sent()) > 1) {
-                            this.portal = new Portal_1.Portal(this.targetControl.rootLocator.locator('../following-sibling::noscript[1]'));
-                        }
-                        return [4 /*yield*/, _super.prototype.initAsync.call(this, customTid)];
-                    case 2:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
+    CurrencyLabel.prototype.getText = function (options) {
+        return this.rootLocator.innerText(options);
+    };
+    CurrencyLabel.prototype.getTooltip = function (type) {
+        return (0, utils_1.getTooltip)(type, this);
+    };
+    CurrencyLabel.prototype.expect = function () {
+        return new assertions_1.CurrencyLabelAssertions(this);
     };
-    return ValidationTooltip;
-}(Tooltip_1.Tooltip));
-exports.ValidationTooltip = ValidationTooltip;
+    return CurrencyLabel;
+}(BaseComponent_1.BaseComponent));
+exports.CurrencyLabel = CurrencyLabel;

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

@@ -3,18 +3,20 @@ import { BaseComponent } from './BaseComponent';
 import { TooltipAssertions } from '../assertions';
 import type { InnerTextOptions } from '../options';
 import { toTextElementLocator } from '../matchers/component/LocatorSymbols';
-import { Portal } from './Portal';
 export declare class Tooltip extends BaseComponent {
-    protected portal: Portal;
-    protected targetControl: BaseComponent;
+    readonly rootLocator: Locator;
+    private readonly closeLocator;
+    private readonly contentLocator;
     readonly [toTextElementLocator]: () => Locator;
-    constructor(targetControl: BaseComponent);
+    constructor(rootLocator: Locator);
     getText(options?: InnerTextOptions): Promise<string>;
     getContent(): Locator;
-    get contentLocator(): Locator;
-    get crossLocator(): Locator;
     close(): Promise<void>;
     expect(): TooltipAssertions;
-    protected showAsync(): Promise<void>;
-    initAsync(customTid?: string): Promise<void>;
 }
+/**
+ * @deprecated createXXXControl feature for migration from '@skbkontur/react-ui-playwright-controls'
+ * Task: IF-2498
+ */
+export declare const createTooltipControl: (context: Locator, options?: import("..").DataTIdOption) => Tooltip;
+export type TooltipControl = Tooltip;

package/build/src/components/Tooltip.js

@@ -52,24 +52,21 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Tooltip = void 0;
+exports.createTooltipControl = exports.Tooltip = void 0;
 var Tooltip_1 = require("@skbkontur/react-ui/components/Tooltip");
 var BaseComponent_1 = require("./BaseComponent");
 var assertions_1 = require("../assertions");
 var dataTidSelector_1 = require("../utils/dataTidSelector");
 var LocatorSymbols_1 = require("../matchers/component/LocatorSymbols");
-var Portal_1 = require("./Portal");
+var createComponentFactory_1 = require("../utils/createComponentFactory");
 var Tooltip = /** @class */ (function (_super) {
     __extends(Tooltip, _super);
-    function Tooltip(targetControl) {
-        var _this = _super.call(this, targetControl.rootLocator) || this;
+    function Tooltip(rootLocator) {
+        var _this = _super.call(this, rootLocator) || this;
+        _this.rootLocator = rootLocator;
         _this[_a] = function () { return _this.rootLocator; };
-        var parentContainer = targetControl.rootLocator.locator('xpath=..');
-        var exactNoscriptLocator = parentContainer.locator('> noscript');
-        _this.portal = new Portal_1.Portal(exactNoscriptLocator);
-        var page = targetControl.rootLocator.page();
-        _this.rootLocator = page.locator("[data-tid='PopupContent']");
-        _this.targetControl = targetControl;
+        _this.contentLocator = rootLocator.locator((0, dataTidSelector_1.getDataTidSelector)(Tooltip_1.TooltipDataTids.content));
+        _this.closeLocator = rootLocator.locator((0, dataTidSelector_1.getDataTidSelector)(Tooltip_1.TooltipDataTids.crossIcon));
         return _this;
     }
     Tooltip.prototype.getText = function (options) {
@@ -78,25 +75,11 @@ var Tooltip = /** @class */ (function (_super) {
     Tooltip.prototype.getContent = function () {
         return this.contentLocator;
     };
-    Object.defineProperty(Tooltip.prototype, "contentLocator", {
-        get: function () {
-            return this.rootLocator.locator((0, dataTidSelector_1.getDataTidSelector)(Tooltip_1.TooltipDataTids.content));
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(Tooltip.prototype, "crossLocator", {
-        get: function () {
-            return this.rootLocator.locator((0, dataTidSelector_1.getDataTidSelector)(Tooltip_1.TooltipDataTids.crossIcon));
-        },
-        enumerable: false,
-        configurable: true
-    });
     Tooltip.prototype.close = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_b) {
                 switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.crossLocator.click()];
+                    case 0: return [4 /*yield*/, this.closeLocator.click()];
                     case 1:
                         _b.sent();
                         return [4 /*yield*/, this.waitFor({ state: 'hidden' })];
@@ -110,33 +93,12 @@ var Tooltip = /** @class */ (function (_super) {
     Tooltip.prototype.expect = function () {
         return new assertions_1.TooltipAssertions(this);
     };
-    Tooltip.prototype.showAsync = function () {
-        return Promise.resolve();
-    };
-    Tooltip.prototype.initAsync = function (customTid) {
-        return __awaiter(this, void 0, void 0, function () {
-            var container, page;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.showAsync()];
-                    case 1:
-                        _b.sent();
-                        if (!(customTid === undefined || customTid === null)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.portal.getContainer()];
-                    case 2:
-                        container = _b.sent();
-                        this.rootLocator = container.locator("[data-tid='PopupContent']");
-                        return [3 /*break*/, 4];
-                    case 3:
-                        page = this.targetControl.rootLocator.page();
-                        this.rootLocator = page.locator("[data-tid='".concat(customTid, "']"));
-                        _b.label = 4;
-                    case 4: return [2 /*return*/];
-                }
-            });
-        });
-    };
     return Tooltip;
 }(BaseComponent_1.BaseComponent));
 exports.Tooltip = Tooltip;
 _a = LocatorSymbols_1.toTextElementLocator;
+/**
+ * @deprecated createXXXControl feature for migration from '@skbkontur/react-ui-playwright-controls'
+ * Task: IF-2498
+ */
+exports.createTooltipControl = (0, createComponentFactory_1.createComponentTIdFactory)(Tooltip);

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

@@ -1,14 +1,13 @@
 export { BaseComponent } from './BaseComponent';
 export { ComponentList } from './ComponentList';
 export { MenuComponent } from './MenuComponent';
-export { InfoTooltip } from './InfoTooltip';
-export { ValidationTooltip } from './ValidationTooltip';
-export { Tooltip } from './Tooltip';
 export { Button, createButtonControl, type ButtonControl } from './Button';
+export { Tooltip, createTooltipControl, type TooltipControl } from './Tooltip';
 export { Portal, createPortalControl, type PortalControl } from './Portal';
 export { Checkbox, createCheckboxControl, type CheckboxControl } from './Checkbox';
 export { ComboBox, createComboBoxControl, type ComboBoxControl } from './ComboBox';
 export { Label, createLabelControl, type LabelControl } from './Label';
+export { CurrencyLabel } from './CurrencyLabel';
 export { MenuItem, createMenuItemControl, type MenuItemControl } from './MenuItem';
 export { Radio, createRadioControl, type RadioControl } from './Radio';
 export { RadioGroup, createRadioGroupControl, type RadioGroupControl } from './RadioGroup';

package/build/src/components/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTabsControl = exports.Tabs = exports.createLinkControl = exports.Link = exports.createToggleControl = exports.Toggle = exports.createSelectControl = exports.Select = exports.createToastControl = exports.Toast = exports.createDropdownControl = exports.Dropdown = exports.createDropdownMenuControl = exports.DropdownMenu = exports.createTextareaControl = exports.Textarea = exports.createDateRangePickerControl = exports.DateRangePicker = exports.createDatePickerControl = exports.DatePicker = exports.createTokenInputControl = exports.TokenInput = exports.createTokenControl = exports.Token = exports.createCurrencyInputControl = exports.CurrencyInput = exports.createInputControl = exports.Input = exports.createRadioGroupControl = exports.RadioGroup = exports.createRadioControl = exports.Radio = exports.createMenuItemControl = exports.MenuItem = exports.createLabelControl = exports.Label = exports.createComboBoxControl = exports.ComboBox = exports.createCheckboxControl = exports.Checkbox = exports.createPortalControl = exports.Portal = exports.createButtonControl = exports.Button = exports.Tooltip = exports.ValidationTooltip = exports.InfoTooltip = exports.MenuComponent = exports.ComponentList = exports.BaseComponent = void 0;
+exports.createTabsControl = exports.Tabs = exports.createLinkControl = exports.Link = exports.createToggleControl = exports.Toggle = exports.createSelectControl = exports.Select = exports.createToastControl = exports.Toast = exports.createDropdownControl = exports.Dropdown = exports.createDropdownMenuControl = exports.DropdownMenu = exports.createTextareaControl = exports.Textarea = exports.createDateRangePickerControl = exports.DateRangePicker = exports.createDatePickerControl = exports.DatePicker = exports.createTokenInputControl = exports.TokenInput = exports.createTokenControl = exports.Token = exports.createCurrencyInputControl = exports.CurrencyInput = exports.createInputControl = exports.Input = exports.createRadioGroupControl = exports.RadioGroup = exports.createRadioControl = exports.Radio = exports.createMenuItemControl = exports.MenuItem = exports.CurrencyLabel = exports.createLabelControl = exports.Label = exports.createComboBoxControl = exports.ComboBox = exports.createCheckboxControl = exports.Checkbox = exports.createPortalControl = exports.Portal = exports.createTooltipControl = exports.Tooltip = exports.createButtonControl = exports.Button = exports.MenuComponent = exports.ComponentList = exports.BaseComponent = void 0;
 exports.createPagingControl = exports.Paging = exports.createKebabControl = exports.Kebab = exports.createFxInputControl = exports.FxInput = exports.createFileUploaderControl = exports.FileUploader = exports.createDateInputControl = exports.DateInput = exports.createAutocompleteControl = exports.Autocomplete = exports.createSpinnerControl = exports.Spinner = exports.createLoaderControl = exports.Loader = exports.createTabControl = exports.Tab = void 0;
 var BaseComponent_1 = require("./BaseComponent");
 Object.defineProperty(exports, "BaseComponent", { enumerable: true, get: function () { return BaseComponent_1.BaseComponent; } });
@@ -8,15 +8,12 @@ var ComponentList_1 = require("./ComponentList");
 Object.defineProperty(exports, "ComponentList", { enumerable: true, get: function () { return ComponentList_1.ComponentList; } });
 var MenuComponent_1 = require("./MenuComponent");
 Object.defineProperty(exports, "MenuComponent", { enumerable: true, get: function () { return MenuComponent_1.MenuComponent; } });
-var InfoTooltip_1 = require("./InfoTooltip");
-Object.defineProperty(exports, "InfoTooltip", { enumerable: true, get: function () { return InfoTooltip_1.InfoTooltip; } });
-var ValidationTooltip_1 = require("./ValidationTooltip");
-Object.defineProperty(exports, "ValidationTooltip", { enumerable: true, get: function () { return ValidationTooltip_1.ValidationTooltip; } });
-var Tooltip_1 = require("./Tooltip");
-Object.defineProperty(exports, "Tooltip", { enumerable: true, get: function () { return Tooltip_1.Tooltip; } });
 var Button_1 = require("./Button");
 Object.defineProperty(exports, "Button", { enumerable: true, get: function () { return Button_1.Button; } });
 Object.defineProperty(exports, "createButtonControl", { enumerable: true, get: function () { return Button_1.createButtonControl; } });
+var Tooltip_1 = require("./Tooltip");
+Object.defineProperty(exports, "Tooltip", { enumerable: true, get: function () { return Tooltip_1.Tooltip; } });
+Object.defineProperty(exports, "createTooltipControl", { enumerable: true, get: function () { return Tooltip_1.createTooltipControl; } });
 var Portal_1 = require("./Portal");
 Object.defineProperty(exports, "Portal", { enumerable: true, get: function () { return Portal_1.Portal; } });
 Object.defineProperty(exports, "createPortalControl", { enumerable: true, get: function () { return Portal_1.createPortalControl; } });
@@ -29,6 +26,8 @@ Object.defineProperty(exports, "createComboBoxControl", { enumerable: true, get:
 var Label_1 = require("./Label");
 Object.defineProperty(exports, "Label", { enumerable: true, get: function () { return Label_1.Label; } });
 Object.defineProperty(exports, "createLabelControl", { enumerable: true, get: function () { return Label_1.createLabelControl; } });
+var CurrencyLabel_1 = require("./CurrencyLabel");
+Object.defineProperty(exports, "CurrencyLabel", { enumerable: true, get: function () { return CurrencyLabel_1.CurrencyLabel; } });
 var MenuItem_1 = require("./MenuItem");
 Object.defineProperty(exports, "MenuItem", { enumerable: true, get: function () { return MenuItem_1.MenuItem; } });
 Object.defineProperty(exports, "createMenuItemControl", { enumerable: true, get: function () { return MenuItem_1.createMenuItemControl; } });

package/build/src/matchers/component/toBeDisabled.d.ts

@@ -1,3 +1,3 @@
 import type { AttributeOptions, EnabledOptions } from '../../options';
 import type { ControlElementLocator } from './LocatorSymbols';
-export declare const toBeDisabled: (this: import("@playwright/test").ExpectMatcherState, component: ControlElementLocator, args_0?: EnabledOptions | AttributeOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
+export declare const toBeDisabled: (this: import("@playwright/test").ExpectMatcherState, component: ControlElementLocator, args_0?: AttributeOptions | EnabledOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;

package/build/src/matchers/componentMatchers.d.ts

@@ -3,7 +3,7 @@ declare const matchers: {
     readonly toBeVisible: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").VisibleElementLocator, args_0?: import("..").VisibleOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     readonly toBeHidden: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").VisibleElementLocator, args_0?: import("..").HiddenOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     readonly toBeEnabled: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ControlElementLocator, args_0?: import("..").EnabledOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
-    readonly toBeDisabled: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ControlElementLocator, args_0?: import("..").EnabledOptions | import("..").AttributeOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
+    readonly toBeDisabled: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ControlElementLocator, args_0?: import("..").AttributeOptions | import("..").EnabledOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     readonly toBeFocused: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ToBeFocusableElementLocator, args_0?: import("..").FocusedOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     readonly toBeChecked: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ToBeCheckableElementLocator, args_0?: import("..").CheckedOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     readonly toBeAutoMode: (this: import("@playwright/test").ExpectMatcherState, component: import("..").FxInput, args_0?: import("..").VisibleOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
@@ -72,7 +72,7 @@ declare const matchers: {
      * @deprecated will be removed in the next major version
      * @see {@link toBeDisabled}
      */
-    readonly toBeDisabledEx: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ControlElementLocator, args_0?: import("..").EnabledOptions | import("..").AttributeOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
+    readonly toBeDisabledEx: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ControlElementLocator, args_0?: import("..").AttributeOptions | import("..").EnabledOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     /**
      * @deprecated will be removed in the next major version
      * @see {@link toBeFocused}
@@ -133,7 +133,7 @@ export declare const componentMatchers: import("@playwright/test").Expect<{
     readonly toBeVisible: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").VisibleElementLocator, args_0?: import("..").VisibleOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     readonly toBeHidden: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").VisibleElementLocator, args_0?: import("..").HiddenOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     readonly toBeEnabled: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ControlElementLocator, args_0?: import("..").EnabledOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
-    readonly toBeDisabled: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ControlElementLocator, args_0?: import("..").EnabledOptions | import("..").AttributeOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
+    readonly toBeDisabled: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ControlElementLocator, args_0?: import("..").AttributeOptions | import("..").EnabledOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     readonly toBeFocused: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ToBeFocusableElementLocator, args_0?: import("..").FocusedOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     readonly toBeChecked: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ToBeCheckableElementLocator, args_0?: import("..").CheckedOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     readonly toBeAutoMode: (this: import("@playwright/test").ExpectMatcherState, component: import("..").FxInput, args_0?: import("..").VisibleOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
@@ -202,7 +202,7 @@ export declare const componentMatchers: import("@playwright/test").Expect<{
      * @deprecated will be removed in the next major version
      * @see {@link toBeDisabled}
      */
-    readonly toBeDisabledEx: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ControlElementLocator, args_0?: import("..").EnabledOptions | import("..").AttributeOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
+    readonly toBeDisabledEx: (this: import("@playwright/test").ExpectMatcherState, component: import("./component/LocatorSymbols").ControlElementLocator, args_0?: import("..").AttributeOptions | import("..").EnabledOptions | undefined) => Promise<import("@playwright/test").MatcherReturnType>;
     /**
      * @deprecated will be removed in the next major version
      * @see {@link toBeFocused}

package/build/src/options/AssertionOptions.d.ts

@@ -1,3 +1,4 @@
+import type { CurrencyLabelOptions } from '../components/CurrencyLabel';
 export type VisibleOptions = {
     /**
      * Time to retry the assertion for in milliseconds. Defaults to `timeout` in `TestConfig.expect`.
@@ -80,3 +81,10 @@ export type TransformOptions = {
      */
     timeout?: number;
 };
+export type CurrencyLabelAssertionOptions = CurrencyLabelOptions & {
+    /**
+     * Time to retry the assertion for in milliseconds.
+     * Defaults to `timeout` in TestConfig.expect.
+     */
+    timeout?: number;
+};

package/build/src/utils/tooltipProvider.d.ts

@@ -1,4 +1,4 @@
-import type { Tooltip } from '../components';
+import { Tooltip } from '../components';
 import type { BaseComponent } from '../components';
 import { TooltipType } from './constants';
 export declare function getTooltip(type: TooltipType, component: BaseComponent): Promise<Tooltip>;

package/build/src/utils/tooltipProvider.js

@@ -37,29 +37,58 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTooltip = getTooltip;
-var InfoTooltip_1 = require("../components/InfoTooltip");
-var ValidationTooltip_1 = require("../components/ValidationTooltip");
+var Popup_1 = require("@skbkontur/react-ui/internal/Popup");
+var components_1 = require("../components");
+var components_2 = require("../components");
 var constants_1 = require("./constants");
+var dataTidSelector_1 = require("./dataTidSelector");
+function isFocusable(value) {
+    return typeof (value === null || value === void 0 ? void 0 : value.focus) === 'function';
+}
 function getTooltip(type, component) {
     return __awaiter(this, void 0, void 0, function () {
-        var tooltip;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var portal, _a, locator, container;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    switch (type) {
-                        case constants_1.TooltipType.Validation:
-                            tooltip = new ValidationTooltip_1.ValidationTooltip(component);
-                            break;
-                        case constants_1.TooltipType.Information:
-                            tooltip = new InfoTooltip_1.InfoTooltip(component);
-                            break;
-                        default:
-                            throw new Error("\u041F\u0440\u043E\u0432\u0430\u0439\u0434\u0435\u0440 \u043D\u0435 \u0443\u043C\u0435\u0435\u0442 \u0440\u0430\u0431\u043E\u0442\u0430\u0442\u044C \u0441 \u0442\u0438\u043F\u043E\u043C \u0442\u0443\u043B\u0442\u0438\u043F\u0430: ".concat(type));
+                    _a = type;
+                    switch (_a) {
+                        case constants_1.TooltipType.Validation: return [3 /*break*/, 1];
+                        case constants_1.TooltipType.Information: return [3 /*break*/, 8];
+                    }
+                    return [3 /*break*/, 9];
+                case 1: return [4 /*yield*/, component.rootLocator.press('Tab')];
+                case 2:
+                    _b.sent();
+                    if (!isFocusable(component)) return [3 /*break*/, 4];
+                    return [4 /*yield*/, component.focus()];
+                case 3:
+                    _b.sent();
+                    return [3 /*break*/, 6];
+                case 4: return [4 /*yield*/, component.rootLocator.focus()];
+                case 5:
+                    _b.sent();
+                    _b.label = 6;
+                case 6:
+                    locator = component.rootLocator.locator('../../noscript');
+                    return [4 /*yield*/, locator.count()];
+                case 7:
+                    if ((_b.sent()) > 1) {
+                        locator = component.rootLocator.locator('../following-sibling::noscript[1]');
+                    }
+                    portal = new components_1.Portal(locator);
+                    return [3 /*break*/, 10];
+                case 8:
+                    {
+                        portal = new components_1.Portal(component.rootLocator.locator('../noscript'));
+                        return [3 /*break*/, 10];
                     }
-                    return [4 /*yield*/, tooltip.initAsync()];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, tooltip];
+                    _b.label = 9;
+                case 9: throw new Error("Unknown tooltip type: ".concat(type));
+                case 10: return [4 /*yield*/, portal.getContainer()];
+                case 11:
+                    container = _b.sent();
+                    return [2 /*return*/, new components_2.Tooltip(container.locator((0, dataTidSelector_1.getDataTidSelector)(Popup_1.PopupDataTids.content)))];
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skbkontur/playwright-react-ui-components",
-  "version": "1.18.0-beta.1",
+  "version": "1.18.0-beta.2",
   "description": "Пакет для взаимодействия с компонентами @skbkontur/react-ui при тестировании с помощью Playwright",
   "main": "build/index.js",
   "files": [

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

@@ -1,6 +0,0 @@
-import type { BaseComponent } from './BaseComponent';
-import { Tooltip } from './Tooltip';
-export declare class InfoTooltip extends Tooltip {
-    constructor(targetControl: BaseComponent);
-    protected showAsync(): Promise<void>;
-}

package/build/src/components/InfoTooltip.js

@@ -1,30 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InfoTooltip = void 0;
-var Tooltip_1 = require("./Tooltip");
-var InfoTooltip = /** @class */ (function (_super) {
-    __extends(InfoTooltip, _super);
-    function InfoTooltip(targetControl) {
-        return _super.call(this, targetControl) || this;
-    }
-    InfoTooltip.prototype.showAsync = function () {
-        return Promise.resolve();
-    };
-    return InfoTooltip;
-}(Tooltip_1.Tooltip));
-exports.InfoTooltip = InfoTooltip;

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

@@ -1,7 +0,0 @@
-import type { BaseComponent } from './BaseComponent';
-import { Tooltip } from './Tooltip';
-export declare class ValidationTooltip extends Tooltip {
-    constructor(targetControl: BaseComponent);
-    protected showAsync(): Promise<void>;
-    initAsync(customTid?: string): Promise<void>;
-}