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

[macOS] RawKeyboardDataMacos properly handles multi-char characters (#94432)

Browse Source 
* Impl

* Macos
This commit is contained in:
Tong Mu 2021-12-07 13:41:35 -08:00 committed by GitHub
parent e4a1d3e1d3
commit 3af6b2f604
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
packages/flutter/lib/src/services/raw_keyboard_macos.dart
View File

@ -85,25 +85,25 @@ class RawKeyEventDataMacOs extends RawKeyEventData {
return knownKey; return knownKey;
} }
// If this key is printable, generate the LogicalKeyboardKey from its // If this key is a single printable character, generate the
// Unicode value. Control keys such as ESC, CTRL, and SHIFT are not // LogicalKeyboardKey from its Unicode value. Control keys such as ESC,
// printable. HOME, DEL, arrow keys, and function keys are considered // CTRL, and SHIFT are not printable. HOME, DEL, arrow keys, and function
// modifier function keys, which generate invalid Unicode scalar values. // keys are considered modifier function keys, which generate invalid
if (keyLabel.isNotEmpty && // Unicode scalar values. Multi-char characters are also discarded.
!LogicalKeyboardKey.isControlCharacter(keyLabel) && int? character;
!_isUnprintableKey(keyLabel)) { if (keyLabel.isNotEmpty) {
// Given that charactersIgnoringModifiers can contain a String of final List<int> codePoints = keyLabel.runes.toList();
// arbitrary length, limit to a maximum of two Unicode scalar values. It if (codePoints.length == 1 &&
// is unlikely that a keyboard would produce a code point bigger than 32 // Ideally we should test whether `codePoints[0]` is in the range.
// bits, but it is still worth defending against this case. // Since LogicalKeyboardKey.isControlCharacter and _isUnprintableKey
assert(charactersIgnoringModifiers.length <= 2); // only tests BMP, it is fine to test keyLabel instead.
int codeUnit = charactersIgnoringModifiers.codeUnitAt(0); !LogicalKeyboardKey.isControlCharacter(keyLabel) &&
if (charactersIgnoringModifiers.length == 2) { !_isUnprintableKey(keyLabel)) {
final int secondCode = charactersIgnoringModifiers.codeUnitAt(1); character = codePoints[0];
codeUnit = (codeUnit << 16) | secondCode;
} }
}
final int keyId = LogicalKeyboardKey.unicodePlane | (codeUnit & LogicalKeyboardKey.valueMask); if (character != null) {
final int keyId = LogicalKeyboardKey.unicodePlane | (character & LogicalKeyboardKey.valueMask);
return LogicalKeyboardKey.findKeyByKeyId(keyId) ?? LogicalKeyboardKey(keyId); return LogicalKeyboardKey.findKeyByKeyId(keyId) ?? LogicalKeyboardKey(keyId);
} }

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

@ -1475,6 +1475,20 @@ void main() {
expect(data.logicalKey, equals(LogicalKeyboardKey.arrowLeft)); expect(data.logicalKey, equals(LogicalKeyboardKey.arrowLeft));
}); });
test('Multi-char keyboard keys are correctly translated', () {
final RawKeyEvent leftArrowKey = RawKeyEvent.fromMessage(const <String, dynamic>{
'type': 'keydown',
'keymap': 'macos',
'keyCode': 0x00000000,
'characters': 'án',
'charactersIgnoringModifiers': 'án',
'modifiers': 0,
});
final RawKeyEventDataMacOs data = leftArrowKey.data as RawKeyEventDataMacOs;
expect(data.physicalKey, equals(PhysicalKeyboardKey.keyA));
expect(data.logicalKey, equals(const LogicalKeyboardKey(0x1400000000)));
});
test('data.toString', () { test('data.toString', () {
expect(RawKeyEvent.fromMessage(const <String, dynamic>{ expect(RawKeyEvent.fromMessage(const <String, dynamic>{
'type': 'keydown', 'type': 'keydown',