fix: prevent endless recursion loading render tree frames (#1132)

bUnit-dev · Jun 28, 2023 · 4e439e9 · 4e439e9
1 parent 4990e75
commit 4e439e9
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/bunit.core/Rendering/TestRenderer.cs b/src/bunit.core/Rendering/TestRenderer.cs
@@ -279,6 +279,11 @@ private void UpdateDisplay(in RenderBatch renderBatch)
  {
  var id = renderBatch.DisposedComponentIDs.Array[i];
 
+ // Add disposed components to the frames collection
+ // to avoid them being added into the dictionary later during a
+ // LoadRenderTreeFrames/GetOrLoadRenderTreeFrame call.
+ renderEvent.Frames.Add(id, default);
+
  logger.LogComponentDisposed(id);
 
  if (renderedComponents.TryGetValue(id, out var rc))
@@ -443,7 +448,8 @@ private void LoadRenderTreeFrames(int componentId, RenderTreeFrameDictionary fra
  for (var i = 0; i < frames.Count; i++)
  {
  ref var frame = ref frames.Array[i];
- if (frame.FrameType == RenderTreeFrameType.Component)
+
+ if (frame.FrameType == RenderTreeFrameType.Component && !framesCollection.Contains(frame.ComponentId))
  {
  LoadRenderTreeFrames(frame.ComponentId, framesCollection);
  }