fix(SystemPadding, Keyboard, iOS): HasSystemPadding, HasKeyboard and SystemPaddings didn't work properly

Author: rotorgames

Rg.Plugins.Popup/Pages/PopupPage.cs

@@ -79,7 +79,7 @@ public IPopupAnimation Animation
         public Thickness SystemPadding
         {
             get { return (Thickness)GetValue(SystemPaddingProperty); }
-            internal set { SetValue(SystemPaddingProperty, value); }
+            private set { SetValue(SystemPaddingProperty, value); }
         }
 
         public static readonly BindableProperty SystemPaddingSidesProperty = BindableProperty.Create(nameof(SystemPaddingSides), typeof(PaddingSide), typeof(PopupPage), PaddingSide.All);
@@ -164,15 +164,14 @@ protected override void OnPropertyChanged(string? propertyName = null)
                 case nameof(HasSystemPadding):
                 case nameof(HasKeyboardOffset):
                 case nameof(SystemPaddingSides):
-                case nameof(SystemPadding):
-                ForceLayout();
-                break;
+                    ForceLayout();
+                    break;
                 case nameof(IsAnimating):
-                IsAnimationEnabled = IsAnimating;
-                break;
+                    IsAnimationEnabled = IsAnimating;
+                    break;
                 case nameof(IsAnimationEnabled):
-                IsAnimating = IsAnimationEnabled;
-                break;
+                    IsAnimating = IsAnimationEnabled;
+                    break;
             }
         }
 

Rg.Plugins.Popup/Platforms/Android/Renderers/PopupPageRenderer.cs

@@ -60,19 +60,23 @@ protected override void Dispose(bool disposing)
         protected override void OnLayout(bool changed, int l, int t, int r, int b)
         {
             var activity = (Activity?)Context;
+            var element = CurrentElement;
+
+            if (element == null)
+                return;
 
             Thickness systemPadding;
             var keyboardOffset = 0d;
 
             var decoreView = activity?.Window?.DecorView;
 
-            var visibleRect = new Android.Graphics.Rect();
+            var visibleRect = new Rect();
 
             decoreView?.GetWindowVisibleDisplayFrame(visibleRect);
 
             if (Build.VERSION.SdkInt >= BuildVersionCodes.M && RootWindowInsets != null)
             {
-                var h = b-t;
+                var h = b - t;
 
                 var windowInsets = RootWindowInsets;
                 var bottomPadding = Math.Min(windowInsets.StableInsetBottom, windowInsets.SystemWindowInsetBottom);
@@ -119,13 +123,17 @@ protected override void OnLayout(bool changed, int l, int t, int r, int b)
                 systemPadding = new Thickness();
             }
 
-            CurrentElement.SetValue(PopupPage.SystemPaddingProperty, systemPadding);
-            CurrentElement.SetValue(PopupPage.KeyboardOffsetProperty, keyboardOffset);
+            var needForceLayout =
+                (element.HasSystemPadding && element.SystemPadding != systemPadding)
+                || (element.HasKeyboardOffset && element.KeyboardOffset != keyboardOffset);
+
+            element.SetValueFromRenderer(PopupPage.SystemPaddingProperty, systemPadding);
+            element.SetValueFromRenderer(PopupPage.KeyboardOffsetProperty, keyboardOffset);
 
             if (changed)
-                CurrentElement.Layout(new Rectangle(Context.FromPixels(l), Context.FromPixels(t), Context.FromPixels(r), Context.FromPixels(b)));
-            else
-                CurrentElement.ForceLayout();
+                element.Layout(new Rectangle(Context.FromPixels(l), Context.FromPixels(t), Context.FromPixels(r), Context.FromPixels(b)));
+            else if(needForceLayout)
+                element.ForceLayout();
 
             base.OnLayout(changed, l, t, r, b);
         }

Rg.Plugins.Popup/Platforms/Ios/Extensions/PlatformExtension.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 
 using Rg.Plugins.Popup.IOS.Renderers;
-
+using Rg.Plugins.Popup.Pages;
 using UIKit;
 
 using Xamarin.Forms;
@@ -57,23 +57,44 @@ public static void UpdateSize(this PopupPageRenderer renderer)
 
             var superviewFrame = renderer.View.Superview.Frame;
             var applicationFrame = UIScreen.MainScreen.ApplicationFrame;
+            var keyboardOffset = renderer.KeyboardBounds.Height;
+
+            Thickness systemPadding;
 
-            var systemPadding = new Thickness
+            if (UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
             {
-                Left = applicationFrame.Left,
-                Top = applicationFrame.Top,
-                Right = applicationFrame.Right - applicationFrame.Width - applicationFrame.Left,
-                Bottom = applicationFrame.Bottom - applicationFrame.Height - applicationFrame.Top + renderer.KeyboardBounds.Height
-            };
-
-            if ((renderer.Element.Width != superviewFrame.Width && renderer.Element.Height != superviewFrame.Height)
-                || currentElement.SystemPadding.Bottom != systemPadding.Bottom)
+                var safeAreaInsets = UIApplication.SharedApplication.KeyWindow.SafeAreaInsets;
+
+                systemPadding = new Thickness(
+                    safeAreaInsets.Left,
+                    safeAreaInsets.Top,
+                    safeAreaInsets.Right,
+                    safeAreaInsets.Bottom);
+            }
+            else
             {
-                currentElement.BatchBegin();
-                currentElement.SystemPadding = systemPadding;
-                renderer.SetElementSize(new Size(superviewFrame.Width, superviewFrame.Height));
-                currentElement.BatchCommit();
+                systemPadding = new Thickness
+                {
+                    Left = applicationFrame.Left,
+                    Top = applicationFrame.Top,
+                    Right = applicationFrame.Right - applicationFrame.Width - applicationFrame.Left,
+                    Bottom = applicationFrame.Bottom - applicationFrame.Height - applicationFrame.Top
+                };
             }
+
+            var needForceLayout =
+                (currentElement.HasSystemPadding && currentElement.SystemPadding != systemPadding)
+                || (currentElement.HasKeyboardOffset && currentElement.KeyboardOffset != keyboardOffset);
+
+            currentElement.SetValueFromRenderer(PopupPage.SystemPaddingProperty, systemPadding);
+            currentElement.SetValueFromRenderer(PopupPage.KeyboardOffsetProperty, keyboardOffset);
+
+            var elementSize = new Size(superviewFrame.Width, superviewFrame.Height);
+
+            if (currentElement.Bounds.Size != elementSize)
+                renderer.SetElementSize(elementSize);
+            else if (needForceLayout)
+                currentElement.ForceLayout();
         }
     }
 }

Rg.Plugins.Popup/Platforms/Mac/Extensions/PlatformExtension.cs

@@ -56,24 +56,8 @@ public static void UpdateSize(this PopupPageRenderer renderer)
                 return;
 
             var superviewFrame = renderer.View.Superview.Frame;
-            var applactionFrame = NSScreen.MainScreen.Frame;
 
-
-
-            var systemPadding = new Thickness
-            {
-                Left = applactionFrame.Left,
-                Top = applactionFrame.Top,
-                Right = applactionFrame.Right - applactionFrame.Width - applactionFrame.Left,
-                Bottom = applactionFrame.Bottom - applactionFrame.Height - applactionFrame.Top
-            };
-
-            currentElement.BatchBegin();
-
-            currentElement.SystemPadding = systemPadding;
             renderer.SetElementSize(new Size(superviewFrame.Width, superviewFrame.Height));
-
-            currentElement.BatchCommit();
         }
     }
 }

Samples/Demo/Pages/KeyboardTestPage.xaml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ContentPage
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Demo.Pages.KeyboardTestPage">
+    <ContentPage.Content>
+        
+    </ContentPage.Content>
+</ContentPage>

Samples/Demo/Pages/KeyboardTestPage.xaml.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+using Xamarin.Forms;
+
+namespace Demo.Pages
+{
+    public partial class KeyboardTestPage : ContentPage
+    {
+        public KeyboardTestPage()
+        {
+            InitializeComponent();
+        }
+    }
+}