Skip to content
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

Jump to bottom

[iOS] Fix SearchBar focus issues #11698

Merged
merged 12 commits into from
Mar 20, 2023
Merged

[iOS] Fix SearchBar focus issues #11698

Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4613874
Fix SearchBar focus issues on iOS/Catalyst
jsuarezruiz Nov 28, 2022
ac35292
Merge branch 'main' into fix-11542
jsuarezruiz Dec 19, 2022
09793f0
Merge branch 'main' into fix-11542
jsuarezruiz Feb 9, 2023
4eac3a8
Merge branch 'main' into fix-11542
jsuarezruiz Feb 20, 2023
70d1177
Code refactoring
jsuarezruiz Feb 23, 2023
d6253b8
Merge branch 'main' into fix-11542
jsuarezruiz Mar 13, 2023
8724878
Added device test
jsuarezruiz Mar 13, 2023
5fe4968
Merge branch 'main' into fix-11542
jsuarezruiz Mar 14, 2023
f69a272
Merge branch 'main' into fix-11542
jsuarezruiz Mar 16, 2023
30acf6a
Merge branch 'main' into fix-11542
jsuarezruiz Mar 20, 2023
eccb688
More device tests
jsuarezruiz Mar 20, 2023
e4130b2
Auto-format source code
Mar 20, 2023
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
16 changes: 16 additions & 0 deletions src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ protected override void ConnectHandler(MauiSearchBar platformView)
platformView.TextSetOrChanged += OnTextPropertySet;
platformView.OnMovedToWindow += OnMovedToWindow;
platformView.ShouldChangeTextInRange += ShouldChangeText;
platformView.OnEditingStarted += OnEditingStarted;
platformView.EditingChanged += OnEditingChanged;
platformView.OnEditingStopped += OnEditingStopped;

base.ConnectHandler(platformView);
}
Expand All @@ -47,7 +49,9 @@ protected override void DisconnectHandler(MauiSearchBar platformView)
platformView.TextSetOrChanged -= OnTextPropertySet;
platformView.ShouldChangeTextInRange -= ShouldChangeText;
platformView.OnMovedToWindow -= OnMovedToWindow;
platformView.OnEditingStarted -= OnEditingStarted;
platformView.EditingChanged -= OnEditingChanged;
platformView.OnEditingStopped -= OnEditingStopped;

base.DisconnectHandler(platformView);
}
Expand Down Expand Up @@ -177,6 +181,12 @@ bool ShouldChangeText(UISearchBar searchBar, NSRange range, string text)
return newLength <= VirtualView?.MaxLength;
}

void OnEditingStarted(object? sender, EventArgs e)
{
if (VirtualView != null)
jsuarezruiz marked this conversation as resolved.
Show resolved Hide resolved
VirtualView.IsFocused = true;
}

void OnEditingChanged(object? sender, EventArgs e)
{
if (VirtualView == null || _editor == null)
Expand All @@ -187,6 +197,12 @@ void OnEditingChanged(object? sender, EventArgs e)
UpdateCancelButtonVisibility();
}

void OnEditingStopped(object? sender, EventArgs e)
{
if (VirtualView != null)
jsuarezruiz marked this conversation as resolved.
Show resolved Hide resolved
VirtualView.IsFocused = false;
}

void UpdateCancelButtonVisibility()
{
if (PlatformView.ShowsCancelButton != VirtualView.ShouldShowCancelButton())
Expand Down