More changes per PR

Author: pranavkm

src/Components/Browser.JS/src/Platform/Circuits/DefaultReconnectDisplay.ts

@@ -8,7 +8,23 @@ export class DefaultReconnectDisplay implements ReconnectDisplay {
   constructor(private document: Document) {
     this.modal = this.document.createElement('div');
     this.modal.id = AutoReconnectCircuitHandler.DialogId;
-    this.modal.style.cssText = 'position:fixed;top:0;right:0;bottom:0;left:0;z-index:1000;display:none;overflow:hidden;background-color:#fff;opacity:0.8;text-align:center;font-weight:bold';
+
+    const modalStyles = [
+      "position: fixed",
+      "top: 0",
+      "right: 0",
+      "bottom: 0",
+      "left: 0",
+      "z-index: 1000",
+      "display: none",
+      "overflow: hidden",
+      "background-color: #fff",
+      "opacity: 0.8",
+      "text-align: center",
+      "font-weight: bold"
+    ];
+
+    this.modal.style.cssText = modalStyles.join(';');
     this.modal.innerHTML = '<h5 style="margin-top: 20px"></h5><button style="margin:5px auto 5px">Retry?</button>';
     this.message = this.modal.querySelector('h5')!;
     this.button = this.modal.querySelector('button')!;

src/Components/Browser.JS/src/tsconfig.json

@@ -1,6 +1,3 @@
 {
-    "extends": "../tsconfig.base.json",
-    "include": [
-        "./**/*"
-    ]
+    "extends": "../tsconfig.base.json"
 }

src/Components/Browser.JS/tests/tsconfig.json

@@ -1,8 +1,3 @@
 {
-  "extends": "../tsconfig.base.json",
-  "include": ["./**/*"],
-  "compilerOptions": {
-    "noUnusedLocals": false,
-    "noUnusedParameters": false
-  }
+  "extends": "../tsconfig.base.json"
 }

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

@@ -19,6 +19,7 @@ public abstract class Renderer : IDisposable
         private readonly ComponentFactory _componentFactory;
         private readonly Dictionary<int, ComponentState> _componentStateById = new Dictionary<int, ComponentState>();
         private readonly Dictionary<int, EventCallback> _eventBindings = new Dictionary<int, EventCallback>();
+        private IDispatcher _dispatcher { get; }
 
         private int _nextComponentId = 0; // TODO: change to 'long' when Mono .NET->JS interop supports it
         private bool _isBatchInProgress;
@@ -32,15 +33,15 @@ public event UnhandledExceptionEventHandler UnhandledSynchronizationException
         {
             add
             {
-                if (!(Dispatcher is RendererSynchronizationContext rendererSynchronizationContext))
+                if (!(_dispatcher is RendererSynchronizationContext rendererSynchronizationContext))
                 {
                     return;
                 }
                 rendererSynchronizationContext.UnhandledException += value;
             }
             remove
             {
-                if (!(Dispatcher is RendererSynchronizationContext rendererSynchronizationContext))
+                if (!(_dispatcher is RendererSynchronizationContext rendererSynchronizationContext))
                 {
                     return;
                 }
@@ -64,25 +65,11 @@ public Renderer(IServiceProvider serviceProvider)
         /// <param name="dispatcher">The <see cref="IDispatcher"/> to be for invoking user actions into the <see cref="Renderer"/> context.</param>
         public Renderer(IServiceProvider serviceProvider, IDispatcher dispatcher) : this(serviceProvider)
         {
-            Dispatcher = dispatcher;
+            _dispatcher = dispatcher;
         }
 
-        /// <summary>
-        /// Gets the <see cref="IDispatcher"/>
-        /// </summary>
-        protected IDispatcher Dispatcher { get; }
-
         internal RenderBatchBuilder RenderBatchBuilder { get; } = new RenderBatchBuilder();
 
-        /// <summary>
-        /// Gets a property that determines if this instance of <see cref="Renderer"/> can render a batch.
-        /// 
-        /// <para>
-        /// Derivied types can use this property to force queuing up renders for a batch.
-        /// </para>
-        /// </summary>
-        protected virtual bool CanRenderBatch { get; } = true;
-
         /// <summary>
         /// Creates an <see cref="IDispatcher"/> that can be used with one or more <see cref="Renderer"/>.
         /// </summary>
@@ -103,7 +90,8 @@ protected IComponent InstantiateComponent(Type componentType)
         /// </summary>
         /// <param name="component">The component.</param>
         /// <returns>The component's assigned identifier.</returns>
-        protected int AssignRootComponentId(IComponent component)
+        // Internal for unit testing
+        protected internal int AssignRootComponentId(IComponent component)
             => AttachAndInitComponent(component, -1).ComponentId;
 
         /// <summary>
@@ -262,13 +250,13 @@ public Task DispatchEventAsync(int eventHandlerId, UIEventArgs eventArgs)
         public virtual Task Invoke(Action workItem)
         {
             // This is for example when we run on a system with a single thread, like WebAssembly.
-            if (Dispatcher == null)
+            if (_dispatcher == null)
             {
                 workItem();
                 return Task.CompletedTask;
             }
 
-            if (SynchronizationContext.Current == Dispatcher)
+            if (SynchronizationContext.Current == _dispatcher)
             {
                 // This is an optimization for when the dispatcher is also a syncronization context, like in the default case.
                 // No need to dispatch. Avoid deadlock by invoking directly.
@@ -277,7 +265,7 @@ public virtual Task Invoke(Action workItem)
             }
             else
             {
-                return Dispatcher.Invoke(workItem);
+                return _dispatcher.Invoke(workItem);
             }
         }
 
@@ -289,20 +277,20 @@ public virtual Task Invoke(Action workItem)
         public virtual Task InvokeAsync(Func<Task> workItem)
         {
             // This is for example when we run on a system with a single thread, like WebAssembly.
-            if (Dispatcher == null)
+            if (_dispatcher == null)
             {
                 return workItem();
             }
 
-            if (SynchronizationContext.Current == Dispatcher)
+            if (SynchronizationContext.Current == _dispatcher)
             {
                 // This is an optimization for when the dispatcher is also a syncronization context, like in the default case.
                 // No need to dispatch. Avoid deadlock by invoking directly.
                 return workItem();
             }
             else
             {
-                return Dispatcher.InvokeAsync(workItem);
+                return _dispatcher.InvokeAsync(workItem);
             }
         }
 
@@ -417,7 +405,7 @@ private void EnsureSynchronizationContext()
             // 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 is SynchronizationContext synchronizationContext && SynchronizationContext.Current != synchronizationContext)
+            if (_dispatcher is SynchronizationContext synchronizationContext && SynchronizationContext.Current != synchronizationContext)
             {
                 throw new InvalidOperationException(
                     "The current thread is not associated with the renderer's synchronization context. " +
@@ -436,22 +424,14 @@ private ComponentState GetOptionalComponentState(int componentId)
                 ? componentState 
                 : null;
 
-        /// <summary>
-        /// Processes the render queue.
-        /// </summary>
-        protected void ProcessRenderQueue()
+        private void ProcessRenderQueue()
         {
-            if (!CanRenderBatch)
-            {
-                return;
-            }
-
             var updateDisplayTask = Task.CompletedTask;
             _isBatchInProgress = true;
             try
             {
                 // Process render queue until empty
-                while (CanRenderBatch && RenderBatchBuilder.ComponentRenderQueue.Count > 0)
+                while (RenderBatchBuilder.ComponentRenderQueue.Count > 0)
                 {
                     var nextToRender = RenderBatchBuilder.ComponentRenderQueue.Dequeue();
                     RenderInExistingBatch(nextToRender);

src/Components/Components/test/RendererTest.cs

@@ -3103,27 +3103,6 @@ public void DisposingRenderer_CapturesExceptionsFromAllRegisteredComponents()
             Assert.Contains(exception2, renderer.HandledExceptions);
         }
 
-        [Fact]
-        public void RendersAreBuffered_WhenCanRenderBatchIsReset()
-        {
-            // Arrange
-            var renderer = new TestRenderer();
-            renderer.SetCanRenderBatch(false);
-            var component = new TestComponent(builder =>
-            {
-                builder.AddContent(0, "Hello");
-                builder.OpenComponent<DisposableComponent>(1);
-                builder.CloseComponent();
-            });
-
-            var componentId = renderer.AssignRootComponentId(component);
-            component.TriggerRender();
-
-            Assert.Empty(renderer.Batches);
-            var entry = Assert.Single(renderer.RenderBatchBuilder.ComponentRenderQueue);
-            Assert.Equal(componentId, entry.ComponentState.ComponentId);
-        }
-
         private class NoOpRenderer : Renderer
         {
             public NoOpRenderer() : base(new TestServiceProvider(), new RendererSynchronizationContext())