From 0fec957d704e977806a76e0765ffa78be00f8ef3 Mon Sep 17 00:00:00 2001
From: Xiao Yijun <xiaoyijun@silverhand.io>
Date: Tue, 27 Aug 2024 13:01:33 +0800
Subject: [PATCH] fix(experience): apply form default value to smart input
 filed (#6521)

---
 .../src/components/IdentifierRegisterForm/index.tsx      | 4 ++--
 .../src/components/IdentifierSignInForm/index.tsx        | 4 ++--
 .../src/components/PasswordSignInForm/index.tsx          | 4 ++--
 .../experience/src/components/SingleSignOnForm/index.tsx | 9 +++++++--
 .../pages/ForgotPassword/ForgotPasswordForm/index.tsx    | 4 ++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/packages/experience/src/components/IdentifierRegisterForm/index.tsx b/packages/experience/src/components/IdentifierRegisterForm/index.tsx
index 47265c4ac..e2f88f3f0 100644
--- a/packages/experience/src/components/IdentifierRegisterForm/index.tsx
+++ b/packages/experience/src/components/IdentifierRegisterForm/index.tsx
@@ -121,13 +121,13 @@ const IdentifierRegisterForm = ({ className, autoFocus, signUpMethods }: Props)
             return true;
           },
         }}
-        render={({ field }) => (
+        render={({ field, formState: { defaultValues } }) => (
           <SmartInputField
             autoComplete="off"
             autoFocus={autoFocus}
             className={styles.inputField}
             {...field}
-            defaultValue={field.value.value}
+            defaultValue={defaultValues?.identifier?.value}
             isDanger={!!errors.identifier || !!errorMessage}
             errorMessage={errors.identifier?.message}
             enabledTypes={signUpMethods}
diff --git a/packages/experience/src/components/IdentifierSignInForm/index.tsx b/packages/experience/src/components/IdentifierSignInForm/index.tsx
index ac1d3c8bc..2246033a6 100644
--- a/packages/experience/src/components/IdentifierSignInForm/index.tsx
+++ b/packages/experience/src/components/IdentifierSignInForm/index.tsx
@@ -122,7 +122,7 @@ const IdentifierSignInForm = ({ className, autoFocus, signInMethods }: Props) =>
               : true;
           },
         }}
-        render={({ field }) => (
+        render={({ field, formState: { defaultValues } }) => (
           <SmartInputField
             autoFocus={autoFocus}
             className={styles.inputField}
@@ -130,7 +130,7 @@ const IdentifierSignInForm = ({ className, autoFocus, signInMethods }: Props) =>
             isDanger={!!errors.identifier || !!errorMessage}
             errorMessage={errors.identifier?.message}
             enabledTypes={enabledSignInMethods}
-            defaultValue={field.value.value}
+            defaultValue={defaultValues?.identifier?.value}
           />
         )}
       />
diff --git a/packages/experience/src/components/PasswordSignInForm/index.tsx b/packages/experience/src/components/PasswordSignInForm/index.tsx
index 0b6821678..ef595faee 100644
--- a/packages/experience/src/components/PasswordSignInForm/index.tsx
+++ b/packages/experience/src/components/PasswordSignInForm/index.tsx
@@ -121,7 +121,7 @@ const PasswordSignInForm = ({ className, autoFocus, signInMethods }: Props) => {
             return errorMessage ? getGeneralIdentifierErrorMessage(signInMethods, 'invalid') : true;
           },
         }}
-        render={({ field }) => (
+        render={({ field, formState: { defaultValues } }) => (
           <SmartInputField
             autoFocus={autoFocus}
             className={styles.inputField}
@@ -129,7 +129,7 @@ const PasswordSignInForm = ({ className, autoFocus, signInMethods }: Props) => {
             isDanger={!!errors.identifier}
             errorMessage={errors.identifier?.message}
             enabledTypes={signInMethods}
-            defaultValue={field.value.value}
+            defaultValue={defaultValues?.identifier?.value}
           />
         )}
       />
diff --git a/packages/experience/src/components/SingleSignOnForm/index.tsx b/packages/experience/src/components/SingleSignOnForm/index.tsx
index 22514b01e..56bc68343 100644
--- a/packages/experience/src/components/SingleSignOnForm/index.tsx
+++ b/packages/experience/src/components/SingleSignOnForm/index.tsx
@@ -35,6 +35,11 @@ const SingleSignOnForm = ({ isTermsAndPrivacyCheckboxVisible }: Props) => {
     formState: { errors, isValid, isSubmitting },
   } = useForm<FormState>({
     reValidateMode: 'onBlur',
+    defaultValues: {
+      identifier: {
+        value: ssoEmail,
+      },
+    },
   });
 
   useEffect(() => {
@@ -82,13 +87,13 @@ const SingleSignOnForm = ({ isTermsAndPrivacyCheckboxVisible }: Props) => {
               : true;
           },
         }}
-        render={({ field }) => (
+        render={({ field, formState: { defaultValues } }) => (
           <SmartInputField
             autoFocus
             className={styles.inputField}
             {...field}
             isDanger={!!errors.identifier}
-            defaultValue={ssoEmail}
+            defaultValue={defaultValues?.identifier?.value}
             errorMessage={errors.identifier?.message}
             enabledTypes={[SignInIdentifier.Email]}
           />
diff --git a/packages/experience/src/pages/ForgotPassword/ForgotPasswordForm/index.tsx b/packages/experience/src/pages/ForgotPassword/ForgotPasswordForm/index.tsx
index 293d2661a..07fd8e390 100644
--- a/packages/experience/src/pages/ForgotPassword/ForgotPasswordForm/index.tsx
+++ b/packages/experience/src/pages/ForgotPassword/ForgotPasswordForm/index.tsx
@@ -98,12 +98,12 @@ const ForgotPasswordForm = ({ className, autoFocus, defaultValue = '', enabledTy
             return true;
           },
         }}
-        render={({ field }) => (
+        render={({ field, formState: { defaultValues } }) => (
           <SmartInputField
             autoFocus={autoFocus}
             className={styles.inputField}
             {...field}
-            defaultValue={defaultValue}
+            defaultValue={defaultValues?.identifier?.value}
             isDanger={!!errors.identifier}
             errorMessage={errors.identifier?.message}
             enabledTypes={enabledTypes}