Skip to content

aria-disabled for Combobox #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephannv merged 1 commit into from
May 7, 2025
Merged

aria-disabled for Combobox #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/ruby_ui/combobox/combobox_checkbox.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ def default_attrs
class: [
"peer h-4 w-4 shrink-0 rounded-sm border border-primary ring-offset-background accent-primary",
"focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
"disabled:cursor-not-allowed disabled:opacity-50"
"disabled:cursor-not-allowed disabled:opacity-50",
"aria-disabled:cursor-not-allowed aria-disabled:opacity-50 aria-disabled:pointer-events-none"
],
data: {
ruby_ui__combobox_target: "input",
Expand Down
8 changes: 7 additions & 1 deletion lib/ruby_ui/combobox/combobox_radio.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ def view_template

def default_attrs
{
class: "aspect-square h-4 w-4 rounded-full border border-primary accent-primary text-primary shadow focus:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
class: [
"aspect-square h-4 w-4 rounded-full border border-primary accent-primary text-primary shadow",
"focus:outline-none",
"focus-visible:ring-1 focus-visible:ring-ring",
"disabled:cursor-not-allowed disabled:opacity-50",
"aria-disabled:cursor-not-allowed aria-disabled:opacity-50 aria-disabled:pointer-events-none"
],
data: {
ruby_ui__combobox_target: "input",
ruby_ui__form_field_target: "input",
Expand Down
16 changes: 11 additions & 5 deletions lib/ruby_ui/combobox/combobox_search_input.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,22 @@ def view_template
def default_attrs
{
type: "search",
class: "flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-none border-none focus:ring-0 placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50",
role: "searchbox",
autocorrect: "off",
autocomplete: "off",
spellcheck: "false",
placeholder: @placeholder,
class: [
"flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-none border-none",
"focus:ring-0",
"placeholder:text-muted-foreground",
"disabled:cursor-not-allowed disabled:opacity-50",
"aria-disabled:cursor-not-allowed aria-disabled:opacity-50 aria-disabled:pointer-events-none"
],
data: {
ruby_ui__combobox_target: "searchInput",
action: "keyup->ruby-ui--combobox#filterItems search->ruby-ui--combobox#filterItems"
},
autocomplete: "off",
autocorrect: "off",
spellcheck: "false"
}
}
end

Expand Down
3 changes: 2 additions & 1 deletion lib/ruby_ui/combobox/combobox_toggle_all_checkbox.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ def default_attrs
class: [
"peer h-4 w-4 shrink-0 rounded-sm border border-primary ring-offset-background accent-primary",
"focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
"disabled:cursor-not-allowed disabled:opacity-50"
"disabled:cursor-not-allowed disabled:opacity-50",
"aria-disabled:cursor-not-allowed aria-disabled:opacity-50 aria-disabled:pointer-events-none"
],
data: {
ruby_ui__combobox_target: "toggleAll",
Expand Down
8 changes: 7 additions & 1 deletion lib/ruby_ui/combobox/combobox_trigger.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@ def view_template
def default_attrs
{
type: "button",
class: "flex h-full w-full items-center whitespace-nowrap rounded-md text-sm ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border border-input bg-background hover:bg-accent hover:text-accent-foreground h-10 px-4 py-2 justify-between",
class: [
"flex h-full w-full items-center whitespace-nowrap rounded-md text-sm ring-offset-background transition-colors border border-input bg-background h-10 px-4 py-2 justify-between",
"hover:bg-accent hover:text-accent-foreground",
"disabled:pointer-events-none disabled:opacity-50",
"aria-disabled:pointer-events-none aria-disabled:opacity-50 aria-disabled:cursor-not-allowed",
"focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
],
data: {
placeholder: @placeholder,
ruby_ui__combobox_target: "trigger",
Expand Down