From ca4a672be21f991ea85d2b175152ce4e86ce5ccc Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Sat, 24 Feb 2024 01:25:45 +0100
Subject: [PATCH] Made Path/PathIcon.Data nullable (#14720)

---
 src/Avalonia.Controls/PathIcon.cs    |  6 +++---
 src/Avalonia.Controls/Shapes/Path.cs | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Controls/PathIcon.cs b/src/Avalonia.Controls/PathIcon.cs
index 204baf2964..ae1acee62e 100644
--- a/src/Avalonia.Controls/PathIcon.cs
+++ b/src/Avalonia.Controls/PathIcon.cs
@@ -9,10 +9,10 @@ namespace Avalonia.Controls
             AffectsRender<PathIcon>(DataProperty);
         }
 
-        public static readonly StyledProperty<Geometry> DataProperty =
-            AvaloniaProperty.Register<PathIcon, Geometry>(nameof(Data));
+        public static readonly StyledProperty<Geometry?> DataProperty =
+            AvaloniaProperty.Register<PathIcon, Geometry?>(nameof(Data));
 
-        public Geometry Data
+        public Geometry? Data
         {
             get => GetValue(DataProperty);
             set => SetValue(DataProperty, value);
diff --git a/src/Avalonia.Controls/Shapes/Path.cs b/src/Avalonia.Controls/Shapes/Path.cs
index 73197d29b4..9cbe6f943f 100644
--- a/src/Avalonia.Controls/Shapes/Path.cs
+++ b/src/Avalonia.Controls/Shapes/Path.cs
@@ -5,8 +5,8 @@ namespace Avalonia.Controls.Shapes
 {
     public class Path : Shape
     {
-        public static readonly StyledProperty<Geometry> DataProperty =
-            AvaloniaProperty.Register<Path, Geometry>(nameof(Data));
+        public static readonly StyledProperty<Geometry?> DataProperty =
+            AvaloniaProperty.Register<Path, Geometry?>(nameof(Data));
 
         private EventHandler? _geometryChangedHandler;
 
@@ -16,15 +16,15 @@ namespace Avalonia.Controls.Shapes
             DataProperty.Changed.AddClassHandler<Path>((o, e) => o.DataChanged(e));
         }
 
-        public Geometry Data
+        public Geometry? Data
         {
             get => GetValue(DataProperty);
             set => SetValue(DataProperty, value);
         }
 
-        private EventHandler? GeometryChangedHandler => _geometryChangedHandler ??= GeometryChanged;
+        private EventHandler GeometryChangedHandler => _geometryChangedHandler ??= GeometryChanged;
 
-        protected override Geometry CreateDefiningGeometry() => Data;
+        protected override Geometry? CreateDefiningGeometry() => Data;
 
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {