Skip to content

Commit

Permalink
fix(ui_auth): fix reauthenticate dialog overflow (#9734)
Browse files Browse the repository at this point in the history
  • Loading branch information
lesnitsky authored Oct 17, 2022
1 parent 29ba1a0 commit defaa20
Show file tree
Hide file tree
Showing 3 changed files with 112 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import 'google_sign_in_test.dart' as google_sign_in;
import 'twitter_sign_in_test.dart' as twitter_sign_in;
import 'apple_sign_in_test.dart' as apple_sign_in;
import 'facebook_sign_in_test.dart' as facebook_sign_in;
import 'layout_test.dart' as layout;

import 'utils.dart';

Expand All @@ -38,4 +39,6 @@ Future<void> main() async {
apple_sign_in.main();
facebook_sign_in.main();
}

layout.main();
}
59 changes: 59 additions & 0 deletions packages/firebase_ui_auth/example/test_driver/layout_test.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import 'package:drive/drive.dart';
import 'package:firebase_auth/firebase_auth.dart'
hide EmailAuthProvider, PhoneAuthProvider;
import 'package:firebase_ui_auth/firebase_ui_auth.dart';
import 'package:firebase_ui_oauth_apple/firebase_ui_oauth_apple.dart';
import 'package:firebase_ui_oauth_google/firebase_ui_oauth_google.dart';
import 'package:flutter/material.dart';
import 'package:mockito/mockito.dart';

void main() {
group(
'Reauthenticate dialog',
() {
testWidgets("doesn't have an overflow when keyboard is visible",
(tester) async {
await tester.pumpWidget(
MaterialApp(
home: Scaffold(
body: ReauthenticateDialog(
providers: [
EmailAuthProvider(),
PhoneAuthProvider(),
GoogleProvider(clientId: 'mock'),
AppleProvider(),
],
auth: MockAuth(),
),
),
),
);

// Triggers keyboard to appear
await tester.tap(find.byType(TextFormField).first);

// Waits for keyboard to appear
await tester.pumpAndSettle();

// No need for an expect.
// Test will fail if there is an overflow.
// This is a built-in flutter functionality
});
},
);
}

class MockUser extends Mock implements User {
@override
List<UserInfo> get providerData => [
UserInfo({'providerId': 'password'}),
UserInfo({'providerId': 'google.com'}),
UserInfo({'providerId': 'apple.com'}),
UserInfo({'providerId': 'phone'})
];
}

class MockAuth extends Mock implements FirebaseAuth {
@override
User? get currentUser => MockUser();
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,30 +36,61 @@ class ReauthenticateDialog extends StatelessWidget {
Widget build(BuildContext context) {
final l = FirebaseUILocalizations.labelsOf(context);

const verticalPadding = EdgeInsets.symmetric(vertical: 16);
const horizontalPadding = EdgeInsets.symmetric(horizontal: 16);

final reauthenticateView = ReauthenticateView(
auth: auth,
providers: providers,
onSignedIn: onSignedIn,
actionButtonLabelOverride: actionButtonLabelOverride,
);

return Center(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 400),
child: Dialog(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisSize: MainAxisSize.min,
children: [
Title(text: l.verifyItsYouText),
const SizedBox(height: 16),
ReauthenticateView(
auth: auth,
providers: providers,
onSignedIn: onSignedIn,
),
const SizedBox(height: 16),
UniversalButton(
text: l.cancelLabel,
variant: ButtonVariant.text,
onPressed: () => Navigator.of(context).pop(),
)
],
padding: verticalPadding,
child: LayoutBuilder(
builder: (context, constraints) {
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Padding(
padding: horizontalPadding,
child: Title(text: l.verifyItsYouText),
),
const SizedBox(height: 16),
ConstrainedBox(
constraints: BoxConstraints(
maxHeight: constraints.maxHeight < 500
? 300
: constraints.maxHeight,
),
child: ListView(
shrinkWrap: true,
padding: const EdgeInsets.symmetric(horizontal: 16),
children: [
reauthenticateView,
const SizedBox(height: 16),
],
),
),
Padding(
padding: horizontalPadding.copyWith(
top: verticalPadding.top,
),
child: UniversalButton(
text: l.cancelLabel,
variant: ButtonVariant.text,
onPressed: () => Navigator.of(context).pop(),
),
)
],
);
},
),
),
),
Expand Down

0 comments on commit defaa20

Please sign in to comment.