Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Core/src/Handlers/Picker/PickerHandler.iOS.cs
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,8 @@ void UpdatePickerFromPickerSource(PickerSource? pickerSource)

PlatformView.Text = VirtualView.GetItem(pickerSource.SelectedIndex);
VirtualView.SelectedIndex = pickerSource.SelectedIndex;
// Re-apply kern: plain Text assignment above clears iOS kern attributes.
PlatformView.UpdateCharacterSpacing(VirtualView);
}

void UpdatePickerSelectedIndex(UIPickerView? pickerView, int formsIndex)
Expand Down
2 changes: 2 additions & 0 deletions src/Core/src/Platform/iOS/PickerExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ internal static void UpdatePicker(this MauiPicker platformPicker, IPicker picker
platformPicker.UpdatePickerTitle(picker);
}

platformPicker.UpdateCharacterSpacing(picker);

var pickerView = platformPicker.UIPickerView;
pickerView?.ReloadAllComponents();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,91 @@ public async Task TextColorInitializesCorrectly()
Assert.Equal(expectedValue, values.PlatformViewValue);
}

[Theory(DisplayName = "Updating SelectedIndex Does Not Affect CharacterSpacing")]
[InlineData(0, 1)]
[InlineData(1, 0)]
public async Task SelectedIndexDoesNotAffectCharacterSpacing(int initialIndex, int newIndex)
{
var picker = new PickerStub
{
Title = "Select an Item",
Items = new[] { "Apple", "Banana", "Cherry" },
CharacterSpacing = 4,
SelectedIndex = initialIndex
};

await InvokeOnMainThreadAsync(() =>
{
var handler = CreateHandler(picker);
handler.UpdateValue(nameof(IPicker.CharacterSpacing));

var before = GetNativeCharacterSpacing(handler);
Assert.Equal(4.0, before);

picker.SelectedIndex = newIndex;
handler.UpdateValue(nameof(IPicker.SelectedIndex));

var after = GetNativeCharacterSpacing(handler);
Assert.Equal(4.0, after);
});
}

[Theory(DisplayName = "Selecting An Item With Done Keeps CharacterSpacing")]
[InlineData(0, 1)]
[InlineData(1, 0)]
public async Task SelectingItemWithDoneDoesNotAffectCharacterSpacing(int initialIndex, int newIndex)
{
var picker = new PickerStub
{
Title = "Select an Item",
Items = new[] { "Apple", "Banana", "Cherry" },
CharacterSpacing = 4,
SelectedIndex = initialIndex
};

await InvokeOnMainThreadAsync(() =>
{
var handler = CreateHandler(picker);
handler.UpdateValue(nameof(IPicker.CharacterSpacing));

var before = GetNativeCharacterSpacing(handler);
Assert.Equal(4.0, before);

var mauiPicker = GetNativePicker(handler);
mauiPicker.BecomeFirstResponder();

var pickerView = mauiPicker.UIPickerView;
var model = (PickerSource)pickerView.Model;
pickerView.Select(newIndex, 0, false);
model.Selected(pickerView, newIndex, 0);
TapDoneOnInputAccessoryView(mauiPicker);

Assert.Equal(picker.Items[newIndex], GetNativeText(handler));

var after = GetNativeCharacterSpacing(handler);
Assert.Equal(4.0, after);
});
}

void TapDoneOnInputAccessoryView(MauiPicker mauiPicker)
{
var toolbar = mauiPicker.InputAccessoryView as UIToolbar;
Assert.NotNull(toolbar);
Assert.NotNull(toolbar.Items);
Assert.NotEmpty(toolbar.Items);
var doneButton = toolbar.Items[toolbar.Items.Length - 1];
Assert.NotNull(doneButton);
Assert.NotNull(doneButton.Target);
Assert.NotNull(doneButton.Action);
UIApplication.SharedApplication.SendAction(doneButton.Action, doneButton.Target, doneButton, null);
}

double GetNativeCharacterSpacing(PickerHandler pickerHandler)
{
var mauiPicker = GetNativePicker(pickerHandler);
return mauiPicker.AttributedText.GetCharacterSpacing();
}

Comment thread
SyedAbdulAzeemSF4852 marked this conversation as resolved.
MauiPicker GetNativePicker(PickerHandler pickerHandler) =>
pickerHandler.PlatformView;

Expand Down
Loading