mirror of
https://github.com/we-promise/sure.git
synced 2026-05-27 06:25:12 +00:00
Closes #1738. Four concrete fixes surfaced by the savings-goals audit + #1737 universal checklist: 1. Focus ring (WCAG 2.4.7). `base.css` had `focus-visible:outline-gray-900` which is **1.07:1** against the primary button's gray-900 background — invisible. Widen to `outline-2 outline-offset-2`, place outline outside the button via offset, and add a dark-mode `outline-white` so the ring is always visible against the page chrome regardless of the button surface. 2. Touch target (WCAG 2.5.5). Icon-only buttons at the default `:md` size were `w-9 h-9` = 36×36, below the 44×44 enhanced target. Bump `md.icon_container_classes` to `w-11 h-11` and `lg.icon_container_classes` to `w-12 h-12` to keep the size scale intact. `sm` stays at 32×32 (already passes WCAG 2.5.8 AA's 24×24 minimum; intentional compact-density variant). 3. Default button type. `content_tag(:button, ...)` inherits the HTML default `type="submit"`, so a DS::Button rendered inside a form steals Enter-key submission from the first text input (reproducible in the form stepper). Default to `type="button"` in the non-`href` branch; existing form submitters pass `type: "submit"` explicitly and continue to work. The `button_to` (href) branch keeps the submit default because button_to wraps its own form. 4. Icon-only accessible name. Icon-only buttons render no text node, so AT users hear "button" with no name. Derive a humanized aria-label from the icon key (e.g. `icon: "more-horizontal"` → `aria-label="More horizontal"`); explicit `aria: { label: }` on the caller still wins. Soft fallback — callers should still pass meaningful labels for richer copy. Plus: replace the stale `fg-white` icon class on the destructive variant with `text-inverse` (the `fg-*` namespace was deprecated in #1626 so `fg-white` resolved to nothing; the icon was using its helper-default color rather than the white the design intended). Out of scope: - Menu avatar trigger (custom 36×36 button bypassing DS::Button) — belongs to #1743 DS::Menu audit. - DS::FilledIcon `lg` size container (decorative, not interactive) — belongs to #1742.
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: "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_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
|