fix: fix OnBackButtonPressedAction to return bool

EasyMicroservices · Sep 25, 2024 · a17ed50 · a17ed50
1 parent 28cd783
commit a17ed50
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/Interfaces/IPage.cs b/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/Interfaces/IPage.cs
@@ -16,7 +16,7 @@ public interface IPage
     /// <summary>
     /// 
     /// </summary>
-    Action OnBackButtonPressedAction { get; set; }
+    Func<bool> OnBackButtonPressedAction { get; set; }
     /// <summary>
     /// 
     /// </summary>

diff --git a/...CSharp/MauiComponents/EasyMicroservices.UI.MauiComponents/Design/Pages/EasyContentPage.cs b/...CSharp/MauiComponents/EasyMicroservices.UI.MauiComponents/Design/Pages/EasyContentPage.cs
@@ -14,13 +14,14 @@ private void CustomContentPage_Loaded(object sender, EventArgs e)
         OnLoadComplete?.Invoke();
     }
 
-    public Action OnBackButtonPressedAction { get; set; }
+    public Func<bool> OnBackButtonPressedAction { get; set; }
 
     public Action OnLoadComplete { get; set; }
 
     protected override bool OnBackButtonPressed()
     {
-        OnBackButtonPressedAction?.Invoke();
+        if (OnBackButtonPressedAction is not null)
+            return OnBackButtonPressedAction();
         return base.OnBackButtonPressed();
     }
 

diff --git a/...auiComponents/EasyMicroservices.UI.MauiComponents/Navigations/DefaultNavigationManager.cs b/...auiComponents/EasyMicroservices.UI.MauiComponents/Navigations/DefaultNavigationManager.cs
@@ -43,7 +43,26 @@ public override async Task<TResponseData> PushDataAsync<TData, TResponseData>(TD
         if (page.BindingContext is IResponsibleViewModel responsibleViewModel)
         {
             if (ipage != null)
-                ipage.OnBackButtonPressedAction = responsibleViewModel.Close;
+            {
+                if (ipage.OnBackButtonPressedAction is null)
+                {
+                    ipage.OnBackButtonPressedAction = () =>
+                    {
+                        responsibleViewModel.Close();
+                        return true;
+                    };
+                }
+                else
+                {
+                    var func = ipage.OnBackButtonPressedAction;
+                    ipage.OnBackButtonPressedAction = () =>
+                    {
+                        responsibleViewModel.Close();
+                        return func();
+                    };
+                }
+            }
+
             var result = await responsibleViewModel.GetResult();
             if (result != null && result is TResponseData responseData)
                 return responseData;
@@ -92,7 +111,7 @@ public override Task<bool> OpenBrowser(string url)
     /// 
     /// </summary>
     /// <param name="pageName"></param>
-    public void RegisterContentPage<TView>(string pageName)
+    public virtual void RegisterContentPage<TView>(string pageName)
         where TView : ContentView, new()
     {
         Pages.TryAdd(pageName, () =>
@@ -103,4 +122,17 @@ public void RegisterContentPage<TView>(string pageName)
             };
         });
     }
+
+    public virtual void RegisterContentPage<TView, TEasyContentPage>(string pageName)
+        where TView : ContentView, new()
+        where TEasyContentPage : EasyContentPage, new()
+    {
+        Pages.TryAdd(pageName, () =>
+        {
+            return new TEasyContentPage()
+            {
+                Content = new TView()
+            };
+        });
+    }
 }