firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the character field of RawKeyEvent is always null on iOS (#135100)

Browse Source 
Fixes https://github.com/flutter/flutter/issues/133956
This commit is contained in:
林洵锋 2023-10-03 13:26:41 +08:00 committed by GitHub
parent 2d2049a17c
commit 047bd6cebd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter/lib/src/services/raw_keyboard.dart
View File

@ -356,6 +356,10 @@ abstract class RawKeyEvent with Diagnosticable {
keyCode: message['keyCode'] as int? ?? 0, keyCode: message['keyCode'] as int? ?? 0,
modifiers: message['modifiers'] as int? ?? 0, modifiers: message['modifiers'] as int? ?? 0,
); );
final Object? characters = message['characters'];
if (characters is String && characters.isNotEmpty) {
character = characters;
}
case 'linux': case 'linux':
final int unicodeScalarValues = message['unicodeScalarValues'] as int? ?? 0; final int unicodeScalarValues = message['unicodeScalarValues'] as int? ?? 0;
data = RawKeyEventDataLinux( data = RawKeyEventDataLinux(

4
packages/flutter/test/services/raw_keyboard_test.dart
View File

@ -19,7 +19,7 @@ class _ModifierCheck {
void main() { void main() {
group('RawKeyboard', () { group('RawKeyboard', () {
testWidgetsWithLeakTracking('The correct character is produced', (WidgetTester tester) async { testWidgetsWithLeakTracking('The correct character is produced', (WidgetTester tester) async {
for (final String platform in <String>['linux', 'android', 'macos', 'fuchsia', 'windows']) { for (final String platform in <String>['linux', 'android', 'macos', 'fuchsia', 'windows', 'ios']) {
String character = ''; String character = '';
void handleKey(RawKeyEvent event) { void handleKey(RawKeyEvent event) {
expect(event.character, equals(character), reason: 'on $platform'); expect(event.character, equals(character), reason: 'on $platform');
@ -34,7 +34,7 @@ void main() {
}); });
testWidgetsWithLeakTracking('No character is produced for non-printables', (WidgetTester tester) async { testWidgetsWithLeakTracking('No character is produced for non-printables', (WidgetTester tester) async {
for (final String platform in <String>['linux', 'android', 'macos', 'fuchsia', 'windows', 'web']) { for (final String platform in <String>['linux', 'android', 'macos', 'fuchsia', 'windows', 'web', 'ios']) {
void handleKey(RawKeyEvent event) { void handleKey(RawKeyEvent event) {
expect(event.character, isNull, reason: 'on $platform'); expect(event.character, isNull, reason: 'on $platform');
} }