Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(material/button): handle disabled states through tokens #28005

Merged
merged 1 commit into from
Oct 26, 2023

Conversation

crisbeto
Copy link
Member

MDC applies disabled styles through the :disabled selector which forced us to work around it by using a selector like .mat-mdc-button[disabled][disabled] and setting both the disabled and enabled button tokens. This is problematic, because it increases the specificity too much and it introduces space for mistakes, because we have to duplicate the tokens values.

These changes resolve the issue by re-applying the token slots to disabled buttons with the correct selector so that they can reuse the same tokens as the button nodes.

@crisbeto crisbeto added P3 An issue that is relevant to core functions, but does not impede progress. Important, but not urgent target: rc This PR is targeted for the next release-candidate labels Oct 26, 2023
@@ -89,15 +88,3 @@
$query: mdc-helpers.$mdc-base-styles-query);
}
}

// Changes a button token set to exclude the ripple styles.
@function mat-private-button-remove-ripple($tokens) {
Copy link
Member Author

Choose a reason for hiding this comment

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

Unrelated change, I just noticed that we weren't using this.

MDC applies disabled styles through the `:disabled` selector which forced us to work around it by using a selector like `.mat-mdc-button[disabled][disabled]` and setting both the disabled and enabled button tokens. This is problematic, because it increases the specificity too much and it introduces space for mistakes, because we have to duplicate the tokens values.

These changes resolve the issue by re-applying the token slots to disabled buttons with the correct selector so that they can reuse the same tokens as the `button` nodes.
@crisbeto crisbeto self-assigned this Oct 26, 2023
@crisbeto crisbeto added the action: merge The PR is ready for merge by the caretaker label Oct 26, 2023
@crisbeto
Copy link
Member Author

Merging this manually through the UI. Will send a follow-up to cherry-pick into the RC branch.

@crisbeto crisbeto merged commit 01a9501 into angular:main Oct 26, 2023
24 of 26 checks passed
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Nov 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker P3 An issue that is relevant to core functions, but does not impede progress. Important, but not urgent target: rc This PR is targeted for the next release-candidate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants