chore: Adjust swapview for xaml reader

unoplatform · Oct 27, 2023 · 3817c61 · 3817c61
1 parent f0ec731
commit 3817c61
Showing 1 changed file with 3 additions and 16 deletions.
diff --git a/src/Uno.UI.RemoteControl/HotReload/ClientHotReloadProcessor.Xaml.cs b/src/Uno.UI.RemoteControl/HotReload/ClientHotReloadProcessor.Xaml.cs
@@ -90,24 +90,11 @@ bool IsSameBaseUri(FrameworkElement i)
 						|| uri.OriginalString == i.BaseUri?.OriginalString;
 				}
 
-				foreach (var instance in EnumerateInstances(Window.Current.Content, IsSameBaseUri))
+				foreach (var instance in EnumerateInstances(Window.Current.Content, IsSameBaseUri).OfType<FrameworkElement>())
 				{
-					switch (instance)
+					if (XamlReader.LoadUsingXClass(fileContent, uri.ToString()) is FrameworkElement newContent)
 					{
-#if __IOS__
-						case UserControl userControl:
-							if (XamlReader.LoadUsingXClass(fileContent, uri.OriginalString) is UIKit.UIView newInstance)
-							{
-								SwapViews(userControl, newInstance);
-							}
-							break;
-#endif
-						case ContentControl content:
-							if (XamlReader.LoadUsingXClass(fileContent, uri.ToString()) is ContentControl newContent)
-							{
-								SwapViews(content, newContent);
-							}
-							break;
+						SwapViews(instance, newContent);
 					}
 				}