Style: Rename pageBuilder with builder in showCupertinoSheet #170625

rkishan516 · 2025-06-14T04:17:46Z

Style: Rename pageBuilder with builder in showCupertinoSheet
fixes: #169831

Pre-launch Checklist

I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
I read the [Tree Hygiene] wiki page, which explains my responsibilities.
I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
I signed the [CLA].
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is [test-exempt].
I followed the [breaking change policy] and added [Data Driven Fixes] where supported.
All existing and new tests are passing.

MitchellGoodwin

Thank you for putting this change together. I left one request and a nit.

packages/flutter/lib/src/cupertino/sheet.dart

MitchellGoodwin · 2025-07-01T17:36:51Z

packages/flutter/lib/src/cupertino/sheet.dart

  final GlobalKey<NavigatorState> nestedNavigatorKey = GlobalKey<NavigatorState>();
  if (!useNestedNavigation) {
-    builder = pageBuilder;
+    widgetBuilder = (pageBuilder ?? builder)!;


Nit: should flip the priority so builder is used before pageBuilder, if both are non-null. More for the sake of reading the intent in the code.

MitchellGoodwin

Apologies because I missed it before, but this will need a test for the dart fix in test_fixes/cupertino. LGTM besides that.

rkishan516 · 2025-07-03T01:48:56Z

Apologies because I missed it before, but this will need a test for the dart fix in test_fixes/cupertino. LGTM besides that.

Thanks for review. I have added test for dart fix.

MitchellGoodwin · 2025-07-08T16:38:28Z

The analyzer is complaining about formatting

Found 1 Dart file which was formatted incorrectly.
To fix, run `dart format packages/flutter/test_fixes/cupertino/cupertino.dart` or:

git apply <<DONE
diff --git a/packages/flutter/test_fixes/cupertino/cupertino.dart b/packages/flutter/test_fixes/cupertino/cupertino.dart
index 7e5143c95b2..00000000000 100644
--- a/packages/flutter/test_fixes/cupertino/cupertino.dart
+++ b/packages/flutter/test_fixes/cupertino/cupertino.dart
@@ -291,5 +291,9 @@ void main() {
   CupertinoButton(minSize: 60.0);
 
   // https://github.com/flutter/flutter/pull/170625
-  showCupertinoSheet(context: context, pageBuilder: (BuildContext context) => Container());
+  showCupertinoSheet(
+    context: context,
+    pageBuilder: (BuildContext context) => Container(),
+  );
 }
DONE

MitchellGoodwin

LGTM, thank you for the change.

victorsanni

LGTM. Thanks for the dart fix.

…#170625) Style: Rename pageBuilder with builder in showCupertinoSheet fixes: flutter#169831 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing.

flutter/flutter#170625)

Roll Flutter from 43657f3baa17 to 35f197f1e5f5 (39 revisions) flutter/flutter@43657f3...35f197f 2025-07-12 [email protected] Roll Fuchsia Linux SDK from 8aoEy1hp2a9HI1pt-... to xQlbHCUI33kDvkew8... (flutter/flutter#172060) 2025-07-12 [email protected] Add RSuperellipse support to Web (global cache) (flutter/flutter#171489) 2025-07-12 [email protected] Fix grammar: Change 'A' to 'An' before IOSSystemContextMenuItemData (flutter/flutter#172019) 2025-07-11 [email protected] Manual roll Dart to b21dca1b89ff (flutter/flutter#172038) 2025-07-11 [email protected] Roll Skia from 2ea2ba09ef85 to 92354f64e37f (1 revision) (flutter/flutter#172039) 2025-07-11 [email protected] Fix CheckedPopupMenuItem semantics to use menuItemCheckbox role with checked state (flutter/flutter#171749) 2025-07-11 [email protected] adds gemini.md to `engine` and `licenses_cpp` (flutter/flutter#172022) 2025-07-11 [email protected] [Web] Implement disabling interactive selection (flutter/flutter#171935) 2025-07-11 [email protected] [tool] Make google3 have to override feature flags (flutter/flutter#171933) 2025-07-11 [email protected] License cpp 710 (flutter/flutter#171989) 2025-07-11 [email protected] add content description to tooltip-only nodes for android (flutter/flutter#171541) 2025-07-11 [email protected] [Web a11y]Update table cell to use LabelRepresentation.sizedSpan (flutter/flutter#172013) 2025-07-11 [email protected] [ Tool ] Enable `omit_obvious_*_types` and `specify_nonobvious_*_types` lints (flutter/flutter#172018) 2025-07-11 [email protected] Add SemanticsLabelBuilder for Accessible Label Concatenation (flutter/flutter#171683) 2025-07-11 [email protected] Run tests on either macOS 14 or 15 (flutter/flutter#171076) 2025-07-11 [email protected] Roll Skia from db1a5550c848 to 2ea2ba09ef85 (1 revision) (flutter/flutter#172017) 2025-07-11 [email protected] [Cupertino] Make some widgets no longer use RSuperellipse (flutter/flutter#171830) 2025-07-11 [email protected] Detach the resource context from the IO thread only if the shell's IO manager is no longer being used by any other spawned shells (flutter/flutter#171554) 2025-07-11 [email protected] Started querying the app state for the gpu disabled sync switch (flutter/flutter#171785) 2025-07-11 [email protected] License_cpp 7/02 (flutter/flutter#171558) 2025-07-11 [email protected] [web] Refactor clipboard. (flutter/flutter#171427) 2025-07-11 [email protected] Require 64-bit Windows (flutter/flutter#171925) 2025-07-11 [email protected] Run hot_reload_with_asset_web_test.dart on Mac/Windows (flutter/flutter#171280) 2025-07-11 [email protected] Roll Skia from da7e3eae7c2b to db1a5550c848 (2 revisions) (flutter/flutter#171999) 2025-07-11 [email protected] Roll Skia from 26571c3b1771 to da7e3eae7c2b (2 revisions) (flutter/flutter#171997) 2025-07-11 [email protected] Roll Skia from 34a40032ff0a to 26571c3b1771 (1 revision) (flutter/flutter#171995) 2025-07-11 [email protected] Roll Fuchsia Linux SDK from lO64ePNEGrGzs-MFC... to 8aoEy1hp2a9HI1pt-... (flutter/flutter#171993) 2025-07-10 [email protected] Remove redundant ThemeData(useMaterial3: true) from tests (flutter/flutter#171569) 2025-07-10 [email protected] [Android 16] Updated linux_android_emu to a 36 AVD in framework CI (flutter/flutter#169121) 2025-07-10 [email protected] [iOS] Add Live Text option to system context menu (flutter/flutter#170969) 2025-07-10 [email protected] Roll Skia from dc3da09ca905 to 34a40032ff0a (1 revision) (flutter/flutter#171982) 2025-07-10 [email protected] feat: Expose FocusNode of FocusTraversalGroup (flutter/flutter#171979) 2025-07-10 [email protected] `CupertinoDatePicker` and `CupertinoTimerPicker` new onChanged behavior (flutter/flutter#170793) 2025-07-10 [email protected] Manual roll Dart SDK from 8d69b07b9d9d to 07ea3aaaadf0 (32 revisions) (flutter/flutter#171969) 2025-07-10 [email protected] Style: Rename pageBuilder with builder in showCupertinoSheet (flutter/flutter#170625) 2025-07-10 [email protected] Roll Skia from bdb8bfcde7f3 to dc3da09ca905 (3 revisions) (flutter/flutter#171971) 2025-07-10 [email protected] Feat: Add foreground color for cupertino button (flutter/flutter#170898) 2025-07-10 [email protected] Roll Skia from 0fef076beec3 to bdb8bfcde7f3 (34 revisions) (flutter/flutter#171964) 2025-07-10 [email protected] Run stateless_stateful_hot_reload_web_test.dart on Mac/Windows (flutter/flutter#171283) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. ...

…#170625) Style: Rename pageBuilder with builder in showCupertinoSheet fixes: flutter#169831 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing.

…r#9602) Roll Flutter from 43657f3baa17 to 35f197f1e5f5 (39 revisions) flutter/flutter@43657f3...35f197f 2025-07-12 [email protected] Roll Fuchsia Linux SDK from 8aoEy1hp2a9HI1pt-... to xQlbHCUI33kDvkew8... (flutter/flutter#172060) 2025-07-12 [email protected] Add RSuperellipse support to Web (global cache) (flutter/flutter#171489) 2025-07-12 [email protected] Fix grammar: Change 'A' to 'An' before IOSSystemContextMenuItemData (flutter/flutter#172019) 2025-07-11 [email protected] Manual roll Dart to b21dca1b89ff (flutter/flutter#172038) 2025-07-11 [email protected] Roll Skia from 2ea2ba09ef85 to 92354f64e37f (1 revision) (flutter/flutter#172039) 2025-07-11 [email protected] Fix CheckedPopupMenuItem semantics to use menuItemCheckbox role with checked state (flutter/flutter#171749) 2025-07-11 [email protected] adds gemini.md to `engine` and `licenses_cpp` (flutter/flutter#172022) 2025-07-11 [email protected] [Web] Implement disabling interactive selection (flutter/flutter#171935) 2025-07-11 [email protected] [tool] Make google3 have to override feature flags (flutter/flutter#171933) 2025-07-11 [email protected] License cpp 710 (flutter/flutter#171989) 2025-07-11 [email protected] add content description to tooltip-only nodes for android (flutter/flutter#171541) 2025-07-11 [email protected] [Web a11y]Update table cell to use LabelRepresentation.sizedSpan (flutter/flutter#172013) 2025-07-11 [email protected] [ Tool ] Enable `omit_obvious_*_types` and `specify_nonobvious_*_types` lints (flutter/flutter#172018) 2025-07-11 [email protected] Add SemanticsLabelBuilder for Accessible Label Concatenation (flutter/flutter#171683) 2025-07-11 [email protected] Run tests on either macOS 14 or 15 (flutter/flutter#171076) 2025-07-11 [email protected] Roll Skia from db1a5550c848 to 2ea2ba09ef85 (1 revision) (flutter/flutter#172017) 2025-07-11 [email protected] [Cupertino] Make some widgets no longer use RSuperellipse (flutter/flutter#171830) 2025-07-11 [email protected] Detach the resource context from the IO thread only if the shell's IO manager is no longer being used by any other spawned shells (flutter/flutter#171554) 2025-07-11 [email protected] Started querying the app state for the gpu disabled sync switch (flutter/flutter#171785) 2025-07-11 [email protected] License_cpp 7/02 (flutter/flutter#171558) 2025-07-11 [email protected] [web] Refactor clipboard. (flutter/flutter#171427) 2025-07-11 [email protected] Require 64-bit Windows (flutter/flutter#171925) 2025-07-11 [email protected] Run hot_reload_with_asset_web_test.dart on Mac/Windows (flutter/flutter#171280) 2025-07-11 [email protected] Roll Skia from da7e3eae7c2b to db1a5550c848 (2 revisions) (flutter/flutter#171999) 2025-07-11 [email protected] Roll Skia from 26571c3b1771 to da7e3eae7c2b (2 revisions) (flutter/flutter#171997) 2025-07-11 [email protected] Roll Skia from 34a40032ff0a to 26571c3b1771 (1 revision) (flutter/flutter#171995) 2025-07-11 [email protected] Roll Fuchsia Linux SDK from lO64ePNEGrGzs-MFC... to 8aoEy1hp2a9HI1pt-... (flutter/flutter#171993) 2025-07-10 [email protected] Remove redundant ThemeData(useMaterial3: true) from tests (flutter/flutter#171569) 2025-07-10 [email protected] [Android 16] Updated linux_android_emu to a 36 AVD in framework CI (flutter/flutter#169121) 2025-07-10 [email protected] [iOS] Add Live Text option to system context menu (flutter/flutter#170969) 2025-07-10 [email protected] Roll Skia from dc3da09ca905 to 34a40032ff0a (1 revision) (flutter/flutter#171982) 2025-07-10 [email protected] feat: Expose FocusNode of FocusTraversalGroup (flutter/flutter#171979) 2025-07-10 [email protected] `CupertinoDatePicker` and `CupertinoTimerPicker` new onChanged behavior (flutter/flutter#170793) 2025-07-10 [email protected] Manual roll Dart SDK from 8d69b07b9d9d to 07ea3aaaadf0 (32 revisions) (flutter/flutter#171969) 2025-07-10 [email protected] Style: Rename pageBuilder with builder in showCupertinoSheet (flutter/flutter#170625) 2025-07-10 [email protected] Roll Skia from bdb8bfcde7f3 to dc3da09ca905 (3 revisions) (flutter/flutter#171971) 2025-07-10 [email protected] Feat: Add foreground color for cupertino button (flutter/flutter#170898) 2025-07-10 [email protected] Roll Skia from 0fef076beec3 to bdb8bfcde7f3 (34 revisions) (flutter/flutter#171964) 2025-07-10 [email protected] Run stateless_stateful_hot_reload_web_test.dart on Mac/Windows (flutter/flutter#171283) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. ...

flutter/flutter#170625)

…#170625) Style: Rename pageBuilder with builder in showCupertinoSheet fixes: flutter#169831 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing.

github-actions bot added framework flutter/packages/flutter repository. See also f: labels. f: cupertino flutter/packages/flutter/cupertino repository labels Jun 14, 2025

rkishan516 force-pushed the cupertino-sheet-parameter branch from fad2bd4 to a3487bc Compare June 14, 2025 04:18

rkishan516 marked this pull request as ready for review June 14, 2025 04:18

dkwingsmt requested a review from MitchellGoodwin June 18, 2025 18:41

MitchellGoodwin reviewed Jul 1, 2025

View reviewed changes

rkishan516 force-pushed the cupertino-sheet-parameter branch from a3487bc to b0f88fa Compare July 2, 2025 01:54

MitchellGoodwin reviewed Jul 2, 2025

View reviewed changes

rkishan516 force-pushed the cupertino-sheet-parameter branch from b0f88fa to 7b7382b Compare July 3, 2025 01:46

github-actions bot added the c: tech-debt Technical debt, code quality, testing, etc. label Jul 3, 2025

rkishan516 force-pushed the cupertino-sheet-parameter branch from 7b7382b to 3849ae9 Compare July 3, 2025 01:47

rkishan516 added 2 commits July 9, 2025 07:53

Style: Rename pageBuilder with builder in showCupertinoSheet

d67e26b

Fix: Add backward compatibility

d35a8c3

rkishan516 force-pushed the cupertino-sheet-parameter branch from 3849ae9 to d35a8c3 Compare July 9, 2025 02:27

MitchellGoodwin approved these changes Jul 10, 2025

View reviewed changes

victorsanni approved these changes Jul 10, 2025

View reviewed changes

victorsanni added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 10, 2025

auto-submit bot added this pull request to the merge queue Jul 10, 2025

Merged via the queue into flutter:master with commit 07aaa8f Jul 10, 2025
72 checks passed

flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jul 10, 2025

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 11, 2025

07aaa8f2a Style: Rename pageBuilder with builder in showCupertinoSheet (

9bbf425

flutter/flutter#170625)

engine-flutter-autoroll mentioned this pull request Jul 11, 2025

Roll Flutter from 43657f3baa17 to 1c5e046d3366 (16 revisions) flutter/packages#9596

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 11, 2025

07aaa8f2a Style: Rename pageBuilder with builder in showCupertinoSheet (

f27e439

flutter/flutter#170625)

engine-flutter-autoroll mentioned this pull request Jul 11, 2025

Roll Flutter from 43657f3baa17 to 255e8c20a09b (17 revisions) flutter/packages#9597

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 11, 2025

07aaa8f2a Style: Rename pageBuilder with builder in showCupertinoSheet (

c74f405

flutter/flutter#170625)

engine-flutter-autoroll mentioned this pull request Jul 11, 2025

Roll Flutter from 43657f3baa17 to 3e9ab91e39f1 (21 revisions) flutter/packages#9598

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 11, 2025

07aaa8f2a Style: Rename pageBuilder with builder in showCupertinoSheet (

4dd6cc8

flutter/flutter#170625)

engine-flutter-autoroll mentioned this pull request Jul 11, 2025

Roll Flutter from 43657f3baa17 to 2c7ab86ea622 (22 revisions) flutter/packages#9599

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 11, 2025

07aaa8f2a Style: Rename pageBuilder with builder in showCupertinoSheet (

7f9764b

flutter/flutter#170625)

engine-flutter-autoroll mentioned this pull request Jul 11, 2025

Roll Flutter from 43657f3baa17 to dcf22d16502f (23 revisions) flutter/packages#9600

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 11, 2025

07aaa8f2a Style: Rename pageBuilder with builder in showCupertinoSheet (

e84b114

flutter/flutter#170625)

engine-flutter-autoroll mentioned this pull request Jul 11, 2025

Roll Flutter from 43657f3baa17 to 43161d4b9578 (24 revisions) flutter/packages#9601

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 12, 2025

07aaa8f2a Style: Rename pageBuilder with builder in showCupertinoSheet (

40bcc9b

flutter/flutter#170625)

engine-flutter-autoroll mentioned this pull request Jul 12, 2025

Roll Flutter from 43657f3baa17 to 35f197f1e5f5 (39 revisions) flutter/packages#9602

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 14, 2025

07aaa8f2a Style: Rename pageBuilder with builder in showCupertinoSheet (

ef0f234

flutter/flutter#170625)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 14, 2025

07aaa8f2a Style: Rename pageBuilder with builder in showCupertinoSheet (

0619ebb

flutter/flutter#170625)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 15, 2025

07aaa8f2a Style: Rename pageBuilder with builder in showCupertinoSheet (

081ca73

flutter/flutter#170625)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 15, 2025

07aaa8f2a Style: Rename pageBuilder with builder in showCupertinoSheet (

d7dce6f

flutter/flutter#170625)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 16, 2025

07aaa8f2a Style: Rename pageBuilder with builder in showCupertinoSheet (

82db427

flutter/flutter#170625)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Style: Rename pageBuilder with builder in showCupertinoSheet #170625

Style: Rename pageBuilder with builder in showCupertinoSheet #170625

Uh oh!

rkishan516 commented Jun 14, 2025

Uh oh!

MitchellGoodwin left a comment

Uh oh!

Uh oh!

MitchellGoodwin Jul 1, 2025

Uh oh!

MitchellGoodwin left a comment

Uh oh!

rkishan516 commented Jul 3, 2025

Uh oh!

MitchellGoodwin commented Jul 8, 2025

Uh oh!

MitchellGoodwin left a comment

Uh oh!

victorsanni left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Style: Rename pageBuilder with builder in showCupertinoSheet #170625

Style: Rename pageBuilder with builder in showCupertinoSheet #170625

Uh oh!

Conversation

rkishan516 commented Jun 14, 2025

Pre-launch Checklist

Uh oh!

MitchellGoodwin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

MitchellGoodwin Jul 1, 2025

Choose a reason for hiding this comment

Uh oh!

MitchellGoodwin left a comment

Choose a reason for hiding this comment

Uh oh!

rkishan516 commented Jul 3, 2025

Uh oh!

MitchellGoodwin commented Jul 8, 2025

Uh oh!

MitchellGoodwin left a comment

Choose a reason for hiding this comment

Uh oh!

victorsanni left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants