Added Error Boundary

avinashsivaraman · Jun 20, 2019 · 96ff857 · 96ff857
1 parent 525e764
commit 96ff857
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/lib/ButtonPanel.js b/src/lib/ButtonPanel.js
@@ -36,7 +36,7 @@ export default class ButtonPanel extends React.Component {
   }
 
   componentWillUnmount(){
-    document.removeEventListener('keydown')
+    document.removeEventListener('keydown', this.mapKeyToButton)
   }
   render() {
     return (

diff --git a/src/lib/Calculator.js b/src/lib/Calculator.js
@@ -24,10 +24,17 @@ export default class Calculator extends React.Component {
       replacement.forEach((item) => {
         cur = pastedData.replace(item.dist, item.reg);
       });
-      this.setState({
-        cur: evaluate(cur).toString(),
-        last: cur
-      })
+      try {
+        this.setStateAndNotify({
+          cur: evaluate(cur).toString(),
+          last: cur
+        })
+      } catch (e) {
+        this.setStateAndNotify({
+          cur,
+          last: 'Not a valid expression'
+        })
+      }
     }
   }