Adds support for Static Forms

chanan · Aug 10, 2024 · f17a6f2 · f17a6f2
1 parent 3467419
commit f17a6f2
Show file tree

Hide file tree

Showing 15 changed files with 66 additions and 10 deletions.
diff --git a/src/BlazorStrap-Docs/Samples/V5/Forms/InputFile/InputFile1.razor b/src/BlazorStrap-Docs/Samples/V5/Forms/InputFile/InputFile1.razor
@@ -4,6 +4,7 @@
     <BSFeedback For="() => Modal.HasFile"/>
 </div>
 
+
 @code {
     private ModalClass Modal { get; set; } = new ModalClass();
     private void OnFileChange(InputFileChangeEventArgs e)

diff --git a/src/BlazorStrap-Docs/wwwroot/Samples/V5/Forms/InputFile/InputFile1.md b/src/BlazorStrap-Docs/wwwroot/Samples/V5/Forms/InputFile/InputFile1.md
@@ -4,6 +4,7 @@
     <BSFeedback For="() => Modal.HasFile"/>
 </div>
 
+
 @code {
     private ModalClass Modal { get; set; } = new ModalClass();
     private void OnFileChange(InputFileChangeEventArgs e)

diff --git a/src/BlazorStrap.V4/BlazorStrap.V4.csproj b/src/BlazorStrap.V4/BlazorStrap.V4.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 		<LangVersion>10.0</LangVersion>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
@@ -14,7 +14,7 @@
 		<PackageProjectUrl>https://blazorstrap.io/</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/chanan/BlazorStrap</RepositoryUrl>
 		<RootNamespace>BlazorStrap.V4</RootNamespace>
-		<PackageVersion>5.2.101</PackageVersion><!--Next Use 5.2.200-Preview1-->
+		<PackageVersion>5.2.102-Preview1</PackageVersion><!--Next Use 5.2.200-Preview1-->
 	</PropertyGroup>
 
 	<ItemGroup Condition="  '$(TargetFramework)' == 'net6.0'  ">
@@ -25,6 +25,10 @@
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.*" />
 		<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
 	</ItemGroup>
+	<ItemGroup Condition="  '$(TargetFramework)' == 'net8.0'  ">
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.*" />
+		<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
+	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\BlazorStrap\BlazorStrap.csproj" />
 	</ItemGroup>

diff --git a/src/BlazorStrap.V4/Components/Forms/BSForm.cs b/src/BlazorStrap.V4/Components/Forms/BSForm.cs
@@ -67,6 +67,8 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
                     formBuilder.AddEventPreventDefaultAttribute(8, "onreset", true);
                 }
                 formBuilder.AddAttribute(9, "ChildContent", EditFormChildContent);
+                formBuilder.AddAttribute(10, "FormName", FormName);
+                formBuilder.AddAttribute(11, "Enhance", Enhance);
                 formBuilder.CloseComponent();
             };
 

diff --git a/src/BlazorStrap.V4/Components/Forms/BSInput.cs b/src/BlazorStrap.V4/Components/Forms/BSInput.cs
@@ -48,6 +48,9 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
             builder.AddAttribute(9, "onfocus", OnFocusEvent);
             builder.AddMultipleAttributes(8, AdditionalAttributes);
             builder.AddAttribute(10, "multiple", IsMultipleSelect);
+#if NET8_0_OR_GREATER
+            builder.AddAttribute(11, "name",NameAttributeValue );
+#endif
             if (Helper?.Id != null)
             {
                 builder.AddAttribute(11, "id", Helper.Id);

diff --git a/src/BlazorStrap.V4/Components/Forms/BSInputCheckbox.cs b/src/BlazorStrap.V4/Components/Forms/BSInputCheckbox.cs
@@ -53,6 +53,9 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
                 builder.AddAttribute(10, "id", Helper.Id);
             }
             builder.AddAttribute(11, "disabled", IsDisabled);
+#if NET8_0_OR_GREATER
+            builder.AddAttribute(12, "name",NameAttributeValue );
+#endif
             builder.AddMultipleAttributes(13, AdditionalAttributes);
             builder.AddElementReferenceCapture(14, elReference => Element = elReference);
             builder.CloseElement();

diff --git a/src/BlazorStrap.V5/BlazorStrap.V5.csproj b/src/BlazorStrap.V5/BlazorStrap.V5.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 		<LangVersion>10.0</LangVersion>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
@@ -13,7 +13,7 @@
 		<PackageProjectUrl>https://blazorstrap.io/</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/chanan/BlazorStrap</RepositoryUrl>
 		<RootNamespace>BlazorStrap.V5</RootNamespace>
-		<PackageVersion>5.2.101</PackageVersion><!--Next Use 5.2.200-Preview1-->
+		<PackageVersion>5.2.102-Preview1</PackageVersion><!--Next Use 5.2.200-Preview1-->
 	</PropertyGroup>
 
 	<ItemGroup Condition="  '$(TargetFramework)' == 'net6.0'  ">
@@ -24,6 +24,10 @@
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.*" />
 		<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
 	</ItemGroup>
+	<ItemGroup Condition="  '$(TargetFramework)' == 'net87.0'  ">
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.*" />
+		<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
+	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\BlazorStrap\BlazorStrap.csproj" />
 	</ItemGroup>

diff --git a/src/BlazorStrap.V5/Components/Forms/BSForm.cs b/src/BlazorStrap.V5/Components/Forms/BSForm.cs
@@ -68,6 +68,8 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
                     formBuilder.AddEventPreventDefaultAttribute(8, "onreset", true);
                 }
                 formBuilder.AddAttribute(9, "ChildContent", EditFormChildContent);
+                formBuilder.AddAttribute(10, "FormName", FormName);
+                formBuilder.AddAttribute(11, "Enhance", Enhance);
                 formBuilder.CloseComponent();
             };
 

diff --git a/src/BlazorStrap.V5/Components/Forms/BSInput.cs b/src/BlazorStrap.V5/Components/Forms/BSInput.cs
@@ -51,6 +51,9 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
             builder.AddAttribute(9, "onfocus", OnFocusEvent);
             builder.AddMultipleAttributes(8, AdditionalAttributes);
             builder.AddAttribute(10, "multiple", IsMultipleSelect);
+#if NET8_0_OR_GREATER
+            builder.AddAttribute(11, "name",NameAttributeValue );
+#endif
             if (Helper?.Id != null)
             {
                 builder.AddAttribute(11, "id", Helper.Id);

diff --git a/src/BlazorStrap.V5/Components/Forms/BSInputCheckbox.cs b/src/BlazorStrap.V5/Components/Forms/BSInputCheckbox.cs
@@ -61,6 +61,9 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
                 builder.AddAttribute(12, "id", id);
             builder.AddMultipleAttributes(13, AdditionalAttributes);
             builder.AddElementReferenceCapture(14, elReference => Element = elReference);
+#if NET8_0_OR_GREATER
+            builder.AddAttribute(15, "name",NameAttributeValue );
+#endif
             builder.CloseElement();
             if (IsToggle)
             {

diff --git a/src/BlazorStrap/BlazorStrap.csproj b/src/BlazorStrap/BlazorStrap.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 		<LangVersion>10.0</LangVersion>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
@@ -13,7 +13,8 @@
 		<PackageProjectUrl>https://blazorstrap.io/</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/chanan/BlazorStrap</RepositoryUrl>
 		<RootNamespace>BlazorStrap</RootNamespace>
-		<PackageVersion>5.2.101</PackageVersion><!--Next Use 5.2.200-Preview1-->
+		<PackageVersion>5.2.102-Preview1</PackageVersion>
+		<AnalysisLevel>6.0</AnalysisLevel><!--Next Use 5.2.200-Preview1-->
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -40,4 +41,8 @@
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.*" />
 		<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
 	</ItemGroup>
+	<ItemGroup Condition="  '$(TargetFramework)' == 'net8.0'  ">
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.*" />
+		<PackageReference Include="BlazorComponentUtilities" Version="1.7.1" />
+	</ItemGroup>
 </Project>
diff --git a/src/BlazorStrap/Shared/Components/Forms/BSFormBase.cs b/src/BlazorStrap/Shared/Components/Forms/BSFormBase.cs
@@ -7,6 +7,16 @@ namespace BlazorStrap.Shared.Components.Forms
     public abstract class BSFormBase<TValue, TJustify> : BlazorStrapBase, IBSForm where TJustify : Enum
     {
         public event Action? OnResetEventHandler;
+
+        /// <summary>
+        /// If enabled, form submission is performed without fully reloading the page. This is
+        /// equivalent to adding <code>data-enhance</code> to the form.
+        ///
+        /// This flag is only relevant in server-side rendering (SSR) scenarios. For interactive
+        /// rendering, the flag has no effect since there is no full-page reload on submit anyway.
+        /// </summary>
+        [Parameter] public bool Enhance { get; set; }
+
         /// <summary>
         /// Form alignment.
         /// </summary>
@@ -17,6 +27,12 @@ public abstract class BSFormBase<TValue, TJustify> : BlazorStrapBase, IBSForm wh
         /// </summary>
         [Parameter] public EditContext? EditContext { get; set; }
 
+        /// <summary>
+        /// Gets or sets the form handler name. This is required for posting it to a server-side endpoint.
+        /// It is not used during interactive rendering.
+        /// </summary>
+        [Parameter] public string? FormName { get; set; }
+
         /// <summary>
         /// Gutters
         /// </summary>

diff --git a/src/BlazorStrap/Shared/Components/Forms/BSInputFileBase.cs b/src/BlazorStrap/Shared/Components/Forms/BSInputFileBase.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Components.Web;
+using System.Globalization;
 using System.Linq.Expressions;
 
 namespace BlazorStrap.Shared.Components.Forms
@@ -124,6 +125,7 @@ protected Task OnFileClick(MouseEventArgs e)
             var filechangevent = new InputFileChangeEventArgs(Array.Empty<IBrowserFile>());
             return OnFileChange(filechangevent);
         }
+
 
         private void DoValidation()
         {

diff --git a/src/BlazorStrap/Shared/Components/Forms/BlazorStrapInputBase.cs b/src/BlazorStrap/Shared/Components/Forms/BlazorStrapInputBase.cs
@@ -83,10 +83,10 @@ public abstract class BlazorStrapInputBase<TValue> : BlazorInputBase<TValue>, IB
                 CultureInfo @cultureInfo => BindConverter.FormatValue(@cultureInfo.Name),
                 DateTime @dateTimeValue => BindConverter.FormatValue(@dateTimeValue, _dateFormat, CultureInfo.InvariantCulture),
                 DateTimeOffset @dateTimeOffsetValue => BindConverter.FormatValue(@dateTimeOffsetValue, _dateFormat, CultureInfo.InvariantCulture),
-                #if NET6_0_OR_GREATER
+#if NET6_0_OR_GREATER
                 DateOnly dateOnlyValue => BindConverter.FormatValue(dateOnlyValue, _dateFormat, CultureInfo.InvariantCulture),
                 TimeOnly timeOnlyValue => BindConverter.FormatValue(timeOnlyValue, _dateFormat, CultureInfo.InvariantCulture),
-                #endif
+#endif
                 _ => base.FormatValueAsString(value),
             };
         }
@@ -312,4 +312,4 @@ private void Dispose()
 
         #endregion
     }
-}
+}
diff --git a/src/BlazorStrap/Utilities/BlazorInputBase.cs b/src/BlazorStrap/Utilities/BlazorInputBase.cs
@@ -19,6 +19,12 @@ namespace BlazorStrap.Utilities;
 /// integrates with an <see cref="Microsoft.AspNetCore.Components.Forms.EditContext"/>, which must be supplied
 /// as a cascading parameter.
 /// </summary>
+
+#if NET8_0
+public abstract class BlazorInputBase<TValue> : InputBase<TValue>
+{
+}
+#else
 public abstract class BlazorInputBase<TValue> : ComponentBase, IDisposable
 {
 
@@ -304,4 +310,5 @@ void IDisposable.Dispose()
 
         Dispose(disposing: true);
     }
-}
+}
+#endif