December 8th, Candidate

Directory.Build.props

@@ -149,6 +149,15 @@
     <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
   </PropertyGroup>
 
+  <!-- TypeScript compilation -->
+  <PropertyGroup>
+    <TypeScriptTarget>ES2020</TypeScriptTarget>
+    <TypeScriptSourceMap>false</TypeScriptSourceMap>
+    <TypeScriptNoImplicitAny>true</TypeScriptNoImplicitAny>
+    <TypeScriptCompileOnSaveEnabled>true</TypeScriptCompileOnSaveEnabled>
+    <TypeScriptCompileBlocked Condition=" '$(TypeScriptCompileBlocked)' == '' and '$(CI)' != 'true' and '$(TF_BUILD)' != 'true' ">true</TypeScriptCompileBlocked>
+  </PropertyGroup>
+
   <!-- Windows specific settings -->
   <PropertyGroup Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">
     <WindowsSdkPackageVersion>10.0.19041.44</WindowsSdkPackageVersion>

Directory.Build.targets

@@ -122,5 +122,7 @@
 
   <!-- Tell typescript to stop deleting everything before building the next TFM -->
   <Target Name="TypeScriptDeleteOutputFromOtherConfigs" />
+  <!-- Don't include any JS files in the Content, we will embed it -->
+  <Target Name="GetTypeScriptOutputForPublishing" />
 
 </Project>

src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs

@@ -1595,6 +1595,38 @@ public override void ViewWillTransitionToSize(SizeF toSize, IUIViewControllerTra
 					UpdateLeftBarButtonItem();
 			}
 
+			public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection)
+			{
+				base.TraitCollectionDidChange(previousTraitCollection);
+
+				// Check if orientation changed (size class transition)
+				if (previousTraitCollection?.VerticalSizeClass != TraitCollection.VerticalSizeClass ||
+					previousTraitCollection?.HorizontalSizeClass != TraitCollection.HorizontalSizeClass)
+				{
+					if (OperatingSystem.IsIOSVersionAtLeast(26) || OperatingSystem.IsMacCatalystVersionAtLeast(26))
+					{
+						UpdateTitleViewFrameForOrientation();
+					}
+				}
+			}
+
+			/// iOS 26+ requires autoresizing masks (UIViewAutoresizing.FlexibleWidth) During orientation changes, the autoresizing mask
+			/// automatically adjusts the width, but we need to explicitly update the frame to ensure the
+			/// title view uses the full available width from the navigation bar. Without this update,
+			/// the title view may not properly expand to fill the navigation bar after rotation.
+			void UpdateTitleViewFrameForOrientation()
+			{
+				if (NavigationItem?.TitleView is not UIView titleView)
+					return;
+
+				if (!_navigation.TryGetTarget(out NavigationRenderer navigationRenderer))
+					return;
+
+				var navigationBarFrame = navigationRenderer.NavigationBar.Frame;
+				titleView.Frame = new RectangleF(0, 0, navigationBarFrame.Width, navigationBarFrame.Height);
+				titleView.LayoutIfNeeded();
+			}
+
 			internal void UpdateLeftBarButtonItem(Page pageBeingRemoved = null)
 			{
 				NavigationRenderer n;

src/Controls/src/Core/Compatibility/Handlers/Shell/Android/ShellItemRenderer.cs

@@ -147,6 +147,8 @@ protected virtual void SetAppearance(ShellAppearance appearance)
 
 		protected virtual bool ChangeSection(ShellSection shellSection)
 		{
+			// Update shell appearance based on the new shell section when switching between tabs
+			((IShellController)ShellContext.Shell).AppearanceChanged(shellSection, false);
 			return ((IShellItemController)ShellItem).ProposeSection(shellSection);
 		}
 

src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs

@@ -5,6 +5,7 @@
 using System.ComponentModel;
 using System.Linq;
 using Foundation;
+using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using Microsoft.Maui.Graphics;
 using ObjCRuntime;
 using UIKit;
@@ -399,6 +400,7 @@ void OnDisplayedPageChanged(Page page)
 			{
 				_displayedPage.PropertyChanged += OnDisplayedPagePropertyChanged;
 				UpdateTabBarHidden();
+				UpdateLargeTitles();
 			}
 		}
 
@@ -408,6 +410,31 @@ void OnDisplayedPagePropertyChanged(object sender, PropertyChangedEventArgs e)
 				UpdateTabBarHidden();
 		}
 
+
+		void UpdateLargeTitles()
+		{
+			var page = _displayedPage;
+			if (page is null || !OperatingSystem.IsIOSVersionAtLeast(11))
+				return;
+
+			var largeTitleDisplayMode = page.OnThisPlatform().LargeTitleDisplay();
+
+			if (SelectedViewController is UINavigationController navigationController)
+			{
+				navigationController.NavigationBar.PrefersLargeTitles = largeTitleDisplayMode == LargeTitleDisplayMode.Always;
+				var top = navigationController.TopViewController;
+				if (top is not null)
+				{
+					top.NavigationItem.LargeTitleDisplayMode = largeTitleDisplayMode switch
+					{
+						LargeTitleDisplayMode.Always => UINavigationItemLargeTitleDisplayMode.Always,
+						LargeTitleDisplayMode.Automatic => UINavigationItemLargeTitleDisplayMode.Automatic,
+						_ => UINavigationItemLargeTitleDisplayMode.Never
+					};
+				}
+			}
+		}
+
 		void RemoveRenderer(IShellSectionRenderer renderer)
 		{
 			if (_sectionRenderers.Remove(renderer.ViewController))
@@ -441,6 +468,7 @@ IShellSectionRenderer RendererForViewController(UIViewController viewController)
 		public override void ViewWillLayoutSubviews()
 		{
 			UpdateTabBarHidden();
+			UpdateLargeTitles();
 			base.ViewWillLayoutSubviews();
 		}
 

src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs

@@ -952,6 +952,7 @@ void AttachSearchController()
 			});
 
 			searchBar.BookmarkButtonClicked += BookmarkButtonClicked;
+			searchBar.OnEditingStopped += OnSearchBarEditingStopped;
 
 			searchBar.Placeholder = SearchHandler.Placeholder;
 			UpdateSearchIsEnabled(_searchController);
@@ -985,6 +986,14 @@ void AttachSearchController()
 			UpdateAutomationId();
 		}
 
+		void OnSearchBarEditingStopped(object? sender, EventArgs e)
+		{
+			if (_searchController is not null)
+			{
+				_searchController.Active = false;
+			}
+		}
+
 		void BookmarkButtonClicked(object? sender, EventArgs e)
 		{
 			(SearchHandler as ISearchHandlerController)?.ClearPlaceholderClicked();
@@ -995,6 +1004,11 @@ void DettachSearchController()
 
 			_searchHandlerAppearanceTracker?.Dispose();
 			_searchHandlerAppearanceTracker = null;
+			if (_searchController?.SearchBar is UISearchBar searchBar)
+			{
+				searchBar.BookmarkButtonClicked -= BookmarkButtonClicked;
+				searchBar.OnEditingStopped -= OnSearchBarEditingStopped;
+			}
 
 			if (NavigationItem is not null)
 			{

src/Controls/src/Core/GradientStop.cs

@@ -48,9 +48,6 @@ public override bool Equals(object obj)
 		}
 
 		/// <include file="../../docs/Microsoft.Maui.Controls/GradientStop.xml" path="//Member[@MemberName='GetHashCode']/Docs/*" />
-		public override int GetHashCode()
-		{
-			return -1234567890 + (Color?.GetHashCode() ?? 0);
-		}
+		public override int GetHashCode() => base.GetHashCode();
 	}
 }

src/Controls/src/Core/Handlers/Items/Android/Adapters/StructuredItemsViewAdapter.cs

@@ -33,12 +33,12 @@ protected override void ItemsViewPropertyChanged(object sender, PropertyChangedE
 		{
 			base.ItemsViewPropertyChanged(sender, property);
 
-			if (property.Is(Microsoft.Maui.Controls.StructuredItemsView.HeaderProperty))
+			if (property.Is(Microsoft.Maui.Controls.StructuredItemsView.HeaderProperty) || property.Is(Microsoft.Maui.Controls.StructuredItemsView.HeaderTemplateProperty))
 			{
 				UpdateHasHeader();
 				NotifyDataSetChanged();
 			}
-			else if (property.Is(Microsoft.Maui.Controls.StructuredItemsView.FooterProperty))
+			else if (property.Is(Microsoft.Maui.Controls.StructuredItemsView.FooterProperty) || property.Is(Microsoft.Maui.Controls.StructuredItemsView.FooterTemplateProperty))
 			{
 				UpdateHasFooter();
 				NotifyDataSetChanged();

src/Controls/src/Core/Handlers/Items/Android/MauiRecyclerView.cs

@@ -583,6 +583,34 @@ internal void UpdateEmptyViewVisibility()
 				SwapAdapter(ItemsViewAdapter, true);
 				UpdateLayoutManager();
 			}
+			else if (showEmptyView && currentAdapter == _emptyViewAdapter)
+			{
+				if (ShouldUpdateEmptyView())
+				{
+					// Header/footer properties changed - detach and reattach adapter to force RecyclerView to recalculate the positions.
+					SetAdapter(null);
+					SwapAdapter(_emptyViewAdapter, true);
+					UpdateEmptyView();
+				}
+			}
+		}
+
+		bool ShouldUpdateEmptyView()
+		{
+			if (ItemsView is StructuredItemsView structuredItemsView)
+			{
+				if (_emptyViewAdapter.Header != structuredItemsView.Header ||
+					_emptyViewAdapter.HeaderTemplate != structuredItemsView.HeaderTemplate ||
+					_emptyViewAdapter.Footer != structuredItemsView.Footer ||
+					_emptyViewAdapter.FooterTemplate != structuredItemsView.FooterTemplate ||
+					_emptyViewAdapter.EmptyView != ItemsView.EmptyView ||
+					_emptyViewAdapter.EmptyViewTemplate != ItemsView.EmptyViewTemplate)
+				{
+					return true;
+				}
+			}
+
+			return false;
 		}
 
 		internal void AdjustScrollForItemUpdate()

src/Controls/src/Core/Handlers/Items/Android/TemplatedItemViewHolder.cs

@@ -119,7 +119,8 @@ bool IsUsingVSMForSelectionColor(View view)
 					for (var setterIndex = 0; setterIndex < state.Setters.Count; setterIndex++)
 					{
 						var setter = state.Setters[setterIndex];
-						if (setter.Property.PropertyName == VisualElement.BackgroundColorProperty.PropertyName)
+						if (setter.Property.PropertyName == VisualElement.BackgroundColorProperty.PropertyName ||
+							setter.Property.PropertyName == VisualElement.BackgroundProperty.PropertyName)
 						{
 							return true;
 						}

src/Controls/src/Core/Handlers/Items/iOS/TemplatedCell.cs

@@ -276,7 +276,8 @@ bool IsUsingVSMForSelectionColor(View view)
 					for (var setterIndex = 0; setterIndex < state.Setters.Count; setterIndex++)
 					{
 						var setter = state.Setters[setterIndex];
-						if (setter.Property.PropertyName == VisualElement.BackgroundColorProperty.PropertyName)
+						if (setter.Property.PropertyName == VisualElement.BackgroundColorProperty.PropertyName ||
+							setter.Property.PropertyName == VisualElement.BackgroundProperty.PropertyName)
 						{
 							return true;
 						}

src/Controls/src/Core/Handlers/Items2/CollectionViewHandler2.iOS.cs

@@ -34,6 +34,8 @@ internal class LayoutSnapInfo
 
 	public partial class CollectionViewHandler2
 	{
+		// Cache for MeasureFirstItem optimization
+		CoreGraphics.CGSize _firstItemMeasuredSize = CoreGraphics.CGSize.Empty;
 
 		public CollectionViewHandler2() : base(Mapper)
 		{
@@ -45,6 +47,30 @@ public CollectionViewHandler2(PropertyMapper mapper = null) : base(mapper ?? Map
 
 		}
 
+		/// <summary>
+		/// Gets the cached first item measured size for MeasureFirstItem optimization.
+		/// Returns CGSize.Empty if not cached or not using MeasureFirstItem strategy.
+		/// </summary>
+		internal CoreGraphics.CGSize GetCachedFirstItemSize()
+		{
+			if (VirtualView is CollectionView cv && cv.ItemSizingStrategy == ItemSizingStrategy.MeasureFirstItem)
+			{
+				return _firstItemMeasuredSize;
+			}
+			return CoreGraphics.CGSize.Empty;
+		}
+
+		/// <summary>
+		/// Sets the cached first item measured size for MeasureFirstItem optimization.
+		/// </summary>
+		internal void SetCachedFirstItemSize(CoreGraphics.CGSize size)
+		{
+			if (VirtualView is CollectionView cv && cv.ItemSizingStrategy == ItemSizingStrategy.MeasureFirstItem)
+			{
+				_firstItemMeasuredSize = size;
+			}
+		}
+
 		public static PropertyMapper<CollectionView, CollectionViewHandler2> Mapper = new(ItemsViewMapper)
 		{
 			[ReorderableItemsView.CanReorderItemsProperty.PropertyName] = MapCanReorderItems,
@@ -56,6 +82,7 @@ public CollectionViewHandler2(PropertyMapper mapper = null) : base(mapper ?? Map
 			[StructuredItemsView.FooterTemplateProperty.PropertyName] = MapFooterTemplate,
 			[StructuredItemsView.HeaderProperty.PropertyName] = MapHeaderTemplate,
 			[StructuredItemsView.FooterProperty.PropertyName] = MapFooterTemplate,
+			[StructuredItemsView.ItemSizingStrategyProperty.PropertyName] = MapItemSizingStrategy,
 			[GroupableItemsView.GroupHeaderTemplateProperty.PropertyName] = MapHeaderTemplate,
 			[GroupableItemsView.GroupFooterTemplateProperty.PropertyName] = MapFooterTemplate,
 		};

src/Controls/src/Core/Handlers/Items2/iOS/CarouselViewController2.cs

@@ -13,6 +13,7 @@ namespace Microsoft.Maui.Controls.Handlers.Items2
 {
 	public class CarouselViewController2 : ItemsViewController2<CarouselView>
 	{
+		bool _isRotating = false;
 		bool _isUpdating = false;
 		int _section = 0;
 		CarouselViewLoopManager _carouselViewLoopManager;
@@ -64,6 +65,16 @@ public override void ViewDidLoad()
 		{
 			InitializeCarouselViewLoopManager();
 			base.ViewDidLoad();
+			// Subscribe to orientation change notifications
+			NSNotificationCenter.DefaultCenter.AddObserver(UIDevice.OrientationDidChangeNotification, DeviceOrientationChanged);
+		}
+
+		void DeviceOrientationChanged(NSNotification notification)
+		{
+			if (InitialPositionSet)
+			{
+				_isRotating = true;
+			}
 		}
 
 		public override void ViewWillLayoutSubviews()
@@ -77,6 +88,22 @@ public override async void ViewDidLayoutSubviews()
 		{
 			base.ViewDidLayoutSubviews();
 			await UpdateInitialPosition();
+
+			if (_isRotating)
+			{
+				BoundsSizeChanged();
+				_isRotating = false;
+			}
+		}
+
+		void BoundsSizeChanged()
+		{
+			// Re-center the current item after bounds change to ensure proper positioning
+			// This is especially important during device rotation to maintain the correct scroll position
+			if (ItemsView is CarouselView carousel && carousel.Position >= 0)
+			{
+				carousel.ScrollTo(carousel.Position, position: Microsoft.Maui.Controls.ScrollToPosition.Center, animate: false);
+			}
 		}
 
 		public override void DraggingStarted(UIScrollView scrollView)
@@ -150,10 +177,12 @@ void TearDown(CarouselView carouselView)
 			InitialPositionSet = false;
 
 			UnsubscribeCollectionItemsSourceChanged(ItemsSource);
-
+			// Clean up orientation notification observer
+			NSNotificationCenter.DefaultCenter.RemoveObserver(this, UIDevice.OrientationDidChangeNotification, null);
 			_carouselViewLoopManager?.Dispose();
 			_carouselViewLoopManager = null;
 			_isUpdating = false;
+			_isRotating = false;
 		}
 
 		internal void UpdateScrollingConstraints()
@@ -372,6 +401,12 @@ internal bool IsUpdating()
 		{
 			return _isUpdating;
 		}
+
+		internal bool IsRotating()
+		{
+			return _isRotating;
+		}
+
 		internal void UpdateLoop()
 		{
 			if (ItemsView is not CarouselView carousel)