From e3a85e4e16ba057ef4fe0331d1f65c93e52fb8a1 Mon Sep 17 00:00:00 2001
From: cristij <joracristi@gmail.com>
Date: Tue, 16 Jan 2018 19:25:25 +0200
Subject: [PATCH] Build

---
 dev-example/WizardRoute.vue        |   7 +-
 src/components/FormWizard.vue      | 103 ++++++++++++++++-------------
 src/components/helpers.js          |  13 ++++
 test/unit/specs/FormWizard.spec.js |  79 +++++++++++-----------
 4 files changed, 114 insertions(+), 88 deletions(-)

diff --git a/dev-example/WizardRoute.vue b/dev-example/WizardRoute.vue
index c5ad08f..29f52fd 100644
--- a/dev-example/WizardRoute.vue
+++ b/dev-example/WizardRoute.vue
@@ -8,7 +8,12 @@
                  @on-change="handleChange"
                  :start-index.sync="activeIndex"
                  color="#e74c3c">
-       <tab-content v-for="tab in tabs" :title="tab" :key="tab">{{tab}}</tab-content>
+       <tab-content v-for="(tab, index) in tabs"
+                    :beforeChange="validateAsync"
+                    :title="tab"
+                    :key="tab">
+         {{tab}}
+       </tab-content>
         <transition name="fade" mode="out-in">
           <router-view></router-view>
         </transition>
diff --git a/src/components/FormWizard.vue b/src/components/FormWizard.vue
index cbfa689..d3e1a1a 100644
--- a/src/components/FormWizard.vue
+++ b/src/components/FormWizard.vue
@@ -75,7 +75,7 @@
 <script>
   import WizardButton from './WizardButton.vue'
   import WizardStep from './WizardStep.vue'
-  import {isPromise, findElementAndFocus, getFocusedTabIndex} from './helpers'
+  import {findElementAndFocus, getFocusedTabIndex, isPromiseLike} from './helpers'
 
   export default {
     name: 'form-wizard',
@@ -270,30 +270,34 @@
           tab.checked = true
         })
       },
-      navigateToTab (index) {
+      async navigateToTab (index) {
         let validate = index > this.activeTabIndex
         if (index <= this.maxStep) {
-          let cb = () => {
+          let navigateFunction = () => {
             if (validate && index - this.activeTabIndex > 1) {
               // validate all steps recursively until destination index
               this.changeTab(this.activeTabIndex, this.activeTabIndex + 1)
-              this.beforeTabChange(this.activeTabIndex, cb)
+              this.beforeTabChange(this.activeTabIndex)
             } else {
               this.changeTab(this.activeTabIndex, index)
               this.afterTabChange(this.activeTabIndex)
             }
           }
           if (validate) {
-            this.beforeTabChange(this.activeTabIndex, cb)
+            let validationResult = await this.beforeTabChange(this.activeTabIndex)
+            if (validationResult === true) {
+              navigateFunction()
+            }
           } else {
             this.setValidationError(null)
-            cb()
+            navigateFunction()
           }
         }
         return index <= this.maxStep
       },
-      nextTab () {
-        let cb = () => {
+      async nextTab () {
+        let validationResult = await this.beforeTabChange(this.activeTabIndex)
+        if (validationResult === true) {
           if (this.activeTabIndex < this.tabCount - 1) {
             this.changeTab(this.activeTabIndex, this.activeTabIndex + 1)
             this.afterTabChange(this.activeTabIndex)
@@ -301,19 +305,21 @@
             this.$emit('on-complete')
           }
         }
-        this.beforeTabChange(this.activeTabIndex, cb)
       },
-      prevTab () {
-        let cb = () => {
+      async prevTab () {
+        let navigateFunction = () => {
           if (this.activeTabIndex > 0) {
             this.setValidationError(null)
             this.changeTab(this.activeTabIndex, this.activeTabIndex - 1)
           }
         }
         if (this.validateOnBack) {
-          this.beforeTabChange(this.activeTabIndex, cb)
+          let validationResult = await this.beforeTabChange(this.activeTabIndex)
+          if (validationResult === true) {
+            navigateFunction()
+          }
         } else {
-          cb()
+          navigateFunction()
         }
       },
       focusNextTab () {
@@ -340,44 +346,47 @@
         this.tabs[this.activeTabIndex].validationError = error
         this.$emit('on-error', error)
       },
-      validateBeforeChange (promiseFn, callback) {
+      async validateBeforeChange (promiseFn) {
         this.setValidationError(null)
         // we have a promise
-        if (isPromise(promiseFn)) {
-          this.setLoading(true)
-          promiseFn.then((res) => {
-            this.setLoading(false)
-            let validationResult = res === true
-            this.executeBeforeChange(validationResult, callback)
-          }).catch((error) => {
-            this.setLoading(false)
-            this.setValidationError(error)
-          })
-          // we have a simple function
-        } else {
-          let validationResult = promiseFn === true
-          this.executeBeforeChange(validationResult, callback)
-        }
+        this.setLoading(true)
+        return promiseFn.then(result => {
+          this.setLoading(false)
+          let validationResult = result === true
+          return this.executeBeforeChange(validationResult)
+        }).catch(error => {
+          this.setLoading(false)
+          this.setValidationError(error)
+          return Promise.resolve(false)
+        })
       },
-      executeBeforeChange (validationResult, callback) {
-        this.$emit('on-validate', validationResult, this.activeTabIndex)
-        if (validationResult) {
-          callback()
-        } else {
-          this.tabs[this.activeTabIndex].validationError = 'error'
-        }
+      executeBeforeChange (validationResult) {
+        return new Promise((resolve, reject) => {
+          this.$emit('on-validate', validationResult, this.activeTabIndex)
+          if (!validationResult) {
+            this.tabs[this.activeTabIndex].validationError = 'error'
+          }
+          resolve(validationResult)
+        })
       },
-      beforeTabChange (index, callback) {
-        if (this.loading) {
-          return
-        }
-        let oldTab = this.tabs[index]
-        if (oldTab && oldTab.beforeChange !== undefined) {
-          let tabChangeRes = oldTab.beforeChange()
-          this.validateBeforeChange(tabChangeRes, callback)
-        } else {
-          callback()
-        }
+      beforeTabChange (index) {
+        return new Promise((resolve, reject) => {
+          if (this.loading) {
+            resolve(false)
+          }
+          let oldTab = this.tabs[index]
+          if (oldTab && oldTab.beforeChange !== undefined) {
+            let beforeChangePromise = oldTab.beforeChange()
+            if (!isPromiseLike(beforeChangePromise)) {
+              beforeChangePromise = Promise.resolve(beforeChangePromise)
+            }
+            this.validateBeforeChange(beforeChangePromise).then((res) => {
+              resolve(res)
+            })
+          } else {
+            resolve(true)
+          }
+        })
       },
       afterTabChange (index) {
         if (this.loading) {
diff --git a/src/components/helpers.js b/src/components/helpers.js
index cea815b..9343445 100644
--- a/src/components/helpers.js
+++ b/src/components/helpers.js
@@ -1,15 +1,28 @@
 export function getFocusedElementId () {
   return document.activeElement.id
 }
+
 export function getFocusedTabIndex (tabs = []) {
   let activeId = getFocusedElementId()
   let tabIndex = tabs.findIndex(tab => tab.tabId === activeId)
   return tabIndex
 }
+
 export function findElementAndFocus (elemId) {
   let elem = document.getElementById(elemId)
   elem.focus()
 }
+
 export function isPromise (func) {
   return func.then && typeof func.then === 'function'
 }
+
+export const promisify = func => (...args) =>
+  new Promise((resolve, reject) =>
+    func(...args, (err, result) => (err ? reject(err) : resolve(result)))
+  )
+
+export const isPromiseLike = obj =>
+  obj !== null &&
+  (typeof obj === 'object' || typeof obj === 'function') &&
+  typeof obj.then === 'function'
diff --git a/test/unit/specs/FormWizard.spec.js b/test/unit/specs/FormWizard.spec.js
index f09c99a..9d25d84 100644
--- a/test/unit/specs/FormWizard.spec.js
+++ b/test/unit/specs/FormWizard.spec.js
@@ -174,13 +174,13 @@ describe('FormWizard.vue', () => {
     window.console = originalConsole
   })
 
-  it('resets wizard', () => {
+  it('resets wizard', async () => {
     const wizard = mount(threeStepWizard, {localVue})
     const wizardInstance = wizard.find(FormWizard)
     let tabs = wizard.findAll(WizardTab)
     expect(tabs.length).to.equal(3)
-    wizardInstance.vm.nextTab()
-    wizardInstance.vm.nextTab()
+    await wizardInstance.vm.nextTab()
+    await wizardInstance.vm.nextTab()
     const lastTab = tabs.at(2)
     expect(lastTab.vm.active).to.equal(true)
     expect(wizardInstance.vm.maxStep).to.equal(tabs.length - 1)
@@ -248,29 +248,29 @@ describe('FormWizard.vue', () => {
       expect(formWizard.vm.activeTabIndex).to.equal(startIndex)
     })
 
-    it('navigates to a visited tab', () => {
+    it('navigates to a visited tab', async () => {
       const wizard = mount(threeStepWizard, {localVue})
       const wizardInstance = wizard.find(FormWizard)
       let tabs = wizard.findAll(WizardTab)
-      wizardInstance.vm.nextTab()
-      wizardInstance.vm.nextTab()
-      wizardInstance.vm.navigateToTab(0)
+      await wizardInstance.vm.nextTab()
+      await wizardInstance.vm.nextTab()
+      await wizardInstance.vm.navigateToTab(0)
       const firstTab = tabs.at(0)
       expect(firstTab.vm.active).to.equal(true)
       expect(wizardInstance.vm.activeTabIndex).to.equal(0)
       expect(wizardInstance.vm.maxStep).to.equal(tabs.length - 1)
 
-      wizardInstance.vm.navigateToTab(2)
+      await wizardInstance.vm.navigateToTab(2)
       expect(wizardInstance.vm.activeTabIndex).to.equal(2)
       expect(wizardInstance.vm.maxStep).to.equal(tabs.length - 1)
     })
 
-    it('active tab is prev when current active tab is removed', (done) => {
+    it('active tab is prev when current active tab is removed', async (done) => {
       const wizard = mount(threeStepWizard, {localVue})
       const wizardInstance = wizard.find(FormWizard)
       // navigate to last tab
-      wizardInstance.vm.nextTab()
-      wizardInstance.vm.nextTab()
+      await wizardInstance.vm.nextTab()
+      await wizardInstance.vm.nextTab()
       const tabs = wizard.findAll(WizardTab)
       expect(tabs.length).to.equal(3)
       wizard.setData({showLastStep: false})
@@ -282,11 +282,11 @@ describe('FormWizard.vue', () => {
       })
     })
 
-    it('with arrow keys on visited tabs', () => {
+    it('with arrow keys on visited tabs', async () => {
       const wizard = mount(threeStepWizard, {localVue, attachToDocument: true})
       const wizardInstance = wizard.find(FormWizard)
-      wizardInstance.vm.nextTab()
-      wizardInstance.vm.nextTab()
+      await wizardInstance.vm.nextTab()
+      await wizardInstance.vm.nextTab()
       wizard.trigger('tab')
       wizard.trigger('keyup.right')
       wizard.trigger('keyup.left')
@@ -333,57 +333,56 @@ describe('FormWizard.vue', () => {
       }
     })
 
-    it('simple method', () => {
+    it('simple method', async () => {
       threeStepWizard.methods.validationMethod = sinon.stub()
       threeStepWizard.methods.validationMethod.returns(true)
       const wizard = mount(threeStepWizard, {localVue})
       const wizardInstance = wizard.find(FormWizard)
-      wizardInstance.vm.nextTab()
+      await wizardInstance.vm.nextTab()
       expect(threeStepWizard.methods.validationMethod.called).to.equal(true)
       expect(wizardInstance.vm.activeTabIndex).to.equal(1)
     })
-    it('simple method on back navigation', () => {
+    it('simple method on back navigation', async () => {
       threeStepWizard.methods.secondValidationMethod = sinon.stub()
       threeStepWizard.methods.secondValidationMethod.returns(true)
       const wizard = mount(threeStepWizard, {localVue})
       const wizardInstance = wizard.find(FormWizard)
-      wizardInstance.vm.nextTab()
-      wizardInstance.vm.prevTab()
+      await wizardInstance.vm.nextTab()
+      await wizardInstance.vm.prevTab()
       expect(threeStepWizard.methods.secondValidationMethod.called).to.equal(true)
     })
-    it('falsy method', () => {
+    it('falsy method', async() => {
       threeStepWizard.methods.validationMethod = sinon.stub()
       threeStepWizard.methods.validationMethod.returns(false)
       const wizard = mount(threeStepWizard, {localVue})
       const wizardInstance = wizard.find(FormWizard)
-      wizardInstance.vm.nextTab()
+      await wizardInstance.vm.nextTab()
       expect(threeStepWizard.methods.validationMethod.called).to.equal(true)
       expect(wizardInstance.vm.activeTabIndex).to.equal(0)
     })
-    it('promise', (done) => {
+    it('promise', async() => {
       threeStepWizard.methods.validationMethod = sinon.stub()
       threeStepWizard.methods.validationMethod.returns(Promise.resolve(true))
       const wizard = mount(threeStepWizard, {localVue})
       const wizardInstance = wizard.find(FormWizard)
-      wizardInstance.vm.nextTab()
+      await wizardInstance.vm.nextTab()
       expect(threeStepWizard.methods.validationMethod.called).to.equal(true)
-      Vue.nextTick(() => {
-        expect(wizardInstance.vm.activeTabIndex).to.equal(1)
-        done()
-      })
+      expect(wizardInstance.vm.activeTabIndex).to.equal(1)
     })
 
-    it('failing promise', (done) => {
+    it('failing promise', async() => {
       threeStepWizard.methods.validationMethod = sinon.stub()
       threeStepWizard.methods.validationMethod.returns(Promise.reject(false))
       const wizard = mount(threeStepWizard, {localVue})
       const wizardInstance = wizard.find(FormWizard)
-      wizardInstance.vm.nextTab()
-      expect(threeStepWizard.methods.validationMethod.called).to.equal(true)
-      Vue.nextTick(() => {
-        expect(wizardInstance.vm.activeTabIndex).to.equal(0)
-        done()
-      })
+      try {
+        await wizardInstance.vm.nextTab()
+      } catch(e) {
+        expect(threeStepWizard.methods.validationMethod.called).to.equal(true)
+        Vue.nextTick(() => {
+          expect(wizardInstance.vm.activeTabIndex).to.equal(0)
+        })
+      }
     })
   })
   describe('after change', () => {
@@ -411,24 +410,24 @@ describe('FormWizard.vue', () => {
         }
       }
     })
-    it('simple method on after change', () => {
+    it('simple method on after change', async() => {
       threeStepWizard.methods.validationMethod = sinon.stub()
       threeStepWizard.methods.validationMethod.returns(null)
       const wizard = mount(threeStepWizard, {localVue})
       const wizardInstance = wizard.find(FormWizard)
-      wizardInstance.vm.nextTab()
+      await wizardInstance.vm.nextTab()
       expect(threeStepWizard.methods.validationMethod.should.have.been.called)
       expect(wizardInstance.vm.activeTabIndex).to.equal(1)
     })
-    it('simple method on back navigation after change', () => {
+    it('simple method on back navigation after change', async () => {
       threeStepWizard.methods.validationMethod = sinon.stub()
       threeStepWizard.methods.validationMethod.returns(null)
       const wizard = mount(threeStepWizard, {localVue})
       const wizardInstance = wizard.find(FormWizard)
-      wizardInstance.vm.nextTab()
-      wizardInstance.vm.prevTab()
+      await wizardInstance.vm.nextTab()
+      await wizardInstance.vm.prevTab()
       expect(threeStepWizard.methods.validationMethod.should.have.been.called)
-    }) 
+    })
   })
   describe('with vue-router', ()=> {
     it('renders correct tab contents', () => {