Skip to content
Draft
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
5 changes: 5 additions & 0 deletions packages/material_ui/lib/src/dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1683,6 +1683,7 @@ Future<T?> showDialog<T>({
bool fullscreenDialog = false,
bool? requestFocus,
AnimationStyle? animationStyle,
RouteBarrierBuilder? barrierBuilder,
}) {
assert(_debugIsActive(context));
assert(debugCheckHasMaterialLocalizations(context));
Expand Down Expand Up @@ -1717,6 +1718,7 @@ Future<T?> showDialog<T>({
requestFocus: requestFocus,
animationStyle: animationStyle,
fullscreenDialog: fullscreenDialog,
barrierBuilder: barrierBuilder,
);
},
builder: (BuildContext routeContext) {
Expand Down Expand Up @@ -1767,6 +1769,7 @@ Future<T?> showAdaptiveDialog<T>({
TraversalEdgeBehavior? traversalEdgeBehavior,
bool? requestFocus,
AnimationStyle? animationStyle,
RouteBarrierBuilder? barrierBuilder,
}) {
final ThemeData theme = Theme.of(context);
switch (theme.platform) {
Expand All @@ -1787,6 +1790,7 @@ Future<T?> showAdaptiveDialog<T>({
traversalEdgeBehavior: traversalEdgeBehavior,
requestFocus: requestFocus,
animationStyle: animationStyle,
barrierBuilder: barrierBuilder,
);
case TargetPlatform.iOS:
case TargetPlatform.macOS:
Expand Down Expand Up @@ -1881,6 +1885,7 @@ class DialogRoute<T> extends RawDialogRoute<T> {
super.anchorPoint,
super.traversalEdgeBehavior,
super.fullscreenDialog,
super.barrierBuilder,
AnimationStyle? animationStyle,
}) : _animationStyle = animationStyle,
super(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
changelog: |
- Add barrierBuilder support to Material dialogs.
version: minor
52 changes: 52 additions & 0 deletions packages/material_ui/test/dialog_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3505,6 +3505,58 @@ void main() {

semantics.dispose();
});

testWidgets('showDialog applies custom barrierBuilder', (WidgetTester tester) async {
const expectedPadding = 12.0;
const barrierKey = ValueKey<String>('custom-barrier-padding');
RouteBarrierDetails? capturedDetails;

await tester.pumpWidget(
MaterialApp(
home: Builder(
builder: (BuildContext context) {
return ElevatedButton(
onPressed: () {
showDialog<void>(
context: context,
barrierLabel: 'barrier_label',
barrierColor: const Color(0xFF00FF00),
barrierBuilder:
(BuildContext context, RouteBarrierDetails details, Widget barrier) {
capturedDetails = details;
return Padding(
key: barrierKey,
padding: const EdgeInsets.all(expectedPadding),
child: barrier,
);
},
builder: (BuildContext context) => const Text('Dialog'),
);
},
child: const Text('Show Dialog'),
);
},
),
),
);

// Open the dialog.
await tester.tap(find.byType(ElevatedButton));
await tester.pumpAndSettle();

final Padding paddingWidget = tester.widget<Padding>(find.byKey(barrierKey));
expect(paddingWidget.padding, const EdgeInsets.all(expectedPadding));

final ModalBarrier barrierWidget = tester.widget<ModalBarrier>(
find.descendant(of: find.byKey(barrierKey), matching: find.byType(ModalBarrier)),
);
expect(barrierWidget.color, const Color(0xFF00FF00));

expect(capturedDetails, isNotNull);
expect(capturedDetails!.barrierColor, const Color(0xFF00FF00));
expect(capturedDetails!.barrierDismissible, true);
expect(capturedDetails!.barrierLabel, 'barrier_label');
});
}

@pragma('vm:entry-point')
Expand Down