@@ -164,57 +164,49 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
164
164
switch ( e . key ) {
165
165
case 'ArrowDown' : {
166
166
if ( delegate . getKeyBelow ) {
167
+ e . preventDefault ( ) ;
167
168
let nextKey = manager . focusedKey != null
168
- ? delegate . getKeyBelow ?. ( manager . focusedKey )
169
+ ? delegate . getKeyBelow ( manager . focusedKey )
169
170
: delegate . getFirstKey ?.( ) ;
170
171
if ( nextKey == null && shouldFocusWrap ) {
171
172
nextKey = delegate . getFirstKey ?.( manager . focusedKey ) ;
172
173
}
173
- if ( nextKey != null ) {
174
- e . preventDefault ( ) ;
175
- navigateToKey ( nextKey ) ;
176
- }
174
+ navigateToKey ( nextKey ) ;
177
175
}
178
176
break ;
179
177
}
180
178
case 'ArrowUp' : {
181
179
if ( delegate . getKeyAbove ) {
180
+ e . preventDefault ( ) ;
182
181
let nextKey = manager . focusedKey != null
183
- ? delegate . getKeyAbove ?. ( manager . focusedKey )
182
+ ? delegate . getKeyAbove ( manager . focusedKey )
184
183
: delegate . getLastKey ?.( ) ;
185
184
if ( nextKey == null && shouldFocusWrap ) {
186
185
nextKey = delegate . getLastKey ?.( manager . focusedKey ) ;
187
186
}
188
- if ( nextKey != null ) {
189
- e . preventDefault ( ) ;
190
- navigateToKey ( nextKey ) ;
191
- }
187
+ navigateToKey ( nextKey ) ;
192
188
}
193
189
break ;
194
190
}
195
191
case 'ArrowLeft' : {
196
192
if ( delegate . getKeyLeftOf ) {
197
- let nextKey = delegate . getKeyLeftOf ?.( manager . focusedKey ) ;
193
+ e . preventDefault ( ) ;
194
+ let nextKey = delegate . getKeyLeftOf ( manager . focusedKey ) ;
198
195
if ( nextKey == null && shouldFocusWrap ) {
199
196
nextKey = direction === 'rtl' ? delegate . getFirstKey ?.( manager . focusedKey ) : delegate . getLastKey ?.( manager . focusedKey ) ;
200
197
}
201
- if ( nextKey != null ) {
202
- e . preventDefault ( ) ;
203
- navigateToKey ( nextKey , direction === 'rtl' ? 'first' : 'last' ) ;
204
- }
198
+ navigateToKey ( nextKey , direction === 'rtl' ? 'first' : 'last' ) ;
205
199
}
206
200
break ;
207
201
}
208
202
case 'ArrowRight' : {
209
203
if ( delegate . getKeyRightOf ) {
210
- let nextKey = delegate . getKeyRightOf ?.( manager . focusedKey ) ;
204
+ e . preventDefault ( ) ;
205
+ let nextKey = delegate . getKeyRightOf ( manager . focusedKey ) ;
211
206
if ( nextKey == null && shouldFocusWrap ) {
212
207
nextKey = direction === 'rtl' ? delegate . getLastKey ?.( manager . focusedKey ) : delegate . getFirstKey ?.( manager . focusedKey ) ;
213
208
}
214
- if ( nextKey != null ) {
215
- e . preventDefault ( ) ;
216
- navigateToKey ( nextKey , direction === 'rtl' ? 'last' : 'first' ) ;
217
- }
209
+ navigateToKey ( nextKey , direction === 'rtl' ? 'last' : 'first' ) ;
218
210
}
219
211
break ;
220
212
}
@@ -244,20 +236,16 @@ export function useSelectableCollection(options: AriaSelectableCollectionOptions
244
236
break ;
245
237
case 'PageDown' :
246
238
if ( delegate . getKeyPageBelow ) {
239
+ e . preventDefault ( ) ;
247
240
let nextKey = delegate . getKeyPageBelow ( manager . focusedKey ) ;
248
- if ( nextKey != null ) {
249
- e . preventDefault ( ) ;
250
- navigateToKey ( nextKey ) ;
251
- }
241
+ navigateToKey ( nextKey ) ;
252
242
}
253
243
break ;
254
244
case 'PageUp' :
255
245
if ( delegate . getKeyPageAbove ) {
246
+ e . preventDefault ( ) ;
256
247
let nextKey = delegate . getKeyPageAbove ( manager . focusedKey ) ;
257
- if ( nextKey != null ) {
258
- e . preventDefault ( ) ;
259
- navigateToKey ( nextKey ) ;
260
- }
248
+ navigateToKey ( nextKey ) ;
261
249
}
262
250
break ;
263
251
case 'a' :
0 commit comments