Refactor SfOtpInput and update unit tests

Enhanced `SfOtpInput.cs` with new using directives, restructured event handlers, and added `ApplyEntrySize` method for better dimension management. Improved code readability and updated comments for clarity.

Updated `SfOtpInputUnitTests.cs` for consistent formatting and added tests to verify `BoxWidth` and `BoxHeight` changes. Overall improvements enhance clarity and maintainability of both implementation and tests.

Refactor SfOtpInput for clarity and add unit tests

Improved code structure in `SfOtpInput.cs` by reorganizing `using` directives, updating documentation, and encapsulating entry dimension logic in a new `ApplyEntrySize` method. Enhanced focus event handling for consistency across input types.

Added unit tests in `SfOtpInputUnitTests.cs` to verify updates to `BoxWidth` and `BoxHeight`, ensuring correct entry dimensions. Improved existing tests for clarity and maintainability, enhancing overall test coverage for the `SfOtpInput` class.

Author: LeoJHarris

maui/src/OtpInput/SfOtpInput.cs

@@ -1,10 +1,10 @@
-using Syncfusion.Maui.Toolkit.Internals;
-using Syncfusion.Maui.Toolkit.Graphics.Internals;
-using Rect = Microsoft.Maui.Graphics.Rect; // Alias for Maui's Rect
-using TextAlignment = Microsoft.Maui.TextAlignment; // Alias for Maui's TextAlignment
-using ResourceDictionary = Microsoft.Maui.Controls.ResourceDictionary; // Alias for Maui's ResourceDictionary
+using Syncfusion.Maui.Toolkit.Graphics.Internals;
 using Syncfusion.Maui.Toolkit.Helper;
+using Syncfusion.Maui.Toolkit.Internals;
 using Syncfusion.Maui.Toolkit.Themes;
+using Rect = Microsoft.Maui.Graphics.Rect;
+using ResourceDictionary = Microsoft.Maui.Controls.ResourceDictionary;
+using TextAlignment = Microsoft.Maui.TextAlignment;
 using System.Globalization;
 #if WINDOWS
 using Microsoft.UI.Xaml;
@@ -1057,10 +1057,10 @@ static void OnAutoFocusPropertyChanged(BindableObject bindable, object oldValue,
 				if ((bool)newValue)
 				{
 #if !(MACCATALYST || IOS)
-                    otpInput.Loaded += (s, e) =>
-                    {
-                        otpInput._otpEntries[0].Focus();
-                    };
+					otpInput.Loaded += (s, e) =>
+					{
+						otpInput._otpEntries[0].Focus();
+					};
 #else
 					Task.Run(() =>
 					{
@@ -1154,7 +1154,7 @@ static void OnStrokePropertyChanged(BindableObject bindable, object oldValue, ob
 		}
 
 		/// <summary>
-		/// Add this property changed handler
+		/// Updates all OTP entry dimensions when BoxWidth or BoxHeight changes.
 		/// </summary>
 		static void OnBoxSizePropertyChanged(BindableObject bindable, object oldValue, object newValue)
 		{
@@ -1166,10 +1166,7 @@ static void OnBoxSizePropertyChanged(BindableObject bindable, object oldValue, o
 				{
 					foreach (var entry in otpInput._otpEntries)
 					{
-						entry.MinimumWidthRequest = otpInput._entryWidth;
-						entry.MinimumHeightRequest = otpInput._entryHeight;
-						entry.WidthRequest = otpInput._entryWidth;
-						entry.HeightRequest = otpInput._entryHeight;
+						otpInput.ApplyEntrySize(entry);
 					}
 				}
 				otpInput.InvalidateMeasure();
@@ -1411,23 +1408,31 @@ OTPEntry InitializeEntry()
 		{
 			OTPEntry otpEntry = new OTPEntry
 			{
-				MinimumWidthRequest = _entryWidth,
-				MinimumHeightRequest = _entryHeight,
-				WidthRequest = _entryWidth,
-				HeightRequest = _entryHeight,
 				FontSize = 16,
 				HorizontalTextAlignment = TextAlignment.Center,
 				VerticalTextAlignment = TextAlignment.Center,
 				Keyboard = Type is OtpInputType.Number ? Keyboard.Numeric : Keyboard.Text,
 			};
 
+			ApplyEntrySize(otpEntry);
 			otpEntry.BindingContext = this;
 			otpEntry.SetBinding(OTPEntry.PlaceholderColorProperty, BindingHelper.CreateBinding(nameof(PlaceholderColor), getter: static (SfOtpInput otpInput) => otpInput.PlaceholderColor));
 			otpEntry.SetBinding(OTPEntry.TextColorProperty, BindingHelper.CreateBinding(nameof(TextColor), getter: static (SfOtpInput otpInput) => otpInput.TextColor));
 
 			return otpEntry;
 		}
 
+		/// <summary>
+		/// Applies the current entry size to the given OTPEntry.
+		/// </summary>
+		void ApplyEntrySize(OTPEntry entry)
+		{
+			entry.MinimumWidthRequest = _entryWidth;
+			entry.MinimumHeightRequest = _entryHeight;
+			entry.WidthRequest = _entryWidth;
+			entry.HeightRequest = _entryHeight;
+		}
+
 		/// <summary>
 		/// Handles the event when an OTP input field receives focus.
 		/// Updates the focused index and redraws the control.
@@ -1533,19 +1538,19 @@ void OnEntryTextChanged(object? sender, Microsoft.Maui.Controls.TextChangedEvent
 				});
 			}
 #else
+			{
+				if (Type is OtpInputType.Password && e.NewTextValue is not "")
 				{
-					if (Type is OtpInputType.Password && e.NewTextValue is not "")
-					{
-						_otpEntries[index].Text = MaskCharacter.ToString();
-					}
-
-					if (isValidText)
-					{
-						Value = new string(valueArray);
-					}
+					_otpEntries[index].Text = MaskCharacter.ToString();
+				}
 
-					HandleFocus(index, hasText);
+				if (isValidText)
+				{
+					Value = new string(valueArray);
 				}
+
+				HandleFocus(index, hasText);
+			}
 #endif
 
 #if ANDROID || WINDOWS

maui/tests/Syncfusion.Maui.Toolkit.UnitTest/Editors/SfOtpInputUnitTests.cs

@@ -120,7 +120,7 @@ public void GetVisualState_Filled(bool enabled, bool hovered, string stroke, str
 		[InlineData(OtpInputStyle.Outlined, 13, false, OtpInputState.Error, "#008000", "#FF0000", "#1C1B1F", "#611c1b1f")]
 		public void UpdateParameters(OtpInputStyle otpInputStyle, double cornerRadius, bool isEnabled, OtpInputState otpInputState, string stroke, string background, string textColor, string disabledTextColor)
 		{
-			OTPEntry otpEntry = new OTPEntry();			
+			OTPEntry otpEntry = new OTPEntry();
 			otpEntry.UpdateParameters(otpInputStyle, cornerRadius, new PointF(10, 10), new PointF(30, 30), new SfOtpInput(),isEnabled, otpInputState, Color.FromArgb(stroke), Color.FromArgb(background), Color.FromArgb(textColor), Color.FromArgb(disabledTextColor));
 			OtpInputStyle? resultInputStyle = (OtpInputStyle?)GetPrivateField(otpEntry, "_styleMode");
 			double? resultCornerRadius = (double?)GetPrivateField(otpEntry, "_cornerRadius");
@@ -292,6 +292,48 @@ public void InputBackground(Color input, Color expected)
 			Assert.Equal(expected, actual);
 		}
 
+		
+
+		[Theory]
+		[InlineData(40)]
+		[InlineData(60)]
+		[InlineData(100)]
+		public void BoxWidth_UpdatesEntryDimensions(double newWidth)
+		{
+			var otpInput = new SfOtpInput();
+			otpInput.BoxWidth = newWidth;
+			var _otpEntries = (OTPEntry[]?)GetPrivateField(otpInput, "_otpEntries");
+			if (_otpEntries != null)
+			{
+				foreach (var entry in _otpEntries)
+				{
+					Assert.Equal(newWidth, entry.MinimumWidthRequest);
+					Assert.Equal(newWidth, entry.WidthRequest);
+				}
+			}
+		}
+
+		
+
+		[Theory]
+		[InlineData(40)]
+		[InlineData(55)]
+		[InlineData(80)]
+		public void BoxHeight_UpdatesEntryDimensions(double newHeight)
+		{
+			var otpInput = new SfOtpInput();
+			otpInput.BoxHeight = newHeight;
+			var _otpEntries = (OTPEntry[]?)GetPrivateField(otpInput, "_otpEntries");
+			if (_otpEntries != null)
+			{
+				foreach (var entry in _otpEntries)
+				{
+					Assert.Equal(newHeight, entry.MinimumHeightRequest);
+					Assert.Equal(newHeight, entry.HeightRequest);
+				}
+			}
+		}
+
 		#endregion
 
 		#region Internal Properties
@@ -548,11 +590,11 @@ public void FocusAsync()
 			var otpInput = new SfOtpInput();
 			OTPEntry[]? otpEntries = (OTPEntry[]?)GetPrivateField(otpInput, "_otpEntries");
 			SetPrivateField(otpInput, "_otpEntries", otpEntries);
-			var sender = otpEntries?[2]; 
+			var sender = otpEntries?[2];
 			var focusEventArgs = new FocusEventArgs(otpInput,true);
 			InvokePrivateMethod(otpInput, "FocusAsync", sender, focusEventArgs);
 			var focusedIndex = (int?)GetPrivateField(otpInput, "_focusedIndex");
-			Assert.Equal(2, focusedIndex); 
+			Assert.Equal(2, focusedIndex);
 		}
 
 
@@ -567,14 +609,14 @@ public void FocusOutAsync()
 		}
 
 		[Theory]
-		[InlineData(0, true, 0)]  
+		[InlineData(0, true, 0)]
 		[InlineData(1, false, 1)]
 		public void FocusEntry(int index, bool setCursorToStart, int expectedCursorPosition)
 		{
 			var otpInput = new SfOtpInput();
 			OTPEntry[]? otpEntries = (OTPEntry[]?)GetPrivateField(otpInput, "_otpEntries");
 			SetPrivateField(otpInput, "_otpEntries", otpEntries);
-			SetPrivateField(otpInput, "_focusedIndex", 0); 
+			SetPrivateField(otpInput, "_focusedIndex", 0);
 			otpEntries?[0].Focus();
 			InvokePrivateMethod(otpInput, "FocusEntry", index, setCursorToStart);
 			int? resultFocusedIndex = (int?)GetPrivateField(otpInput, "_focusedIndex");
@@ -584,9 +626,9 @@ public void FocusEntry(int index, bool setCursorToStart, int expectedCursorPosit
 		}
 
 		[Theory]
-		[InlineData(3, true, 3)] 
+		[InlineData(3, true, 3)]
 		[InlineData(0, false, 0)]
-		[InlineData(3, false, 3)] 
+		[InlineData(3, false, 3)]
 		public void HandleFocus(int index, bool hasText, int expectedFocusIndex)
 		{
 			var otpInput = new SfOtpInput ();
@@ -596,26 +638,26 @@ public void HandleFocus(int index, bool hasText, int expectedFocusIndex)
 			SetPrivateField(otpInput, "_focusedIndex", index);
 			InvokePrivateMethod(otpInput,"HandleFocus", index, hasText);
 			focusedIndex = GetPrivateField(otpInput, "_focusedIndex");
-			Assert.Equal(expectedFocusIndex, focusedIndex); 
+			Assert.Equal(expectedFocusIndex, focusedIndex);
 		}
 
 		[Theory]
-		[InlineData(0, 1)] 
+		[InlineData(0, 1)]
 		[InlineData(1, 1)]
-		[InlineData(2,1)] 
-		[InlineData(3, 1)] 
+		[InlineData(2,1)]
+		[InlineData(3, 1)]
 		public void GetStrokeThickness(int index, float expectedStrokeThickness)
 		{
 			var otpInput = new SfOtpInput();
 			OTPEntry[]? otpEntries = (OTPEntry[]?)GetPrivateField(otpInput, "_otpEntries");
 			SetPrivateField(otpInput,"_otpEntries", otpEntries);
 			float? strokeThickness =(float?) InvokePrivateMethod(otpInput, "GetStrokeThickness", index);
-			Assert.Equal(expectedStrokeThickness, strokeThickness); 
+			Assert.Equal(expectedStrokeThickness, strokeThickness);
 		}
 
 
 		[Theory]
-		[InlineData(0, 30f, 40f, 5f, 3f, 50f, false, 300f)] 
+		[InlineData(0, 30f, 40f, 5f, 3f, 50f, false, 300f)]
 		[InlineData(1, 35f, 45f, 10f, 5f, 60f, false, 300f)]
 		public void UpdateDrawingParameters(int index, float entryWidth, float entryHeight, float spacing, float extraSpacing, float lineLength, bool isRTL, float controlWidth)
 		{
@@ -667,14 +709,14 @@ public void UpdateValue()
 			var otpInput = new SfOtpInput();
 			OTPEntry[]? _otpEntries = (OTPEntry[]?)GetPrivateField(otpInput, "_otpEntries");
 
-			string invalidInput = "12A4"; 
-			InvokePrivateMethod(otpInput, "UpdateValue", otpInput, invalidInput); 
+			string invalidInput = "12A4";
+			InvokePrivateMethod(otpInput, "UpdateValue", otpInput, invalidInput);
 			Assert.Equal("1", _otpEntries?[0].Text);
 			Assert.Equal("2", _otpEntries?[1].Text);
-			Assert.Equal("", _otpEntries?[2].Text); 
+			Assert.Equal("", _otpEntries?[2].Text);
 			Assert.Equal("4", _otpEntries?[3].Text);
 
-			otpInput.Type = OtpInputType.Password; 
+			otpInput.Type = OtpInputType.Password;
 			string passwordInput = "1234";
 			InvokePrivateMethod(otpInput, "UpdateValue", otpInput, passwordInput);
 			if (_otpEntries != null)
@@ -696,7 +738,7 @@ public void UpdateEntriesLength(int initialLength, int newLength)
 			InvokePrivateMethod(otpInput, "UpdateEntriesLength", initialLength, newLength);
 			OTPEntry[]? _otpEntries = (OTPEntry[]?)GetPrivateField(otpInput, "_otpEntries");
 			SetPrivateField(otpInput, "_otpEntries", _otpEntries);
-			Assert.Equal(newLength, _otpEntries?.Length); 
+			Assert.Equal(newLength, _otpEntries?.Length);
 		}
 
 		[Theory]
@@ -753,14 +795,14 @@ public void AddEntry(int initialLength,int newLength)
 			int expectedSeparatorCount = newLength - 1;
 			int actualSeparatorCount = layout.Children.OfType<SfLabel>().Count();
 			Assert.Equal(expectedSeparatorCount, actualSeparatorCount);
-			int expectedTotalChildren = newLength + expectedSeparatorCount; 
+			int expectedTotalChildren = newLength + expectedSeparatorCount;
 			Assert.Equal(expectedTotalChildren, layout.Children.Count);
 		}
 
 
 		[Theory]
-		[InlineData(0, 50f, 30f, 5f, 5f)]  
-		[InlineData(0, 60f, 40f, 10f, 10f)]  
+		[InlineData(0, 50f, 30f, 5f, 5f)]
+		[InlineData(0, 60f, 40f, 10f, 10f)]
 		public void SetInputFieldPosition(int index, float entryWidth, float entryHeight, float spacing, float extraSpacing)
 		{
 
@@ -777,22 +819,22 @@ public void SetInputFieldPosition(int index, float entryWidth, float entryHeight
 			InvokePrivateMethod(otpInput, "SetInputFieldPosition", index, otpEntry);
 
 			RectF[]? entryBounds = (RectF[]?)GetPrivateField(otpInput, "_entryBounds");
-			Assert.Equal(index + 1, entryBounds?.Length);  
+			Assert.Equal(index + 1, entryBounds?.Length);
 
 			var layoutBounds = AbsoluteLayout.GetLayoutBounds(otpEntry);
 
 			float expectedX =  (entryWidth + spacing) * index + extraSpacing;
 			float expectedY =  extraSpacing;
 
-			Assert.Equal(expectedX, layoutBounds.X);  
+			Assert.Equal(expectedX, layoutBounds.X);
 			Assert.Equal(expectedY, layoutBounds.Y);
 			Assert.Equal(entryWidth, layoutBounds.Width);
-			Assert.Equal(entryHeight, layoutBounds.Height); 
+			Assert.Equal(entryHeight, layoutBounds.Height);
 		}
 
 		[Theory]
-		[InlineData(0, 50f, 30f, 5f, 5f)] 
-		[InlineData(1, 60f, 40f, 10f, 10f)] 
+		[InlineData(0, 50f, 30f, 5f, 5f)]
+		[InlineData(1, 60f, 40f, 10f, 10f)]
 		public void SetSeparatorPosition(int index, float entryWidth, float entryHeight, float spacing, float separatorWidth)
 		{
 			var otpInput = new SfOtpInput();