DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leaks in _PopupMenuRoute (#148373)

Browse Source
This commit is contained in:
Valentin Vignal 2024-05-16 04:50:03 +08:00 committed by GitHub
parent ffae7c60c2
commit 8b129b9b89
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -880,10 +880,12 @@ class _PopupMenuRoute<T> extends PopupRoute<T> {
final Clip clipBehavior;
final AnimationStyle? popUpAnimationStyle;
CurvedAnimation? _animation;
@override
Animation<double> createAnimation() {
if (popUpAnimationStyle != AnimationStyle.noAnimation) {
return CurvedAnimation(
return _animation ??= CurvedAnimation(
parent: super.createAnimation(),
curve: popUpAnimationStyle?.curve ?? Curves.linear,
reverseCurve: popUpAnimationStyle?.reverseCurve ?? const Interval(0.0, _kMenuCloseIntervalEnd),
@ -962,6 +964,12 @@ class _PopupMenuRoute<T> extends PopupRoute<T> {
Set<Rect> _avoidBounds(MediaQueryData mediaQuery) {
return DisplayFeatureSubScreen.avoidBounds(mediaQuery).toSet();
}
@override
void dispose() {
_animation?.dispose();
super.dispose();
}
}
/// Show a popup menu that contains the `items` at `position`.

6
packages/flutter/test/material/popup_menu_test.dart
View File

@ -9,6 +9,7 @@ import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart';
import '../widgets/semantics_tester.dart';
import 'feedback_tester.dart';
@ -2096,7 +2097,10 @@ void main() {
expect(find.text('PopupMenuButton icon'), findsOneWidget);
});
testWidgets('showMenu uses nested navigator by default', (WidgetTester tester) async {
testWidgets('showMenu uses nested navigator by default',
// TODO(polina-c): remove when fixed https://github.com/flutter/flutter/issues/145600 [leak-tracking-opt-in]
experimentalLeakTesting: LeakTesting.settings.withTracked(classes: const <String>['CurvedAnimation']),
(WidgetTester tester) async {
final MenuObserver rootObserver = MenuObserver();
final MenuObserver nestedObserver = MenuObserver();