Ignore custom variants with :merge(…) selectors#18020
Merged
philipp-spiess merged 2 commits intomainfrom May 15, 2025
Merged
Conversation
26100df to
1d312dc
Compare
| if (variant.some((v) => v.includes(':merge('))) return | ||
| } else if (typeof variant === 'object') { | ||
| if (Object.keys(variant).some((v) => v.includes(':merge('))) return | ||
| } |
Contributor
There was a problem hiding this comment.
- We should detect this in matchVariant as well.
- Should the object check happen recursively or no? I don't remember what v3 did there
Contributor
Author
There was a problem hiding this comment.
- Ah yep forgot about
matchVariant. - Hmm yeah probably you're right.
Contributor
Author
There was a problem hiding this comment.
@thecrypticace The matchVariant(…) implementation is a bit annoying since we have to call the matcher function to sample the output. I tried throwing the variant out later but once we register it with the design system, the peer-* and group-* compounding doesn't work anymore.
The only other idea I have is to check for wether the variant starts with peer- or group-. What do you think?
1d312dc to
9ceb6ce
Compare
thecrypticace
approved these changes
May 14, 2025
philipp-spiess
commented
May 15, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #15617
Summary
This PR ignores
addVariant(…)legacy JS plugin calls for variants that are using the:merge(…)selector for parent and sibling states. We can ignore these now because in v4,group-*andpeer-*variants compound automatically and you don't have to define them anymore.Test plan
Added a unit test to ensure that the
optionalvariant example from the v3 docs work as expected.