IocPage

Simnico99 · Sep 16, 2022 · 0af16eb · 0af16eb
1 parent df76f14
commit 0af16eb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/ZirconNet.WPF/DependencyInjection/PageDataContextAttribute.cs b/src/ZirconNet.WPF/DependencyInjection/PageDataContextAttribute.cs
@@ -3,7 +3,7 @@
 [AttributeUsage(AttributeTargets.Class)]
 public sealed class PageDataContextAttribute : Attribute
 {
-    public IEnumerable<string>? PagesToBindName { get; }
+    public Type[]? PagesToBindType { get; }
     public PageDataContextAttribute() { }
 
     public PageDataContextAttribute(params Type[] pagesToBind)
@@ -12,6 +12,6 @@ public PageDataContextAttribute(params Type[] pagesToBind)
         {
             return;
         }
-        PagesToBindName = pagesToBind.Select(x => x.Name).ToList();
+        PagesToBindType = pagesToBind;
     }
 }
diff --git a/src/ZirconNet.WPF/Mvvm/IocPage.cs b/src/ZirconNet.WPF/Mvvm/IocPage.cs
@@ -56,12 +56,12 @@ private List<ViewModel> GetPageDataContexts(IServiceProvider servicesProvider, I
                 continue;
             }
 
-            if (pageDataContextAttribute.PagesToBindName is null)
+            if (pageDataContextAttribute.PagesToBindType is null)
             {
                 viewModels.Add(viewModel);
                 continue;
             }
-            if (pageDataContextAttribute.PagesToBindName.Contains(GetType().Name))
+            if (pageDataContextAttribute.PagesToBindType.Contains(GetType()))
             {
                 viewModels.Add(viewModel);
             }
@@ -91,14 +91,18 @@ private IEnumerable<ViewModel> GetPageDataContexts(IServiceProvider servicesProv
                 continue;
             }
 
-            if (pageDataContextAttribute.PagesToBindName is null)
+            if (pageDataContextAttribute.PagesToBindType is null)
             {
                 yield return viewModel;
                 continue;
             }
-            if (pageDataContextAttribute.PagesToBindName.Contains(GetType().Name))
+            foreach (var type in pageDataContextAttribute.PagesToBindType)
             {
-                yield return viewModel;
+                if (type == GetType())
+                {
+                    yield return viewModel;
+                    continue;
+                }
             }
         }
 #endif