Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/flutter/lib/src/widgets/selectable_region.dart
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,10 @@ class SelectableRegionState extends State<SelectableRegion>
final _SelectableRegionSelectionStatusNotifier _selectionStatusNotifier =
_SelectableRegionSelectionStatusNotifier._();

/// Preserves the selection status scope and root selection container when the
/// desktop web context menu wrapper is added or removed.
final GlobalKey _selectionStatusScopeKey = GlobalKey(debugLabel: 'selectionStatusScopeKey');

@protected
@override
void initState() {
Expand Down Expand Up @@ -1949,6 +1953,7 @@ class SelectableRegionState extends State<SelectableRegion>
Widget build(BuildContext context) {
assert(debugCheckHasOverlay(context));
Widget result = SelectableRegionSelectionStatusScope._(
key: _selectionStatusScopeKey,
selectionStatusNotifier: _selectionStatusNotifier,
child: SelectionContainer(registrar: this, delegate: _selectionDelegate, child: widget.child),
);
Expand Down Expand Up @@ -3506,6 +3511,7 @@ final class _SelectableRegionSelectionStatusNotifier extends ChangeNotifier
/// does not change.
final class SelectableRegionSelectionStatusScope extends InheritedWidget {
const SelectableRegionSelectionStatusScope._({
super.key,
required this.selectionStatusNotifier,
required super.child,
});
Expand Down
32 changes: 32 additions & 0 deletions packages/flutter/test/widgets/selectable_region_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6572,6 +6572,38 @@ void main() {
skip: !kIsWeb, // [intended] This test verifies web behavior.
);

testWidgets(
'web can rebuild SelectableRegion after disabling the browser context menu',
(WidgetTester tester) async {
debugDefaultTargetPlatformOverride = TargetPlatform.macOS;
try {
await BrowserContextMenu.enableContextMenu();

late StateSetter rebuild;
await tester.pumpWidget(
TestWidgetsApp(
home: StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {
rebuild = setState;
return _selectableRegion(child: const Text('How are you?'));
},
),
),
);

await BrowserContextMenu.disableContextMenu();
rebuild(() {});
await tester.pump();

final Object? exception = tester.takeException();
expect(exception, isNull, reason: exception?.toString());
} finally {
debugDefaultTargetPlatformOverride = null;
}
},
skip: !kIsWeb, // [intended] This test verifies web desktop behavior.
);

testWidgets(
'uses contextMenuBuilder by default on Android and iOS web',
(WidgetTester tester) async {
Expand Down