mirror of
https://github.com/we-promise/sure.git
synced 2026-06-08 12:19:03 +00:00
* fix(ds): disabled buttons use not-allowed cursor
Tailwind v4 preflight sets cursor:pointer on every <button>, including
disabled ones. Add disabled:cursor-not-allowed to the DS button base so
disabled buttons read as non-interactive.
* fix(goals): disable new-goal submit until required fields valid
The submit button was always enabled, and the funding-accounts checkbox
group has no native 'required', so a goal with no linked account could be
submitted and only fail server-side (422). Disable the submit until name,
a positive target amount, and >=1 account are present, and add a
submit-time guard that surfaces inline errors and focuses the first
offending field as a backstop.
* fix(goals): keep color/icon picker from shifting the form
DS::Disclosure wraps its body in an mt-2 div that sits in normal flow, so
opening the absolutely-positioned picker popover nudged the form down ~8px.
Use a raw <details> for the picker so the popover overlays without
reflowing the content beneath it.
* fix(goals): container-responsive cards, meta-line status, scrollable tabs
- Card grids + KPI strip switch from viewport breakpoints to container
queries (@container), so columns track the actual content width when the
account/AI sidebars are open instead of crushing three columns into a
narrow center.
- Move the status pill from the title row to the meta line; the title now
gets the full header width (no more 'Hou...' truncation at 3-up). Drop
the secondary line when the pill already states it (completed / open).
- Card internals harden for narrow widths (ring shrink-0, footer wrap,
shorter 'N days left' secondary).
- Filter tabs scroll horizontally instead of wrapping 'On track' mid-label
or forcing the row wider than the viewport.
* fix(goals): only require a funding account on the create form
GoalsController#edit renders account checkboxes from visible accounts only,
so a goal backed solely by a now-hidden (disabled / pending_deletion)
account renders none checked. The submit-validation then wedged the edit
form — a name/notes change couldn't be saved even though #update preserves
existing links when account_ids is omitted. Gate the account requirement on
a require-account Stimulus value that is true only for the create form.
* fix(goals): give the color/icon picker trigger an accessible name
The hand-rolled <summary> is icon-only (pen), so screen readers announced an
unlabeled control. Add a localized aria-label.
* fix(goals): render form validation errors inline on server re-render
The client-side controller already surfaces name / amount / account errors
inline and disables submit, but a server 422 (JS disabled, or a race that
lets an invalid submit through) fell back to the top run-on banner
("X must be filled and Y and Z."). Make the existing inline error hints
server-aware so a failed submit shows the same per-field red text the
client path does, and drop the base-error banner — base only ever carries
the account requirement, which now renders beside the funding-accounts
list.
* fix(goals): blur projection chart under privacy mode
The projection chart's SVG axis labels and annotations (target, "$X short",
$200K/$400K ticks) rendered in cleartext while privacy mode blurred every
other number on the page. Tag the chart container `privacy-sensitive`, the
same wrapper-level treatment the net-worth and cashflow-sankey charts
already use, so it blurs with the rest.
* fix(goals): stop target-date input stretching when amount error shows
The target-amount / target-date row is a two-column grid. The amount
column carries its inline error <p> underneath, so when that error
appears the column grows and the default `items-stretch` makes the
sibling date input stretch to match — the date box visibly grew taller
than the amount box. Anchor the row with `items-start` so each input
keeps its natural height and the error just extends below its own column.
* fix(goals): make invalid submit announce errors instead of dead-ending
Review follow-ups:
- Swap the submit gate from the disabled attribute to aria-disabled: a
truly disabled default submit also blocks Enter-key implicit
submission, so an invalid form was a dead button with every inline
error still hidden. The button now stays clickable and lets
validateOnSubmit surface the errors; DS buttonish styles the
aria-disabled state (cursor-not-allowed + opacity-50). Side effect:
loading_button_controller submits also dim while busy, which reads as
an upgrade.
- Focus the first funding-account checkbox when accounts are the only
missing field (focus previously went nowhere).
- Drop the now-orphaned goals.goal_card.days_left_by locale key.
164 lines
5.2 KiB
Ruby
164 lines
5.2 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(
|
|
# Tailwind v4 preflight sets `cursor: pointer` on all <button>s, which
|
|
# also applies while disabled. Override so disabled buttons read as
|
|
# non-interactive. The aria-disabled twins cover buttons that gate via
|
|
# `aria-disabled` to stay clickable/focusable (e.g. submit buttons whose
|
|
# click handler surfaces validation errors — a truly disabled default
|
|
# submit would also swallow Enter-key implicit submission).
|
|
"font-medium whitespace-nowrap disabled:cursor-not-allowed aria-disabled:cursor-not-allowed aria-disabled:opacity-50",
|
|
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
|