Merge branch 'master' into feature/InternalTypeLinksFix

havit · Nov 29, 2023 · 7fa1aab · 7fa1aab
2 parents a17d2b8 + 61d1048
commit 7fa1aab
Show file tree

Hide file tree

Showing 95 changed files with 696 additions and 268 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -13,6 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+    - name: Setup .NET 8
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 8.0.x
     - name: Setup .NET 7
       uses: actions/setup-dotnet@v3
       with:

diff --git a/BlazorAppTest/BlazorAppTest.csproj b/BlazorAppTest/BlazorAppTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-	  <TargetFramework>net7.0</TargetFramework>
+	  <TargetFramework>net8.0</TargetFramework>
 	  <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/BlazorAppTest/Pages/HxCalendarComponents/ZonedTimeProvider.cs b/BlazorAppTest/Pages/HxCalendarComponents/ZonedTimeProvider.cs
@@ -0,0 +1,13 @@
+namespace BlazorAppTest.Pages.HxCalendarComponents;
+
+public class ZonedTimeProvider : TimeProvider
+{
+	private TimeZoneInfo zoneInfo;
+
+	public ZonedTimeProvider(TimeZoneInfo zoneInfo)
+	{
+		this.zoneInfo = zoneInfo;
+	}
+
+	public override TimeZoneInfo LocalTimeZone { get => zoneInfo; }
+}
diff --git a/BlazorAppTest/Pages/HxCalendar_Issue597_Test.razor b/BlazorAppTest/Pages/HxCalendar_Issue597_Test.razor
@@ -0,0 +1,44 @@
+@page "/HxCalendar_Issue597_Test"
+@using BlazorAppTest.Pages.HxCalendarComponents;
+@inject TimeProvider SystemTimeProvider
+<h1>HxCalendar</h1>
+<fieldset class="m-2 p-2">
+    <label>From DI: @(SystemTimeProvider.LocalTimeZone.Id)</label>
+    <div>
+        <HxCalendar />
+    </div>
+</fieldset>
+
+<fieldset class="m-2 p-2">
+    <label>From Settings: @(AppCalendarSettings.AmericanSamoa.TimeProvider.LocalTimeZone.Id)</label>
+    <div><HxCalendar Settings="AppCalendarSettings.AmericanSamoa" /></div>
+</fieldset>
+
+<fieldset class="m-2 p-2">
+    <label>From Settings: @(AppCalendarSettings.Samoa.TimeProvider.LocalTimeZone.Id)</label>
+    <div><HxCalendar Settings="AppCalendarSettings.Samoa" /></div>
+</fieldset>
+
+<fieldset class="m-2 p-2">
+    <label>From Settings: @(timeProviderUtc.LocalTimeZone.Id)</label>
+    <div><HxCalendar TimeProvider="timeProviderUtc" /></div>
+</fieldset>
+
+@code {
+    private static TimeProvider timeProviderUtc = new ZonedTimeProvider(TimeZoneInfo.Utc);
+
+    private class AppCalendarSettings
+    {
+        private static TimeProvider timeProviderUtc11 = new ZonedTimeProvider(TimeZoneInfo.FindSystemTimeZoneById("UTC-11"));
+        private static TimeProvider timeProviderUtc13 = new ZonedTimeProvider(TimeZoneInfo.FindSystemTimeZoneById("Samoa Standard Time"));
+        public static CalendarSettings AmericanSamoa => new()
+        {
+            TimeProvider = timeProviderUtc11,
+        };
+        public static CalendarSettings Samoa => new()
+        {
+            TimeProvider = timeProviderUtc13,
+        };
+    }
+
+}
diff --git a/BlazorAppTest/Pages/HxScrollspyTest.razor b/BlazorAppTest/Pages/HxScrollspyTest.razor
@@ -1,5 +1,8 @@
 @page "/HxScrollspyTest"
 @inject NavigationManager NavigationManager
+@{
+#pragma warning disable 0618 // HxAnchorFragmentNavigation
+}
 
 <h1>Scrollspy Tests</h1>
 
@@ -100,4 +103,5 @@
 			await anchorFragmentNavigationComponent.ScrollToCurrentUriFragmentAsync();
 		}
 	}
+#pragma warning restore 0618
 }
diff --git a/BlazorAppTest/Pages/HxSearchBoxTest.razor b/BlazorAppTest/Pages/HxSearchBoxTest.razor
@@ -1,6 +1,18 @@
 @page "/HxSearchBoxTest"
 
-<HxSearchBox DataProvider="ProvideSearchResults" Label="Search" ItemTitleSelector="(i) => i.Title" ItemSubtitleSelector="(i) => i.Subtitle" ItemIconSelector="(i) => i.Icon" TItem="SearchBoxItem" >
+<HxSearchBox DataProvider="ProvideSearchResults" Label="Search needle in a haystack" InputSize="InputSize.Small" ItemTitleSelector="(i) => i.Title" ItemSubtitleSelector="(i) => i.Subtitle" ItemIconSelector="(i) => i.Icon" TItem="SearchBoxItem">
+    <DefaultContentTemplate>
+        <div class="small py-2 px-3 text-muted">Search for Mouse, Table or Door...</div>
+    </DefaultContentTemplate>
+</HxSearchBox>
+
+<HxSearchBox DataProvider="ProvideSearchResults" Label="Search regular stuff" InputSize="InputSize.Regular" ItemTitleSelector="(i) => i.Title" ItemSubtitleSelector="(i) => i.Subtitle" ItemIconSelector="(i) => i.Icon" TItem="SearchBoxItem">
+    <DefaultContentTemplate>
+        <div class="small py-2 px-3 text-muted">Search for Mouse, Table or Door...</div>
+    </DefaultContentTemplate>
+</HxSearchBox>
+
+<HxSearchBox DataProvider="ProvideSearchResults" Label="Search huge things" InputSize="InputSize.Large" ItemTitleSelector="(i) => i.Title" ItemSubtitleSelector="(i) => i.Subtitle" ItemIconSelector="(i) => i.Icon" TItem="SearchBoxItem">
     <DefaultContentTemplate>
         <div class="small py-2 px-3 text-muted">Search for Mouse, Table or Door...</div>
     </DefaultContentTemplate>

diff --git a/BlazorAppTest/Startup.cs b/BlazorAppTest/Startup.cs
@@ -27,6 +27,7 @@ public void ConfigureServices(IServiceCollection services)
 		services.AddRazorPages();
 		services.AddServerSideBlazor();
 
+		services.AddHxServices();
 		services.AddHxMessenger();
 		services.AddHxMessageBoxHost();
 		services.AddHxGoogleTagManager(options =>

diff --git a/BlazorRTLAppTest/BlazorRTLAppTest.csproj b/BlazorRTLAppTest/BlazorRTLAppTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -11,8 +11,8 @@
 		<LangVersion>latest</LangVersion>
 
 		<!-- aligned NuGet PackageVersion for package-bundles -->
-		<ComponentsPackagesVersion>4.2.6</ComponentsPackagesVersion>
-		<GrpcPackagesVersion>1.4.4</GrpcPackagesVersion>
+		<ComponentsPackagesVersion>4.3.4</ComponentsPackagesVersion>
+		<GrpcPackagesVersion>1.5.0</GrpcPackagesVersion>
 	</PropertyGroup>
 
 	<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')))"/>

diff --git a/....Blazor.Components.Web.Bootstrap.Tests/Havit.Blazor.Components.Web.Bootstrap.Tests.csproj b/....Blazor.Components.Web.Bootstrap.Tests/Havit.Blazor.Components.Web.Bootstrap.Tests.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
+	  <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
 	  <IsPackable>false</IsPackable>
 	  <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="bunit.web" Version="1.24.10" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+		<PackageReference Include="bunit.web" Version="1.25.3" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
 		<PackageReference Include="Moq" Version="4.20.69" />
 		<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
 		<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Alerts/HxAlert.razor.cs b/Havit.Blazor.Components.Web.Bootstrap/Alerts/HxAlert.razor.cs
@@ -27,7 +27,7 @@ protected override void OnParametersSet()
 	{
 		base.OnParametersSet();
 
-		Contract.Requires<InvalidOperationException>(Color != ThemeColor.None, $"Parameter {nameof(Color)} of {nameof(HxBadge)} is required.");
+		Contract.Requires<InvalidOperationException>(Color != ThemeColor.None, $"Parameter {nameof(Color)} of {nameof(HxAlert)} is required.");
 	}
 
 	public string GetColorCss()

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Calendar/CalendarSettings.cs b/Havit.Blazor.Components.Web.Bootstrap/Calendar/CalendarSettings.cs
@@ -19,4 +19,10 @@ public record CalendarSettings
 	/// Allows customization of the dates in dropdown calendars.
 	/// </summary>
 	public CalendarDateCustomizationProviderDelegate DateCustomizationProvider { get; set; }
+
+	/// <summary>
+	/// TimeProvider to customize the today date
+	/// </summary>
+	public TimeProvider TimeProvider { get; set; }
+
 }
diff --git a/Havit.Blazor.Components.Web.Bootstrap/Calendar/HxCalendar.razor.cs b/Havit.Blazor.Components.Web.Bootstrap/Calendar/HxCalendar.razor.cs
@@ -1,4 +1,5 @@
 using System.Globalization;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Havit.Blazor.Components.Web.Bootstrap;
 
@@ -28,7 +29,7 @@ static HxCalendar()
 		Defaults = new CalendarSettings()
 		{
 			MinDate = DefaultMinDate,
-			MaxDate = DefaultMaxDate
+			MaxDate = DefaultMaxDate,
 		};
 	}
 
@@ -105,6 +106,20 @@ static HxCalendar()
 	/// </summary>
 	[Parameter] public bool KeyboardNavigation { get; set; } = true;
 
+	// Set during SetParameterSetAsync to make it optional
+	[Inject] protected TimeProvider TimeProviderFromServices { get; set; }
+
+	/// <summary>
+	/// TimeProvider is resolved in the following order:<br />
+	///		1. TimeProvider from this parameter <br />
+	///		2. Settings TimeProvider (configurable from <see cref="HxCalendar.Settings"/>)<br />
+	///		3. Defaults TimeProvider (configurable from <see cref="HxCalendar.Defaults"/>)<br />
+	///		4. TimeProvider from DependencyInjection<br />
+	/// </summary>
+	[Parameter] public TimeProvider TimeProvider { get; set; } = null;
+
+	protected TimeProvider TimeProviderEffective => TimeProvider ?? GetSettings()?.TimeProvider ?? GetDefaults()?.TimeProvider ?? TimeProviderFromServices;
+
 	private CultureInfo Culture => CultureInfo.CurrentUICulture;
 	private DayOfWeek FirstDayOfWeek => Culture.DateTimeFormat.FirstDayOfWeek;
 	protected DateTime DisplayMonthFirstDay => new DateTime(DisplayMonth.Year, DisplayMonth.Month, 1);
@@ -138,7 +153,7 @@ protected override async Task OnParametersSetAsync()
 
 		if (DisplayMonth == default)
 		{
-			await SetDisplayMonthAsync(Value ?? DateTime.Today);
+			await SetDisplayMonthAsync(Value ?? TimeProviderEffective.GetLocalNow().Date);
 		}
 		else if ((Value != null) && lastKnownValueChanged && ((DisplayMonth.Year != Value.Value.Year) || (DisplayMonth.Month != Value.Value.Month)))
 		{
@@ -191,7 +206,7 @@ private void UpdateRenderData()
 
 		DateTime currentDay = FirstDayToDisplay;
 		DateTime valueDay = Value?.Date ?? default;
-		DateTime today = DateTime.Today;
+		DateTime today = TimeProviderEffective.GetLocalNow().Date;
 
 		for (var week = 0; week < 6; week++)
 		{

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Carousel/HxCarousel.razor.cs b/Havit.Blazor.Components.Web.Bootstrap/Carousel/HxCarousel.razor.cs
@@ -236,6 +236,10 @@ protected virtual async ValueTask DisposeAsyncCore()
 			{
 				// NOOP
 			}
+			catch (TaskCanceledException)
+			{
+				// NOOP
+			}
 		}
 
 		dotnetObjectReference?.Dispose();

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Collapse/HxCollapse.razor.cs b/Havit.Blazor.Components.Web.Bootstrap/Collapse/HxCollapse.razor.cs
@@ -256,6 +256,10 @@ protected virtual async ValueTask DisposeAsyncCore()
 			{
 				// NOOP
 			}
+			catch (TaskCanceledException)
+			{
+				// NOOP
+			}
 		}
 
 		dotnetObjectReference?.Dispose();

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Dropdowns/HxDropdownToggleButton.cs b/Havit.Blazor.Components.Web.Bootstrap/Dropdowns/HxDropdownToggleButton.cs
@@ -217,6 +217,10 @@ protected virtual async ValueTask DisposeAsyncCore()
 			{
 				// NOOP
 			}
+			catch (TaskCanceledException)
+			{
+				// NOOP
+			}
 		}
 
 		dotnetObjectReference.Dispose();

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Dropdowns/HxDropdownToggleElement.cs b/Havit.Blazor.Components.Web.Bootstrap/Dropdowns/HxDropdownToggleElement.cs
@@ -219,6 +219,10 @@ protected virtual async ValueTask DisposeAsyncCore()
 			{
 				// NOOP
 			}
+			catch (TaskCanceledException)
+			{
+				// NOOP
+			}
 		}
 
 		dotnetObjectReference.Dispose();

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/Autosuggests/HxAutosuggest.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/Autosuggests/HxAutosuggest.cs
@@ -172,6 +172,9 @@ protected override void BuildRenderInput(RenderTreeBuilder builder)
 		builder.AddAttribute(1023, nameof(HxAutosuggestInternal<TItem, TValue>.InputGroupStartTemplate), this.InputGroupStartTemplate);
 		builder.AddAttribute(1024, nameof(HxAutosuggestInternal<TItem, TValue>.InputGroupEndText), this.InputGroupEndText);
 		builder.AddAttribute(1025, nameof(HxAutosuggestInternal<TItem, TValue>.InputGroupEndTemplate), this.InputGroupEndTemplate);
+#if NET8_0_OR_GREATER
+		builder.AddAttribute(1026, nameof(HxAutosuggestInternal<TItem, TValue>.NameAttributeValue), NameAttributeValue);
+#endif
 
 		builder.AddMultipleAttributes(2000, this.AdditionalAttributes);
 

diff --git a/...zor.Components.Web.Bootstrap/Forms/Autosuggests/Internal/HxAutosuggestInputInternal.razor b/...zor.Components.Web.Bootstrap/Forms/Autosuggests/Internal/HxAutosuggestInputInternal.razor
@@ -2,6 +2,7 @@
 
 <input @ref="InputElement"
        id="@InputId"
+	   name="@(String.IsNullOrEmpty(NameAttributeValue) ? null : NameAttributeValue)"
        type="text"
        class="@CssClass hx-autosuggest-input"
        disabled="@(!EnabledEffective)"

diff --git a/....Components.Web.Bootstrap/Forms/Autosuggests/Internal/HxAutosuggestInputInternal.razor.cs b/....Components.Web.Bootstrap/Forms/Autosuggests/Internal/HxAutosuggestInputInternal.razor.cs
@@ -26,6 +26,8 @@ public partial class HxAutosuggestInputInternal
 	/// </summary>
 	[Parameter] public (int Skidding, int Distance) DropdownOffset { get; set; }
 
+	[Parameter] public string NameAttributeValue { get; set; }
+
 	/// <summary>
 	/// Additional attributes to be splatted onto an underlying HTML element.
 	/// </summary>

diff --git a/...t.Blazor.Components.Web.Bootstrap/Forms/Autosuggests/Internal/HxAutosuggestInternal.razor b/...t.Blazor.Components.Web.Bootstrap/Forms/Autosuggests/Internal/HxAutosuggestInternal.razor
@@ -13,6 +13,7 @@
     <div class="@CssClassHelper.Combine("hx-autosuggest-input-wrapper", (LabelTypeEffective == Havit.Blazor.Components.Web.Bootstrap.LabelType.Floating) ? "form-floating" : null)">
         <HxAutosuggestInputInternal @ref="autosuggestInput"
                             InputId="@InputId"
+							NameAttributeValue="@NameAttributeValue"
                             EnabledEffective="@EnabledEffective"
                             Value="@userInput"
                             OnInput="HandleInputInput"

diff --git a/...lazor.Components.Web.Bootstrap/Forms/Autosuggests/Internal/HxAutosuggestInternal.razor.cs b/...lazor.Components.Web.Bootstrap/Forms/Autosuggests/Internal/HxAutosuggestInternal.razor.cs
@@ -96,6 +96,8 @@ public partial class HxAutosuggestInternal<TItem, TValue> : IAsyncDisposable
 	/// </summary>
 	[Parameter] public RenderFragment InputGroupEndTemplate { get; set; }
 
+	[Parameter] public string NameAttributeValue { get; set; }
+
 	/// <summary>
 	/// Additional attributes to be splatted onto an underlying HTML element.
 	/// </summary>
@@ -489,6 +491,10 @@ protected virtual async ValueTask DisposeAsyncCore()
 			{
 				// NOOP
 			}
+			catch (TaskCanceledException)
+			{
+				// NOOP
+			}
 		}
 
 		dotnetObjectReference?.Dispose();

diff --git a/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputBase.cs b/Havit.Blazor.Components.Web.Bootstrap/Forms/HxInputBase.cs
@@ -295,16 +295,22 @@ private protected virtual void BuildRenderInput_AddCommonAttributes(RenderTreeBu
 	{
 		builder.AddMultipleAttributes(1, AdditionalAttributes);
 		builder.AddAttribute(2, "id", InputId);
-		builder.AddAttribute(3, "type", typeValue);
-		builder.AddAttribute(4, "class", GetInputCssClassToRender());
-		builder.AddAttribute(5, "disabled", !EnabledEffective);
+#if NET8_0_OR_GREATER
+		if (!String.IsNullOrEmpty(this.NameAttributeValue))
+		{
+			builder.AddAttribute(3, "name", NameAttributeValue);
+		}
+#endif
+		builder.AddAttribute(4, "type", typeValue);
+		builder.AddAttribute(5, "class", GetInputCssClassToRender());
+		builder.AddAttribute(6, "disabled", !EnabledEffective);
 		if ((this is IInputWithLabelType inputWithLabelType) && (inputWithLabelType.LabelTypeEffective == LabelType.Floating))
 		{
-			builder.AddAttribute(6, "placeholder", "placeholder"); // there must be a nonempty value (which is not visible)
+			builder.AddAttribute(7, "placeholder", "placeholder"); // there must be a nonempty value (which is not visible)
 		}
 		else if (this is IInputWithPlaceholder inputWithPlaceholder)
 		{
-			builder.AddAttribute(7, "placeholder", inputWithPlaceholder.Placeholder);
+			builder.AddAttribute(8, "placeholder", inputWithPlaceholder.Placeholder);
 		}
 
 	}
@@ -352,6 +358,11 @@ protected virtual void RenderChipGenerator(RenderTreeBuilder builder)
 	/// </remarks>
 	protected virtual bool ShouldRenderChipGenerator()
 	{
+		if (CurrentValue is string currentValueString)
+		{
+			// fixes #659 [HxInputText] Generates chip for String.Empty value
+			return !String.IsNullOrEmpty(currentValueString);
+		}
 		return !EqualityComparer<TValue>.Default.Equals(CurrentValue, default(TValue));
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -236,6 +236,10 @@ protected virtual async ValueTask DisposeAsyncCore() @@
     			{
     				// NOOP
     			}
+    			catch (TaskCanceledException)
+    			{
+    				// NOOP
+    			}
     		}
     		dotnetObjectReference?.Dispose();
@@ Expand Down @@