@@ -312,8 +312,7 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo
312312 if ( needUpdateFocus ) {
313313 const isScrollEvent = ! ! e ?. event ?. type ;
314314 const skipFocusEvent = e ?. virtualColumnsScrolling && isScrollEvent ;
315- const preventScroll = ! isFullUpdate ;
316- this . _updateFocus ( true , skipFocusEvent , preventScroll ) ;
315+ this . _updateFocus ( true , skipFocusEvent , true ) ;
317316 }
318317 }
319318 }
@@ -1633,7 +1632,7 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo
16331632 gridCoreUtils . focusAndSelectElement ( this , $focusedElement ) ;
16341633 }
16351634
1636- public _focus ( $cell , disableFocus ?, skipFocusEvent ?, preventScroll = false ) {
1635+ public _focus ( $cell : dxElementWrapper , disableFocus ?: boolean , skipFocusEvent ?: boolean , preventScroll ?: boolean ) {
16371636 const $row = $cell && ! $cell . hasClass ( ROW_CLASS )
16381637 ? $cell . closest ( `.${ ROW_CLASS } ` )
16391638 : $cell ;
@@ -1685,7 +1684,12 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo
16851684 } ) ;
16861685 if ( ! skipFocusEvent ) {
16871686 this . _applyTabIndexToElement ( $focusElement ) ;
1688- $focusElement . get ( 0 ) ?. focus ( { preventScroll } ) ;
1687+ if ( preventScroll ) {
1688+ $focusElement . get ( 0 ) ?. focus ( { preventScroll } ) ;
1689+ } else {
1690+ // @ts -expect-error
1691+ eventsEngine . trigger ( $focusElement , 'focus' ) ;
1692+ }
16891693 }
16901694 if ( disableFocus ) {
16911695 $focusElement . addClass ( CELL_FOCUS_DISABLED_CLASS ) ;
@@ -1737,7 +1741,7 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo
17371741 ) ;
17381742 return ;
17391743 }
1740- ! isFocusedElementDefined && this . _focus ( $cell , false , skipFocusEvent ) ;
1744+ ! isFocusedElementDefined && this . _focus ( $cell , false , skipFocusEvent , preventScroll ) ;
17411745 } else if (
17421746 ! isFocusedElementDefined
17431747 && ( this . _isNeedFocus || this . _isHiddenFocus )
0 commit comments