fix(chip): move focus to next chip when chip removed

dhis2 · Apr 17, 2024 · 51770e1 · 51770e1
1 parent 8c0c379
commit 51770e1
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/components/chip/src/chip-group/chip-group.js b/components/chip/src/chip-group/chip-group.js
@@ -12,8 +12,9 @@ const ChipGroup = ({ className, dataTest, children }) => {
             const chips = Array.from(
                 chipContainer.current.querySelectorAll('[role="option"]')
             )
-
-            chips[0].focus()
+            if (chips.length > 0) {
+                chips[0].focus()
+            }
             return
         }
 
@@ -39,6 +40,10 @@ const ChipGroup = ({ className, dataTest, children }) => {
             const prevIndex = (currentIndex - 1 + chips.length) % chips.length
             chips[prevIndex].focus()
         }
+        if (event.key === 'Backspace' || event.key === 'Delete') {
+            const nextIndex = (currentIndex + 1) % chips.length
+            chips[nextIndex].focus()
+        }
     }
     return (
         <div