refactor(ui): refine Button proportions and interaction hierarchy - #901
Merged
Conversation
Astro-Han
force-pushed
the
refactor/ui-button-hierarchy
branch
from
July 13, 2026 18:10
4a20293 to
6c35908
Compare
Astro-Han
marked this pull request as ready for review
July 13, 2026 19:24
This was referenced Jul 15, 2026
Astro-Han
added a commit
that referenced
this pull request
Jul 15, 2026
…ill shape (#1028) #901 retired the composer consumer-layer button CSS (maka-composer-tool-button / maka-composer-context-plus / maka-composer-send-button) onto the shared Button, but the shared primitive had no governed replacement for the circle — its only radius is the control-tier rounded-sm — so the "+" affordance (hover included) and the send button silently went square. Add a `shape` axis to buttonVariants (default / pill) so the pill tier lives on the governed primitive, opt the composer "+" and send buttons into shape="pill", and extend the radius-converge contract with `alsoTiers` so a component can legitimately serve more than one radius tier (buttonVariants: control + pill). The utility-primitives contract now asserts the composer buttons carry shape="pill", and button.test.ts locks that tailwind-merge resolves pill over the base rounded-sm.
This was referenced Jul 16, 2026
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
1 participant
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
Why
The shared Button had accumulated 28px, 30px, 32px, 36px, and 40px paths, while compact consumers compensated with local geometry and hover rules. That made Chinese and English labels appear inconsistent and blurred the hierarchy between solid actions, bordered secondary actions, and quiet controls.
This change restores the primitive as the single authority for action proportions and interaction states. Composite navigation rows remain in their existing semantic seams instead of pretending to be another Button size.
Closes #878.
Scope
Verification
npm --workspace @maka/ui test— 128 tests passed.npm --workspace @maka/desktop test— 2,415 tests passed.npm run typecheck— all workspaces passed.Button hierarchy
Interaction states
Impact
Button consumers now use a smaller governed default height, neutral text uses normal weight, and
outline,lg, andnavare no longer valid Button options. Existing consumers are migrated in this PR; no operator action or data migration is required.Reviewer notes
Please focus on the shared variant matrix, the distinction between ghost and quiet text tone, and the semantic separation between standard actions and composite navigation rows.
Ready for review
Verificationexplains why it is not applicable