fix(Dropdown): no more focus errors if Dropdown.Items.Item is not used

N00nDay · Apr 27, 2023 · cbdc419 · cbdc419 · vercel · Apr 27, 2023
1 parent 5baec04
commit cbdc419
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/lib/components/dropdown/Items.svelte b/src/lib/components/dropdown/Items.svelte
@@ -23,12 +23,10 @@
 		e.stopPropagation();
 		if (e.key === 'ArrowUp') {
 			focusIndex = focusIndex > 0 ? focusIndex - 1 : items.length - 1;
-			items[focusIndex].focus();
+			if (items && items[focusIndex]) items[focusIndex].focus();
 		} else if (e.key === 'ArrowDown') {
 			focusIndex = focusIndex < items.length - 1 ? focusIndex + 1 : 0;
-			items[focusIndex].focus();
-		} else if (e.key === 'Enter') {
-			console.log('Enter FIRED');
+			if (items && items[focusIndex]) items[focusIndex].focus();
 		} else if (e.key === 'Escape') {
 			handleClose();
 		}
@@ -80,7 +78,7 @@
 
 	onMount(() => {
 		items = list.querySelectorAll('li');
-		items[focusIndex].focus();
+		if (items && items[focusIndex]) items[focusIndex].focus();
 	});
 </script>