merge 1.4 branch

Megabit · Feb 24, 2024 · 2c7cf49 · 2c7cf49
2 parents 1270cf2 + aff39ea
commit 2c7cf49
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 31 deletions.
diff --git a/Source/Blazorise/Components/Carousel/Carousel.razor.cs b/Source/Blazorise/Components/Carousel/Carousel.razor.cs
@@ -383,6 +383,9 @@ protected virtual async Task AnimationEnd( CarouselSlide slide )
     {
         var selectedSlide = GetSelectedCarouselSlide();
 
+        if ( selectedSlide is null )
+            return;
+
         if ( slide.Name == selectedSlide.Name )
         {
             AnimationRunning = false;

diff --git a/Source/Blazorise/Interfaces/IModalService.cs b/Source/Blazorise/Interfaces/IModalService.cs
@@ -27,23 +27,23 @@ public interface IModalService
     /// Shows a Modal where the content is TComponent.
     /// </summary>
     /// <typeparam name="TComponent"></typeparam>
-    public Task<ModalInstance> Show<TComponent>();
+    public Task<ModalInstance> Show<TComponent>() where TComponent : notnull, IComponent;
 
     /// <summary>
     /// Shows a Modal where the content is TComponent.
     /// </summary>
     /// <typeparam name="TComponent"></typeparam>
     /// <param name="title"></param>
     /// <returns></returns>
-    public Task<ModalInstance> Show<TComponent>( string title );
+    public Task<ModalInstance> Show<TComponent>( string title ) where TComponent : notnull, IComponent;
 
     /// <summary>
     /// Shows a Modal where the content is TComponent.
     /// </summary>
     /// <typeparam name="TComponent"></typeparam>
     /// <param name="parameters"></param>
     /// <returns></returns>
-    public Task<ModalInstance> Show<TComponent>( Action<ModalProviderParameterBuilder<TComponent>> parameters );
+    public Task<ModalInstance> Show<TComponent>( Action<ModalProviderParameterBuilder<TComponent>> parameters ) where TComponent : notnull, IComponent;
 
     /// <summary>
     /// Shows a Modal where the content is TComponent.
@@ -52,7 +52,7 @@ public interface IModalService
     /// <param name="parameters"></param>
     /// <param name="modalInstanceOptions"></param>
     /// <returns></returns>
-    public Task<ModalInstance> Show<TComponent>( Action<ModalProviderParameterBuilder<TComponent>> parameters, ModalInstanceOptions modalInstanceOptions );
+    public Task<ModalInstance> Show<TComponent>( Action<ModalProviderParameterBuilder<TComponent>> parameters, ModalInstanceOptions modalInstanceOptions ) where TComponent : notnull, IComponent;
 
     /// <summary>
     /// Shows a Modal where the content is TComponent.
@@ -61,7 +61,7 @@ public interface IModalService
     /// <param name="title"></param>
     /// <param name="parameters"></param>
     /// <returns></returns>
-    public Task<ModalInstance> Show<TComponent>( string title, Action<ModalProviderParameterBuilder<TComponent>> parameters );
+    public Task<ModalInstance> Show<TComponent>( string title, Action<ModalProviderParameterBuilder<TComponent>> parameters ) where TComponent : notnull, IComponent;
 
     /// <summary>
     /// Shows a Modal where the content is TComponent.
@@ -70,7 +70,7 @@ public interface IModalService
     /// <param name="title"></param>
     /// <param name="modalInstanceOptions"></param>
     /// <returns></returns>
-    public Task<ModalInstance> Show<TComponent>( string title, ModalInstanceOptions modalInstanceOptions );
+    public Task<ModalInstance> Show<TComponent>( string title, ModalInstanceOptions modalInstanceOptions ) where TComponent : notnull, IComponent;
 
     /// <summary>
     /// Shows a Modal where the content is TComponent.
@@ -80,7 +80,7 @@ public interface IModalService
     /// <param name="parameters"></param>
     /// <param name="modalInstanceOptions"></param>
     /// <returns></returns>
-    public Task<ModalInstance> Show<TComponent>( string title, Action<ModalProviderParameterBuilder<TComponent>> parameters, ModalInstanceOptions modalInstanceOptions );
+    public Task<ModalInstance> Show<TComponent>( string title, Action<ModalProviderParameterBuilder<TComponent>> parameters, ModalInstanceOptions modalInstanceOptions ) where TComponent : notnull, IComponent;
 
     /// <summary>
     /// Shows a Modal where the content is of componentType.

diff --git a/Source/Blazorise/Services/ModalService.cs b/Source/Blazorise/Services/ModalService.cs
@@ -21,36 +21,34 @@ public void SetModalProvider( ModalProvider modalProvider )
         => ModalProvider = modalProvider;
 
     /// <inheritdoc/>
-    public Task<ModalInstance> Show<TComponent>()
+    public Task<ModalInstance> Show<TComponent>() where TComponent : notnull, IComponent
         => Show( typeof( TComponent ) );
 
     /// <inheritdoc/>
-    public Task<ModalInstance> Show<TComponent>( string title )
+    public Task<ModalInstance> Show<TComponent>( string title ) where TComponent : notnull, IComponent
         => Show( title, typeof( TComponent ) );
 
     /// <inheritdoc/>
-    public Task<ModalInstance> Show<TComponent>( string title, ModalInstanceOptions modalProviderOptions )
+    public Task<ModalInstance> Show<TComponent>( string title, ModalInstanceOptions modalProviderOptions ) where TComponent : notnull, IComponent
         => Show<TComponent>( title, null, modalProviderOptions );
 
     /// <inheritdoc/>
-    public Task<ModalInstance> Show<TComponent>( Action<ModalProviderParameterBuilder<TComponent>> parameters )
+    public Task<ModalInstance> Show<TComponent>( Action<ModalProviderParameterBuilder<TComponent>> parameters ) where TComponent : notnull, IComponent
         => Show<TComponent>( string.Empty, parameters, null );
 
     /// <inheritdoc/>
-    public Task<ModalInstance> Show<TComponent>( Action<ModalProviderParameterBuilder<TComponent>> parameters, ModalInstanceOptions modalInstanceOptions )
+    public Task<ModalInstance> Show<TComponent>( Action<ModalProviderParameterBuilder<TComponent>> parameters, ModalInstanceOptions modalInstanceOptions ) where TComponent : notnull, IComponent
         => Show<TComponent>( string.Empty, parameters, modalInstanceOptions );
 
     /// <inheritdoc/>
-    public Task<ModalInstance> Show<TComponent>( string title, Action<ModalProviderParameterBuilder<TComponent>> parameters )
+    public Task<ModalInstance> Show<TComponent>( string title, Action<ModalProviderParameterBuilder<TComponent>> parameters ) where TComponent : notnull, IComponent
         => Show<TComponent>( title, parameters, null );
 
     /// <inheritdoc/>
-    public Task<ModalInstance> Show<TComponent>( string title, Action<ModalProviderParameterBuilder<TComponent>> parameters, ModalInstanceOptions modalInstanceOptions )
+    public Task<ModalInstance> Show<TComponent>( string title, Action<ModalProviderParameterBuilder<TComponent>> parameters, ModalInstanceOptions modalInstanceOptions ) where TComponent : notnull, IComponent
     {
-        ModalProviderParameterBuilder<TComponent> builder = new();
-        if ( parameters is not null )
-            parameters( builder );
-        return Show( title, typeof( TComponent ), builder.Parameters, modalInstanceOptions );
+        RenderFragment childContent = BuildParameterfulContent<TComponent>( parameters );
+        return Show( title, childContent, modalInstanceOptions );
     }
 
     /// <inheritdoc/>
@@ -72,18 +70,7 @@ public Task<ModalInstance> Show( string title, RenderFragment content )
     /// <inheritdoc/>
     public Task<ModalInstance> Show( string title, Type componentType, Dictionary<string, object> componentParameters = null, ModalInstanceOptions modalInstanceOptions = null )
     {
-        var childContent = new RenderFragment( __builder =>
-        {
-            __builder.OpenComponent( componentType );
-
-            if ( componentParameters is not null )
-            {
-                __builder.Attributes( componentParameters );
-            }
-
-            __builder.CloseComponent();
-        } );
-
+        RenderFragment childContent = BuildParameterfulContent( componentType, componentParameters );
         return Show( title, childContent, modalInstanceOptions );
     }
 
@@ -105,6 +92,42 @@ public Task Hide()
     public Task Hide( ModalInstance modalInstance )
         => ModalProvider.Hide( modalInstance );
 
+    private static RenderFragment BuildParameterfulContent( Type componentType, Dictionary<string, object> componentParameters )
+    {
+        return new RenderFragment( __builder =>
+        {
+            __builder.OpenComponent( componentType );
+
+            if ( componentParameters is not null )
+            {
+                __builder.Attributes( componentParameters, 1 );
+            }
+
+            __builder.CloseComponent();
+        } );
+    }
+
+    private static RenderFragment BuildParameterfulContent<TComponent>( Action<ModalProviderParameterBuilder<TComponent>> parameters ) where TComponent : notnull, IComponent
+    {
+        return new RenderFragment( __builder =>
+        {
+            __builder.OpenComponent<TComponent>();
+
+            if ( parameters is not null )
+            {
+                ModalProviderParameterBuilder<TComponent> parameterBuilder = new();
+                parameters( parameterBuilder );
+
+                if ( parameterBuilder.Parameters is not null )
+                {
+                    __builder.Attributes( parameterBuilder.Parameters, 1 );
+                }
+            }
+
+            __builder.CloseComponent();
+        } );
+    }
+
     /// <inheritdoc/>
     public IEnumerable<ModalInstance> GetInstances()
         => ModalProvider.GetInstances();

diff --git a/Source/Extensions/Blazorise.Snackbar/SnackbarStack.razor.cs b/Source/Extensions/Blazorise.Snackbar/SnackbarStack.razor.cs
@@ -42,7 +42,9 @@ public SnackbarInfo( MarkupString message,
             ShowActionButton = showActionButton;
             ActionButtonText = actionButtonText;
             ActionButtonIcon = actionButtonIcon;
-            IntervalBeforeClose = intervalBeforeClose + animationDuration;
+            IntervalBeforeClose = intervalBeforeClose is null
+                                    ? null
+                                    : intervalBeforeClose + ( animationDuration ?? 0 );
             AnimationDuration = animationDuration;
             Multiline = multiline;
         }