Add latest KEyboardScrollFixes and android flyout fix

Author: PureWeen

Shandler.Samples/MainFlyoutPage.cs

@@ -0,0 +1,20 @@
+namespace Shandler.Samples;
+
+public class MainFlyoutPage : FlyoutPage
+{
+	public MainFlyoutPage()
+	{
+		Detail = new NavigationPage(new MainPage());
+		Flyout = new ContentPage()
+		{
+			Content = new VerticalStackLayout()
+			{
+				new Label()
+				{
+					Text = "label"
+				}
+			},
+			Title = "rabbits of mercy"
+		};
+	}
+}

Shandler.Samples/Shandler.Samples.csproj

@@ -50,7 +50,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-		<PackageReference Include="PureWeen.Maui.FixesAndWorkarounds" Version="1.0.5" />
+		<PackageReference Include="PureWeen.Maui.FixesAndWorkarounds" Version="1.3.0" />
 	</ItemGroup>
 
 </Project>

ShanedlerSamples/Library/Common/ViewExtensions.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -26,6 +27,22 @@ namespace Maui.FixesAndWorkarounds.Library.Common
 {
     internal static partial class Extensions
     {
+
+		internal static void InvokePrivateMethod(this object target, string methodName, object?[]? parameters)
+		{
+			var methods =
+				target.GetType().GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.FlattenHierarchy);
+
+			foreach (var thing in methods)
+			{
+				if (thing.Name == methodName)
+				{
+					thing.Invoke(target, parameters);
+					return;
+				}
+			}
+		}
+
         internal static T? FindParentOfType<T>(this Element element, bool includeThis = false)
             where T : IElement
         {

ShanedlerSamples/Library/Common/ViewExtensions.iOS.cs

@@ -85,7 +85,17 @@ internal static partial class Extensions
 				if (siblings is null)
 					break;
 
-				nextView = view.FindNextView(siblings.IndexOf(view) + 1, isValidType);
+				// TableView and ListView cells may not be in order so handle separately
+				if (view.FindResponder<UITableView>() is UITableView tableView)
+				{
+					nextView = view.FindNextInTableView(tableView, isValidType);
+
+					if (nextView is null)
+						view = tableView;
+				}
+
+				else
+					nextView = view.FindNextView(siblings.IndexOf(view) + 1, isValidType);
 
 				view = view.Superview;
 			}
@@ -99,7 +109,7 @@ internal static partial class Extensions
 		static UIView? FindNextView(this UIView? view, int index, Func<UIView, bool> isValidType)
 		{
 			// search through the view's siblings and traverse down their branches
-			var siblings = view?.Superview?.Subviews;
+			var siblings = view is UITableView table ? table.VisibleCells : view?.Superview?.Subviews;
 
 			if (siblings is null)
 				return null;
@@ -122,6 +132,31 @@ internal static partial class Extensions
 			return null;
 		}
 
+		static UIView? FindNextInTableView(this UIView view, UITableView table, Func<UIView, bool> isValidType)
+		{
+			if (isValidType(view))
+			{
+				var index = view.FindTableViewCellIndex(table);
+
+				return index == -1 ? null : table.FindNextView(index + 1, isValidType);
+			}
+
+			return null;
+		}
+
+		static int FindTableViewCellIndex(this UIView view, UITableView table)
+		{
+			var cells = table.VisibleCells;
+			var viewCell = view.FindResponder<UITableViewCell>();
+
+			for (int i = 0; i < cells.Length; i++)
+			{
+				if (cells[i] == viewCell)
+					return i;
+			}
+			return -1;
+		}
+
 		internal static void ChangeFocusedView(this UIView view, UIView? newView)
 		{
 			if (newView is null)

ShanedlerSamples/Library/Keyboard/KeyboardAutoManagerScroll.iOS.cs

@@ -26,7 +26,7 @@ public WorkaroundMauiScrollView()
 		// while the KeyboardAutoManagerScroll is scrolling.
 		public override void ScrollRectToVisible(CGRect rect, bool animated)
 		{
-			if (!KeyboardAutoManagerScroll.IsCurrentlyScrolling)
+			if (!KeyboardAutoManagerScroll.IsKeyboardAutoScrollHandling)
 				base.ScrollRectToVisible(rect, animated);
 		}
 	}
@@ -70,9 +70,10 @@ void RemoveKeyboard()
 
 
 
-	internal static class KeyboardAutoManagerScroll
+
+	public static class KeyboardAutoManagerScroll
 	{
-		internal static bool IsCurrentlyScrolling;
+		internal static bool IsKeyboardAutoScrollHandling;
 		static UIScrollView? LastScrollView;
 		static CGPoint StartingContentOffset;
 		static UIEdgeInsets StartingScrollIndicatorInsets;
@@ -93,7 +94,7 @@ internal static class KeyboardAutoManagerScroll
 		static NSObject? TextFieldToken = null;
 		static NSObject? TextViewToken = null;
 
-		internal static void Connect()
+		public static void Connect()
 		{
 			if (TextFieldToken is not null)
 				return;
@@ -109,7 +110,7 @@ internal static void Connect()
 			DidHideToken = NSNotificationCenter.DefaultCenter.AddObserver(new NSString("UIKeyboardDidHideNotification"), DidHideKeyboard);
 		}
 
-		internal static void Disconnect()
+		public static void Disconnect()
 		{
 			if (WillShowToken is not null)
 				NSNotificationCenter.DefaultCenter.RemoveObserver(WillShowToken);
@@ -122,19 +123,22 @@ internal static void Disconnect()
 			if (TextViewToken is not null)
 				NSNotificationCenter.DefaultCenter.RemoveObserver(TextViewToken);
 
-			IsCurrentlyScrolling = false;
+			IsKeyboardAutoScrollHandling = false;
 		}
 
 		static async void DidUITextBeginEditing(NSNotification notification)
 		{
-			IsCurrentlyScrolling = true;
+			IsKeyboardAutoScrollHandling = true;
 
 			if (notification.Object is not null)
 			{
 				View = notification.Object as UIView;
 
-				if (View is null)
+				if (View is null || View.FindResponder<UIAlertController>() is not null)
+				{
+					IsKeyboardAutoScrollHandling = false;
 					return;
+				}
 
 				CursorRect = null;
 
@@ -211,7 +215,7 @@ static void WillHideKeyboard(NSNotification notification)
 
 		static void DidHideKeyboard(NSNotification notification)
 		{
-			IsCurrentlyScrolling = false;
+			IsKeyboardAutoScrollHandling = false;
 		}
 
 		static NSObject? FindValue(this NSDictionary dict, string key)
@@ -302,11 +306,13 @@ internal static async Task AdjustPositionDebounce()
 		// main method to calculate and animate the scrolling
 		internal static void AdjustPosition()
 		{
-			if (View is not UITextField field && View is not UITextView)
-				return;
-
-			if (ContainerView is null)
+			if (ContainerView is null
+				|| CursorRect is null
+				|| (View is not UITextField && View is not UITextView))
+			{
+				IsKeyboardAutoScrollHandling = false;
 				return;
+			}
 
 			if (TopViewBeginOrigin == InvalidPoint)
 				TopViewBeginOrigin = new CGPoint(ContainerView.Frame.X, ContainerView.Frame.Y);
@@ -345,9 +351,6 @@ internal static void AdjustPosition()
 			if (ContainerView.Superview is UIView v)
 				rootSuperViewFrameInWindow = v.ConvertRectToView(v.Bounds, window);
 
-			if (CursorRect is null)
-				return;
-
 			var cursorRect = (CGRect)CursorRect;
 
 			nfloat cursorNotInViewScroll = 0;

ShanedlerSamples/Library/Workarounds/HostExtensions.Android.cs

@@ -0,0 +1,35 @@
+#if ANDROID
+using Maui.FixesAndWorkarounds.Library.Common;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Handlers.Compatibility;
+
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.LifecycleEvents;
+using System.Reflection;
+
+namespace Maui.FixesAndWorkarounds
+{
+	public static partial class HostExtensions
+	{
+		public static MauiAppBuilder ConfigureFlyoutPageWorkarounds(this MauiAppBuilder builder)
+		{
+
+			FlyoutViewHandler.Mapper.AppendToMapping(nameof(IFlyoutView.Detail), OnFixDetailsPage);
+			FlyoutViewHandler.Mapper.AppendToMapping(nameof(IFlyoutView.Flyout), OnFixDetailsPage);
+			return builder;
+		}
+
+		static void OnFixDetailsPage(IFlyoutViewHandler arg1, IFlyoutView arg2)
+		{
+			var VirtualView = arg1.VirtualView;
+
+			if (VirtualView.FlyoutBehavior != FlyoutBehavior.Locked)
+				return;
+
+			arg1.InvokePrivateMethod("UpdateDetailsFragmentView", null);
+		}
+	}
+
+}
+
+#endif

ShanedlerSamples/Library/Workarounds/HostExtensions.cs

@@ -76,7 +76,7 @@ public static MauiAppBuilder ConfigureEntryNextWorkaround(this MauiAppBuilder bu
 			return builder;
 		}
 
-
+#if !ANDROID
 		public static MauiAppBuilder ConfigureFlyoutPageWorkarounds(this MauiAppBuilder builder)
 		{
 #if IOS || MACCATALYST
@@ -85,10 +85,10 @@ public static MauiAppBuilder ConfigureFlyoutPageWorkarounds(this MauiAppBuilder
 			{
 				handlers.AddHandler<FlyoutPage, CustomPhoneFlyoutPageRenderer>();
 			});
-
 #endif
 			return builder;
-		}
+		}		
+#endif
 
 		public static MauiAppBuilder ConfigureShellWorkarounds(this MauiAppBuilder builder)
 		{

ShanedlerSamples/MainFlyoutPage.cs

@@ -5,16 +5,41 @@ public class MainFlyoutPage : FlyoutPage
 	public MainFlyoutPage()
 	{
 		Detail = new NavigationPage(new MainPage());
-		Flyout = new ContentPage()
+		Flyout = new SwappingStuffFlyoutPage();
+		//Flyout = new ContentPage()
+		//{
+		//	Content = new VerticalStackLayout()
+		//	{
+		//		new Label()
+		//		{
+		//			Text = "label"
+		//		}
+		//	},
+		//	Title = "rabbits of mercy"
+		//};
+	}
+
+	class SwappingStuffFlyoutPage : ContentPage
+	{
+		public SwappingStuffFlyoutPage()
 		{
-			Content = new VerticalStackLayout()
+			Title = "Hi thgere";
+
+			var layout = new VerticalStackLayout();
+
+			layout.Add(new Button()
 			{
-				new Label()
+				Text = "Swap flyout page",
+				Command = new Command(() =>
 				{
-					Text = "label"
-				}
-			},
-			Title = "rabbits of mercy"
-		};
+					if (Application.Current.MainPage is FlyoutPage fp)
+					{
+						fp.Detail = new NavigationPage(new MainPage());
+					}
+				})
+			});
+
+			Content = layout;
+		}
 	}
 }