Merge branch 'dotnet:fix-5669' into fix-5669

Author: BagavathiPerumal

src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs

@@ -17,13 +17,15 @@ protected override void ConnectHandler(AutoSuggestBox platformView)
 		{
 			platformView.Loaded += OnLoaded;
 			platformView.QuerySubmitted += OnQuerySubmitted;
+			platformView.KeyDown += OnKeyDown;
 			platformView.TextChanged += OnTextChanged;
 		}
 
 		protected override void DisconnectHandler(AutoSuggestBox platformView)
 		{
 			platformView.Loaded -= OnLoaded;
 			platformView.QuerySubmitted -= OnQuerySubmitted;
+			platformView.KeyDown -= OnKeyDown;
 			platformView.TextChanged -= OnTextChanged;
 		}
 
@@ -138,6 +140,12 @@ void OnQuerySubmitted(AutoSuggestBox? sender, AutoSuggestBoxQuerySubmittedEventA
 			VirtualView.SearchButtonPressed();
 		}
 
+		void OnKeyDown(object sender, UI.Xaml.Input.KeyRoutedEventArgs e)
+		{
+			if (VirtualView.MaxLength != -1)
+				PlatformView?.UpdateMaxLength(VirtualView);
+		}
+
 		void OnTextChanged(AutoSuggestBox? sender, AutoSuggestBoxTextChangedEventArgs e)
 		{
 			if (e.Reason == AutoSuggestionBoxTextChangeReason.ProgrammaticChange)
@@ -149,4 +157,4 @@ void OnTextChanged(AutoSuggestBox? sender, AutoSuggestBoxTextChangedEventArgs e)
 			VirtualView.Text = sender.Text;
 		}
 	}
-}
+}

src/Core/src/Platform/Windows/SearchBarExtensions.cs

@@ -1,4 +1,5 @@
-using Microsoft.Maui.Graphics;
+using System;
+using Microsoft.Maui.Graphics;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
@@ -132,7 +133,7 @@ public static void UpdateMaxLength(this AutoSuggestBox platformControl, ISearchB
 
 			var currentControlText = platformControl.Text;
 
-			if (currentControlText.Length > maxLength)
+			if (currentControlText.Length >= maxLength)
 				platformControl.Text = currentControlText.Substring(0, maxLength);
 		}