Merge pull request #238 from MalzSmith/master

Assign ViewModels as DataContext to created Views in MVVM templates
AvaloniaUI · Nov 13, 2023 · 66f3823 · 66f3823
2 parents 8d27f8a + 77a1a53
commit 66f3823
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/templates/csharp/app-mvvm/ViewLocator.cs b/templates/csharp/app-mvvm/ViewLocator.cs
@@ -21,7 +21,9 @@ public IControl Build(object data)
 
         if (type != null)
         {
-            return (Control)Activator.CreateInstance(type)!;
+            var control = (Control)Activator.CreateInstance(type)!;
+            control.DataContext = data;
+            return control;
         }
 
         return new TextBlock { Text = "Not Found: " + name };
@@ -31,4 +33,4 @@ public bool Match(object? data)
     {
         return data is ViewModelBase;
     }
-}
+}
diff --git a/templates/fsharp/app-mvvm/ViewLocator.fs b/templates/fsharp/app-mvvm/ViewLocator.fs
@@ -17,6 +17,8 @@ type ViewLocator() =
                 if isNull typ then
                     upcast TextBlock(Text = sprintf "Not Found: %s" name)
                 else
-                    downcast Activator.CreateInstance(typ)
+                    let view = Activator.CreateInstance(typ) :?> Control
+                    view.DataContext <- data
+                    view
 
         member this.Match(data) = data :? ViewModelBase