refactor(mix): simplify deferred merge and stabilize variant ordering#862
Draft
leoafarias wants to merge 4 commits intomainfrom
Draft
refactor(mix): simplify deferred merge and stabilize variant ordering#862leoafarias wants to merge 4 commits intomainfrom
leoafarias wants to merge 4 commits intomainfrom
Conversation
Centralize deferred merge logic in Style.deferMerge() with DeferredVariant, add cycle detection via _visitedStyles, flatten double MixOps.mergeVariants nesting, and reduce over-specified 50-element insertion-order test to 7 elements.
Contributor
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
|
To view this pull requests documentation preview, visit the following URL: Documentation is deployed and generated using docs.page. |
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
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.
Summary
Style.deferMerge()withDeferredVariantandhasBasePayload/copyWithVariantshooks, replacing duplicated inline guards in generated merge methods_visitedStylesto prevent infinite recursion inmergeActiveVariantsMixOps.mergeVariantsnesting to[...?$variants, ...?deferredVariants]for readabilityTest plan
style_get_all_variants_test,token_style_mixin_test,style_nested_variants_test,style_defer_merge_test)useTokenprecedence chain:useToken(...).color(red)→ red wins