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

Fixed an issue with FilterChip's changing size when selected due to border size. (#111916)

Browse Source
This commit is contained in:
Darren Austin 2022-09-19 15:29:24 -07:00 committed by GitHub
parent 7f6c111c58
commit ba489607a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/tools/gen_defaults/lib/filter_chip_template.dart
View File

@ -57,7 +57,7 @@ class _${blockName}DefaultsM3 extends ChipThemeData {
? isEnabled
? ${border('$tokenGroup$variant.unselected.outline')}
: ${border('$tokenGroup$variant.disabled.unselected.outline')}
: null;
: const BorderSide(color: Colors.transparent);
@override
IconThemeData? get iconTheme => IconThemeData(

3
packages/flutter/lib/src/material/choice_chip.dart
View File

@ -7,6 +7,7 @@ import 'package:flutter/widgets.dart';
import 'chip.dart';
import 'chip_theme.dart';
import 'colors.dart';
import 'debug.dart';
import 'theme.dart';
import 'theme_data.dart';
@ -236,7 +237,7 @@ class _ChoiceChipDefaultsM3 extends ChipThemeData {
? isEnabled
? BorderSide(color: Theme.of(context).colorScheme.outline)
: BorderSide(color: Theme.of(context).colorScheme.onSurface.withOpacity(0.12))
: null;
: const BorderSide(color: Colors.transparent);
@override
IconThemeData? get iconTheme => IconThemeData(

3
packages/flutter/lib/src/material/filter_chip.dart
View File

@ -7,6 +7,7 @@ import 'package:flutter/widgets.dart';
import 'chip.dart';
import 'chip_theme.dart';
import 'colors.dart';
import 'debug.dart';
import 'theme.dart';
import 'theme_data.dart';
@ -245,7 +246,7 @@ class _FilterChipDefaultsM3 extends ChipThemeData {
? isEnabled
? BorderSide(color: Theme.of(context).colorScheme.outline)
: BorderSide(color: Theme.of(context).colorScheme.onSurface.withOpacity(0.12))
: null;
: const BorderSide(color: Colors.transparent);
@override
IconThemeData? get iconTheme => IconThemeData(

39
packages/flutter/test/material/filter_chip_test.dart
View File

@ -172,4 +172,43 @@ void main() {
await tester.pumpWidget(wrapForChip(child: FilterChip(label: label, onSelected: (bool b) { }, clipBehavior: Clip.antiAlias)));
checkChipMaterialClipBehavior(tester, Clip.antiAlias);
});
testWidgets('M3 width should not change with selection', (WidgetTester tester) async {
// Regression tests for: https://github.com/flutter/flutter/issues/110645
// For the text "FilterChip" the chip should default to 175 regardless of selection.
const int expectedWidth = 175;
// Unselected
await tester.pumpWidget(MaterialApp(
theme: ThemeData(useMaterial3: true),
home: Material(
child: Center(
child: FilterChip(
label: const Text('FilterChip'),
showCheckmark: false,
onSelected: (bool _) {},
)
),
),
));
expect(tester.getSize(find.byType(FilterChip)).width, expectedWidth);
// Selected
await tester.pumpWidget(MaterialApp(
theme: ThemeData(useMaterial3: true),
home: Material(
child: Center(
child: FilterChip(
label: const Text('FilterChip'),
showCheckmark: false,
selected: true,
onSelected: (bool _) {},
)
),
),
));
await tester.pumpAndSettle();
expect(tester.getSize(find.byType(FilterChip)).width, expectedWidth);
});
}