Undo renderer changes

Author: pranavkm

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

@@ -18,8 +18,9 @@ public abstract class Renderer : IDisposable
     {
         private readonly ComponentFactory _componentFactory;
         private readonly Dictionary<int, ComponentState> _componentStateById = new Dictionary<int, ComponentState>();
+        private readonly RenderBatchBuilder _batchBuilder = new RenderBatchBuilder();
         private readonly Dictionary<int, EventCallback> _eventBindings = new Dictionary<int, EventCallback>();
-        private IDispatcher _dispatcher { get; }
+        private readonly IDispatcher _dispatcher;
 
         private int _nextComponentId = 0; // TODO: change to 'long' when Mono .NET->JS interop supports it
         private bool _isBatchInProgress;
@@ -68,8 +69,6 @@ public Renderer(IServiceProvider serviceProvider, IDispatcher dispatcher) : this
             _dispatcher = dispatcher;
         }
 
-        internal RenderBatchBuilder RenderBatchBuilder { get; } = new RenderBatchBuilder();
-
         /// <summary>
         /// Creates an <see cref="IDispatcher"/> that can be used with one or more <see cref="Renderer"/>.
         /// </summary>
@@ -388,7 +387,7 @@ protected internal virtual void AddToRenderQueue(int componentId, RenderFragment
                 return;
             }
 
-            RenderBatchBuilder.ComponentRenderQueue.Enqueue(
+            _batchBuilder.ComponentRenderQueue.Enqueue(
                 new RenderQueueEntry(componentState, renderFragment));
 
             if (!_isBatchInProgress)
@@ -420,23 +419,24 @@ private ComponentState GetRequiredComponentState(int componentId)
 
         private ComponentState GetOptionalComponentState(int componentId)
             => _componentStateById.TryGetValue(componentId, out var componentState)
-                ? componentState 
+                ? componentState
                 : null;
 
         private void ProcessRenderQueue()
         {
-            var updateDisplayTask = Task.CompletedTask;
             _isBatchInProgress = true;
+            var updateDisplayTask = Task.CompletedTask;
+
             try
             {
                 // Process render queue until empty
-                while (RenderBatchBuilder.ComponentRenderQueue.Count > 0)
+                while (_batchBuilder.ComponentRenderQueue.Count > 0)
                 {
-                    var nextToRender = RenderBatchBuilder.ComponentRenderQueue.Dequeue();
+                    var nextToRender = _batchBuilder.ComponentRenderQueue.Dequeue();
                     RenderInExistingBatch(nextToRender);
                 }
 
-                var batch = RenderBatchBuilder.ToBatch();
+                var batch = _batchBuilder.ToBatch();
                 updateDisplayTask = UpdateDisplayAsync(batch);
 
                 // Fire off the execution of OnAfterRenderAsync, but don't wait for it
@@ -445,8 +445,8 @@ private void ProcessRenderQueue()
             }
             finally
             {
-                RemoveEventHandlerIds(RenderBatchBuilder.DisposedEventHandlerIds.ToRange(), updateDisplayTask);
-                RenderBatchBuilder.Clear();
+                RemoveEventHandlerIds(_batchBuilder.DisposedEventHandlerIds.ToRange(), updateDisplayTask);
+                _batchBuilder.Clear();
                 _isBatchInProgress = false;
             }
         }
@@ -495,15 +495,15 @@ private Task InvokeRenderCompletedCalls(ArrayRange<RenderTreeDiff> updatedCompon
         private void RenderInExistingBatch(RenderQueueEntry renderQueueEntry)
         {
             renderQueueEntry.ComponentState
-                .RenderIntoBatch(RenderBatchBuilder, renderQueueEntry.RenderFragment);
+                .RenderIntoBatch(_batchBuilder, renderQueueEntry.RenderFragment);
 
             // Process disposal queue now in case it causes further component renders to be enqueued
-            while (RenderBatchBuilder.ComponentDisposalQueue.Count > 0)
+            while (_batchBuilder.ComponentDisposalQueue.Count > 0)
             {
-                var disposeComponentId = RenderBatchBuilder.ComponentDisposalQueue.Dequeue();
-                GetRequiredComponentState(disposeComponentId).DisposeInBatch(RenderBatchBuilder);
+                var disposeComponentId = _batchBuilder.ComponentDisposalQueue.Dequeue();
+                GetRequiredComponentState(disposeComponentId).DisposeInBatch(_batchBuilder);
                 _componentStateById.Remove(disposeComponentId);
-                RenderBatchBuilder.DisposedComponentIds.Append(disposeComponentId);
+                _batchBuilder.DisposedComponentIds.Append(disposeComponentId);
             }
         }