From edccb582615b91048e9e5bb995e53acf1138f25a Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Tue, 11 Jul 2023 18:13:54 +0200
Subject: [PATCH 1/2] Composition: collect IRenderDataItem resources
 recursively

---
 .../Drawing/ServerCompositionRenderData.cs    | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Base/Rendering/Composition/Drawing/ServerCompositionRenderData.cs b/src/Avalonia.Base/Rendering/Composition/Drawing/ServerCompositionRenderData.cs
index cb5e21be00..97083ccaf5 100644
--- a/src/Avalonia.Base/Rendering/Composition/Drawing/ServerCompositionRenderData.cs
+++ b/src/Avalonia.Base/Rendering/Composition/Drawing/ServerCompositionRenderData.cs
@@ -42,22 +42,31 @@ class ServerCompositionRenderData : SimpleServerRenderResource
             _items.Add(reader.ReadObject<IRenderDataItem>());
         
         var collector = s_resourceHashSetPool.Get();
-        foreach(var item in _items)
-            if (item is IRenderDataItemWithServerResources resourceItem)
-                resourceItem.Collect(collector);
-        
+        CollectResources(_items, collector);
+
         foreach (var r in collector.Resources)
         {
             _referencedResources.Add(r);
             r.AddObserver(this);
         }
-        
+
         collector.Resources.Clear();
         s_resourceHashSetPool.ReturnAndSetNull(ref collector);
         
         base.DeserializeChangesCore(reader, committedAt);
     }
 
+    private static void CollectResources(PooledInlineList<IRenderDataItem> items, IRenderDataServerResourcesCollector collector)
+    {
+        foreach (var item in items)
+        {
+            if (item is IRenderDataItemWithServerResources resourceItem)
+                resourceItem.Collect(collector);
+            else if (item is RenderDataPushNode pushNode)
+                CollectResources(pushNode.Children, collector);
+        }
+    }
+
     public Rect? Bounds
     {
         get
@@ -133,4 +142,4 @@ class ServerCompositionRenderData : SimpleServerRenderResource
         Reset();
         base.Dispose();
     }
-}
\ No newline at end of file
+}

From 237e4cba69cf26e3ca8ca379c2326521dde29500 Mon Sep 17 00:00:00 2001
From: Julien Lebosquain <julien@lebosquain.net>
Date: Tue, 11 Jul 2023 18:35:38 +0200
Subject: [PATCH 2/2] Fix InlineDictionary enumeration when an array is used

---
 .../Utilities/SmallDictionary.cs              | 16 +++---
 .../Utilities/InlineDictionaryTests.cs        | 53 +++++++++++++++++++
 2 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 tests/Avalonia.Base.UnitTests/Utilities/InlineDictionaryTests.cs

diff --git a/src/Avalonia.Base/Utilities/SmallDictionary.cs b/src/Avalonia.Base/Utilities/SmallDictionary.cs
index b6e62411da..1e63d554b4 100644
--- a/src/Avalonia.Base/Utilities/SmallDictionary.cs
+++ b/src/Avalonia.Base/Utilities/SmallDictionary.cs
@@ -51,7 +51,7 @@ internal struct InlineDictionary<TKey, TValue> : IEnumerable<KeyValuePair<TKey,
                         throw new ArgumentException("Key already exists in dictionary");
                 }
 
-                if (arr[c].Key == null)
+                if (arr[c].Key == null && free == -1)
                     free = c;
             }
 
@@ -337,11 +337,15 @@ internal struct InlineDictionary<TKey, TValue> : IEnumerable<KeyValuePair<TKey,
             }
             else if (_type == Type.Array)
             {
-                var next = _index + 1;
-                if (_arr!.Length - 1 < next || _arr[next].Key == null)
-                    return false;
-                _index = next;
-                return true;
+                for (var next = _index + 1; next < _arr!.Length; ++next)
+                {
+                    if (_arr[next].Key != null)
+                    {
+                        _index = next;
+                        return true;
+                    }
+                }
+                return false;
             }
             else if (_type == Type.Dictionary)
                 return _inner.MoveNext();
diff --git a/tests/Avalonia.Base.UnitTests/Utilities/InlineDictionaryTests.cs b/tests/Avalonia.Base.UnitTests/Utilities/InlineDictionaryTests.cs
new file mode 100644
index 0000000000..af47d2726a
--- /dev/null
+++ b/tests/Avalonia.Base.UnitTests/Utilities/InlineDictionaryTests.cs
@@ -0,0 +1,53 @@
+#nullable enable
+
+using System.Collections.Generic;
+using Avalonia.Utilities;
+using Xunit;
+
+namespace Avalonia.Base.UnitTests.Utilities;
+
+public class InlineDictionaryTests
+{
+    [Fact]
+    public void Enumeration_After_Add_With_Internal_Array_Works()
+    {
+        var dic = new InlineDictionary<string, int>();
+        dic.Add("foo", 1);
+        dic.Add("bar", 2);
+        dic.Add("baz", 3);
+
+        Assert.Equal(
+            new[] {
+                new KeyValuePair<string, int>("foo", 1),
+                new KeyValuePair<string, int>("bar", 2),
+                new KeyValuePair<string, int>("baz", 3)
+            },
+            dic);
+    }
+
+    [Fact]
+    public void Enumeration_After_Remove_With_Internal_Array_Works()
+    {
+        var dic = new InlineDictionary<string, int>();
+        dic.Add("foo", 1);
+        dic.Add("bar", 2);
+        dic.Add("baz", 3);
+
+        Assert.Equal(
+            new[] {
+                new KeyValuePair<string, int>("foo", 1),
+                new KeyValuePair<string, int>("bar", 2),
+                new KeyValuePair<string, int>("baz", 3)
+            },
+            dic);
+
+        dic.Remove("bar");
+
+        Assert.Equal(
+            new[] {
+                new KeyValuePair<string, int>("foo", 1),
+                new KeyValuePair<string, int>("baz", 3)
+            },
+            dic);
+    }
+}