fixing background tap dismissal

PrismLibrary · Jun 6, 2019 · 1a49f73 · 1a49f73
1 parent c20beae
commit 1a49f73
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 13 deletions.
diff --git a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld/Views/DialogDemoPage.xaml b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld/Views/DialogDemoPage.xaml
@@ -12,7 +12,7 @@
         <StackLayout>
             <Label Text="{x:Static i18n:Resources.LoremIpsum}" />
             <Button Text="Show Demo Dialog"
-                    Command="{prism:ShowDialog 'DemoDialog?message=Hello%20From%20Prism%20DialogService!'}"
+                    Command="{prism:ShowDialog 'DemoDialog?message=Hello%20From%20Prism%20DialogService!&amp;closeOnBackgroundTapped=true'}"
                     HorizontalOptions="Center" />
             <Button Text="Show User Alert"
                     Command="{Binding ShowUserAlertCommand}"

diff --git a/Source/Xamarin/Prism.Forms/Services/Dialogs/DialogResult.cs b/Source/Xamarin/Prism.Forms/Services/Dialogs/DialogResult.cs
@@ -7,13 +7,6 @@ namespace Prism.Services.Dialogs
 {
     internal class DialogResult : IDialogResult
     {
-        private bool _success;
-        public bool Success
-        {
-            get => Exception is null ? _success : false;
-            set => _success = value;
-        }
-
         public Exception Exception { get; set; }
         public IDialogParameters Parameters { get; set; }
     }

diff --git a/Source/Xamarin/Prism.Forms/Services/Dialogs/DialogService.cs b/Source/Xamarin/Prism.Forms/Services/Dialogs/DialogService.cs
@@ -133,7 +133,6 @@ private IDialogResult CloseDialog(IDialogParameters parameters, ContentPage curr
 
                 return new DialogResult
                 {
-                    Success = true,
                     Parameters = parameters
                 };
             }
@@ -250,7 +249,7 @@ private void InsertPopupViewInCurrentPage(ContentPage currentPage, View popupVie
 
             if (hideOnBackgroundTapped)
             {
-                var dismissCommand = new Command(() => CloseDialog(new DialogParameters(), currentPage));
+                var dismissCommand = new Command(() => callback(new DialogParameters()));
                 mask.GestureRecognizers.Add(new TapGestureRecognizer
                 {
                     Command = dismissCommand

diff --git a/Source/Xamarin/Prism.Forms/Services/Dialogs/IDialogResult.cs b/Source/Xamarin/Prism.Forms/Services/Dialogs/IDialogResult.cs
@@ -1,9 +1,10 @@
-using Prism.Navigation;
+using System;
 
 namespace Prism.Services.Dialogs
 {
-    public interface IDialogResult : INavigationResult
+    public interface IDialogResult
     {
+        Exception Exception { get; }
         IDialogParameters Parameters { get; }
     }
 }
diff --git a/Source/Xamarin/Prism.Forms/Services/Dialogs/Xaml/ShowDialogExtension.cs b/Source/Xamarin/Prism.Forms/Services/Dialogs/Xaml/ShowDialogExtension.cs
@@ -51,7 +51,7 @@ private void DialogClosedCallback(IDialogResult result)
 
         protected virtual void OnDialogClosed(IDialogResult result)
         {
-            if (!result.Success)
+            if (result.Exception != null)
             {
                 Log.Warning("Warning", $"Dialog '{Name}' closed with an error:\n{result.Exception}");
             }