PR feedback

Author: rynowak

src/Components/Components/src/Rendering/HtmlRenderer.cs

@@ -36,7 +36,7 @@ public HtmlRenderer(IServiceProvider serviceProvider, ILoggerFactory loggerFacto
             _htmlEncoder = htmlEncoder;
         }
 
-        public override Dispatcher Dispatcher { get; } = new RendererSynchronizationContextDispatcher();
+        public override Dispatcher Dispatcher { get; } = Dispatcher.CreateDefault();
 
         /// <inheritdoc />
         protected override Task UpdateDisplayAsync(in RenderBatch renderBatch)

src/Components/Components/src/Rendering/Renderer.cs

@@ -375,17 +375,16 @@ private int FindLatestEventHandlerIdInChain(int eventHandlerId)
 
         private void EnsureSynchronizationContext()
         {
-            // When the Dispatcher is a synchronization context
-            // Render operations are not thread-safe, so they need to be serialized.
+            // Render operations are not thread-safe, so they need to be serialized by the dispatcher.
             // Plus, any other logic that mutates state accessed during rendering also
             // needs not to run concurrently with rendering so should be dispatched to
             // the renderer's sync context.
             if (!Dispatcher.CheckAccess())
             {
                 throw new InvalidOperationException(
-                    "The current thread is not associated with the renderer's synchronization context. " +
-                    "Use Invoke() or InvokeAsync() to switch execution to the renderer's synchronization " +
-                    "context when triggering rendering or modifying any state accessed during rendering.");
+                    "The current thread is not associated with the Dispatcher. " +
+                    "Use Invoke() or InvokeAsync() to switch execution to the Dispatcher when " +
+                    "triggering rendering or modifying any state accessed during rendering.");
             }
         }
 

src/Components/Components/test/RenderTreeBuilderTest.cs

@@ -1797,10 +1797,9 @@ private class TestRenderer : Renderer
         {
             public TestRenderer() : base(new TestServiceProvider(), NullLoggerFactory.Instance)
             {
-                Dispatcher = new RendererSynchronizationContextDispatcher();
             }
 
-            public override Dispatcher Dispatcher { get; }
+            public override Dispatcher Dispatcher { get; } = Dispatcher.CreateDefault();
 
             protected override void HandleException(Exception exception)
                 => throw new NotImplementedException();

src/Components/Server/src/Circuits/CircuitHost.cs

@@ -94,11 +94,9 @@ public CircuitHost(
 
         public IServiceProvider Services { get; }
 
-        public Dispatcher Dispatcher { get; }
-
         public Task<ComponentRenderedText> PrerenderComponentAsync(Type componentType, ParameterCollection parameters)
         {
-            return Dispatcher.InvokeAsync(async () =>
+            return Renderer.Dispatcher.InvokeAsync(async () =>
             {
                 var result = await Renderer.RenderComponentAsync(componentType, parameters);
 

src/Components/Server/src/Circuits/CircuitRegistry.cs

@@ -90,7 +90,7 @@ public virtual Task DisconnectAsync(CircuitHost circuitHost, string connectionId
             {
                 if (DisconnectCore(circuitHost, connectionId))
                 {
-                    circuitHandlerTask = circuitHost.Dispatcher.InvokeAsync(() => circuitHost.OnConnectionDownAsync(default));
+                    circuitHandlerTask = circuitHost.Renderer.Dispatcher.InvokeAsync(() => circuitHost.OnConnectionDownAsync(default));
                 }
                 else
                 {
@@ -189,7 +189,7 @@ public virtual async Task<CircuitHost> ConnectAsync(string circuitId, IClientPro
 
                 // Dispatch the circuit handlers inside the sync context to ensure the order of execution. CircuitHost executes circuit handlers inside of
                 // 
-                circuitHandlerTask = circuitHost.Dispatcher.InvokeAsync(async () =>
+                circuitHandlerTask = circuitHost.Renderer.Dispatcher.InvokeAsync(async () =>
                 {
                     if (previouslyConnected)
                     {

src/Components/Server/test/Circuits/CircuitHostTest.cs

@@ -82,7 +82,7 @@ public async Task DisposeAsync_DisposesRendererWithinSynchronizationContext()
                 serviceScope.Object,
                 remoteRenderer);
 
-            var component = new DispatcherComponent(circuitHost.Dispatcher);
+            var component = new DispatcherComponent(circuitHost.Renderer.Dispatcher);
             circuitHost.Renderer.AssignRootComponentId(component);
             var original = SynchronizationContext.Current;
             SynchronizationContext.SetSynchronizationContext(null);

src/Components/Shared/test/TestRenderer.cs

@@ -25,7 +25,7 @@ public TestRenderer(Dispatcher dispatcher) : base(new TestServiceProvider(), Nul
 
         public TestRenderer(IServiceProvider serviceProvider) : base(serviceProvider, NullLoggerFactory.Instance)
         {
-            Dispatcher = new RendererSynchronizationContextDispatcher();
+            Dispatcher = Dispatcher.CreateDefault();
         }
 
         public override Dispatcher Dispatcher { get; }

src/Components/test/E2ETest/ServerExecutionTests/ServerComponentRenderingTest.cs

@@ -33,7 +33,7 @@ public void ThrowsIfRenderIsRequestedOutsideSyncContext()
             appElement.FindElement(By.Id("run-without-dispatch")).Click();
 
             Browser.Contains(
-                $"{typeof(InvalidOperationException).FullName}: The current thread is not associated with the renderer's synchronization context",
+                $"{typeof(InvalidOperationException).FullName}: The current thread is not associated with the Dispatcher. Use Invoke() or InvokeAsync() to switch execution to the Dispatcher when triggering rendering or modifying any state accessed during rendering.",
                 () => result.Text);
         }
     }

src/Components/test/Ignitor.Test/RenderBatchReaderTest.cs

@@ -339,7 +339,7 @@ public FakeRenderer()
             {
             }
 
-            public override Dispatcher Dispatcher { get; } = new RendererSynchronizationContextDispatcher();
+            public override Dispatcher Dispatcher { get; } = Dispatcher.CreateDefault();
 
             protected override void HandleException(Exception exception)
             {