Skip to content

Commit 340b20d

Browse files
vnbaaijvnbaaij
committed
Merge branch 'dev'
2 parents 2bb591c + ce43fde commit 340b20d

36 files changed

+758
-649
lines changed

‎Directory.Build.props‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,40 @@
11
<Project>
2-
<PropertyGroup>
3-
<Authors>Microsoft</Authors>
4-
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
5-
<NeutralLanguage>en</NeutralLanguage>
6-
<Owners>Microsoft Corporation</Owners>
7-
<PackageProjectUrl>https://github.com/microsoft/fluentui-blazor</PackageProjectUrl>
8-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
9-
<RepositoryUrl>https://github.com/microsoft/fluentui-blazor</RepositoryUrl>
10-
<RepositoryType>git</RepositoryType>
11-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
12-
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
13-
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
2+
<PropertyGroup>
3+
<Authors>Microsoft</Authors>
4+
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
5+
<NeutralLanguage>en</NeutralLanguage>
6+
<Owners>Microsoft Corporation</Owners>
7+
<PackageProjectUrl>https://github.com/microsoft/fluentui-blazor</PackageProjectUrl>
8+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
9+
<RepositoryUrl>https://github.com/microsoft/fluentui-blazor</RepositoryUrl>
10+
<RepositoryType>git</RepositoryType>
11+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
12+
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
13+
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
14+
15+
<VersionFile>4.11.5</VersionFile>
16+
<VersionPrefix>4.11.5</VersionPrefix>
17+
<VersionSuffix></VersionSuffix>
18+
<AssemblyVersion>$(VersionFile)</AssemblyVersion>
19+
<FileVersion>$(VersionFile)</FileVersion>
1420

15-
<VersionFile>4.11.4</VersionFile>
16-
<VersionPrefix>4.11.4</VersionPrefix>
17-
<VersionSuffix></VersionSuffix>
18-
<AssemblyVersion>$(VersionFile)</AssemblyVersion>
19-
<FileVersion>$(VersionFile)</FileVersion>
2021

2122
<LangVersion>latest</LangVersion>
2223
<Nullable>enable</Nullable>
2324
<ImplicitUsings>enable</ImplicitUsings>
2425

25-
<!-- Enable code style analysis -->
26-
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
27-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
26+
<!-- Enable code style analysis -->
27+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
28+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
2829

29-
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
30+
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
31+
<NoWarn>IDE0130</NoWarn>
3032

31-
</PropertyGroup>
33+
</PropertyGroup>
3234

33-
<ItemGroup>
34-
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
35-
<_Parameter1>Microsoft.FluentUI.AspNetCore.Components.Tests</_Parameter1>
36-
</AssemblyAttribute>
37-
</ItemGroup>
35+
<ItemGroup>
36+
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
37+
<_Parameter1>Microsoft.FluentUI.AspNetCore.Components.Tests</_Parameter1>
38+
</AssemblyAttribute>
39+
</ItemGroup>
3840
</Project>

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

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,18 @@
753753
<param name="e"></param>
754754
<returns></returns>
755755
</member>
756+
<member name="M:Microsoft.FluentUI.AspNetCore.Components.InputHelpers`1.GetMaxValue">
757+
<summary>
758+
Because of the limitation of the web component, the maximum value is set to 9999999999 for really large numbers.
759+
</summary>
760+
<returns>The maximum value for the underlying type</returns>
761+
</member>
762+
<member name="M:Microsoft.FluentUI.AspNetCore.Components.InputHelpers`1.GetMinValue">
763+
<summary>
764+
Because of the limitation of the web component, the minimum value is set to -9999999999 for really large negative numbers.
765+
</summary>
766+
<returns>The minimum value for the underlying type</returns>
767+
</member>
756768
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentBodyContent.ChildContent">
757769
<summary>
758770
Gets or sets the content to be rendered inside the component.
@@ -833,6 +845,7 @@
833845
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentButton.FormId">
834846
<summary>
835847
Gets or sets the id of a form to associate the element to.
848+
Both the <see cref="P:Microsoft.FluentUI.AspNetCore.Components.FluentComponentBase.Id"/> and the FormId must be set if the button is placed outside of a form.
836849
</summary>
837850
</member>
838851
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentButton.Action">
@@ -2731,6 +2744,14 @@
27312744
<member name="M:Microsoft.FluentUI.AspNetCore.Components.FluentCalendar.OnSelectDayMouseOverAsync(System.DateTime,System.Boolean)">
27322745
<summary />
27332746
</member>
2747+
<member name="M:Microsoft.FluentUI.AspNetCore.Components.FluentCalendar.AllDaysAreDisabled(System.DateTime,System.DateTime)">
2748+
<summary>
2749+
Check if all days between two dates are disabled.
2750+
</summary>
2751+
<param name="start"></param>
2752+
<param name="end"></param>
2753+
<returns></returns>
2754+
</member>
27342755
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentCalendarBase.Culture">
27352756
<summary>
27362757
Gets or sets the culture of the component.
@@ -2742,6 +2763,12 @@
27422763
Function to know if a specific day must be disabled.
27432764
</summary>
27442765
</member>
2766+
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentCalendarBase.DisabledCheckAllDaysOfMonthYear">
2767+
<summary>
2768+
By default, the <see cref="P:Microsoft.FluentUI.AspNetCore.Components.FluentCalendarBase.DisabledDateFunc" /> check only the first day of the month and the first day of the year for the Month and Year views.
2769+
Set this property to `true` to check if all days of the month and year are disabled (more time consuming).
2770+
</summary>
2771+
</member>
27452772
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentCalendarBase.DisabledSelectable">
27462773
<summary>
27472774
Apply the disabled style to the <see cref="P:Microsoft.FluentUI.AspNetCore.Components.FluentCalendarBase.DisabledDateFunc"/> days.
@@ -7655,6 +7682,12 @@
76557682
Gets or sets the content to be rendered inside the component.
76567683
</summary>
76577684
</member>
7685+
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentNumberField`1.UseTypeConstraints">
7686+
<summary>
7687+
If true, the min and max values will be automatically set based on the type of TValue,
7688+
unless an explicit value for Min or Max is provided.
7689+
</summary>
7690+
</member>
76587691
<member name="M:Microsoft.FluentUI.AspNetCore.Components.FluentNumberField`1.FormatValueAsString(`0)">
76597692
<summary>
76607693
Formats the value as a string. Derived classes can override this to determine the formatting used for <c>CurrentValueAsString</c>.
@@ -14600,6 +14633,14 @@
1460014633
<param name="culture"></param>
1460114634
<returns></returns>
1460214635
</member>
14636+
<member name="M:Microsoft.FluentUI.AspNetCore.Components.Extensions.DateTimeExtensions.EndOfYear(System.DateTime,System.Globalization.CultureInfo)">
14637+
<summary>
14638+
Returns the last day of the year.
14639+
</summary>
14640+
<param name="self"></param>
14641+
<param name="culture"></param>
14642+
<returns></returns>
14643+
</member>
1460314644
<member name="M:Microsoft.FluentUI.AspNetCore.Components.Extensions.DateTimeExtensions.EndOfMonth(System.DateTime,System.Globalization.CultureInfo)">
1460414645
<summary>
1460514646
Returns the last day of the month.

‎examples/Demo/Shared/Pages/Home/Videos.razor‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,18 @@
1010

1111
<FluentGrid Spacing="7">
1212
<FluentGridItem xs="12" sm="4">
13-
<div class="youtube-title">.NET Conf 2024</div>
14-
<div class="youtube-responsive">
13+
<div class="youtube-title">.NET Conf 2024
14+
</div>
15+
<p class="video-link">Watch: <a href="https://www.youtube.com/watch?v=w8BKS1a8MnU">https://www.youtube.com/watch?v=w8BKS1a8MnU</a></p>
16+
17+
<div class="youtube-responsive">
1518
<iframe src="https://www.youtube.com/embed/w8BKS1a8MnU?si=ugsYLTHGhBrXdAhn" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
1619
</div>
1720
</FluentGridItem>
1821

1922
<FluentGridItem xs="12" sm="4">
2023
<div class="youtube-title">ASP.NET Community Standup 2024</div>
24+
<p class="video-link">Watch: <a href="https://www.youtube.com/watch?v=1fveBAi6Q7I">https://www.youtube.com/watch?v=1fveBAi6Q7I</a></p>
2125
<div class="youtube-responsive">
2226
<iframe src="https://www.youtube.com/embed/1fveBAi6Q7I" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
2327
</div>
@@ -27,24 +31,28 @@
2731

2832
<FluentGridItem xs="12" sm="4">
2933
<div class="youtube-title" style="overflow: unset;">Open at Microsoft - 2024</div>
34+
<p class="video-link">Watch: <a href="https://www.youtube.com/watch?v=lUZ5mrg2Q8k">https://www.youtube.com/watch?v=lUZ5mrg2Q8k</a></p>
3035
<div class="youtube-responsive">
3136
<iframe src="https://www.youtube.com/embed/lUZ5mrg2Q8k" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
3237
</div>
3338
</FluentGridItem>
3439
<FluentGridItem xs="12" sm="4">
3540
<div class="youtube-title"></div>
41+
<p class="video-link">Watch: <a href="https://www.youtube.com/watch?v=jOv9ioCVDFU">https://www.youtube.com/watch?v=jOv9ioCVDFUI</a></p>
3642
<div class="youtube-responsive">
3743
<iframe src="https://www.youtube.com/embed/jOv9ioCVDFU" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
3844
</div>
3945
</FluentGridItem>
4046
<FluentGridItem xs="12" sm="4">
4147
<div class="youtube-title"></div>
48+
<p class="video-link">Watch: <a href="https://www.youtube.com/watch?v=HTUemhV9W-M">https://www.youtube.com/watch?v=HTUemhV9W-M</a></p>
4249
<div class="youtube-responsive">
4350
<iframe src="https://www.youtube.com/embed/HTUemhV9W-M" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
4451
</div>
4552
</FluentGridItem>
4653
<FluentGridItem xs="12" sm="4">
4754
<div class="youtube-title">.NET Conf 2023</div>
55+
<p class="video-link">Watch: <a href="https://www.youtube.com/watch?v=a0xOqNemRoY">https://www.youtube.com/watch?v=a0xOqNemRoY</a></p>
4856
<div class="youtube-responsive">
4957
<iframe src="https://www.youtube.com/embed/a0xOqNemRoY" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
5058
</div>

‎examples/Demo/Shared/Pages/Lab/IssueTester.razor‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-

1+
2+
3+

‎examples/Demo/Shared/Pages/List/Select/Examples/SelectMultipleWithFunctions.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<p>All people whose first name starts with a "J" are initialy selected through the <code>OptionSelected</code> (Func delegate) parameter.</p>
44
<p>All people with a birth year greater than 1990 are disabled through the <code>OptionDisabled</code> (Func delegate) parameter.</p>
55

6-
<div style="display: block; height: 300px;">
6+
77
<FluentSelect TOption="Person"
88
Label="Select persons"
99
Items="@Data.People"
@@ -15,7 +15,7 @@
1515
OptionSelected="@(p => p.FirstName.StartsWith("J"))"
1616
@bind-Value="@SelectedValue"
1717
@bind-SelectedOptions="@SelectedOptions" />
18-
</div>
18+
1919

2020
<p>
2121
Selected value: @SelectedValue <br />
@@ -35,4 +35,4 @@
3535
{
3636
IEnumerable<Person>? SelectedOptions;
3737
string? SelectedValue;
38-
}
38+
}

‎examples/Demo/Shared/Pages/NumberField/Examples/NumberFieldTypeConstraints.razor‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<p>
2+
<FluentNumberField @bind-Value="@exampleUshort1" UseTypeConstraints>Unsigned short with inherent constraints from type</FluentNumberField>
3+
Example unsigned short: @exampleUshort1
4+
<br/>
5+
Minimum value: @(ushort.MinValue); Maximum value: @(ushort.MaxValue)
6+
</p>
7+
8+
<p>
9+
<FluentNumberField @bind-Value="@exampleUshort2" Max="10" UseTypeConstraints>Unsigned short with inherent constraints from type and manual max</FluentNumberField>
10+
Example unsigned short: @exampleUshort2
11+
<br/>
12+
Minimum value: @(ushort.MinValue); Maximum value: 10
13+
</p>
14+
15+
<p>
16+
<FluentNumberField @bind-Value="@exampleUshort3" Min="5" Max="10" UseTypeConstraints>Unsigned short with inherent constraints, but Min and Max overrides.</FluentNumberField>
17+
Example unsigned short: @exampleUshort3
18+
<br/>
19+
Minimum value: 5; Maximum value: 10
20+
</p>
21+
22+
@code {
23+
ushort exampleUshort1 { get; set; }
24+
ushort exampleUshort2 { get; set; }
25+
ushort exampleUshort3 { get; set; }
26+
}

‎examples/Demo/Shared/Pages/NumberField/Examples/NumberFieldTypes.razor‎

Lines changed: 51 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,77 @@
11
<p>
2-
<FluentNumberField @bind-Value="exampleLong">Long</FluentNumberField><br />
2+
<FluentNumberField @bind-Value="exampleLong">Long</FluentNumberField>
3+
<br/>
34
Example long: @exampleLong
4-
<br />
5-
Minimum value: -999999999999; Maximum value: 999999999999
5+
<br/>
6+
Minimum value: @(MinValue); Maximum value: @(MaxValue)
67
</p>
78
<p>
89
<FluentNumberField @bind-Value="shortMin">Short</FluentNumberField>
9-
<br />
10+
<br/>
1011
Minimum value: @(short.MinValue); Maximum value: @(short.MaxValue)
1112
</p>
1213

1314
<p>
14-
<FluentNumberField @bind-Value="@exampleFloat">Float</FluentNumberField><br />
15+
<FluentNumberField @bind-Value="@exampleFloat">Float</FluentNumberField>
16+
<br/>
1517
Example float: @exampleFloat
16-
<br />
17-
Minimum value: @(float.MinValue); Maximum value: @(float.MaxValue)
18+
<br/>
19+
Minimum value: @(MinValue); Maximum value: @(MaxValue)
1820
</p>
1921
<p>
20-
<FluentNumberField Step=0.25 @bind-Value="@exampleFloat">Float</FluentNumberField><br />
21-
Example float: @exampleFloat (step=0.25)
22-
<br />
23-
Minimum value: @(float.MinValue); Maximum value: @(float.MaxValue)
22+
<FluentNumberField Step=0.25 @bind-Value="@exampleFloat2">Float</FluentNumberField>
23+
<br/>
24+
Example float: @exampleFloat2 (step=0.25)
25+
<br/>
26+
Minimum value: @(MinValue); Maximum value: @(MaxValue)
2427
</p>
2528
<p>
26-
<FluentNumberField @bind-Value="@exampleDouble" >Double</FluentNumberField><br />
29+
<FluentNumberField @bind-Value="@exampleDouble">Double</FluentNumberField>
30+
<br/>
2731
Example double: @exampleDouble
28-
<br />
29-
Minimum value: @(double.MinValue); Maximum value: @(double.MaxValue)
32+
<br/>
33+
Minimum value: @(MinValue); Maximum value: @(MaxValue)
3034
</p>
3135
<p>
32-
<FluentNumberField @bind-Value="@exampleDecimal">Decimal</FluentNumberField><br />
36+
<FluentNumberField @bind-Value="@exampleDecimal">Decimal</FluentNumberField>
37+
<br/>
3338
Example decimal: @exampleDecimal
34-
<br />
35-
Minimum value: @(decimal.MinValue); Maximum value: @(decimal.MaxValue)
39+
<br/>
40+
Minimum value: @(MinValue); Maximum value: @(MaxValue)
41+
</p>
42+
43+
<p>
44+
<FluentNumberField @bind-Value="@exampleUshort">Unsigned short</FluentNumberField>
45+
Example unsigned short: @exampleUshort
46+
<br/>
47+
Minimum value: @(ushort.MinValue); Maximum value: @(ushort.MaxValue)
48+
</p>
49+
50+
<p>
51+
<FluentNumberField @bind-Value="@exampleUint">Unsigned integer</FluentNumberField>
52+
Example unsigned integer: @exampleUint
53+
<br/>
54+
Minimum value: @(uint.MinValue); Maximum value: @(uint.MaxValue)
55+
</p>
56+
57+
<p>
58+
<FluentNumberField @bind-Value="@exampleUlong">Unsigned long</FluentNumberField>
59+
Example unsigned long: @exampleUlong
60+
<br/>
61+
Minimum value: @(ulong.MinValue); Maximum value: @(MaxValue)
3662
</p>
3763

3864
@code {
39-
int exampleInt { get; set; } = 123;
40-
int exampleInt2 { get; set; } = 345;
4165
short shortMin = short.MinValue;
42-
long exampleLong { get; set; } = 999999999999;
66+
long exampleLong { get; set; } = 9999999997;
4367
float exampleFloat { get; set; } = 123.45f;
68+
float exampleFloat2 { get; set; } = 123.45f;
4469
double exampleDouble { get; set; } = 456.32d;
4570
decimal exampleDecimal { get; set; } = Decimal.One / 3;
71+
ushort exampleUshort { get; set; }
72+
uint exampleUint { get; set; }
73+
ulong exampleUlong { get; set; }
74+
75+
private const long MaxValue = 9999999999;
76+
private const long MinValue = -9999999999;
4677
}

‎examples/Demo/Shared/Pages/NumberField/NumberFieldPage.razor‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333

3434
<DemoSection Title="Types" Component="@typeof(NumberFieldTypes)"></DemoSection>
3535

36+
<DemoSection Title="Types with constraints" Component="typeof(NumberFieldTypeConstraints)"></DemoSection>
37+
3638
<DemoSection Title="Displays" Component="@typeof(NumberFieldDisplays)"></DemoSection>
3739

3840
<DemoSection Title="Icons"Component="@typeof(NumberFieldIcons)"></DemoSection>

‎examples/Demo/Shared/Shared/DemoMainLayout.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
</div>
9292
<FluentSpacer />
9393
<div class="copy">
94-
Microsoft © 2024. All rights reserved.
94+
Microsoft © 2025. All rights reserved.
9595
</div>
9696
</FluentFooter>
9797
</FluentLayout>

0 commit comments

Comments
 (0)