Refactor: ListView focus tracker check

ckeditor · Dec 4, 2023 · f40fa77 · f40fa77
1 parent b0e4bcb
commit f40fa77
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/packages/ckeditor5-ui/src/list/listview.ts b/packages/ckeditor5-ui/src/list/listview.ts
@@ -10,9 +10,9 @@
 import View from '../view';
 import FocusCycler from '../focuscycler';
 
-import type ListItemView from './listitemview';
+import ListItemView from './listitemview';
 import ListItemGroupView from './listitemgroupview';
-import ListSeparatorView from './listseparatorview';
+import type ListSeparatorView from './listseparatorview';
 import type DropdownPanelFocusable from '../dropdown/dropdownpanelfocusable';
 import ViewCollection from '../viewcollection';
 
@@ -142,7 +142,7 @@ export default class ListView extends View<HTMLUListElement> implements Dropdown
 		for ( const item of this.items ) {
 			if ( item instanceof ListItemGroupView ) {
 				this._registerFocusableItemsGroup( item );
-			} else if ( !( item instanceof ListSeparatorView ) ) {
+			} else if ( item instanceof ListItemView ) {
 				this._registerFocusableListItem( item );
 			}
 		}

diff --git a/packages/ckeditor5-ui/tests/list/listview.js b/packages/ckeditor5-ui/tests/list/listview.js
@@ -12,7 +12,7 @@ import FocusTracker from '@ckeditor/ckeditor5-utils/src/focustracker';
 import FocusCycler from '../../src/focuscycler';
 import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
 import View from '../../src/view';
-import { ListItemGroupView } from '../../src';
+import { ListItemGroupView, ListItemView } from '../../src';
 
 describe( 'ListView', () => {
 	let view;
@@ -499,10 +499,9 @@ describe( 'ListView', () => {
 } );
 
 function focusable( name ) {
-	const view = nonFocusable();
+	const view = new ListItemView();
 
 	view.name = name;
-	view.focus = () => {};
 
 	return view;
 }