@gaozh1024/rn-kit 0.2.0-beta.0 → 0.2.0

package/dist/index.mjs

@@ -2117,6 +2117,17 @@ var styles5 = StyleSheet5.create({
   }
 });
 
+// src/ui/form/group.ts
+var toggleGroupValue = (values, optionValue, checked) => {
+  if (checked) {
+    return values.includes(optionValue) ? values : [...values, optionValue];
+  }
+  return values.filter((value) => value !== optionValue);
+};
+var isGroupOptionDisabled = (groupDisabled, optionDisabled) => {
+  return groupDisabled || Boolean(optionDisabled);
+};
+
 // src/ui/form/CheckboxGroup.tsx
 import { jsx as jsx21 } from "nativewind/jsx-runtime";
 function CheckboxGroup({
@@ -2128,18 +2139,15 @@ function CheckboxGroup({
 }) {
   const handleChange = (optionValue, checked) => {
     if (!onChange) return;
-    if (checked) {
-      onChange([...value, optionValue]);
-    } else {
-      onChange(value.filter((v) => v !== optionValue));
-    }
+    onChange(toggleGroupValue(value, optionValue, checked));
   };
-  return /* @__PURE__ */ jsx21(AppView, { row: direction === "row", flex: direction === "row", gap: 4, children: options.map((option) => /* @__PURE__ */ jsx21(
+  const isRow = direction === "row";
+  return /* @__PURE__ */ jsx21(AppView, { row: isRow, flex: isRow, gap: 4, children: options.map((option) => /* @__PURE__ */ jsx21(
     Checkbox,
     {
       checked: value.includes(option.value),
       onChange: (checked) => handleChange(option.value, checked),
-      disabled: disabled || option.disabled,
+      disabled: isGroupOptionDisabled(disabled, option.disabled),
       children: option.label
     },
     option.value
@@ -2226,12 +2234,13 @@ function RadioGroup({
   direction = "column",
   disabled = false
 }) {
-  return /* @__PURE__ */ jsx23(AppView, { row: direction === "row", flex: direction === "row", gap: 4, children: options.map((option) => /* @__PURE__ */ jsx23(
+  const isRow = direction === "row";
+  return /* @__PURE__ */ jsx23(AppView, { row: isRow, flex: isRow, gap: 4, children: options.map((option) => /* @__PURE__ */ jsx23(
     Radio,
     {
       checked: value === option.value,
       onChange: () => onChange?.(option.value),
-      disabled: disabled || option.disabled,
+      disabled: isGroupOptionDisabled(disabled, option.disabled),
       children: option.label
     },
     option.value
@@ -3092,10 +3101,21 @@ function FormItem({
 
 // src/ui/form/useForm.ts
 import { useState as useState19, useCallback as useCallback15, useMemo as useMemo7 } from "react";
-function useForm({
-  schema,
-  defaultValues
-}) {
+var getIssuePath = (issue) => issue.path.map(String).join(".");
+var getFieldError = (issues, name) => {
+  const exactIssue = issues.find((issue) => getIssuePath(issue) === name);
+  if (exactIssue) return exactIssue.message;
+  const nestedIssue = issues.find((issue) => issue.path[0] === name);
+  return nestedIssue?.message;
+};
+var buildFormErrors = (issues) => {
+  return issues.reduce((acc, issue) => {
+    const path = getIssuePath(issue);
+    acc[path || "root"] = issue.message;
+    return acc;
+  }, {});
+};
+function useForm({ schema, defaultValues }) {
   const [values, setValues] = useState19(defaultValues);
   const [errors, setErrors] = useState19({});
   const [isSubmitting, setIsSubmitting] = useState19(false);
@@ -3105,14 +3125,21 @@ function useForm({
   const isValid = useMemo7(() => {
     return Object.keys(errors).length === 0;
   }, [errors]);
-  const setValue = useCallback15((name, value) => {
-    setValues((prev) => ({ ...prev, [name]: value }));
+  const clearFieldError = useCallback15((name) => {
     setErrors((prev) => {
+      if (!(name in prev)) return prev;
       const next = { ...prev };
       delete next[name];
       return next;
     });
   }, []);
+  const setValue = useCallback15(
+    (name, value) => {
+      setValues((prev) => ({ ...prev, [name]: value }));
+      clearFieldError(name);
+    },
+    [clearFieldError]
+  );
   const getValue = useCallback15(
     (name) => {
       return values[name];
@@ -3121,42 +3148,33 @@ function useForm({
   );
   const validateField = useCallback15(
     async (name) => {
-      try {
-        const shape = schema.shape;
-        if (shape && shape[name]) {
-          await shape[name].parseAsync(values[name]);
-          setErrors((prev) => {
-            const next = { ...prev };
-            delete next[name];
-            return next;
-          });
-          return true;
-        }
+      const fieldName = name;
+      const result = await schema.safeParseAsync(values);
+      if (result.success) {
+        clearFieldError(fieldName);
+        return true;
+      }
+      const errorMessage = getFieldError(result.error.issues, fieldName);
+      if (!errorMessage) {
+        clearFieldError(fieldName);
         return true;
-      } catch (error) {
-        setErrors((prev) => ({
-          ...prev,
-          [name]: error.errors?.[0]?.message || "\u9A8C\u8BC1\u5931\u8D25"
-        }));
-        return false;
       }
+      setErrors((prev) => ({
+        ...prev,
+        [fieldName]: errorMessage
+      }));
+      return false;
     },
-    [schema, values]
+    [schema, values, clearFieldError]
   );
   const validate = useCallback15(async () => {
-    try {
-      await schema.parseAsync(values);
+    const result = await schema.safeParseAsync(values);
+    if (result.success) {
       setErrors({});
       return true;
-    } catch (error) {
-      const formErrors = {};
-      error.errors?.forEach((err) => {
-        const path = err.path.join(".");
-        formErrors[path] = err.message;
-      });
-      setErrors(formErrors);
-      return false;
     }
+    setErrors(buildFormErrors(result.error.issues));
+    return false;
   }, [schema, values]);
   const reset = useCallback15(() => {
     setValues(defaultValues);