chore: Properly have tbi container applied

unoplatform · Oct 11, 2024 · 1c4ecec · 1c4ecec
1 parent 3628d17
commit 1c4ecec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/Uno.Toolkit.RuntimeTests/Tests/TabBarTests.cs b/src/Uno.Toolkit.RuntimeTests/Tests/TabBarTests.cs
@@ -445,11 +445,9 @@ public async Task Verify_ItemTemplated_Disabled_Not_Selectable()
 
 			var SUT = new TabBar
 			{
-				// If `ItemTemplate` is not set first then the order of
-				// `OnItemTemplateChanged` and `GetContainerForItemOverride` are not correct and test fail on android
-				ItemTemplate = dt,
 				Style = (Style)Application.Current.Resources["TopTabBarStyle"],
-				ItemsSource = source
+				ItemsSource = source,
+				ItemTemplate = dt,
 			};
 
 			await UnitTestUIContentHelperEx.SetContentAndWait(SUT);

diff --git a/src/Uno.Toolkit.UI/Controls/TabBar/TabBar.cs b/src/Uno.Toolkit.UI/Controls/TabBar/TabBar.cs
@@ -274,9 +274,8 @@ private void OnItemsSourceChanged()
 
 		protected override void OnItemTemplateChanged(DataTemplate oldItemTemplate, DataTemplate newItemTemplate)
 		{
-			base.OnItemTemplateChanged(oldItemTemplate, newItemTemplate);
-
 			IsUsingOwnContainerAsTemplateRoot = IsItemItsOwnContainerOverride(newItemTemplate?.LoadContent());
+			base.OnItemTemplateChanged(oldItemTemplate, newItemTemplate);
 		}
 
 		private void OnSelectedItemChanged(DependencyPropertyChangedEventArgs? args)