dialog: Remove no-op SingleChildScrollView; have tests' checkNoDialog describe dialog #1782
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chrisbobbe
added
the
integration review
gnprice
reviewed
Aug 6, 2025
test/widgets/dialog_checks.dart
Outdated
Comment on lines
61
to
62
| ...find.bySubtype<AlertDialog>().evaluate().map((e) => e.widget), | ||
| ...find.byType(CupertinoAlertDialog).evaluate().map((e) => e.widget), |
There was a problem hiding this comment.
nit: this is equivalent, right?
Suggested change
| ...find.bySubtype<AlertDialog>().evaluate().map((e) => e.widget), | |
| ...find.byType(CupertinoAlertDialog).evaluate().map((e) => e.widget), | |
| ...tester.widgetList(find.bySubtype<AlertDialog>()), | |
| ...tester.widgetList(find.byType(CupertinoAlertDialog)), |
test/widgets/dialog_checks.dart
Outdated
| throw TestFailure(message); | ||
| } | ||
|
|
||
| check(find.byType(Dialog)).findsNothing(); // TODO is this needed? |
There was a problem hiding this comment.
Seems useful to have for good measure — i.e. just to be sure there's not an unexpected kind of dialog that in the future it turns out we're using somewhere.
test/widgets/dialog_checks.dart
Outdated
| } | ||
| } | ||
| } | ||
| throw TestFailure(message); |
There was a problem hiding this comment.
Cool, this is a good way to construct a custom failure message — bypassing the assertions library (package:checks, or package:test) and taking control directly using ordinary Dart features.
test/widgets/dialog_checks.dart
Outdated
Comment on lines
82
to
84
| message += ' content: '; | ||
| if (contentTexts.isNotEmpty) { | ||
| message += contentTexts.map((t) => t.data).join('\n '); |
There was a problem hiding this comment.
Best to use a StringBuffer rather than += on a String.
(This isn't a performance-critical spot here; but it's not significantly harder and sets a good example.)
lib/widgets/dialog.dart
Outdated
Comment on lines
59
to
62
| Widget? _adaptiveMessage(String? message) { | ||
| if (message == null) return null; | ||
|
|
||
| return _adaptiveContent(Text(message)); |
There was a problem hiding this comment.
Seems like this function can be inlined — it's not really encapsulating any information that doesn't naturally go at its caller.
test/widgets/dialog_test.dart
Outdated
Comment on lines
159
to
162
| final context = tester.element(find.byType(ChooseAccountPage)); | ||
| // TODO could do this with [TestGlobalStore] or similar? | ||
| await GlobalStoreWidget.of(context) | ||
| .settings.debugSetLegacyUpgradeState(LegacyUpgradeState.found); |
There was a problem hiding this comment.
Right — this is how we'd normally do it, no?
Suggested change
| final context = tester.element(find.byType(ChooseAccountPage)); | |
| // TODO could do this with [TestGlobalStore] or similar? | |
| await GlobalStoreWidget.of(context) | |
| .settings.debugSetLegacyUpgradeState(LegacyUpgradeState.found); | |
| await testBinding.globalStore | |
| .settings.debugSetLegacyUpgradeState(LegacyUpgradeState.found); |
(with maybe ".settings" moved to the previous line)
Example output on failure: 00:05 +66: message action sheet ReactionButtons +1 request has an error; useLegacy: false ══╡ EXCEPTION CAUGHT BY FLUTTER TEST FRAMEWORK ╞════════════════════════════════════════════════════ The following TestFailure was thrown running a test: Found dialog(s) when none were expected: Dialog: title: Adding reaction failed content: Invalid message(s) When the exception was thrown, this was the stack: <asynchronous suspension> <asynchronous suspension> <asynchronous suspension> <asynchronous suspension> (elided one frame from package:stack_trace) The test description was: +1 request has an error; useLegacy: false ════════════════════════════════════════════════════════════════════════════════════════════════════ 00:05 +66 -1: message action sheet ReactionButtons +1 request has an error; useLegacy: false [E] Test failed. See exception logs above. The test description was: +1 request has an error; useLegacy: false
In zulip#1017, we overlooked the fact that a SingleChildScrollView is added automatically on iOS but not on Android. I haven't reproduced an observable bug that comes from this, but it calls for a fix. I tested this change manually on iOS (showErrorDialog, showSuggestedActionDialog, and UpgradeWelcomeDialog), with short text and long text (longer than a screenful, to check the scrolling works).
chrisbobbe
force-pushed
the
pr-dialog-improvements
branch
from
38a0878 to
8d3c128
Compare
|
Thanks! Revision pushed. |
|
Thanks! Looks good; merging. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.