@sikka/hawa 0.5.2-next → 0.5.3-next

package/dist/index.d.mts

@@ -866,6 +866,7 @@ type RegisterFormTypes = {
         passwordTooShortText: string;
         confirmPasswordLabel: string;
         confirmPasswordPlaceholder: string;
+        confirmPasswordRequired: string;
         refCodePlaceholder: string;
         subscribeToNewsletter: string;
         forgotPasswordText: string;

package/dist/index.d.ts

@@ -866,6 +866,7 @@ type RegisterFormTypes = {
         passwordTooShortText: string;
         confirmPasswordLabel: string;
         confirmPasswordPlaceholder: string;
+        confirmPasswordRequired: string;
         refCodePlaceholder: string;
         subscribeToNewsletter: string;
         forgotPasswordText: string;

package/dist/index.js

@@ -6295,31 +6295,51 @@ var import_react_hook_form2 = require("react-hook-form");
 var import_zod = require("@hookform/resolvers/zod");
 var z = __toESM(require("zod"));
 var LoginForm = function(props) {
-    var _props_texts, _props_texts1, _props_texts2, _props_texts3, _props_texts4, _props_texts5, _props_texts6, _props_texts7, _props_texts8, _props_texts9, _props_texts10, _props_texts11, _props_texts12;
-    var formSchema2 = z.object({
-        email: z.string({
-            required_error: (_props_texts = props.texts) === null || _props_texts === void 0 ? void 0 : _props_texts.emailRequiredText
-        }).nonempty({
-            message: (_props_texts1 = props.texts) === null || _props_texts1 === void 0 ? void 0 : _props_texts1.emailRequiredText
-        }).email({
-            message: (_props_texts2 = props.texts) === null || _props_texts2 === void 0 ? void 0 : _props_texts2.emailInvalidText
-        }),
-        password: z.string({
-            required_error: (_props_texts3 = props.texts) === null || _props_texts3 === void 0 ? void 0 : _props_texts3.passwordRequiredText
-        }).min(5, {
-            message: "Password must be at least 5 characters long"
-        }).nonempty({
-            message: (_props_texts4 = props.texts) === null || _props_texts4 === void 0 ? void 0 : _props_texts4.passwordRequiredText
-        }),
-        username: z.string().min(2, {
-            message: "Username must be at least 2 characters"
-        }).nonempty({
-            message: (_props_texts5 = props.texts) === null || _props_texts5 === void 0 ? void 0 : _props_texts5.usernameRequired
-        }),
-        phone: z.string().nonempty({
-            message: "Phone number is required"
-        })
-    });
+    var _props_texts, _props_texts1, _props_texts2, _props_texts3, _props_texts4, _props_texts5, _props_texts6;
+    var formSchema2;
+    if (props.loginType === "email") {
+        var _props_texts7, _props_texts8, _props_texts9, _props_texts10, _props_texts11;
+        formSchema2 = z.object({
+            email: z.string({
+                required_error: (_props_texts7 = props.texts) === null || _props_texts7 === void 0 ? void 0 : _props_texts7.emailRequiredText
+            }).nonempty({
+                message: (_props_texts8 = props.texts) === null || _props_texts8 === void 0 ? void 0 : _props_texts8.emailRequiredText
+            }).email({
+                message: (_props_texts9 = props.texts) === null || _props_texts9 === void 0 ? void 0 : _props_texts9.emailInvalidText
+            }),
+            password: z.string({
+                required_error: (_props_texts10 = props.texts) === null || _props_texts10 === void 0 ? void 0 : _props_texts10.passwordRequiredText
+            }).min(5, {
+                message: "Password must be at least 5 characters long"
+            }).nonempty({
+                message: (_props_texts11 = props.texts) === null || _props_texts11 === void 0 ? void 0 : _props_texts11.passwordRequiredText
+            })
+        });
+    } else if (props.loginType === "username") {
+        var _props_texts12, _props_texts13, _props_texts14;
+        formSchema2 = z.object({
+            username: z.string().min(2, {
+                message: "Username must be at least 2 characters"
+            }).nonempty({
+                message: (_props_texts12 = props.texts) === null || _props_texts12 === void 0 ? void 0 : _props_texts12.usernameRequired
+            }),
+            password: z.string({
+                required_error: (_props_texts13 = props.texts) === null || _props_texts13 === void 0 ? void 0 : _props_texts13.passwordRequiredText
+            }).min(5, {
+                message: "Password must be at least 5 characters long"
+            }).nonempty({
+                message: (_props_texts14 = props.texts) === null || _props_texts14 === void 0 ? void 0 : _props_texts14.passwordRequiredText
+            })
+        });
+    } else if (props.loginType === "phone") {
+        formSchema2 = z.object({
+            phone: z.string().nonempty({
+                message: "Phone number is required"
+            })
+        });
+    } else {
+        formSchema2 = z.object({});
+    }
     var _ref = (0, import_react_hook_form2.useForm)({
         resolver: (0, import_zod.zodResolver)(formSchema2)
     }), handleSubmit = _ref.handleSubmit, control = _ref.control, formState = _ref.formState;
@@ -6338,7 +6358,7 @@ var LoginForm = function(props) {
         onSubmit: handleSubmit(function(e) {
             if (props.handleLogin) {
                 console.log("attempting to login");
-                props.handleLogin(e);
+                return props.handleLogin(e);
             } else {
                 console.log("Form is submitted but handleLogin prop is missing");
             }
@@ -6411,16 +6431,16 @@ var LoginForm = function(props) {
     }), !props.withoutResetPassword && /* @__PURE__ */ import_react33.default.createElement("div", {
         onClick: props.handleForgotPassword,
         className: "hawa-mb-3 hawa-mt-2 hawa-w-fit hawa-cursor-pointer hawa-text-xs dark:hawa-text-gray-300"
-    }, ((_props_texts6 = props.texts) === null || _props_texts6 === void 0 ? void 0 : _props_texts6.forgotPasswordText) || "Forgot Password?")), /* @__PURE__ */ import_react33.default.createElement(Button, {
+    }, ((_props_texts = props.texts) === null || _props_texts === void 0 ? void 0 : _props_texts.forgotPasswordText) || "Forgot Password?")), /* @__PURE__ */ import_react33.default.createElement(Button, {
         className: "hawa-mt-0 hawa-w-full",
         type: "submit",
         isLoading: props.isLoading
-    }, ((_props_texts7 = props.texts) === null || _props_texts7 === void 0 ? void 0 : _props_texts7.loginText) || "Login"), !props.withoutSignUp && /* @__PURE__ */ import_react33.default.createElement("div", {
+    }, ((_props_texts1 = props.texts) === null || _props_texts1 === void 0 ? void 0 : _props_texts1.loginText) || "Login"), !props.withoutSignUp && /* @__PURE__ */ import_react33.default.createElement("div", {
         className: "hawa-p-3 hawa-text-center hawa-text-sm hawa-font-normal dark:hawa-text-gray-300"
-    }, ((_props_texts8 = props.texts) === null || _props_texts8 === void 0 ? void 0 : _props_texts8.newUserText) || "New user?", " ", /* @__PURE__ */ import_react33.default.createElement("span", {
+    }, ((_props_texts2 = props.texts) === null || _props_texts2 === void 0 ? void 0 : _props_texts2.newUserText) || "New user?", " ", /* @__PURE__ */ import_react33.default.createElement("span", {
         onClick: props.handleRouteToSignUp,
         className: "clickable-link"
-    }, ((_props_texts9 = props.texts) === null || _props_texts9 === void 0 ? void 0 : _props_texts9.createAccount) || "Create Account")))), props.viaGithub || props.viaGoogle || props.viaTwitter ? /* @__PURE__ */ import_react33.default.createElement(CardFooter, {
+    }, ((_props_texts3 = props.texts) === null || _props_texts3 === void 0 ? void 0 : _props_texts3.createAccount) || "Create Account")))), props.viaGithub || props.viaGoogle || props.viaTwitter ? /* @__PURE__ */ import_react33.default.createElement(CardFooter, {
         className: cn(props.logosOnly ? "hawa-flex hawa-flex-row hawa-justify-center hawa-gap-2" : "hawa-grid hawa-grid-cols-1 hawa-gap-2")
     }, props.viaGoogle && /* @__PURE__ */ import_react33.default.createElement(Button, {
         className: "hawa-flex hawa-flex-row hawa-items-center hawa-gap-2",
@@ -6430,7 +6450,7 @@ var LoginForm = function(props) {
         size: "button"
     }) : /* @__PURE__ */ import_react33.default.createElement(Logos.google, {
         className: "hawa-h-4 hawa-w-4"
-    }), !props.logosOnly && ((_props_texts10 = props.texts) === null || _props_texts10 === void 0 ? void 0 : _props_texts10.loginViaGoogleLabel)), props.viaGithub && /* @__PURE__ */ import_react33.default.createElement(Button, {
+    }), !props.logosOnly && ((_props_texts4 = props.texts) === null || _props_texts4 === void 0 ? void 0 : _props_texts4.loginViaGoogleLabel)), props.viaGithub && /* @__PURE__ */ import_react33.default.createElement(Button, {
         className: "hawa-flex hawa-flex-row hawa-items-center hawa-gap-2",
         variant: "outline",
         onClick: props.handleGithubLogin
@@ -6438,7 +6458,7 @@ var LoginForm = function(props) {
         size: "button"
     }) : /* @__PURE__ */ import_react33.default.createElement(Logos.gitHub, {
         className: "hawa-h-4 hawa-w-4"
-    }), !props.logosOnly && ((_props_texts11 = props.texts) === null || _props_texts11 === void 0 ? void 0 : _props_texts11.loginViaGithubLabel)), props.viaTwitter && /* @__PURE__ */ import_react33.default.createElement(Button, {
+    }), !props.logosOnly && ((_props_texts5 = props.texts) === null || _props_texts5 === void 0 ? void 0 : _props_texts5.loginViaGithubLabel)), props.viaTwitter && /* @__PURE__ */ import_react33.default.createElement(Button, {
         className: "hawa-flex hawa-flex-row hawa-items-center hawa-gap-2",
         variant: "outline",
         onClick: props.handleTwitterLogin
@@ -6446,7 +6466,7 @@ var LoginForm = function(props) {
         size: "button"
     }) : /* @__PURE__ */ import_react33.default.createElement(Logos.twitter, {
         className: "hawa-h-4 hawa-w-4"
-    }), " ", !props.logosOnly && ((_props_texts12 = props.texts) === null || _props_texts12 === void 0 ? void 0 : _props_texts12.loginViaTwitterLabel))) : null), props.handleColorMode && props.handleLanguage && /* @__PURE__ */ import_react33.default.createElement(InterfaceSettings, {
+    }), " ", !props.logosOnly && ((_props_texts6 = props.texts) === null || _props_texts6 === void 0 ? void 0 : _props_texts6.loginViaTwitterLabel))) : null), props.handleColorMode && props.handleLanguage && /* @__PURE__ */ import_react33.default.createElement(InterfaceSettings, {
         currentColorMode: props.currentColorMode,
         currentLanguage: props.currentLanguage,
         handleColorMode: props.handleColorMode,
@@ -6460,23 +6480,34 @@ var import_zod2 = require("@hookform/resolvers/zod");
 var z2 = __toESM(require("zod"));
 var RegisterForm = function(props) {
     var methods = (0, import_react_hook_form3.useForm)();
-    var _props_texts = props.texts, userReferenceLabel = _props_texts.userReferenceLabel, usernameLabel = _props_texts.usernameLabel, usernamePlaceholder = _props_texts.usernamePlaceholder, usernameRequired = _props_texts.usernameRequired, newUserText = _props_texts.newUserText, existingUserText = _props_texts.existingUserText, emailInvalidText = _props_texts.emailInvalidText, emailLabel = _props_texts.emailLabel, emailPlaceholder = _props_texts.emailPlaceholder, emailRequiredText = _props_texts.emailRequiredText, passwordLabel = _props_texts.passwordLabel, passwordPlaceholder = _props_texts.passwordPlaceholder, passwordRequiredText = _props_texts.passwordRequiredText, passwordTooShortText = _props_texts.passwordTooShortText, forgotPasswordText = _props_texts.forgotPasswordText, confirmPasswordLabel = _props_texts.confirmPasswordLabel, confirmPasswordPlaceholder = _props_texts.confirmPasswordPlaceholder, termsRequiredText = _props_texts.termsRequiredText, fullNameRequiredText = _props_texts.fullNameRequiredText;
-    var formSchema2 = z2.object({
-        fullName: z2.string().optional(),
-        email: z2.string({
-            required_error: emailRequiredText
-        }).email({
-            message: emailInvalidText
-        }).nonempty({
-            message: usernameRequired
-        }),
-        username: z2.string({
-            required_error: usernameRequired
-        }).refine(function(value) {
-            return value !== "";
-        }, {
-            message: usernameRequired
-        }),
+    var _props_texts = props.texts, userReferenceLabel = _props_texts.userReferenceLabel, usernameLabel = _props_texts.usernameLabel, usernamePlaceholder = _props_texts.usernamePlaceholder, usernameRequired = _props_texts.usernameRequired, newUserText = _props_texts.newUserText, existingUserText = _props_texts.existingUserText, emailInvalidText = _props_texts.emailInvalidText, emailLabel = _props_texts.emailLabel, emailPlaceholder = _props_texts.emailPlaceholder, emailRequiredText = _props_texts.emailRequiredText, passwordLabel = _props_texts.passwordLabel, passwordPlaceholder = _props_texts.passwordPlaceholder, passwordRequiredText = _props_texts.passwordRequiredText, passwordTooShortText = _props_texts.passwordTooShortText, confirmPasswordRequired = _props_texts.confirmPasswordRequired, forgotPasswordText = _props_texts.forgotPasswordText, confirmPasswordLabel = _props_texts.confirmPasswordLabel, confirmPasswordPlaceholder = _props_texts.confirmPasswordPlaceholder, termsRequiredText = _props_texts.termsRequiredText, fullNameRequiredText = _props_texts.fullNameRequiredText;
+    var fieldSchemas = {};
+    props.registerFields.forEach(function(field) {
+        switch(field){
+            case "fullname":
+                fieldSchemas["fullName"] = z2.string().optional();
+                break;
+            case "email":
+                fieldSchemas["email"] = z2.string({
+                    required_error: emailRequiredText
+                }).email({
+                    message: emailInvalidText
+                }).nonempty({
+                    message: usernameRequired
+                });
+                break;
+            case "username":
+                fieldSchemas["username"] = z2.string({
+                    required_error: usernameRequired
+                }).refine(function(value) {
+                    return value !== "";
+                }, {
+                    message: usernameRequired
+                });
+                break;
+        }
+    });
+    var formSchema2 = z2.object(_object_spread_props(_object_spread({}, fieldSchemas), {
         password: z2.string({
             required_error: passwordRequiredText
         }).min(5, {
@@ -6486,7 +6517,9 @@ var RegisterForm = function(props) {
         }, {
             message: passwordRequiredText
         }),
-        confirm_password: z2.string().refine(function(value) {
+        confirm_password: z2.string({
+            required_error: confirmPasswordRequired
+        }).refine(function(value) {
             return value !== "";
         }, {
             message: passwordRequiredText
@@ -6501,7 +6534,7 @@ var RegisterForm = function(props) {
             message: termsRequiredText
         }),
         newsletter_accepted: z2.boolean().optional()
-    }).refine(function(data) {
+    })).refine(function(data) {
         return data.password === data.confirm_password;
     }, {
         message: "Passwords don't match",
@@ -6523,9 +6556,7 @@ var RegisterForm = function(props) {
         text: props.errorText,
         severity: "error"
     }), /* @__PURE__ */ import_react34.default.createElement(import_react_hook_form3.FormProvider, _object_spread({}, methods), /* @__PURE__ */ import_react34.default.createElement("form", {
-        onSubmit: handleSubmit(function(e) {
-            return props.handleRegister(e);
-        }),
+        onSubmit: handleSubmit(props.handleRegister),
         className: "hawa-flex hawa-flex-col hawa-gap-4"
     }, /* @__PURE__ */ import_react34.default.createElement("div", {
         className: "hawa-flex hawa-flex-col hawa-gap-4"

package/dist/index.mjs

@@ -6093,16 +6093,30 @@ import { Controller as Controller2, useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import * as z from "zod";
 var LoginForm = (props) => {
-  const formSchema2 = z.object({
-    email: z.string({
-      required_error: props.texts?.emailRequiredText
-    }).nonempty({ message: props.texts?.emailRequiredText }).email({ message: props.texts?.emailInvalidText }),
-    password: z.string({
-      required_error: props.texts?.passwordRequiredText
-    }).min(5, { message: "Password must be at least 5 characters long" }).nonempty({ message: props.texts?.passwordRequiredText }),
-    username: z.string().min(2, { message: "Username must be at least 2 characters" }).nonempty({ message: props.texts?.usernameRequired }),
-    phone: z.string().nonempty({ message: "Phone number is required" })
-  });
+  let formSchema2;
+  if (props.loginType === "email") {
+    formSchema2 = z.object({
+      email: z.string({
+        required_error: props.texts?.emailRequiredText
+      }).nonempty({ message: props.texts?.emailRequiredText }).email({ message: props.texts?.emailInvalidText }),
+      password: z.string({
+        required_error: props.texts?.passwordRequiredText
+      }).min(5, { message: "Password must be at least 5 characters long" }).nonempty({ message: props.texts?.passwordRequiredText })
+    });
+  } else if (props.loginType === "username") {
+    formSchema2 = z.object({
+      username: z.string().min(2, { message: "Username must be at least 2 characters" }).nonempty({ message: props.texts?.usernameRequired }),
+      password: z.string({
+        required_error: props.texts?.passwordRequiredText
+      }).min(5, { message: "Password must be at least 5 characters long" }).nonempty({ message: props.texts?.passwordRequiredText })
+    });
+  } else if (props.loginType === "phone") {
+    formSchema2 = z.object({
+      phone: z.string().nonempty({ message: "Phone number is required" })
+    });
+  } else {
+    formSchema2 = z.object({});
+  }
   const { handleSubmit, control, formState } = useForm({
     resolver: zodResolver(formSchema2)
   });
@@ -6120,7 +6134,7 @@ var LoginForm = (props) => {
       onSubmit: handleSubmit((e) => {
         if (props.handleLogin) {
           console.log("attempting to login");
-          props.handleLogin(e);
+          return props.handleLogin(e);
         } else {
           console.log(
             "Form is submitted but handleLogin prop is missing"
@@ -6297,18 +6311,31 @@ var RegisterForm = (props) => {
     passwordPlaceholder,
     passwordRequiredText,
     passwordTooShortText,
+    confirmPasswordRequired,
     forgotPasswordText,
     confirmPasswordLabel,
     confirmPasswordPlaceholder,
     termsRequiredText,
     fullNameRequiredText
   } = props.texts;
+  let fieldSchemas = {};
+  props.registerFields.forEach((field) => {
+    switch (field) {
+      case "fullname":
+        fieldSchemas["fullName"] = z2.string().optional();
+        break;
+      case "email":
+        fieldSchemas["email"] = z2.string({ required_error: emailRequiredText }).email({ message: emailInvalidText }).nonempty({ message: usernameRequired });
+        break;
+      case "username":
+        fieldSchemas["username"] = z2.string({ required_error: usernameRequired }).refine((value) => value !== "", { message: usernameRequired });
+        break;
+    }
+  });
   const formSchema2 = z2.object({
-    fullName: z2.string().optional(),
-    email: z2.string({ required_error: emailRequiredText }).email({ message: emailInvalidText }).nonempty({ message: usernameRequired }),
-    username: z2.string({ required_error: usernameRequired }).refine((value) => value !== "", { message: usernameRequired }),
+    ...fieldSchemas,
     password: z2.string({ required_error: passwordRequiredText }).min(5, { message: passwordTooShortText }).refine((value) => value !== "", { message: passwordRequiredText }),
-    confirm_password: z2.string().refine((value) => value !== "", { message: passwordRequiredText }),
+    confirm_password: z2.string({ required_error: confirmPasswordRequired }).refine((value) => value !== "", { message: passwordRequiredText }),
     refCode: z2.string().optional(),
     reference: z2.string().optional(),
     terms_accepted: z2.boolean({ required_error: termsRequiredText }).refine((value) => value, { message: termsRequiredText }),
@@ -6330,7 +6357,7 @@ var RegisterForm = (props) => {
   ), /* @__PURE__ */ React53.createElement(FormProvider2, { ...methods }, /* @__PURE__ */ React53.createElement(
     "form",
     {
-      onSubmit: handleSubmit((e) => props.handleRegister(e)),
+      onSubmit: handleSubmit(props.handleRegister),
       className: "hawa-flex hawa-flex-col hawa-gap-4"
     },
     /* @__PURE__ */ React53.createElement("div", { className: "hawa-flex hawa-flex-col hawa-gap-4" }, props.registerFields.map((fld, i) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sikka/hawa",
-  "version": "0.5.2-next",
+  "version": "0.5.3-next",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {