Skip to content

[MacCatalyst] Picker focus events #27973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jfversluis merged 1 commit into from
Feb 27, 2025
Merged

[MacCatalyst] Picker focus events #27973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue2339.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,16 @@ public Issue2339(TestDevice testDevice) : base(testDevice)
[Test]
[Category(UITestCategories.Picker)]
[Category(UITestCategories.Compatibility)]
[FailsOnIOSWhenRunningOnXamarinUITest]
[FailsOnMacWhenRunningOnXamarinUITest("Focus Behavior is different")]
[FailsOnWindowsWhenRunningOnXamarinUITest("Focus Behavior is different")]
public void FocusAndUnFocusMultipleTimes()
{
App.WaitForElement("btnFocusThenUnFocus");
App.Tap("btnFocusThenUnFocus");
App.WaitForNoElement("Picker Focused: 1");
App.WaitForNoElement("Picker UnFocused: 1");
App.Back();
App.WaitForElement("Picker Focused: 1");
App.WaitForElement("Picker UnFocused: 1");
App.Tap("btnFocusThenUnFocus");
App.WaitForNoElement("Picker Focused: 2");
App.WaitForNoElement("Picker UnFocused: 2");
App.WaitForElement("Picker Focused: 2");
App.WaitForElement("Picker UnFocused: 2");
}
}
}
38 changes: 19 additions & 19 deletions src/Core/src/Handlers/Picker/PickerHandler.iOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,18 @@ void DisplayAlert(MauiPicker uITextField)
popoverPresentation.SourceRect = uITextField.Bounds;
}

EventHandler? editingDidEndHandler = null;

editingDidEndHandler = async (s, e) =>
{
await pickerController.DismissViewControllerAsync(true);
if (VirtualView is IPicker virtualView)
virtualView.IsFocused = false;
uITextField.EditingDidEnd -= editingDidEndHandler;
};

uITextField.EditingDidEnd += editingDidEndHandler;

var platformWindow = MauiContext?.GetPlatformWindow();
platformWindow?.BeginInvokeOnMainThread(() =>
{
Expand Down Expand Up @@ -204,37 +216,19 @@ public void Connect(PickerHandler handler, IPicker virtualView, MauiPicker platf
_handler = new(handler);
_virtualView = new(virtualView);

#if MACCATALYST
platformView.ShouldBeginEditing += OnShouldBeginEditing;
#endif
platformView.EditingDidBegin += OnStarted;
platformView.EditingDidEnd += OnEnded;
platformView.EditingChanged += OnEditing;
}

public void Disconnect(MauiPicker platformView)
{
#if MACCATALYST
platformView.ShouldBeginEditing -= OnShouldBeginEditing;
#endif
platformView.EditingDidBegin -= OnStarted;
platformView.EditingDidEnd -= OnEnded;
platformView.EditingChanged -= OnEditing;
}

#if MACCATALYST
bool OnShouldBeginEditing (UITextField textField)
{
if (Handler is not PickerHandler handler)
return false;


// The PlatformView will always be a MauiPicker (which derives from UITextfield) by definition, but we're forced to use
// UITextField as the parameter to satisfy the signature for ShouldBeginEditing. The following cast is safe.
handler.DisplayAlert((MauiPicker)textField);
return false;
}
#else
#if !MACCATALYST
public void OnDone()
{
if (Handler is PickerHandler handler)
Expand All @@ -248,6 +242,12 @@ void OnStarted(object? sender, EventArgs eventArgs)
{
if (VirtualView is IPicker virtualView)
virtualView.IsFocused = true;
#if MACCATALYST
if (Handler is not PickerHandler handler)
return;

handler.DisplayAlert(handler.PlatformView);
#endif
}

void OnEnded(object? sender, EventArgs eventArgs)
Expand Down
Loading