fix key up/down bound issue

suppermancool · suppermancool · commit e93e64b2651a · 2019-01-24T15:10:28.000+07:00
diff --git a/components/Dropdown/Dropdown.jsx b/components/Dropdown/Dropdown.jsx
@@ -31,10 +31,11 @@ class Dropdown  extends React.Component {
         return
       }
       childSelectionIndex += 1
-      if (childSelectionIndex > listChild.length) {
-        childSelectionIndex = 0
+      if (childSelectionIndex >= listChild.length) {
+        childSelectionIndex -= 1
+      } else {
+        listChild[childSelectionIndex].focus()
       }
-      listChild[childSelectionIndex].focus()
     }
     const focusOnPreviousChild = () => {
       const listChild = this.listRef.getElementsByTagName('li')
@@ -43,9 +44,10 @@ class Dropdown  extends React.Component {
       }
       childSelectionIndex -= 1
       if (childSelectionIndex < 0) {
-        childSelectionIndex = listChild.length - 1
+        childSelectionIndex = 0
+      } else {
+        listChild[childSelectionIndex].focus()
       }
-      listChild[childSelectionIndex].focus()
     }
     let searchKey = ''
     let timer

Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,11 @@ class Dropdown extends React.Component {`
`31`	`31`	`return`
`32`	`32`	`}`
`33`	`33`	`childSelectionIndex += 1`
`34`		`- if (childSelectionIndex > listChild.length) {`
`35`		`- childSelectionIndex = 0`
	`34`	`+ if (childSelectionIndex >= listChild.length) {`
	`35`	`+ childSelectionIndex -= 1`
	`36`	`+ } else {`
	`37`	`+ listChild[childSelectionIndex].focus()`
`36`	`38`	`}`
`37`		`- listChild[childSelectionIndex].focus()`
`38`	`39`	`}`
`39`	`40`	`const focusOnPreviousChild = () => {`
`40`	`41`	`const listChild = this.listRef.getElementsByTagName('li')`
`@@ -43,9 +44,10 @@ class Dropdown extends React.Component {`
`43`	`44`	`}`
`44`	`45`	`childSelectionIndex -= 1`
`45`	`46`	`if (childSelectionIndex < 0) {`
`46`		`- childSelectionIndex = listChild.length - 1`
	`47`	`+ childSelectionIndex = 0`
	`48`	`+ } else {`
	`49`	`+ listChild[childSelectionIndex].focus()`
`47`	`50`	`}`
`48`		`- listChild[childSelectionIndex].focus()`
`49`	`51`	`}`
`50`	`52`	`let searchKey = ''`
`51`	`53`	`let timer`