eddev 0.1.44-beta-1 → 0.1.44-beta-2

package/gravityforms/gravity-forms.d.ts

@@ -1,11 +1,16 @@
-declare type GravityFormsField = {
+export declare type GravityFormsField = {
     type: string;
     id: number;
     label: string;
+    isRequired: boolean;
 } & {
     [key: string]: any;
 };
 export declare type GravityFormData = {
+    id: number;
     fields: GravityFormsField[];
+    title: string;
+    button: {
+        text: string;
+    };
 };
-export {};

package/gravityforms/index.d.ts

@@ -1 +1,2 @@
 export * from "./useGravityForm";
+export * from "./gravity-forms";

package/gravityforms/index.js

@@ -11,3 +11,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./useGravityForm"), exports);
+__exportStar(require("./gravity-forms"), exports);

package/gravityforms/useGravityForm.d.ts

@@ -1,16 +1,15 @@
+import { GravityFormsField } from ".";
 import { GravityFormData } from "./gravity-forms";
 declare type Options = {
     form: GravityFormData;
 };
+export declare type GravityFormsFieldState<T = any> = GravityFormsField & {
+    value: T | undefined;
+    error: string | undefined;
+    set(value: T | undefined): void;
+};
 export declare function useGravityForm(opts: Options): {
-    fields: {
-        value: any;
-        error: string | undefined;
-        set: (value: any) => void;
-        type: string;
-        id: number;
-        label: string;
-    }[];
+    fields: GravityFormsFieldState<any>[];
     submit(): void;
     updateField(id: number, value: any): void;
     submitting: boolean;

package/gravityforms/useGravityForm.js

@@ -52,20 +52,20 @@ var react_1 = require("react");
 var react_2 = require("react");
 var react_3 = require("react");
 var reducer = function (state, action) {
-    var _a, _b;
+    var _a, _b, _c;
     switch (action.type) {
         case "field":
-            return __assign(__assign({}, state), { values: __assign(__assign({}, state.values), (_a = {}, _a[action.id] = action.value, _a)) });
+            return __assign(__assign({}, state), { errors: __assign(__assign({}, state.errors), (_a = {}, _a[action.id] = undefined, _a)), values: __assign(__assign({}, state.values), (_b = {}, _b[action.id] = action.value, _b)) });
         case "submitting":
             return __assign(__assign({}, state), { errors: {}, validity: {}, hasErrors: false, submitting: true });
         case "success":
             return __assign(__assign({}, state), { submitting: false, complete: true, errors: {}, validity: {}, hasErrors: false, successMessage: action.message });
         case "mainError":
-            return __assign(__assign({}, state), { hasErrors: true, mainError: action.message });
+            return __assign(__assign({}, state), { submitting: false, hasErrors: true, mainError: action.message });
         case "errors":
-            return __assign(__assign({}, state), { hasErrors: true, errors: action.errors });
+            return __assign(__assign({}, state), { submitting: false, hasErrors: true, errors: action.errors });
         case "clearError":
-            return __assign(__assign({}, state), { errors: __assign(__assign({}, state.errors), (_b = {}, _b[action.id] = undefined, _b)) });
+            return __assign(__assign({}, state), { submitting: false, errors: __assign(__assign({}, state.errors), (_c = {}, _c[action.id] = undefined, _c)) });
         default:
             throw new Error("Unknown GravityForms action ".concat(JSON.stringify(action)));
     }
@@ -96,6 +96,7 @@ function useGravityForm(opts) {
             submit: function (state) {
                 dispatch({ type: "submitting" });
                 submit(form, state).then(function (result) {
+                    console.log("RESULT", result);
                     if (cancelled)
                         return;
                     if (result.success) {
@@ -113,7 +114,7 @@ function useGravityForm(opts) {
         return function () {
             cancelled = true;
         };
-    });
+    }, []);
     return __assign(__assign({}, state), { fields: fields, submit: function () {
             submitter === null || submitter === void 0 ? void 0 : submitter.submit(state);
         }, updateField: function (id, value) {
@@ -121,6 +122,14 @@ function useGravityForm(opts) {
         } });
 }
 exports.useGravityForm = useGravityForm;
+function prepareValuesPayload(form, state, data) {
+    for (var _i = 0, _a = form.fields; _i < _a.length; _i++) {
+        var field = _a[_i];
+        var value = state.values[field.id];
+        data["input_" + field.id] = value;
+    }
+    return data;
+}
 function submit(form, state) {
     return __awaiter(this, void 0, void 0, function () {
         var url, params, result, payload, err_1;
@@ -128,8 +137,12 @@ function submit(form, state) {
             switch (_a.label) {
                 case 0:
                     _a.trys.push([0, 3, , 4]);
+                    console.log("Submitting", { form: form, state: state });
                     url = "/wp-json/ed/v1/gf/submit";
-                    params = {};
+                    params = {
+                        formID: form.id,
+                        values: prepareValuesPayload(form, state, {}),
+                    };
                     return [4 /*yield*/, fetch(url, {
                             method: "POST",
                             headers: {
@@ -143,7 +156,17 @@ function submit(form, state) {
                     return [4 /*yield*/, result.json()];
                 case 2:
                     payload = _a.sent();
-                    return [2 /*return*/, payload];
+                    if (!payload.is_valid) {
+                        return [2 /*return*/, __assign(__assign({}, payload), { success: false, errors: payload.validation_messages })];
+                    }
+                    else if (payload.is_valid) {
+                        return [2 /*return*/, __assign(__assign({}, payload), { success: true, successMessage: payload.confirmation_message })];
+                    }
+                    else {
+                        console.error("Not sure what to do with GF response", payload);
+                        return [2 /*return*/, __assign({}, payload)];
+                    }
+                    return [3 /*break*/, 4];
                 case 3:
                     err_1 = _a.sent();
                     console.error(err_1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eddev",
-  "version": "0.1.44-beta-1",
+  "version": "0.1.44-beta-2",
   "main": "./index.js",
   "license": "MIT",
   "bin": {
@@ -87,7 +87,7 @@
     "zustand": "^3.5.10"
   },
   "peerDependencies": {
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.0.0-rc.0",
+    "react-dom": "^18.0.0-rc.0"
   }
 }