wip hiding and showing states

Megabit · Feb 23, 2024 · 3d3149d · 3d3149d
1 parent d309be5
commit 3d3149d
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 14 deletions.
diff --git a/Source/Blazorise.AntDesign/AntDesignClassProvider.cs b/Source/Blazorise.AntDesign/AntDesignClassProvider.cs
@@ -879,7 +879,11 @@ public override string Display( DisplayType displayType, DisplayDefinition displ
 
     public override string ModalFade() => Fade();
 
-    public override string ModalFade( bool animation ) => animation ? Fade() : null;
+    public override string ModalFade( bool showing, bool hiding ) => showing
+        ? Show()
+        : hiding
+            ? Fade()
+            : null;
 
     public override string ModalVisible( bool visible ) => null;
 

diff --git a/Source/Blazorise.Bootstrap/BootstrapClassProvider.cs b/Source/Blazorise.Bootstrap/BootstrapClassProvider.cs
@@ -889,7 +889,11 @@ public override string Display( DisplayType displayType, DisplayDefinition displ
 
     public override string ModalFade() => Fade();
 
-    public override string ModalFade( bool animation ) => animation ? Fade() : null;
+    public override string ModalFade( bool showing, bool hiding ) => showing
+        ? Show()
+        : hiding
+            ? Fade()
+            : null;
 
     public override string ModalVisible( bool visible ) => visible ? Show() : null;
 

diff --git a/Source/Blazorise.Bootstrap5/Bootstrap5ClassProvider.cs b/Source/Blazorise.Bootstrap5/Bootstrap5ClassProvider.cs
@@ -882,7 +882,11 @@ public override string Display( DisplayType displayType, DisplayDefinition displ
 
     public override string ModalFade() => Fade();
 
-    public override string ModalFade( bool animation ) => animation ? Fade() : null;
+    public override string ModalFade( bool showing, bool hiding ) => showing
+        ? Show()
+        : hiding
+            ? Fade()
+            : null;
 
     public override string ModalVisible( bool visible ) => visible ? Show() : null;
 

diff --git a/Source/Blazorise.Bulma/BulmaClassProvider.cs b/Source/Blazorise.Bulma/BulmaClassProvider.cs
@@ -910,7 +910,11 @@ public override string Display( DisplayType displayType, DisplayDefinition displ
 
     public override string ModalFade() => Fade();
 
-    public override string ModalFade( bool animation ) => animation ? Fade() : null;
+    public override string ModalFade( bool showing, bool hiding ) => showing
+        ? Show()
+        : hiding
+            ? Fade()
+            : null;
 
     public override string ModalVisible( bool visible ) => visible ? Active() : null;
 

diff --git a/Source/Blazorise.FluentUI2/Providers/FluentUI2ClassProvider.cs b/Source/Blazorise.FluentUI2/Providers/FluentUI2ClassProvider.cs
@@ -1017,7 +1017,7 @@ public override string Display( DisplayType displayType, DisplayDefinition displ
 
     public override string ModalFade() => "fui-DialogSurface-fade";
 
-    public override string ModalFade( bool animation ) => animation ? "fui-DialogSurface-fade" : null;
+    public override string ModalFade( bool showing, bool hiding ) => showing || hiding ? "fui-DialogSurface-fade" : null;
 
     public override string ModalVisible( bool visible ) => visible ? "fui-DialogSurface-show" : "fui-DialogSurface-hide";
 

diff --git a/Source/Blazorise.Tailwind/TailwindClassProvider.cs b/Source/Blazorise.Tailwind/TailwindClassProvider.cs
@@ -1305,7 +1305,7 @@ public override string AlertColor( Color color )
 
     public override string ModalFade() => "b-modal-fade";
 
-    public override string ModalFade( bool animation ) => animation ? "b-modal-fade" : null;
+    public override string ModalFade( bool showing, bool hiding ) => hiding ? "b-modal-fade" : null;
 
     public override string ModalVisible( bool visible ) => visible ? "flex" : null;
 

diff --git a/Source/Blazorise/Components/Modal/Modal.razor.cs b/Source/Blazorise/Components/Modal/Modal.razor.cs
@@ -112,7 +112,7 @@ protected override Task OnFirstAfterRenderAsync()
     protected override void BuildClasses( ClassBuilder builder )
     {
         builder.Append( ClassProvider.Modal() );
-        builder.Append( ClassProvider.ModalFade( Animated ) );
+        builder.Append( ClassProvider.ModalFade( Animated && State.Showing, Animated && State.Hiding ) );
         builder.Append( ClassProvider.ModalVisible( IsVisible ) );
 
         base.BuildClasses( builder );
@@ -408,11 +408,17 @@ public Task BeginAnimation( bool visible )
     {
         if ( visible )
         {
+            state = state with { Showing = true };
+
             BackdropVisible = ShowBackdrop;
-            DirtyStyles();
         }
         else
-            DirtyClasses();
+        {
+            state = state with { Hiding = true };
+        }
+
+        DirtyClasses();
+        DirtyStyles();
 
         return InvokeAsync( StateHasChanged );
     }
@@ -421,9 +427,16 @@ public Task BeginAnimation( bool visible )
     public Task EndAnimation( bool visible )
     {
         if ( visible )
-            DirtyClasses();
+        {
+            state = state with { Showing = false };
+        }
         else
-            DirtyStyles();
+        {
+            state = state with { Hiding = false };
+        }
+
+        DirtyClasses();
+        DirtyStyles();
 
         BackdropVisible = ShowBackdrop && visible;
 

diff --git a/Source/Blazorise/Interfaces/IClassProvider.cs b/Source/Blazorise/Interfaces/IClassProvider.cs
@@ -816,7 +816,7 @@ public interface IClassProvider
 
     string ModalFade();
 
-    string ModalFade( bool animation );
+    string ModalFade( bool showing, bool hiding );
 
     string ModalVisible( bool visible );
 

diff --git a/Source/Blazorise/Providers/ClassProvider.cs b/Source/Blazorise/Providers/ClassProvider.cs
@@ -820,7 +820,7 @@ public virtual string Display( DisplayType displayType, IEnumerable<DisplayDefin
 
     public abstract string ModalFade();
 
-    public abstract string ModalFade( bool animation );
+    public abstract string ModalFade( bool showing, bool hiding );
 
     public abstract string ModalVisible( bool visible );
 

diff --git a/Source/Blazorise/Providers/EmptyClassProvider.cs b/Source/Blazorise/Providers/EmptyClassProvider.cs
@@ -823,7 +823,7 @@ class EmptyClassProvider : IClassProvider
 
     public string ModalFade() => null;
 
-    public string ModalFade( bool animation ) => null;
+    public string ModalFade( bool showing, bool hiding ) => null;
 
     public string ModalVisible( bool visible ) => null;
 

diff --git a/Source/Blazorise/States/ModalState.cs b/Source/Blazorise/States/ModalState.cs
@@ -10,6 +10,10 @@ public record ModalState
     /// </summary>
     public bool Visible { get; init; }
 
+    public bool Showing { get; init; }
+
+    public bool Hiding { get; init; }
+
     /// <summary>
     /// Defines the open state of the modal dialog.
     /// </summary>