fix(calendar): Fix possible null ref in measure

unoplatform · Jun 2, 2021 · 70c5afa · 70c5afa
1 parent d589e89
commit 70c5afa
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ICustomScrollInfo.cs b/src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ICustomScrollInfo.cs
@@ -23,6 +23,11 @@ internal static class CustomScrollInfoExtensions
 	{
 		public static void ApplyViewport(this ICustomScrollInfo scrollInfo, ref Size size)
 		{
+			if (scrollInfo is null)
+			{
+				return;
+			}
+
 			if (scrollInfo.ViewportWidth is { } width)
 			{
 				size.Width = width;
@@ -35,6 +40,11 @@ public static void ApplyViewport(this ICustomScrollInfo scrollInfo, ref Size siz
 
 		public static void ApplyViewport(this ICustomScrollInfo scrollInfo, ref Rect rect)
 		{
+			if (scrollInfo is null)
+			{
+				return;
+			}
+
 			if (scrollInfo.ViewportWidth is { } width)
 			{
 				rect.Width = width;