From cc79be9acc749e5af27685502f88dee7f64d69e1 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Wed, 5 Jun 2024 22:22:06 +0100
Subject: [PATCH] Make it possible to gather values using scoped
 ItemConfiguration

---
 Toolkit.Foundation/ICollectionSynchronization.cs          | 3 +++
 .../ICollectionSynchronizationExtensions.cs               | 7 +++++++
 Toolkit.Foundation/{IIndexable.cs => IIndexed.cs}         | 4 ++--
 Toolkit.Foundation/IKeyed.cs                              | 6 ++++++
 Toolkit.Foundation/ISynchronizationCollection.cs          | 6 ------
 Toolkit.Foundation/Observable.cs                          | 8 ++++++++
 Toolkit.Foundation/ObservableCollection.cs                | 2 +-
 7 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 Toolkit.Foundation/ICollectionSynchronization.cs
 create mode 100644 Toolkit.Foundation/ICollectionSynchronizationExtensions.cs
 rename Toolkit.Foundation/{IIndexable.cs => IIndexed.cs} (69%)
 create mode 100644 Toolkit.Foundation/IKeyed.cs
 delete mode 100644 Toolkit.Foundation/ISynchronizationCollection.cs

diff --git a/Toolkit.Foundation/ICollectionSynchronization.cs b/Toolkit.Foundation/ICollectionSynchronization.cs
new file mode 100644
index 0000000..10d67c9
--- /dev/null
+++ b/Toolkit.Foundation/ICollectionSynchronization.cs
@@ -0,0 +1,3 @@
+namespace Toolkit.Foundation;
+
+public interface ICollectionSynchronization<TItem>;
\ No newline at end of file
diff --git a/Toolkit.Foundation/ICollectionSynchronizationExtensions.cs b/Toolkit.Foundation/ICollectionSynchronizationExtensions.cs
new file mode 100644
index 0000000..c368e40
--- /dev/null
+++ b/Toolkit.Foundation/ICollectionSynchronizationExtensions.cs
@@ -0,0 +1,7 @@
+namespace Toolkit.Foundation;
+
+public static class ICollectionSynchronizationExtensions
+{
+    public static int IndexOf<TItem>(this ICollectionSynchronization<TItem> synchronization,
+        TItem item) => synchronization is IList<TItem> collection ? collection.IndexOf(item) : -1;
+}
diff --git a/Toolkit.Foundation/IIndexable.cs b/Toolkit.Foundation/IIndexed.cs
similarity index 69%
rename from Toolkit.Foundation/IIndexable.cs
rename to Toolkit.Foundation/IIndexed.cs
index dcf42af..43f70d3 100644
--- a/Toolkit.Foundation/IIndexable.cs
+++ b/Toolkit.Foundation/IIndexed.cs
@@ -1,6 +1,6 @@
 namespace Toolkit.Foundation;
 
-public interface IIndexable
+public interface IIndexed
 {
     public int Index { get; }
-}
\ No newline at end of file
+}
diff --git a/Toolkit.Foundation/IKeyed.cs b/Toolkit.Foundation/IKeyed.cs
new file mode 100644
index 0000000..dfaae3b
--- /dev/null
+++ b/Toolkit.Foundation/IKeyed.cs
@@ -0,0 +1,6 @@
+namespace Toolkit.Foundation;
+
+public interface IKeyed<T>
+{
+    public T Id { get; }
+}
\ No newline at end of file
diff --git a/Toolkit.Foundation/ISynchronizationCollection.cs b/Toolkit.Foundation/ISynchronizationCollection.cs
deleted file mode 100644
index 34ddd27..0000000
--- a/Toolkit.Foundation/ISynchronizationCollection.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Toolkit.Foundation;
-
-public interface ISynchronizationCollection<TItem>
-{
-    int IndexOf(TItem item);
-}
diff --git a/Toolkit.Foundation/Observable.cs b/Toolkit.Foundation/Observable.cs
index eb0055a..f3a7583 100644
--- a/Toolkit.Foundation/Observable.cs
+++ b/Toolkit.Foundation/Observable.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using System.ComponentModel;
 
 namespace Toolkit.Foundation;
 
@@ -140,4 +141,11 @@ public partial class Observable<TKey, TValue> : Observable
         Key = key;
         Value = value;
     }
+
+    partial void OnValueChanged(TValue? value) => OnValueChanged();
+
+    protected virtual void OnValueChanged()
+    {
+
+    }
 }
\ No newline at end of file
diff --git a/Toolkit.Foundation/ObservableCollection.cs b/Toolkit.Foundation/ObservableCollection.cs
index 57b1f85..7c8d99a 100644
--- a/Toolkit.Foundation/ObservableCollection.cs
+++ b/Toolkit.Foundation/ObservableCollection.cs
@@ -18,7 +18,7 @@ public partial class ObservableCollection<TItem> :
     IList,
     IReadOnlyList<TItem>,
     INotifyCollectionChanged,
-    ISynchronizationCollection<TItem>,
+    ICollectionSynchronization<TItem>,
     IServiceProviderRequired,
     IServiceFactoryRequired,
     IMediatorRequired,