Merge pull request #8 from gradedcatfood/master

Update InertiaForm to handle latest version inertia 0.4 and inertia-vue 0.3

Author: taylorotwell

package.json

@@ -33,7 +33,7 @@
         "babel-preset-es2015": "^6.9.0"
     },
     "dependencies": {
-        "@inertiajs/inertia": "^0.1.7",
+        "@inertiajs/inertia": "^0.4.0",
         "prettier": "^1.10.2"
     }
 }

src/InertiaForm.js

@@ -138,23 +138,25 @@ class InertiaForm {
         this.processing = true;
         this.successful = false;
 
-        const then = () => {
+        const onSuccess = page => {
             this.processing = false;
 
             if (! this.hasErrors()) {
                 this.onSuccess();
             } else {
                 this.onFail();
             }
+
+            if (options.onSuccess) {
+                options.onSuccess(page)
+            }
         }
 
         if (requestType === 'delete') {
-            return this.__inertia[requestType](url, options)
-                .then(then)
+            return this.__inertia[requestType](url, { ... options, onSuccess })
         }
 
-        return this.__inertia[requestType](url, this.hasFiles() ? objectToFormData(this.data()) : this.data(), options)
-            .then(then)
+        return this.__inertia[requestType](url, this.hasFiles() ? objectToFormData(this.data()) : this.data(), { ... options, onSuccess })
     }
 
     hasFiles() {
@@ -266,15 +268,15 @@ export default {
                         .withData(data)
                         .withOptions(options)
                         .withInertia(app.config.globalProperties.$inertia)
-                        .withPage(() => app.config.globalProperties.$page),
+                        .withPage(() => app.config.globalProperties.$page.hasOwnProperty('props') ? app.config.globalProperties.$page.props : app.config.globalProperties.$page),
             });
         } else {
             app.prototype.$inertia.form = (data = {}, options = {}) => {
                 return InertiaForm.create()
                     .withData(data)
                     .withOptions(options)
                     .withInertia(app.prototype.$inertia)
-                    .withPage(() => app.prototype.$page);
+                    .withPage(() => app.prototype.$page.hasOwnProperty('props') ? app.prototype.$page.props : app.prototype.$page);
             };
         }
     },