Fixed failure for dynamic binding when updates DataContext later than…

… InitializeComponent() on Avalonia. #42
kekyo · May 15, 2024 · 1c1432e · 1c1432e
1 parent f20897c
commit 1c1432e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Epoxy.Core/EventBinder.cs b/src/Epoxy.Core/EventBinder.cs
@@ -331,10 +331,13 @@ static Event()
     {
         EventNameProperty.Changed.Subscribe(
             new AnonymousObserver<AvaloniaPropertyChangedEventArgs<string>>(e =>
-                ((Event)e.Sender).OnEventNamePropertyChanged(e.OldValue, e.NewValue)));
+                ((Event)e.Sender).OnEventNamePropertyChanged(
+                    e.OldValue.HasValue ? e.OldValue.Value : null,
+                    e.NewValue.HasValue ? e.NewValue.Value : null)));
         CommandProperty.Changed.Subscribe(
             new AnonymousObserver<AvaloniaPropertyChangedEventArgs<ICommand>>(e =>
-                ((Event)e.Sender).OnCommandPropertyChanged(e.NewValue)));
+                ((Event)e.Sender).OnCommandPropertyChanged(
+                    e.NewValue.HasValue ? e.NewValue.Value : null)));
     }
 #else
     /// <summary>