marketally/marketally.mopups
2
0
Fork 0
Code Issues Packages Releases Wiki

Merge pull request #107 from romerotg/master

Browse Source 
Fix "VirtualView cannot be null here" on Android when `OnLayout` is fired after the handler is disconnected
This commit is contained in:
Tyson Elliot Hooker
2024-03-07 15:46:15 +11:00
committed by GitHub
parent 87fb74f03e 42e60cd8ff
commit 86c80de083
2 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Mopups/Mopups.Maui/Platforms/Android/Handler/PopupPageHandler.cs
View File

@@ -20,7 +20,8 @@ public class PopupPageHandler : PageHandler
protected override void ConnectHandler(ContentViewGroup platformView)
{
(platformView as PopupPageRenderer).PopupHandler = this;
if (platformView is PopupPageRenderer popupPageRenderer)
popupPageRenderer.PopupHandler = this;
base.ConnectHandler(platformView);
}
@@ -32,6 +33,8 @@ public class PopupPageHandler : PageHandler
protected override void DisconnectHandler(ContentViewGroup platformView)
{
if (platformView is PopupPageRenderer popupPageRenderer)
popupPageRenderer.PopupHandler = null;
base.DisconnectHandler(platformView);
}
}

39
Mopups/Mopups.Maui/Platforms/Android/Handler/PopupPageRenderer.cs
View File

@@ -115,13 +115,13 @@ public class PopupPageRenderer : ContentViewGroup
systemPadding = new Thickness();
}
(PopupHandler.VirtualView as PopupPage)?.SetValue(PopupPage.SystemPaddingProperty, systemPadding);
(PopupHandler.VirtualView as PopupPage)?.SetValue(PopupPage.KeyboardOffsetProperty, keyboardOffset);
(PopupHandler?.VirtualView as PopupPage)?.SetValue(PopupPage.SystemPaddingProperty, systemPadding);
(PopupHandler?.VirtualView as PopupPage)?.SetValue(PopupPage.KeyboardOffsetProperty, keyboardOffset);
if (changed)
(PopupHandler.VirtualView as PopupPage)?.Layout(new Rect(Context.FromPixels(left), Context.FromPixels(top), Context.FromPixels(right), Context.FromPixels(bottom)));
(PopupHandler?.VirtualView as PopupPage)?.Layout(new Rect(Context.FromPixels(left), Context.FromPixels(top), Context.FromPixels(right), Context.FromPixels(bottom)));
else
(PopupHandler.VirtualView as PopupPage)?.ForceLayout();
(PopupHandler?.VirtualView as PopupPage)?.ForceLayout();
base.OnLayout(changed, left, top, right, bottom);
//base.OnLayout(changed, 20, 500, 1080, 2000);
//base.OnLayout(changed, visibleRect.Left, visibleRect.Top, visibleRect.Right, visibleRect.Bottom);
@@ -137,17 +137,19 @@ public class PopupPageRenderer : ContentViewGroup
var activity = Platform.CurrentActivity;
var decoreView = activity?.Window?.DecorView;
//activity?.Window?.SetSoftInputMode(SoftInput.AdjustResize);
Context.HideKeyboard(decoreView);
if (decoreView != null)
Context?.HideKeyboard(decoreView);
base.OnAttachedToWindow();
}
protected override void OnDetachedFromWindow()
{
Device.StartTimer(TimeSpan.FromMilliseconds(0), () =>
Application.Current?.Dispatcher.StartTimer(TimeSpan.FromMilliseconds(0), () =>
{
var activity = Platform.CurrentActivity;
var decoreView = activity?.Window?.DecorView;
Context.HideKeyboard(decoreView);
if (decoreView != null)
Context?.HideKeyboard(decoreView);
return false;
});
@@ -170,7 +172,7 @@ public class PopupPageRenderer : ContentViewGroup
{
return false;
}
if ((PopupHandler.VirtualView as PopupPage).BackgroundInputTransparent)
if ((PopupHandler?.VirtualView is PopupPage popupPage) && popupPage.BackgroundInputTransparent)
{
return base.DispatchTouchEvent(e);
}
@@ -192,11 +194,11 @@ public class PopupPageRenderer : ContentViewGroup
_gestureDetector.OnTouchEvent(e);
if ((PopupHandler?.VirtualView as PopupPage).BackgroundInputTransparent)
if ((PopupHandler?.VirtualView is PopupPage popupPage) && popupPage.BackgroundInputTransparent)
{
if ((ChildCount > 0 && !IsInRegion(e.RawX, e.RawY, PopupHandler?.PlatformView.GetChildAt(0)!)) || ChildCount == 0)
{
(PopupHandler?.VirtualView as PopupPage).SendBackgroundClick();
popupPage.SendBackgroundClick();
return false;
}
@@ -227,11 +229,20 @@ public class PopupPageRenderer : ContentViewGroup
if (ChildCount == 0)
return;
var isInRegion = IsInRegion(e.RawX, e.RawY, PopupHandler.PlatformView.GetChildAt(0));
if (!isInRegion)
if (PopupHandler != null)
{
(PopupHandler.VirtualView as PopupPage).SendBackgroundClick();
var child = PopupHandler.PlatformView.GetChildAt(0);
if (child != null)
{
var isInRegion = IsInRegion(e.RawX, e.RawY, child);
if (!isInRegion)
{
if (PopupHandler.VirtualView is PopupPage popupPage)
popupPage.SendBackgroundClick();
}
}
}
}
}