Tmp

Author: javiercn

src/Components/Samples/BlazorUnitedApp.Client/Data/WeatherForecast.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace BlazorUnitedApp.Client.Data;
+
+public class ClientWeatherForecast
+{
+    public DateOnly Date { get; set; }
+
+    public int TemperatureC { get; set; }
+
+    public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
+
+    public string? Summary { get; set; }
+}

src/Components/Samples/BlazorUnitedApp.Client/Data/WeatherForecastService.cs

@@ -0,0 +1,23 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace BlazorUnitedApp.Client.Data;
+
+public class ClientWeatherForecastService
+{
+    private static readonly string[] Summaries = new[]
+    {
+        "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
+    };
+
+    public async Task<ClientWeatherForecast[]> GetForecastAsync(DateOnly startDate)
+    {
+        await Task.Yield();
+        return await Task.FromResult(Enumerable.Range(1, 5).Select(index => new ClientWeatherForecast
+        {
+            Date = startDate.AddDays(index),
+            TemperatureC = Random.Shared.Next(-20, 55),
+            Summary = Summaries[Random.Shared.Next(Summaries.Length)]
+        }).ToArray());
+    }
+}

src/Components/Samples/BlazorUnitedApp.Client/Pages/ClientFetchData.razor

@@ -0,0 +1,81 @@
+@page "/clientfetchdata/"
+@using BlazorUnitedApp.Client.Data
+@using Microsoft.AspNetCore.Components.Web
+@inject ClientWeatherForecastService ForecastService
+@inject NavigationManager NavigationManager
+@rendermode Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveWebAssembly
+
+<PageTitle>Weather forecast</PageTitle>
+
+<h1>Weather forecast</h1>
+
+<p>This component demonstrates fetching data from a service.</p>
+
+@if (Forecasts == null)
+{
+    <p><em>Loading...</em></p>
+}
+else
+{
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Date</th>
+                <th>Temp. (C)</th>
+                <th>Temp. (F)</th>
+                <th>Summary</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var forecast in Forecasts)
+            {
+                <tr>
+                    <td>@forecast.Date.ToShortDateString()</td>
+                    <td>@forecast.TemperatureC</td>
+                    <td>@forecast.TemperatureF</td>
+                    <td>@forecast.Summary</td>
+                </tr>
+            }
+        </tbody>
+    </table>
+}
+
+<p>Current Url = @Page</p>
+
+<ul>
+    <li>
+        <a href="clientfetchdata/?page=0">Page 0</a>
+    </li>
+    <li>
+        <a href="clientfetchdata/?page=1">Page 1</a>
+    </li>
+    <li>
+        <a href="clientfetchdata/?page=2">Page 2</a>
+    </li>
+</ul>
+
+@code {
+    [PersistentState]
+    [UpdateStateOnEnhancedNavigation(true)]
+    public ClientWeatherForecast[]? Forecasts { get; set; }
+
+    public string Page { get; set; } = "";
+
+    protected override async Task OnInitializedAsync()
+    {
+        // Extract the page from the query string
+        var uri = NavigationManager.ToAbsoluteUri(NavigationManager.Uri);
+        var pageParam = uri.Query.Split('&')
+            .Select(q => q.Split('='))
+            .FirstOrDefault(q => q.Length == 2 && q[0] == "page")?[1];
+        int pageIndex = 1 + (int.TryParse(pageParam, out int parsedPage) ? parsedPage : 0);
+        pageIndex *= 7;
+
+        Forecasts ??= await ForecastService.GetForecastAsync(DateOnly.FromDateTime(DateTime.Now).AddDays(pageIndex));
+    }
+
+    protected override void OnParametersSet()
+    {
+        Page = NavigationManager.Uri;
+    }
+}

src/Components/Samples/BlazorUnitedApp.Client/Program.cs

@@ -1,8 +1,12 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using BlazorUnitedApp.Client.Data;
+using BlazorUnitedApp.Client.Pages;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
+builder.Services.AddSingleton<ClientWeatherForecastService>();
+
 await builder.Build().RunAsync();

src/Components/Samples/BlazorUnitedApp/Program.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using BlazorUnitedApp;
+using BlazorUnitedApp.Client.Data;
 using BlazorUnitedApp.Data;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -12,6 +13,7 @@
     .AddInteractiveServerComponents();
 
 builder.Services.AddSingleton<WeatherForecastService>();
+builder.Services.AddSingleton<ClientWeatherForecastService>();
 
 var app = builder.Build();
 
@@ -30,6 +32,7 @@
 
 app.MapStaticAssets();
 app.MapRazorComponents<App>()
+    .AddAdditionalAssemblies(typeof(BlazorUnitedApp.Client.Pages.ClientFetchData).Assembly)
     .AddInteractiveServerRenderMode()
     .AddInteractiveWebAssemblyRenderMode();
 

src/Components/Samples/BlazorUnitedApp/Routes.razor

@@ -1,4 +1,4 @@
-<Router AppAssembly="@typeof(App).Assembly">
+<Router AppAssembly="@typeof(App).Assembly" AdditionalAssemblies="[typeof(BlazorUnitedApp.Client.Pages.ClientFetchData).Assembly]">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
         <FocusOnNavigate RouteData="@routeData" Selector="h1" />

src/Components/Samples/BlazorUnitedApp/Shared/NavMenu.razor

@@ -29,6 +29,11 @@
                 <span class="bi bi-list-nested" aria-hidden="true"></span> Web assembly
             </NavLink>
         </div>
+        <div class="nav-item px-3">
+            <NavLink class="nav-link" href="clientfetchdata">
+                <span class="bi bi-list-nested" aria-hidden="true"></span> Client Fetch Data
+            </NavLink>
+        </div>
     </nav>
 </div>
 

src/Components/WebAssembly/WebAssembly/src/Rendering/WebAssemblyRenderer.cs

@@ -1,9 +1,11 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices.JavaScript;
+using Microsoft.AspNetCore.Components.Infrastructure;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Web;
@@ -26,13 +28,15 @@ internal sealed partial class WebAssemblyRenderer : WebRenderer
     private readonly Dispatcher _dispatcher;
     private readonly ResourceAssetCollection _resourceCollection;
     private readonly IInternalJSImportMethods _jsMethods;
+    private readonly ComponentStatePersistenceManager _componentStatePersistenceManager;
     private static readonly RendererInfo _componentPlatform = new("WebAssembly", isInteractive: true);
 
     public WebAssemblyRenderer(IServiceProvider serviceProvider, ResourceAssetCollection resourceCollection, ILoggerFactory loggerFactory, JSComponentInterop jsComponentInterop)
         : base(serviceProvider, loggerFactory, DefaultWebAssemblyJSRuntime.Instance.ReadJsonSerializerOptions(), jsComponentInterop)
     {
         _logger = loggerFactory.CreateLogger<WebAssemblyRenderer>();
         _jsMethods = serviceProvider.GetRequiredService<IInternalJSImportMethods>();
+        _componentStatePersistenceManager = serviceProvider.GetRequiredService<ComponentStatePersistenceManager>();
 
         // if SynchronizationContext.Current is null, it means we are on the single-threaded runtime
         _dispatcher = WebAssemblyDispatcher._mainSynchronizationContext == null
@@ -46,9 +50,13 @@ public WebAssemblyRenderer(IServiceProvider serviceProvider, ResourceAssetCollec
     }
 
     [UnconditionalSuppressMessage("Trimming", "IL2072", Justification = "These are root components which belong to the user and are in assemblies that don't get trimmed.")]
-    private void OnUpdateRootComponents(RootComponentOperationBatch batch)
+    private void OnUpdateRootComponents(RootComponentOperationBatch batch, string appState)
     {
         var webRootComponentManager = GetOrCreateWebRootComponentManager();
+
+        var store = new PrerenderComponentApplicationStore(appState);
+        _ = _componentStatePersistenceManager.RestoreStateAsync(store, WebPersistenceScenario.EnhancedNavigation);
+
         for (var i = 0; i < batch.Operations.Length; i++)
         {
             var operation = batch.Operations[i];
@@ -74,6 +82,8 @@ private void OnUpdateRootComponents(RootComponentOperationBatch batch)
             }
         }
 
+        store.ExistingState.Clear();
+
         NotifyEndUpdateRootComponents(batch.BatchId);
     }
 

src/Components/WebAssembly/WebAssembly/src/Services/DefaultWebAssemblyJSRuntime.cs

@@ -24,7 +24,7 @@ internal sealed partial class DefaultWebAssemblyJSRuntime : WebAssemblyJSRuntime
 
     public ElementReferenceContext ElementReferenceContext { get; }
 
-    public event Action<RootComponentOperationBatch>? OnUpdateRootComponents;
+    public event Action<RootComponentOperationBatch, string>? OnUpdateRootComponents;
 
     [DynamicDependency(nameof(InvokeDotNet))]
     [DynamicDependency(nameof(EndInvokeJS))]
@@ -94,12 +94,12 @@ public static void BeginInvokeDotNet(string? callId, string assemblyNameOrDotNet
 
     [SupportedOSPlatform("browser")]
     [JSExport]
-    public static void UpdateRootComponentsCore(string operationsJson)
+    public static void UpdateRootComponentsCore(string operationsJson, string appState)
     {
         try
         {
             var operations = DeserializeOperations(operationsJson);
-            Instance.OnUpdateRootComponents?.Invoke(operations);
+            Instance.OnUpdateRootComponents?.Invoke(operations, appState);
         }
         catch (Exception ex)
         {