Skip to content

Commit abac27d

Browse files
authored
Fix ink features painting in YearPicker. (flutter#177014)
Fixes flutter#155198 ## Description - Fixes ink features painting outside of the `GridView` bounds in `YearPicker` | BEFORE | AFTER | | - | - | | <video alt="before" src="https://github.com/user-attachments/assets/efe86478-a19b-4a1b-b6c1-97f30dbe262b" /> | <video alt="after" src="https://github.com/user-attachments/assets/1c70fbe9-3e89-4b18-bce0-40d81068adbf" /> | ## 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]. - [X] 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
1 parent 28a1d0b commit abac27d

File tree

2 files changed

+46
-8
lines changed

2 files changed

+46
-8
lines changed

packages/flutter/lib/src/material/calendar_date_picker.dart

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,18 +1542,20 @@ class _YearPickerState extends State<YearPicker> {
15421542

15431543
@override
15441544
Widget build(BuildContext context) {
1545-
assert(debugCheckHasMaterial(context));
15461545
return Column(
15471546
children: <Widget>[
15481547
const Divider(),
15491548
Expanded(
1550-
child: GridView.builder(
1551-
controller: _scrollController,
1552-
dragStartBehavior: widget.dragStartBehavior,
1553-
gridDelegate: _YearPickerGridDelegate(context),
1554-
itemBuilder: _buildYearItem,
1555-
itemCount: math.max(_itemCount, minYears),
1556-
padding: const EdgeInsets.symmetric(horizontal: _yearPickerPadding),
1549+
child: Material(
1550+
type: MaterialType.transparency,
1551+
child: GridView.builder(
1552+
controller: _scrollController,
1553+
dragStartBehavior: widget.dragStartBehavior,
1554+
gridDelegate: _YearPickerGridDelegate(context),
1555+
itemBuilder: _buildYearItem,
1556+
itemCount: math.max(_itemCount, minYears),
1557+
padding: const EdgeInsets.symmetric(horizontal: _yearPickerPadding),
1558+
),
15571559
),
15581560
),
15591561
const Divider(),

packages/flutter/test/material/calendar_date_picker_test.dart

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1734,6 +1734,42 @@ void main() {
17341734
),
17351735
);
17361736
});
1737+
1738+
// Regression test for https://github.com/flutter/flutter/issues/155198.
1739+
testWidgets('Ink features are painted on inner Material', (WidgetTester tester) async {
1740+
await tester.pumpWidget(
1741+
yearPicker(
1742+
firstDate: DateTime(2020),
1743+
lastDate: DateTime(2030),
1744+
selectedDate: DateTime(2025),
1745+
),
1746+
);
1747+
1748+
expect(find.byType(Material), findsNWidgets(2));
1749+
1750+
// Material outside the GridView.
1751+
final MaterialInkController outerMaterial = Material.of(
1752+
tester.element(find.byType(YearPicker)),
1753+
);
1754+
// Material directly wrapping the GridView.
1755+
final MaterialInkController innerMaterial = Material.of(
1756+
tester.element(find.byType(GridView)),
1757+
);
1758+
1759+
expect(outerMaterial, isNot(same(innerMaterial)));
1760+
expect((outerMaterial as dynamic).debugInkFeatures, isNull);
1761+
expect((innerMaterial as dynamic).debugInkFeatures, isNull);
1762+
1763+
// Hover over the 2022 year item to trigger the ink highlight.
1764+
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse);
1765+
await gesture.addPointer(location: tester.getCenter(find.text('2022')));
1766+
addTearDown(gesture.removePointer);
1767+
await tester.pump();
1768+
1769+
// Only the inner Material should have ink features.
1770+
expect((outerMaterial as dynamic).debugInkFeatures, isNull);
1771+
expect((innerMaterial as dynamic).debugInkFeatures, hasLength(1));
1772+
});
17371773
});
17381774

17391775
group('Calendar Delegate', () {

0 commit comments

Comments
 (0)