Merge branch 'dev' into cupsos/not-setting-current-value

microsoft · Feb 2, 2024 · 41a87a5 · 41a87a5
2 parents 3986ff0 + 0bb1121
commit 41a87a5
Show file tree

Hide file tree

Showing 87 changed files with 588 additions and 530 deletions.
diff --git a/examples/Demo/Shared/Pages/SortableList/SortableListPage.razor b/examples/Demo/Shared/Pages/SortableList/SortableListPage.razor
@@ -85,7 +85,11 @@
 
 <DemoSection Component="typeof(SortableListDragHandles)" Title="Drag Handles">
     <Description>
-        Drag handles are specified by the `Handle` property which specifies which CSS class denotes the drag handle. In the example below, the items can only be sorted using the drag handle itself.
+        When setting the <code>Handle</code> parameter to true, the items can only be sorted using the drag handle itself. The following CSS classes can be used to split the drag functionality from the content:
+        <ul>
+            <li>sortable-grab: the grabable part of the dragable item</li>
+            <li>sortable-item-content: the content part of the draggable item</li>
+        </ul>
     </Description>
 </DemoSection>
 

diff --git a/...ed/Pages/Splitter/PanelSplitterPage.razor → ...red/Pages/Splitter/MultSplitterPage.razor b/...ed/Pages/Splitter/PanelSplitterPage.razor → ...red/Pages/Splitter/MultSplitterPage.razor
@@ -4,19 +4,19 @@
 #pragma warning disable FluentMultiSplitter
 }
 
-<h1>Panel Splitter (Experimental)</h1>
+<h1>MultiSplitter (Experimental)</h1>
 
 <blockquote style="font-style: normal;">
     ⚠️ <b>This component is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.</b>.<br />
     To use it, you need to add the following line to the top of your razor file <br />
     <code>@($"@{{ #pragma warning disable FluentMultiSplitter }}")</code>
 </blockquote>
 
-<p>The <b>Panel Splitter</b> splits the page into sections and allows the user to control the page layout.</p>
+<p>The <b>MultiSplitter</b> splits the page into multiple sections and allows the user to control the page layout.</p>
 
 <p>
-    You can include as many <b>Pane</b> as you like in a container.
-    By default, panels are resizable, but the <code>Resizable</code> property can be used to block this functionality.
+    You can include as many <b>Pane</b>s as you like in a container.
+    By default, panes are resizable, but the <code>Resizable</code> property can be used to block this functionality.
     The initial <code>Size</code> is in percent or pixels and has a <code>Min</code> and <code>Max</code> value.
     A Panel can be fully collapsed by setting the <code>Collapsible</code> property to True.
 </p>
@@ -57,4 +57,4 @@
 <h2 id="documentation">Documentation</h2>
 
 <ApiDocumentation Component="typeof(FluentMultiSplitter)" />
-<ApiDocumentation Component="typeof(FluentMultiSplitterPane)" />
+<ApiDocumentation Component="typeof(FluentMultiSplitterPane)" />
diff --git a/...llapsibleRegion_NotExpanded.verified.html → ...sibleRegion_Collapsed.verified.razor.html b/...llapsibleRegion_NotExpanded.verified.html → ...sibleRegion_Collapsed.verified.razor.html
@@ -1,4 +1,2 @@
 
-<div class="fluent-collapsible-region-container" style="height: 0;" b-2esy53gizz="">
-  <b>render me</b>
-</div>
+<div class="fluent-collapsible-region-container" style="height: 0;" b-hk0m26j2or="">Content</div>
diff --git a/...ntCollapsibleRegion_Default.verified.html → ...psibleRegion_Expanded.verified.razor.html b/...ntCollapsibleRegion_Default.verified.html → ...psibleRegion_Expanded.verified.razor.html
@@ -1,4 +1,2 @@
 
-<div class="fluent-collapsible-region-container" style="height: auto;" b-2esy53gizz="">
-  <b>render me</b>
-</div>
+<div class="fluent-collapsible-region-container" style="height: auto;" b-hk0m26j2or="">Content</div>
diff --git a/...sibleRegion_ExpandedChanged.verified.html → ...egion_ExpandedChanged.verified.razor.html b/...sibleRegion_ExpandedChanged.verified.html → ...egion_ExpandedChanged.verified.razor.html
@@ -1,4 +1,2 @@
 
-<div class="fluent-collapsible-region-container" style="height: auto;" b-2esy53gizz="">
-  <b>render me</b>
-</div>
+<div class="fluent-collapsible-region-container" style="height: auto;" b-hk0m26j2or="">Content</div>
diff --git a/...Region/FluentCollapsibleRegionTests.FluentCollapsibleRegion_MaxHeight.verified.razor.html b/...Region/FluentCollapsibleRegionTests.FluentCollapsibleRegion_MaxHeight.verified.razor.html
@@ -0,0 +1,2 @@
+
+<div class="fluent-collapsible-region-container" style="max-height: 200px; height: 0;" b-hk0m26j2or="">Content</div>
diff --git a/tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.razor b/tests/Core/CollapsibleRegion/FluentCollapsibleRegionTests.razor
@@ -0,0 +1,51 @@
+@using Xunit;
+@inherits TestContext
+@code
+{
+    [Fact]
+    public void FluentCollapsibleRegion_Expanded()
+    {
+        // Arrange && Act
+        var cut = Render(@<FluentCollapsibleRegion Expanded="true">Content</FluentCollapsibleRegion>);
+
+        // Assert
+        cut.Verify();
+    }
+
+    [Fact]
+    public void FluentCollapsibleRegion_Collapsed()
+    {
+        // Arrange && Act
+        var cut = Render(@<FluentCollapsibleRegion Expanded="false">Content</FluentCollapsibleRegion>);
+
+        // Assert
+        cut.Verify();
+    }
+
+    [Fact]
+    public void FluentCollapsibleRegion_MaxHeight()
+    {
+        // Arrange
+        var maxHeight = "200px";
+
+        // Act
+        var cut = Render(@<FluentCollapsibleRegion MaxHeight="@maxHeight">Content</FluentCollapsibleRegion>);
+
+        // Assert
+        cut.Verify();
+    }
+
+    [Fact]
+    public void FluentCollapsibleRegion_ExpandedChanged()
+    {
+        // Arrange
+        var value = false;
+        Action<bool> expandedChanged = (e) => { value = e; };
+
+        // Act
+        var cut = Render(@<FluentCollapsibleRegion Expanded="true" ExpandedChanged="expandedChanged">Content</FluentCollapsibleRegion>);
+
+        // Assert
+        cut.Verify();
+    }
+}
diff --git a/...psibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_MaxHeight.verified.html b/...psibleRegion/FluentCollapsibleRegionTests.FluentCollapsibleRegion_MaxHeight.verified.html
diff --git a/tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.cs b/tests/Core/_ToDo/CollapsibleRegion/FluentCollapsibleRegionTests.cs
diff --git a/...dualAccounts/A-SSR/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs b/...dualAccounts/A-SSR/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -36,6 +36,16 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
                 "/Account/ExternalLogin",
                 QueryString.Create(query));
 
+            // Temporary workaround for FluentButton returning a provider value twice
+            // Split the comma-separated list of strings
+            var providers = provider.Split(',');
+
+            // Find the value that appears twice in the list
+            provider = providers.GroupBy(p => p)
+                                .Where(g => g.Count() == 2)
+                                .Select(g => g.Key)
+                                .First();
+
             var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
             return TypedResults.Challenge(properties, [provider]);
         });

diff --git a/...eValidation/IndividualAccounts/A-SSR/Components/Account/Pages/Manage/ExternalLogins.razor b/...eValidation/IndividualAccounts/A-SSR/Components/Account/Pages/Manage/ExternalLogins.razor
@@ -54,7 +54,7 @@
             <p>
                 @foreach (var provider in otherLogins)
                 {
-                                        <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
                         @provider.DisplayName
                     </FluentButton>
                 }

diff --git a/...teValidation/IndividualAccounts/A-SSR/Components/Account/Shared/ExternalLoginPicker.razor b/...teValidation/IndividualAccounts/A-SSR/Components/Account/Shared/ExternalLoginPicker.razor
@@ -23,7 +23,8 @@ else
             <p>
                 @foreach (var provider in externalLogins)
                 {
-                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent"  name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <text>&nbsp;</text>
                 }
             </p>
         </div>

diff --git a/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Pages/Weather.razor b/tests/TemplateValidation/IndividualAccounts/A-SSR/Components/Pages/Weather.razor
@@ -15,10 +15,10 @@ else
 {
     <!-- This page is rendered in SSR mode, so the FluentDataGrid component does not offer any interactivity (like sorting). -->
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Align=Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align="Align.End"/>
     </FluentDataGrid>
 }
 

diff --git a/tests/TemplateValidation/IndividualAccounts/A-SSR/FluentUI.TemplateValidation.csproj b/tests/TemplateValidation/IndividualAccounts/A-SSR/FluentUI.TemplateValidation.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>aspnet-FluentUI.TemplateValidation-da823711-18da-48b3-8509-abef0515630f</UserSecretsId>
+    <UserSecretsId>aspnet-FluentUI.TemplateValidation-d2fb3a59-b7c2-4f16-b8fa-2fd124e6bfd1</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/TemplateValidation/IndividualAccounts/A-SSR/Properties/launchSettings.json b/tests/TemplateValidation/IndividualAccounts/A-SSR/Properties/launchSettings.json
@@ -4,16 +4,16 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:16962",
-        "sslPort": 44395
+        "applicationUrl": "http://localhost:12503",
+        "sslPort": 44388
       }
     },
     "profiles": {
       "http": {
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "applicationUrl": "http://localhost:5128",
+        "applicationUrl": "http://localhost:5225",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -22,7 +22,7 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "applicationUrl": "https://localhost:7127;http://localhost:5128",
+        "applicationUrl": "https://localhost:7287;http://localhost:5225",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }

diff --git a/...ts/B-Server/Global/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs b/...ts/B-Server/Global/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -36,6 +36,16 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
                 "/Account/ExternalLogin",
                 QueryString.Create(query));
 
+            // Temporary workaround for FluentButton returning a provider value twice
+            // Split the comma-separated list of strings
+            var providers = provider.Split(',');
+
+            // Find the value that appears twice in the list
+            provider = providers.GroupBy(p => p)
+                                .Where(g => g.Count() == 2)
+                                .Select(g => g.Key)
+                                .First();
+
             var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
             return TypedResults.Challenge(properties, [provider]);
         });

diff --git a/...n/IndividualAccounts/B-Server/Global/Components/Account/Pages/Manage/ExternalLogins.razor b/...n/IndividualAccounts/B-Server/Global/Components/Account/Pages/Manage/ExternalLogins.razor
@@ -54,7 +54,7 @@
             <p>
                 @foreach (var provider in otherLogins)
                 {
-                                        <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="Provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">
                         @provider.DisplayName
                     </FluentButton>
                 }

diff --git a/...on/IndividualAccounts/B-Server/Global/Components/Account/Shared/ExternalLoginPicker.razor b/...on/IndividualAccounts/B-Server/Global/Components/Account/Shared/ExternalLoginPicker.razor
@@ -23,7 +23,8 @@ else
             <p>
                 @foreach (var provider in externalLogins)
                 {
-                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent"  name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent" Name="provider" Value="@provider.Name" Title="@($"Log in using your {provider.DisplayName} account")">@provider.DisplayName</FluentButton>
+                    <text>&nbsp;</text>
                 }
             </p>
         </div>

diff --git a/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Pages/Weather.razor b/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Components/Pages/Weather.razor
@@ -13,10 +13,10 @@
 else
 {
     <FluentDataGrid Id="weathergrid" Items=@forecasts GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem=WeatherForecast>
-        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align=Align.Start/>
-        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align=Align.Center/>
-        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align=Align.End/>
+        <PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align="Align.Start"/>
+        <PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align="Align.Center"/>
+        <PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align="Align.End"/>
     </FluentDataGrid>
 }
 

diff --git a/.../TemplateValidation/IndividualAccounts/B-Server/Global/FluentUI.TemplateValidation.csproj b/.../TemplateValidation/IndividualAccounts/B-Server/Global/FluentUI.TemplateValidation.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>aspnet-FluentUI.TemplateValidation-872fa7db-498e-4557-922b-9a86831b2831</UserSecretsId>
+    <UserSecretsId>aspnet-FluentUI.TemplateValidation-1775dc8f-f41e-4334-9c4b-5b36ba013869</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Properties/launchSettings.json b/tests/TemplateValidation/IndividualAccounts/B-Server/Global/Properties/launchSettings.json
@@ -4,16 +4,16 @@
       "windowsAuthentication": false,
       "anonymousAuthentication": true,
       "iisExpress": {
-        "applicationUrl": "http://localhost:3162",
-        "sslPort": 44312
+        "applicationUrl": "http://localhost:1887",
+        "sslPort": 44376
       }
     },
     "profiles": {
       "http": {
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "applicationUrl": "http://localhost:5208",
+        "applicationUrl": "http://localhost:5240",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }
@@ -22,7 +22,7 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "applicationUrl": "https://localhost:7121;http://localhost:5208",
+        "applicationUrl": "https://localhost:7253;http://localhost:5240",
         "environmentVariables": {
           "ASPNETCORE_ENVIRONMENT": "Development"
         }

diff --git a/...s/B-Server/PerPage/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs b/...s/B-Server/PerPage/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -36,6 +36,16 @@ public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEn
                 "/Account/ExternalLogin",
                 QueryString.Create(query));
 
+            // Temporary workaround for FluentButton returning a provider value twice
+            // Split the comma-separated list of strings
+            var providers = provider.Split(',');
+
+            // Find the value that appears twice in the list
+            provider = providers.GroupBy(p => p)
+                                .Where(g => g.Count() == 2)
+                                .Select(g => g.Key)
+                                .First();
+
             var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
             return TypedResults.Challenge(properties, [provider]);
         });
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@

		<div class="fluent-collapsible-region-container" style="max-height: 200px; height: 0;" b-hk0m26j2or="">Content</div>