mirror of
https://github.com/we-promise/sure.git
synced 2026-05-07 21:04:12 +00:00
* chore(design-system): swap raw gray classes for semantic tokens across remaining views Finalizes the raw-color sweep started in #1652 (settings) and continued in #1654 (holdings). Covers accounts, budgets, chats, pages, imports, provider integrations (mercury, lunchflow, sophtron, enable_banking, coinstats), auth flows (password reset, MFA, registrations), shared layouts, and selected DS component hover states. 35 files, ~56 line changes. Mappings (matching the patterns established in the prior sweeps): - text-white bg-gray-900 hover:bg-gray-800 (with optional focus:ring-gray-900) -> text-inverse button-bg-primary hover:button-bg-primary-hover -> focus:ring-button-bg-primary - text-gray-500 / 600 / 700 -> text-secondary - text-gray-800 -> text-primary - text-gray-400 -> text-subdued - hover:text-gray-700 / hover:text-gray-100 -> hover:text-primary - bg-gray-50 / 100 / 200 (standalone) -> bg-surface-inset - bg-gray-500/5 -> bg-gray-tint-5 - bg-gray-500/10 -> bg-gray-tint-10 - bg-gray-900 (decorative active states) -> bg-inverse - hover:bg-gray-50 / 100 (standalone) -> hover:bg-surface-inset - hover:bg-gray-300 -> hover:bg-surface-inset-hover - bg-white hover:bg-gray-100 -> bg-container hover:bg-container-hover - border-gray-300 -> border-secondary - focus:border-gray-200 -> focus:border-secondary - focus-within:border-gray-900 -> focus-within:border-primary - DS::Buttonish outline / ghost / icon hover: hover:bg-gray-100 theme-dark:hover:bg-gray-700 -> hover:bg-container-inset-hover Left intentionally raw, with rationale: - bg-gray-300 / bg-gray-400 decorative dots and avatar circles. The raw value reads OK against both bg-container variants; no semantic "neutral indicator" token exists. Same pattern as #1652 / #1654. - bg-gray-400/20 theme-dark:bg-gray-500/20 (onboardings/trial). Custom alpha tint with no equivalent token. - bg-white theme-dark:bg-gray-700 (DS::Tabs active pill, budgets tabs). Custom tab-pill pattern; gray-700 in dark mode (one shade lighter than page bg-gray-900) is intentional for visibility. - bg-gray-100 theme-dark:bg-gray-700 (DS::Toggle base bg). Closest match (bg-container-inset-hover) is semantically a hover state. - DS::Buttonish secondary variant gray-200/300/700/600 pattern. Same pattern as #1654 holdings; needs button-bg-secondary-strong from that PR. Will swap in a follow-up after #1654 merges. - disabled:bg-gray-500 theme-dark:disabled:bg-gray-400 on inverse buttons (DS::Buttonish primary, enable_banking, coinstats). Custom disabled state for the inverse pair; no token. - text-gray-300 SVG stroke (shared/_progress_circle). - bg-white text-gray-900 (layouts/print). Print contexts intentionally light regardless of theme. - bg-gray-800 / border-gray-700 / text-white / hover:text-gray-100 (impersonation_sessions/_super_admin_bar). Admin overlay styled to remain dark in both modes; not a theme-aware component. Files covered by other in-flight PRs were skipped to avoid rebase conflicts: chats/_ai_consent's fg-inverse swap (#1626), shared/_text_tooltip and shared/_money_field tooltip pills (#1626), investments/_value_tooltip (#1626), components/DS/tooltip (#1626). * fix(design-system): keep changelog avatar text raw to preserve dark-mode contrast The changelog avatar fallback (when @release_notes[:avatar] is missing) sits inside the "decorative + raw" exception list — bg-gray-300 stays fixed across themes since no semantic neutral-indicator token exists. The earlier sweep partially themed the pair: bg-gray-300 stayed raw but text-gray-600 became text-secondary. text-secondary resolves to gray-300 in dark mode, which matches the bg → text became invisible against its own background. Reverting only the text class to text-gray-600 restores the original fixed-light placeholder behavior. Both classes raw, both themes readable. * fix(design-system): address review feedback on raw-color-sweep-finalize Six issues caught by CodeRabbit + Codex review: 1. focus:ring-button-bg-primary silently emits no CSS (×6 files). button-bg-primary is a custom @utility, not a theme color, so Tailwind's ring-{name} resolution finds no --color-button-bg-primary. Replaces with focus:ring-gray-900 theme-dark:focus:ring-white — same color flip as the button bg, but resolved through theme colors so the ring actually renders. Files: lunchflow/mercury/sophtron _api_error + _setup_required, coinstats_items/new. 2. accounts/show/_activity.html.erb: focus-within:ring-gray-100 was dead (no ring-width on the parent). Removed. 3. import/confirms/show.html.erb: uniform hover:bg-surface-inset-hover applied to both active and inactive step indicators created a jarring dark-to-light flip on the active step (bg-inverse → bg-surface-inset-hover). Now hover follows the resting state: active uses hover:bg-inverse-hover, inactive uses hover:bg-surface-inset-hover. 4. password_resets/new.html.erb: bg-white left raw alongside the migrated hover:bg-surface-inset. Swapped to bg-container so dark mode flips properly. 5. registrations/new.html.erb + password_validator_controller.js: view now uses bg-surface-inset on password strength block lines, but the Stimulus controller still toggled bg-gray-200 on validate. Updated controller to add/remove bg-surface-inset matching the view, so unmet states reset to the tokenized class instead of leaving raw gray-200 stuck on the element.
157 lines
4.6 KiB
Ruby
157 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-500 theme-dark:bg-red-400 hover:bg-red-600 theme-dark:hover:bg-red-500 disabled:bg-red-200 theme-dark:disabled:bg-red-600",
|
|
icon_classes: "fg-white"
|
|
},
|
|
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-9 h-9",
|
|
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-10 h-10",
|
|
radius_classes: "rounded-xl",
|
|
text_classes: "text-base"
|
|
}
|
|
}.freeze
|
|
|
|
attr_reader :variant, :size, :href, :icon, :icon_position, :text, :full_width, :extra_classes, :frame, :opts
|
|
|
|
def initialize(variant: :primary, size: :md, href: nil, text: nil, icon: nil, 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_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
|