Небольшие правки

Author: SephVin

src/Controls.Extensions/Controls.Extensions.csproj

@@ -23,7 +23,7 @@
         <Title>Playwright.ReactUI.Controls.Extensions</Title>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <FileVersion>1.0.0</FileVersion>
-        <Version>3.1.0</Version>
+        <Version>3.1.1</Version>
         <Authors>Evgeniy Ivanov</Authors>
         <Product>Playwright.ReactUI.Controls.Extensions</Product>
         <PackageReadmeFile>README-Controls.Extensions.md</PackageReadmeFile>

src/Controls.Extensions/FxInputExtensions.cs

@@ -59,7 +59,7 @@ public static async Task AppendTextAsync(
 
     public static async Task WaitToBeAutoAsync(
         this FxInput fxInput,
-        LocatorAssertionsToBeVisibleOptions? options = default
+        LocatorAssertionsToBeHiddenOptions? options = default
     ) => await fxInput.ExpectV2().ToBeAutoAsync(options).ConfigureAwait(false);
 
     public static async Task WaitNotToBeAutoAsync(

src/Controls/Assertions/FxInputAssertionsV2.cs

@@ -38,8 +38,11 @@ public async Task ToBeFocusedAsync(LocatorAssertionsToBeFocusedOptions? options
     public async Task NotToBeFocusedAsync(LocatorAssertionsToBeFocusedOptions? options = default)
         => await fxInput.InputLocator.Expect().Not.ToBeFocusedAsync(options).ConfigureAwait(false);
 
-    public async Task ToBeAutoAsync(LocatorAssertionsToBeVisibleOptions? options = default)
-        => await fxInput.AutoButtonLocator.Expect().Not.ToBeVisibleAsync(options).ConfigureAwait(false);
+    public async Task ToBeAutoAsync(LocatorAssertionsToBeHiddenOptions? options = default)
+    {
+        await fxInput.WaitForAsync().ConfigureAwait(false);
+        await fxInput.AutoButtonLocator.Expect().ToBeHiddenAsync(options).ConfigureAwait(false);
+    }
 
     public async Task NotToBeAutoAsync(LocatorAssertionsToBeVisibleOptions? options = default)
         => await fxInput.AutoButtonLocator.Expect().ToBeVisibleAsync(options).ConfigureAwait(false);

src/Controls/Controls.csproj

@@ -24,7 +24,7 @@
         <Title>Playwright.ReactUI.Controls</Title>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <FileVersion>1.0.0</FileVersion>
-        <Version>3.1.0</Version>
+        <Version>3.1.1</Version>
         <Authors>Evgeniy Ivanov</Authors>
         <Product>Playwright.ReactUI.Controls</Product>
         <PackageReadmeFile>README-Controls.md</PackageReadmeFile>

src/Controls/Dropdown.cs

@@ -127,16 +127,12 @@ private async Task<ILocator> GetMenuItemsLocatorAsync()
     }
 
     private async Task<ILocator> GetPortalContainerAsync()
-    {
-        await OpenDropdownIfNeededAsync().ConfigureAwait(false);
-        return await portal.GetContainerAsync().ConfigureAwait(false);
-    }
-
-    private async Task OpenDropdownIfNeededAsync()
     {
         if (!await IsMenuOpenedAsync().ConfigureAwait(false))
         {
             await ButtonLocator.ClickAsync().ConfigureAwait(false);
         }
+
+        return await portal.GetContainerAsync().ConfigureAwait(false);
     }
 }

src/Controls/DropdownMenu.cs

@@ -137,17 +137,13 @@ private async Task<ILocator> GetMenuItemsLocatorAsync()
     }
 
     private async Task<ILocator> GetPortalContainerAsync()
-    {
-        await OpenDropdownIfNeededAsync().ConfigureAwait(false);
-        return await portal.GetContainerAsync().ConfigureAwait(false);
-    }
-
-    private async Task OpenDropdownIfNeededAsync()
     {
         if (!await IsMenuOpenedAsync().ConfigureAwait(false))
         {
             await ButtonLocator.ClickAsync().ConfigureAwait(false);
         }
+
+        return await portal.GetContainerAsync().ConfigureAwait(false);
     }
 
     private async Task SelectFirstByTextAsync(ILocator item, bool isMenuClosedAfterSelect = true)

src/Controls/Kebab.cs

@@ -27,16 +27,16 @@ public async Task<bool> IsDisabledAsync(LocatorGetAttributeOptions? options = de
     public async Task<bool> IsMenuOpenedAsync()
         => await portal.IsVisibleAsync().ConfigureAwait(false);
 
-    public async Task SelectByTextAsync(string text, LocatorClickOptions? options = default)
+    public async Task SelectFirstByTextAsync(string text, LocatorClickOptions? options = default)
     {
         var item = await GetMenuItemsLocatorAsync(text).ConfigureAwait(false);
-        await item.ClickAsync(options).ConfigureAwait(false);
+        await item.First.ClickAsync(options).ConfigureAwait(false);
     }
 
-    public async Task SelectByTextAsync(Regex regex, LocatorClickOptions? options = default)
+    public async Task SelectFirstByTextAsync(Regex regex, LocatorClickOptions? options = default)
     {
         var item = await GetMenuItemsLocatorAsync(regex).ConfigureAwait(false);
-        await item.ClickAsync(options).ConfigureAwait(false);
+        await item.First.ClickAsync(options).ConfigureAwait(false);
     }
 
     public async Task SelectByIndexAsync(int index, LocatorClickOptions? options = default)

src/Controls/Paging.cs

@@ -11,14 +11,14 @@ public class Paging : ControlBase
 {
     private readonly Label nextPage;
 
-    public Paging(ILocator context)
-        : base(context)
+    public Paging(ILocator rootLocator)
+        : base(rootLocator)
     {
         Pages = new ControlList<Page>(
-            context,
+            rootLocator,
             locator => locator.Locator("[data-tid='Paging__pageLinkWrapper']"),
             x => new Page(x));
-        nextPage = new Label(context.Locator("[data-tid='Paging__forwardLink']"));
+        nextPage = new Label(rootLocator.Locator("[data-tid='Paging__forwardLink']"));
     }
 
     public ControlList<Page> Pages { get; }

src/Tests/Controls/DateInputTests.cs

@@ -116,6 +116,7 @@ public async Task GetValue_Return_Empty_When_DateInput_Value_Is_Empty()
     public async Task Fill_New_Value()
     {
         var dateInput = await GetDateInputAsync("default").ConfigureAwait(false);
+        await dateInput.NativeInputLocator.Expect().ToBeEmptyAsync().ConfigureAwait(false);
 
         await dateInput.FillAsync("02.01.2024").ConfigureAwait(false);
 

src/Tests/Controls/FxInputTests.cs

@@ -64,7 +64,7 @@ public async Task IsAuto_Return_True_WHen_FxInput_In_AutoMode()
     }
 
     [Test]
-    public async Task IsAuto_Return_False_When_FxInput_In_AutoMode()
+    public async Task IsAuto_Return_False_When_FxInput_In_Default_Mode()
     {
         var fxInput = await GetFxInputAsync("default").ConfigureAwait(false);