coject 2.4.15 → 2.4.17
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/dist/cjs/Components/Input/index.d.ts +2 -0
- package/dist/cjs/Components/Input/index.js +11 -3
- package/dist/cjs/Components/Input/index.js.map +1 -1
- package/dist/esm/Components/Input/index.d.ts +2 -0
- package/dist/esm/Components/Input/index.js +11 -3
- package/dist/esm/Components/Input/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -38,12 +38,12 @@ const Input = ({ name, value, multiline, helperText, validation, required, onCha
|
|
|
38
38
|
const { classes } = (0, theme_1.default)();
|
|
39
39
|
const Methods = (0, react_hook_form_1.useFormContext)() || {};
|
|
40
40
|
const [inputValue, setInputValue] = (0, react_1.useState)(value ?? "");
|
|
41
|
-
const { setValue, control, getValues, setError, clearErrors, formState: { errors } } = (0, react_hook_form_1.useFormContext)() || {};
|
|
41
|
+
const { setValue, control, getValues, watch, setError, clearErrors, formState: { errors } } = (0, react_hook_form_1.useFormContext)() || {};
|
|
42
42
|
// Methods Watching
|
|
43
43
|
(0, react_1.useEffect)(() => {
|
|
44
44
|
control && setInputValue(getValues(name || "default") !== undefined ? getValues(name || "default") : "");
|
|
45
45
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
46
|
-
}, [control, getValues, name]);
|
|
46
|
+
}, [control, getValues, name, watch && watch(name || "default")]);
|
|
47
47
|
// Value
|
|
48
48
|
(0, react_1.useEffect)(() => {
|
|
49
49
|
if (value !== undefined) {
|
|
@@ -62,7 +62,9 @@ const Input = ({ name, value, multiline, helperText, validation, required, onCha
|
|
|
62
62
|
// Error Handling
|
|
63
63
|
(0, react_1.useEffect)(() => {
|
|
64
64
|
const Required = (!!required || !!validation?.required) && !inputValue;
|
|
65
|
+
const Phone = !!validation?.email && !!inputValue && !(/^\d{9}$/.test(`${inputValue}`));
|
|
65
66
|
const Numbers = !!validation?.number && !!inputValue && !(/^[0-9,.]+$/i.test(`${inputValue}`));
|
|
67
|
+
const Email = !!validation?.email && !!inputValue && !(/^[^\s@]+@[^\s@]+\.[a-zA-Z]{2,}$/.test(`${inputValue}`));
|
|
66
68
|
const Arabic = !!validation?.arabic && !!inputValue && !(/^[\u0621-\u064A\u064B-\u0652\u0670\u0671',._\/\-\s]+$/ui.test(`${inputValue}`));
|
|
67
69
|
const English = !!validation?.english && !!inputValue && !(/^[-/_.,'A-Za-z ]+$/i.test(`${inputValue}`));
|
|
68
70
|
const MinNumber = !!validation?.min && !!inputValue && Number(inputValue) < Number((validation.min instanceof Object) ? validation.min.value : validation.min);
|
|
@@ -71,7 +73,7 @@ const Input = ({ name, value, multiline, helperText, validation, required, onCha
|
|
|
71
73
|
const MaxLength = !!validation?.maxLength && !!inputValue && (`${inputValue}`).length > Number((validation.maxLength instanceof Object) ? validation.maxLength.value : validation.maxLength);
|
|
72
74
|
const Pattern = !!validation?.pattern && !!inputValue && ((validation.pattern instanceof Object) ? !((validation?.pattern?.value).test(`${inputValue}`)) : !((validation?.pattern).test(`${inputValue}`)));
|
|
73
75
|
// Clear Errors
|
|
74
|
-
if (!Required && !Numbers && !Arabic && !English && !MinNumber && !MaxNumber && !MinLength && !MaxLength && !Pattern)
|
|
76
|
+
if (!Required && !Numbers && !Arabic && !English && !MinNumber && !MaxNumber && !MinLength && !MaxLength && !Pattern && !Email && !Phone)
|
|
75
77
|
clearErrors(name || "default");
|
|
76
78
|
// Set Errors
|
|
77
79
|
else {
|
|
@@ -87,6 +89,12 @@ const Input = ({ name, value, multiline, helperText, validation, required, onCha
|
|
|
87
89
|
// English
|
|
88
90
|
if (English)
|
|
89
91
|
setError(name || "default", { type: "pattern", message: (validation?.english?.toString() === "true") ? "This Field Just English" : `${validation?.english}` });
|
|
92
|
+
// Email
|
|
93
|
+
if (Email)
|
|
94
|
+
setError(name || "default", { type: "email", message: (validation?.email?.toString() === "true") ? "This Field Just Email" : `${validation?.email}` });
|
|
95
|
+
// Phone
|
|
96
|
+
if (Phone)
|
|
97
|
+
setError(name || "default", { type: "pattern", message: (validation?.phone?.toString() === "true") ? "This Field Just Phone" : `${validation?.phone}` });
|
|
90
98
|
// MinNumber
|
|
91
99
|
if (MinNumber)
|
|
92
100
|
setError(name || "default", { type: "min", message: (validation?.min instanceof Object) ? `${validation.min.message}` : "Less Than The Minimum" });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../resources/Components/Input/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAuD;AAEvD,kBAAkB;AAClB,qDAAiD;AAEjD,cAAc;AACd,4CAA+E;AAE/E,SAAS;AACT,oDAAgC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../resources/Components/Input/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,12 +9,12 @@ export const Input = ({ name, value, multiline, helperText, validation, required
|
|
|
9
9
|
const { classes } = useStyles();
|
|
10
10
|
const Methods = useFormContext() || {};
|
|
11
11
|
const [inputValue, setInputValue] = useState(value ?? "");
|
|
12
|
-
const { setValue, control, getValues, setError, clearErrors, formState: { errors } } = useFormContext() || {};
|
|
12
|
+
const { setValue, control, getValues, watch, setError, clearErrors, formState: { errors } } = useFormContext() || {};
|
|
13
13
|
// Methods Watching
|
|
14
14
|
useEffect(() => {
|
|
15
15
|
control && setInputValue(getValues(name || "default") !== undefined ? getValues(name || "default") : "");
|
|
16
16
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
17
|
-
}, [control, getValues, name]);
|
|
17
|
+
}, [control, getValues, name, watch && watch(name || "default")]);
|
|
18
18
|
// Value
|
|
19
19
|
useEffect(() => {
|
|
20
20
|
if (value !== undefined) {
|
|
@@ -33,7 +33,9 @@ export const Input = ({ name, value, multiline, helperText, validation, required
|
|
|
33
33
|
// Error Handling
|
|
34
34
|
useEffect(() => {
|
|
35
35
|
const Required = (!!required || !!validation?.required) && !inputValue;
|
|
36
|
+
const Phone = !!validation?.email && !!inputValue && !(/^\d{9}$/.test(`${inputValue}`));
|
|
36
37
|
const Numbers = !!validation?.number && !!inputValue && !(/^[0-9,.]+$/i.test(`${inputValue}`));
|
|
38
|
+
const Email = !!validation?.email && !!inputValue && !(/^[^\s@]+@[^\s@]+\.[a-zA-Z]{2,}$/.test(`${inputValue}`));
|
|
37
39
|
const Arabic = !!validation?.arabic && !!inputValue && !(/^[\u0621-\u064A\u064B-\u0652\u0670\u0671',._\/\-\s]+$/ui.test(`${inputValue}`));
|
|
38
40
|
const English = !!validation?.english && !!inputValue && !(/^[-/_.,'A-Za-z ]+$/i.test(`${inputValue}`));
|
|
39
41
|
const MinNumber = !!validation?.min && !!inputValue && Number(inputValue) < Number((validation.min instanceof Object) ? validation.min.value : validation.min);
|
|
@@ -42,7 +44,7 @@ export const Input = ({ name, value, multiline, helperText, validation, required
|
|
|
42
44
|
const MaxLength = !!validation?.maxLength && !!inputValue && (`${inputValue}`).length > Number((validation.maxLength instanceof Object) ? validation.maxLength.value : validation.maxLength);
|
|
43
45
|
const Pattern = !!validation?.pattern && !!inputValue && ((validation.pattern instanceof Object) ? !((validation?.pattern?.value).test(`${inputValue}`)) : !((validation?.pattern).test(`${inputValue}`)));
|
|
44
46
|
// Clear Errors
|
|
45
|
-
if (!Required && !Numbers && !Arabic && !English && !MinNumber && !MaxNumber && !MinLength && !MaxLength && !Pattern)
|
|
47
|
+
if (!Required && !Numbers && !Arabic && !English && !MinNumber && !MaxNumber && !MinLength && !MaxLength && !Pattern && !Email && !Phone)
|
|
46
48
|
clearErrors(name || "default");
|
|
47
49
|
// Set Errors
|
|
48
50
|
else {
|
|
@@ -58,6 +60,12 @@ export const Input = ({ name, value, multiline, helperText, validation, required
|
|
|
58
60
|
// English
|
|
59
61
|
if (English)
|
|
60
62
|
setError(name || "default", { type: "pattern", message: (validation?.english?.toString() === "true") ? "This Field Just English" : `${validation?.english}` });
|
|
63
|
+
// Email
|
|
64
|
+
if (Email)
|
|
65
|
+
setError(name || "default", { type: "email", message: (validation?.email?.toString() === "true") ? "This Field Just Email" : `${validation?.email}` });
|
|
66
|
+
// Phone
|
|
67
|
+
if (Phone)
|
|
68
|
+
setError(name || "default", { type: "pattern", message: (validation?.phone?.toString() === "true") ? "This Field Just Phone" : `${validation?.phone}` });
|
|
61
69
|
// MinNumber
|
|
62
70
|
if (MinNumber)
|
|
63
71
|
setError(name || "default", { type: "min", message: (validation?.min instanceof Object) ? `${validation.min.message}` : "Less Than The Minimum" });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../resources/Components/Input/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAM,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEvD,kBAAkB;AAClB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,cAAc;AACd,OAAO,EAAE,GAAG,EAAE,SAAS,EAAkB,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/E,SAAS;AACT,OAAO,SAAS,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../resources/Components/Input/index.tsx"],"names":[],"mappings":"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"}
|