Skip to content

Commit c3445dc

Browse files
Fix memory leak in BottomNavigationBar (#146748)
1 parent cb719db commit c3445dc

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,9 @@ class _BottomNavigationBarState extends State<BottomNavigationBar> with TickerPr
883883
for (final _Circle circle in _circles) {
884884
circle.dispose();
885885
}
886+
for (final CurvedAnimation animation in _animations) {
887+
animation.dispose();
888+
}
886889
super.dispose();
887890
}
888891

packages/flutter/test/material/bottom_sheet_test.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'dart:ui';
77
import 'package:flutter/foundation.dart';
88
import 'package:flutter/material.dart';
99
import 'package:flutter_test/flutter_test.dart';
10+
import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart';
1011

1112
import '../widgets/semantics_tester.dart';
1213

@@ -1282,7 +1283,10 @@ void main() {
12821283
await checkDragHandleAndColors();
12831284
});
12841285

1285-
testWidgets('showModalBottomSheet does not use root Navigator by default', (WidgetTester tester) async {
1286+
testWidgets('showModalBottomSheet does not use root Navigator by default',
1287+
// TODO(polina-c): remove when fixed https://github.com/flutter/flutter/issues/145600 [leak-tracking-opt-in]
1288+
experimentalLeakTesting: LeakTesting.settings.withTracked(classes: const <String>['CurvedAnimation']),
1289+
(WidgetTester tester) async {
12861290
await tester.pumpWidget(MaterialApp(
12871291
home: Scaffold(
12881292
body: Navigator(onGenerateRoute: (RouteSettings settings) => MaterialPageRoute<void>(builder: (_) {

0 commit comments

Comments
 (0)