mirror of
https://github.com/we-promise/sure.git
synced 2026-05-24 13:04:56 +00:00
db563f3d62
CodeRabbit P1+P2 review on #1840:
1. button.rb: `merged_opts.delete(:href)` always returned nil because
Buttonish#initialize strips :href from opts into @href, so the
`if href.blank?` guard was ALWAYS true. Every DS::Button rendered via
button_to (the href branch) got `type="button"` on the inner button,
breaking submission of those button_to-generated forms (e.g.
imports/_ready.html.erb publish button, imports/_failure.html.erb
try-again button). Drop the local `href = merged_opts.delete(:href)`
so the guard now reads the @href reader, leaving the href branch's
HTML default intact.
2. settings/profiles/show.html.erb: the Save button is rendered with
`render DS::Button.new(...)` inside `styled_form_with` (not via
form.submit), so the StyledFormBuilder#submit type-pin from
624e9794 doesn't cover it. Pass `type: :submit` explicitly so the
profile form submits again under the default-type-button policy.
3. base.css: replace raw `outline-gray-900` / `outline-white` with the
established alpha-ring focus pattern
(focus-visible:ring-alpha-black-300 + theme-dark:ring-alpha-white-300)
already used by app/components/settings/provider_card.html.erb and
sure-design-system/components.css. Keeps a11y focus ring while using
DS tokens.
63 lines
2.0 KiB
Ruby
63 lines
2.0 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
# An extension to `button_to` helper. All options are passed through to the `button_to` helper with some additional
|
|
# options available.
|
|
class DS::Button < DS::Buttonish
|
|
attr_reader :confirm
|
|
|
|
def initialize(confirm: nil, **opts)
|
|
super(**opts)
|
|
@confirm = confirm
|
|
end
|
|
|
|
def container(&block)
|
|
if href.present?
|
|
button_to(href, **merged_opts, &block)
|
|
else
|
|
content_tag(:button, **merged_opts, &block)
|
|
end
|
|
end
|
|
|
|
private
|
|
def merged_opts
|
|
merged_opts = opts.dup || {}
|
|
extra_classes = merged_opts.delete(:class)
|
|
data = merged_opts.delete(:data) || {}
|
|
|
|
if confirm.present?
|
|
data = data.merge(turbo_confirm: confirm.to_data_attribute)
|
|
end
|
|
|
|
if frame.present?
|
|
data = data.merge(turbo_frame: frame)
|
|
end
|
|
|
|
# `content_tag(:button, ...)` defaults to `type="submit"` per the HTML
|
|
# spec — meaning a DS::Button rendered inside a form will steal Enter-key
|
|
# submission from the first text input. Default to `type="button"` so
|
|
# callers must opt into submit behavior explicitly. `button_to` (href
|
|
# branch) wraps the button in its own form, so submit there is correct
|
|
# and we leave its default alone.
|
|
if href.blank?
|
|
merged_opts[:type] ||= "button"
|
|
end
|
|
|
|
# Icon-only buttons have no visible text node, so screen readers fall
|
|
# back to announcing "button" with no name. Derive a humanized fallback
|
|
# from the icon key so AT users hear *something* meaningful; explicit
|
|
# `aria: { label: }` on the caller still wins.
|
|
if icon_only? && icon.present?
|
|
aria = (merged_opts[:aria] || {}).symbolize_keys
|
|
if aria[:label].blank? && merged_opts[:"aria-label"].blank?
|
|
aria[:label] = icon.to_s.tr("-_", " ").capitalize
|
|
merged_opts[:aria] = aria
|
|
end
|
|
end
|
|
|
|
merged_opts.merge(
|
|
class: class_names(container_classes, extra_classes),
|
|
data: data
|
|
)
|
|
end
|
|
end
|