@uniai-fe/uds-templates 0.1.8 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniai-fe/uds-templates",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "UNIAI Design System; UI Templates Package",
   "type": "module",
   "private": false,

package/src/auth/signup/hooks/useSignupAccountForm.ts

@@ -3,6 +3,8 @@
 import { useMemo } from "react";
 import { useWatch } from "react-hook-form";
 import type { ReactNode } from "react";
+import { DEFAULT_PASSWORD_RULES } from "../../common/password/constants";
+import type { AuthPasswordRule } from "../../common/password/types";
 import type {
   AuthSignupAccountFields,
   AuthSignupAccountValues,
@@ -26,6 +28,7 @@ export function useSignupAccountForm<
   fields,
   form,
   onSubmit,
+  passwordRules,
 }: UseSignupAccountFormOptions<TFields>): UseSignupAccountFormReturn<TFields> {
   const values = useWatch({ control: form.control }) as
     | AuthSignupAccountValues
@@ -82,13 +85,45 @@ export function useSignupAccountForm<
     );
   }, [confirmFieldName, fields, form, passwordFieldName]);
 
+  const passwordValue =
+    (values?.[passwordFieldName] as string | undefined) ?? "";
+  const confirmPasswordValue =
+    (values?.[confirmFieldName] as string | undefined) ?? "";
+
+  const normalizedPasswordRules: AuthPasswordRule[] =
+    passwordRules && passwordRules.length > 0
+      ? passwordRules
+      : DEFAULT_PASSWORD_RULES;
+
+  const arePasswordRulesFulfilled =
+    normalizedPasswordRules.length > 0
+      ? normalizedPasswordRules.every(rule => {
+          if (typeof rule.fulfilled === "boolean") {
+            return rule.fulfilled;
+          }
+          if (typeof rule.predicate === "function") {
+            return rule.predicate(passwordValue);
+          }
+          return false;
+        })
+      : true;
+
+  const isConfirmMatched =
+    passwordValue.trim().length > 0 &&
+    confirmPasswordValue.trim().length > 0 &&
+    confirmPasswordValue === passwordValue;
+
   const trimmedFilled =
     values &&
     Object.values(values).every(value =>
       typeof value === "string" ? value.trim().length > 0 : false,
     );
 
-  const disabled = form.formState.isSubmitting || !trimmedFilled;
+  const disabled =
+    form.formState.isSubmitting ||
+    !trimmedFilled ||
+    !arePasswordRulesFulfilled ||
+    !isConfirmMatched;
 
   const onSubmitHandler = form.handleSubmit(onSubmit);
 

package/src/auth/signup/markup/AccountForm.tsx

@@ -47,17 +47,6 @@ export function AuthSignupAccountForm({
     defaultValues,
   });
 
-  const {
-    register,
-    helpers,
-    disabled,
-    onSubmit: handleSubmit,
-  } = useSignupAccountForm({
-    fields,
-    form,
-    onSubmit,
-  });
-
   const passwordFieldName =
     (fields.password.attr?.name as keyof AuthSignupAccountValues | undefined) ??
     ("password" as keyof AuthSignupAccountValues);
@@ -71,6 +60,18 @@ export function AuthSignupAccountForm({
       ? passwordRules
       : DEFAULT_PASSWORD_RULES;
 
+  const {
+    register,
+    helpers,
+    disabled,
+    onSubmit: handleSubmit,
+  } = useSignupAccountForm({
+    fields,
+    form,
+    onSubmit,
+    passwordRules: resolvedPasswordRules,
+  });
+
   return (
     <FormProvider {...form}>
       <form

package/src/auth/signup/markup/Template.tsx

@@ -5,7 +5,6 @@ import type {
   AuthSignupStepIndicatorItem,
   AuthSignupTemplateProps,
 } from "../types";
-import type { AuthSignupStepId } from "../types";
 import { AuthSignupUserInfoForm } from "./UserInfoForm";
 import { AuthSignupVerificationForm } from "./VerificationForm";
 import { AuthSignupAccountForm } from "./AccountForm";
@@ -19,13 +18,6 @@ const DEFAULT_STEPS: AuthSignupStepIndicatorItem[] = [
   { id: "complete", label: "완료" },
 ];
 
-const STEP_INDEX: Record<AuthSignupStepId, number> = {
-  userInfo: 0,
-  verifyAgreement: 1,
-  generateAccount: 2,
-  complete: 3,
-};
-
 /**
  * 회원가입 템플릿; Step1~4 화면을 AuthContainer 위에서 전환한다.
  * @component

package/src/auth/signup/types/hooks.ts

@@ -1,5 +1,6 @@
 import type { ReactNode } from "react";
 import type { InputState } from "@uniai-fe/uds-primitives";
+import type { AuthPasswordRule } from "../../common/password/types";
 import type {
   AuthSignupFieldProps,
   AuthSignupUserInfoFields,
@@ -73,6 +74,7 @@ export interface UseSignupAccountFormOptions<
   fields: TFields;
   form: UseFormReturn<AuthSignupAccountValues>;
   onSubmit: SubmitHandler<AuthSignupAccountValues>;
+  passwordRules?: AuthPasswordRule[];
 }
 
 export interface UseSignupAccountFormReturn<