Merge branch 'master' of github.com:agjs/use-ajv-form

Author: agjs

.prettierrc

@@ -0,0 +1,10 @@
+const config = {
+  semi: true,
+  trailingComma: 'all',
+  singleQuote: true,
+  printWidth: 85,
+  tabWidth: 2,
+  endOfLine: 'auto',
+};
+
+module.exports = config;

.prettierrc.js

@@ -90,5 +90,6 @@
     "json schema validation",
     "use-ajv-form",
     "react form validation"
-  ]
+  ],
+  "packageManager": "pnpm@9.15.2+sha1.0ffb02f94047016ec7e088030337455b4c94bb34"
 }

package.json

@@ -198,10 +198,14 @@ const useAJVForm = <T extends Record<string, any>>(
     );
   }, [state]);
 
-  const isValid = useMemo(
-    () => Object.keys(state).every((key) => !state[key].error),
-    [state],
-  );
+  const isValid = useMemo(() => {
+    const data = Object.keys(state).reduce((acc, inputName) => {
+      acc[inputName as keyof T] = getValue(state[inputName].value) as T[keyof T];
+      return acc;
+    }, {} as T);
+
+    return AJVValidate(data);
+  }, [state]);
 
   useEffect(() => {
     if (!options?.errors || !options.errors.length) {

pnpm-lock.yaml

@@ -969,7 +969,6 @@ describe('useAJVForm with error handling', () => {
     const { result } = renderHook(() => useAJVForm(initialData, schema, { errors }));
 
     expect(result.current.state.title.error).toBe('title is required.');
-    expect(result.current.isValid).toBe(false);
   });
 
   it('should update errors when options.errors changes', () => {
@@ -1003,7 +1002,25 @@ describe('useAJVForm with error handling', () => {
     expect(result.current.state.title.error).toBe(
       'Should be at least 3 characters long.',
     );
+  });
+
+  it('should validate the form correctly', () => {
+    const initialData = { title: '' };
+    const schema: JSONSchemaType<{ title: string }> = {
+      type: 'object',
+      required: ['title'],
+      properties: {
+        title: { type: 'string', minLength: 3 },
+      },
+    };
 
+    const { result } = renderHook(() => useAJVForm(initialData, schema));
     expect(result.current.isValid).toBe(false);
+
+    result.current.set({ title: 'Hi' });
+    expect(result.current.validate().isValid).toBe(false);
+
+    result.current.set({ title: 'Hello' });
+    expect(result.current.validate().isValid).toBe(true);
   });
 });