Merge branch 'devel'

kekyo · May 15, 2024 · 4fd1070 · 4fd1070
2 parents 3e9cd00 + 1c1432e
commit 4fd1070
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/playground/EpoxyHello.Avalonia11/Views/MainWindow.axaml b/playground/EpoxyHello.Avalonia11/Views/MainWindow.axaml
@@ -22,7 +22,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:epoxy="clr-namespace:Epoxy;assembly=Epoxy.Core"
+        xmlns:epoxy="https://github.com/kekyo/Epoxy"
         xmlns:viewmodels="clr-namespace:EpoxyHello.Avalonia11.ViewModels"
         xmlns:converters="clr-namespace:EpoxyHello.Avalonia11.Views.Converters"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"

diff --git a/src/Epoxy.Avalonia11/Properties/AssemblyInfo.cs b/src/Epoxy.Avalonia11/Properties/AssemblyInfo.cs
@@ -21,8 +21,5 @@
 
 using Avalonia.Metadata;
 
-// TODO: In 0.10.0, Avalonia XAML designer cause
-//   "XamlException: 'Unable to resolve type'" error when use XML namespace alias.
-//   Related?: https://github.com/AvaloniaUI/Avalonia/issues/3592
-//[assembly: XmlnsDefinition("https://github.com/kekyo/Epoxy", "Epoxy")]
-//[assembly: XmlnsPrefix("https://github.com/kekyo/Epoxy", "epoxy")]
+[assembly: XmlnsDefinition("https://github.com/kekyo/Epoxy", "Epoxy")]
+[assembly: XmlnsPrefix("https://github.com/kekyo/Epoxy", "epoxy")]
diff --git a/src/Epoxy.Core.Avalonia11/Properties/AssemblyInfo.cs b/src/Epoxy.Core.Avalonia11/Properties/AssemblyInfo.cs
@@ -25,8 +25,5 @@
 [assembly: InternalsVisibleTo("Epoxy")]
 [assembly: InternalsVisibleTo("FSharp.Epoxy")]
 
-// TODO: In 0.10.0, Avalonia XAML designer cause
-//   "XamlException: 'Unable to resolve type'" error when use XML namespace alias.
-//   Related?: https://github.com/AvaloniaUI/Avalonia/issues/3592
-//[assembly: XmlnsDefinition("https://github.com/kekyo/Epoxy", "Epoxy")]
-//[assembly: XmlnsPrefix("https://github.com/kekyo/Epoxy", "epoxy")]
+[assembly: XmlnsDefinition("https://github.com/kekyo/Epoxy", "Epoxy")]
+[assembly: XmlnsPrefix("https://github.com/kekyo/Epoxy", "epoxy")]
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>