firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ListTile.divideTiles only run Iterable once (#78879)

Browse Source
This commit is contained in:
Xavier H
2021-06-23 18:06:03 +02:00
committed by GitHub
parent 69f2f8a18b
commit b63bcaa3c9
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/flutter/lib/src/material/list_tile.dart
View File

@@ -980,11 +980,11 @@ class ListTile extends StatelessWidget {
assert(tiles != null);
assert(color != null || context != null);
if (tiles.isEmpty)
return;
final Iterator<Widget> iterator = tiles.iterator;
final bool isNotEmpty = iterator.moveNext();
final bool hasNext = iterator.moveNext();
if (!hasNext)
return;
final Decoration decoration = BoxDecoration(
border: Border(
@@ -1001,7 +1001,7 @@ class ListTile extends StatelessWidget {
);
tile = iterator.current;
}
if (isNotEmpty)
if (hasNext)
yield tile;
}

14
packages/flutter/test/material/list_tile_test.dart
View File

@@ -257,6 +257,20 @@ void main() {
expect(output, isEmpty);
});
testWidgets('ListTile.divideTiles only runs the generator once', (WidgetTester tester) async {
// Regression test for https://github.com/flutter/flutter/pull/78879
int callCount = 0;
Iterable<Widget> generator() sync* {
callCount += 1;
yield const Text('');
yield const Text('');
}
final List<Widget> output = ListTile.divideTiles(tiles: generator(), color: Colors.grey).toList();
expect(output, hasLength(2));
expect(callCount, 1);
});
testWidgets('ListTileTheme', (WidgetTester tester) async {
final Key titleKey = UniqueKey();
final Key subtitleKey = UniqueKey();