fix Select focus move issue during loading, and allow moving to top a…

…fter pressing down on the last option (#1558)
youzan · Nov 23, 2020 · 7117d19 · 7117d19
1 parent b3304c8
commit 7117d19
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/zent/src/select/Select.tsx b/packages/zent/src/select/Select.tsx
@@ -106,7 +106,7 @@ function defaultRenderOptionList<Item extends ISelectItem>(
 }
 
 function isSelectable<Item extends ISelectItem>(item: Item) {
-  return !item.disabled && !item.type;
+  return !!item && !item.disabled && !item.type;
 }
 
 function findNextSelectableOption<Item extends ISelectItem>(
@@ -435,7 +435,7 @@ export class Select<
           nextIndex = 0;
         }
       } else {
-        nextIndex = state.activeIndex + delta;
+        nextIndex = (state.activeIndex + delta) % options.length;
       }
       if (nextIndex >= options.length) {
         nextIndex = options.length - 1;