feat: added inputextensions returntype property

unoplatform · May 10, 2024 · fa8cfc7 · fa8cfc7
2 parents cef56d6 + 1dd4b2c
commit fa8cfc7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Uno.Toolkit.RuntimeTests/Tests/TabBarTests.cs b/src/Uno.Toolkit.RuntimeTests/Tests/TabBarTests.cs
@@ -89,6 +89,22 @@ public async Task SetSelectedItem()
 			Assert.IsTrue(source[1].IsSelected);
 		}
 
+		[TestMethod]
+		public async Task SetSelectedItem_SimpleSource()
+		{
+			var source = Enumerable.Range(0, 3).ToArray();
+			var SUT = new TabBar
+			{
+				ItemsSource = source,
+				SelectedItem = 1,
+			};
+
+			await UnitTestUIContentHelperEx.SetContentAndWait(SUT);
+
+			Assert.AreEqual(source[1], SUT.SelectedItem);
+			Assert.AreEqual(1, SUT.SelectedIndex);
+		}
+
 		[TestMethod]
 		public async Task SetSelectedIndex()
 		{

diff --git a/src/Uno.Toolkit.UI/Controls/TabBar/TabBar.cs b/src/Uno.Toolkit.UI/Controls/TabBar/TabBar.cs
@@ -234,7 +234,7 @@ private void OnSelectedItemChanged(DependencyPropertyChangedEventArgs? args)
 				return;
 			}
 
-			var newlySelectedItem = SelectedItem as TabBarItem;
+			var newlySelectedItem = this.FindContainer<TabBarItem>(SelectedItem);
 			if (!IsReady && newlySelectedItem != null)
 			{
 				return;