.

beyaz · Mar 4, 2024 · aaefff7 · aaefff7
1 parent 8b827ce
commit aaefff7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/ReactWithDotNet/Client.cs b/ReactWithDotNet/Client.cs
@@ -30,6 +30,21 @@ internal static EventSenderInfo GetEventSenderInfo(ReactComponentBase reactCompo
 
 public sealed class Client
 {
+    internal Client Clone()
+    {
+        if (TaskList.Count == 0)
+        {
+            return new(_reactContext);
+        }
+
+        var cloned = new Client(_reactContext);
+
+        cloned.TaskList.AddRange(TaskList);
+
+        return cloned;
+    }
+
+
     internal readonly List<ClientTask> TaskList = new();
     readonly ReactContext _reactContext;
 

diff --git a/ReactWithDotNet/ElementSerializer.ToJsonMap.cs b/ReactWithDotNet/ElementSerializer.ToJsonMap.cs
@@ -1,8 +1,6 @@
 using System.Collections;
-using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Reflection;
-using System.Text.Json.Serialization;
 
 namespace ReactWithDotNet;
 
@@ -603,14 +601,7 @@ ReactComponentBase cloneComponent()
 
                         if (component._client is not null)
                         {
-                            if (component._client.TaskList.Count == 0)
-                            {
-                                component._client = new(component.Context);
-                            }
-                            else
-                            {
-                                component._client = ReflectionHelper.DeepCopy(component._client);
-                            }
+                            component._client = component._client.Clone();
                         }
 
                         return component;