File tree Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -312,8 +312,8 @@ protected function moveSelectionVertically(string $direction) : void
312
312
313
313
if ($ this ->selectedItem !== null && !array_key_exists ($ this ->selectedItem , $ this ->items )) {
314
314
$ this ->selectedItem = $ direction === 'UP '
315
- ? end ($ itemKeys )
316
- : reset ($ itemKeys );
315
+ ? ( int ) end ($ itemKeys )
316
+ : ( int ) reset ($ itemKeys );
317
317
}
318
318
} while (!$ this ->canSelect ());
319
319
}
@@ -332,15 +332,19 @@ protected function moveSelectionHorizontally(string $direction) : void
332
332
$ itemKeys = array_keys ($ item ->getItems ());
333
333
$ selectedItemIndex = $ item ->getSelectedItemIndex ();
334
334
335
+ if (null === $ selectedItemIndex ) {
336
+ $ selectedItemIndex = 0 ;
337
+ }
338
+
335
339
do {
336
340
$ direction === 'LEFT '
337
341
? $ selectedItemIndex --
338
342
: $ selectedItemIndex ++;
339
343
340
344
if (!array_key_exists ($ selectedItemIndex , $ item ->getItems ())) {
341
345
$ selectedItemIndex = $ direction === 'LEFT '
342
- ? end ($ itemKeys )
343
- : reset ($ itemKeys );
346
+ ? ( int ) end ($ itemKeys )
347
+ : ( int ) reset ($ itemKeys );
344
348
}
345
349
} while (!$ item ->canSelectIndex ($ selectedItemIndex ));
346
350
You can’t perform that action at this time.
0 commit comments