Merge pull request #538 from xamarin/ermau-type-selector-fixes

Object editor / type selector fixes

Author: ermau

Xamarin.PropertyEditing.Tests/ObjectPropertyViewModelTests.cs

@@ -256,6 +256,41 @@ public async Task MultiValueTypesNull ()
 			Assert.That (vm.ValueType, Is.Null);
 		}
 
+		[Test]
+		public void ReturnedNullTypeCancels ()
+		{
+			object value = new object ();
+			var p = CreatePropertyMock ("prop");
+			var childsubInfo = GetTypeInfo (typeof (SubChildClass));
+			var editor = new MockObjectEditor (new[] { p.Object }, new Dictionary<IPropertyInfo, IReadOnlyList<ITypeInfo>> {
+				{
+					p.Object,
+					new[] {
+						GetTypeInfo (typeof(ChildClass)),
+						childsubInfo
+					}
+				}
+			});
+
+			var providerMock = CreateProviderMock (value, new MockObjectEditor { Target = value });
+			var vm = new ObjectPropertyViewModel (new TargetPlatform (providerMock.Object), p.Object, new[] { editor });
+
+			var tcs = new TaskCompletionSource<ITypeInfo> ();
+			bool requested = false;
+			vm.TypeRequested += (sender, args) => {
+				requested = true;
+				args.SelectedType = tcs.Task;
+			};
+
+			Assume.That (vm.CreateInstanceCommand.CanExecute (childsubInfo), Is.True);
+			vm.CreateInstanceCommand.Execute (null);
+			Assume.That (requested, Is.True);
+
+			tcs.SetResult (null);
+
+			providerMock.Verify (ep => ep.CreateObjectAsync (null), Times.Never);
+		}
+
 		private TestContext syncContext;
 
 		private Mock<IEditorProvider> CreateProviderMock (object value, IObjectEditor editor)

Xamarin.PropertyEditing.Tests/SimpleCollectionViewTests.cs

@@ -756,6 +756,50 @@ public void Indexer ()
 			Assert.Throws<ArgumentOutOfRangeException> (() => view[2].ToString(), "this[] didn't throw out of range on filtered out item");
 		}
 
+		[Test]
+		[Description ("Covers #522, empty parents now unfiltered by their own filter shouldn't be added")]
+		public void ParentFilterChangesOnEmpty ()
+		{
+			var parents = new ObservableCollection<TestNode> {
+				new TestNode ("A") {
+					Children = new List<TestNode> {
+						new TestNode ("A child")
+					}
+				},
+				new TestNode ("Baz") {
+					Children = new List<TestNode> {
+						new TestNode ("Baz child")
+					}
+				},
+				new TestNode ("Bar") {
+					Children = new List<TestNode> {
+						new TestNode ("Bar child")
+					}
+				},
+			};
+
+			var view = new SimpleCollectionView (parents, new SimpleCollectionViewOptions {
+				DisplaySelector = TestNodeDisplaySelector,
+				ChildrenSelector = TestNodeChildrenSelector,
+				ChildOptions = new SimpleCollectionViewOptions {
+					DisplaySelector = TestNodeDisplaySelector
+				}
+			});
+
+			Assume.That (view.Count, Is.EqualTo (3));
+
+			view.Options.Filter = o => ((TestNode) o).Key != "Bar";
+			Assume.That (view.Count, Is.EqualTo (2));
+
+			view.Options.ChildOptions.Filter = o => ((TestNode) o).Key.StartsWith ("A");
+			Assume.That (view.Count, Is.EqualTo (1));
+
+			view.Options.Filter = null;
+
+			Assert.That (((KeyValuePair<string, SimpleCollectionView>) view[0]).Key, Is.EqualTo (parents[0].Key));
+			Assert.That (view.Count, Is.EqualTo (1));
+		}
+
 		private IEnumerable TestNodeChildrenSelector (object o)
 		{
 			return ((TestNode)o).Children;

Xamarin.PropertyEditing/ViewModels/ObjectPropertyViewModel.cs

@@ -164,7 +164,9 @@ private async void CreateInstance ()
 
 						try {
 							selectedType = await args.SelectedType;
- 						} catch (OperationCanceledException) {
+							if (selectedType == null)
+								return;
+						} catch (OperationCanceledException) {
 							return;
 						}
 					}

Xamarin.PropertyEditing/ViewModels/SimpleCollectionView.cs

@@ -127,8 +127,6 @@ public object this[int index]
 
 		public bool HasChildElements => (this.filtered.Count > 0);
 
-		public bool IsFiltering => Options?.Filter != null;
-
 		public bool Contains (object value)
 		{
 			return IndexOf (value) != -1;
@@ -289,15 +287,19 @@ private string GetKey (object element)
 
 		private bool MatchesFilter (Element element)
 		{
-			if (!IsFiltering)
+			if (!GetIsFiltering())
+				return true;
+			if (element.ChildrenView != null && !element.ChildrenView.HasChildElements)
+				return false;
+			if (Options.Filter == null)
 				return true;
 
 			return Options.Filter (element.Item);
 		}
 
 		private void FilterCore (bool notify = true, bool isPureSubset = false)
 		{
-			if (!IsFiltering) {
+			if (!GetIsFiltering()) {
 				if (this.arranged.Count == this.filtered.Count)
 					return;
 			}
@@ -312,8 +314,7 @@ private void FilterCore (bool notify = true, bool isPureSubset = false)
 
 			var toRemove = new List<string>();
 			foreach (var kvp in this.filtered) {
-				var childView = kvp.Value.ChildrenView;
-				if ((childView != null && !childView.HasChildElements) || !MatchesFilter (kvp.Value)) {
+				if (!MatchesFilter (kvp.Value)) {
 					toRemove.Add (kvp.Key);
 				}
 			}
@@ -324,7 +325,7 @@ private void FilterCore (bool notify = true, bool isPureSubset = false)
 				var toAdd = new List<string> (filteredOut.Count);
 				foreach (string key in filteredOut) {
 					Element e = this.arranged[key];
-					if (!IsFiltering || Options.Filter (e.Item))
+					if (MatchesFilter (e))
 						toAdd.Add (key);
 				}
 				toAdd.Sort (Comparer);
@@ -435,8 +436,6 @@ private void Reset (bool notify = true)
 			this.arranged.Clear();
 			this.filtered.Clear();
 
-			bool filtering = IsFiltering;
-
 			foreach (var sourceItem in this.source.Cast<object>().Select (o => new { Item = o, Key = GetKey (o) }).OrderBy (e => e.Key, Comparer)) {
 				Element e = new Element {
 					Item = sourceItem.Item
@@ -453,7 +452,7 @@ private void Reset (bool notify = true)
 					e.ChildrenView = new SimpleCollectionView (children, Options.ChildOptions, this, sourceItem.Key, sourceItem.Item);
 				}
 
-				if (!filtering || this.options.Filter (e.Item))
+				if (MatchesFilter (e))
 					this.filtered.Add (sourceItem.Key, e);
 			}
 
@@ -499,5 +498,27 @@ private void OnCollectionChanged (NotifyCollectionChangedEventArgs e)
 				}
 			}
 		}
+
+		private bool GetIsFiltering ()
+		{
+			// Generally our hierarchy is at max 3 levels deep, this can be cached if we find it problematic
+			SimpleCollectionView parent = this;
+			while (parent != null) {
+				if (parent.Options?.Filter != null)
+					return true;
+
+				parent = parent.parent;
+			}
+
+			SimpleCollectionViewOptions childOptions = Options.ChildOptions;
+			while (childOptions != null) {
+				if (childOptions.Filter != null)
+					return true;
+
+				childOptions = childOptions.ChildOptions;
+			}
+
+			return false;
+		}
 	}
 }