[2025/06/02] Candidate - In Flight Branch (#29754)

For more information about inflight process check
https://github.com/dotnet/maui/wiki/Inflight-Branch-Process

Author: PureWeen

Directory.Build.targets

@@ -125,4 +125,7 @@
     </ItemGroup>
   </Target>
 
+  <!-- Tell typescript to stop deleting everything before building the next TFM -->
+  <Target Name="TypeScriptDeleteOutputFromOtherConfigs" />
+
 </Project>

eng/Versions.props

@@ -216,4 +216,4 @@
     <MicrosoftiOSSdkPackageVersion>$(MicrosoftiOSSdknet90_180PackageVersion)</MicrosoftiOSSdkPackageVersion>
     <MicrosofttvOSSdkPackageVersion>$(MicrosofttvOSSdknet90_180PackageVersion)</MicrosofttvOSSdkPackageVersion>
   </PropertyGroup>
-</Project>
+</Project>

eng/pipelines/common/ui-tests.yml

@@ -31,7 +31,7 @@ parameters:
     - 'ScrollView,SearchBar,Shape,Slider,SoftInput,Stepper,Switch,SwipeView'
     - 'Shell'
     - 'TabbedPage,TableView,TimePicker,TitleView,ToolbarItem'
-    - 'ViewBaseTests,Visual,WebView,Window'
+    - 'Shadow,ViewBaseTests,Visual,WebView,Window'
 
   projects:
     - name: name

src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj

@@ -78,6 +78,7 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\Embedded\*" />
     <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
+    <MauiAsset Include="..\..\..\Core\src\Handlers\HybridWebView\HybridWebView.js" LogicalName="HybridSamplePage\scripts\HybridWebView.js" />
     <MauiImage Include="Resources\Images\*" />
     <MauiImage Update="Resources\Images\*.gif" Resize="false" />
     <MauiIcon Include="Resources\AppIcons\appicon.svg" ForegroundFile="Resources\AppIcons\appicon_foreground.svg" />

src/Controls/samples/Controls.Sample/Resources/Raw/HybridSamplePage/scripts/HybridWebView.js

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
+using CoreGraphics;
 using Foundation;
 using Microsoft.Maui.Controls.Compatibility;
 using Microsoft.Maui.Controls.Compatibility.iOS.Resources;
@@ -33,19 +34,15 @@ static ContextActionsCell()
 		{
 			var rect = new RectangleF(0, 0, 1, 1);
 			var size = rect.Size;
-
-			UIGraphics.BeginImageContext(size);
-			var context = UIGraphics.GetCurrentContext();
-			context.SetFillColor(Microsoft.Maui.Platform.ColorExtensions.Red.CGColor);
-			context.FillRect(rect);
-			DestructiveBackground = UIGraphics.GetImageFromCurrentImageContext();
-
-			context.SetFillColor(Microsoft.Maui.Platform.ColorExtensions.LightGray.CGColor);
-			context.FillRect(rect);
-
-			NormalBackground = UIGraphics.GetImageFromCurrentImageContext();
-
-			context.Dispose();
+			using var renderer = new UIGraphicsImageRenderer(size);
+			DestructiveBackground = renderer.CreateImage((UIGraphicsImageRendererContext ctx) =>
+			{
+				FillRect(ctx, rect, ColorExtensions.Red.CGColor);
+			});
+			NormalBackground = renderer.CreateImage((UIGraphicsImageRendererContext ctx) =>
+			{
+				FillRect(ctx, rect, ColorExtensions.LightGray.CGColor);
+			});
 		}
 
 		public ContextActionsCell() : base(UITableViewCellStyle.Default, Key)
@@ -84,6 +81,13 @@ public void Close()
 			_scroller.ContentOffset = new PointF(0, 0);
 		}
 
+		static void FillRect(UIGraphicsImageRendererContext ctx, RectangleF rect, CGColor color)
+		{
+			var context = ctx.CGContext;
+			context.SetFillColor(color);
+			context.FillRect(rect);
+		}
+
 		public override void LayoutSubviews()
 		{
 			base.LayoutSubviews();

src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/ContextActionCell.cs

@@ -38,6 +38,7 @@ public SearchHandlerAppearanceTracker(IShellSearchView searchView, IShellContext
 			UpdateHorizontalTextAlignment();
 			UpdateVerticalTextAlignment();
 			UpdateInputType();
+			UpdateCharacterSpacing();
 		}
 
 		protected virtual void SearchHandlerPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
@@ -90,6 +91,17 @@ protected virtual void SearchHandlerPropertyChanged(object sender, System.Compon
 			{
 				UpdateText();
 			}
+			else if (e.Is(SearchHandler.CharacterSpacingProperty))
+			{
+				UpdateCharacterSpacing();
+			}
+		}
+		void UpdateCharacterSpacing()
+		{
+			if (_editText is not null)
+			{
+				_editText.LetterSpacing = _searchHandler.CharacterSpacing.ToEm();
+			}
 		}
 
 		void UpdateText()

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

@@ -410,7 +410,8 @@ protected virtual async void UpdateLeftBarButtonItem(Context context, AToolbar t
 			var text = backButtonHandler.GetPropertyIfSet(BackButtonBehavior.TextOverrideProperty, String.Empty);
 			var command = backButtonHandler.GetPropertyIfSet<ICommand>(BackButtonBehavior.CommandProperty, null);
 			bool isEnabled = _shell.Toolbar.BackButtonEnabled;
-			var image = GetFlyoutIcon(backButtonHandler, page);
+			//Add the FlyoutIcon only if the FlyoutBehavior is Flyout
+			var image = _flyoutBehavior == FlyoutBehavior.Flyout ? GetFlyoutIcon(backButtonHandler, page) : null;
 			var backButtonVisible = _toolbar.BackButtonVisible;
 
 			DrawerArrowDrawable icon = null;

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

@@ -119,6 +119,10 @@ void SearchHandlerPropertyChanged(object sender, System.ComponentModel.PropertyC
 			{
 				UpdateText(_uiSearchBar.FindDescendantView<UITextField>());
 			}
+			else if (e.Is(SearchHandler.CharacterSpacingProperty))
+			{
+				UpdateCharacterSpacing(_uiSearchBar.FindDescendantView<UITextField>());
+			}
 		}
 
 		void UpdateText(UITextField uiTextField)
@@ -128,6 +132,27 @@ void UpdateText(UITextField uiTextField)
 
 			uiTextField.Text = _searchHandler.Query;
 			UpdateTextTransform(uiTextField);
+			UpdateCharacterSpacing(uiTextField);
+		}
+
+		void UpdateCharacterSpacing(UITextField textField)
+		{
+			if (textField is null)
+			{
+				return;
+			}
+
+			var attributedText = textField.AttributedText?.WithCharacterSpacing(_searchHandler.CharacterSpacing);
+			if (attributedText is not null)
+			{
+				textField.AttributedText = attributedText;
+			}
+
+			var placeholderAttributedText = textField.AttributedPlaceholder?.WithCharacterSpacing(_searchHandler.CharacterSpacing);
+			if (placeholderAttributedText is not null)
+			{
+				textField.AttributedPlaceholder = placeholderAttributedText;
+			}
 		}
 
 		void GetDefaultSearchBarColors(UISearchBar searchBar)

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

@@ -336,7 +336,11 @@ void UpdateLeftToolbarItems()
 
 			if (String.IsNullOrWhiteSpace(text) && image == null)
 			{
-				image = _context.Shell.FlyoutIcon;
+				//Add the FlyoutIcon only if the FlyoutBehavior is Flyout
+				if (_flyoutBehavior == FlyoutBehavior.Flyout)
+				{
+					image = _context.Shell.FlyoutIcon;
+				}
 			}
 
 			if (!IsRootPage)
@@ -803,7 +807,14 @@ void SearchButtonClicked(object sender, EventArgs e)
 
 		void SetSearchBarIcon(UISearchBar searchBar, ImageSource source, UISearchBarIcon icon)
 		{
-			source.LoadImage(source.FindMauiContext(), image =>
+			var mauiContext = source.FindMauiContext(true);
+
+			if (mauiContext is null)
+			{
+				return;
+			}
+
+			source.LoadImage(mauiContext, image =>
 			{
 				var result = image?.Value;
 				if (result != null)
@@ -829,6 +840,11 @@ void OnPageLoaded(object sender, EventArgs e)
 			}
 
 			UpdateToolbarItemsInternal();
+
+			//UIKIt will try to override our colors when the SearchController is inside the NavigationBar
+			//Best way was to force them to be set again when page is loaded / ViewDidLoad
+			_searchHandlerAppearanceTracker?.UpdateSearchBarColors();
+
 			CheckAppeared();
 		}
 
@@ -850,9 +866,6 @@ void SetAppeared()
 				return;
 
 			_isVisiblePage = true;
-			//UIKIt will try to override our colors when the SearchController is inside the NavigationBar
-			//Best way was to force them to be set again when page is Appearing / ViewDidLoad
-			_searchHandlerAppearanceTracker?.UpdateSearchBarColors();
 			UpdateShellToMyPage();
 
 			if (_context.Shell.Toolbar != null)