Merge in 'release/8.0' changes

Author: dotnet-bot

src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Columns/ColumnBase.razor

@@ -19,7 +19,7 @@
         {
             @if (ColumnOptions is not null && (Align != Align.Right && Align != Align.End))
             {
-                <button class="col-options-button" type="button" @onclick="@(() => Grid.ShowColumnOptionsAsync(this))"></button>
+                <button class="col-options-button" type="button" title="Column options" @onclick="@(() => Grid.ShowColumnOptionsAsync(this))"></button>
             }
 
             if (Sortable.HasValue ? Sortable.Value : IsSortableByDefault())
@@ -38,7 +38,7 @@
 
             @if (ColumnOptions is not null && (Align == Align.Right || Align == Align.End))
             {
-                <button class="col-options-button" type="button" @onclick="@(() => Grid.ShowColumnOptionsAsync(this))"></button>
+                <button class="col-options-button" type="button" title="Column options" @onclick="@(() => Grid.ShowColumnOptionsAsync(this))"></button>
             }
         }
     }

src/Components/Server/src/Circuits/RemoteJSRuntime.cs

@@ -30,6 +30,8 @@ internal partial class RemoteJSRuntime : JSRuntime
 
     public bool IsInitialized => _clientProxy is not null;
 
+    internal bool IsPermanentlyDisconnected => _permanentlyDisconnected;
+
     /// <summary>
     /// Notifies when a runtime exception occurred.
     /// </summary>

src/Components/Server/src/Circuits/RemoteNavigationManager.cs

@@ -106,6 +106,12 @@ async Task PerformNavigationAsync()
                 }
 
                 await _jsRuntime.InvokeVoidAsync(Interop.NavigateTo, uri, options);
+                Log.NavigationCompleted(_logger, uri);
+            }
+            catch (TaskCanceledException)
+            when (_jsRuntime is RemoteJSRuntime remoteRuntime && remoteRuntime.IsPermanentlyDisconnected)
+            {
+                Log.NavigationStoppedSessionEnded(_logger, uri);
             }
             catch (Exception ex)
             {
@@ -190,5 +196,11 @@ public static void RequestingNavigation(ILogger logger, string uri, NavigationOp
 
         [LoggerMessage(5, LogLevel.Error, "Failed to refresh", EventName = "RefreshFailed")]
         public static partial void RefreshFailed(ILogger logger, Exception exception);
+
+        [LoggerMessage(6, LogLevel.Debug, "Navigation completed when changing the location to {Uri}", EventName = "NavigationCompleted")]
+        public static partial void NavigationCompleted(ILogger logger, string uri);
+
+        [LoggerMessage(7, LogLevel.Debug, "Navigation stopped because the session ended when navigating to {Uri}", EventName = "NavigationStoppedSessionEnded")]
+        public static partial void NavigationStoppedSessionEnded(ILogger logger, string uri);
     }
 }

src/Components/Web.JS/dist/Release/blazor.web.js

@@ -53,19 +53,24 @@ class BlazorStreamingUpdate extends HTMLElement {
               const isFormPost = node.getAttribute('from') === 'form-post';
               const isEnhancedNav = node.getAttribute('enhanced') === 'true';
               if (isEnhancedNav && isWithinBaseUriSpace(destinationUrl)) {
+                // At this point the destinationUrl might be an opaque URL so we don't know whether it's internal/external or
+                // whether it's even going to the same URL we're currently on. So we don't know how to update the history.
+                // Defer that until the redirection is resolved by performEnhancedPageLoad.
+                const treatAsRedirectionFromMethod = isFormPost ? 'post' : 'get';
+                const fetchOptions = undefined;
+                performEnhancedPageLoad(destinationUrl, /* interceptedLink */ false, fetchOptions, treatAsRedirectionFromMethod);
+              } else {
                 if (isFormPost) {
                   // The URL is not yet updated. Push a whole new entry so that 'back' goes back to the pre-redirection location.
-                  history.pushState(null, '', destinationUrl);
+                  // WARNING: The following check to avoid duplicating history entries won't work if the redirection is to an opaque URL.
+                  // We could change the server-side logic to return URLs in plaintext if they match the current request URL already,
+                  // but it's arguably easier to understand that history non-duplication only works for enhanced nav, which is also the
+                  // case for non-streaming responses.
+                  if (destinationUrl !== location.href) {
+                    location.assign(destinationUrl);
+                  }
                 } else {
                   // The URL was already updated on the original link click. Replace so that 'back' goes to the pre-redirection location.
-                  history.replaceState(null, '', destinationUrl);
-                }
-                performEnhancedPageLoad(destinationUrl, /* interceptedLink */ false);
-              } else {
-                // Same reason for varying as above
-                if (isFormPost) {
-                  location.assign(destinationUrl);
-                } else {
                   location.replace(destinationUrl);
                 }
               }

src/Components/Web.JS/src/Rendering/StreamingRendering.ts

@@ -132,10 +132,10 @@ function onDocumentSubmit(event: SubmitEvent) {
 
     event.preventDefault();
 
-    const url = new URL(event.submitter?.getAttribute('formaction') || formElem.action, document.baseURI); 
-    const fetchOptions: RequestInit = { method: method}; 
+    const url = new URL(event.submitter?.getAttribute('formaction') || formElem.action, document.baseURI);
+    const fetchOptions: RequestInit = { method: method};
     const formData = new FormData(formElem);
-   
+
     const submitterName = event.submitter?.getAttribute('name');
     const submitterValue = event.submitter!.getAttribute('value');
     if (submitterName && submitterValue) {
@@ -153,8 +153,8 @@ function onDocumentSubmit(event: SubmitEvent) {
     } else {
       // Setting request body and content-type header depending on enctype
       const enctype = event.submitter?.getAttribute('formenctype') || formElem.enctype;
-      if (enctype === 'multipart/form-data') { 
-        // Content-Type header will be set to 'multipart/form-data' 
+      if (enctype === 'multipart/form-data') {
+        // Content-Type header will be set to 'multipart/form-data'
         fetchOptions.body = formData;
       } else {
         fetchOptions.body = urlSearchParams;
@@ -170,7 +170,7 @@ function onDocumentSubmit(event: SubmitEvent) {
   }
 }
 
-export async function performEnhancedPageLoad(internalDestinationHref: string, interceptedLink: boolean, fetchOptions?: RequestInit) {
+export async function performEnhancedPageLoad(internalDestinationHref: string, interceptedLink: boolean, fetchOptions?: RequestInit, treatAsRedirectionFromMethod?: 'get' | 'post') {
   performingEnhancedPageLoad = true;
 
   // First, stop any preceding enhanced page load
@@ -232,8 +232,9 @@ export async function performEnhancedPageLoad(internalDestinationHref: string, i
       // For 301/302/etc redirections to internal URLs, the browser will already have followed the chain of redirections
       // to the end, and given us the final content. We do still need to update the current URL to match the final location,
       // then let the rest of enhanced nav logic run to patch the new content into the DOM.
-      if (response.redirected) {
-        if (isGetRequest) {
+      if (response.redirected || treatAsRedirectionFromMethod) {
+        const treatAsGet = treatAsRedirectionFromMethod ? (treatAsRedirectionFromMethod === 'get') : isGetRequest;
+        if (treatAsGet) {
           // For gets, the intermediate (redirecting) URL is already in the address bar, so we have to use 'replace'
           // so that 'back' would go to the page before the redirection
           history.replaceState(null, '', response.url);

src/Components/Web.JS/src/Services/NavigationEnhancement.ts

@@ -0,0 +1,9 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Components;
+
+internal interface IInputRadioValueProvider
+{
+    public object? CurrentValue { get; }
+}

src/Components/Web/src/Forms/IInputRadioValueProvider.cs

@@ -8,21 +8,19 @@ namespace Microsoft.AspNetCore.Components.Forms;
 /// </summary>
 internal sealed class InputRadioContext
 {
+    private readonly IInputRadioValueProvider _valueProvider;
+
     public InputRadioContext? ParentContext { get; }
     public EventCallback<ChangeEventArgs> ChangeEventCallback { get; }
+    public object? CurrentValue => _valueProvider.CurrentValue;
 
     // Mutable properties that may change any time an InputRadioGroup is rendered
     public string? GroupName { get; set; }
-    public object? CurrentValue { get; set; }
     public string? FieldClass { get; set; }
 
-    /// <summary>
-    /// Instantiates a new <see cref="InputRadioContext" />.
-    /// </summary>
-    /// <param name="parentContext">The parent context, if any.</param>
-    /// <param name="changeEventCallback">The event callback to be invoked when the selected value is changed.</param>
-    public InputRadioContext(InputRadioContext? parentContext, EventCallback<ChangeEventArgs> changeEventCallback)
+    public InputRadioContext(IInputRadioValueProvider valueProvider, InputRadioContext? parentContext, EventCallback<ChangeEventArgs> changeEventCallback)
     {
+        _valueProvider = valueProvider;
         ParentContext = parentContext;
         ChangeEventCallback = changeEventCallback;
     }

src/Components/Web/src/Forms/InputRadioContext.cs

@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Components.Forms;
 /// <summary>
 /// Groups child <see cref="InputRadio{TValue}"/> components.
 /// </summary>
-public class InputRadioGroup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TValue> : InputBase<TValue>
+public class InputRadioGroup<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] TValue> : InputBase<TValue>, IInputRadioValueProvider
 {
     private readonly string _defaultGroupName = Guid.NewGuid().ToString("N");
     private InputRadioContext? _context;
@@ -27,14 +27,16 @@ public class InputRadioGroup<[DynamicallyAccessedMembers(DynamicallyAccessedMemb
 
     [CascadingParameter] private InputRadioContext? CascadedContext { get; set; }
 
+    object? IInputRadioValueProvider.CurrentValue => CurrentValue;
+
     /// <inheritdoc />
     protected override void OnParametersSet()
     {
         // On the first render, we can instantiate the InputRadioContext
         if (_context is null)
         {
             var changeEventCallback = EventCallback.Factory.CreateBinder<string?>(this, __value => CurrentValueAsString = __value, CurrentValueAsString);
-            _context = new InputRadioContext(CascadedContext, changeEventCallback);
+            _context = new InputRadioContext(this, CascadedContext, changeEventCallback);
         }
         else if (_context.ParentContext != CascadedContext)
         {
@@ -59,7 +61,7 @@ protected override void OnParametersSet()
             // Otherwise, just use a GUID to disambiguate this group's radio inputs from any others on the page.
             _context.GroupName = _defaultGroupName;
         }
-        _context.CurrentValue = CurrentValue;
+
         _context.FieldClass = EditContext?.FieldCssClass(FieldIdentifier);
     }
 

src/Components/Web/src/Forms/InputRadioGroup.cs

@@ -35,6 +35,8 @@
 
   <ItemGroup>
     <None Include="buildTransitive\Microsoft.AspNetCore.Components.WebView.props" Pack="true" PackagePath="%(Identity)" />
+    <None Include="buildMultiTargeting\Microsoft.AspNetCore.Components.WebView.props" Pack="true" PackagePath="%(Identity)" />
+    <None Include="build\Microsoft.AspNetCore.Components.WebView.props" Pack="true" PackagePath="%(Identity)" />
   </ItemGroup>
 
   <ItemGroup>

src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj

@@ -1466,6 +1466,8 @@ public void SubmitButtonFormenctypeAttributeOverridesEnhancedFormEnctype()
     [Fact]
     public void EnhancedFormThatCallsNavigationManagerRefreshDoesNotPushHistoryEntry()
     {
+        GoTo("about:blank");
+
         var startUrl = Browser.Url;
         GoTo("forms/form-that-calls-navigation-manager-refresh");
         var guid = Browser.Exists(By.Id("guid")).Text;
@@ -1482,6 +1484,30 @@ public void EnhancedFormThatCallsNavigationManagerRefreshDoesNotPushHistoryEntry
         Browser.Navigate().Back();
         Browser.Equal(startUrl, () => Browser.Url);
     }
+    
+    [Fact]
+    public void EnhancedFormThatCallsNavigationManagerRefreshDoesNotPushHistoryEntry_Streaming()
+    {
+        GoTo("about:blank");
+
+        var startUrl = Browser.Url;
+        GoTo("forms/form-that-calls-navigation-manager-refresh-streaming");
+
+        // Submit the form
+        Browser.FindElement(By.Id("some-text")).SendKeys("test string");
+        Browser.Equal("test string", () => Browser.FindElement(By.Id("some-text")).GetAttribute("value"));
+        Browser.Exists(By.Id("submit-button")).Click();
+
+        // Wait for the async/streaming process to complete. We know this happened
+        // if the loading indicator says we're done, and the textbox was cleared
+        // due to the refresh
+        Browser.Equal("False", () => Browser.FindElement(By.Id("loading-indicator")).Text);
+        Browser.Equal("", () => Browser.FindElement(By.Id("some-text")).GetAttribute("value"));
+
+        // Checking that the history entry was not pushed
+        Browser.Navigate().Back();
+        Browser.Equal(startUrl, () => Browser.Url);
+    }
 
     // Can't just use GetAttribute or GetDomAttribute because they both auto-resolve it
     // to an absolute URL. We want to be able to assert about the attribute's literal value.

src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs

@@ -844,6 +844,30 @@ public void InputRadioGroupWorksWithMutatingSetter()
         Browser.Equal("False", () => tuesday.GetDomProperty("checked"));
     }
 
+    [Theory]
+    [InlineData(0)]
+    [InlineData(2)]
+    public void InputRadioGroupWorksWithParentImplementingIHandleEvent(int n)
+    {
+        Browser.Url = new UriBuilder(Browser.Url) { Query = ($"?n={n}") }.ToString();
+        var appElement = Browser.MountTestComponent<InputRadioParentImplementsIHandleEvent>();
+        var zero = appElement.FindElement(By.Id("inputradiogroup-parent-ihandle-event-0"));
+        var one = appElement.FindElement(By.Id("inputradiogroup-parent-ihandle-event-1"));
+
+        Browser.Equal(n == 0 ? "True" : "False", () => zero.GetDomProperty("checked"));
+        Browser.Equal("False", () => one.GetDomProperty("checked"));
+
+        // Observe the changes after a click
+        one.Click();
+        Browser.Equal("False", () => zero.GetDomProperty("checked"));
+        Browser.Equal("True", () => one.GetDomProperty("checked"));
+
+        // Ensure other options can be selected
+        zero.Click();
+        Browser.Equal("False", () => one.GetDomProperty("checked"));
+        Browser.Equal("True", () => zero.GetDomProperty("checked"));
+    }
+
     [Fact]
     public void InputSelectWorksWithMutatingSetter()
     {

src/Components/test/E2ETest/Tests/FormsTest.cs

@@ -0,0 +1,14 @@
+@using Microsoft.AspNetCore.Components.Forms
+@implements IHandleEvent
+
+<InputRadioGroup @bind-Value="N">
+  <InputRadio id="inputradiogroup-parent-ihandle-event-0" Value="0" />
+  <InputRadio id="inputradiogroup-parent-ihandle-event-1" Value="1" />
+</InputRadioGroup>
+
+@code {
+
+  [SupplyParameterFromQuery(Name = "n")] int? N { get; set; }
+
+  Task IHandleEvent.HandleEventAsync(EventCallbackWorkItem callback, object arg) => callback.InvokeAsync(arg);
+}

src/Components/test/testassets/BasicTestApp/FormsTest/InputRadioParentImplementsIHandleEvent.razor

@@ -49,6 +49,7 @@
         <option value="BasicTestApp.FormsTest.InputRangeComponent">Input range</option>
         <option value="BasicTestApp.FormsTest.InputsWithoutEditForm">Inputs without EditForm</option>
         <option value="BasicTestApp.FormsTest.InputsWithMutatingSetters">Inputs with mutating setters</option>
+        <option value="BasicTestApp.FormsTest.InputRadioParentImplementsIHandleEvent">Input Radio Parent Implements IHandleEvent</option>
         <option value="BasicTestApp.NavigateOnSubmit">Navigate to submit</option>
         <option value="BasicTestApp.GlobalizationBindCases">Globalization Bind Cases</option>
         <option value="BasicTestApp.GracefulTermination">Graceful Termination</option>

src/Components/test/testassets/BasicTestApp/Index.razor

@@ -0,0 +1,41 @@
+@page "/forms/form-that-calls-navigation-manager-refresh-streaming"
+@using Microsoft.AspNetCore.Components.Forms
+@attribute [StreamRendering]
+@inject NavigationManager Nav
+
+<h3>Form That Calls NavigationManager.Refresh() with streaming</h3>
+
+<form data-enhance @onsubmit="@RefreshAfterDelayAsync" @formname="form-refresh" method="post">
+    <AntiforgeryToken />
+    <input id="some-text" name="SomeText" value="@SomeText" />
+    <button id="submit-button">Submit</button>
+</form>
+
+<p>Loading: <span id="loading-indicator">@loading</span></p>
+
+@if (missingText)
+{
+    <p>Enter some text, so you can see it go back to blank after the refresh happened.</p>
+}
+
+@code {
+    [SupplyParameterFromForm]
+    public string SomeText { get; set; }
+
+    bool loading;
+    bool missingText;
+
+    async Task RefreshAfterDelayAsync()
+    {
+        if (string.IsNullOrEmpty(SomeText))
+        {
+            missingText = true;
+        }
+        else
+        {
+            loading = true;
+            await Task.Delay(1000);
+            Nav.Refresh();
+        }
+    }
+}