Skip to content

fix(TextBox): Avoid NRE on Android on virtual keyboard enter (backport #13527) #13584

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

Closed
mergify wants to merge 2 commits into from
Closed

fix(TextBox): Avoid NRE on Android on virtual keyboard enter (backport #13527) #13584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a43d19a
fix(TextBox): Avoid NRE on Android on virtual keyboard enter
MartinZikmund Sep 6, 2023
687823e
test: Verify KeyEvent args are not required for virtual keyboard enter
MartinZikmund Sep 6, 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
17 changes: 17 additions & 0 deletions src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_TextBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,5 +677,22 @@ public async Task When_ReadOnly_Toggled_Repeatedly()

Assert.AreEqual(updatedText.Length, textBox.SelectionLength);
}

#if __ANDROID__
[TestMethod]
public async Task When_TextBox_ImeAction_Enter()
{
var textBox = new TextBox
{
Text = "Text",
};

WindowHelper.WindowContent = textBox;
await WindowHelper.WaitForLoaded(textBox);

var act = () => textBox.OnEditorAction(textBox.TextBoxView, Android.Views.InputMethods.ImeAction.Next, null);
act.Should().NotThrow();
}
#endif
}
}
6 changes: 6 additions & 0 deletions src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,9 +555,15 @@ public bool OnEditorAction(TextView v, [GeneratedEnum] ImeAction actionId, KeyEv
{
//We need to force a keypress event on editor action.
//the key press event is not triggered if we press the enter key depending on the ime.options
<<<<<<< HEAD

// TODO: include modifier info in KeyEvent constructor
OnKeyPress(v, new KeyEventArgs(true, Keycode.Enter, new KeyEvent(KeyEventActions.Up, Keycode.Enter)));
=======
var modifiers = e is not null ? VirtualKeyHelper.FromModifiers(e.Modifiers) : VirtualKeyModifiers.None;
RaiseEvent(KeyUpEvent, new KeyRoutedEventArgs(this, global::Windows.System.VirtualKey.Enter, modifiers));
RaiseEvent(KeyUpEvent, new KeyRoutedEventArgs(this, global::Windows.System.VirtualKey.Enter, modifiers));
>>>>>>> d023bb1f58 (fix(TextBox): Avoid NRE on Android on virtual keyboard enter)

// Action will be ImeNull if AcceptsReturn is true, in which case we return false to allow the new line to register.
// Otherwise we return true to allow the focus to change correctly.
Expand Down