Merge pull request #5 from stavroskasidis/release/1.1

Release/1.1

Author: stavroskasidis

BlazorDialog/BlazorDialog.csproj

@@ -16,7 +16,7 @@
     <Copyright />
     <PackageTags>blazor blazor-component blazor-dialog dialog modal blazor-modal blazordialog blazormodaldialog blazormodal razor razor-components razorcomponents</PackageTags>
     <VersionSuffix>$(VersionSuffix)</VersionSuffix>
-    <Version>1.0.0</Version>
+    <Version>1.1.0</Version>
     <Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
     <Product>BlazorDialog</Product>
   </PropertyGroup>

BlazorDialog/BlazorDialogStore.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Security.Cryptography.X509Certificates;
 using System.Text;
+using System.Linq;
 
 namespace BlazorDialog
 {
@@ -18,6 +20,11 @@ public Dialog GetById(string id)
             throw new ArgumentException($"No dialog found for id '{id}'", nameof(id));
         }
 
+        public int GetVisibleDialogsCount()
+        {
+            return registeredDialogs.Count(x => x.Value.GetVisibility());
+        }
+
         public void Register(Dialog blazorDialog)
         {
             if (blazorDialog?.Id == null)

BlazorDialog/Components/Dialog.razor

@@ -8,7 +8,7 @@
         <CascadingValue Value="this.Input" Name="DialogInput">
             @if (!IsCustom)
             {
-                <div class="blazor-dialog-container @(Centered ? "blazor-dialog-centered" : "")">
+                <div class="blazor-dialog-container @(Centered ? "blazor-dialog-centered" : "")" style="z-index:@(1050 + dialogDepth)">
                     <div class="blazor-dialog-content-wrapper @ContentWrapperCssClass @AnimationCssClass">
                         <div class="blazor-dialog-content">
                             @ChildContent
@@ -152,7 +152,7 @@
     }
 
     bool isShowingChanged = false;
-
+    int dialogDepth = 0;
     protected override async Task OnParametersSetAsync()
     {
         if (isShowingChanged && IsShowing == true && !isShowing)
@@ -163,6 +163,7 @@
                 await OnBeforeShow.InvokeAsync(args);
             }
             this.isShowing = true;
+            dialogDepth = dialogStore.GetVisibleDialogsCount();
             if (OnAfterShow.HasDelegate)
             {
                 var args = new DialogAfterShowEventArgs(this);
@@ -225,6 +226,7 @@
             await OnBeforeShow.InvokeAsync(args);
         }
         this.isShowing = true;
+        dialogDepth = dialogStore.GetVisibleDialogsCount();
         await InvokeAsync(() => StateHasChanged());
         if (OnAfterShow.HasDelegate)
         {
@@ -263,4 +265,9 @@
     {
         await this.Hide<object>(null);
     }
+
+    public bool GetVisibility()
+    {
+        return this.isShowing;
+    }
 }

BlazorDialog/IBlazorDialogStore.cs

@@ -10,5 +10,6 @@ public interface IBlazorDialogStore
         void Register(Dialog blazorDialog);
         void Unregister(Dialog blazorDialog);
         Dialog GetById(string id);
+        int GetVisibleDialogsCount();
     }
 }

BlazorDialog/wwwroot/styles.css

@@ -1,6 +1,5 @@
 .blazor-dialog-container {
     position: fixed;
-    z-index: 1050;
     left: 0;
     top: 0;
     width: 100%; /* Full width */

README.md

@@ -76,7 +76,12 @@ Make sure that there is a call to `app.UseStaticFiles();` in your server project
 
 ## Release Notes
 
-<details  open="open"><summary>1.0</summary>
+<details  open="open"><summary>1.1</summary>
+    
+>- Added support for dialog-in-dialog.
+</details>
+
+<details><summary>1.0</summary>
 
 >- Fixed an infinite loop bug with `OnBeforeShow` event.
 >- Fixed css bugs.

TestApps/BlazorDialog.TestAppsCommon/IndexCommon.razor

@@ -20,19 +20,6 @@
     <option value="@DialogAnimation.Zoom">@DialogAnimation.Zoom</option>
     <option value="@DialogAnimation.FadeIn">@DialogAnimation.FadeIn</option>
 </select>
-
-<Dialog Id="simple-dialog" Size="size" Centered="isCentered" Animation="animation">
-    <DialogInputProvider TInput="string">
-        <DialogBody>
-            <h4>@context.Input</h4>
-        </DialogBody>
-        <DialogFooter>
-            <button type="button" class="btn btn-primary" @onclick="@(() => context.Dialog.Hide("yes"))">Yes</button>
-            <button type="button" class="btn btn-secondary" @onclick="@(()=> context.Dialog.Hide("no"))">No</button>
-        </DialogFooter>
-    </DialogInputProvider>
-</Dialog>
-
 <Dialog Id="simple-large-dialog" Size="size" Centered="isCentered" Animation="animation">
     <DialogInputProvider TInput="string">
         <DialogHeader ShowClose="true">
@@ -60,6 +47,22 @@
     </DialogInputProvider>
 </Dialog>
 
+<Dialog Id="simple-dialog" Size="size" Centered="isCentered" Animation="animation">
+    <DialogInputProvider TInput="string">
+        <DialogBody>
+            <h4>@context.Input</h4>
+        </DialogBody>
+        <DialogFooter>
+            <button type="button" class="btn btn-primary" @onclick="@(() => context.Dialog.Hide("yes"))">Yes</button>
+            <button type="button" class="btn btn-secondary" @onclick="@(()=> context.Dialog.Hide("no"))">No</button>
+
+            <button @onclick="SimpleDialogBigOnClick">Simple Dialog Big (dialog in dialog)</button>
+        </DialogFooter>
+    </DialogInputProvider>
+</Dialog>
+
+
+
 <button @onclick="SimpleDialogOnClick">Simple Dialog</button>
 <button @onclick="SimpleDialogBigOnClick">Simple Dialog Big</button>