fix IViewModelLocator not found (#105)

tibel · Aug 20, 2023 · e2bba7d · e2bba7d
1 parent 9774347
commit e2bba7d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/Caliburn.Light.WPF/View.cs b/src/Caliburn.Light.WPF/View.cs
@@ -213,6 +213,12 @@ private static void CreateView(FrameworkElement parentElement, object model, str
                 return;
             }
 
+            if (!parentElement.IsLoaded)
+            {
+                ExecuteOnLoad(parentElement, x => CreateView(x, x.DataContext, GetContext(x)));
+                return;
+            }
+
             var viewModelLocator = GetCurrentViewModelLocator(parentElement);
             if (viewModelLocator is null)
                 throw new InvalidOperationException("Could not find 'IViewModelLocator' in control hierarchy.");

diff --git a/src/Caliburn.Light.WinUI/View.cs b/src/Caliburn.Light.WinUI/View.cs
@@ -227,6 +227,12 @@ private static void CreateView(FrameworkElement parentElement, object model, str
                 return;
             }
 
+            if (!parentElement.IsLoaded)
+            {
+                ExecuteOnLoad(parentElement, x => CreateView(x, x.DataContext, GetContext(x)));
+                return;
+            }
+
             var viewModelLocator = GetCurrentViewModelLocator(parentElement);
             if (viewModelLocator is null)
                 throw new InvalidOperationException("Could not find 'IViewModelLocator' in control hierarchy.");