From afdf0e42d6a3bd8431730d98310899767eea7d96 Mon Sep 17 00:00:00 2001
From: Chris Vanderloo <chris.vanderloo@yahoo.com>
Date: Mon, 27 Apr 2020 23:11:20 -0400
Subject: [PATCH] moved around how the functions work

---
 src/canvas/Canvas.js | 43 +++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/canvas/Canvas.js b/src/canvas/Canvas.js
index 9570586..16b749a 100644
--- a/src/canvas/Canvas.js
+++ b/src/canvas/Canvas.js
@@ -87,42 +87,19 @@ class Canvas extends React.Component {
         },
         erase: (id) => {
           console.log("ERASURE")
-          let successful = this.erasure(id);
-          if (successful)
-            this.setState({ 
-              highlights: {
-                cut: 'none', 
-                var: 'none'
-              },
-              interaction: true, 
-              cbFunction: null });
+          return this.erasure(id);
         },
         iterate: (id) => {
           console.log("ITERATION")
         },
         dcRemove: (id) => {
           console.log("DOUBLE CUT Remove")
-          let successful = this.doubleCutRemove(id);
-          if (successful) 
-            this.setState({ 
-              highlights: {
-                cut: 'none', 
-                var: 'none'
-              },
-              interaction: true, 
-              cbFunction: null });
+          return this.doubleCutRemove(id);
         },
         dcAdd: (id) => {
           console.log("DOUBLE CUT Add")
-          let successful = this.doubleCutAdd(id);
-          if (successful) 
-            this.setState({ 
-              highlights: {
-                cut: 'none', 
-                var: 'none'
-              },
-              interaction: true, 
-              cbFunction: null });
+          return this.doubleCutAdd(id);
+          
         }
       }
     }
@@ -137,7 +114,17 @@ class Canvas extends React.Component {
     this.setState({ 
       highlights: selectable, 
       interaction: false, 
-      cbFunction: this.state.functions[nameOfFunction] 
+      cbFunction: (id) => {
+        let successful = this.state.functions[nameOfFunction](id); 
+        if (successful) 
+          this.setState({ 
+            highlights: {
+              cut: 'none', 
+              var: 'none'
+            },
+            interaction: true, 
+            cbFunction: null });
+      }
     });
   }
 
-- 
2.51.2