@@ -182,11 +182,8 @@ export class IgxTabItemComponent extends IgxTabItemBase implements AfterViewInit
182182 */
183183 @HostListener ( 'keydown' , [ '$event' ] )
184184 public onKeydown ( event : KeyboardEvent ) {
185- event . preventDefault ( ) ;
186-
187185 const tabsArray = this . _tabs . tabs . toArray ( ) ;
188186 const startIndex = tabsArray . indexOf ( this ) ;
189- let tab : IgxTabItemBase ;
190187 let finalIndex = - 1 ;
191188 let currentIndex = startIndex ;
192189
@@ -220,14 +217,17 @@ export class IgxTabItemComponent extends IgxTabItemBase implements AfterViewInit
220217 while ( currentIndex !== startIndex ) ;
221218 break ;
222219 case KEYS . HOME :
220+ event . preventDefault ( ) ;
223221 finalIndex = tabsArray . find ( t => ( t as IgxTabItemComponent ) . disabled === false ) . index ;
224222 break ;
225223 case KEYS . END :
224+ event . preventDefault ( ) ;
226225 finalIndex = tabsArray . slice ( ) . reverse ( ) . find ( t => ( t as IgxTabItemComponent ) . disabled === false ) . index ;
227226 break ;
228227 case KEYS . ENTER :
229228 case KEYS . SPACE :
230229 case KEYS . SPACE_IE :
230+ event . preventDefault ( ) ;
231231 if ( ! this . autoGenerated ) {
232232 this . nativeTabItem . nativeElement . click ( ) ;
233233 }
@@ -237,11 +237,11 @@ export class IgxTabItemComponent extends IgxTabItemBase implements AfterViewInit
237237 }
238238
239239 if ( finalIndex > - 1 ) {
240- tab = tabsArray [ finalIndex ] ;
240+ const tab = tabsArray [ finalIndex ] ;
241241 tab . nativeTabItem . nativeElement . focus ( ) ;
242242
243243 if ( this . autoGenerated ) {
244- tab . nativeTabItem . nativeElement . click ( ) ;
244+ tab . select ( ) ;
245245 }
246246 }
247247 }
0 commit comments