Skip to content

Commit 02371f5

Browse files
vnbaaijvnbaaij
committed
Merge branch 'dev'
2 parents f813e85 + 7b8a8ba commit 02371f5

File tree

86 files changed

+2113
-344
lines changed

Some content is hidden

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

86 files changed

+2113
-344
lines changed

‎Directory.Build.props

+2-2
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.5</VersionFile>
16-
<VersionPrefix>4.11.5</VersionPrefix>
15+
<VersionFile>4.11.6</VersionFile>
16+
<VersionPrefix>4.11.6</VersionPrefix>
1717
<VersionSuffix></VersionSuffix>
1818
<AssemblyVersion>$(VersionFile)</AssemblyVersion>
1919
<FileVersion>$(VersionFile)</FileVersion>

‎Directory.Packages.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@
6666
<PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion9)" />
6767
<PackageVersion Include="System.Text.Json" Version="$(RuntimeVersion9)" />
6868
</ItemGroup>
69-
</Project>
69+
</Project>

‎WHATSNEW.md

+192
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,195 @@
1+
## V4.11.6
2+
3+
### Components
4+
- \[Autocomplete\] Apply invalid css to autocomplete ([#3417](https://github.com/microsoft/fluentui-blazor/pull/3417))
5+
- \[DataGrid\] Add IGridSort interface, fixes sorting when using ItemsProvider ([#3460](https://github.com/microsoft/fluentui-blazor/pull/3460))
6+
- \[DataGrid\] Fix error in handling GridTemplateColumns ([#3413](https://github.com/microsoft/fluentui-blazor/pull/3413))
7+
- \[DataGrid\] Only add Selectable items when using Select All ([#3453](https://github.com/microsoft/fluentui-blazor/pull/3453))
8+
- \[DataGrid\] Provide alternate way to refresh when working with remote data ([#3423](https://github.com/microsoft/fluentui-blazor/pull/3423))
9+
- \[Search\] FluentSearch fix deletion if Disabled/Readonly ([#3433](https://github.com/microsoft/fluentui-blazor/pull/3433))
10+
- \[InputFile\] Add @attributes ([#3441](https://github.com/microsoft/fluentui-blazor/pull/3441))
11+
- \[Lists\] Fix Form validation happening too late ([#3468](https://github.com/microsoft/fluentui-blazor/pull/3468))
12+
- \[Lists\] Fix Form validation issue ([#3466](https://github.com/microsoft/fluentui-blazor/pull/3466))
13+
- \[Lists\] Do not have parameters only be set once ([#3457](https://github.com/microsoft/fluentui-blazor/pull/3457))
14+
- \[Menu\] Add CheckedChanged EventCallback (fix 3390) ([#3414](https://github.com/microsoft/fluentui-blazor/pull/3414))
15+
- \[Select\] Fix style when Multiple set/not set ([#3442](https://github.com/microsoft/fluentui-blazor/pull/3442))
16+
- \[Toolbar\] Dispose of JS module properly ([#3470](https://github.com/microsoft/fluentui-blazor/pull/3470))
17+
18+
### Demo site and documentation
19+
- \[Docs\] Anchor docs ([#3428](https://github.com/microsoft/fluentui-blazor/pull/3428))
20+
21+
### Icons and Emoji
22+
- Update to Fluent UI System Icons 1.1.278 (changes since 1.1.273)
23+
24+
**What's new (Name / Size(s) / Variant(s))**
25+
- Agents / 16, 28, 32, 48 / Filled & Regular
26+
- Alert Badge / 32 / Filled & Regular
27+
- Apps List / 32 / Filled & Regular
28+
- Apps List Detail / 32 / Filled & Regular
29+
- Arrow Circle Up Sparkle / 20, 24 / Filled & Regular
30+
- Arrow Counterclockwise Info / 20, 24, 28, 32, 48 / Filled & Regular
31+
- Arrow Square / 32 / Filled & Regular
32+
- Branch Request Closed / 16, 20 / Filled & Regular
33+
- Branch Request Draft / 16, 20 / Filled & Regular
34+
- Building Home / 32 / Filled & Regular
35+
- Calendar Clock / 32 / Filled & Regular
36+
- Call Rectangle Landscape / 16, 20, 24, 28 / Filled & Regular
37+
- Call Square / 16, 20, 24, 28 / Filled & Regular
38+
- Crown Subtract / 20 / Filled & Regular
39+
- Data Area / 20, 24, 32 / Filled & Regular
40+
- Data Line / 32 / Filled & Regular
41+
- Data Pie / 20, 24, 32 / Filled & Regular
42+
- Data Scatter / 20, 24, 32 / Filled & Regular
43+
- Data Trending / 20, 32 / Filled & Regular
44+
- Data Usage Sparkle / 20, 24 / Filled & Regular
45+
- Database Arrow Right / 16 / Filled & Regular
46+
- Document Arrow Right / 16 / Filled & Regular
47+
- Info Sparkle / 16, 20, 24, 28, 32, 48 / Filled & Regular
48+
- Lightbulb Checkmark / 24, 32 / Filled & Regular
49+
- List Bar / 24, 32 / Filled & Regular
50+
- Mail Clock / 32 / Filled & Regular
51+
- Mail Data Bar / 16, 20, 24 / Filled & Regular
52+
- Number Symbol Square / 32 / Filled
53+
- Number Symbol Square / 32 / Regular
54+
- People Sync / 24, 32 / Filled & Regular
55+
- Person Arrow Back / 16 / Filled & Regular
56+
- Person Heart / 32 / Filled & Regular
57+
- Person Key / 24, 32 / Filled & Regular
58+
- Person Sync / 24, 32 / Filled & Regular
59+
- Person Tentative / 32 / Filled & Regular
60+
- Ribbon Star / 32 / Filled & Regular
61+
- Send Clock / 32 / Filled & Regular
62+
- Skip Back 15 / 20, 24 / Filled & Regular
63+
- Skip Forward 15 / 20, 24 / Filled & Regular
64+
- Square Text Arrow Repeat All / 32 / Filled & Regular
65+
- Star Settings / 32 / Filled & Regular
66+
- Table Alt Text / 20, 24, 32 / Filled & Light & Regular
67+
- Table Cell Add / 16, 20, 24 / Filled & Regular
68+
- Temperature Degree Celsius / 16, 20, 24, 28, 32, 48 / Filled & Regular
69+
- Temperature Degree Fahrenheit / 16, 20, 24, 28, 32, 48 / Filled & Regular
70+
- Text Bullet List Square Sparkle / 32 / Filled & Regular
71+
- Text Paragraph Direction Left / 24 / Filled & Regular
72+
- Text Paragraph Direction Right / 24 / Filled & Regular
73+
- Video Multiple / 16, 20, 24, 28, 32, 48 / Filled & Regular
74+
- Window Text / 16, 24, 28 / Filled & Regular
75+
76+
77+
**What's updated (Name / Size(s) / Variant(s))**
78+
- Arrow Forward / 16, 20, 24, 28, 32, 48 / Filled & Regular
79+
- Arrow Reply All / 16, 20, 24, 28, 32, 48 / Filled
80+
- Chart Multiple / 16, 20, 24, 32 / Filled & Regular
81+
- Diversity / 16, 20, 24, 28, 48 / Filled & Regular
82+
- Guest / 16, 20, 24, 28, 32, 48 / Filled & Regular
83+
- Info / 24, 28 / Filled & Regular
84+
- Lock Closed Ribbon / 16, 20, 24, 28, 48 / Filled & Regular
85+
- Person Sync / 16, 20, 24, 28, 32, 48 / Filled & Regular
86+
87+
**What's got color now (Name / Size(s) / Variant(s))**
88+
- Alert Badge / 16, 20, 24, 32 / Color
89+
- Alert Urgent / 16, 20, 24 / Color
90+
- Animal Paw Print / 16, 20, 24, 28, 32, 48 / Color
91+
- Apps List Detail / 20, 24, 32 / Color
92+
- Apps List / 20, 24, 32 / Color
93+
- Arrow Clockwise Dashes Settings / 16, 20, 24, 28, 32, 48 / Color
94+
- Arrow Clockwise Dashes / 16, 20, 24, 32 / Color
95+
- Arrow Square / 20, 24, 32 / Color
96+
- Arrow Sync / 16, 20, 24 / Color
97+
- Board / 16, 20, 24, 28 / Color
98+
- Book Database / 16, 20, 24, 32 / Color
99+
- Book Open / 16, 20, 24, 28, 32, 48 / Color
100+
- Book Star / 20, 24 / Color
101+
- Book / 16, 20, 24, 28, 32, 48 / Color
102+
- Bookmark / 16, 20, 24, 28, 32 / Color
103+
- Bot Sparkle / 16, 20, 24 / Color
104+
- Bot / 16, 20, 24 / Color
105+
- Building Government Search / 16, 20, 24, 32 / Color
106+
- Building Government / 16, 20, 24, 32 / Color
107+
- Building Home / 16, 20, 24, 32 / Color
108+
- Calendar Data Bar / 16, 20, 24, 28 / Color
109+
- Calendar Edit / 16, 20, 24, 32 / Color
110+
- Calendar Sync / 16, 20, 24 / Color
111+
- Certificate / 16, 20, 24, 32 / Color
112+
- Chart Multiple / 16, 20, 24, 32 / Color
113+
- Clipboard Task / 16, 20, 24 / Color
114+
- Clock / 16, 20, 24, 28, 32, 48 / Color
115+
- Cloud Words / 16, 20, 24, 28, 32, 48 / Color
116+
- Code / 16, 20, 24 / Color
117+
- Coin Multiple / 16, 20, 24, 28, 32, 48 / Color
118+
- Comment Multiple / 16, 20, 24, 28, 32 / Color
119+
- Comment / 16, 20, 24, 28, 32, 48 / Color
120+
- Contact Card / 16, 20, 24, 28, 32, 48 / Color
121+
- Content View / 16, 20, 24, 28, 32 / Color
122+
- Data Area / 20, 24, 32 / Color
123+
- Data Line / 20, 24, 32 / Color
124+
- Data Pie / 20, 24, 32 / Color
125+
- Data Scatter / 20, 24, 32 / Color
126+
- Data Trending / 16, 20, 24, 28, 32, 48 / Color
127+
- Database / 16, 20, 24, 32, 48 / Color
128+
- Diversity / 16, 20, 24, 28, 48 / Color
129+
- Document Edit / 16, 20, 24 / Color
130+
- Document Lock / 32 / Color
131+
- Document Text / 16, 20, 24, 28, 32, 48 / Color
132+
- Drafts / 16, 20, 24 / Color
133+
- Flag / 16, 20, 24, 28, 32, 48 / Color
134+
- Form / 20, 24, 28, 48 / Color
135+
- Gauge / 20, 24, 32 / Color
136+
- Gift Card / 16, 20, 24 / Color
137+
- Gift / 16, 20, 24 / Color
138+
- Guest / 16, 20, 24, 28, 32, 48 / Color
139+
- Heart / 16, 20, 24, 28, 32, 48 / Color
140+
- Image Off / 20, 24, 28, 32, 48 / Color
141+
- Image / 16, 20, 24, 28, 32, 48 / Color
142+
- Laptop / 16, 20, 24, 28, 32, 48 / Color
143+
- Layer Diagonal Person / 16, 20, 24 / Color
144+
- Lightbulb Checkmark / 20, 24, 32 / Color
145+
- Lightbulb / 16, 20, 24, 28, 32, 48 / Color
146+
- Link Multiple / 16, 20, 24 / Color
147+
- List Bar / 16, 20, 24, 32 / Color
148+
- Location Ripple / 16, 20, 24 / Color
149+
- Lock Closed / 16, 20, 24, 28, 32, 48 / Color
150+
- Lock Shield / 16, 20, 24, 28, 32, 48 / Color
151+
- Mail Alert / 16, 20, 24, 28, 32 / Color
152+
- Mail Clock / 16, 20, 24, 32 / Color
153+
- Megaphone Loud / 16, 20, 24, 28, 32 / Color
154+
- Molecule / 16, 20, 24, 28, 32, 48 / Color
155+
- News / 16, 20, 24, 28 / Color
156+
- Notebook Question Mark / 20, 24 / Color
157+
- Notebook / 16, 20, 24, 32 / Color
158+
- Number Symbol Square / 20, 24, 32 / Color
159+
- Options / 16, 20, 24, 28, 32, 48 / Color
160+
- Paint Brush / 16, 20, 24, 28, 32 / Color
161+
- Patient / 20, 24, 32 / Color
162+
- People List / 16, 20, 24, 28, 32 / Color
163+
- People Sync / 16, 20, 24, 28, 32 / Color
164+
- Person Feedback / 16, 20, 24, 28, 32, 48 / Color
165+
- Person Heart / 20, 24, 32 / Color
166+
- Person Key / 20, 24, 32 / Color
167+
- Person Tentative / 16, 20, 24, 32 / Color
168+
- Person Warning / 16, 20, 24, 28, 32, 48 / Color
169+
- Phone Laptop / 16, 20, 24, 32 / Color
170+
- Phone / 16, 20, 24, 28, 32, 48 / Color
171+
- Premium / 16, 20, 24, 28, 32 / Color
172+
- Puzzle Piece / 16, 20, 24, 28, 32, 48 / Color
173+
- Ribbon Star / 20, 24, 32 / Color
174+
- Ribbon / 16, 20, 24, 32 / Color
175+
- Send Clock / 20, 24, 32 / Color
176+
- Send / 16, 20, 24, 28, 32, 48 / Color
177+
- Settings / 16, 20, 24, 28, 32, 48 / Color
178+
- Share Android / 16, 20, 24, 32 / Color
179+
- Sport / 16, 20, 24 / Color
180+
- Star Settings / 20, 24, 32 / Color
181+
- Star / 16, 20, 24, 28, 32, 48 / Color
182+
- Table / 16, 20, 24, 28, 32, 48 / Color
183+
- Text Bullet List Square Sparkle / 16, 20, 24, 32 / Color
184+
- Text Bullet List Square / 16, 20, 24, 28, 32, 48 / Color
185+
- Toolbox / 16, 20, 24, 28, 32 / Color
186+
- Trophy / 16, 20, 24, 28, 32, 48 / Color
187+
- Weather Snowflake / 20, 24, 32, 48 / Color
188+
- Weather Sunny Low / 20, 24, 48 / Color
189+
- WiFi Warning / 20, 24 / Color
190+
- WiFi / 20, 24 / Color
191+
- Wrench Screwdriver / 20, 24, 32 / Color
192+
1193
## V4.11.5
2194

3195
### General

‎eng/pipelines/version.yml

+1-1
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.5' # Set the next final version here.
5+
FileVersion: '4.11.6' # Set the next final version here.
66
PackageSuffix: ''

‎examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml

+17-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/Demo/Shared/Pages/Anchor/Examples/AnchorIcons.razor

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<h4>Neutral appearane</h4>
1+
<h4>Neutral appearance</h4>
22
<div style="display: flex; align-items: center; gap: 10px; margin-bottom: 1em;">
33
<FluentAnchor Href="#" IconStart="@(new Icons.Regular.Size16.Globe())">
44
Icon at start
@@ -18,7 +18,7 @@
1818
<FluentIcon Value="@(new Icons.Regular.Size16.Globe())" Color="@Color.Success" Slot="end" />
1919
</FluentAnchor>
2020
</div>
21-
<h4>Hypertext appearane</h4>
21+
<h4>Hypertext appearance</h4>
2222
<p>
2323
By default, the margin between the icon and the link is equal to the margin that is used for the other
2424
appearances. If you find that margin to large, you can add the following to your CSS:<br/><br />
@@ -33,7 +33,7 @@
3333
}
3434
</CodeSnippet>
3535
<br />
36-
<em>Do not use these styles if there is no icon being displayed with a hypertext. It will cause the hypertext to get a margin at the stat/end.</em>
36+
<em>Do not use these styles if there is no icon being displayed with a hypertext. It will cause the hypertext to get a margin at the start/end.</em>
3737
</p>
3838
<div style="display: flex; align-items: center; gap: 10px; margin-bottom: 1em;">
3939
<FluentAnchor Appearance="@Appearance.Hypertext" Href="#" IconStart="@(new Icons.Regular.Size16.Globe())">

‎examples/Demo/Shared/Pages/DataGrid/Examples/DataGridColumnKeyGridSort.razor

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<FluentDataGrid Items="@_gridData" ResizableColumns=true GridTemplateColumns="0.5fr 0.5fr">
2+
<TemplateColumn Sortable="true" Title="First Name" SortBy="_firstNameSort">
3+
@context.Properties["firstname"]
4+
</TemplateColumn>
5+
6+
<TemplateColumn Sortable="true" Title="Last Name" SortBy="_lastNameSort">
7+
@context.Properties["lastname"]
8+
</TemplateColumn>
9+
</FluentDataGrid>
10+
11+
@code {
12+
private ColumnKeyGridSort<GridRow> _firstNameSort = new ColumnKeyGridSort<GridRow>(
13+
"firstname",
14+
(queryable, sortAscending) =>
15+
{
16+
if (sortAscending)
17+
{
18+
return queryable.OrderBy(x => x.Properties["firstname"]);
19+
}
20+
else
21+
{
22+
return queryable.OrderByDescending(x => x.Properties["firstname"]);
23+
}
24+
}
25+
);
26+
27+
private ColumnKeyGridSort<GridRow> _lastNameSort = new ColumnKeyGridSort<GridRow>(
28+
"lastname",
29+
(queryable, sortAscending) =>
30+
{
31+
if (sortAscending)
32+
{
33+
return queryable.OrderBy(x => x.Properties["lastname"]);
34+
}
35+
else
36+
{
37+
return queryable.OrderByDescending(x => x.Properties["lastname"]);
38+
}
39+
}
40+
);
41+
42+
private static readonly IQueryable<GridRow> _gridData = new GridRow[] {
43+
new(new Dictionary<string, string>{ { "firstname", "Tom" }, { "lastname", "Cruise" } }),
44+
new(new Dictionary<string, string>{ { "firstname", "Dolly" }, { "lastname", "Parton" } }),
45+
new(new Dictionary<string, string>{ { "firstname", "Nicole" }, { "lastname", "Kidmon" } }),
46+
new(new Dictionary<string, string>{ { "firstname", "James" }, { "lastname", "Bond" } }),
47+
}.AsQueryable();
48+
49+
public record GridRow(Dictionary<string, string> Properties);
50+
}

‎examples/Demo/Shared/Pages/DataGrid/Examples/DataGridRemoteData.razor

+3-7
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,14 @@
3838
foodRecallProvider = async req =>
3939
{
4040
var url = NavManager.GetUriWithQueryParameters("https://api.fda.gov/food/enforcement.json", new Dictionary<string, object?>
41-
{
41+
{
4242
{ "skip", req.StartIndex },
4343
{ "limit", req.Count },
44-
});
44+
});
4545

4646
var response = await Http.GetFromJsonAsync<FoodRecallQueryResult>(url, req.CancellationToken);
4747

48-
// Simulate a slow data retrieval process
49-
if (req.Count is null)
50-
{
51-
await Task.Delay(2500);
52-
}
48+
5349
return GridItemsProviderResult.From(
5450
items: response!.Results,
5551
totalItemCount: response!.Meta.Results.Total);

0 commit comments

Comments
 (0)