GetParentViewController (#4785)

MvvmCross · Dec 7, 2023 · 3c35878 · 3c35878
1 parent 491d61b
commit 3c35878
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 31 deletions.
diff --git a/MvvmCross/Platforms/Ios/Presenters/MvxIosViewPresenter.cs b/MvvmCross/Platforms/Ios/Presenters/MvxIosViewPresenter.cs
@@ -418,7 +418,7 @@ private Task<bool> ShowPopoverViewControllerChild(UIViewController viewControlle
 
             viewController.ModalPresentationStyle = attribute.ModalPresentationStyle;
             viewController.ModalTransitionStyle = attribute.ModalTransitionStyle;
-            if (attribute.PreferredContentSize != default(CGSize))
+            if (attribute.PreferredContentSize != default)
                 viewController.PreferredContentSize = attribute.PreferredContentSize;
 
             if (_iosVersion13Checker.IsVersionOrHigher && viewController.PresentationController != null)
@@ -427,10 +427,8 @@ private Task<bool> ShowPopoverViewControllerChild(UIViewController viewControlle
                     new MvxModalPresentationControllerDelegate(this, viewController, attribute);
             }
 
-            // Check if there is a modal already presented first. Otherwise use the window root
-            var modalHost = ModalViewControllers.LastOrDefault() ?? Window.RootViewController;
-
-            modalHost.PresentViewController(viewController, attribute.Animated, null);
+            var parentViewController = GetParentViewController();
+            parentViewController.PresentViewController(viewController, attribute.Animated, null);
 
             ModalViewControllers.Add(viewController);
 
@@ -459,11 +457,6 @@ private Task<bool> ShowPopoverViewControllerChild(UIViewController viewControlle
                 viewController = CreateNavigationController(viewController);
             }
 
-            // Check if there is a modal already presented first. Otherwise use the topmost view controller.
-            var viewHost = ModalViewControllers.LastOrDefault() ?? Window.RootViewController;
-            if (viewHost == null)
-                throw new MvxException($"Trying to show View type: {viewController.GetType().Name} as popover, but could not find a view host!");
-
             viewController.ModalPresentationStyle = UIModalPresentationStyle.Popover;
 
             var presentationController = viewController.PopoverPresentationController;
@@ -474,10 +467,19 @@ private Task<bool> ShowPopoverViewControllerChild(UIViewController viewControlle
             presentationController.Delegate = new MvxPopoverPresentationControllerDelegate(this);
 
             PopoverViewController = viewController;
-            await viewHost.PresentViewControllerAsync(viewController, attribute.Animated).ConfigureAwait(true);
+
+            var parentViewController = GetParentViewController();
+            await parentViewController.PresentViewControllerAsync(viewController, attribute.Animated).ConfigureAwait(true);
             return true;
         }
 
+        private UIViewController GetParentViewController()
+        {
+            //Ensure to get a ViewController that is not being dismissed. See related bugs https://github.com/MvvmCross/MvvmCross/issues/4781
+            return ModalViewControllers.LastOrDefault(x => !x.IsBeingDismissed) ?? Window.RootViewController
+                ?? throw new MvxException($"No parent ViewController found.");
+        }
+
         protected virtual Task<bool> ShowMasterSplitViewController(
             UIViewController viewController,
             MvxSplitViewPresentationAttribute attribute,
@@ -726,8 +728,7 @@ protected virtual void CloseMasterNavigationController()
             MasterNavigationController = null;
         }
 
-        public virtual async Task<bool> CloseModalViewController(
-            UIViewController viewController, MvxModalPresentationAttribute attribute)
+        public virtual async Task<bool> CloseModalViewController(UIViewController viewController, MvxModalPresentationAttribute attribute)
         {
             ValidateArguments(viewController, attribute);
 

diff --git a/MvvmCross/Platforms/Ios/Presenters/MvxModalPresentationControllerDelegate.cs b/MvvmCross/Platforms/Ios/Presenters/MvxModalPresentationControllerDelegate.cs
@@ -3,26 +3,24 @@
 // See the LICENSE file in the project root for more information.
 
 using MvvmCross.Platforms.Ios.Presenters.Attributes;
-using UIKit;
 
-namespace MvvmCross.Platforms.Ios.Presenters
+namespace MvvmCross.Platforms.Ios.Presenters;
+
+public class MvxModalPresentationControllerDelegate : UIAdaptivePresentationControllerDelegate
 {
-    public class MvxModalPresentationControllerDelegate : UIAdaptivePresentationControllerDelegate
-    {
-        private readonly MvxIosViewPresenter _presenter;
-        private readonly UIViewController _viewController;
-        private readonly MvxModalPresentationAttribute _attribute;
+    private readonly MvxIosViewPresenter _presenter;
+    private readonly UIViewController _viewController;
+    private readonly MvxModalPresentationAttribute _attribute;
 
-        public MvxModalPresentationControllerDelegate(MvxIosViewPresenter presenter, UIViewController viewController, MvxModalPresentationAttribute attribute)
-        {
-            _presenter = presenter;
-            _viewController = viewController;
-            _attribute = attribute;
-        }
+    public MvxModalPresentationControllerDelegate(MvxIosViewPresenter presenter, UIViewController viewController, MvxModalPresentationAttribute attribute)
+    {
+        _presenter = presenter;
+        _viewController = viewController;
+        _attribute = attribute;
+    }
 
-        public override void WillDismiss(UIPresentationController presentationController)
-        {
-            _presenter.CloseModalViewController(_viewController, _attribute);
-        }
+    public override async void DidDismiss(UIPresentationController presentationController)
+    {
+        await _presenter.CloseModalViewController(_viewController, _attribute).ConfigureAwait(false);
     }
-}
+}