Skip to content

Commit

Permalink
Fix CupertinoContextMenu throws exception on route animation (flutt…
Browse files Browse the repository at this point in the history
…er#124785)

Fix `CupertinoContextMenu` throws exception on route animation
  • Loading branch information
TahaTesser authored and exaby73 committed Apr 17, 2023
1 parent 63ca8fe commit 09c0db2
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 3 deletions.
8 changes: 5 additions & 3 deletions packages/flutter/lib/src/cupertino/context_menu.dart
Original file line number Diff line number Diff line change
Expand Up @@ -592,9 +592,11 @@ class _CupertinoContextMenuState extends State<CupertinoContextMenu> with Ticker
if (status != AnimationStatus.dismissed) {
return;
}
setState(() {
_childHidden = false;
});
if (mounted) {
setState(() {
_childHidden = false;
});
}
_route!.animation!.removeStatusListener(_routeAnimationStatusListener);
_route = null;
}
Expand Down
45 changes: 45 additions & 0 deletions packages/flutter/test/cupertino/context_menu_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,51 @@ void main() {
expect(tester.getSize(find.byWidget(action)).width, 250);
}
});

testWidgets("ContextMenu route animation doesn't throw exception on dismiss", (WidgetTester tester) async {
// This is a regression test for https://github.com/flutter/flutter/issues/124597.
final List<int> items = List<int>.generate(2, (int index) => index).toList();

await tester.pumpWidget(CupertinoApp(
home: CupertinoPageScaffold(
child: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
return ListView(
children: items.map((int index) => CupertinoContextMenu(
actions: <CupertinoContextMenuAction>[
CupertinoContextMenuAction(
child: const Text('DELETE'),
onPressed: () {
setState(() {
items.remove(index);
Navigator.of(context).pop();
});
Navigator.of(context).pop();
},
),
],
child: Text('Item $index'),
)).toList(),
);
}
),
),
));

// Open the CupertinoContextMenu.
final TestGesture gesture = await tester.startGesture(tester.getCenter(find.text('Item 1')));
await tester.pumpAndSettle();
await gesture.up();
await tester.pumpAndSettle();

// Tap the delete action.
await tester.tap(find.text('DELETE'));
await tester.pumpAndSettle();

// The CupertinoContextMenu should be closed with no exception.
expect(find.text('DELETE'), findsNothing);
expect(tester.takeException(), null);
});
});

group("Open layout differs depending on child's position on screen", () {
Expand Down

0 comments on commit 09c0db2

Please sign in to comment.