[Material] Fixed Renderer's LayoutSubviews may cause NullReferenceExc…

…eption on iOS. (#15670) Co-authored-by: naokitaguchi <taguchi@frog-pod.com>
xamarin · Feb 15, 2023 · b28fb45 · b28fb45
1 parent bab2c49
commit b28fb45
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Xamarin.Forms.Material.iOS/MaterialButtonRenderer.cs b/Xamarin.Forms.Material.iOS/MaterialButtonRenderer.cs
@@ -115,7 +115,7 @@ protected virtual void ApplyTheme()
 
 		protected virtual void ApplyThemeIfNeeded()
 		{
-			var bgBrush = Element.Background;
+			var bgBrush = Element?.Background;
 
 			if (Brush.IsNullOrEmpty(bgBrush))
 				return;

diff --git a/Xamarin.Forms.Material.iOS/MaterialFrameRenderer.cs b/Xamarin.Forms.Material.iOS/MaterialFrameRenderer.cs
@@ -133,7 +133,7 @@ protected override void Dispose(bool disposing)
 
 		protected virtual void ApplyThemeIfNeeded()
 		{
-			var bgBrush = Element.Background;
+			var bgBrush = Element?.Background;
 
 			if (Brush.IsNullOrEmpty(bgBrush))
 				return;

diff --git a/Xamarin.Forms.Material.iOS/MaterialTextManager.cs b/Xamarin.Forms.Material.iOS/MaterialTextManager.cs
@@ -89,7 +89,7 @@ public static void ApplyTheme(IMaterialTextField textField, IMaterialEntryRender
 
 		public static void ApplyThemeIfNeeded(IMaterialTextField textField, IMaterialEntryRenderer element)
 		{
-			var bgBrush = element.Background;
+			var bgBrush = element?.Background;
 
 			if (Brush.IsNullOrEmpty(bgBrush))
 				return;