Skip to content

Commit 0791352

Browse files
authored
Update the Variant selector (default 32 for Light) (#2331)
1 parent 796dad1 commit 0791352

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

examples/Demo/AssetExplorer/Components/Pages/IconExplorer.razor

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,35 @@
1414
<FluentGrid Style="width: 100%;" Spacing="1">
1515
<FluentGridItem Style="min-width: 200px;">
1616
<FluentSearch @bind-Value="@Criteria.SearchTerm"
17-
@bind-Value:after="@StartNewSearchAsync"
17+
@bind-Value:after="@(() => StartNewSearchAsync(nameof(Criteria.SearchTerm)))"
1818
Placeholder="Part of icon name..." />
1919
</FluentGridItem>
2020
<FluentGridItem Gap="0">
2121
<FluentSelect TOption="int"
2222
@bind-SelectedOption="@Criteria.Size"
23-
@bind-SelectedOption:after="@StartNewSearchAsync"
23+
@bind-SelectedOption:after="@(() => StartNewSearchAsync(nameof(Criteria.Size)))"
2424
Style="min-width: 100px;"
2525
Items="@AllAvailableSizes"
2626
OptionText="@(i => i > 0 ? $"Size{i}" : "[All]")" />
2727
</FluentGridItem>
2828
<FluentGridItem>
2929
<FluentSelect TOption="IconVariant"
3030
@bind-SelectedOption="@Criteria.Variant"
31-
@bind-SelectedOption:after="@StartNewSearchAsync"
31+
@bind-SelectedOption:after="@(() => StartNewSearchAsync(nameof(Criteria.Variant)))"
3232
Style="min-width: 100px;"
3333
Items="@(Enum.GetValues<IconVariant>())" />
3434
</FluentGridItem>
3535
<FluentGridItem>
3636
<FluentSelect TOption="Color"
3737
@bind-SelectedOption="@Criteria.Color"
38-
@bind-SelectedOption:after="@StartNewSearchAsync"
38+
@bind-SelectedOption:after="@(() => StartNewSearchAsync(nameof(Criteria.Color)))"
3939
Style="min-width: 100px;"
4040
Items="@(Enum.GetValues<Color>().Where(i => i != Color.Custom))"
4141
OptionValue="@(i => i.ToAttributeValue())" />
4242
</FluentGridItem>
4343
<FluentGridItem>
4444
<FluentButton IconStart="@(new Icons.Regular.Size24.ArrowCircleRight())"
45-
OnClick="@StartNewSearchAsync" />
45+
OnClick="@(() => StartNewSearchAsync(string.Empty))" />
4646
</FluentGridItem>
4747
</FluentGrid>
4848

examples/Demo/AssetExplorer/Components/Pages/IconExplorer.razor.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,13 @@ protected override void OnInitialized()
4242
}
4343
}
4444

45-
private async Task StartNewSearchAsync()
45+
private async Task StartNewSearchAsync(string property)
4646
{
47+
if (property == nameof(Criteria.Variant) && Criteria.Variant == IconVariant.Light && Criteria.Size != 32)
48+
{
49+
Criteria.Size = 32;
50+
}
51+
4752
SearchInProgress = true;
4853
await Task.Delay(1); // Display spinner
4954

@@ -71,7 +76,7 @@ private IEnumerable<int> AllAvailableSizes
7176
{
7277
get
7378
{
74-
var sizes = Enum.GetValues<IconSize>().Select(i => (int)i).ToList();
79+
var sizes = Enum.GetValues<IconSize>().Where(i => i > 0).Select(i => (int)i).ToList();
7580
var empty = new int[] { 0 };
7681
return empty.Concat(sizes);
7782
}

0 commit comments

Comments
 (0)