Skip to content

Reland "Update FocusManager platform check to include iOS"#148984

Merged
auto-submit[bot] merged 4 commits intoflutter:masterfrom
nate-thegrate:focus-manager-fix
May 23, 2024
Merged

Reland "Update FocusManager platform check to include iOS"#148984
auto-submit[bot] merged 4 commits intoflutter:masterfrom
nate-thegrate:focus-manager-fix

Conversation

@nate-thegrate
Copy link
Contributor

@nate-thegrate nate-thegrate commented May 23, 2024 •
edited
Loading

The original PR ended up having incompatible changes with #148067.

@nate-thegrate nate-thegrate added the cp: stable cherry pick this pull request to stable release candidate branch label May 23, 2024
@github-actions github-actions bot added framework flutter/packages/flutter repository. See also f: labels. f: focus Focus traversal, gaining or losing focus labels May 23, 2024
@nate-thegrate nate-thegrate mentioned this pull request May 23, 2024
Closed
5 tasks
@Renzo-Olivares
Copy link
Contributor

Renzo-Olivares commented May 23, 2024

I think FocusManager.listenToApplicationLifecycleChangesIfSupported should also be updated to reflect this new platform check.

@nate-thegrate
Copy link
Contributor Author

nate-thegrate commented May 23, 2024

@Renzo-Olivares I hadn't noticed that the listenToApplicationLifecycleChangesIfSupported method was added, thank you!

Renzo-Olivares
Renzo-Olivares reviewed May 23, 2024
View reviewed changes
Renzo-Olivares
Renzo-Olivares reviewed May 23, 2024
View reviewed changes
Renzo-Olivares
Renzo-Olivares reviewed May 23, 2024
View reviewed changes
packages/flutter/test/widgets/focus_manager_test.dart Outdated
Copy link
Contributor

@Renzo-Olivares Renzo-Olivares May 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think about removing this check, and instead specifying Android and iOS as the test variants, and skipping the web test? I think as the test stands now it is only running on Android.

Copy link
Contributor Author

@nate-thegrate nate-thegrate May 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't believe I didn't notice that you can specify a test variant! Thanks for the suggestion.

Renzo-Olivares
Renzo-Olivares reviewed May 23, 2024
View reviewed changes
Renzo-Olivares
Renzo-Olivares reviewed May 23, 2024
View reviewed changes
Renzo-Olivares
Renzo-Olivares approved these changes May 23, 2024
View reviewed changes
Copy link
Contributor

@Renzo-Olivares Renzo-Olivares left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM w/ small nit. Thank you for the quick changes and contribution!

Renzo-Olivares
Renzo-Olivares reviewed May 23, 2024
View reviewed changes
packages/flutter/test/widgets/focus_manager_test.dart Outdated
expect(focusNode.hasPrimaryFocus, isTrue);
},
skip: kIsWeb, // [intended]
variant: TargetPlatformVariant.only(TargetPlatform.iOS, TargetPlatform.android),
Copy link
Contributor

@Renzo-Olivares Renzo-Olivares May 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be

variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.android, TargetPlatform.iOS }).

@nate-thegrate nate-thegrate added the autosubmit Merge PR when tree becomes green via auto submit App label May 23, 2024
@auto-submit auto-submit bot merged commit f419177 into flutter:master May 23, 2024
@xvrh xvrh mentioned this pull request May 24, 2024
Closed
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 24, 2024
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 24, 2024
@engine-flutter-autoroll
f419177 Reland "Update FocusManager platform check to include iOS" (f…
9dc23fe 
…lutter/flutter#148984)
auto-submit bot pushed a commit to flutter/packages that referenced this pull request May 24, 2024
@engine-flutter-autoroll
Roll Flutter from 8d955cd to 8dd0831 (22 revisions) (#6788)
df6dd24 
flutter/flutter@8d955cd...8dd0831

2024-05-24 [email protected] Roll Flutter Engine from c6041cd9049c to 4ab442475223 (1 revision) (flutter/flutter#149039)
2024-05-24 [email protected] Roll Flutter Engine from 8d896f4feb76 to c6041cd9049c (1 revision) (flutter/flutter#149035)
2024-05-24 [email protected] Roll Flutter Engine from fe3b26294d8f to 8d896f4feb76 (1 revision) (flutter/flutter#149030)
2024-05-24 [email protected] Roll Flutter Engine from b4fb08f21757 to fe3b26294d8f (1 revision) (flutter/flutter#149028)
2024-05-24 [email protected] Roll Flutter Engine from f873230ce823 to b4fb08f21757 (2 revisions) (flutter/flutter#149025)
2024-05-24 [email protected] Roll Flutter Engine from d78f66753332 to f873230ce823 (1 revision) (flutter/flutter#149021)
2024-05-24 [email protected] Roll Flutter Engine from 768c90ee5dc7 to d78f66753332 (3 revisions) (flutter/flutter#149011)
2024-05-23 [email protected] Reland "Update `FocusManager` platform check to include iOS" (flutter/flutter#148984)
2024-05-23 [email protected] Roll Flutter Engine from ad12c5d02a8c to 768c90ee5dc7 (2 revisions) (flutter/flutter#149003)
2024-05-23 [email protected] Fix `SnackBar` action text button overlay color (flutter/flutter#148961)
2024-05-23 [email protected] Fix the second TextFormField to trigger onTapOutside (flutter/flutter#148930)
2024-05-23 [email protected] Roll Flutter Engine from 2a48302f6f4e to ad12c5d02a8c (3 revisions) (flutter/flutter#148993)
2024-05-23 [email protected] Roll Flutter Engine from 964f087f288c to 2a48302f6f4e (1 revision) (flutter/flutter#148950)
2024-05-23 [email protected] [wiki migration] Remaining pages under docs/contributing/ (flutter/flutter#148790)
2024-05-23 [email protected] [wiki migration] Web team pages (flutter/flutter#148777)
2024-05-23 [email protected] Test remaining transitions api examples (flutter/flutter#148302)
2024-05-23 [email protected] Test snack bar examples (flutter/flutter#147774)
2024-05-23 [email protected] Add tests for material banner example (flutter/flutter#147733)
2024-05-23 [email protected] Roll Packages from 6525441 to 1008d9e (6 revisions) (flutter/flutter#148980)
2024-05-23 [email protected] Revert "const vs. non-const widget build benchmark" (flutter/flutter#148970)
2024-05-23 [email protected] Remove hidden dependencies on HttpClient (flutter/flutter#148773)
2024-05-23 [email protected] Revert "Update `FocusManager` platform check to include iOS" (flutter/flutter#148978)

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],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
@nate-thegrate nate-thegrate deleted the focus-manager-fix branch May 25, 2024 18:58
@nate-thegrate nate-thegrate removed the cp: stable cherry pick this pull request to stable release candidate branch label May 30, 2024
victorsanni pushed a commit to victorsanni/flutter that referenced this pull request May 31, 2024
@nate-thegrate @victorsanni
Reland "Update FocusManager platform check to include iOS" (flutter…
3147e34 
…#148984)

It looks like removing `kIsWeb` from the `FocusManager._appLifecycleListener` platform check is causing [memory leaks](flutter#148985) and test failures.

This pull request fixes flutter#148475 and prevents the test failures shown in flutter#148978.
@justinmc justinmc mentioned this pull request Jun 27, 2024
Open
@nate-thegrate nate-thegrate added the cp: stable cherry pick this pull request to stable release candidate branch label Jun 28, 2024
@flutteractionsbot
Copy link

flutteractionsbot commented Jun 28, 2024

Failed to create CP due to merge conflicts.
You will need to create the PR manually. See the cherrypick wiki for more info.

@techouse
Copy link
Contributor

techouse commented Jun 30, 2024

When will this land in stable? It has been baking in master for over a month now.

@nate-thegrate
Copy link
Contributor Author

nate-thegrate commented Jun 30, 2024

Hi @techouse, I appreciate your concern! Unfortunately, a comment like this one contravenes our issue hygiene guidelines.

But to answer your question: it will land in stable once someone makes a cherry-pick pull request, and that PR is approved. I was planning to manually create a PR within the next day or two!

@nate-thegrate nate-thegrate mentioned this pull request Jul 1, 2024
Closed
5 tasks
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 6, 2024
@engine-flutter-autoroll
f419177 Reland "Update FocusManager platform check to include iOS" (f…
e7ada3b 
…lutter/flutter#148984)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Renzo-Olivares Renzo-Olivares Renzo-Olivares approved these changes

@LongCatIsLooong LongCatIsLooong Awaiting requested review from LongCatIsLooong

Assignees

No one assigned

Labels

autosubmit Merge PR when tree becomes green via auto submit App cp: stable cherry pick this pull request to stable release candidate branch f: focus Focus traversal, gaining or losing focus framework flutter/packages/flutter repository. See also f: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@nate-thegrate @Renzo-Olivares @flutteractionsbot @techouse