mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
Follow up of https://github.com/flutter/flutter/pull/174323 This pull request updates the usage of state sets in theme and widget property resolution logic throughout the codebase, replacing all instances of `MaterialState` with `WidgetState`. This change ensures consistency with the newer `WidgetState` API and prepares the code for future enhancements or compatibility. The update affects component themes, button styles, property generators, and related tests. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [ ] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
199 lines
6.1 KiB
Dart
199 lines
6.1 KiB
Dart
// Copyright 2014 The Flutter Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter/services.dart';
|
|
|
|
void main() {
|
|
runApp(const MaterialApp(title: 'Focus Demo', home: FocusDemo()));
|
|
}
|
|
|
|
class DemoButton extends StatefulWidget {
|
|
const DemoButton({
|
|
super.key,
|
|
required this.name,
|
|
this.canRequestFocus = true,
|
|
this.autofocus = false,
|
|
});
|
|
|
|
final String name;
|
|
final bool canRequestFocus;
|
|
final bool autofocus;
|
|
|
|
@override
|
|
State<DemoButton> createState() => _DemoButtonState();
|
|
}
|
|
|
|
class _DemoButtonState extends State<DemoButton> {
|
|
late final FocusNode focusNode = FocusNode(
|
|
debugLabel: widget.name,
|
|
canRequestFocus: widget.canRequestFocus,
|
|
);
|
|
|
|
@override
|
|
void dispose() {
|
|
focusNode.dispose();
|
|
super.dispose();
|
|
}
|
|
|
|
@override
|
|
void didUpdateWidget(DemoButton oldWidget) {
|
|
super.didUpdateWidget(oldWidget);
|
|
focusNode.canRequestFocus = widget.canRequestFocus;
|
|
}
|
|
|
|
void _handleOnPressed() {
|
|
focusNode.requestFocus();
|
|
print('Button ${widget.name} pressed.');
|
|
debugDumpFocusTree();
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return TextButton(
|
|
focusNode: focusNode,
|
|
autofocus: widget.autofocus,
|
|
style: ButtonStyle(
|
|
overlayColor: WidgetStateProperty.resolveWith<Color>((Set<WidgetState> states) {
|
|
if (states.contains(WidgetState.focused)) {
|
|
return Colors.red.withOpacity(0.25);
|
|
}
|
|
if (states.contains(WidgetState.hovered)) {
|
|
return Colors.blue.withOpacity(0.25);
|
|
}
|
|
return Colors.transparent;
|
|
}),
|
|
),
|
|
onPressed: () => _handleOnPressed(),
|
|
child: Text(widget.name),
|
|
);
|
|
}
|
|
}
|
|
|
|
class FocusDemo extends StatefulWidget {
|
|
const FocusDemo({super.key});
|
|
|
|
@override
|
|
State<FocusDemo> createState() => _FocusDemoState();
|
|
}
|
|
|
|
class _FocusDemoState extends State<FocusDemo> {
|
|
FocusNode? outlineFocus;
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
outlineFocus = FocusNode(debugLabel: 'Demo Focus Node');
|
|
}
|
|
|
|
@override
|
|
void dispose() {
|
|
outlineFocus?.dispose();
|
|
super.dispose();
|
|
}
|
|
|
|
KeyEventResult _handleKeyPress(FocusNode node, KeyEvent event) {
|
|
if (event is KeyDownEvent) {
|
|
print('Scope got key event: ${event.logicalKey}, $node');
|
|
print('Keys down: ${HardwareKeyboard.instance.logicalKeysPressed}');
|
|
if (event.logicalKey == LogicalKeyboardKey.tab) {
|
|
debugDumpFocusTree();
|
|
if (HardwareKeyboard.instance.logicalKeysPressed.contains(LogicalKeyboardKey.shiftLeft) ||
|
|
HardwareKeyboard.instance.logicalKeysPressed.contains(LogicalKeyboardKey.shiftRight)) {
|
|
print('Moving to previous.');
|
|
node.previousFocus();
|
|
return KeyEventResult.handled;
|
|
} else {
|
|
print('Moving to next.');
|
|
node.nextFocus();
|
|
return KeyEventResult.handled;
|
|
}
|
|
}
|
|
final TraversalDirection? direction = switch (event.logicalKey) {
|
|
LogicalKeyboardKey.arrowLeft => TraversalDirection.left,
|
|
LogicalKeyboardKey.arrowRight => TraversalDirection.right,
|
|
LogicalKeyboardKey.arrowUp => TraversalDirection.up,
|
|
LogicalKeyboardKey.arrowDown => TraversalDirection.down,
|
|
_ => null,
|
|
};
|
|
if (direction != null) {
|
|
node.focusInDirection(direction);
|
|
return KeyEventResult.handled;
|
|
}
|
|
}
|
|
return KeyEventResult.ignored;
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final TextTheme textTheme = Theme.of(context).textTheme;
|
|
|
|
return FocusTraversalGroup(
|
|
policy: ReadingOrderTraversalPolicy(),
|
|
child: FocusScope(
|
|
debugLabel: 'Scope',
|
|
onKeyEvent: _handleKeyPress,
|
|
autofocus: true,
|
|
child: DefaultTextStyle(
|
|
style: textTheme.headlineMedium!,
|
|
child: Scaffold(
|
|
appBar: AppBar(title: const Text('Focus Demo')),
|
|
floatingActionButton: FloatingActionButton(child: const Text('+'), onPressed: () {}),
|
|
body: Center(
|
|
child: Builder(
|
|
builder: (BuildContext context) {
|
|
return Column(
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
children: <Widget>[
|
|
const Row(
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
children: <Widget>[DemoButton(name: 'One', autofocus: true)],
|
|
),
|
|
const Row(
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
children: <Widget>[
|
|
DemoButton(name: 'Two'),
|
|
DemoButton(name: 'Three', canRequestFocus: false),
|
|
],
|
|
),
|
|
const Row(
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
children: <Widget>[
|
|
DemoButton(name: 'Four'),
|
|
DemoButton(name: 'Five'),
|
|
DemoButton(name: 'Six'),
|
|
],
|
|
),
|
|
OutlinedButton(
|
|
onPressed: () => print('pressed'),
|
|
child: const Text('PRESS ME'),
|
|
),
|
|
const Padding(
|
|
padding: EdgeInsets.all(8.0),
|
|
child: TextField(
|
|
decoration: InputDecoration(labelText: 'Enter Text', filled: true),
|
|
),
|
|
),
|
|
const Padding(
|
|
padding: EdgeInsets.all(8.0),
|
|
child: TextField(
|
|
decoration: InputDecoration(
|
|
border: OutlineInputBorder(),
|
|
labelText: 'Enter Text',
|
|
filled: false,
|
|
),
|
|
),
|
|
),
|
|
],
|
|
);
|
|
},
|
|
),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|