react-form-manage 1.0.6-beta.2 → 1.0.6-beta.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -2,6 +2,18 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file.
4
4
 
5
+ ## [1.0.6-beta.4] - 2026-01-22
6
+
7
+ - Update README with validation rule examples (pattern, async validator)
8
+ - Remove Vite template boilerplate from docs
9
+
10
+ ## [1.0.6-beta.3] - 2026-01-22
11
+
12
+ - Add `ValidationRule` typing and export
13
+ - Support custom regex `pattern` in validation
14
+ - Update usage docs with numeric-only example
15
+ - Add demo field `numericCode` using pattern rule
16
+
5
17
  ## [1.0.6-beta.2] - 2026-01-22
6
18
 
7
19
  - Fix TypeScript prop types for all components
package/README.md CHANGED
@@ -72,6 +72,8 @@ export default Example;
72
72
 
73
73
  `Form` sẽ đăng ký form instance trong store nội bộ và inject `value` / `onChange` vào các children của `FormItem`.
74
74
 
75
+ `ValidationRule` là type public được export để bạn mô tả rules rõ ràng trong TypeScript.
76
+
75
77
  ---
76
78
 
77
79
  ## Form API / Programmatic usage
@@ -108,6 +110,48 @@ Methods available on the form instance (populated by `Form` provider):
108
110
 
109
111
  ---
110
112
 
113
+ ## Validation rules
114
+
115
+ Hỗ trợ các rule phổ biến: `required`, `min`, `max`, `len`, `pattern`, `enum`, `whitespace`, `type` và custom `validator`. `pattern` nhận `RegExp`; `validator` nhận hàm sync/async `(value, ctx) => void | Promise<void>`.
116
+
117
+ Ví dụ pattern + required:
118
+
119
+ ```tsx
120
+ <Form formName="codeForm" initialValues={{ numericCode: "" }}>
121
+ <FormItem
122
+ name="numericCode"
123
+ rules={[
124
+ { required: true, message: "Code is required" },
125
+ { pattern: /^\d+$/, message: "Only digits are allowed" },
126
+ ]}
127
+ >
128
+ <Input placeholder="Enter digits only" />
129
+ </FormItem>
130
+ <button type="submit">Submit</button>
131
+ </Form>
132
+ ```
133
+
134
+ Custom validator (async):
135
+
136
+ ```tsx
137
+ <FormItem
138
+ name="username"
139
+ rules={[
140
+ {
141
+ validator: async (value) => {
142
+ if (!value) throw new Error("Username required");
143
+ const exists = await api.checkUser(value);
144
+ if (exists) throw new Error("Username already taken");
145
+ },
146
+ },
147
+ ]}
148
+ >
149
+ <Input placeholder="Username" />
150
+ </FormItem>
151
+ ```
152
+
153
+ ---
154
+
111
155
  ## FormList (Array field)
112
156
 
113
157
  `FormList` là render-prop component cung cấp `listFields` và các action `add`, `remove`, `move`.
@@ -186,20 +230,3 @@ Nếu bạn muốn tự sinh `.d.ts` từ JS, có thể thêm `tsconfig.types.js
186
230
  ## License
187
231
 
188
232
  Mặc định chưa thêm license — nếu muốn public, hãy thêm `LICENSE` (ví dụ MIT).
189
-
190
- # React + Vite
191
-
192
- This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
193
-
194
- Currently, two official plugins are available:
195
-
196
- - [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) (or [oxc](https://oxc.rs) when used in [rolldown-vite](https://vite.dev/guide/rolldown)) for Fast Refresh
197
- - [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
198
-
199
- ## React Compiler
200
-
201
- The React Compiler is not enabled on this template because of its impact on dev & build performances. To add it, see [this documentation](https://react.dev/learn/react-compiler/installation).
202
-
203
- ## Expanding the ESLint configuration
204
-
205
- If you are developing a production application, we recommend using TypeScript with type-aware lint rules enabled. Check out the [TS template](https://github.com/vitejs/vite/tree/main/packages/create-vite/template-react-ts) for information on how to integrate TypeScript and [`typescript-eslint`](https://typescript-eslint.io) in your project.
@@ -1,11 +1,12 @@
1
1
  import type { ReactElement } from "react";
2
+ import type { ValidationRule } from "../../types/public";
2
3
  export interface FormItemProps {
3
4
  children: ReactElement;
4
5
  name: string;
5
6
  formName?: string;
6
7
  initialValue?: any;
7
8
  formItemId?: string;
8
- rules?: any[];
9
+ rules?: ValidationRule[];
9
10
  valuePropName?: string;
10
11
  getValueFromEvent?: (event: any) => any;
11
12
  }
@@ -1,5 +1,6 @@
1
1
  import { type RefObject } from "react";
2
2
  import type { FormInstance } from "../stores/formStore";
3
+ import type { ValidationRule } from "../types/public";
3
4
  type AnyObject = Record<string, any>;
4
5
  interface UseFormItemControlProps {
5
6
  formName?: string;
@@ -7,7 +8,7 @@ interface UseFormItemControlProps {
7
8
  name?: string;
8
9
  initialValue?: any;
9
10
  formItemId?: string;
10
- rules?: any[];
11
+ rules?: ValidationRule[];
11
12
  elementRef?: RefObject<any> | null;
12
13
  }
13
14
  interface UseFormItemControlReturn {
@@ -8,12 +8,14 @@ import { useFormCleanUp, useFormListeners, useFormStore, } from "../stores/formS
8
8
  const VALID_PREMITIVE_TYPE = ["string", "number", "undefined"];
9
9
  export default function useFormItemControl({ formName, form, name, initialValue, formItemId, rules, elementRef, }) {
10
10
  const contextForm = useFormContext();
11
- const { value, setData, getCacheData, getFormValues } = useFormStore(useShallow((state) => {
11
+ const { value, setData, getCacheData, getFormValues, getFormState, isStateInitied, } = useFormStore(useShallow((state) => {
12
12
  return {
13
13
  value: get(state.forms, `${formName || form?.formName || contextForm?.formName}.${name}`),
14
14
  setData: state.setData,
15
15
  getCacheData: state.getCacheData,
16
16
  getFormValues: state.getFormValues,
17
+ getFormState: state.getFormState,
18
+ isStateInitied: state.formStates?.[formName || form?.formName || contextForm?.formName]?.isInitied,
17
19
  };
18
20
  }));
19
21
  const { setCleanUpStack } = useFormCleanUp(useShallow((state) => ({
@@ -53,6 +55,7 @@ export default function useFormItemControl({ formName, form, name, initialValue,
53
55
  // value
54
56
  // );
55
57
  setInitData(formName || form?.formName || contextForm?.formName, name, value);
58
+ onChange(value, { notTriggerDirty: true });
56
59
  };
57
60
  const onFocus = () => {
58
61
  setListener({
@@ -171,6 +174,14 @@ export default function useFormItemControl({ formName, form, name, initialValue,
171
174
  }
172
175
  }
173
176
  }
177
+ // Custom pattern
178
+ if (r.pattern && !r.pattern.test(fieldValue || "")) {
179
+ listErrors.push({
180
+ ruleName,
181
+ message: r.message,
182
+ });
183
+ return;
184
+ }
174
185
  // Password
175
186
  if (r.isPassword && !IS_PASSWORD_REGEX.test(fieldValue)) {
176
187
  // tempMessage.push(IS_PASSWORD_INVALID_MESSAGE);
@@ -319,18 +330,22 @@ export default function useFormItemControl({ formName, form, name, initialValue,
319
330
  // console.log({ internalInitValue, value, initialValue });
320
331
  // console.log("Init item value: ", name, value, internalInitValue);
321
332
  // console.log("internalInitValue: ", internalInitValue);
322
- if (!value) {
323
- if (!internalInitValue) {
324
- if (!isNil(initialValue)) {
325
- console.log("On init data", initialValue);
326
- onInitData(initialValue);
333
+ if (isStateInitied) {
334
+ // console.log("Skip set init data when form is resetting");
335
+ if (isNil(value)) {
336
+ if (isNil(internalInitValue)) {
337
+ if (isNil(initialValue)) {
338
+ console.log("On init data", initialValue);
339
+ onInitData(initialValue);
340
+ }
341
+ }
342
+ else {
343
+ onChange(internalInitValue, { notTriggerDirty: true });
327
344
  }
328
345
  }
329
- else {
330
- onChange(internalInitValue);
331
- }
346
+ return;
332
347
  }
333
- }, [internalInitValue]);
348
+ }, [isStateInitied]);
334
349
  useEffect(() => {
335
350
  if (!listener) {
336
351
  setListener({
package/dist/index.d.ts CHANGED
@@ -1,9 +1,9 @@
1
- import Form, { useForm, useWatch, useSubmitDataWatch, useFormStateWatch, type FormProps } from "./providers/Form";
1
+ import Form, { useForm, useWatch, useSubmitDataWatch, useFormStateWatch, type FormProps, type ValidationRule } from "./providers/Form";
2
2
  import FormItem, { type FormItemProps } from "./components/Form/FormItem";
3
3
  import FormList, { type FormListProps } from "./components/Form/FormList";
4
4
  import Input from "./components/Input";
5
5
  import InputWrapper, { type InputWrapperProps } from "./components/Form/InputWrapper";
6
6
  import useFormItemControl from "./hooks/useFormItemControl";
7
7
  import useFormListControl from "./hooks/useFormListControl";
8
- export { Form, FormItem, FormList, Input, InputWrapper, useFormItemControl, useFormListControl, useForm, useWatch, useSubmitDataWatch, useFormStateWatch, type FormProps, type FormItemProps, type FormListProps, type InputWrapperProps, };
8
+ export { Form, FormItem, FormList, Input, InputWrapper, useFormItemControl, useFormListControl, useForm, useWatch, useSubmitDataWatch, useFormStateWatch, type FormProps, type FormItemProps, type FormListProps, type InputWrapperProps, type ValidationRule, };
9
9
  export default Form;
@@ -1,7 +1,8 @@
1
- import type { ReactNode, ComponentType, FormHTMLAttributes } from "react";
1
+ import type { ComponentType, FormHTMLAttributes, ReactNode } from "react";
2
2
  import type { PublicFormInstance } from "../types/public";
3
+ export type { ValidationRule } from "../types/public";
3
4
  export declare const FormContext: import("react").Context<any>;
4
- export interface FormProps<T = any> extends Omit<FormHTMLAttributes<HTMLFormElement>, 'onSubmit'> {
5
+ export interface FormProps<T = any> extends Omit<FormHTMLAttributes<HTMLFormElement>, "onSubmit"> {
5
6
  children: ReactNode;
6
7
  formName: string;
7
8
  initialValues?: T;
@@ -9,8 +9,9 @@ import { useFormListeners, useFormStore } from "../stores/formStore";
9
9
  import { getAllNoneObjStringPath } from "../utils/obj.util";
10
10
  export const FormContext = createContext(null);
11
11
  export default function Form({ children, formName, initialValues, onFinish, onReject, onFinally, FormElement, ...props }) {
12
- const { getFormItemValue, setInitData, setData, getFormValues, setFormState, setFormInstance, revokeFormInstance, setSubmitHistory, clearFormValues, clearFormInitialValues, clearFormState, } = useFormStore(useShallow((state) => ({
13
- setInitData: state.setFormInitData,
12
+ const { appInitValue, getFormItemValue, setInitData, setData, getFormValues, setFormState, setFormInstance, revokeFormInstance, setSubmitHistory, clearFormValues, clearFormInitialValues, clearFormState, } = useFormStore(useShallow((state) => ({
13
+ appInitValue: state.initialValues,
14
+ setInitData: state.setInitData,
14
15
  getFormValues: state.getFormValues,
15
16
  setFormState: state.setFormState,
16
17
  setFormInstance: state.setFormInstance,
@@ -237,7 +238,19 @@ export default function Form({ children, formName, initialValues, onFinish, onRe
237
238
  });
238
239
  };
239
240
  useEffect(() => {
240
- setInitData(formName, initialValues);
241
+ // set initial values
242
+ if (initialValues) {
243
+ const allStringPath = getAllNoneObjStringPath(initialValues);
244
+ allStringPath.forEach((p) => {
245
+ // console.log(
246
+ // "Set initial value for form",
247
+ // formName,
248
+ // p,
249
+ // get(initialValues, p),
250
+ // );
251
+ setInitData(formName, p, get(initialValues, p));
252
+ });
253
+ }
241
254
  setFormState({
242
255
  formName,
243
256
  isInitied: true,
@@ -262,6 +275,9 @@ export default function Form({ children, formName, initialValues, onFinish, onRe
262
275
  clearFormState(formName);
263
276
  };
264
277
  }, []);
278
+ // useEffect(() => {
279
+ // // console.log("Form appInitValue changed", appInitValue);
280
+ // }, [appInitValue]);
265
281
  return (_jsxs(FormContext.Provider, { value: {
266
282
  formName,
267
283
  }, children: [FormElement ? (_jsx(FormElement, { onSubmit: (e) => {
@@ -281,7 +297,8 @@ export function useFormContext() {
281
297
  return c;
282
298
  }
283
299
  export function useForm(formNameOrFormInstance) {
284
- const targetFormName = typeof formNameOrFormInstance === "object" && formNameOrFormInstance !== null
300
+ const targetFormName = typeof formNameOrFormInstance === "object" &&
301
+ formNameOrFormInstance !== null
285
302
  ? formNameOrFormInstance.formName
286
303
  : formNameOrFormInstance;
287
304
  const formInstance = useFormStore((state) => {
@@ -1,14 +1,17 @@
1
1
  export interface FormInstance {
2
2
  formName: string;
3
- resetFields?: any;
4
- submit?: any;
5
- submitAsync?: any;
6
- setFieldValue?: any;
7
- setFieldValues?: any;
8
- getFieldValue?: any;
9
- getFieldValues?: any;
10
- getFieldErrors?: any;
11
- setFieldFocus?: any;
3
+ resetFields: (values?: any) => void;
4
+ submit: (values?: any) => void;
5
+ submitAsync: (values?: any) => Promise<any>;
6
+ setFieldValue: (name: string, value: any, options?: any) => void;
7
+ setFieldValues: (values: Record<string, any>, options?: any) => void;
8
+ getFieldValue: (name: string) => any;
9
+ getFieldValues: (names?: string[]) => Array<{
10
+ name: string;
11
+ value: any;
12
+ }>;
13
+ getFieldErrors: () => Record<string, any>;
14
+ setFieldFocus: (name: string) => void;
12
15
  }
13
16
  interface FormStoreState {
14
17
  forms: Record<string, any>;
@@ -126,7 +126,7 @@ export const useFormStore = create((storeSet, storeGet) => ({
126
126
  setInitData(formName, name, value) {
127
127
  return storeSet(produce((state) => {
128
128
  const oldValues = state.initialValues;
129
- // console.log("Inner init: ", `${formName}.${name}`, value);
129
+ console.log("Inner init: ", `${formName}.${name}`, value);
130
130
  set(oldValues, `${formName}.${name}`, value);
131
131
  }));
132
132
  },
@@ -1,14 +1,42 @@
1
1
  export type FormValues<T = any> = T;
2
+ export interface ValidationRule<T = any, TValues = any> {
3
+ name?: string;
4
+ message: string;
5
+ handler?: (value: T, formValues: TValues) => boolean | Promise<boolean>;
6
+ required?: boolean;
7
+ min?: number;
8
+ max?: number;
9
+ minLength?: number;
10
+ maxLength?: number;
11
+ isPassword?: boolean;
12
+ isUsername?: boolean;
13
+ isPhoneNumber?: boolean;
14
+ isStringNumber?: boolean;
15
+ isPositiveStringNumber?: boolean;
16
+ isPositiveIntegerStringNumber?: boolean;
17
+ isEmail?: boolean;
18
+ isVietnameseName?: boolean;
19
+ isNoSpaceStringAndNumber?: boolean;
20
+ isStringAndNumber?: boolean;
21
+ isNoSpaceOnlyAlphabetStringAndNumber?: boolean;
22
+ isOnlyAlphabetStringAndNumber?: boolean;
23
+ isNoSpaceAlphabetString?: boolean;
24
+ pattern?: RegExp;
25
+ }
2
26
  export interface PublicFormInstance<T = any> {
3
27
  formName: string;
4
- resetFields?: (values?: Partial<T>) => void;
5
- submit?: (values?: T) => void;
6
- submitAsync?: (values?: T) => Promise<any>;
7
- setFieldValue?: (name: keyof T & string, value: any) => void;
8
- setFieldValues?: (values: Partial<T>) => void;
9
- getFieldValue?: (name: keyof T & string) => any;
10
- getFieldValues?: () => T;
11
- getFieldErrors?: () => Record<string, any>;
28
+ resetFields: (values?: Partial<T>) => void;
29
+ submit: (values?: T) => void;
30
+ submitAsync: (values?: T) => Promise<any>;
31
+ setFieldValue: (name: keyof T & string, value: any, options?: any) => void;
32
+ setFieldValues: (values: Partial<T>, options?: any) => void;
33
+ getFieldValue: (name: keyof T & string) => any;
34
+ getFieldValues: (names?: Array<keyof T & string>) => Array<{
35
+ name: string;
36
+ value: any;
37
+ }>;
38
+ getFieldErrors: () => Record<string, any>;
39
+ setFieldFocus: (name: keyof T & string) => void;
12
40
  }
13
41
  export interface UseFormItemProps<T = any> {
14
42
  formName?: string;
@@ -16,7 +44,7 @@ export interface UseFormItemProps<T = any> {
16
44
  name?: keyof T & string;
17
45
  initialValue?: any;
18
46
  formItemId?: string;
19
- rules?: any[];
47
+ rules?: ValidationRule<any, T>[];
20
48
  }
21
49
  export interface UseFormItemReturn<T = any> {
22
50
  value: T | undefined;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-form-manage",
3
- "version": "1.0.6-beta.2",
3
+ "version": "1.0.6-beta.4",
4
4
  "description": "Lightweight React form management with list and listener support.",
5
5
  "license": "MIT",
6
6
  "type": "module",
package/src/App.tsx CHANGED
@@ -1,6 +1,7 @@
1
1
  import { Button, Input } from "antd";
2
2
  import { useEffect } from "react";
3
3
  import FormItem from "./components/Form/FormItem";
4
+ import FormList from "./components/Form/FormList";
4
5
  import InputWrapper from "./components/Form/InputWrapper";
5
6
  import Form, { useForm } from "./providers/Form";
6
7
 
@@ -9,14 +10,19 @@ const App = () => {
9
10
 
10
11
  useEffect(() => {
11
12
  if (form) {
12
- setTimeout(() => {
13
- form.setFieldValue("TestData", "HelloWorld");
14
- }, 500);
13
+ // setTimeout(() => {
14
+ // form.setFieldValue("TestData", "HelloWorld");
15
+ // }, 500);
15
16
  }
16
17
  }, [form]);
17
18
  return (
18
19
  <div>
19
20
  <Form
21
+ initialValues={{
22
+ TestData: "",
23
+ numericCode: "",
24
+ arr: [{ el: "Item 1" }, { el: "Item 2" }],
25
+ }}
20
26
  onFinish={(values) => {
21
27
  console.log(values);
22
28
  }}
@@ -27,7 +33,72 @@ const App = () => {
27
33
  <Input />
28
34
  </InputWrapper>
29
35
  </FormItem>
36
+
37
+ <FormItem
38
+ name={"numericCode"}
39
+ rules={[
40
+ { required: true, message: "Vui lòng nhập mã" },
41
+ {
42
+ pattern: /^\d+$/,
43
+ message: "Chỉ cho phép chuỗi số",
44
+ },
45
+ ]}
46
+ >
47
+ <InputWrapper>
48
+ <Input placeholder="Mã chỉ gồm số" style={{ width: 200 }} />
49
+ </InputWrapper>
50
+ </FormItem>
51
+ <FormList
52
+ initialValues={[
53
+ {
54
+ el: "",
55
+ },
56
+ ]}
57
+ name="arr"
58
+ >
59
+ {(fields, { add, remove, move }) => (
60
+ <div>
61
+ {fields.map((field, index) => (
62
+ <div key={field.key} style={{ marginBottom: 8 }}>
63
+ <FormItem name={`${field.name}.el`}>
64
+ <InputWrapper>
65
+ <Input placeholder="Item value" style={{ width: 200 }} />
66
+ </InputWrapper>
67
+ </FormItem>
68
+ <Button
69
+ onClick={() => remove({ index })}
70
+ style={{ marginLeft: 8 }}
71
+ >
72
+ Remove
73
+ </Button>
74
+ {index > 0 && (
75
+ <Button
76
+ onClick={() => move({ from: index, to: index - 1 })}
77
+ style={{ marginLeft: 8 }}
78
+ >
79
+ Move Up
80
+ </Button>
81
+ )}
82
+ {index < fields.length - 1 && (
83
+ <Button
84
+ onClick={() => move({ from: index, to: index + 1 })}
85
+ style={{ marginLeft: 8 }}
86
+ >
87
+ Move Down
88
+ </Button>
89
+ )}
90
+ </div>
91
+ ))}
92
+ <Button onClick={() => add(fields.length)}>Add Item</Button>
93
+ </div>
94
+ )}
95
+ </FormList>
30
96
  <Button htmlType="submit">Submit</Button>
97
+ <Button
98
+ onClick={() => {
99
+ form?.resetFields?.();
100
+ }}
101
+ ></Button>
31
102
  </Form>
32
103
  </div>
33
104
  );
@@ -1,5 +1,6 @@
1
1
  import { cloneElement, useRef, useState } from "react";
2
2
  import type { ReactElement } from "react";
3
+ import type { ValidationRule } from "../../types/public";
3
4
  import { v4 } from "uuid";
4
5
  import useFormItemControl from "../../hooks/useFormItemControl";
5
6
 
@@ -9,7 +10,7 @@ export interface FormItemProps {
9
10
  formName?: string;
10
11
  initialValue?: any;
11
12
  formItemId?: string;
12
- rules?: any[];
13
+ rules?: ValidationRule[];
13
14
  valuePropName?: string;
14
15
  getValueFromEvent?: (event: any) => any;
15
16
  }
@@ -25,6 +25,7 @@ import {
25
25
  } from "../stores/formStore";
26
26
 
27
27
  import type { FormInstance } from "../stores/formStore";
28
+ import type { ValidationRule } from "../types/public";
28
29
 
29
30
  type AnyObject = Record<string, any>;
30
31
 
@@ -34,7 +35,7 @@ interface UseFormItemControlProps {
34
35
  name?: string;
35
36
  initialValue?: any;
36
37
  formItemId?: string;
37
- rules?: any[];
38
+ rules?: ValidationRule[];
38
39
  elementRef?: RefObject<any> | null;
39
40
  }
40
41
 
@@ -59,7 +60,14 @@ export default function useFormItemControl<T = any>({
59
60
  elementRef,
60
61
  }: UseFormItemControlProps): UseFormItemControlReturn {
61
62
  const contextForm = useFormContext();
62
- const { value, setData, getCacheData, getFormValues } = useFormStore(
63
+ const {
64
+ value,
65
+ setData,
66
+ getCacheData,
67
+ getFormValues,
68
+ getFormState,
69
+ isStateInitied,
70
+ } = useFormStore(
63
71
  useShallow((state) => {
64
72
  return {
65
73
  value: get(
@@ -69,6 +77,11 @@ export default function useFormItemControl<T = any>({
69
77
  setData: state.setData,
70
78
  getCacheData: state.getCacheData,
71
79
  getFormValues: state.getFormValues,
80
+ getFormState: state.getFormState,
81
+ isStateInitied:
82
+ state.formStates?.[
83
+ formName || form?.formName || contextForm?.formName
84
+ ]?.isInitied,
72
85
  };
73
86
  }),
74
87
  );
@@ -130,6 +143,7 @@ export default function useFormItemControl<T = any>({
130
143
  name,
131
144
  value,
132
145
  );
146
+ onChange(value, { notTriggerDirty: true });
133
147
  };
134
148
 
135
149
  const onFocus = () => {
@@ -283,6 +297,16 @@ export default function useFormItemControl<T = any>({
283
297
  }
284
298
  }
285
299
 
300
+ // Custom pattern
301
+ if (r.pattern && !r.pattern.test(fieldValue || "")) {
302
+ listErrors.push({
303
+ ruleName,
304
+ message: r.message,
305
+ });
306
+
307
+ return;
308
+ }
309
+
286
310
  // Password
287
311
  if (r.isPassword && !IS_PASSWORD_REGEX.test(fieldValue)) {
288
312
  // tempMessage.push(IS_PASSWORD_INVALID_MESSAGE);
@@ -478,17 +502,22 @@ export default function useFormItemControl<T = any>({
478
502
  // console.log("Init item value: ", name, value, internalInitValue);
479
503
  // console.log("internalInitValue: ", internalInitValue);
480
504
 
481
- if (!value) {
482
- if (!internalInitValue) {
483
- if (!isNil(initialValue)) {
484
- console.log("On init data", initialValue);
485
- onInitData(initialValue);
505
+ if (isStateInitied) {
506
+ // console.log("Skip set init data when form is resetting");
507
+
508
+ if (isNil(value)) {
509
+ if (isNil(internalInitValue)) {
510
+ if (isNil(initialValue)) {
511
+ console.log("On init data", initialValue);
512
+ onInitData(initialValue);
513
+ }
514
+ } else {
515
+ onChange(internalInitValue, { notTriggerDirty: true });
486
516
  }
487
- } else {
488
- onChange(internalInitValue);
489
517
  }
518
+ return;
490
519
  }
491
- }, [internalInitValue]);
520
+ }, [isStateInitied]);
492
521
 
493
522
  useEffect(() => {
494
523
  if (!listener) {
package/src/index.ts CHANGED
@@ -4,6 +4,7 @@ import Form, {
4
4
  useSubmitDataWatch,
5
5
  useFormStateWatch,
6
6
  type FormProps,
7
+ type ValidationRule,
7
8
  } from "./providers/Form";
8
9
 
9
10
  import FormItem, { type FormItemProps } from "./components/Form/FormItem";
@@ -30,6 +31,7 @@ export {
30
31
  type FormItemProps,
31
32
  type FormListProps,
32
33
  type InputWrapperProps,
34
+ type ValidationRule,
33
35
  };
34
36
 
35
37
  export default Form;