trytofixios

felipebaltazar · Nov 2, 2024 · 9725bc9 · 9725bc9
1 parent 87b7285
commit 9725bc9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/Maui.ServerDrivenUI/Models/ServerUIElement.cs b/Maui.ServerDrivenUI/Models/ServerUIElement.cs
@@ -1,6 +1,7 @@
 using Maui.ServerDrivenUI.Services;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
+using System.Text.RegularExpressions;
 
 namespace Maui.ServerDrivenUI;
 
@@ -113,9 +114,19 @@ public string ToXaml(IList<CustomNamespace>? customNamespaces = null)
         }
 
         var xaml = XamlConverterService.ConvertToXml(this);
-        return $"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
-            $"{xaml}";
+        return DoRemovespace($"<?xml version=\"1.0\" ?>\n" +
+            $"{xaml}");
     }
 
     #endregion
+
+    private static string DoRemovespace(string strFile)
+    {
+        var str = System.IO.File.ReadAllText(strFile);
+        str = str.Replace("\n", "");
+        str = str.Replace("\r", "");
+        var regex = new Regex(@">\s*<");
+        return regex.Replace(str, "><");
+
+    }
 }
diff --git a/Maui.ServerDrivenUI/Views/ServerDrivenVisualElement.cs b/Maui.ServerDrivenUI/Views/ServerDrivenVisualElement.cs
@@ -15,14 +15,15 @@ internal static async Task InitializeComponentAsync(IServerDrivenVisualElement e
         var errorMessage = string.Empty;
         try
         {
-            ShowLoadingView(element);
+            MainThread.BeginInvokeOnMainThread(() => ShowLoadingView(element));
             MainThread.BeginInvokeOnMainThread(() => element.State = UIElementState.Loading);
+            await Task.Yield();
 
             var serverDrivenUiService = ServiceProviderHelper
                 .ServiceProvider?
                 .GetService<IServerDrivenUIService>();
 
-            if (serverDrivenUiService != null)
+            if (serverDrivenUiService is not null)
             {
                 var xaml = await serverDrivenUiService
                     .GetXamlAsync(element.ServerKey ?? element.GetType().Name)