@@ -52,6 +52,7 @@ var autoSuggest = (function() {
5252 var elementToFocus = null ;
5353 var focusIndex = null ;
5454 var allSuggestItems = helper . eA ( ".auto-suggest-item" ) ;
55+ var columnCount = getComputedStyle ( helper . e ( ".auto-suggest-list" ) ) . getPropertyValue ( "grid-template-columns" ) . split ( " " ) . length ;
5556 var _findInput = function ( ) {
5657 if ( event . target . classList . contains ( "auto-suggest-input" ) ) {
5758 _currentInputOptions . input = event . target ;
@@ -71,8 +72,8 @@ var autoSuggest = (function() {
7172 if ( focusIndex == null ) {
7273 elementToFocus = allSuggestItems [ allSuggestItems . length - 1 ] ;
7374 } else {
74- if ( focusIndex > 2 && focusIndex <= allSuggestItems . length - 1 ) {
75- elementToFocus = allSuggestItems [ focusIndex - 3 ] ;
75+ if ( focusIndex >= columnCount && focusIndex <= allSuggestItems . length - 1 ) {
76+ elementToFocus = allSuggestItems [ focusIndex - columnCount ] ;
7677 } else {
7778 elementToFocus = _currentInputOptions . input ;
7879 } ;
@@ -84,8 +85,8 @@ var autoSuggest = (function() {
8485 if ( focusIndex == null ) {
8586 elementToFocus = allSuggestItems [ 0 ] ;
8687 } else {
87- if ( focusIndex < allSuggestItems . length - 3 ) {
88- elementToFocus = allSuggestItems [ focusIndex + 3 ] ;
88+ if ( focusIndex < allSuggestItems . length - columnCount ) {
89+ elementToFocus = allSuggestItems [ focusIndex + columnCount ] ;
8990 } else {
9091 elementToFocus = _currentInputOptions . input ;
9192 } ;
0 commit comments