Merge branch '2.x' into dev

2020-11-06 16:28:43 +08:00
parent e19ba76aba f07d8e6709
commit eb2619dc44
3 changed files with 65 additions and 5 deletions
@@ -69,11 +69,13 @@ export default createComponent({
        const { children } = cursor;
        let defaultIndex = cursor.defaultIndex ?? +this.defaultIndex;

-        while (
-          children[defaultIndex].disabled &&
-          defaultIndex < children.length - 1
-        ) {
-          defaultIndex++;
+        while (children[defaultIndex] && children[defaultIndex].disabled) {
+          if (defaultIndex < children.length - 1) {
+            defaultIndex++;
+          } else {
+            defaultIndex = 0;
+            break;
+          }
        }

        formatted.push({