Skip to content

Commit

Permalink
Autocomplete: Fix CSS issue (#5315)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mr-Technician
Mr-Technician authored Sep 20, 2022
1 parent 82fb6c9 commit c64df27
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
38 changes: 19 additions & 19 deletions src/MudBlazor.UnitTests/Components/AutocompleteTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -865,8 +865,8 @@ public async Task Autocomplete_Should_NotIndicateLoadingByDefault()
autocompletecomp.Find("input").Input("Calif");

// Test
comp.WaitForAssertion(() => comp.Find("div.autocomplete").ClassList.Should().NotContain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.autocomplete").Children.ToMarkup().Should().NotContain("progress-indicator-circular"));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").ClassList.Should().NotContain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").Children.ToMarkup().Should().NotContain("progress-indicator-circular"));
}

[Test]
Expand All @@ -883,13 +883,13 @@ public async Task Autocomplete_Should_IndicateLoadingWithCircularProgressIndicat
autocompletecomp.Find("input").Input("Calif");

// Test show
comp.WaitForAssertion(() => comp.Find("div.autocomplete").ClassList.Should().Contain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.autocomplete").Children.ToMarkup().Should().Contain("progress-indicator-circular"));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").ClassList.Should().Contain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").Children.ToMarkup().Should().Contain("progress-indicator-circular"));
comp.WaitForAssertion(() => comp.Find("div.mud-popover").ClassList.Should().Contain("mud-popover-open"));

// Test hide
comp.WaitForAssertion(() => comp.Find("div.autocomplete").ClassList.Should().NotContain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.autocomplete").Children.ToMarkup().Should().NotContain("progress-indicator-circular"));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").ClassList.Should().NotContain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").Children.ToMarkup().Should().NotContain("progress-indicator-circular"));
}

[Test]
Expand All @@ -906,15 +906,15 @@ public async Task Autocomplete_Should_IndicateLoadingWithCircularProgressIndicat
autocompletecomp.Find("input").Input("Calif");

// Test show
comp.WaitForAssertion(() => comp.Find("div.autocomplete").ClassList.Should().Contain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.autocomplete").Children.ToMarkup().Should().Contain("progress-indicator-circular"));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").ClassList.Should().Contain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").Children.ToMarkup().Should().Contain("progress-indicator-circular"));
comp.WaitForAssertion(() => comp.Find("div.progress-indicator-circular").ClassList.Should().Contain("progress-indicator-circular--with-adornment"));
comp.WaitForAssertion(() => comp.Find("div.mud-popover").ClassList.Should().Contain("mud-popover-open"));

// Test hide
comp.WaitForAssertion(() => comp.Find("div.autocomplete").ClassList.Should().NotContain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.autocomplete").Children.ToMarkup().Should().NotContain("progress-indicator-circular"));
comp.WaitForAssertion(() => comp.Find("div.autocomplete").Children.ToMarkup().Should().NotContain("progress-indicator-circular--with-adornment"));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").ClassList.Should().NotContain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").Children.ToMarkup().Should().NotContain("progress-indicator-circular"));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").Children.ToMarkup().Should().NotContain("progress-indicator-circular--with-adornment"));
}

[Test]
Expand All @@ -936,12 +936,12 @@ public async Task Autocomplete_Should_IndicateLoadingWithCustomProgressIndicator
autocompletecomp.Find("input").Input("Calif");

// Test show
comp.WaitForAssertion(() => comp.Find("div.autocomplete").ClassList.Should().Contain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.autocomplete").Children.ToMarkup().Should().Contain("Loading..."));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").ClassList.Should().Contain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").Children.ToMarkup().Should().Contain("Loading..."));

// Test hide
comp.WaitForAssertion(() => comp.Find("div.autocomplete").ClassList.Should().NotContain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.autocomplete").Children.ToMarkup().Should().NotContain("Loading..."));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").ClassList.Should().NotContain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").Children.ToMarkup().Should().NotContain("Loading..."));
}

[Test]
Expand All @@ -963,11 +963,11 @@ public async Task Autocomplete_Should_IndicateLoadingWithProgressIndicatorInside
autocompletecomp.Find("input").Input("Calif");

// Test show
comp.WaitForAssertion(() => comp.Find("div.autocomplete").ClassList.Should().Contain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").ClassList.Should().Contain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.mud-popover").ToMarkup().Should().Contain("Loading..."));

// Test hide
comp.WaitForAssertion(() => comp.Find("div.autocomplete").ClassList.Should().NotContain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.mud-autocomplete").ClassList.Should().NotContain("mud-autocomplete--with-progress"));
comp.WaitForAssertion(() => comp.Find("div.mud-popover").ToMarkup().Should().NotContain("Loading..."));
}

Expand Down Expand Up @@ -1027,12 +1027,12 @@ public async Task Autocomplete_FullWidth()
var comp = Context.RenderComponent<AutocompleteTest1>();
var autocompleteComp = comp.FindComponent<MudAutocomplete<string>>();

autocompleteComp.Find("div.mud-select").ClassList.Should().Contain("autocomplete");
autocompleteComp.Find("div.mud-select").ClassList.Should().Contain("mud-autocomplete");
autocompleteComp.Find("div.mud-select").ClassList.Should().NotContain("mud-width-full");

autocompleteComp.SetParam(p => p.FullWidth, true);

autocompleteComp.Find("div.mud-select").ClassList.Should().Contain("autocomplete");
autocompleteComp.Find("div.mud-select").ClassList.Should().Contain("mud-autocomplete");
autocompleteComp.Find("div.mud-select").ClassList.Should().Contain("mud-width-full");
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/MudBlazor/Components/Autocomplete/MudAutocomplete.razor.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
Expand All @@ -23,7 +23,7 @@ public partial class MudAutocomplete<T> : MudBaseInput<T>, IDisposable

protected string AutocompleteClassname =>
new CssBuilder("mud-select")
.AddClass("autocomplete")
.AddClass("mud-autocomplete")
.AddClass("mud-width-full", FullWidth)
.AddClass("mud-autocomplete--with-progress", ShowProgressIndicator && IsLoading)
.Build();
Expand Down

0 comments on commit c64df27

Please sign in to comment.