Skip to content

Commit 2d5c10e

Browse files
vnbaaijvnbaaij
committed
Merge dev
2 parents 651822f + 3037fb4 commit 2d5c10e

File tree

123 files changed

+2078
-1619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+2078
-1619
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,3 +412,4 @@ Microsoft.Fast.Components.FluentUI.xml
412412
/tests/TemplateValidation/**/Data/Migrations
413413
/tests/TemplateValidation/**/Data/*
414414
/spelling.dic
415+
/global.json

‎Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
1313
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
1414

15-
<VersionFile>4.11.3</VersionFile>
16-
<VersionPrefix>4.11.3</VersionPrefix>
15+
<VersionFile>4.11.4</VersionFile>
16+
<VersionPrefix>4.11.4</VersionPrefix>
1717
<VersionSuffix></VersionSuffix>
1818
<AssemblyVersion>$(VersionFile)</AssemblyVersion>
1919
<FileVersion>$(VersionFile)</FileVersion>

‎WHATSNEW.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
## V4.11.4
2+
3+
### Icons and Emoji
4+
- Update to Fluent UI System Icons 1.1.273 (changes since 1.1.270)
5+
6+
**What's new (Name / Size(s) / Variant(s))**
7+
- Design Ideas / 16, 20, 24, 28, 32, 48 / Color
8+
- Desk Multiple / 20, 24 / Filled & Regular
9+
- Fast Forward Circle / 24 / Color
10+
- Hand Multiple / 16, 20, 24, 28 / Filled & Regular
11+
- Image Add / 28, 32, 48 / Filled & Regular
12+
- Lightbulb Filament / 16, 20, 24, 28, 32, 48 / Color
13+
- Play Circle Hint Half / 20, 24 / Filled & Regular
14+
- Shield Arrow Right / 16, 20, 24, 28, 32, 48 / Filled & Regular
15+
- Slide Text Sparkle / 16, 20, 24, 28, 32, 48 / Color
16+
- Text List Abc Lowercase LTR / 20, 24 / Filled & Regular
17+
- Text List Abc Uppercase LTR / 20, 24 / Filled & Regular
18+
- Text List Roman Numeral Lowercase / 20, 24 / Filled & Regular
19+
- Text List Roman Numeral Uppercase / 20, 24 / Filled & Regular
20+
21+
22+
**What's updated (Name / Size(s) / Variant(s))**
23+
- Diversity / 16, 20, 24, 28, 48 / Filled & Regular
24+
- Guest Add / 20, 24 / Filled & Regular
25+
- Guest / 12, 16, 20, 24, 28, 32, 48 / Filled & Regular
26+
- Image Add / 24 / Filled & Regular
27+
128
## V4.11.3
229

330
### Components

‎eng/pipelines/build-core-lib.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ trigger:
55
batch: true
66
branches:
77
include:
8+
- main
89
- dev
9-
- dev-v5
10+
- dev-v5
1011
- archives/v3
1112

1213
paths:

‎eng/pipelines/version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ variables:
22
# File and Package version
33
# dev branch: 1.2.4-Preview-23282-1' (PackageSuffix is always ignored in Dev branch)
44
# main branch: 1.2.4-RC.1' (PackageSuffix is ignored, if empty, in Main branch)
5-
FileVersion: '4.11.3' # Set the next final version here.
5+
FileVersion: '4.11.4' # Set the next final version here.
66
PackageSuffix: ''

‎examples/Demo/AssetExplorer/Components/Pages/EmojiExplorer.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
else
5959
{
6060
<FluentLabel Class="not-found">
61-
No emoji found
61+
@_searchResultMessage
6262
</FluentLabel>
6363
}
6464
}

‎examples/Demo/AssetExplorer/Components/Pages/EmojiExplorer.razor.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public partial class EmojiExplorer
1111
private readonly EmojiSearchCriteria Criteria = new();
1212
private EmojiInfo[] EmojisFound = Array.Empty<EmojiInfo>();
1313
private PaginationState PaginationState = new() { ItemsPerPage = 4 * 12 };
14+
private string _searchResultMessage = "Start search...";
1415

1516
[Parameter]
1617
public string Title { get; set; } = "FluentUI Blazor - Emoji Explorers";
@@ -57,6 +58,8 @@ .. EmojiExtensions.AllEmojis
5758

5859
await PaginationState.SetTotalItemCountAsync(EmojisFound.Length);
5960

61+
_searchResultMessage = EmojisFound.Length == 0 ? "No emoji found." : string.Empty;
62+
6063
SearchInProgress = false;
6164
}
6265

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

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,54 +6,54 @@
66

77
<div class="icon-explorer" style="width: @(Width ?? "100%"); height: @(Height ?? "calc(100vh - 120px)");">
88

9-
@if (!string.IsNullOrEmpty(Title))
10-
{
11-
<h2>@Title</h2>
12-
}
9+
@if (!string.IsNullOrEmpty(Title))
10+
{
11+
<h2>@Title</h2>
12+
}
1313

14-
<FluentGrid Style="width: 100%;" Spacing="1">
15-
<FluentGridItem Style="min-width: 200px;">
16-
<FluentSearch @bind-Value="@Criteria.SearchTerm"
17-
@bind-Value:after="@(() => StartNewSearchAsync(nameof(Criteria.SearchTerm)))"
18-
Placeholder="Part of icon name..." />
19-
</FluentGridItem>
20-
<FluentGridItem Gap="0">
21-
<FluentSelect TOption="int"
22-
@bind-SelectedOption="@Criteria.Size"
23-
@bind-SelectedOption:after="@(() => StartNewSearchAsync(nameof(Criteria.Size)))"
24-
Style="min-width: 100px;"
25-
Items="@AllAvailableSizes"
26-
OptionText="@(i => i > 0 ? $"Size{i}" : "[All]")" />
27-
</FluentGridItem>
28-
<FluentGridItem>
29-
<FluentSelect TOption="IconVariant"
30-
@bind-SelectedOption="@Criteria.Variant"
31-
@bind-SelectedOption:after="@(() => StartNewSearchAsync(nameof(Criteria.Variant)))"
32-
Style="min-width: 100px;"
33-
Items="@(Enum.GetValues<IconVariant>())" />
34-
</FluentGridItem>
35-
<FluentGridItem>
36-
<FluentSelect TOption="Color"
37-
@bind-SelectedOption="@Criteria.Color"
38-
@bind-SelectedOption:after="@(() => StartNewSearchAsync(nameof(Criteria.Color)))"
39-
Style="min-width: 100px;"
40-
Items="@(Enum.GetValues<Color>().Where(i => i != Color.Custom))"
41-
OptionValue="@(i => i.ToAttributeValue())" />
42-
</FluentGridItem>
43-
<FluentGridItem>
44-
<FluentButton IconStart="@(new Icons.Regular.Size24.ArrowCircleRight())"
45-
OnClick="@(() => StartNewSearchAsync(string.Empty))" />
46-
</FluentGridItem>
47-
</FluentGrid>
14+
<FluentGrid Style="width: 100%;" Spacing="1">
15+
<FluentGridItem Style="min-width: 200px;">
16+
<FluentSearch @bind-Value="@Criteria.SearchTerm"
17+
@bind-Value:after="@(() => StartNewSearchAsync(nameof(Criteria.SearchTerm)))"
18+
Placeholder="Part of icon name..." />
19+
</FluentGridItem>
20+
<FluentGridItem Gap="0">
21+
<FluentSelect TOption="int"
22+
@bind-SelectedOption="@Criteria.Size"
23+
@bind-SelectedOption:after="@(() => StartNewSearchAsync(nameof(Criteria.Size)))"
24+
Style="min-width: 100px;"
25+
Items="@AllAvailableSizes"
26+
OptionText="@(i => i > 0 ? $"Size{i}" : "[All]")" />
27+
</FluentGridItem>
28+
<FluentGridItem>
29+
<FluentSelect TOption="IconVariant"
30+
@bind-SelectedOption="@Criteria.Variant"
31+
@bind-SelectedOption:after="@(() => StartNewSearchAsync(nameof(Criteria.Variant)))"
32+
Style="min-width: 100px;"
33+
Items="@(Enum.GetValues<IconVariant>())" />
34+
</FluentGridItem>
35+
<FluentGridItem>
36+
<FluentSelect TOption="Color"
37+
@bind-SelectedOption="@Criteria.Color"
38+
@bind-SelectedOption:after="@(() => StartNewSearchAsync(nameof(Criteria.Color)))"
39+
Style="min-width: 100px;"
40+
Items="@(Enum.GetValues<Color>().Where(i => i != Color.Custom))"
41+
OptionValue="@(i => i.ToAttributeValue())" />
42+
</FluentGridItem>
43+
<FluentGridItem>
44+
<FluentButton IconStart="@(new Icons.Regular.Size24.ArrowCircleRight())"
45+
OnClick="@(() => StartNewSearchAsync(string.Empty))" />
46+
</FluentGridItem>
47+
</FluentGrid>
4848

49-
@* Results *@
50-
@if (SearchInProgress)
51-
{
52-
<FluentProgressRing Style="width: unset; margin: 50px;" />
53-
}
54-
else
55-
{
56-
@if (IconsFound.Any())
49+
@* Results *@
50+
@if (SearchInProgress)
51+
{
52+
<FluentProgressRing Style="width: unset; margin: 50px;" />
53+
}
54+
else
55+
{
56+
@if (IconsFound.Any())
5757
{
5858
<FluentLabel Class="header">
5959
Click on upper right clipboard icon in a card to copy a ready to paste <code>FluentIcon</code>
@@ -75,7 +75,7 @@
7575
else
7676
{
7777
<FluentLabel Class="not-found">
78-
No icons found
78+
@_searchResultMessage
7979
</FluentLabel>
8080
}
8181
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public partial class IconExplorer
1212
private readonly IconSearchCriteria Criteria = new();
1313
private IconInfo[] IconsFound = Array.Empty<IconInfo>();
1414
private PaginationState PaginationState = new() { ItemsPerPage = 4 * 12 };
15+
private string _searchResultMessage = "Start search...";
1516

1617
[Parameter]
1718
public string Title { get; set; } = "FluentUI Blazor - Icon Explorers";
@@ -64,6 +65,8 @@ .. IconsExtensions.AllIcons
6465

6566
await PaginationState.SetTotalItemCountAsync(IconsFound.Length);
6667

68+
_searchResultMessage = IconsFound.Length == 0 ? "No icons found." : string.Empty;
69+
6770
SearchInProgress = false;
6871
}
6972

‎examples/Demo/Shared/Components/NewsDate.razor

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<div class="calendar">
2+
<div class="calendar-header">
3+
<div class="month">@Month</div>
4+
@if (@IncludeYear)
5+
{
6+
<div class="year">@Year</div>
7+
}
8+
</div>
9+
<div class="calendar-body">
10+
<div class="date">@Day</div>
11+
</div>
12+
</div>
13+
14+
@code {
15+
[Parameter, EditorRequired]
16+
public string? Day { get; set; }
17+
18+
[Parameter, EditorRequired]
19+
public string? Month { get; set; }
20+
21+
[Parameter, EditorRequired]
22+
public string? Year { get; set; }
23+
24+
[Parameter]
25+
public bool IncludeYear { get; set; } = false;
26+
27+
}

‎examples/Demo/Shared/Components/NewsDate.razor.css

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
.calendar {
2+
width: 30px;
3+
border: 1px solid var(--accent-fill-rest);
4+
border-radius: 8px;
5+
background-color: #fff;
6+
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
7+
overflow: hidden;
8+
}
9+
10+
.calendar-header {
11+
background-color: var(--accent-fill-active);
12+
color: var(--neutral-fill-rest);
13+
text-align: center;
14+
}
15+
16+
.calendar-header .month{
17+
height: 20px;
18+
font-size: 0.7em;
19+
font-weight: bold;
20+
}
21+
22+
.calendar-header .year {
23+
height: 10px;
24+
font-size: 0.7em;
25+
}
26+
27+
.calendar-body {
28+
text-align: center;
29+
position: relative;
30+
}
31+
32+
.calendar-body .date {
33+
font-size: 1em;
34+
font-weight: bolder;
35+
color: var(--accent-fill-rest)
36+
}

0 commit comments

Comments
 (0)