mirror of
https://github.com/we-promise/sure.git
synced 2026-06-05 18:59:04 +00:00
* fix(ds): dark-mode token parity — text, borders, checkbox, toggle, over-budget badge Dark-mode contrast/parity pass (design-review epic #2134, follow-up to #1736): - text-subdued (dark): gray-500 -> gray-400; faint/eyebrow text ~3.6:1 -> ~6.7:1 (clears AA), staying below text-secondary so hierarchy holds. - border-primary/secondary/subdued (dark): +1 alpha-white step each; restores group-card edges and in-card row hairlines (border-primary 1.86:1 -> 2.8:1). Alpha keeps them surface-relative across any dark bg. - Dark checkbox: unchecked was a solid white square (read as already-selected) — now a transparent outlined box; checked/indeterminate use a white fill with a #171717 glyph (was #808080, ~2:1); added an explicit indeterminate dash; disabled muted to gray-700. - Toggle (light off-state): track gray-100 -> gray-300 plus a thumb shadow; the white-thumb-on-white-track invisible off-state now reads (dark off-track was already hardened to gray-700). - Over-budget badge: text-red-500 -> text-destructive (theme-aware, matching the on-track/near-limit siblings); in-situ dark contrast 4.18:1 -> 4.55:1 (AA). - Correct invalid icon color keys (red/yellow/green -> destructive/warning/success) on the three budget status badges. Verified in-browser, light+dark: isolated checkbox states, /accounts card borders, /reports muted text, toggle off-state, /budgets over-budget badge (in-situ 4.55:1). * fix(ds): reconcile destructive color + fix filled-pill contrast Continues the dark-parity pass (#2134): - Reconcile destructive: border-destructive and button-bg-destructive were red-500 while the destructive text/icon token was red-600. Unify on red-600 (light) / red-400 (dark) across text, border, and button — the text token can't drop to red-500 (3.96:1 on white, fails AA), so border/button move up instead. White-on-destructive-button 3.96:1 -> 4.36:1 (AA-large); hover red-600 -> red-700. - DS::Pill filled style: deepen the fill tone-500 -> tone-700. White label text on tone-500 failed AA on nearly every tone (amber 2.35:1, green 2.62:1, red 3.95:1); tone-700 clears it (amber 5.43, green 4.30, red 5.86, others 6.4-12) in both themes and removes the dark-surface glare. Date-input calendar glyph in dark verified already-correct (existing invert(1) rules; color-scheme is normal, so no conflict) — no change needed. Verified in-browser: real .button-bg-destructive (red-600) + filled pills, all tones, light and dark. * fix(ds): destructive button consumes the reconciled red-600 Follow-up to the destructive reconcile in this branch: DS::Buttonish's destructive variant still used raw bg-red-500 / hover:bg-red-600, so destructive *buttons* didn't match the reconciled destructive text/border (red-600). Align to red-600 / hover red-700 (light); dark unchanged (red-400 / red-500). White-on-red-600 = 4.37:1 (AA-large), consistent with the rest of the destructive family. * refactor(ds): tokenize budget-category badge + bar backgrounds Status-badge foregrounds already used semantic tokens (text-destructive/ warning/success) but backgrounds + progress-bar fills stayed on the raw palette (bg-red-500/10, bg-yellow-500, ...). Switch to the matching semantic tokens (bg-destructive/10, bg-warning, bg-success) — same value in light, now theme-aware in dark. Mirrors DS::Alert. Addresses CodeRabbit/Codex on #2139.
158 lines
4.6 KiB
Ruby
158 lines
4.6 KiB
Ruby
class DS::Buttonish < DesignSystemComponent
|
|
VARIANTS = {
|
|
primary: {
|
|
container_classes: "text-inverse bg-inverse hover:bg-inverse-hover disabled:bg-gray-500 theme-dark:disabled:bg-gray-400",
|
|
icon_classes: "text-inverse"
|
|
},
|
|
secondary: {
|
|
container_classes: "text-primary bg-gray-200 theme-dark:bg-gray-700 hover:bg-gray-300 theme-dark:hover:bg-gray-600 disabled:bg-gray-200 theme-dark:disabled:bg-gray-600",
|
|
icon_classes: "text-primary"
|
|
},
|
|
destructive: {
|
|
container_classes: "text-inverse bg-red-600 theme-dark:bg-red-400 hover:bg-red-700 theme-dark:hover:bg-red-500 disabled:bg-red-200 theme-dark:disabled:bg-red-600",
|
|
icon_classes: "text-inverse"
|
|
},
|
|
outline: {
|
|
container_classes: "text-primary border border-secondary bg-transparent hover:bg-surface-hover",
|
|
icon_classes: "text-secondary"
|
|
},
|
|
outline_destructive: {
|
|
container_classes: "text-destructive border border-secondary bg-transparent hover:bg-container-inset-hover",
|
|
icon_classes: "text-secondary"
|
|
},
|
|
ghost: {
|
|
container_classes: "text-primary bg-transparent hover:bg-container-inset-hover",
|
|
icon_classes: "text-secondary"
|
|
},
|
|
icon: {
|
|
container_classes: "hover:bg-container-inset-hover",
|
|
icon_classes: "text-secondary"
|
|
},
|
|
icon_inverse: {
|
|
container_classes: "bg-inverse hover:bg-inverse-hover",
|
|
icon_classes: "text-inverse"
|
|
}
|
|
}.freeze
|
|
|
|
SIZES = {
|
|
sm: {
|
|
container_classes: "px-2 py-1",
|
|
icon_container_classes: "inline-flex items-center justify-center w-8 h-8",
|
|
radius_classes: "rounded-md",
|
|
text_classes: "text-sm"
|
|
},
|
|
md: {
|
|
container_classes: "px-3 py-2",
|
|
icon_container_classes: "inline-flex items-center justify-center w-11 h-11",
|
|
radius_classes: "rounded-lg",
|
|
text_classes: "text-sm"
|
|
},
|
|
lg: {
|
|
container_classes: "px-4 py-3",
|
|
icon_container_classes: "inline-flex items-center justify-center w-12 h-12",
|
|
radius_classes: "rounded-xl",
|
|
text_classes: "text-base"
|
|
}
|
|
}.freeze
|
|
|
|
attr_reader :variant, :size, :href, :icon, :icon_custom, :icon_position, :text, :full_width, :extra_classes, :frame, :opts
|
|
|
|
def initialize(variant: :primary, size: :md, href: nil, text: nil, icon: nil, icon_custom: false, icon_position: :left, full_width: false, frame: nil, **opts)
|
|
@variant = variant.to_s.underscore.to_sym
|
|
@size = size.to_sym
|
|
@href = href
|
|
@icon = icon
|
|
@icon_custom = icon_custom
|
|
@icon_position = icon_position.to_sym
|
|
@text = text
|
|
@full_width = full_width
|
|
@extra_classes = opts.delete(:class)
|
|
@frame = frame
|
|
@opts = opts
|
|
end
|
|
|
|
def call
|
|
raise NotImplementedError, "Buttonish is an abstract class and cannot be instantiated directly."
|
|
end
|
|
|
|
def container_classes(override_classes = nil)
|
|
class_names(
|
|
"font-medium whitespace-nowrap",
|
|
merged_base_classes,
|
|
full_width ? "w-full justify-center" : nil,
|
|
container_size_classes,
|
|
icon_only? ? nil : size_data.dig(:text_classes),
|
|
variant_data.dig(:container_classes)
|
|
)
|
|
end
|
|
|
|
def container_size_classes
|
|
icon_only? ? size_data.dig(:icon_container_classes) : size_data.dig(:container_classes)
|
|
end
|
|
|
|
def icon_color
|
|
# Map variant to icon color for the icon helper
|
|
case variant
|
|
when :primary, :icon_inverse
|
|
:white
|
|
when :destructive, :outline_destructive
|
|
:destructive
|
|
else
|
|
:default
|
|
end
|
|
end
|
|
|
|
def icon_classes
|
|
class_names(
|
|
variant_data.dig(:icon_classes)
|
|
)
|
|
end
|
|
|
|
def icon_only?
|
|
variant.in?([ :icon, :icon_inverse ]) || (icon.present? && text.blank?)
|
|
end
|
|
|
|
private
|
|
def variant_data
|
|
self.class::VARIANTS.dig(variant)
|
|
end
|
|
|
|
def size_data
|
|
self.class::SIZES.dig(size)
|
|
end
|
|
|
|
# Make sure that user can override common classes like `hidden`
|
|
def merged_base_classes
|
|
base_display_classes = "inline-flex items-center gap-1"
|
|
base_radius_classes = size_data.dig(:radius_classes)
|
|
|
|
extra_classes_list = (extra_classes || "").split
|
|
|
|
has_display_override = extra_classes_list.any? { |c| permitted_display_override_classes.include?(c) }
|
|
has_radius_override = extra_classes_list.any? { |c| permitted_radius_override_classes.include?(c) }
|
|
|
|
base_classes = []
|
|
|
|
unless has_display_override
|
|
base_classes << base_display_classes
|
|
end
|
|
|
|
unless has_radius_override
|
|
base_classes << base_radius_classes
|
|
end
|
|
|
|
class_names(
|
|
base_classes,
|
|
extra_classes
|
|
)
|
|
end
|
|
|
|
def permitted_radius_override_classes
|
|
[ "rounded-full" ]
|
|
end
|
|
|
|
def permitted_display_override_classes
|
|
[ "hidden", "flex" ]
|
|
end
|
|
end
|