Support canceling onContinue props

Resolve Evo-Forge#53
sntran-contrib · Apr 24, 2016 · 7d9648c · 7d9648c · sntran · Apr 24, 2016
1 parent 8d4729c
commit 7d9648c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/components/essence-stepper/lib/stepper.js b/components/essence-stepper/lib/stepper.js
@@ -71,14 +71,17 @@ var Stepper = (function (_React$Component) {
         key: 'continueStepper',
         value: function continueStepper(callback) {
             var nextStep = this.state.currentStep + 1;
-
-            this.setState({
-                selected: nextStep,
-                currentStep: nextStep
-            });
+            var advanced = true;
 
             if (callback) {
-                return callback(nextStep);
+                advanced = callback(nextStep) || true;
+            }
+
+            if (advanced) {
+                this.setState({
+                    selected: nextStep,
+                    currentStep: nextStep
+                });
             }
         }
     }, {

diff --git a/components/essence-stepper/src/stepper.jsx b/components/essence-stepper/src/stepper.jsx
@@ -45,14 +45,17 @@ class Stepper extends React.Component {
 
     continueStepper(callback) {
         let nextStep = this.state.currentStep+1;
-
-        this.setState({
-            selected: nextStep,
-            currentStep: nextStep
-        });
+        let advanced = true;
 
         if (callback) {
-            return callback(nextStep);
+            advanced = callback(nextStep) || true;
+        }
+
+        if (advanced) {
+            this.setState({
+                selected: nextStep,
+                currentStep: nextStep
+            });
         }
     }