mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
a04fb324be
Bumps the Dart version to 3.8 across the repo (excluding engine/src/flutter/third_party) and applies formatting updates from Dart 3.8. ## 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. - [ ] 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]. <!-- 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
490 lines
18 KiB
Dart
490 lines
18 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_test/flutter_test.dart';
|
|
|
|
void main() {
|
|
TextStyle iconStyle(WidgetTester tester, IconData icon) {
|
|
final RichText iconRichText = tester.widget<RichText>(
|
|
find.descendant(of: find.byIcon(icon), matching: find.byType(RichText)),
|
|
);
|
|
return iconRichText.text.style!;
|
|
}
|
|
|
|
test('TextButtonTheme lerp special cases', () {
|
|
expect(TextButtonThemeData.lerp(null, null, 0), null);
|
|
const TextButtonThemeData data = TextButtonThemeData();
|
|
expect(identical(TextButtonThemeData.lerp(data, data, 0.5), data), true);
|
|
});
|
|
|
|
testWidgets('Material3: Passing no TextButtonTheme returns defaults', (
|
|
WidgetTester tester,
|
|
) async {
|
|
const ColorScheme colorScheme = ColorScheme.light();
|
|
await tester.pumpWidget(
|
|
MaterialApp(
|
|
theme: ThemeData.from(colorScheme: colorScheme),
|
|
home: Scaffold(
|
|
body: Center(
|
|
child: TextButton(onPressed: () {}, child: const Text('button')),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
|
|
final Finder buttonMaterial = find.descendant(
|
|
of: find.byType(TextButton),
|
|
matching: find.byType(Material),
|
|
);
|
|
|
|
final Material material = tester.widget<Material>(buttonMaterial);
|
|
expect(material.animationDuration, const Duration(milliseconds: 200));
|
|
expect(material.borderRadius, null);
|
|
expect(material.color, Colors.transparent);
|
|
expect(material.elevation, 0.0);
|
|
expect(material.shadowColor, Colors.transparent);
|
|
expect(material.shape, const StadiumBorder());
|
|
expect(material.textStyle!.color, colorScheme.primary);
|
|
expect(material.textStyle!.fontFamily, 'Roboto');
|
|
expect(material.textStyle!.fontSize, 14);
|
|
expect(material.textStyle!.fontWeight, FontWeight.w500);
|
|
|
|
final Align align = tester.firstWidget<Align>(
|
|
find.ancestor(of: find.text('button'), matching: find.byType(Align)),
|
|
);
|
|
expect(align.alignment, Alignment.center);
|
|
});
|
|
|
|
testWidgets('Material2: Passing no TextButtonTheme returns defaults', (
|
|
WidgetTester tester,
|
|
) async {
|
|
const ColorScheme colorScheme = ColorScheme.light();
|
|
await tester.pumpWidget(
|
|
MaterialApp(
|
|
theme: ThemeData.from(useMaterial3: false, colorScheme: colorScheme),
|
|
home: Scaffold(
|
|
body: Center(
|
|
child: TextButton(onPressed: () {}, child: const Text('button')),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
|
|
final Finder buttonMaterial = find.descendant(
|
|
of: find.byType(TextButton),
|
|
matching: find.byType(Material),
|
|
);
|
|
|
|
final Material material = tester.widget<Material>(buttonMaterial);
|
|
expect(material.animationDuration, const Duration(milliseconds: 200));
|
|
expect(material.borderRadius, null);
|
|
expect(material.color, Colors.transparent);
|
|
expect(material.elevation, 0.0);
|
|
expect(material.shadowColor, const Color(0xff000000));
|
|
expect(
|
|
material.shape,
|
|
const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(4.0))),
|
|
);
|
|
expect(material.textStyle!.color, colorScheme.primary);
|
|
expect(material.textStyle!.fontFamily, 'Roboto');
|
|
expect(material.textStyle!.fontSize, 14);
|
|
expect(material.textStyle!.fontWeight, FontWeight.w500);
|
|
|
|
final Align align = tester.firstWidget<Align>(
|
|
find.ancestor(of: find.text('button'), matching: find.byType(Align)),
|
|
);
|
|
expect(align.alignment, Alignment.center);
|
|
});
|
|
|
|
group('[Theme, TextTheme, TextButton style overrides]', () {
|
|
const Color foregroundColor = Color(0xff000001);
|
|
const Color backgroundColor = Color(0xff000002);
|
|
const Color disabledColor = Color(0xff000003);
|
|
const Color shadowColor = Color(0xff000004);
|
|
const double elevation = 3;
|
|
const TextStyle textStyle = TextStyle(fontSize: 12.0);
|
|
const EdgeInsets padding = EdgeInsets.all(3);
|
|
const Size minimumSize = Size(200, 200);
|
|
const BorderSide side = BorderSide(color: Colors.green, width: 2);
|
|
const OutlinedBorder shape = RoundedRectangleBorder(
|
|
side: side,
|
|
borderRadius: BorderRadius.all(Radius.circular(2)),
|
|
);
|
|
const MouseCursor enabledMouseCursor = SystemMouseCursors.text;
|
|
const MouseCursor disabledMouseCursor = SystemMouseCursors.grab;
|
|
const MaterialTapTargetSize tapTargetSize = MaterialTapTargetSize.shrinkWrap;
|
|
const Duration animationDuration = Duration(milliseconds: 25);
|
|
const bool enableFeedback = false;
|
|
const AlignmentGeometry alignment = Alignment.centerLeft;
|
|
|
|
final Key backgroundKey = UniqueKey();
|
|
final Key foregroundKey = UniqueKey();
|
|
Widget backgroundBuilder(BuildContext context, Set<MaterialState> states, Widget? child) {
|
|
return KeyedSubtree(key: backgroundKey, child: child!);
|
|
}
|
|
|
|
Widget foregroundBuilder(BuildContext context, Set<MaterialState> states, Widget? child) {
|
|
return KeyedSubtree(key: foregroundKey, child: child!);
|
|
}
|
|
|
|
final ButtonStyle style = TextButton.styleFrom(
|
|
foregroundColor: foregroundColor,
|
|
disabledForegroundColor: disabledColor,
|
|
backgroundColor: backgroundColor,
|
|
disabledBackgroundColor: disabledColor,
|
|
shadowColor: shadowColor,
|
|
elevation: elevation,
|
|
textStyle: textStyle,
|
|
padding: padding,
|
|
minimumSize: minimumSize,
|
|
side: side,
|
|
shape: shape,
|
|
enabledMouseCursor: enabledMouseCursor,
|
|
disabledMouseCursor: disabledMouseCursor,
|
|
tapTargetSize: tapTargetSize,
|
|
animationDuration: animationDuration,
|
|
enableFeedback: enableFeedback,
|
|
alignment: alignment,
|
|
backgroundBuilder: backgroundBuilder,
|
|
foregroundBuilder: foregroundBuilder,
|
|
);
|
|
|
|
Widget buildFrame({
|
|
ButtonStyle? buttonStyle,
|
|
ButtonStyle? themeStyle,
|
|
ButtonStyle? overallStyle,
|
|
}) {
|
|
final Widget child = Builder(
|
|
builder: (BuildContext context) {
|
|
return TextButton(style: buttonStyle, onPressed: () {}, child: const Text('button'));
|
|
},
|
|
);
|
|
return MaterialApp(
|
|
theme: ThemeData.from(
|
|
colorScheme: const ColorScheme.light(),
|
|
).copyWith(textButtonTheme: TextButtonThemeData(style: overallStyle)),
|
|
home: Scaffold(
|
|
body: Center(
|
|
// If the TextButtonTheme widget is present, it's used
|
|
// instead of the Theme's ThemeData.textButtonTheme.
|
|
child: themeStyle == null
|
|
? child
|
|
: TextButtonTheme(
|
|
data: TextButtonThemeData(style: themeStyle),
|
|
child: child,
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
|
|
final Finder findMaterial = find.descendant(
|
|
of: find.byType(TextButton),
|
|
matching: find.byType(Material),
|
|
);
|
|
|
|
final Finder findInkWell = find.descendant(
|
|
of: find.byType(TextButton),
|
|
matching: find.byType(InkWell),
|
|
);
|
|
|
|
const Set<MaterialState> enabled = <MaterialState>{};
|
|
const Set<MaterialState> disabled = <MaterialState>{MaterialState.disabled};
|
|
const Set<MaterialState> hovered = <MaterialState>{MaterialState.hovered};
|
|
const Set<MaterialState> focused = <MaterialState>{MaterialState.focused};
|
|
|
|
void checkButton(WidgetTester tester) {
|
|
final Material material = tester.widget<Material>(findMaterial);
|
|
final InkWell inkWell = tester.widget<InkWell>(findInkWell);
|
|
expect(material.textStyle!.color, foregroundColor);
|
|
expect(material.textStyle!.fontSize, 12);
|
|
expect(material.color, backgroundColor);
|
|
expect(material.shadowColor, shadowColor);
|
|
expect(material.elevation, elevation);
|
|
expect(
|
|
MaterialStateProperty.resolveAs<MouseCursor?>(inkWell.mouseCursor, enabled),
|
|
enabledMouseCursor,
|
|
);
|
|
expect(
|
|
MaterialStateProperty.resolveAs<MouseCursor?>(inkWell.mouseCursor, disabled),
|
|
disabledMouseCursor,
|
|
);
|
|
expect(inkWell.overlayColor!.resolve(hovered), foregroundColor.withOpacity(0.08));
|
|
expect(inkWell.overlayColor!.resolve(focused), foregroundColor.withOpacity(0.1));
|
|
expect(inkWell.enableFeedback, enableFeedback);
|
|
expect(material.borderRadius, null);
|
|
expect(material.shape, shape);
|
|
expect(material.animationDuration, animationDuration);
|
|
expect(tester.getSize(find.byType(TextButton)), const Size(200, 200));
|
|
final Align align = tester.firstWidget<Align>(
|
|
find.ancestor(of: find.text('button'), matching: find.byType(Align)),
|
|
);
|
|
expect(align.alignment, alignment);
|
|
expect(
|
|
find.descendant(of: findMaterial, matching: find.byKey(backgroundKey)),
|
|
findsOneWidget,
|
|
);
|
|
expect(find.descendant(of: findInkWell, matching: find.byKey(foregroundKey)), findsOneWidget);
|
|
}
|
|
|
|
testWidgets('Button style overrides defaults', (WidgetTester tester) async {
|
|
await tester.pumpWidget(buildFrame(buttonStyle: style));
|
|
await tester.pumpAndSettle(); // allow the animations to finish
|
|
checkButton(tester);
|
|
});
|
|
|
|
testWidgets('Button theme style overrides defaults', (WidgetTester tester) async {
|
|
await tester.pumpWidget(buildFrame(themeStyle: style));
|
|
await tester.pumpAndSettle();
|
|
checkButton(tester);
|
|
});
|
|
|
|
testWidgets('Overall Theme button theme style overrides defaults', (WidgetTester tester) async {
|
|
await tester.pumpWidget(buildFrame(overallStyle: style));
|
|
await tester.pumpAndSettle();
|
|
checkButton(tester);
|
|
});
|
|
|
|
// Same as the previous tests with empty ButtonStyle's instead of null.
|
|
|
|
testWidgets('Button style overrides defaults, empty theme and overall styles', (
|
|
WidgetTester tester,
|
|
) async {
|
|
await tester.pumpWidget(
|
|
buildFrame(
|
|
buttonStyle: style,
|
|
themeStyle: const ButtonStyle(),
|
|
overallStyle: const ButtonStyle(),
|
|
),
|
|
);
|
|
await tester.pumpAndSettle(); // allow the animations to finish
|
|
checkButton(tester);
|
|
});
|
|
|
|
testWidgets('Button theme style overrides defaults, empty button and overall styles', (
|
|
WidgetTester tester,
|
|
) async {
|
|
await tester.pumpWidget(
|
|
buildFrame(
|
|
buttonStyle: const ButtonStyle(),
|
|
themeStyle: style,
|
|
overallStyle: const ButtonStyle(),
|
|
),
|
|
);
|
|
await tester.pumpAndSettle(); // allow the animations to finish
|
|
checkButton(tester);
|
|
});
|
|
|
|
testWidgets(
|
|
'Overall Theme button theme style overrides defaults, null theme and empty overall style',
|
|
(WidgetTester tester) async {
|
|
await tester.pumpWidget(buildFrame(buttonStyle: const ButtonStyle(), overallStyle: style));
|
|
await tester.pumpAndSettle(); // allow the animations to finish
|
|
checkButton(tester);
|
|
},
|
|
);
|
|
});
|
|
|
|
testWidgets('Material3 - TextButton repsects Theme shadowColor', (WidgetTester tester) async {
|
|
const ColorScheme colorScheme = ColorScheme.light();
|
|
const Color shadowColor = Color(0xff000001);
|
|
const Color overriddenColor = Color(0xff000002);
|
|
|
|
Widget buildFrame({Color? overallShadowColor, Color? themeShadowColor, Color? shadowColor}) {
|
|
return MaterialApp(
|
|
theme: ThemeData.from(colorScheme: colorScheme.copyWith(shadow: overallShadowColor)),
|
|
home: Scaffold(
|
|
body: Center(
|
|
child: TextButtonTheme(
|
|
data: TextButtonThemeData(style: TextButton.styleFrom(shadowColor: themeShadowColor)),
|
|
child: Builder(
|
|
builder: (BuildContext context) {
|
|
return TextButton(
|
|
style: TextButton.styleFrom(shadowColor: shadowColor),
|
|
onPressed: () {},
|
|
child: const Text('button'),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
|
|
final Finder buttonMaterialFinder = find.descendant(
|
|
of: find.byType(TextButton),
|
|
matching: find.byType(Material),
|
|
);
|
|
|
|
await tester.pumpWidget(buildFrame());
|
|
Material material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, Colors.transparent);
|
|
|
|
await tester.pumpWidget(buildFrame(overallShadowColor: shadowColor));
|
|
await tester.pumpAndSettle(); // theme animation
|
|
material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, Colors.transparent);
|
|
|
|
await tester.pumpWidget(buildFrame(themeShadowColor: shadowColor));
|
|
await tester.pumpAndSettle(); // theme animation
|
|
material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, shadowColor);
|
|
|
|
await tester.pumpWidget(buildFrame(shadowColor: shadowColor));
|
|
await tester.pumpAndSettle(); // theme animation
|
|
material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, shadowColor);
|
|
|
|
await tester.pumpWidget(
|
|
buildFrame(overallShadowColor: overriddenColor, themeShadowColor: shadowColor),
|
|
);
|
|
await tester.pumpAndSettle(); // theme animation
|
|
material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, shadowColor);
|
|
|
|
await tester.pumpWidget(
|
|
buildFrame(themeShadowColor: overriddenColor, shadowColor: shadowColor),
|
|
);
|
|
await tester.pumpAndSettle(); // theme animation
|
|
material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, shadowColor);
|
|
});
|
|
|
|
testWidgets('Material2 - TextButton repsects Theme shadowColor', (WidgetTester tester) async {
|
|
const ColorScheme colorScheme = ColorScheme.light();
|
|
const Color shadowColor = Color(0xff000001);
|
|
const Color overriddenColor = Color(0xff000002);
|
|
|
|
Widget buildFrame({Color? overallShadowColor, Color? themeShadowColor, Color? shadowColor}) {
|
|
return MaterialApp(
|
|
theme: ThemeData.from(
|
|
useMaterial3: false,
|
|
colorScheme: colorScheme,
|
|
).copyWith(shadowColor: overallShadowColor),
|
|
home: Scaffold(
|
|
body: Center(
|
|
child: TextButtonTheme(
|
|
data: TextButtonThemeData(style: TextButton.styleFrom(shadowColor: themeShadowColor)),
|
|
child: Builder(
|
|
builder: (BuildContext context) {
|
|
return TextButton(
|
|
style: TextButton.styleFrom(shadowColor: shadowColor),
|
|
onPressed: () {},
|
|
child: const Text('button'),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
|
|
final Finder buttonMaterialFinder = find.descendant(
|
|
of: find.byType(TextButton),
|
|
matching: find.byType(Material),
|
|
);
|
|
|
|
await tester.pumpWidget(buildFrame());
|
|
Material material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, Colors.black); //default
|
|
|
|
await tester.pumpWidget(buildFrame(overallShadowColor: shadowColor));
|
|
await tester.pumpAndSettle(); // theme animation
|
|
material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, shadowColor);
|
|
|
|
await tester.pumpWidget(buildFrame(themeShadowColor: shadowColor));
|
|
await tester.pumpAndSettle(); // theme animation
|
|
material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, shadowColor);
|
|
|
|
await tester.pumpWidget(buildFrame(shadowColor: shadowColor));
|
|
await tester.pumpAndSettle(); // theme animation
|
|
material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, shadowColor);
|
|
|
|
await tester.pumpWidget(
|
|
buildFrame(overallShadowColor: overriddenColor, themeShadowColor: shadowColor),
|
|
);
|
|
await tester.pumpAndSettle(); // theme animation
|
|
material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, shadowColor);
|
|
|
|
await tester.pumpWidget(
|
|
buildFrame(themeShadowColor: overriddenColor, shadowColor: shadowColor),
|
|
);
|
|
await tester.pumpAndSettle(); // theme animation
|
|
material = tester.widget<Material>(buttonMaterialFinder);
|
|
expect(material.shadowColor, shadowColor);
|
|
});
|
|
|
|
testWidgets('TextButton.icon respects TextButtonTheme ButtonStyle.iconAlignment', (
|
|
WidgetTester tester,
|
|
) async {
|
|
Widget buildButton({IconAlignment? iconAlignment}) {
|
|
return MaterialApp(
|
|
theme: ThemeData(
|
|
textButtonTheme: TextButtonThemeData(style: ButtonStyle(iconAlignment: iconAlignment)),
|
|
),
|
|
home: Scaffold(
|
|
body: Center(
|
|
child: TextButton.icon(
|
|
onPressed: () {},
|
|
icon: const Icon(Icons.add),
|
|
label: const Text('button'),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
|
|
await tester.pumpWidget(buildButton());
|
|
|
|
final Offset buttonTopLeft = tester.getTopLeft(find.byType(Material).last);
|
|
final Offset iconTopLeft = tester.getTopLeft(find.byIcon(Icons.add));
|
|
|
|
expect(buttonTopLeft.dx, iconTopLeft.dx - 12.0);
|
|
|
|
await tester.pumpWidget(buildButton(iconAlignment: IconAlignment.end));
|
|
await tester.pumpAndSettle();
|
|
|
|
final Offset buttonTopRight = tester.getTopRight(find.byType(Material).last);
|
|
final Offset iconTopRight = tester.getTopRight(find.byIcon(Icons.add));
|
|
|
|
expect(buttonTopRight.dx, iconTopRight.dx + 16.0);
|
|
});
|
|
|
|
// Regression test for https://github.com/flutter/flutter/issues/162839.
|
|
testWidgets(
|
|
'TextButton icon uses provided TextButtonThemeData foregroundColor over default icon color',
|
|
(WidgetTester tester) async {
|
|
const Color foregroundColor = Color(0xFFFFA500);
|
|
|
|
await tester.pumpWidget(
|
|
MaterialApp(
|
|
theme: ThemeData(
|
|
textButtonTheme: TextButtonThemeData(
|
|
style: TextButton.styleFrom(foregroundColor: foregroundColor),
|
|
),
|
|
),
|
|
home: Material(
|
|
child: Center(
|
|
child: TextButton.icon(
|
|
onPressed: () {},
|
|
icon: const Icon(Icons.add),
|
|
label: const Text('Button'),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
|
|
expect(iconStyle(tester, Icons.add).color, foregroundColor);
|
|
},
|
|
);
|
|
}
|