Fix resolving colors via theme(…) in compat mode with nested objects
#19097
+93
−10
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.
This PR fixes an issue when loading (nested) colors from a config file and later referencing it via the
theme(…)function in CSS.Given a config like this:
We internally map this into the design system. The issue here is that the
fooandfoo-barare overlapping and it behaves more like this:So while we can easily resolve
colors.foo-bar, thecolors.foowould result in the object with aDEFAULTkey. This PR solves that by using theDEFAULTkey if we end up with an object that has it.If you end up resolving an object (
theme(colors)) then the behavior is unchanged.Test plan
DEFAULTkey).Fixes: #19091