Fxied bug in ExtractGenericArgumentDataContextChangeAttribute

riganti · Sep 28, 2023 · abb2229 · abb2229
1 parent b3dcbc7
commit abb2229
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Framework/Framework/Binding/ExtractGenericArgumentDataContextChangeAttribute.cs b/src/Framework/Framework/Binding/ExtractGenericArgumentDataContextChangeAttribute.cs
@@ -45,7 +45,9 @@ public ExtractGenericArgumentDataContextChangeAttribute(Type genericType, int ty
 
     public override Type? GetChildDataContextType(Type dataContext, DataContextStack controlContextStack, DotvvmBindableObject control, DotvvmProperty? property = null)
     {
-        var implementations = ReflectionUtils.GetBaseTypesAndInterfaces(dataContext).ToList();
+        var implementations = ReflectionUtils.GetBaseTypesAndInterfaces(dataContext)
+            .Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == GenericType)
+            .ToList();
         if (implementations.Count == 0)
         {
             throw new Exception($"The data context {dataContext} doesn't implement {GenericType}!");

diff --git a/src/Framework/Framework/Utils/ReflectionUtils.cs b/src/Framework/Framework/Utils/ReflectionUtils.cs
@@ -647,6 +647,7 @@ public static IEnumerable<Type> GetBaseTypesAndInterfaces(Type type)
                 yield return i;
             }
 
+            yield return type;
             while (type.BaseType is { } baseType)
             {
                 yield return baseType;