Skip to content

F
Front-End
Unverified Commit 909e529e authored by Greg Spencer's avatar Greg Spencer Committed by GitHub
Browse files
Options

Convert some usage of `RawKeyEvent`, et al to `KeyEvent` (#139329) 

## Description

This converts some uses of `RawKeyEvent` to `KeyEvent` in preparation for deprecating `RawKeyEvent`.

## Related Issues
 - https://github.com/flutter/flutter/issues/136419
parent 2d60241d
Hide whitespace changes
Inline Side-by-side
Showing with 173 additions and 169 deletions
packages/flutter/lib/src/material/app.dart
View file @ 909e529e
...@@ -1079,8 +1079,9 @@ class _MaterialAppState extends State<MaterialApp> { ...@@ -1079,8 +1079,9 @@ class _MaterialAppState extends State<MaterialApp> {
Widget result = _buildWidgetApp(context); Widget result = _buildWidgetApp(context);
result = Focus( result = Focus(
canRequestFocus: false, canRequestFocus: false,
onKey: (FocusNode node, RawKeyEvent event) { onKeyEvent: (FocusNode node, KeyEvent event) {
if (event is! RawKeyDownEvent || event.logicalKey != LogicalKeyboardKey.escape) { if ((event is! KeyDownEvent && event is! KeyRepeatEvent) ||
event.logicalKey != LogicalKeyboardKey.escape) {
return KeyEventResult.ignored; return KeyEventResult.ignored;
} }
return Tooltip.dismissAllToolTips() ? KeyEventResult.handled : KeyEventResult.ignored; return Tooltip.dismissAllToolTips() ? KeyEventResult.handled : KeyEventResult.ignored;
......
packages/flutter/test/material/text_field_test.dart
View file @ 909e529e
...@@ -31,143 +31,6 @@ import '../widgets/live_text_utils.dart'; ...@@ -31,143 +31,6 @@ import '../widgets/live_text_utils.dart';
import '../widgets/semantics_tester.dart'; import '../widgets/semantics_tester.dart';
import 'feedback_tester.dart'; import 'feedback_tester.dart';
typedef FormatEditUpdateCallback = void Function(TextEditingValue, TextEditingValue);
// On web, key events in text fields are handled by the browser.
const bool areKeyEventsHandledByPlatform = isBrowser;
class CupertinoLocalizationsDelegate extends LocalizationsDelegate<CupertinoLocalizations> {
@override
bool isSupported(Locale locale) => true;
@override
Future<CupertinoLocalizations> load(Locale locale) =>
DefaultCupertinoLocalizations.load(locale);
@override
bool shouldReload(CupertinoLocalizationsDelegate old) => false;
}
class MaterialLocalizationsDelegate extends LocalizationsDelegate<MaterialLocalizations> {
@override
bool isSupported(Locale locale) => true;
@override
Future<MaterialLocalizations> load(Locale locale) => DefaultMaterialLocalizations.load(locale);
@override
bool shouldReload(MaterialLocalizationsDelegate old) => false;
}
class WidgetsLocalizationsDelegate extends LocalizationsDelegate<WidgetsLocalizations> {
@override
bool isSupported(Locale locale) => true;
@override
Future<WidgetsLocalizations> load(Locale locale) => DefaultWidgetsLocalizations.load(locale);
@override
bool shouldReload(WidgetsLocalizationsDelegate old) => false;
}
Widget overlay({ required Widget child }) {
final OverlayEntry entry = OverlayEntry(
builder: (BuildContext context) {
return Center(
child: Material(
child: child,
),
);
},
);
addTearDown(() => entry..remove()..dispose());
return overlayWithEntry(entry);
}
Widget overlayWithEntry(OverlayEntry entry) {
return Localizations(
locale: const Locale('en', 'US'),
delegates: <LocalizationsDelegate<dynamic>>[
WidgetsLocalizationsDelegate(),
MaterialLocalizationsDelegate(),
CupertinoLocalizationsDelegate(),
],
child: DefaultTextEditingShortcuts(
child: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: const MediaQueryData(size: Size(800.0, 600.0)),
child: Overlay(
initialEntries: <OverlayEntry>[
entry,
],
),
),
),
),
);
}
Widget boilerplate({ required Widget child, ThemeData? theme }) {
return MaterialApp(
theme: theme,
home: Localizations(
locale: const Locale('en', 'US'),
delegates: <LocalizationsDelegate<dynamic>>[
WidgetsLocalizationsDelegate(),
MaterialLocalizationsDelegate(),
],
child: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: const MediaQueryData(size: Size(800.0, 600.0)),
child: Center(
child: Material(
child: child,
),
),
),
),
),
);
}
Future<void> skipPastScrollingAnimation(WidgetTester tester) async {
await tester.pump();
await tester.pump(const Duration(milliseconds: 200));
}
double getOpacity(WidgetTester tester, Finder finder) {
return tester.widget<FadeTransition>(
find.ancestor(
of: finder,
matching: find.byType(FadeTransition),
),
).opacity.value;
}
class TestFormatter extends TextInputFormatter {
TestFormatter(this.onFormatEditUpdate);
FormatEditUpdateCallback onFormatEditUpdate;
@override
TextEditingValue formatEditUpdate(TextEditingValue oldValue, TextEditingValue newValue) {
onFormatEditUpdate(oldValue, newValue);
return newValue;
}
}
FocusNode _focusNode() {
final FocusNode result = FocusNode();
addTearDown(result.dispose);
return result;
}
TextEditingController _textEditingController({String text = ''}) {
final TextEditingController result = TextEditingController(text: text);
addTearDown(result.dispose);
return result;
}
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();
final MockClipboard mockClipboard = MockClipboard(); final MockClipboard mockClipboard = MockClipboard();
...@@ -7127,7 +6990,7 @@ void main() { ...@@ -7127,7 +6990,7 @@ void main() {
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
home: Material( home: Material(
child: RawKeyboardListener( child: KeyboardListener(
focusNode: focusNode, focusNode: focusNode,
child: TextField( child: TextField(
controller: controller, controller: controller,
...@@ -7320,7 +7183,7 @@ void main() { ...@@ -7320,7 +7183,7 @@ void main() {
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
home: Material( home: Material(
child: RawKeyboardListener( child: KeyboardListener(
focusNode: focusNode, focusNode: focusNode,
child: textField, child: textField,
), ),
...@@ -7394,7 +7257,7 @@ void main() { ...@@ -7394,7 +7257,7 @@ void main() {
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
home: Material( home: Material(
child: RawKeyboardListener( child: KeyboardListener(
focusNode: focusNode, focusNode: focusNode,
child: textField, child: textField,
), ),
...@@ -7449,7 +7312,7 @@ void main() { ...@@ -7449,7 +7312,7 @@ void main() {
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
home: Material( home: Material(
child: RawKeyboardListener( child: KeyboardListener(
focusNode: focusNode, focusNode: focusNode,
child: textField, child: textField,
), ),
...@@ -7517,7 +7380,7 @@ void main() { ...@@ -7517,7 +7380,7 @@ void main() {
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
home: Material( home: Material(
child: RawKeyboardListener( child: KeyboardListener(
focusNode: focusNode, focusNode: focusNode,
child: textField, child: textField,
), ),
...@@ -7568,7 +7431,7 @@ void main() { ...@@ -7568,7 +7431,7 @@ void main() {
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp( MaterialApp(
home: Material( home: Material(
child: RawKeyboardListener( child: KeyboardListener(
focusNode: focusNode, focusNode: focusNode,
child: textField, child: textField,
), ),
...@@ -7613,7 +7476,7 @@ void main() { ...@@ -7613,7 +7476,7 @@ void main() {
testWidgetsWithLeakTracking('Changing positions of text fields', (WidgetTester tester) async { testWidgetsWithLeakTracking('Changing positions of text fields', (WidgetTester tester) async {
final FocusNode focusNode = _focusNode(); final FocusNode focusNode = _focusNode();
final List<RawKeyEvent> events = <RawKeyEvent>[]; final List<KeyEvent> events = <KeyEvent>[];
final TextEditingController c1 = _textEditingController(); final TextEditingController c1 = _textEditingController();
final TextEditingController c2 = _textEditingController(); final TextEditingController c2 = _textEditingController();
...@@ -7624,9 +7487,9 @@ void main() { ...@@ -7624,9 +7487,9 @@ void main() {
MaterialApp( MaterialApp(
home: home:
Material( Material(
child: RawKeyboardListener( child: KeyboardListener(
focusNode: focusNode, focusNode: focusNode,
onKey: events.add, onKeyEvent: events.add,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[ children: <Widget>[
...@@ -7669,9 +7532,9 @@ void main() { ...@@ -7669,9 +7532,9 @@ void main() {
MaterialApp( MaterialApp(
home: home:
Material( Material(
child: RawKeyboardListener( child: KeyboardListener(
focusNode: focusNode, focusNode: focusNode,
onKey: events.add, onKeyEvent: events.add,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[ children: <Widget>[
...@@ -7707,7 +7570,7 @@ void main() { ...@@ -7707,7 +7570,7 @@ void main() {
testWidgetsWithLeakTracking('Changing focus test', (WidgetTester tester) async { testWidgetsWithLeakTracking('Changing focus test', (WidgetTester tester) async {
final FocusNode focusNode = _focusNode(); final FocusNode focusNode = _focusNode();
final List<RawKeyEvent> events = <RawKeyEvent>[]; final List<KeyEvent> events = <KeyEvent>[];
final TextEditingController c1 = _textEditingController(); final TextEditingController c1 = _textEditingController();
final TextEditingController c2 = _textEditingController(); final TextEditingController c2 = _textEditingController();
...@@ -7718,9 +7581,9 @@ void main() { ...@@ -7718,9 +7581,9 @@ void main() {
MaterialApp( MaterialApp(
home: home:
Material( Material(
child: RawKeyboardListener( child: KeyboardListener(
focusNode: focusNode, focusNode: focusNode,
onKey: events.add, onKeyEvent: events.add,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[ children: <Widget>[
...@@ -17238,3 +17101,141 @@ class _ObscureTextTestWidgetState extends State<_ObscureTextTestWidget> { ...@@ -17238,3 +17101,141 @@ class _ObscureTextTestWidgetState extends State<_ObscureTextTestWidget> {
); );
} }
} }
typedef FormatEditUpdateCallback = void Function(TextEditingValue, TextEditingValue);
// On web, key events in text fields are handled by the browser.
const bool areKeyEventsHandledByPlatform = isBrowser;
class CupertinoLocalizationsDelegate extends LocalizationsDelegate<CupertinoLocalizations> {
@override
bool isSupported(Locale locale) => true;
@override
Future<CupertinoLocalizations> load(Locale locale) =>
DefaultCupertinoLocalizations.load(locale);
@override
bool shouldReload(CupertinoLocalizationsDelegate old) => false;
}
class MaterialLocalizationsDelegate extends LocalizationsDelegate<MaterialLocalizations> {
@override
bool isSupported(Locale locale) => true;
@override
Future<MaterialLocalizations> load(Locale locale) => DefaultMaterialLocalizations.load(locale);
@override
bool shouldReload(MaterialLocalizationsDelegate old) => false;
}
class WidgetsLocalizationsDelegate extends LocalizationsDelegate<WidgetsLocalizations> {
@override
bool isSupported(Locale locale) => true;
@override
Future<WidgetsLocalizations> load(Locale locale) => DefaultWidgetsLocalizations.load(locale);
@override
bool shouldReload(WidgetsLocalizationsDelegate old) => false;
}
Widget overlay({ required Widget child }) {
final OverlayEntry entry = OverlayEntry(
builder: (BuildContext context) {
return Center(
child: Material(
child: child,
),
);
},
);
addTearDown(() => entry..remove()..dispose());
return overlayWithEntry(entry);
}
Widget overlayWithEntry(OverlayEntry entry) {
return Localizations(
locale: const Locale('en', 'US'),
delegates: <LocalizationsDelegate<dynamic>>[
WidgetsLocalizationsDelegate(),
MaterialLocalizationsDelegate(),
CupertinoLocalizationsDelegate(),
],
child: DefaultTextEditingShortcuts(
child: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: const MediaQueryData(size: Size(800.0, 600.0)),
child: Overlay(
initialEntries: <OverlayEntry>[
entry,
],
),
),
),
),
);
}
Widget boilerplate({ required Widget child, ThemeData? theme }) {
return MaterialApp(
theme: theme,
home: Localizations(
locale: const Locale('en', 'US'),
delegates: <LocalizationsDelegate<dynamic>>[
WidgetsLocalizationsDelegate(),
MaterialLocalizationsDelegate(),
],
child: Directionality(
textDirection: TextDirection.ltr,
child: MediaQuery(
data: const MediaQueryData(size: Size(800.0, 600.0)),
child: Center(
child: Material(
child: child,
),
),
),
),
),
);
}
Future<void> skipPastScrollingAnimation(WidgetTester tester) async {
await tester.pump();
await tester.pump(const Duration(milliseconds: 200));
}
double getOpacity(WidgetTester tester, Finder finder) {
return tester.widget<FadeTransition>(
find.ancestor(
of: finder,
matching: find.byType(FadeTransition),
),
).opacity.value;
}
class TestFormatter extends TextInputFormatter {
TestFormatter(this.onFormatEditUpdate);
FormatEditUpdateCallback onFormatEditUpdate;
@override
TextEditingValue formatEditUpdate(TextEditingValue oldValue, TextEditingValue newValue) {
onFormatEditUpdate(oldValue, newValue);
return newValue;
}
}
FocusNode _focusNode() {
final FocusNode result = FocusNode();
addTearDown(result.dispose);
return result;
}
TextEditingController _textEditingController({String text = ''}) {
final TextEditingController result = TextEditingController(text: text);
addTearDown(result.dispose);
return result;
}
packages/flutter/test/widgets/focus_traversal_test.dart
View file @ 909e529e
...@@ -2809,8 +2809,9 @@ void main() { ...@@ -2809,8 +2809,9 @@ void main() {
await tester.pumpWidget(MaterialApp(home: Container())); await tester.pumpWidget(MaterialApp(home: Container()));
RawKeyboard.instance.addListener((RawKeyEvent event) { HardwareKeyboard.instance.addHandler((KeyEvent event) {
events.add(event); events.add(event);
return true;
}); });
await tester.idle(); await tester.idle();
...@@ -2829,7 +2830,7 @@ void main() { ...@@ -2829,7 +2830,7 @@ void main() {
}); });
testWidgetsWithLeakTracking('Focus traversal does not break when no focusable is available on a WidgetsApp', (WidgetTester tester) async { testWidgetsWithLeakTracking('Focus traversal does not break when no focusable is available on a WidgetsApp', (WidgetTester tester) async {
final List<RawKeyEvent> events = <RawKeyEvent>[]; final List<KeyEvent> events = <KeyEvent>[];
await tester.pumpWidget( await tester.pumpWidget(
WidgetsApp( WidgetsApp(
...@@ -2843,8 +2844,9 @@ void main() { ...@@ -2843,8 +2844,9 @@ void main() {
), ),
); );
RawKeyboard.instance.addListener((RawKeyEvent event) { HardwareKeyboard.instance.addHandler((KeyEvent event) {
events.add(event); events.add(event);
return true;
}); });
await tester.idle(); await tester.idle();
......
packages/flutter/test/widgets/selectable_text_test.dart
View file @ 909e529e
...@@ -1895,7 +1895,7 @@ void main() { ...@@ -1895,7 +1895,7 @@ void main() {
testWidgetsWithLeakTracking('Changing positions of selectable text', (WidgetTester tester) async { testWidgetsWithLeakTracking('Changing positions of selectable text', (WidgetTester tester) async {
final FocusNode focusNode = FocusNode(); final FocusNode focusNode = FocusNode();
addTearDown(focusNode.dispose); addTearDown(focusNode.dispose);
final List<RawKeyEvent> events = <RawKeyEvent>[]; final List<KeyEvent> events = <KeyEvent>[];
final Key key1 = UniqueKey(); final Key key1 = UniqueKey();
final Key key2 = UniqueKey(); final Key key2 = UniqueKey();
...@@ -1904,9 +1904,9 @@ void main() { ...@@ -1904,9 +1904,9 @@ void main() {
MaterialApp( MaterialApp(
home: home:
Material( Material(
child: RawKeyboardListener( child: KeyboardListener(
focusNode: focusNode, focusNode: focusNode,
onKey: events.add, onKeyEvent: events.add,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[ children: <Widget>[
...@@ -1947,9 +1947,9 @@ void main() { ...@@ -1947,9 +1947,9 @@ void main() {
MaterialApp( MaterialApp(
home: home:
Material( Material(
child: RawKeyboardListener( child: KeyboardListener(
focusNode: focusNode, focusNode: focusNode,
onKey: events.add, onKeyEvent: events.add,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[ children: <Widget>[
...@@ -1986,7 +1986,7 @@ void main() { ...@@ -1986,7 +1986,7 @@ void main() {
testWidgetsWithLeakTracking('Changing focus test', (WidgetTester tester) async { testWidgetsWithLeakTracking('Changing focus test', (WidgetTester tester) async {
final FocusNode focusNode = FocusNode(); final FocusNode focusNode = FocusNode();
addTearDown(focusNode.dispose); addTearDown(focusNode.dispose);
final List<RawKeyEvent> events = <RawKeyEvent>[]; final List<KeyEvent> events = <KeyEvent>[];
final Key key1 = UniqueKey(); final Key key1 = UniqueKey();
final Key key2 = UniqueKey(); final Key key2 = UniqueKey();
...@@ -1995,9 +1995,9 @@ void main() { ...@@ -1995,9 +1995,9 @@ void main() {
MaterialApp( MaterialApp(
home: home:
Material( Material(
child: RawKeyboardListener( child: KeyboardListener(
focusNode: focusNode, focusNode: focusNode,
onKey: events.add, onKeyEvent: events.add,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[ children: <Widget>[
......
packages/flutter/test/widgets/shortcuts_test.dart
View file @ 909e529e
...@@ -175,7 +175,7 @@ void main() { ...@@ -175,7 +175,7 @@ void main() {
expect(invoked, 0); expect(invoked, 0);
invoked = 0; invoked = 0;
expect(RawKeyboard.instance.keysPressed, isEmpty); expect(HardwareKeyboard.instance.logicalKeysPressed, isEmpty);
}); });
test('LogicalKeySet.hashCode is stable', () { test('LogicalKeySet.hashCode is stable', () {
...@@ -352,7 +352,7 @@ void main() { ...@@ -352,7 +352,7 @@ void main() {
expect(invoked, 1); expect(invoked, 1);
invoked = 0; invoked = 0;
expect(RawKeyboard.instance.keysPressed, isEmpty); expect(HardwareKeyboard.instance.logicalKeysPressed, isEmpty);
}, variant: KeySimulatorTransitModeVariant.all()); }, variant: KeySimulatorTransitModeVariant.all());
testWidgetsWithLeakTracking('handles repeated events', (WidgetTester tester) async { testWidgetsWithLeakTracking('handles repeated events', (WidgetTester tester) async {
...@@ -378,7 +378,7 @@ void main() { ...@@ -378,7 +378,7 @@ void main() {
expect(invoked, 2); expect(invoked, 2);
invoked = 0; invoked = 0;
expect(RawKeyboard.instance.keysPressed, isEmpty); expect(HardwareKeyboard.instance.logicalKeysPressed, isEmpty);
}, variant: KeySimulatorTransitModeVariant.all()); }, variant: KeySimulatorTransitModeVariant.all());
testWidgetsWithLeakTracking('rejects repeated events if requested', (WidgetTester tester) async { testWidgetsWithLeakTracking('rejects repeated events if requested', (WidgetTester tester) async {
...@@ -405,7 +405,7 @@ void main() { ...@@ -405,7 +405,7 @@ void main() {
expect(invoked, 1); expect(invoked, 1);
invoked = 0; invoked = 0;
expect(RawKeyboard.instance.keysPressed, isEmpty); expect(HardwareKeyboard.instance.logicalKeysPressed, isEmpty);
}, variant: KeySimulatorTransitModeVariant.all()); }, variant: KeySimulatorTransitModeVariant.all());
testWidgetsWithLeakTracking('handles Shift-Ctrl-C', (WidgetTester tester) async { testWidgetsWithLeakTracking('handles Shift-Ctrl-C', (WidgetTester tester) async {
...@@ -455,7 +455,7 @@ void main() { ...@@ -455,7 +455,7 @@ void main() {
expect(invoked, 0); expect(invoked, 0);
invoked = 0; invoked = 0;
expect(RawKeyboard.instance.keysPressed, isEmpty); expect(HardwareKeyboard.instance.logicalKeysPressed, isEmpty);
}); });
testWidgetsWithLeakTracking('isActivatedBy works as expected', (WidgetTester tester) async { testWidgetsWithLeakTracking('isActivatedBy works as expected', (WidgetTester tester) async {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab