From 5c9c225cebfe8ec92df8a994739b5c10d240b513 Mon Sep 17 00:00:00 2001
From: Joshua Ferrell <josh@joshferrell.me>
Date: Mon, 26 Feb 2024 20:43:11 -0800
Subject: [PATCH 1/3] fix: radio not quitting loop after finding correct input

---
 src/event/radio.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/event/radio.ts b/src/event/radio.ts
index 7c374af9..2d76fc04 100644
--- a/src/event/radio.ts
+++ b/src/event/radio.ts
@@ -28,5 +28,6 @@ export function walkRadio(
 
     focusElement(group[i])
     instance.dispatchUIEvent(group[i], 'click')
+    return
   }
 }

From 7fd7f983d51fd7142e2e69b9a17753d6a996fb9d Mon Sep 17 00:00:00 2001
From: Joshua Ferrell <josh@joshferrell.me>
Date: Mon, 26 Feb 2024 20:44:19 -0800
Subject: [PATCH 2/3] fix: keydown direction for up and down reversed

---
 src/event/behavior/keydown.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/event/behavior/keydown.ts b/src/event/behavior/keydown.ts
index 6927deef..1305ca0c 100644
--- a/src/event/behavior/keydown.ts
+++ b/src/event/behavior/keydown.ts
@@ -28,7 +28,7 @@ const keydownBehavior: {
   ArrowDown: (event, target, instance) => {
     /* istanbul ignore else */
     if (isElementType(target, 'input', {type: 'radio'} as const)) {
-      return () => walkRadio(instance, target, -1)
+      return () => walkRadio(instance, target, 1)
     }
   },
   ArrowLeft: (event, target, instance) => {
@@ -46,7 +46,7 @@ const keydownBehavior: {
   ArrowUp: (event, target, instance) => {
     /* istanbul ignore else */
     if (isElementType(target, 'input', {type: 'radio'} as const)) {
-      return () => walkRadio(instance, target, 1)
+      return () => walkRadio(instance, target, -1)
     }
   },
   Backspace: (event, target, instance) => {

From 3352abf6efac96ccc10f567a2fb5e6969c21661e Mon Sep 17 00:00:00 2001
From: Joshua Ferrell <josh@joshferrell.me>
Date: Mon, 26 Feb 2024 20:45:44 -0800
Subject: [PATCH 3/3] feat: update tests with extra scenarios to be more robust

Adds an additional test to ensure that aria-disabled is still focusable
---
 tests/event/behavior/keydown.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/event/behavior/keydown.ts b/tests/event/behavior/keydown.ts
index 42feb6c0..bca55c3b 100644
--- a/tests/event/behavior/keydown.ts
+++ b/tests/event/behavior/keydown.ts
@@ -317,7 +317,9 @@ cases(
       <input type="radio" name="" value="nameless2"/>
       <input type="radio" name="group" value="c" disabled/>
       <input type="radio" name="group" value="d"/>
-      <input type="radio" name="foo"/>
+      <input type="radio" name="group" value="f" aria-disabled />
+      <input type="radio" name="group" value="e" />
+        <input type="radio" name="foo"/>
       <input type="text" name="group"/>
     `,
       {focus},
@@ -360,14 +362,14 @@ cases(
       expectedTarget: '//input[@value="a"]',
     },
     'forward around the corner': {
-      focus: '//input[@value="d"]',
+      focus: '//input[@value="e"]',
       key: 'ArrowRight',
       expectedTarget: '//input[@value="a"]',
     },
     'backward around the corner': {
       focus: '//input[@value="a"]',
       key: 'ArrowUp',
-      expectedTarget: '//input[@value="d"]',
+      expectedTarget: '//input[@value="e"]',
     },
     'do nothing on single radio': {
       focus: '//input[@name="solo"]',
@@ -378,5 +380,10 @@ cases(
       key: 'ArrowRight',
       expectedTarget: '//input[@value="nameless2"]',
     },
+    'on radios with aria-disabled': {
+        focus: '//input[@value="d"]',
+        key: 'ArrowDown',
+        expectedTarget: '//input[@value="f"]',
+      },
   },
 )