Skip to content

Reorder materialStateProperty defaults#125905

Merged
auto-submit[bot] merged 10 commits intoflutter:masterfrom
QuncCccccc:reorder_material_property_defaults
May 11, 2023
Merged

Reorder materialStateProperty defaults#125905
auto-submit[bot] merged 10 commits intoflutter:masterfrom
QuncCccccc:reorder_material_property_defaults

Conversation

@QuncCccccc
Copy link
Contributor

@QuncCccccc QuncCccccc commented May 2, 2023 •
edited
Loading

Fixes #122250. This PR is to make sure all the MaterialStateProperty defaults are able to correctly resolve different states.

  • When a widget is pressed, it is also hovered, so we need to put the MaterialState.pressed check before MaterialState.hovered.
  • When a widget is focused, the widget should still be able to be hovered, so we should check MaterialState.hovered before MaterialState.focused.
  • There are also cases like in _InputDecoratorDefaultsM3, the MaterialState.disabled should be checked before MaterialState.error.

the order should be disabled, (error), pressed, hovered, focused.

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].
  • All existing and new tests are passing.

@flutter-dashboard flutter-dashboard bot added a: text input Entering text in a text field or keyboard related problems f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels. c: contributor-productivity Team-specific productivity, code health, technical debt. labels May 2, 2023
QuncCccccc
QuncCccccc commented May 2, 2023
View reviewed changes
dev/tools/gen_defaults/lib/app_bar_template.dart Outdated
Copy link
Contributor Author

@QuncCccccc QuncCccccc May 2, 2023

Choose a reason for hiding this comment

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

Changes in app_bar_template.dart are coming from a previous PR which only removed the defaults in app_bar.dart but didn't update the template. To avoid this kind of mismatch in the future, I will add a test shard to CI to make sure the template and generated defaults can match each other.

@QuncCccccc QuncCccccc changed the title Reorder material property defaults Reorder material state property defaults May 3, 2023
@QuncCccccc QuncCccccc force-pushed the reorder_material_property_defaults branch from c3fbb4f to 3a68961 Compare May 5, 2023 05:20
@QuncCccccc QuncCccccc changed the title Reorder material state property defaults Reorder materialStateProperty defaults May 5, 2023
@QuncCccccc QuncCccccc marked this pull request as ready for review May 5, 2023 16:57
@QuncCccccc QuncCccccc requested a review from HansMuller May 5, 2023 16:59
HansMuller
HansMuller approved these changes May 10, 2023
View reviewed changes
Copy link
Contributor

@HansMuller HansMuller left a comment

Choose a reason for hiding this comment

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

LGTM

@QuncCccccc QuncCccccc added the autosubmit Merge PR when tree becomes green via auto submit App label May 11, 2023
@auto-submit auto-submit bot merged commit 4e7e451 into flutter:master May 11, 2023
@TahaTesser TahaTesser mentioned this pull request May 11, 2023
Closed
8 tasks
@HansMuller HansMuller mentioned this pull request May 12, 2023
Closed
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 13, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 13, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
999e260 
)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 13, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 13, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
94c676c 
)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 14, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 15, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
d4fcbb8 
)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 15, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 15, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
d566631 
)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 15, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 15, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
d3f2713 
)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 15, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 15, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
1254234 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 15, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
70aee97 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 15, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
3222764 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
fe59c9a 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
3326376 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
f165a01 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
e5a09e1 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
1c4f92b 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
7eed6ee 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
d653f83 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
5255a8c 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
079ccb1 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
5814d70 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
d70238f 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
0885cd7 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
7f3ac6e 
)
CaseyHillers pushed a commit to CaseyHillers/flutter that referenced this pull request May 24, 2023
@QuncCccccc
Reorder materialStateProperty defaults (flutter#125905)
f8db032 
Fixes flutter#122250. This PR is to make sure all the MaterialStateProperty defaults are able to correctly resolve different states. 
* When a widget is pressed, it is also hovered, so we need to put the `MaterialState.pressed` check before `MaterialState.hovered`. 
* When a widget is focused, the widget should still be able to be hovered, so we should check `MaterialState.hovered` before `MaterialState.focused`.
* There are also cases like in _InputDecoratorDefaultsM3, the `MaterialState.disabled` should be checked before `MaterialState.error`.

 the order should be disabled, (error), pressed, hovered, focused.
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 16, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
2863c04 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 17, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
c15a127 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 17, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
c27df8a 
)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 17, 2023
@engine-flutter-autoroll
4e7e451 Reorder materialStateProperty defaults (flutter/flutter#125905
eeb35bf 
)
@QuncCccccc QuncCccccc mentioned this pull request Apr 9, 2024
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@HansMuller HansMuller HansMuller approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

a: text input Entering text in a text field or keyboard related problems autosubmit Merge PR when tree becomes green via auto submit App c: contributor-productivity Team-specific productivity, code health, technical debt. f: material design flutter/packages/flutter/material repository. 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.

M3 Button MaterialStateProperty defaults don't resolve MaterialState.pressed

2 participants

@QuncCccccc @HansMuller