fix(Grid.js): checking if selection valid before calling functions (w…

…hich may return NaN if selectio
fobbyal · Jun 10, 2020 · 7aeb47c · 7aeb47c
1 parent 161703b
commit 7aeb47c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/src/Grid.js b/src/Grid.js
@@ -753,20 +753,21 @@ class Grid extends React.PureComponent {
         // })
         this.edit(rowIndex, columnIndex)
       }
-    }
-    if (!this.isGridEditing()) {
-      if (e.keyCode === 37) this.selectLeft(e.shiftKey)
-      if (e.keyCode === 39) this.selectRight(e.shiftKey)
-      if (e.keyCode === 38) this.selectTop(e.shiftKey)
-      if (e.keyCode === 40) this.selectBottom(e.shiftKey)
-      if (e.ctrlKey && e.keyCode === 65) this.selectAll()
-      if (e.keyCode === 9) {
-        e.preventDefault()
-        e.shiftKey ? this.selectLeft() : this.selectRight()
-      }
-      if (e.keyCode === 46) {
-        e.preventDefault()
-        this.deleteSelection()
+
+      if (!this.isGridEditing()) {
+        if (e.keyCode === 37) this.selectLeft(e.shiftKey)
+        if (e.keyCode === 39) this.selectRight(e.shiftKey)
+        if (e.keyCode === 38) this.selectTop(e.shiftKey)
+        if (e.keyCode === 40) this.selectBottom(e.shiftKey)
+        if (e.ctrlKey && e.keyCode === 65) this.selectAll()
+        if (e.keyCode === 9) {
+          e.preventDefault()
+          e.shiftKey ? this.selectLeft() : this.selectRight()
+        }
+        if (e.keyCode === 46) {
+          e.preventDefault()
+          this.deleteSelection()
+        }
       }
     }
   }

diff --git a/src/editEngine.js b/src/editEngine.js
@@ -7,7 +7,7 @@ export const generateInitialEditInfo = ({ addedFirst } = {}) => ({
   removed: [],
   // originalRow => editedRow
   updatedMap: new Map(),
-  // editedRow => orignalRow
+  // editedRow => originalRow
   dirtyMap: new Map(),
   history: [],
 })