[RC1] Enhanced nav with persistent component state (#36139)

Author: guardrex

aspnetcore/blazor/call-web-api.md

@@ -623,24 +623,20 @@ For more information, see the [Client-side services fail to resolve during prere
 
 When prerendering, components render twice: first statically, then interactively. State doesn't automatically flow from the prerendered component to the interactive one. If a component performs asynchronous initialization operations and renders different content for different states during initialization, such as a "Loading..." progress indicator, you may see a flicker when the component renders twice.
 
-You can address this by flowing prerendered state using the Persistent Component State API, which the `BlazorWebAppCallWebApi` and `BlazorWebAppCallWebApi_Weather` [sample apps](#sample-apps) demonstrate. When the component renders interactively, it can render the same way using the same state. However, the API doesn't currently work with enhanced navigation, which you can work around by disabling enhanced navigation on links to the page (`data-enhanced-nav=false`). For more information, see the following resources:
-
-<!-- UPDATE 10.0 The enhanced nav update is in for Preview 7. 
-                 The preceding paragraph will be updated/
-                 versioned on the upcoming docs Preview 7 PR. 
-                 I'll go ahead and remove the PU issue 
-                 cross-link on PR #35873.
-            
-                 Note that the README of the "weather" call web API
-                 sample has a cross-link and remark on this, and the
-                 sample app disabled enhanced nav on the weather
-                 component link. -->
+You can address this by flowing prerendered state using the Persistent Component State API, which the `BlazorWebAppCallWebApi` and `BlazorWebAppCallWebApi_Weather` [sample apps](#sample-apps) demonstrate. When the component renders interactively, it can render the same way using the same state. For more information, see the following resources:
 
 * <xref:blazor/state-management/prerendered-state-persistence>
 * <xref:blazor/fundamentals/routing#enhanced-navigation-and-form-handling>
 
 :::moniker-end
 
+:::moniker range="< aspnetcore-10.0"
+
+> [!NOTE]
+> The Persistent Component State API only supports enhanced navigation in .NET 10 or later. For apps that target .NET 8 or .NET 9, you can disable enhanced navigation on links to the page with the `data-enhance-nav` attribute set to `false`. For more information, see <xref:blazor/fundamentals/routing#enhanced-navigation-and-form-handling>.
+
+:::moniker-end
+
 :::moniker range=">= aspnetcore-9.0"
 
 ## Client-side request streaming

aspnetcore/blazor/fundamentals/routing.md

@@ -1072,7 +1072,7 @@ Enhanced navigation is available when:
 
 * The Blazor Web App script (`blazor.web.js`) is used, not the Blazor Server script (`blazor.server.js`) or Blazor WebAssembly script (`blazor.webassembly.js`).
 * The feature isn't [explicitly disabled](xref:blazor/fundamentals/startup#disable-enhanced-navigation-and-form-handling).
-* The destination URL is within the internal base URI space (the app's base path).
+* The destination URL is within the internal base URI space (the app's base path) and the link to the page doesn't have the `data-enhance-nav` attribute set to `false`.
 
 If server-side routing and enhanced navigation are enabled, [location changing handlers](#location-changes) are only invoked for programmatic navigation initiated from an interactive runtime. In future releases, additional types of navigation, such as following a link, may also invoke location changing handlers.
 

aspnetcore/blazor/state-management/server.md

@@ -57,17 +57,7 @@ During server-side rendering, Blazor Web Apps can persist a user's session (circ
 * Mobile device users switching apps
 * Network interruptions
 * Proactive resource management (pausing inactive circuits)
-
-<!-- UPDATE 10.0 - Arriving for RC1 ...
-
-                   Guidance changes for persistent component state with enhanced nav
-                   will be on the upcoming docs PR for RC1.
-
-                   API review for support persistent component state on enhanced navigation
-                   https://github.com/dotnet/aspnetcore/issues/62773
-                   -->
-
-*[Enhanced navigation](xref:blazor/fundamentals/routing#enhanced-navigation-and-form-handling) with circuit state persistence isn't currently supported but planned for a future release.*
+* [Enhanced navigation](xref:blazor/fundamentals/routing#enhanced-navigation-and-form-handling)
 
 Server resources can be freed up if the circuit state can be persisted and then resumed later:
 

aspnetcore/release-notes/aspnetcore-10/includes/blazor.md

@@ -633,8 +633,7 @@ During server-side rendering, Blazor Web Apps can now persist a user's session (
 * Mobile device users switching apps
 * Network interruptions
 * Proactive resource management (pausing inactive circuits)
-
-*[Enhanced navigation](xref:blazor/fundamentals/routing?view=aspnetcore-10.0#enhanced-navigation-and-form-handling) with circuit state persistence isn't currently supported but planned for a future release.*
+* [Enhanced navigation](xref:blazor/fundamentals/routing?view=aspnetcore-10.0#enhanced-navigation-and-form-handling)
 
 For more information, see <xref:blazor/state-management/server?view=aspnetcore-10.0#circuit-state-and-prerendering-state-preservation>.