@sikka/hawa 0.49.7-next → 0.49.9-next

package/dist/index.mjs

@@ -10309,8 +10309,15 @@ var RegisterForm = ({
     continueWithEmail: texts == null ? void 0 : texts.continueWithEmail,
     continueWithPhone: texts == null ? void 0 : texts.continueWithPhone
   };
-  const methods = useForm2();
   let fieldSchemas = {};
+  let remainingFieldsSchema = z2.object({
+    refCode: z2.string().optional(),
+    reference: z2.string().optional(),
+    terms_accepted: showTermsOption ? z2.boolean({ required_error: (texts == null ? void 0 : texts.termsRequired) || "Terms required" }).refine((value) => value, {
+      message: (texts == null ? void 0 : texts.termsRequired) || "Terms required"
+    }) : z2.boolean().optional(),
+    newsletter_accepted: z2.boolean().optional()
+  });
   const hasPhoneType = registerTypes == null ? void 0 : registerTypes.some((type) => type.value === "phone");
   if (hasPhoneType && selectedRegisterType.value === "phone") {
     registerFields = ["phone"];
@@ -10365,13 +10372,7 @@ var RegisterForm = ({
           return isPhoneValid;
         },
         { message: ((_d = texts == null ? void 0 : texts.phone) == null ? void 0 : _d.invalid) || "Phone Number Invalid" }
-      ),
-      refCode: z2.string().optional(),
-      reference: z2.string().optional(),
-      terms_accepted: z2.boolean({ required_error: (texts == null ? void 0 : texts.termsRequired) || "Terms required" }).refine((value) => value, {
-        message: (texts == null ? void 0 : texts.termsRequired) || "Terms required"
-      }),
-      newsletter_accepted: z2.boolean().optional()
+      )
     });
   } else {
     formSchema = z2.object({
@@ -10389,21 +10390,24 @@ var RegisterForm = ({
         message: ((_i = texts == null ? void 0 : texts.password) == null ? void 0 : _i.tooShort) || "Password is too short"
       }).refine((value) => value !== "", {
         message: ((_j = texts == null ? void 0 : texts.password) == null ? void 0 : _j.required) || "Confirm password is required"
-      }),
-      refCode: z2.string().optional(),
-      reference: z2.string().optional(),
-      terms_accepted: z2.boolean({ required_error: (texts == null ? void 0 : texts.termsRequired) || "Terms required" }).refine((value) => value, {
-        message: (texts == null ? void 0 : texts.termsRequired) || "Terms required"
-      }),
-      newsletter_accepted: z2.boolean().optional()
+      })
     }).refine((data) => data.password === data.confirm_password, {
       message: ((_k = texts == null ? void 0 : texts.confirm) == null ? void 0 : _k.dontMatch) || "Passwords don't match",
       path: ["confirm_password"]
     });
   }
-  const { handleSubmit, control, formState } = useForm2({
-    resolver: zodResolver2(formSchema)
+  let finalSchema = z2.intersection(formSchema, remainingFieldsSchema);
+  const methods = useForm2({
+    resolver: zodResolver2(finalSchema)
   });
+  const onSubmit = (data) => {
+    console.log("Form submitted with data:", data);
+    if (props.onRegister) {
+      props.onRegister(data);
+    } else {
+      console.log("onRegister prop is missing");
+    }
+  };
   return /* @__PURE__ */ React83.createElement("div", { className: cn("hawa-flex hawa-flex-col", (_l = props.classNames) == null ? void 0 : _l.root) }, /* @__PURE__ */ React83.createElement(
     Card,
     {
@@ -10443,13 +10447,7 @@ var RegisterForm = ({
           {
             id: "register_form",
             noValidate: true,
-            onSubmit: handleSubmit((e) => {
-              if (props.onRegister) {
-                return props.onRegister(e);
-              } else {
-                console.log("Form is submitted but onRegister prop is missing");
-              }
-            }),
+            onSubmit: methods.handleSubmit(onSubmit),
             className: "hawa-flex hawa-flex-col hawa-gap-4"
           },
           /* @__PURE__ */ React83.createElement(
@@ -10486,7 +10484,7 @@ var RegisterForm = ({
                     Controller2,
                     {
                       key: i,
-                      control,
+                      control: methods.control,
                       name: "fullName",
                       render: ({ field }) => {
                         var _a2, _b2, _c2;
@@ -10496,7 +10494,7 @@ var RegisterForm = ({
                             width: "full",
                             label: ((_a2 = texts == null ? void 0 : texts.fullName) == null ? void 0 : _a2.label) || "Full Name",
                             placeholder: (_b2 = texts == null ? void 0 : texts.fullName) == null ? void 0 : _b2.placeholder,
-                            helperText: (_c2 = formState.errors.fullName) == null ? void 0 : _c2.message,
+                            helperText: (_c2 = methods.formState.errors.fullName) == null ? void 0 : _c2.message,
                             ...field
                           }
                         );
@@ -10509,7 +10507,7 @@ var RegisterForm = ({
                     Controller2,
                     {
                       key: i,
-                      control,
+                      control: methods.control,
                       name: "email",
                       render: ({ field }) => {
                         var _a2, _b2, _c2;
@@ -10523,7 +10521,7 @@ var RegisterForm = ({
                             width: "full",
                             autoComplete: "email",
                             label: ((_a2 = texts == null ? void 0 : texts.email) == null ? void 0 : _a2.label) || "Email",
-                            helperText: (_b2 = formState.errors.email) == null ? void 0 : _b2.message,
+                            helperText: (_b2 = methods.formState.errors.email) == null ? void 0 : _b2.message,
                             placeholder: ((_c2 = texts == null ? void 0 : texts.email) == null ? void 0 : _c2.placeholder) || "Enter your email",
                             ...field,
                             onChange: (e) => {
@@ -10540,7 +10538,7 @@ var RegisterForm = ({
                     Controller2,
                     {
                       key: i,
-                      control,
+                      control: methods.control,
                       name: "username",
                       render: ({ field }) => {
                         var _a2, _b2, _c2, _d2, _e2;
@@ -10553,7 +10551,7 @@ var RegisterForm = ({
                             labelProps: ((_b2 = props.usernameOptions) == null ? void 0 : _b2.label) ? {
                               ...(_c2 = props.usernameOptions) == null ? void 0 : _c2.label
                             } : void 0,
-                            helperText: (_d2 = formState.errors.username) == null ? void 0 : _d2.message,
+                            helperText: (_d2 = methods.formState.errors.username) == null ? void 0 : _d2.message,
                             placeholder: (_e2 = texts == null ? void 0 : texts.username) == null ? void 0 : _e2.placeholder,
                             ...field
                           }
@@ -10566,7 +10564,7 @@ var RegisterForm = ({
               /* @__PURE__ */ React83.createElement(
                 Controller2,
                 {
-                  control,
+                  control: methods.control,
                   name: "password",
                   render: ({ field }) => {
                     var _a2, _b2, _c2;
@@ -10578,7 +10576,7 @@ var RegisterForm = ({
                         autoComplete: "new-password",
                         label: ((_a2 = texts == null ? void 0 : texts.password) == null ? void 0 : _a2.label) || "Password",
                         placeholder: (_b2 = texts == null ? void 0 : texts.password) == null ? void 0 : _b2.placeholder,
-                        helperText: (_c2 = formState.errors.password) == null ? void 0 : _c2.message,
+                        helperText: (_c2 = methods.formState.errors.password) == null ? void 0 : _c2.message,
                         endIcon: /* @__PURE__ */ React83.createElement(
                           "div",
                           {
@@ -10597,7 +10595,7 @@ var RegisterForm = ({
               /* @__PURE__ */ React83.createElement(
                 Controller2,
                 {
-                  control,
+                  control: methods.control,
                   name: "confirm_password",
                   render: ({ field }) => {
                     var _a2, _b2, _c2;
@@ -10609,7 +10607,7 @@ var RegisterForm = ({
                         autoComplete: "new-password",
                         label: ((_a2 = texts == null ? void 0 : texts.confirm) == null ? void 0 : _a2.label) || "Confirm Password",
                         placeholder: ((_b2 = texts == null ? void 0 : texts.confirm) == null ? void 0 : _b2.placeholder) || "Confirm your Password",
-                        helperText: (_c2 = formState.errors.confirm_password) == null ? void 0 : _c2.message,
+                        helperText: (_c2 = methods.formState.errors.confirm_password) == null ? void 0 : _c2.message,
                         endIcon: /* @__PURE__ */ React83.createElement(
                           "div",
                           {
@@ -10629,7 +10627,7 @@ var RegisterForm = ({
               props.showRefCode && /* @__PURE__ */ React83.createElement(
                 Controller2,
                 {
-                  control,
+                  control: methods.control,
                   name: "refCode",
                   render: ({ field }) => {
                     var _a2;
@@ -10639,7 +10637,7 @@ var RegisterForm = ({
                         width: "full",
                         label: texts == null ? void 0 : texts.refCode,
                         placeholder: (texts == null ? void 0 : texts.refCodePlaceholder) || "Enter the referral code",
-                        helperText: (_a2 = formState.errors.refCode) == null ? void 0 : _a2.message,
+                        helperText: (_a2 = methods.formState.errors.refCode) == null ? void 0 : _a2.message,
                         ...field
                       }
                     );
@@ -10649,7 +10647,7 @@ var RegisterForm = ({
               props.showUserSource && /* @__PURE__ */ React83.createElement(
                 Controller2,
                 {
-                  control,
+                  control: methods.control,
                   name: "reference",
                   render: ({ field }) => {
                     var _a2, _b2;
@@ -10683,7 +10681,7 @@ var RegisterForm = ({
               /* @__PURE__ */ React83.createElement(
                 Controller2,
                 {
-                  control,
+                  control: methods.control,
                   name: "phone",
                   render: ({ field }) => {
                     var _a2, _b2;
@@ -10691,7 +10689,7 @@ var RegisterForm = ({
                       PhoneInput,
                       {
                         label: ((_a2 = texts == null ? void 0 : texts.phone) == null ? void 0 : _a2.label) || "Phone Number",
-                        helperText: (_b2 = formState.errors.phone) == null ? void 0 : _b2.message,
+                        helperText: (_b2 = methods.formState.errors.phone) == null ? void 0 : _b2.message,
                         preferredCountry: { label: "+966" },
                         ...props.phoneInputProps,
                         handleChange: (e) => {
@@ -10711,7 +10709,7 @@ var RegisterForm = ({
               props.showRefCode && /* @__PURE__ */ React83.createElement(
                 Controller2,
                 {
-                  control,
+                  control: methods.control,
                   name: "refCode",
                   render: ({ field }) => {
                     var _a2;
@@ -10721,7 +10719,7 @@ var RegisterForm = ({
                         width: "full",
                         label: texts == null ? void 0 : texts.refCode,
                         placeholder: (texts == null ? void 0 : texts.refCodePlaceholder) || "Enter the referral code",
-                        helperText: (_a2 = formState.errors.refCode) == null ? void 0 : _a2.message,
+                        helperText: (_a2 = methods.formState.errors.refCode) == null ? void 0 : _a2.message,
                         ...field
                       }
                     );
@@ -10731,7 +10729,7 @@ var RegisterForm = ({
               props.showUserSource && /* @__PURE__ */ React83.createElement(
                 Controller2,
                 {
-                  control,
+                  control: methods.control,
                   name: "reference",
                   render: ({ field }) => {
                     var _a2, _b2;
@@ -10755,7 +10753,7 @@ var RegisterForm = ({
             showTermsOption || showNewsletterOption ? /* @__PURE__ */ React83.createElement("div", { className: "hawa-flex hawa-flex-col hawa-gap-3 hawa-mb-2" }, showTermsOption && /* @__PURE__ */ React83.createElement(
               Controller2,
               {
-                control,
+                control: methods.control,
                 name: "terms_accepted",
                 render: ({ field }) => {
                   var _a2, _b2;
@@ -10763,7 +10761,7 @@ var RegisterForm = ({
                     Checkbox,
                     {
                       id: "terms_accepted",
-                      helperText: (_b2 = (_a2 = formState.errors.terms_accepted) == null ? void 0 : _a2.message) == null ? void 0 : _b2.toString(),
+                      helperText: (_b2 = (_a2 = methods.formState.errors.terms_accepted) == null ? void 0 : _a2.message) == null ? void 0 : _b2.toString(),
                       onCheckedChange: (e) => field.onChange(e),
                       label: /* @__PURE__ */ React83.createElement("div", { className: "hawa-flex hawa-flex-row hawa-gap-0.5 hawa-whitespace-nowrap hawa-flex-wrap" }, (texts == null ? void 0 : texts.iAcceptText) || "I accept the", " ", /* @__PURE__ */ React83.createElement(StopPropagationWrapper, null, /* @__PURE__ */ React83.createElement(
                         "span",
@@ -10785,7 +10783,7 @@ var RegisterForm = ({
             ), showNewsletterOption && /* @__PURE__ */ React83.createElement(
               Controller2,
               {
-                control,
+                control: methods.control,
                 name: "newsletter_accepted",
                 render: ({ field }) => /* @__PURE__ */ React83.createElement(
                   Checkbox,
@@ -11091,63 +11089,71 @@ var CodeConfirmation = ({ codeLength = 6, ...props }) => {
       }
     };
   }, []);
-  return /* @__PURE__ */ React88.createElement(Card, null, /* @__PURE__ */ React88.createElement(CardContent, { headless: true }, props.showError && /* @__PURE__ */ React88.createElement(Alert, { title: props.errorTitle, text: props.errorText, severity: "error" }), /* @__PURE__ */ React88.createElement("div", { className: "hawa-mb-4 dark:hawa-text-white" }, /* @__PURE__ */ React88.createElement("div", { className: "hawa-text-lg hawa-font-bold" }, ((_c = props.texts) == null ? void 0 : _c.checkYourIdentifier) || "Please check your phone"), /* @__PURE__ */ React88.createElement("div", { className: "hawa-text-muted-foreground hawa-flex hawa-flex-row" }, /* @__PURE__ */ React88.createElement("span", null, `${(_d = props.texts) == null ? void 0 : _d.weSentCode} ` || `We've sent a code to `, /* @__PURE__ */ React88.createElement("span", { dir: "ltr" }, props.identifier)))), /* @__PURE__ */ React88.createElement(
-    "form",
+  return /* @__PURE__ */ React88.createElement(
+    Card,
     {
-      noValidate: true,
-      onSubmit: handleSubmit((e) => {
-        if (props.onConfirm) {
-          return props.onConfirm(e);
-        } else {
-          console.log("Form is submitted but onConfirm prop is missing");
-        }
-      })
+      className: cn(
+        props.cardless && "hawa-border-none hawa-bg-transparent !hawa-shadow-none !hawa-drop-shadow-none"
+      )
     },
-    /* @__PURE__ */ React88.createElement(
-      Controller5,
-      {
-        control,
-        name: "otp_code",
-        render: ({ field }) => {
-          var _a2;
-          return /* @__PURE__ */ React88.createElement(
-            PinInput,
-            {
-              maxLength: codeLength,
-              helperText: (_a2 = formState.errors.otp_code) == null ? void 0 : _a2.message,
-              ...field
-            }
-          );
-        }
-      }
-    ),
-    showResendTimer ? /* @__PURE__ */ React88.createElement("div", { className: "hawa-py-2 hawa-text-center hawa-text-xs hawa-text-muted-foreground" }, (_e = props.texts) == null ? void 0 : _e.resendCodeTimer, " ", /* @__PURE__ */ React88.createElement("strong", null, remainingTime), " ", (_f = props.texts) == null ? void 0 : _f.seconds) : /* @__PURE__ */ React88.createElement("div", { className: "hawa-py-2 hawa-text-center hawa-text-xs hawa-text-muted-foreground" }, /* @__PURE__ */ React88.createElement("span", null, (_h = (_g = props.texts) == null ? void 0 : _g.didntGetCode) != null ? _h : "Didn't get the code?"), " ", /* @__PURE__ */ React88.createElement(
-      "span",
-      {
-        className: "clickable-link",
-        onClick: () => {
-          startResendTimer();
-          props.onResend();
-        }
-      },
-      ((_i = props.texts) == null ? void 0 : _i.resendCode) || "Click to resend"
-    )),
-    /* @__PURE__ */ React88.createElement("div", { className: "hawa-mt-4 hawa-grid hawa-grid-cols-2 hawa-gap-2" }, /* @__PURE__ */ React88.createElement(
-      Button,
+    /* @__PURE__ */ React88.createElement(CardContent, { headless: true, noPadding: props.cardless }, props.showError && /* @__PURE__ */ React88.createElement(Alert, { title: props.errorTitle, text: props.errorText, severity: "error" }), /* @__PURE__ */ React88.createElement("div", { className: "hawa-mb-4 dark:hawa-text-white" }, /* @__PURE__ */ React88.createElement("div", { className: "hawa-text-lg hawa-font-bold" }, ((_c = props.texts) == null ? void 0 : _c.checkYourIdentifier) || "Please check your phone"), /* @__PURE__ */ React88.createElement("div", { className: "hawa-text-muted-foreground hawa-flex hawa-flex-row" }, /* @__PURE__ */ React88.createElement("span", null, `${(_d = props.texts) == null ? void 0 : _d.weSentCode} ` || `We've sent a code to `, /* @__PURE__ */ React88.createElement("span", { dir: "ltr" }, props.identifier)))), /* @__PURE__ */ React88.createElement(
+      "form",
       {
-        type: "button",
-        onClick: () => {
-          if (props.onCancel) {
-            return props.onCancel();
+        noValidate: true,
+        onSubmit: handleSubmit((e) => {
+          if (props.onConfirm) {
+            return props.onConfirm(e);
           } else {
-            console.log("Cancel button clicked but onCancel prop is missing");
+            console.log("Form is submitted but onConfirm prop is missing");
           }
-        },
-        variant: "outline"
+        })
       },
-      ((_j = props.texts) == null ? void 0 : _j.cancel) || "Cancel"
-    ), /* @__PURE__ */ React88.createElement(Button, { isLoading: props.confirmLoading }, ((_k = props.texts) == null ? void 0 : _k.confirm) || "Confirm"))
-  )));
+      /* @__PURE__ */ React88.createElement(
+        Controller5,
+        {
+          control,
+          name: "otp_code",
+          render: ({ field }) => {
+            var _a2;
+            return /* @__PURE__ */ React88.createElement(
+              PinInput,
+              {
+                maxLength: codeLength,
+                helperText: (_a2 = formState.errors.otp_code) == null ? void 0 : _a2.message,
+                ...field
+              }
+            );
+          }
+        }
+      ),
+      showResendTimer ? /* @__PURE__ */ React88.createElement("div", { className: "hawa-py-2 hawa-text-center hawa-text-xs hawa-text-muted-foreground" }, (_e = props.texts) == null ? void 0 : _e.resendCodeTimer, " ", /* @__PURE__ */ React88.createElement("strong", null, remainingTime), " ", (_f = props.texts) == null ? void 0 : _f.seconds) : /* @__PURE__ */ React88.createElement("div", { className: "hawa-py-2 hawa-text-center hawa-text-xs hawa-text-muted-foreground" }, /* @__PURE__ */ React88.createElement("span", null, (_h = (_g = props.texts) == null ? void 0 : _g.didntGetCode) != null ? _h : "Didn't get the code?"), " ", /* @__PURE__ */ React88.createElement(
+        "span",
+        {
+          className: "clickable-link",
+          onClick: () => {
+            startResendTimer();
+            props.onResend();
+          }
+        },
+        ((_i = props.texts) == null ? void 0 : _i.resendCode) || "Click to resend"
+      )),
+      /* @__PURE__ */ React88.createElement("div", { className: "hawa-mt-4 hawa-grid hawa-grid-cols-2 hawa-gap-2" }, /* @__PURE__ */ React88.createElement(
+        Button,
+        {
+          type: "button",
+          onClick: () => {
+            if (props.onCancel) {
+              return props.onCancel();
+            } else {
+              console.log("Cancel button clicked but onCancel prop is missing");
+            }
+          },
+          variant: "outline"
+        },
+        ((_j = props.texts) == null ? void 0 : _j.cancel) || "Cancel"
+      ), /* @__PURE__ */ React88.createElement(Button, { isLoading: props.confirmLoading }, ((_k = props.texts) == null ? void 0 : _k.confirm) || "Confirm"))
+    ))
+  );
 };
 
 // blocks/feedback/UserReferralSource.tsx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sikka/hawa",
-  "version": "0.49.7-next",
+  "version": "0.49.9-next",
   "description": "Modern UI Kit made with Tailwind",
   "author": {
     "name": "Sikka Software",