Move inputComponent to signup types

supertokens · Oct 25, 2023 · 8d60068 · 8d60068
1 parent 31d6e29
commit 8d60068
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 17 deletions.
diff --git a/lib/build/recipe/emailpassword/components/themes/signInAndUp/signIn.d.ts b/lib/build/recipe/emailpassword/components/themes/signInAndUp/signIn.d.ts
diff --git a/lib/build/recipe/emailpassword/components/themes/signInAndUp/signInForm.d.ts b/lib/build/recipe/emailpassword/components/themes/signInAndUp/signInForm.d.ts
diff --git a/lib/build/recipe/emailpassword/types.d.ts b/lib/build/recipe/emailpassword/types.d.ts
diff --git a/lib/build/types.d.ts b/lib/build/types.d.ts
diff --git a/lib/ts/recipe/emailpassword/types.ts b/lib/ts/recipe/emailpassword/types.ts
@@ -236,14 +236,23 @@ export type NormalisedEnterEmailForm = FeatureBaseConfig & {
 
 type FormThemeBaseProps = ThemeBaseProps & {
     /*
-     * Form fields to use in the signin form.
+     * Form fields to use in the signup form.
      */
     formFields: FormFieldThemeProps[];
 
     error: string | undefined;
 };
 
-export type SignInThemeProps = FormThemeBaseProps & {
+type SignInFormThemeBaseProps = ThemeBaseProps & {
+    /*
+     * Form fields to use in the signin form. exclude custom component
+     */
+    formFields: Omit<FormFieldThemeProps, "inputComponent">[];
+
+    error: string | undefined;
+};
+
+export type SignInThemeProps = SignInFormThemeBaseProps & {
     recipeImplementation: RecipeInterface;
     clearError: () => void;
     onError: (error: string) => void;
@@ -260,7 +269,6 @@ export type SignUpThemeProps = FormThemeBaseProps & {
     config: NormalisedConfig;
     signInClicked?: () => void;
     onSuccess: (result: { user: User }) => void;
-    formFields: (FormFieldThemeProps & { inputComponent?: React.FC<InputProps> })[];
 };
 
 export type SignInAndUpThemeProps = {
@@ -289,6 +297,11 @@ export type FormFieldThemeProps = NormalisedFormField & {
      * Clears the field after calling the API.
      */
     clearOnSubmit?: boolean;
+
+    /*
+     * Ability to add custom components
+     */
+    inputComponent?: React.FC<InputProps>;
 };
 
 export type FormFieldError = {

diff --git a/lib/ts/types.ts b/lib/ts/types.ts
@@ -13,7 +13,6 @@
  * under the License.
  */
 
-import type { InputProps } from "./recipe/emailpassword/components/library/input";
 import type { BaseRecipeModule } from "./recipe/recipeModule/baseRecipeModule";
 import type { NormalisedConfig as NormalisedRecipeModuleConfig } from "./recipe/recipeModule/types";
 import type { TranslationFunc, TranslationStore } from "./translation/translationHelpers";
@@ -284,11 +283,6 @@ export type NormalisedFormField = {
      * Moves focus to the input element when it mounts
      */
     autofocus?: boolean;
-
-    /*
-     * Ability to add custom components
-     */
-    inputComponent?: React.FC<InputProps>;
 };
 
 export type ReactComponentClass<P = any> = ComponentClass<P, any> | ((props: P) => JSX.Element);