From c479a1a7122a8b53b9b8c7798e46f608ad6b0d94 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Soucy <ma.soucy@nventive.com>
Date: Wed, 23 Aug 2023 09:15:26 -0400
Subject: [PATCH 1/2] style: fix layout

---
 .../AdvancedXBind.Shared/MainPage.xaml        | 108 ++++++++++++------
 1 file changed, 71 insertions(+), 37 deletions(-)

diff --git a/UI/AdvancedXBind/AdvancedXBind.Shared/MainPage.xaml b/UI/AdvancedXBind/AdvancedXBind.Shared/MainPage.xaml
index 14dc84249..314f41449 100644
--- a/UI/AdvancedXBind/AdvancedXBind.Shared/MainPage.xaml
+++ b/UI/AdvancedXBind/AdvancedXBind.Shared/MainPage.xaml
@@ -1,38 +1,72 @@
-<Page
-    x:Class="AdvancedXBind.MainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="using:AdvancedXBind.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:sys="using:System"
-    xmlns:vm="using:AdvancedXBind.ViewModel"
-    mc:Ignorable="d"
-    Background="White"
-    >
-    <Page.Resources>
-        <converters:DoubleToStringConverter x:Key="DoubleToStringConverter"/>
-    </Page.Resources>
-    <Grid DataContext="{x:Bind vm:PlanetViewModel.Create('Jupiter')}" Margin="40" RowSpacing="20" ColumnSpacing="10" HorizontalAlignment="Stretch" VerticalAlignment="Top">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="*"/>
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-        <TextBlock Text="{Binding Planet.Name}" Grid.ColumnSpan="2" HorizontalAlignment="Center" FontSize="32" Foreground="IndianRed" Margin="5,5,5,15"/>
-        <TextBlock Grid.Row="1" HorizontalAlignment="Right" TextWrapping="WrapWholeWords" FontWeight="Bold" >Enter your weight on Earth:</TextBlock>
-        <TextBox Grid.Row="1" Grid.Column="1" x:Name="tb" />
-        <TextBlock Grid.Row="2" HorizontalAlignment="Right" TextWrapping="WrapWholeWords" FontWeight="Bold">Your weight on Jupiter:</TextBlock>
-        <TextBlock Text="{x:Bind ViewModel.WeightOnPlanet(tb.Text), Mode=OneWay}" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2"/>
-        <Button Grid.Row="3" HorizontalAlignment="Right" Content="Display Planet Information" Click="{x:Bind DisplayPlanetSync}"/>
-        <TextBlock Grid.Row="3" Grid.Column="1" Text="{x:Bind GetResultOfAsyncMethod()}"/>
-        <TextBlock Grid.Row="4" HorizontalAlignment="Right" FontWeight="Bold" TextWrapping="WrapWholeWords" Text="Approx Planet Density (KG/M3):"/>
-        <TextBlock Grid.Row="4" Grid.Column="1" Text="{x:Bind ViewModel.CalculateDensity(ViewModel.Planet.Mass, ViewModel.Planet.Diameter)}"/>
-    </Grid>
+<Page x:Class="AdvancedXBind.MainPage"
+	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	  xmlns:converters="using:AdvancedXBind.Converters"
+	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	  xmlns:sys="using:System"
+	  xmlns:vm="using:AdvancedXBind.ViewModel"
+	  mc:Ignorable="d"
+	  Background="White">
+	<Page.Resources>
+		<converters:DoubleToStringConverter x:Key="DoubleToStringConverter" />
+	</Page.Resources>
+	<Grid DataContext="{x:Bind vm:PlanetViewModel.Create('Jupiter')}"
+		  Margin="40"
+		  RowSpacing="20"
+		  ColumnSpacing="10"
+		  HorizontalAlignment="Stretch"
+		  VerticalAlignment="Top">
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="*" />
+			<ColumnDefinition Width="*" />
+		</Grid.ColumnDefinitions>
+		<Grid.RowDefinitions>
+			<RowDefinition />
+			<RowDefinition />
+			<RowDefinition />
+			<RowDefinition />
+			<RowDefinition />
+		</Grid.RowDefinitions>
+		<TextBlock Text="{Binding Planet.Name}"
+				   Grid.ColumnSpan="2"
+				   HorizontalAlignment="Center"
+				   FontSize="32"
+				   Foreground="IndianRed"
+				   Margin="5,5,5,15" />
+		<TextBlock Grid.Row="1"
+				   HorizontalAlignment="Right"
+				   TextWrapping="WrapWholeWords"
+				   FontWeight="Bold">
+			Enter your weight on Earth:
+		</TextBlock>
+		<TextBox Grid.Row="1"
+				 Grid.Column="1"
+				 x:Name="tb" />
+		<TextBlock Grid.Row="2"
+				   HorizontalAlignment="Right"
+				   TextWrapping="WrapWholeWords"
+				   FontWeight="Bold">
+			Your weight on Jupiter:
+		</TextBlock>
+		<TextBlock Text="{x:Bind ViewModel.WeightOnPlanet(tb.Text), Mode=OneWay}"
+				   Grid.Row="2"
+				   Grid.Column="1"
+				   Grid.ColumnSpan="2" />
+		<Button Grid.Row="3"
+				HorizontalAlignment="Right"
+				Content="Display Planet Information"
+				Click="{x:Bind DisplayPlanetSync}" />
+		<TextBlock Grid.Row="3"
+				   Grid.Column="1"
+				   Text="{x:Bind GetResultOfAsyncMethod()}" />
+		<TextBlock Grid.Row="4"
+				   HorizontalAlignment="Right"
+				   FontWeight="Bold"
+				   TextWrapping="WrapWholeWords"
+				   Text="Approx Planet Density (KG/M3):" />
+		<TextBlock Grid.Row="4"
+				   Grid.Column="1"
+				   Text="{x:Bind ViewModel.CalculateDensity(ViewModel.Planet.Mass, ViewModel.Planet.Diameter)}" />
+	</Grid>
 </Page>

From 4352b9b182a00f00fa4033a1660b3dac01ab1124 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Soucy <ma.soucy@nventive.com>
Date: Wed, 23 Aug 2023 09:25:01 -0400
Subject: [PATCH 2/2] fix: WASM deadlock on AdvancedXBind sample

---
 UI/AdvancedXBind/AdvancedXBind.Shared/MainPage.xaml        | 7 ++++++-
 .../AdvancedXBind.Shared/ViewModel/PlanetViewModel.cs      | 7 +++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/UI/AdvancedXBind/AdvancedXBind.Shared/MainPage.xaml b/UI/AdvancedXBind/AdvancedXBind.Shared/MainPage.xaml
index 314f41449..fa95e8be2 100644
--- a/UI/AdvancedXBind/AdvancedXBind.Shared/MainPage.xaml
+++ b/UI/AdvancedXBind/AdvancedXBind.Shared/MainPage.xaml
@@ -5,9 +5,11 @@
 	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	  xmlns:sys="using:System"
+	  xmlns:wasm="http://uno.ui/wasm"
 	  xmlns:vm="using:AdvancedXBind.ViewModel"
-	  mc:Ignorable="d"
+	  mc:Ignorable="d wasm"
 	  Background="White">
+
 	<Page.Resources>
 		<converters:DoubleToStringConverter x:Key="DoubleToStringConverter" />
 	</Page.Resources>
@@ -53,9 +55,12 @@
 				   Grid.Row="2"
 				   Grid.Column="1"
 				   Grid.ColumnSpan="2" />
+
+		<!-- The button is disabled on WASM because of this issue: https://github.com/unoplatform/uno/issues/13370 -->
 		<Button Grid.Row="3"
 				HorizontalAlignment="Right"
 				Content="Display Planet Information"
+				wasm:IsEnabled="False"
 				Click="{x:Bind DisplayPlanetSync}" />
 		<TextBlock Grid.Row="3"
 				   Grid.Column="1"
diff --git a/UI/AdvancedXBind/AdvancedXBind.Shared/ViewModel/PlanetViewModel.cs b/UI/AdvancedXBind/AdvancedXBind.Shared/ViewModel/PlanetViewModel.cs
index 785cefe2f..e7fc1be01 100644
--- a/UI/AdvancedXBind/AdvancedXBind.Shared/ViewModel/PlanetViewModel.cs
+++ b/UI/AdvancedXBind/AdvancedXBind.Shared/ViewModel/PlanetViewModel.cs
@@ -75,8 +75,11 @@ public async Task<string> SimulateLongRunningMethodAsync()
         {
             DateTimeOffset now = DateTimeOffset.Now;
             Stopwatch sw = Stopwatch.StartNew();
-            await Task.Delay(50);
-            sw.Stop();
+			// We cannot use Delay on WASM because of this issue: https://github.com/unoplatform/uno/issues/13370
+#if !__WASM__
+			await Task.Delay(50);
+#endif
+			sw.Stop();
             return $"Started {now} Elapsed: {sw.Elapsed}";
         }
     }