Merge branch 'master' of github.com:digipolisantwerp/acpaas-ui_react

* 'master' of github.com:digipolisantwerp/acpaas-ui_react: fix: remove console log fix: prevent oob error Bump prismjs from 1.24.1 to 1.25.0
digipolisantwerp · Dec 13, 2021 · 994bdf4 · 994bdf4
2 parents 8e8eb9b + 850b0a3
commit 994bdf4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+### Fixed
+- `Autocomplete` - prevent crash when going to index 0
 
 ## v6.2.0 - 2021-12-07
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/autocomplete/src/component/Autocomplete.jsx b/packages/autocomplete/src/component/Autocomplete.jsx
@@ -108,15 +108,15 @@ class Autocomplete extends Component<Props, IState> {
       tap(e => {
         e.preventDefault();
         const {results, cursor} = this.state;
-        if (e.key === "ArrowDown" && cursor < results.length - 1) {
+        if (e.key === "ArrowDown" && cursor < results.length) {
           this.setState({
             open: true,
             cursor: cursor + 1
           }, () => {
             this.scrollToItem()
           });
         }
-        if (e.key === "ArrowUp" && cursor > 0) {
+        if (e.key === "ArrowUp" && cursor > 1) {
           this.setState({
             open: true,
             cursor: cursor - 1
@@ -176,6 +176,11 @@ class Autocomplete extends Component<Props, IState> {
 
   scrollToItem = () => {
     const domNode = ReactDOM.findDOMNode(this['item_' + this.state.cursor]);
+
+    if (!domNode) {
+      return;
+    }
+
     domNode.scrollIntoView(false)
   };