discrete values filter supports incremental updates
This commit is contained in:
1 parent
87568a6a53
commit
02fedc577a
1 file changed
+107
-62
@@ -41,6 +41,16 @@ namespace mbts.spark.filters {
|
||||
IEqualityComparer<TValue> equality_comparer,
|
||||
IComparer<TValue> comparer = null
|
||||
) => new DynamicItemsFilter<TRow, TValue, TState>(items, get_row_val, get_state, load_state, prop_name, equality_comparer, comparer);
|
||||
|
||||
public static IDataGridColumnPersistentFilter<TRow, TState> Create<TRow, TValue, TState>(
|
||||
IObservable<(IReadOnlyList<TValue> added, IReadOnlyList<TValue> removed)> items,
|
||||
Func<TRow, TValue> get_row_val,
|
||||
Func<ISet<TValue>, TState> get_state,
|
||||
Func<TState, IObservable<IEnumerable<TValue>>> load_state,
|
||||
string prop_name,
|
||||
IEqualityComparer<TValue> equality_comparer,
|
||||
IComparer<TValue> comparer = null
|
||||
) => new DynamicItemsFilter<TRow, TValue, TState>(items, get_row_val, get_state, load_state, prop_name, equality_comparer, comparer);
|
||||
#endregion
|
||||
|
||||
#region Implementation (private)
|
||||
@@ -81,12 +91,13 @@ namespace mbts.spark.filters {
|
||||
}
|
||||
|
||||
class DynamicItemsFilter<TRow, TValue, TState> : FilterVMBase<TRow, TValue, TState>, IDisposable {
|
||||
readonly IEqualityComparer<TValue> _equality_comparer;
|
||||
readonly Func<ISet<TValue>, TState> _get_state;
|
||||
readonly Func<TState, IObservable<IEnumerable<TValue>>> _load_state;
|
||||
readonly IList<IDisposable> _resources = new List<IDisposable>();
|
||||
readonly HashSet<TValue> _items_set, _selected_items_set;
|
||||
readonly ObservableCollection<TValue> _unsorted_items;
|
||||
bool _override_desired_selection;
|
||||
// use a HashSet for faster filtering, via 'Contains'
|
||||
HashSet<TValue> _selected_items_set;
|
||||
IDisposable _desired_items_sub, _items_sub;
|
||||
|
||||
public DynamicItemsFilter(
|
||||
IObservable<IEnumerable<TValue>> items,
|
||||
@@ -96,67 +107,60 @@ namespace mbts.spark.filters {
|
||||
string prop_name,
|
||||
IEqualityComparer<TValue> equality_comparer,
|
||||
IComparer<TValue> comparer = null
|
||||
) : base(get_row_val, prop_name) {
|
||||
_get_state = get_state;
|
||||
_load_state = load_state;
|
||||
_selected_items_set = new HashSet<TValue>(equality_comparer);
|
||||
var items_set = new HashSet<TValue>(equality_comparer);
|
||||
var unsorted_items = new ObservableCollection<TValue>();
|
||||
this.items = comparer != null ? new ObservableSortedCollection<TValue>(unsorted_items, comparer) : unsorted_items;
|
||||
_resources.Add(items.ObserveOnDispatcher().Subscribe(new_items => {
|
||||
items_set = new HashSet<TValue>(new_items.Concat(_selected_items_set), equality_comparer);
|
||||
unsorted_items.sync_with(items_set);
|
||||
}));
|
||||
selected_items.CollectionChanged += on_selected_items_CollectionChanged;
|
||||
Action<Action<IObservable<IEnumerable<TValue>>>> ah = cb => _on_state_loaded += cb, rh = cb => _on_state_loaded -= cb;
|
||||
_resources.Add(Observable.FromEvent(ah, rh).SelectMany(src => src).ObserveOnDispatcher().Subscribe(dsi => {
|
||||
if (!_override_desired_selection && dsi != null) {
|
||||
var copy = new HashSet<TValue>(_selected_items_set, equality_comparer);
|
||||
_selected_items_set = new HashSet<TValue>(dsi, equality_comparer);
|
||||
using (selected_items.SuspendHandler(on_selected_items_CollectionChanged)) {
|
||||
foreach (var item in _selected_items_set) {
|
||||
if (items_set.Add(item))
|
||||
unsorted_items.Add(item);
|
||||
}
|
||||
selected_items.sync_with(_selected_items_set);
|
||||
}
|
||||
if (!copy.SetEquals(_selected_items_set))
|
||||
_raise_filter_changed();
|
||||
}
|
||||
}));
|
||||
_resources.Add(Disposable.Create(() => selected_items.CollectionChanged -= on_selected_items_CollectionChanged));
|
||||
|
||||
void on_selected_items_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) {
|
||||
_override_desired_selection = true;
|
||||
switch (e.Action) {
|
||||
case NotifyCollectionChangedAction.Add:
|
||||
foreach (TValue item in e.NewItems)
|
||||
_selected_items_set.Add(item);
|
||||
break;
|
||||
case NotifyCollectionChangedAction.Remove:
|
||||
foreach (TValue item in e.OldItems)
|
||||
_selected_items_set.Remove(item);
|
||||
break;
|
||||
case NotifyCollectionChangedAction.Replace:
|
||||
foreach (TValue item in e.OldItems)
|
||||
_selected_items_set.Remove(item);
|
||||
foreach (TValue item in e.NewItems)
|
||||
_selected_items_set.Add(item);
|
||||
break;
|
||||
default:
|
||||
_selected_items_set = new HashSet<TValue>(selected_items, equality_comparer);
|
||||
break;
|
||||
}
|
||||
}
|
||||
) : this(get_row_val, get_state, load_state, prop_name, equality_comparer, comparer) {
|
||||
//
|
||||
_items_sub = items.ObserveOnDispatcher().Subscribe(new_items => {
|
||||
_items_set.SetItems(new_items.Concat(_selected_items_set));
|
||||
_unsorted_items.sync_with(_items_set);
|
||||
});
|
||||
}
|
||||
|
||||
public DynamicItemsFilter(
|
||||
IObservable<(IReadOnlyList<TValue> added, IReadOnlyList<TValue> removed)> items,
|
||||
Func<TRow, TValue> get_row_val,
|
||||
Func<ISet<TValue>, TState> get_state,
|
||||
Func<TState, IObservable<IEnumerable<TValue>>> load_state,
|
||||
string prop_name,
|
||||
IEqualityComparer<TValue> equality_comparer,
|
||||
IComparer<TValue> comparer = null
|
||||
) : this(get_row_val, get_state, load_state, prop_name, equality_comparer, comparer) {
|
||||
//
|
||||
_items_sub = items.ObserveOnDispatcher().Subscribe(update => {
|
||||
foreach (var v in update.added)
|
||||
_items_set.Add(v);
|
||||
foreach (var v in update.removed.Except(_selected_items_set))
|
||||
_items_set.Remove(v);
|
||||
_unsorted_items.sync_with(_items_set);
|
||||
});
|
||||
}
|
||||
|
||||
public event Action<IObservable<IEnumerable<TValue>>> _on_state_loaded;
|
||||
DynamicItemsFilter(
|
||||
Func<TRow, TValue> get_row_val,
|
||||
Func<ISet<TValue>, TState> get_state,
|
||||
Func<TState, IObservable<IEnumerable<TValue>>> load_state,
|
||||
string prop_name,
|
||||
IEqualityComparer<TValue> equality_comparer,
|
||||
IComparer<TValue> comparer = null
|
||||
) : base(get_row_val, prop_name) {
|
||||
//
|
||||
_get_state = get_state;
|
||||
_load_state = load_state;
|
||||
_equality_comparer = equality_comparer;
|
||||
_selected_items_set = new HashSet<TValue>(_equality_comparer);
|
||||
_items_set = new HashSet<TValue>(_equality_comparer);
|
||||
_unsorted_items = new ObservableCollection<TValue>();
|
||||
items = comparer != null ? new ObservableSortedCollection<TValue>(_unsorted_items, comparer) : _unsorted_items;
|
||||
selected_items.CollectionChanged += _on_selected_items_CollectionChanged;
|
||||
}
|
||||
|
||||
public ObservableCollection<TValue> items { get; }
|
||||
public ObservableCollectionEx<TValue> selected_items { get; } = new ObservableCollectionEx<TValue>();
|
||||
|
||||
public void Dispose() =>
|
||||
Disposable.dispose(_resources);
|
||||
public void Dispose() {
|
||||
Disposable.dispose(ref _desired_items_sub);
|
||||
Disposable.dispose(ref _items_sub);
|
||||
selected_items.CollectionChanged -= _on_selected_items_CollectionChanged;
|
||||
}
|
||||
|
||||
public override TState get_state() =>
|
||||
_get_state(_selected_items_set);
|
||||
@@ -170,11 +174,13 @@ namespace mbts.spark.filters {
|
||||
protected override IObjSnapshot _get_snapshot() =>
|
||||
new SelectedItemsSnapshot<TValue>(selected_items, items);
|
||||
|
||||
protected override void _load_state_internal(TState state) =>
|
||||
_on_state_loaded?.Invoke(_load_state(state));
|
||||
protected override void _load_state_internal(TState state) {
|
||||
Disposable.dispose(ref _desired_items_sub);
|
||||
_desired_items_sub = _load_state(state).ObserveOnDispatcher().Subscribe(_on_desired_item);
|
||||
}
|
||||
|
||||
protected override void _apply() {
|
||||
_selected_items_set = new HashSet<TValue>(selected_items);
|
||||
_selected_items_set.SetItems(selected_items);
|
||||
base._apply();
|
||||
}
|
||||
|
||||
@@ -184,7 +190,46 @@ namespace mbts.spark.filters {
|
||||
selected_items.Clear();
|
||||
_selected_items_set.Clear();
|
||||
_raise_filter_changed();
|
||||
}
|
||||
}
|
||||
|
||||
void _on_selected_items_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) {
|
||||
_override_desired_selection = true;
|
||||
switch (e.Action) {
|
||||
case NotifyCollectionChangedAction.Add:
|
||||
foreach (TValue item in e.NewItems)
|
||||
_selected_items_set.Add(item);
|
||||
break;
|
||||
case NotifyCollectionChangedAction.Remove:
|
||||
foreach (TValue item in e.OldItems)
|
||||
_selected_items_set.Remove(item);
|
||||
break;
|
||||
case NotifyCollectionChangedAction.Replace:
|
||||
foreach (TValue item in e.OldItems)
|
||||
_selected_items_set.Remove(item);
|
||||
foreach (TValue item in e.NewItems)
|
||||
_selected_items_set.Add(item);
|
||||
break;
|
||||
default:
|
||||
_selected_items_set.SetItems(selected_items);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void _on_desired_item(IEnumerable<TValue> dsi) {
|
||||
if (!_override_desired_selection && dsi != null) {
|
||||
var copy = new HashSet<TValue>(_selected_items_set, _equality_comparer);
|
||||
_selected_items_set.SetItems(dsi);
|
||||
using (selected_items.SuspendHandler(_on_selected_items_CollectionChanged)) {
|
||||
foreach (var item in _selected_items_set) {
|
||||
if (_items_set.Add(item))
|
||||
_unsorted_items.Add(item);
|
||||
}
|
||||
selected_items.sync_with(_selected_items_set);
|
||||
}
|
||||
if (!copy.SetEquals(_selected_items_set))
|
||||
_raise_filter_changed();
|
||||
}
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
Reference in new issue
Block a user