@@ -164,57 +164,49 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
164164 switch ( e . key ) {
165165 case 'ArrowDown' : {
166166 if ( delegate . getKeyBelow ) {
167+ e . preventDefault ( ) ;
167168 let nextKey = manager . focusedKey != null
168- ? delegate . getKeyBelow ?. ( manager . focusedKey )
169+ ? delegate . getKeyBelow ( manager . focusedKey )
169170 : delegate . getFirstKey ?.( ) ;
170171 if ( nextKey == null && shouldFocusWrap ) {
171172 nextKey = delegate . getFirstKey ?.( manager . focusedKey ) ;
172173 }
173- if ( nextKey != null ) {
174- e . preventDefault ( ) ;
175- navigateToKey ( nextKey ) ;
176- }
174+ navigateToKey ( nextKey ) ;
177175 }
178176 break ;
179177 }
180178 case 'ArrowUp' : {
181179 if ( delegate . getKeyAbove ) {
180+ e . preventDefault ( ) ;
182181 let nextKey = manager . focusedKey != null
183- ? delegate . getKeyAbove ?. ( manager . focusedKey )
182+ ? delegate . getKeyAbove ( manager . focusedKey )
184183 : delegate . getLastKey ?.( ) ;
185184 if ( nextKey == null && shouldFocusWrap ) {
186185 nextKey = delegate . getLastKey ?.( manager . focusedKey ) ;
187186 }
188- if ( nextKey != null ) {
189- e . preventDefault ( ) ;
190- navigateToKey ( nextKey ) ;
191- }
187+ navigateToKey ( nextKey ) ;
192188 }
193189 break ;
194190 }
195191 case 'ArrowLeft' : {
196192 if ( delegate . getKeyLeftOf ) {
197- let nextKey = delegate . getKeyLeftOf ?.( manager . focusedKey ) ;
193+ e . preventDefault ( ) ;
194+ let nextKey = delegate . getKeyLeftOf ( manager . focusedKey ) ;
198195 if ( nextKey == null && shouldFocusWrap ) {
199196 nextKey = direction === 'rtl' ? delegate . getFirstKey ?.( manager . focusedKey ) : delegate . getLastKey ?.( manager . focusedKey ) ;
200197 }
201- if ( nextKey != null ) {
202- e . preventDefault ( ) ;
203- navigateToKey ( nextKey , direction === 'rtl' ? 'first' : 'last' ) ;
204- }
198+ navigateToKey ( nextKey , direction === 'rtl' ? 'first' : 'last' ) ;
205199 }
206200 break ;
207201 }
208202 case 'ArrowRight' : {
209203 if ( delegate . getKeyRightOf ) {
210- let nextKey = delegate . getKeyRightOf ?.( manager . focusedKey ) ;
204+ e . preventDefault ( ) ;
205+ let nextKey = delegate . getKeyRightOf ( manager . focusedKey ) ;
211206 if ( nextKey == null && shouldFocusWrap ) {
212207 nextKey = direction === 'rtl' ? delegate . getLastKey ?.( manager . focusedKey ) : delegate . getFirstKey ?.( manager . focusedKey ) ;
213208 }
214- if ( nextKey != null ) {
215- e . preventDefault ( ) ;
216- navigateToKey ( nextKey , direction === 'rtl' ? 'last' : 'first' ) ;
217- }
209+ navigateToKey ( nextKey , direction === 'rtl' ? 'last' : 'first' ) ;
218210 }
219211 break ;
220212 }
@@ -244,20 +236,16 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
244236 break ;
245237 case 'PageDown' :
246238 if ( delegate . getKeyPageBelow ) {
239+ e . preventDefault ( ) ;
247240 let nextKey = delegate . getKeyPageBelow ( manager . focusedKey ) ;
248- if ( nextKey != null ) {
249- e . preventDefault ( ) ;
250- navigateToKey ( nextKey ) ;
251- }
241+ navigateToKey ( nextKey ) ;
252242 }
253243 break ;
254244 case 'PageUp' :
255245 if ( delegate . getKeyPageAbove ) {
246+ e . preventDefault ( ) ;
256247 let nextKey = delegate . getKeyPageAbove ( manager . focusedKey ) ;
257- if ( nextKey != null ) {
258- e . preventDefault ( ) ;
259- navigateToKey ( nextKey ) ;
260- }
248+ navigateToKey ( nextKey ) ;
261249 }
262250 break ;
263251 case 'a' :
0 commit comments