Skip to content

Commit e4264da

Browse files
authored
aria-disabled for Combobox (#271)
1 parent 187b2bc commit e4264da

File tree

5 files changed

+29
-9
lines changed

5 files changed

+29
-9
lines changed

lib/ruby_ui/combobox/combobox_checkbox.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ def default_attrs
1313
class: [
1414
"peer h-4 w-4 shrink-0 rounded-sm border border-primary ring-offset-background accent-primary",
1515
"focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
16-
"disabled:cursor-not-allowed disabled:opacity-50"
16+
"disabled:cursor-not-allowed disabled:opacity-50",
17+
"aria-disabled:cursor-not-allowed aria-disabled:opacity-50 aria-disabled:pointer-events-none"
1718
],
1819
data: {
1920
ruby_ui__combobox_target: "input",

lib/ruby_ui/combobox/combobox_radio.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@ def view_template
1010

1111
def default_attrs
1212
{
13-
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",
13+
class: [
14+
"aspect-square h-4 w-4 rounded-full border border-primary accent-primary text-primary shadow",
15+
"focus:outline-none",
16+
"focus-visible:ring-1 focus-visible:ring-ring",
17+
"disabled:cursor-not-allowed disabled:opacity-50",
18+
"aria-disabled:cursor-not-allowed aria-disabled:opacity-50 aria-disabled:pointer-events-none"
19+
],
1420
data: {
1521
ruby_ui__combobox_target: "input",
1622
ruby_ui__form_field_target: "input",

lib/ruby_ui/combobox/combobox_search_input.rb

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,22 @@ def view_template
1919
def default_attrs
2020
{
2121
type: "search",
22-
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",
2322
role: "searchbox",
23+
autocorrect: "off",
24+
autocomplete: "off",
25+
spellcheck: "false",
2426
placeholder: @placeholder,
27+
class: [
28+
"flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-none border-none",
29+
"focus:ring-0",
30+
"placeholder:text-muted-foreground",
31+
"disabled:cursor-not-allowed disabled:opacity-50",
32+
"aria-disabled:cursor-not-allowed aria-disabled:opacity-50 aria-disabled:pointer-events-none"
33+
],
2534
data: {
2635
ruby_ui__combobox_target: "searchInput",
2736
action: "keyup->ruby-ui--combobox#filterItems search->ruby-ui--combobox#filterItems"
28-
},
29-
autocomplete: "off",
30-
autocorrect: "off",
31-
spellcheck: "false"
37+
}
3238
}
3339
end
3440

lib/ruby_ui/combobox/combobox_toggle_all_checkbox.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ def default_attrs
1313
class: [
1414
"peer h-4 w-4 shrink-0 rounded-sm border border-primary ring-offset-background accent-primary",
1515
"focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
16-
"disabled:cursor-not-allowed disabled:opacity-50"
16+
"disabled:cursor-not-allowed disabled:opacity-50",
17+
"aria-disabled:cursor-not-allowed aria-disabled:opacity-50 aria-disabled:pointer-events-none"
1718
],
1819
data: {
1920
ruby_ui__combobox_target: "toggleAll",

lib/ruby_ui/combobox/combobox_trigger.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@ def view_template
2121
def default_attrs
2222
{
2323
type: "button",
24-
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",
24+
class: [
25+
"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",
26+
"hover:bg-accent hover:text-accent-foreground",
27+
"disabled:pointer-events-none disabled:opacity-50",
28+
"aria-disabled:pointer-events-none aria-disabled:opacity-50 aria-disabled:cursor-not-allowed",
29+
"focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
30+
],
2531
data: {
2632
placeholder: @placeholder,
2733
ruby_ui__combobox_target: "trigger",

0 commit comments

Comments
 (0)