Fixed attaching bindings multiple times in BindableViewHolder inheritors

Softeq · Sep 25, 2024 · 2c1c0f4 · 2c1c0f4
1 parent 55eee72
commit 2c1c0f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/Softeq.XToolkit.Bindings.Droid/Bindable/BindableRecyclerViewAdapter.cs b/Softeq.XToolkit.Bindings.Droid/Bindable/BindableRecyclerViewAdapter.cs
@@ -110,7 +110,8 @@ public sealed override RecyclerView.ViewHolder OnCreateViewHolder(ViewGroup pare
         public void DoAttachBindings()
         {
             // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-            _existingBindableViewHolders.Where(x => x.DataContext != null)
+            _existingBindableViewHolders
+                .Where(x => !x.AreBindingsAttached && x.DataContext != null)
                 .Apply(x => x.DoAttachBindings());
         }
 

diff --git a/Softeq.XToolkit.Bindings.Droid/Bindable/BindableViewHolder.cs b/Softeq.XToolkit.Bindings.Droid/Bindable/BindableViewHolder.cs
@@ -69,11 +69,6 @@ protected virtual void OnItemViewClick(object sender, EventArgs e)
 
         public virtual void DoAttachBindings()
         {
-            if (AreBindingsAttached)
-            {
-                return;
-            }
-
             AreBindingsAttached = true;
             _subscriptionsComponent.CreateSubscriptions();
         }
@@ -83,7 +78,6 @@ public virtual void DoDetachBindings()
             this.DetachBindings();
 
             _subscriptionsComponent.DisposeSubscriptions();
-
             AreBindingsAttached = false;
         }