[iOS] FlyoutPage Shadow works incorrectly on iOS - fix (#22351)

* Fixed #22169 * Update PhoneFlyoutPageRenderer.cs * Code refactor
dotnet · May 13, 2024 · b2870c7 · b2870c7
1 parent 8b10f39
commit b2870c7
Showing 1 changed file with 28 additions and 10 deletions.
diff --git a/src/Controls/src/Core/Compatibility/Handlers/FlyoutPage/iOS/PhoneFlyoutPageRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/FlyoutPage/iOS/PhoneFlyoutPageRenderer.cs
@@ -2,6 +2,7 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
+using CoreGraphics;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
@@ -663,11 +664,8 @@ bool shouldReceive(UIGestureRecognizer g, UITouch t)
 								targetFrame.X = (nfloat)Math.Min(_flyoutController.View.Frame.Width, Math.Max(0, motion));
 
 							targetFrame.X = targetFrame.X * directionModifier;
-							if (_applyShadow)
-							{
-								var openProgress = targetFrame.X / _flyoutController.View.Frame.Width;
-								ApplyDetailShadow((nfloat)openProgress);
-							}
+
+							ApplyShadow(targetFrame);
 
 							detailView.Frame = targetFrame;
 						}
@@ -692,11 +690,7 @@ bool shouldReceive(UIGestureRecognizer g, UITouch t)
 								targetFrame.X = (float)Element.Bounds.Width - (flyoutWidth + targetFrame.X);
 							}
 
-							if (_applyShadow)
-							{
-								var openProgress = targetFrame.X / flyoutWidth;
-								ApplyDetailShadow((nfloat)openProgress);
-							}
+							ApplyShadow(targetFrame);
 
 							flyoutView.Frame = targetFrame;
 						}
@@ -757,6 +751,30 @@ bool shouldReceive(UIGestureRecognizer g, UITouch t)
 			View.AddGestureRecognizer(_panGesture);
 		}
 
+		void ApplyShadow(CGRect targetFrame)
+		{
+			if (!_applyShadow)
+				return;
+
+			var flyoutWidth = _flyoutController.View.Frame.Width;
+			nfloat openProgress;
+
+			if (!FlyoutOverlapsDetailsInPopoverMode)
+			{
+				openProgress = !IsRTL
+					? targetFrame.X / flyoutWidth
+					: ((float)Element.Bounds.Width - targetFrame.Right) / flyoutWidth;
+			}
+			else
+			{
+				openProgress = !IsRTL
+					? (targetFrame.X + flyoutWidth) / flyoutWidth
+					: ((float)Element.Bounds.Width - targetFrame.X) / flyoutWidth;
+			}
+
+			ApplyDetailShadow(openProgress);
+		}
+
 		static bool IsSwipeView(UIView view)
 		{
 			if (view == null)