Optional popover animations on iOS

Author: RadekVyM

src/Playground/Playground.Original/Views/Pages/PopoverPage.xaml

@@ -17,7 +17,7 @@
                 HorizontalOptions="Start"
                 PopoverAlignment="{Binding Source={x:Reference popoverAlignmentPicker}, Path=SelectedItem}"
                 UseDefaultStyling="{Binding Source={x:Reference useDefaultStylingSwitch}, Path=IsToggled}"
-                IsAnimated="{Binding Source={x:Reference useDefaultStylingSwitch}, Path=IsToggled}" />
+                IsAnimated="{Binding Source={x:Reference isAnimatedSwitch}, Path=IsToggled}" />
             <controls:PopoverTest
                 HorizontalOptions="Center"
                 PopoverAlignment="{Binding Source={x:Reference popoverAlignmentPicker}, Path=SelectedItem}"

src/SimpleToolkit.Core/Handlers/Popover/PopoverHandler.MaciOS.cs

@@ -31,26 +31,31 @@ public static void MapContent(PopoverHandler handler, IPopover popover)
 
     public static void MapIsAnimated(PopoverHandler handler, IPopover popover)
     {
+        handler.PlatformView.IsAnimated = popover.IsAnimated;
     }
 
     public static void MapPermittedArrowDirections(PopoverHandler handler, IPopover popover)
     {
         handler.PlatformView.PermittedArrowDirections = popover.PermittedArrowDirections.ToUIPopoverArrowDirection();
     }
 
-    public static void MapShow(PopoverHandler handler, IPopover popover, object parentView)
+    public static async void MapShow(PopoverHandler handler, IPopover popover, object parentView)
     {
         if (parentView is not IElement anchor)
             return;
 
-        handler.PlatformView?.Show(popover, anchor);
+        try { await handler.PlatformView?.Show(popover, anchor); }
+        catch { throw; }
     }
 
     public static async void MapHide(PopoverHandler handler, IPopover popover, object arg3)
     {
         var vc = handler.PlatformView.ViewController;
         if (vc is not null)
-            await vc.DismissViewControllerAsync(true);
+        {
+            try { await vc.DismissViewControllerAsync(true); }
+            catch { throw; }
+        }
         //handler.PlatformView.CleanUp();
     }
 }

src/SimpleToolkit.Core/Platform/MaciOS/PopoverViewController.cs

@@ -14,6 +14,7 @@ public class PopoverViewController(IMauiContext mauiContext) : UIViewController
 {
     private readonly IMauiContext mauiContext = mauiContext ?? throw new ArgumentNullException(nameof(mauiContext));
     private Grid contentWrapper = null;
+    private bool isAnimated = true;
     private WeakReference<IPopover> virtualViewReference;
 
     internal UIViewController ViewController { get; private set; }
@@ -31,6 +32,17 @@ public virtual UIPopoverArrowDirection PermittedArrowDirections
         set => ((UIPopoverPresentationController)PresentationController).PermittedArrowDirections = value;
     }
 
+    public virtual bool IsAnimated 
+    {
+        get => isAnimated;
+        set
+        {
+            isAnimated = value;
+            if (PresentationController.Delegate is PopoverDelegate popoverDelegate)
+                popoverDelegate.IsAnimated = value;
+        }
+    }
+
 
     public override void ViewWillAppear(bool animated)
     {
@@ -45,7 +57,8 @@ public override void ViewWillAppear(bool animated)
             View.Superview.Layer.CornerRadius = 0f;
             View.Superview.Layer.MasksToBounds = false;
 
-            AnimateIn();
+            if (IsAnimated)
+                AnimateIn();
         }
     }
 
@@ -84,7 +97,7 @@ public void SetElement(IPopover element)
     }
 
     [MemberNotNull(nameof(ViewController))]
-    public void Show(in IPopover virtualView, in IElement anchor)
+    public async Task Show(IPopover virtualView, IElement anchor)
     {
         if (IsBeingPresented || IsBeingDismissed)
             return;
@@ -95,7 +108,12 @@ public void Show(in IPopover virtualView, in IElement anchor)
         _ = ViewController ?? throw new InvalidOperationException($"{nameof(ViewController)} cannot be null");
 
         SetAnchor(virtualView, anchor);
-        PresentInViewController(ViewController);
+        await PresentInViewController(ViewController);
+    }
+
+    public async Task Hide()
+    {
+        await ViewController.DismissViewControllerAsync(IsAnimated);
     }
 
     public void CleanUp()
@@ -187,8 +205,11 @@ private void SetAnchor(IPopover popover, IElement anchor)
     private void SetUpPresentationController(IPopover virtualView)
     {
         var presentationController = (UIPopoverPresentationController)PresentationController;
-
-        presentationController.Delegate = new PopoverDelegate();
+        
+        presentationController.Delegate = new PopoverDelegate
+        {
+            IsAnimated = IsAnimated
+        };
         presentationController.PermittedArrowDirections = virtualView.PermittedArrowDirections.ToUIPopoverArrowDirection();
 
         if (!virtualView.UseDefaultStyling)
@@ -198,9 +219,9 @@ private void SetUpPresentationController(IPopover virtualView)
         }
     }
 
-    private void PresentInViewController(UIViewController viewController)
+    private async Task PresentInViewController(UIViewController viewController)
     {
-        viewController.PresentViewController(this, true, null);
+        await viewController.PresentViewControllerAsync(this, IsAnimated);
     }
 
     private CGPoint GetContentOffset(bool useDefaultStyling)
@@ -233,6 +254,14 @@ private static void RemoveShadow(UIView containerView)
 
     private class PopoverDelegate : UIPopoverPresentationControllerDelegate
     {
+        public bool IsAnimated { get; set; } = true;
+
+        public override bool ShouldDismiss(UIPresentationController presentationController)
+        {
+            presentationController.PresentingViewController.DismissViewController(IsAnimated, null);
+            return true;
+        }
+
         public override UIModalPresentationStyle GetAdaptivePresentationStyle(UIPresentationController forPresentationController) =>
             UIModalPresentationStyle.None;