fix(hrui): Fix double flicker + double notif on wasm

jeromelaban · Jul 15, 2024 · 3590121 · 3590121
1 parent a29c5ea
commit 3590121
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/Uno.UI.RemoteControl/HotReload/ClientHotReloadProcessor.MetadataUpdate.cs b/src/Uno.UI.RemoteControl/HotReload/ClientHotReloadProcessor.MetadataUpdate.cs
@@ -433,7 +433,7 @@ public static void ForceHotReloadUpdate()
 		try
 		{
 			Instance?._status.ConfigureSourceForNextOperation(HotReloadSource.Manual);
-			UpdateApplication(Array.Empty<Type>());
+			UpdateApplicationCore([]);
 		}
 		finally
 		{
@@ -446,6 +446,18 @@ public static void ForceHotReloadUpdate()
 	/// </summary>
 	[EditorBrowsable(EditorBrowsableState.Never)]
 	public static void UpdateApplication(Type[] types)
+	{
+		if (types is { Length: >0 })
+		{
+			UpdateApplicationCore(types);
+		}
+		else
+		{
+			_log.Trace("Invalid metadata update, ignore it."); // Avoid flicker on WASM
+		}
+	}
+
+	private static void UpdateApplicationCore(Type[] types)
 	{
 		var hr = Instance?._status.ReportLocalStarting(types);
 

diff --git a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Wasm.csproj b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Wasm.csproj
@@ -77,7 +77,7 @@
 
 		<PropertyGroup>
 			<_OverrideTargetFramework>$(TargetFramework)</_OverrideTargetFramework>
-			<_TargetNugetFolder>$(NuGetPackageRoot)\$(PackageId.ToLowerInvariant())\$(UnoNugetOverrideVersion)\uno-runtime\$(UnoRuntimeIdentifier.ToLowerInvariant())</_TargetNugetFolder>
+			<_TargetNugetFolder>$(NuGetPackageRoot)\$(PackageId.ToLowerInvariant())\$(UnoNugetOverrideVersion)\uno-runtime\$(TargetFramework)\$(UnoRuntimeIdentifier.ToLowerInvariant())</_TargetNugetFolder>
 		</PropertyGroup>
 		<ItemGroup>
 			<_OutputFiles Include="$(TargetDir)**" />

diff --git a/src/Uno.UI/WasmCSS/Uno.UI.css b/src/Uno.UI/WasmCSS/Uno.UI.css
@@ -277,3 +277,8 @@ input::-ms-clear {
   background: var(--selection-background);
   color: var(--selection-color);
 }
+
+/* Uno has it's own HR indicator, hide default indicator from dotnet. */
+#dotnet-hotreload-toast {
+  visibility: collapse
+}