breaking changes: regions are now async (added init async, loaded asy…

…nc awares), added ILoaded aware and async version

MPowerKit.Navigation.Core/Awares/ILoadedAware.cs

@@ -0,0 +1,13 @@
+using MPowerKit.Navigation.Interfaces;
+
+namespace MPowerKit.Navigation.Awares;
+
+public interface ILoadedAware
+{
+    void OnLoaded(INavigationParameters navigationParameters);
+}
+
+public interface ILoadedAsyncAware
+{
+    Task OnLoadedAsync(INavigationParameters navigationParameters);
+}

MPowerKit.Navigation.Core/Interfaces/IRegion.cs

@@ -2,9 +2,9 @@
 
 public interface IRegion
 {
-    NavigationResult ReplaceAll(string viewName, INavigationParameters? parameters);
-    NavigationResult Push(string viewName, INavigationParameters? parameters);
-    NavigationResult PushBackwards(string viewName, INavigationParameters? parameters);
+    ValueTask<NavigationResult> ReplaceAll(string viewName, INavigationParameters? parameters);
+    ValueTask<NavigationResult> Push(string viewName, INavigationParameters? parameters);
+    ValueTask<NavigationResult> PushBackwards(string viewName, INavigationParameters? parameters);
     NavigationResult GoBack(INavigationParameters? parameters);
     NavigationResult GoForward(INavigationParameters? parameters);
     NavigationResult GoByName(string viewName, INavigationParameters? parameters);

MPowerKit.Navigation.Core/Interfaces/IRegionManager.cs

@@ -2,6 +2,6 @@
 
 public interface IRegionManager
 {
-    NavigationResult NavigateTo(string regionName, string viewName, INavigationParameters? parameters = null);
+    ValueTask<NavigationResult> NavigateTo(string regionName, string viewName, INavigationParameters? parameters = null);
     IEnumerable<IRegion> GetRegions(VisualElement? regionHolder);
 }

MPowerKit.Navigation.Core/MPowerKit.Navigation.Core.csproj

@@ -11,7 +11,7 @@
 
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Title>MPowerKit.Navigation.Core</Title>
-		<Version>1.2.1</Version>
+		<Version>1.3.0</Version>
 		<Authors>MPowerKit,Alex Dobrynin</Authors>
 		<Description>.NET MAUI MVVM navigation framework. It supports regular/modal navigation, opening/closing windows, regions</Description>
 		<Copyright>MPowerKit</Copyright>

MPowerKit.Navigation.Core/Utilities/MvvmHelpers.cs

@@ -107,6 +107,39 @@ public static bool IsParentRegionHolder(Element? initialView, Element? regionHol
         return false;
     }
 
+    public static async Task OnPageLoadedRecursively(Page target, INavigationParameters parameters)
+    {
+        OnLoaded(target, parameters);
+        await OnLoadedAsync(target, parameters);
+
+        if (target is NavigationPage np)
+        {
+            await OnPageLoadedRecursively(np.CurrentPage, parameters);
+        }
+        else if (target is TabbedPage tp)
+        {
+            foreach (var item in tp.Children)
+            {
+                await OnPageLoadedRecursively(item, parameters);
+            }
+        }
+        else if (target is FlyoutPage fp)
+        {
+            await OnPageLoadedRecursively(fp.Flyout, parameters);
+            await OnPageLoadedRecursively(fp.Detail, parameters);
+        }
+    }
+
+    public static void OnLoaded(VisualElement target, INavigationParameters parameters)
+    {
+        InvokeViewAndViewModelAction<ILoadedAware>(target, v => v.OnLoaded(parameters));
+    }
+
+    public static Task OnLoadedAsync(VisualElement target, INavigationParameters parameters)
+    {
+        return InvokeViewAndViewModelActionAsync<ILoadedAsyncAware>(target, v => v.OnLoadedAsync(parameters));
+    }
+
     public static void PageNavigatedRecursively(Page target, INavigationParameters parameters, bool to)
     {
         var child = target switch

MPowerKit.Navigation.Popups/Awares/IPopupDialogAware.cs

@@ -4,5 +4,5 @@ namespace MPowerKit.Navigation.Awares;
 
 public interface IPopupDialogAware
 {
-    public Action<(Confirmation Confirmation, bool Animated)> RequestClose { get; set; }
+    public Action<(Confirmation Confirmation, bool Animated)>? RequestClose { get; set; }
 }

MPowerKit.Navigation.Popups/Interfaces/IPopupNavigationService.cs

@@ -6,7 +6,7 @@ namespace MPowerKit.Navigation.Interfaces;
 public interface IPopupNavigationService
 {
     ValueTask<PopupResult> ShowAwaitablePopupAsync(string popupName, INavigationParameters? parameters = null, bool animated = true);
-    ValueTask<NavigationResult> ShowPopupAsync(string popupName, INavigationParameters? parameters = null, bool animated = true, Action<Confirmation>? closeAction = null);
+    ValueTask<NavigationResult> ShowPopupAsync(string popupName, INavigationParameters? parameters = null, bool animated = true, Action<Confirmation?>? closeAction = null);
     ValueTask<NavigationResult> HidePopupAsync(bool animated = true);
     ValueTask<NavigationResult> HidePopupAsync(PopupPage page, bool animated = true);
 }

MPowerKit.Navigation.Popups/MPowerKit.Navigation.Popups.csproj

@@ -17,7 +17,7 @@
 
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Title>MPowerKit.Navigation.Popups</Title>
-		<Version>1.2.1.4</Version>
+		<Version>1.3.0</Version>
 		<Authors>MPowerKit,Alex Dobrynin</Authors>
 		<Description>.NET MAUI MVVM navigation framework. It supports regular/modal navigation, opening/closing windows, regions, popups</Description>
 		<Copyright>MPowerKit</Copyright>

MPowerKit.Navigation.Popups/MPowerKitPopupsWindow.cs

@@ -16,7 +16,7 @@ public MPowerKitPopupsWindow(IPopupNavigationService popupNavigationService)
 
     protected override bool OnBackButtonClicked()
     {
-        var navigationPopupService = this.Handler.MauiContext.Services.GetRequiredService<INavigationPopupService>();
+        var navigationPopupService = this.Handler.MauiContext!.Services.GetRequiredService<INavigationPopupService>();
 
         var popup = navigationPopupService.PopupStack.FirstOrDefault(p => p.Window == this);
 

MPowerKit.Navigation/MPowerKit.Navigation.csproj

@@ -9,7 +9,7 @@
 
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Title>MPowerKit.Navigation</Title>
-		<Version>1.2.1</Version>
+		<Version>1.3.0</Version>
 		<Authors>MPowerKit,Alex Dobrynin</Authors>
 		<Description>.NET MAUI MVVM navigation framework. It supports regular/modal navigation, opening/closing windows, regions</Description>
 		<Copyright>MPowerKit</Copyright>

MPowerKit.Navigation/NavigationService.cs

@@ -271,6 +271,9 @@ protected virtual async ValueTask GoBackModally(INavigationParameters parameters
 
     public virtual async ValueTask<NavigationResult> NavigateAsync(string stringUri, INavigationParameters? parameters = null, bool modal = false, bool animated = true)
     {
+        // need to be here to wait until ui finish its important work
+        await Task.Delay(1);
+
         parameters ??= new NavigationParameters();
 
         try
@@ -299,6 +302,8 @@ public virtual async ValueTask<NavigationResult> NavigateAsync(string stringUri,
                 await DoRelativeNavigation(pages, parameters, animated);
             }
 
+            if (pages?.Count > 0) await MvvmHelpers.OnPageLoadedRecursively(pages[0]!, parameters);
+
             return new NavigationResult(true, null);
         }
         catch (Exception ex)

MPowerKit.Navigation/PlatformSpecific/MauiNavKitNavigtaionRenderer.MaciOS.cs

@@ -12,12 +12,12 @@ public override void ViewDidLoad()
     {
         base.ViewDidLoad();
 
-        this.InteractivePopGestureRecognizer.Delegate = new SwipeBackDelegate(this);
+        InteractivePopGestureRecognizer.Delegate = new SwipeBackDelegate(this);
     }
 
     public override void ViewWillDisappear(bool animated)
     {
-        this.InteractivePopGestureRecognizer.Delegate = null;
+        InteractivePopGestureRecognizer.Delegate = null;
 
         base.ViewWillDisappear(animated);
     }

MPowerKit.Regions/MPowerKit.Regions.csproj

@@ -9,7 +9,7 @@
 
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Title>MPowerKit.Regions</Title>
-		<Version>1.2.1</Version>
+		<Version>1.3.0</Version>
 		<Authors>MPowerKit,Alex Dobrynin</Authors>
 		<Description>.NET MAUI MVVM navigation framework. It supports regular/modal navigation, opening/closing windows, regions</Description>
 		<Copyright>MPowerKit</Copyright>

MPowerKit.Regions/Region.cs

@@ -37,16 +37,19 @@ public Region(IServiceProvider serviceProvider,
         RegionManager = regionManager;
         RegionAccessor = regionAccessor;
 
-        RegionHolder.Content = StackContainer;
+        RegionHolder!.Content = StackContainer;
     }
 
-    public virtual NavigationResult ReplaceAll(string viewName, INavigationParameters? parameters)
+    public virtual async ValueTask<NavigationResult> ReplaceAll(string viewName, INavigationParameters? parameters)
     {
+        // need to be here to wait until ui finish its important work
+        await Task.Delay(1);
+
         parameters ??= new NavigationParameters();
 
         try
         {
-            var view = InitView(viewName, parameters);
+            var view = await InitView(viewName, parameters);
 
             var viewsToRemove = RegionStack.Reverse().ToList();
 
@@ -67,6 +70,8 @@ public virtual NavigationResult ReplaceAll(string viewName, INavigationParameter
                 DestroyRecursively(item);
             }
 
+            await OnLoadded(parameters);
+
             return new NavigationResult(true, null);
         }
         catch (Exception ex)
@@ -75,13 +80,16 @@ public virtual NavigationResult ReplaceAll(string viewName, INavigationParameter
         }
     }
 
-    public virtual NavigationResult Push(string viewName, INavigationParameters? parameters)
+    public virtual async ValueTask<NavigationResult> Push(string viewName, INavigationParameters? parameters)
     {
+        // need to be here to wait until ui finish its important work
+        await Task.Delay(1);
+
         parameters ??= new NavigationParameters();
 
         try
         {
-            var view = InitView(viewName, parameters);
+            var view = await InitView(viewName, parameters);
 
             var index = RegionStack.Count - 1;
 
@@ -105,6 +113,8 @@ public virtual NavigationResult Push(string viewName, INavigationParameters? par
                 DestroyRecursively(item);
             }
 
+            await OnLoadded(parameters);
+
             return new NavigationResult(true, null);
         }
         catch (Exception ex)
@@ -113,13 +123,16 @@ public virtual NavigationResult Push(string viewName, INavigationParameters? par
         }
     }
 
-    public virtual NavigationResult PushBackwards(string viewName, INavigationParameters? parameters)
+    public virtual async ValueTask<NavigationResult> PushBackwards(string viewName, INavigationParameters? parameters)
     {
+        // need to be here to wait until ui finish its important work
+        await Task.Delay(1);
+
         parameters ??= new NavigationParameters();
 
         try
         {
-            var view = InitView(viewName, parameters);
+            var view = await InitView(viewName, parameters);
 
             var index = 0;
 
@@ -143,6 +156,8 @@ public virtual NavigationResult PushBackwards(string viewName, INavigationParame
                 DestroyRecursively(item);
             }
 
+            await OnLoadded(parameters);
+
             return new NavigationResult(true, null);
         }
         catch (Exception ex)
@@ -151,13 +166,20 @@ public virtual NavigationResult PushBackwards(string viewName, INavigationParame
         }
     }
 
-    protected virtual View InitView(string viewName, INavigationParameters parameters)
+    protected virtual async ValueTask OnLoadded(INavigationParameters parameters)
+    {
+        MvvmHelpers.OnLoaded(CurrentView!, parameters);
+        await MvvmHelpers.OnLoadedAsync(CurrentView!, parameters);
+    }
+
+    protected virtual async ValueTask<View> InitView(string viewName, INavigationParameters parameters)
     {
         var view = (ServiceProvider.GetViewAndViewModel(viewName) as View)!;
 
         ViewRegionViewNameAttached.SetRegionViewName(view, viewName);
 
         MvvmHelpers.OnInitialized(view, parameters);
+        await MvvmHelpers.OnInitializedAsync(view, parameters);
 
         BehaviorExtensions.ApplyBehaviors(ServiceProvider, view);
 
@@ -176,7 +198,7 @@ public virtual bool CanGoForward()
 
     public virtual bool CanGoByName(string viewName)
     {
-        return (RegionStack as List<VisualElement>).Exists(v => ViewRegionViewNameAttached.GetRegionViewName(v) == viewName);
+        return RegionStack.Any(v => ViewRegionViewNameAttached.GetRegionViewName(v) == viewName);
     }
 
     public virtual NavigationResult GoBack(INavigationParameters? parameters)
@@ -249,7 +271,7 @@ public virtual NavigationResult GoByName(string viewName, INavigationParameters?
                 throw new InvalidOperationException("Cannot go by view name");
             }
 
-            var viewNavigateTo = (RegionStack as List<VisualElement>).Find(v => ViewRegionViewNameAttached.GetRegionViewName(v) == viewName);
+            var viewNavigateTo = RegionStack.FirstOrDefault(v => ViewRegionViewNameAttached.GetRegionViewName(v) == viewName);
 
             if (viewNavigateTo == CurrentView)
             {
@@ -258,7 +280,7 @@ public virtual NavigationResult GoByName(string viewName, INavigationParameters?
 
             var index = RegionStack.IndexOf(CurrentView!);
 
-            var indexNavigateTo = RegionStack.IndexOf(viewNavigateTo);
+            var indexNavigateTo = RegionStack.IndexOf(viewNavigateTo!);
 
             parameters[KnownNavigationParameters.NavigationDirection] = index > indexNavigateTo ? NavigationDirection.Back : NavigationDirection.Forward;
 
@@ -283,9 +305,12 @@ public virtual void NavigatedRecursively(INavigationParameters parameters, bool
             MvvmHelpers.Navigated(CurrentView, parameters, to);
         }
 
-        foreach (var region in RegionManager.GetRegions(RegionHolder))
+        if (parameters.GetNavigationDirection() != NavigationDirection.New)
         {
-            region.NavigatedRecursively(parameters, to);
+            foreach (var region in RegionManager.GetRegions(CurrentView))
+            {
+                region.NavigatedRecursively(parameters, to);
+            }
         }
 
         if (!to)
@@ -333,7 +358,7 @@ public virtual void OnWindowLifecycleRecursively(bool resume)
             MvvmHelpers.WindowLifecycle(view, resume);
         }
 
-        foreach (var region in RegionManager.GetRegions(RegionHolder))
+        foreach (var region in RegionManager.GetRegions(StackContainer))
         {
             region.OnWindowLifecycleRecursively(resume);
         }
@@ -349,7 +374,7 @@ public virtual void OnPageLifecycleRecursively(bool appearing)
             }
         }
 
-        foreach (var region in RegionManager.GetRegions(RegionHolder))
+        foreach (var region in RegionManager.GetRegions(StackContainer))
         {
             region.OnPageLifecycleRecursively(appearing);
         }

MPowerKit.Regions/RegionManager.cs

@@ -15,18 +15,18 @@ public RegionManager(IServiceProvider serviceProvider)
         ServiceProvider = serviceProvider;
     }
 
-    public virtual NavigationResult NavigateTo(string regionName, string viewName, INavigationParameters? parameters = null)
+    public virtual async ValueTask<NavigationResult> NavigateTo(string regionName, string viewName, INavigationParameters? parameters = null)
     {
         parameters ??= new NavigationParameters();
 
         try
         {
-            if (!_regionHolders.ContainsKey(regionName))
+            if (!_regionHolders.TryGetValue(regionName, out WeakReference<ContentView>? value))
             {
                 throw new ArgumentNullException($"There is not registered region with name {regionName}");
             }
 
-            var regionHolder = (_regionHolders[regionName].TryGetTarget(out var target) ? target : null)
+            var regionHolder = (value.TryGetTarget(out var target) ? target : null)
                 ?? throw new NullReferenceException("Region was disposed");
 
             var scope = ViewServiceProviderAttached.GetServiceScope(regionHolder);
@@ -57,7 +57,7 @@ public virtual NavigationResult NavigateTo(string regionName, string viewName, I
 
             var region = scope.ServiceProvider.GetRequiredService<IRegion>();
 
-            return region.ReplaceAll(viewName, parameters);
+            return await region.ReplaceAll(viewName, parameters);
         }
         catch (Exception ex)
         {

Sample/MauiProgram.cs

@@ -19,6 +19,7 @@ public static MauiApp CreateMauiApp()
                     s.RegisterForNavigation<MainPage>();
                     s.RegisterForNavigation<NewPage1>();
                     s.RegisterForNavigation<NewContent1>();
+                    s.RegisterForNavigation<NewContent2>();
                     s.RegisterForNavigation<PopupPageTest>();
                     s.RegisterForNavigation<FlyPage>();
                 })

Sample/NewContent1.xaml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView x:Class="Sample.NewContent1"
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:mpk="clr-namespace:MPowerKit.Regions;assembly=MPowerKit.Regions">
     <VerticalStackLayout>
         <Label HorizontalOptions="Center"
                Text="Welcome to .NET MAUI!"
                VerticalOptions="Center" />
+        <ContentView mpk:RegionManager.RegionName="NewRegion" />
     </VerticalStackLayout>
 </ContentView>