Skip to content

Conversation

@justinmc
Copy link
Contributor

Fixes an issue where multiple cursors were shown incorrectly

This pull request is a manual cherry pick of #175044 after I had trouble updating the automatic cherry pick pull request (#175393).

Issue Link:

What is the link to the issue this cherry-pick is addressing?

#173106

Changelog Description:

Explain this cherry pick in one line that is accessible to most Flutter developers. See best practices for examples

flutter/173106 - Fixes an issue where multiple cursors were shown incorrectly

Impact Description:

What is the impact (ex. visual jank on Samsung phones, app crash, cannot ship an iOS app)? Does it impact development (ex. flutter doctor crashes when Android Studio is installed), or the shipping production app (the app crashes on launch)

App is usable but shows multiple cursors incorrectly.

Workaround:

Is there a workaround for this issue?

No.

Risk:

What is the risk level of this cherry-pick?

  • Low
  • Medium
  • High

Test Coverage:

Are you confident that your fix is well-tested by automated tests?

  • Yes
  • No

Validation Steps:

What are the steps to validate that this fix works?

Create a list with many text fields. Tap on one text field to focus it. Swipe on another text field. Only at most one cursor should be visible at a time.

<!--
Thanks for filing a pull request!
Reviewers are typically assigned within a week of filing a request.
To learn more about code review, see our documentation on Tree Hygiene:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
-->

This PR fixes the issue where the cursor appears on a `TextField` after
a small swipe gesture, even if the field does not have focus.

The problem was caused by missing focus validation when showing the
cursor.
Now the cursor is only shown if the `TextField` has focus, which aligns
with expected behavior.

Fixes flutter#173106

## 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.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

**Note**: The Flutter team is currently trialing the use of [Gemini Code
Assist for
GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code).
Comments from the `gemini-code-assist` bot should not be taken as
authoritative feedback from the Flutter team. If you find its comments
useful you can update your code accordingly, but if you are unsure or
disagree with the feedback, please feel free to wait for a Flutter team
member's review for guidance on which automated comments should be
addressed.

<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
[Features we expect every widget to implement]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
[Data Driven Fixes]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
@justinmc justinmc requested review from a team and jtmcdole as code owners September 25, 2025 19:13
@justinmc justinmc requested a review from reidbaker September 25, 2025 19:13
@github-actions github-actions bot added a: tests "flutter test", flutter_test, or one of our tests a: text input Entering text in a text field or keyboard related problems platform-android Android applications specifically platform-ios iOS applications specifically tool Affects the "flutter" command-line tool. See also t: labels. framework flutter/packages/flutter repository. See also f: labels. engine flutter/engine related. See also e: labels. f: material design flutter/packages/flutter/material repository. a: accessibility Accessibility, e.g. VoiceOver or TalkBack. (aka a11y) f: cupertino flutter/packages/flutter/cupertino repository platform-web Web applications specifically platform-linux Building on or for Linux specifically a: desktop Running on desktop f: integration_test The flutter/packages/integration_test plugin e: impeller Impeller rendering backend issues and features requests team-android Owned by Android platform team team-ios Owned by iOS platform team labels Sep 25, 2025
@justinmc justinmc requested review from Renzo-Olivares and loic-sharma and removed request for a team and loic-sharma September 25, 2025 19:14
@justinmc justinmc changed the base branch from master to flutter-3.35-candidate.0 September 25, 2025 19:14
@flutter-dashboard
Copy link

This pull request was opened from and to a release candidate branch. This should only be done as part of the official Flutter release process. If you are attempting to make a regular contribution to the Flutter project, please close this PR and follow the instructions at Tree Hygiene for detailed instructions on contributing to Flutter.

Reviewers: Use caution before merging pull requests to release branches. Ensure the proper procedure has been followed.

@reidbaker
Copy link
Contributor

@justinmc you need to modify your target branch.

@justinmc
Copy link
Contributor Author

Whoops, done!

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request is a cherry-pick that bundles a large number of fixes and improvements for a stable release. The changes are diverse, ranging from the cursor behavior fix mentioned in the title to significant refactoring of iOS device deployment, build system enhancements, and fixes in the Impeller rendering backend.

Overall, the changes are well-implemented and improve the robustness and maintainability of the codebase. I've included a few suggestions to enhance maintainability and correct a potentially confusing warning message for plugin developers.

@reidbaker
Copy link
Contributor

reidbaker commented Sep 25, 2025

@justinmc dont forget to update the changelog and engine.version in another pr before doing post submits. I forgot both on my first attempt last week.

@jtmcdole
Copy link
Member

lgtm from me.

@justinmc
Copy link
Contributor Author

Thank you for the heads up @reidbaker, I was definitely heading for the same mistake.

@jmagman
Copy link
Member

jmagman commented Sep 25, 2025

I had trouble updating the automatic cherry pick pull request (#175393).

I filed #176054, that's a recent cocoon regression.

@justinmc
Copy link
Contributor Author

Thank you @jmagman!

@justinmc justinmc added the autosubmit Merge PR when tree becomes green via auto submit App label Sep 25, 2025
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Sep 25, 2025
@auto-submit
Copy link
Contributor

auto-submit bot commented Sep 25, 2025

autosubmit label was removed for flutter/flutter/176048, because The base commit of the PR is older than 7 days and can not be merged. Please merge the latest changes from the main into this branch and resubmit the PR.

@jtmcdole jtmcdole merged commit 07f51a8 into flutter:flutter-3.35-candidate.0 Sep 26, 2025
140 of 141 checks passed
@justinmc justinmc deleted the cp-stable-98f507e663b317513603883ff7332dd2e04f57a4 branch September 26, 2025 16:45
auto-submit bot pushed a commit that referenced this pull request Sep 26, 2025
Changelog update for stable hotfix. These are the cherry picks:

#176030
#176048
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Sep 29, 2025
@fabiocdssilva69-prog fabiocdssilva69-prog mentioned this pull request Oct 6, 2025
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

a: accessibility Accessibility, e.g. VoiceOver or TalkBack. (aka a11y) a: desktop Running on desktop a: tests "flutter test", flutter_test, or one of our tests a: text input Entering text in a text field or keyboard related problems e: impeller Impeller rendering backend issues and features requests engine flutter/engine related. See also e: labels. f: cupertino flutter/packages/flutter/cupertino repository f: integration_test The flutter/packages/integration_test plugin f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels. platform-android Android applications specifically platform-ios iOS applications specifically platform-linux Building on or for Linux specifically platform-web Web applications specifically team-android Owned by Android platform team team-ios Owned by iOS platform team tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants