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.

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

[iOS] Fix SearchBar focus issues #11698

Merged
merged 12 commits into from
Mar 20, 2023
16 changes: 16 additions & 0 deletions src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs
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 @@ -182,6 +186,12 @@ bool ShouldChangeText(UISearchBar searchBar, NSRange range, string text)
return newLength <= VirtualView?.MaxLength;
}

void OnEditingStarted(object? sender, EventArgs e)
{
if (VirtualView is not null)
VirtualView.IsFocused = true;
}

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

void OnEditingStopped(object? sender, EventArgs e)
{
if (VirtualView is not null)
VirtualView.IsFocused = false;
}

void UpdateCancelButtonVisibility()
{
if (PlatformView.ShowsCancelButton != VirtualView.ShouldShowCancelButton())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Microsoft.Maui.DeviceTests.Stubs;
using Microsoft.Maui.Graphics;
using Microsoft.Maui.Handlers;
using Microsoft.Maui.Hosting;
using ObjCRuntime;
using UIKit;
using Xunit;
Expand Down Expand Up @@ -116,17 +117,17 @@ public async Task CharacterSpacingInitializesCorrectly()
string originalText = "Test";
var xplatCharacterSpacing = 4;

var slider = new SearchBarStub()
var searchBar = new SearchBarStub()
{
CharacterSpacing = xplatCharacterSpacing,
Text = originalText
};

var values = await GetValueAsync(slider, (handler) =>
var values = await GetValueAsync(searchBar, (handler) =>
{
return new
{
ViewValue = slider.CharacterSpacing,
ViewValue = searchBar.CharacterSpacing,
PlatformViewValue = GetNativeCharacterSpacing(handler)
};
});
Expand All @@ -135,6 +136,72 @@ public async Task CharacterSpacingInitializesCorrectly()
Assert.Equal(xplatCharacterSpacing, values.PlatformViewValue);
}

[Fact]
public async Task SearchBarFocusedIsWorking()
jsuarezruiz marked this conversation as resolved.
Show resolved Hide resolved
{
EnsureHandlerCreated(builder =>
{
builder.ConfigureMauiHandlers(handler =>
{
handler.AddHandler<VerticalStackLayoutStub, LayoutHandler>();
handler.AddHandler<SearchBarStub, SearchBarHandler>();
});
});

var layout = new VerticalStackLayoutStub();

var searchBar1 = new SearchBarStub
{
Text = "SearchBar 1"
};

var searchBar2 = new SearchBarStub
{
Text = "SearchBar 2"
};

layout.Add(searchBar1);

layout.Width = 100;
layout.Height = 150;

await InvokeOnMainThreadAsync(async () =>
{
var contentViewHandler = CreateHandler<LayoutHandler>(layout);
await contentViewHandler.PlatformView.AttachAndRun(async () =>
{
searchBar1.ToPlatform().Focus(new FocusRequest(false));
await searchBar1.WaitForFocused();
Assert.True(searchBar1.IsFocused);
Assert.False(searchBar2.IsFocused);
});
});
}

[Fact]
public async Task SearchBarUnFocusedIsWorking()
{
var searchBar = new SearchBarStub
{
Text = "SearchBar"
};

await InvokeOnMainThreadAsync(async () =>
{
var searchBarHandler = CreateHandler(searchBar);
await searchBarHandler.PlatformView.AttachAndRun(async () =>
{
searchBar.Handler.Invoke(nameof(IView.Focus), new FocusRequest(false));
await searchBar.WaitForFocused();
Assert.True(searchBar.IsFocused);

searchBar.Handler.Invoke(nameof(IView.Unfocus), new FocusRequest(false));
await searchBar.WaitForUnFocused();
Assert.False(searchBar.IsFocused);
});
});
}

double GetInputFieldHeight(SearchBarHandler searchBarHandler)
{
return GetNativeSearchBar(searchBarHandler).Bounds.Height;
Expand Down