@redneckz/wildless-cms-uni-blocks 0.14.896 → 0.14.897
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/bundle/bundle.umd.js +29 -2
- package/bundle/bundle.umd.min.js +1 -1
- package/bundle/hooks/useForm/useForm.d.ts +2 -0
- package/bundle/ui-kit/FormField/RefWrapper.d.ts +7 -0
- package/dist/hooks/useForm/useForm.d.ts +2 -0
- package/dist/hooks/useForm/useForm.js +17 -0
- package/dist/hooks/useForm/useForm.js.map +1 -1
- package/dist/ui-kit/FormField/RefWrapper.d.ts +7 -0
- package/dist/ui-kit/FormField/RefWrapper.js +16 -0
- package/dist/ui-kit/FormField/RefWrapper.js.map +1 -0
- package/dist/ui-kit/FormField/getField.js +2 -1
- package/dist/ui-kit/FormField/getField.js.map +1 -1
- package/lib/components/OfficesAtmsMap/OfficesAtmsMapLayout.d.ts +1 -1
- package/lib/hooks/useForm/useForm.d.ts +2 -0
- package/lib/hooks/useForm/useForm.js +17 -0
- package/lib/hooks/useForm/useForm.js.map +1 -1
- package/lib/ui-kit/FormField/RefWrapper.d.ts +7 -0
- package/lib/ui-kit/FormField/RefWrapper.js +14 -0
- package/lib/ui-kit/FormField/RefWrapper.js.map +1 -0
- package/lib/ui-kit/FormField/getField.js +2 -1
- package/lib/ui-kit/FormField/getField.js.map +1 -1
- package/mobile/bundle/bundle.umd.js +29 -2
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/bundle/hooks/useForm/useForm.d.ts +2 -0
- package/mobile/bundle/ui-kit/FormField/RefWrapper.d.ts +7 -0
- package/mobile/dist/hooks/useForm/useForm.d.ts +2 -0
- package/mobile/dist/hooks/useForm/useForm.js +17 -0
- package/mobile/dist/hooks/useForm/useForm.js.map +1 -1
- package/mobile/dist/ui-kit/FormField/RefWrapper.d.ts +7 -0
- package/mobile/dist/ui-kit/FormField/RefWrapper.js +16 -0
- package/mobile/dist/ui-kit/FormField/RefWrapper.js.map +1 -0
- package/mobile/dist/ui-kit/FormField/getField.js +2 -1
- package/mobile/dist/ui-kit/FormField/getField.js.map +1 -1
- package/mobile/lib/hooks/useForm/useForm.d.ts +2 -0
- package/mobile/lib/hooks/useForm/useForm.js +17 -0
- package/mobile/lib/hooks/useForm/useForm.js.map +1 -1
- package/mobile/lib/ui-kit/FormField/RefWrapper.d.ts +7 -0
- package/mobile/lib/ui-kit/FormField/RefWrapper.js +14 -0
- package/mobile/lib/ui-kit/FormField/RefWrapper.js.map +1 -0
- package/mobile/lib/ui-kit/FormField/getField.js +2 -1
- package/mobile/lib/ui-kit/FormField/getField.js.map +1 -1
- package/mobile/src/hooks/useForm/useForm.ts +31 -2
- package/mobile/src/ui-kit/FormField/RefWrapper.tsx +20 -0
- package/mobile/src/ui-kit/FormField/getField.tsx +3 -2
- package/package.json +1 -1
- package/src/hooks/useForm/useForm.ts +31 -2
- package/src/ui-kit/FormField/RefWrapper.tsx +20 -0
- package/src/ui-kit/FormField/getField.tsx +3 -2
|
@@ -7,6 +7,8 @@ export interface FieldProps<V> extends ControlProps<V> {
|
|
|
7
7
|
isDirty?: boolean;
|
|
8
8
|
errors?: ValidationInfo;
|
|
9
9
|
error?: ValidationInfo[0];
|
|
10
|
+
setFieldRef?: (_: HTMLDivElement) => void;
|
|
11
|
+
fieldRef?: HTMLDivElement | null;
|
|
10
12
|
}
|
|
11
13
|
export declare type FormFieldRegisterer<FormState> = <N extends keyof FormState, V = FormState[N]>(fieldName: N, options?: FieldOptions<V, FormState[N]>) => FieldProps<V extends undefined ? FormState[N] : V>;
|
|
12
14
|
export interface FormOperators<FormState extends Record<string, any>> {
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { VNode } from '../../model/VNode';
|
|
2
|
+
declare type RefWrapperProps = {
|
|
3
|
+
onFieldRef?: (_: HTMLDivElement) => void;
|
|
4
|
+
children?: VNode;
|
|
5
|
+
};
|
|
6
|
+
export declare const RefWrapper: import("@redneckz/uni-jsx").UNIComponent<RefWrapperProps, any, any>;
|
|
7
|
+
export {};
|
|
@@ -7,6 +7,8 @@ export interface FieldProps<V> extends ControlProps<V> {
|
|
|
7
7
|
isDirty?: boolean;
|
|
8
8
|
errors?: ValidationInfo;
|
|
9
9
|
error?: ValidationInfo[0];
|
|
10
|
+
setFieldRef?: (_: HTMLDivElement) => void;
|
|
11
|
+
fieldRef?: HTMLDivElement | null;
|
|
10
12
|
}
|
|
11
13
|
export declare type FormFieldRegisterer<FormState> = <N extends keyof FormState, V = FormState[N]>(fieldName: N, options?: FieldOptions<V, FormState[N]>) => FieldProps<V extends undefined ? FormState[N] : V>;
|
|
12
14
|
export interface FormOperators<FormState extends Record<string, any>> {
|
|
@@ -6,6 +6,7 @@ const useFormValidator_1 = require("./useFormValidator");
|
|
|
6
6
|
const useNormalizedFormState_1 = require("./useNormalizedFormState");
|
|
7
7
|
function useForm(initialState, { resetOnSubmit, formValidator, normalizer, onChange, onSubmit } = {}) {
|
|
8
8
|
const [formState, setFormState] = (0, useNormalizedFormState_1.useNormalizedFormState)(initialState, normalizer, onChange);
|
|
9
|
+
const fieldRefs = (0, hooks_1.useRef)(getRefsObject(initialState));
|
|
9
10
|
const [isDirtyForm, { setTrue: markAsDirty, setFalse: markAsClean }] = (0, useBool_1.useBool)(false);
|
|
10
11
|
const dirtyFieldsMap = (0, hooks_1.useRef)({});
|
|
11
12
|
const [fieldValidatorsMap, { isValid, errors }] = (0, useFormValidator_1.useFormValidator)(formState, formValidator);
|
|
@@ -16,6 +17,12 @@ function useForm(initialState, { resetOnSubmit, formValidator, normalizer, onCha
|
|
|
16
17
|
const fieldValidator = options?.validator ?? fieldValidatorsMap[fieldName];
|
|
17
18
|
const fieldErrors = isDirty && fieldValidator ? fieldValidator(value) : [];
|
|
18
19
|
return {
|
|
20
|
+
setFieldRef: (_) => {
|
|
21
|
+
if (fieldRefs.current) {
|
|
22
|
+
fieldRefs.current[fieldName] = _;
|
|
23
|
+
}
|
|
24
|
+
},
|
|
25
|
+
fieldRef: fieldRefs.current?.[fieldName],
|
|
19
26
|
value: format ? format(value) : value,
|
|
20
27
|
isDirty,
|
|
21
28
|
errors: fieldValidator && fieldErrors,
|
|
@@ -45,10 +52,20 @@ function useForm(initialState, { resetOnSubmit, formValidator, normalizer, onCha
|
|
|
45
52
|
onSubmit?.(formState, ev);
|
|
46
53
|
}
|
|
47
54
|
else {
|
|
55
|
+
const errorFieldName = getErrorFieldName(formState, fieldValidatorsMap);
|
|
48
56
|
markAsDirty();
|
|
57
|
+
field(errorFieldName).fieldRef?.scrollIntoView({ behavior: 'smooth' });
|
|
49
58
|
}
|
|
50
59
|
}, [resetOnSubmit, formState, isValid, reset, onSubmit]);
|
|
51
60
|
return [formState, { errors, field, update, reset, onSubmit: handleSubmit }];
|
|
52
61
|
}
|
|
53
62
|
exports.useForm = useForm;
|
|
63
|
+
const getRefsObject = (initialState) => Object.keys(initialState).reduce((acc, key) => ({ ...acc, [key]: null }), {});
|
|
64
|
+
const getErrorFieldName = (formState, fieldValidatorsMap = {}) => {
|
|
65
|
+
const [errorFieldName = ''] = Object.entries(formState).find(([fieldName, value]) => {
|
|
66
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
67
|
+
return fieldValidatorsMap[fieldName]?.(value)?.length;
|
|
68
|
+
}) ?? [];
|
|
69
|
+
return errorFieldName;
|
|
70
|
+
};
|
|
54
71
|
//# sourceMappingURL=useForm.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useForm.js","sourceRoot":"","sources":["../../../src/hooks/useForm/useForm.ts"],"names":[],"mappings":";;AAAA,uDAAkE;AAClE,iEAA8D;AAM9D,yDAAsD;AACtD,qEAAkE;
|
|
1
|
+
{"version":3,"file":"useForm.js","sourceRoot":"","sources":["../../../src/hooks/useForm/useForm.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { VNode } from '../../model/VNode';
|
|
2
|
+
declare type RefWrapperProps = {
|
|
3
|
+
onFieldRef?: (_: HTMLDivElement) => void;
|
|
4
|
+
children?: VNode;
|
|
5
|
+
};
|
|
6
|
+
export declare const RefWrapper: import("@redneckz/uni-jsx").UNIComponent<RefWrapperProps, any, any>;
|
|
7
|
+
export {};
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
2
|
+
exports.RefWrapper = void 0;
|
|
3
|
+
const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
|
|
4
|
+
const uni_jsx_1 = require("@redneckz/uni-jsx");
|
|
5
|
+
const hooks_1 = require("@redneckz/uni-jsx/lib/hooks");
|
|
6
|
+
const noop_1 = require("../../utils/noop");
|
|
7
|
+
exports.RefWrapper = (0, uni_jsx_1.JSX)(({ onFieldRef = noop_1.noop, children }) => {
|
|
8
|
+
const ref = (0, hooks_1.useRef)(null);
|
|
9
|
+
(0, hooks_1.useEffect)(() => {
|
|
10
|
+
if (ref.current) {
|
|
11
|
+
onFieldRef(ref.current);
|
|
12
|
+
}
|
|
13
|
+
}, []);
|
|
14
|
+
return (0, jsx_runtime_1.jsx)("div", { ref: ref, children: children });
|
|
15
|
+
});
|
|
16
|
+
//# sourceMappingURL=RefWrapper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RefWrapper.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/RefWrapper.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAgE;AAEhE,2CAAwC;AAO3B,QAAA,UAAU,GAAG,IAAA,aAAG,EAAkB,CAAC,EAAE,UAAU,GAAG,WAAI,EAAE,QAAQ,EAAE,EAAE,EAAE;IACjF,MAAM,GAAG,GAAG,IAAA,cAAM,EAAwB,IAAI,CAAC,CAAC;IAChD,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,GAAG,CAAC,OAAO,EAAE;YACf,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SACzB;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,gCAAK,GAAG,EAAE,GAAG,YAAG,QAAQ,GAAO,CAAC;AACzC,CAAC,CAAC,CAAC"}
|
|
@@ -42,6 +42,7 @@ const UltraPremiumField_1 = require("./Fields/UltraPremiumField");
|
|
|
42
42
|
const VedField_1 = require("./Fields/VedField");
|
|
43
43
|
const _onsentToReceiveMaterialsField_1 = require("./Fields/\u0421onsentToReceiveMaterialsField");
|
|
44
44
|
const getPremium_1 = require("./getPremium");
|
|
45
|
+
const RefWrapper_1 = require("./RefWrapper");
|
|
45
46
|
const shouldRenderField_1 = require("./shouldRenderField");
|
|
46
47
|
const PRODUCT_REF = {
|
|
47
48
|
$ref: '/wcms-resources/outservice-productlist.json',
|
|
@@ -97,7 +98,7 @@ const getField = (field, params, externalInputs = {}) => (input, i) => {
|
|
|
97
98
|
...externalInputs,
|
|
98
99
|
};
|
|
99
100
|
const Component = fieldsRegister[String(input.name)];
|
|
100
|
-
return (0, shouldRenderField_1.shouldRenderField)({ input, field }) && Component ? ((0, jsx_runtime_1.jsx)(
|
|
101
|
+
return (0, shouldRenderField_1.shouldRenderField)({ input, field }) && Component ? ((0, jsx_runtime_1.jsx)(RefWrapper_1.RefWrapper, { onFieldRef: field(input.name ?? '').setFieldRef, children: (0, jsx_runtime_1.jsx)(Component, { field: field, input: input, params: params }) }, String(i))) : null;
|
|
101
102
|
};
|
|
102
103
|
exports.getField = getField;
|
|
103
104
|
//# sourceMappingURL=getField.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getField.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/getField.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getField.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/getField.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,8 @@ export interface FieldProps<V> extends ControlProps<V> {
|
|
|
7
7
|
isDirty?: boolean;
|
|
8
8
|
errors?: ValidationInfo;
|
|
9
9
|
error?: ValidationInfo[0];
|
|
10
|
+
setFieldRef?: (_: HTMLDivElement) => void;
|
|
11
|
+
fieldRef?: HTMLDivElement | null;
|
|
10
12
|
}
|
|
11
13
|
export declare type FormFieldRegisterer<FormState> = <N extends keyof FormState, V = FormState[N]>(fieldName: N, options?: FieldOptions<V, FormState[N]>) => FieldProps<V extends undefined ? FormState[N] : V>;
|
|
12
14
|
export interface FormOperators<FormState extends Record<string, any>> {
|
|
@@ -4,6 +4,7 @@ import { useFormValidator } from './useFormValidator.js';
|
|
|
4
4
|
import { useNormalizedFormState } from './useNormalizedFormState.js';
|
|
5
5
|
export function useForm(initialState, { resetOnSubmit, formValidator, normalizer, onChange, onSubmit } = {}) {
|
|
6
6
|
const [formState, setFormState] = useNormalizedFormState(initialState, normalizer, onChange);
|
|
7
|
+
const fieldRefs = useRef(getRefsObject(initialState));
|
|
7
8
|
const [isDirtyForm, { setTrue: markAsDirty, setFalse: markAsClean }] = useBool(false);
|
|
8
9
|
const dirtyFieldsMap = useRef({});
|
|
9
10
|
const [fieldValidatorsMap, { isValid, errors }] = useFormValidator(formState, formValidator);
|
|
@@ -14,6 +15,12 @@ export function useForm(initialState, { resetOnSubmit, formValidator, normalizer
|
|
|
14
15
|
const fieldValidator = options?.validator ?? fieldValidatorsMap[fieldName];
|
|
15
16
|
const fieldErrors = isDirty && fieldValidator ? fieldValidator(value) : [];
|
|
16
17
|
return {
|
|
18
|
+
setFieldRef: (_) => {
|
|
19
|
+
if (fieldRefs.current) {
|
|
20
|
+
fieldRefs.current[fieldName] = _;
|
|
21
|
+
}
|
|
22
|
+
},
|
|
23
|
+
fieldRef: fieldRefs.current?.[fieldName],
|
|
17
24
|
value: format ? format(value) : value,
|
|
18
25
|
isDirty,
|
|
19
26
|
errors: fieldValidator && fieldErrors,
|
|
@@ -43,9 +50,19 @@ export function useForm(initialState, { resetOnSubmit, formValidator, normalizer
|
|
|
43
50
|
onSubmit?.(formState, ev);
|
|
44
51
|
}
|
|
45
52
|
else {
|
|
53
|
+
const errorFieldName = getErrorFieldName(formState, fieldValidatorsMap);
|
|
46
54
|
markAsDirty();
|
|
55
|
+
field(errorFieldName).fieldRef?.scrollIntoView({ behavior: 'smooth' });
|
|
47
56
|
}
|
|
48
57
|
}, [resetOnSubmit, formState, isValid, reset, onSubmit]);
|
|
49
58
|
return [formState, { errors, field, update, reset, onSubmit: handleSubmit }];
|
|
50
59
|
}
|
|
60
|
+
const getRefsObject = (initialState) => Object.keys(initialState).reduce((acc, key) => ({ ...acc, [key]: null }), {});
|
|
61
|
+
const getErrorFieldName = (formState, fieldValidatorsMap = {}) => {
|
|
62
|
+
const [errorFieldName = ''] = Object.entries(formState).find(([fieldName, value]) => {
|
|
63
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
64
|
+
return fieldValidatorsMap[fieldName]?.(value)?.length;
|
|
65
|
+
}) ?? [];
|
|
66
|
+
return errorFieldName;
|
|
67
|
+
};
|
|
51
68
|
//# sourceMappingURL=useForm.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useForm.js","sourceRoot":"","sources":["../../../src/hooks/useForm/useForm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAM9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"useForm.js","sourceRoot":"","sources":["../../../src/hooks/useForm/useForm.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { VNode } from '../../model/VNode';
|
|
2
|
+
declare type RefWrapperProps = {
|
|
3
|
+
onFieldRef?: (_: HTMLDivElement) => void;
|
|
4
|
+
children?: VNode;
|
|
5
|
+
};
|
|
6
|
+
export declare const RefWrapper: import("@redneckz/uni-jsx").UNIComponent<RefWrapperProps, any, any>;
|
|
7
|
+
export {};
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
|
|
2
|
+
import { JSX } from '@redneckz/uni-jsx';
|
|
3
|
+
import { useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
|
|
4
|
+
import { noop } from '../../utils/noop.js';
|
|
5
|
+
export const RefWrapper = JSX(({ onFieldRef = noop, children }) => {
|
|
6
|
+
const ref = useRef(null);
|
|
7
|
+
useEffect(() => {
|
|
8
|
+
if (ref.current) {
|
|
9
|
+
onFieldRef(ref.current);
|
|
10
|
+
}
|
|
11
|
+
}, []);
|
|
12
|
+
return _jsx("div", { ref: ref, children: children });
|
|
13
|
+
});
|
|
14
|
+
//# sourceMappingURL=RefWrapper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RefWrapper.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/RefWrapper.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAOxC,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAkB,CAAC,EAAE,UAAU,GAAG,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE;IACjF,MAAM,GAAG,GAAG,MAAM,CAAwB,IAAI,CAAC,CAAC;IAChD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,GAAG,CAAC,OAAO,EAAE;YACf,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SACzB;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,cAAK,GAAG,EAAE,GAAG,YAAG,QAAQ,GAAO,CAAC;AACzC,CAAC,CAAC,CAAC"}
|
|
@@ -40,6 +40,7 @@ import { UltraPremiumField } from './Fields/UltraPremiumField.js';
|
|
|
40
40
|
import { VedField } from './Fields/VedField.js';
|
|
41
41
|
import { ConsentToReceiveMaterialsField } from './Fields/СonsentToReceiveMaterialsField.js';
|
|
42
42
|
import { getPremium } from './getPremium.js';
|
|
43
|
+
import { RefWrapper } from './RefWrapper.js';
|
|
43
44
|
import { shouldRenderField } from './shouldRenderField.js';
|
|
44
45
|
const PRODUCT_REF = {
|
|
45
46
|
$ref: '/wcms-resources/outservice-productlist.json',
|
|
@@ -95,6 +96,6 @@ export const getField = (field, params, externalInputs = {}) => (input, i) => {
|
|
|
95
96
|
...externalInputs,
|
|
96
97
|
};
|
|
97
98
|
const Component = fieldsRegister[String(input.name)];
|
|
98
|
-
return shouldRenderField({ input, field }) && Component ? (_jsx(
|
|
99
|
+
return shouldRenderField({ input, field }) && Component ? (_jsx(RefWrapper, { onFieldRef: field(input.name ?? '').setFieldRef, children: _jsx(Component, { field: field, input: input, params: params }) }, String(i))) : null;
|
|
99
100
|
};
|
|
100
101
|
//# sourceMappingURL=getField.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getField.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/getField.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getField.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/getField.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { type ControlProps } from '../../model/ControlProps';
|
|
|
4
4
|
import { type PreventableEvent } from '../../ui-kit/PreventableEvent';
|
|
5
5
|
import { type ValidationInfo } from '../../validation/validator';
|
|
6
6
|
import { type FieldOptions } from './FieldOptions';
|
|
7
|
-
import { type FormOptions } from './FormOptions';
|
|
7
|
+
import { type FieldValidatorsMap, type FormOptions } from './FormOptions';
|
|
8
8
|
import { useFormValidator } from './useFormValidator';
|
|
9
9
|
import { useNormalizedFormState } from './useNormalizedFormState';
|
|
10
10
|
|
|
@@ -12,6 +12,8 @@ export interface FieldProps<V> extends ControlProps<V> {
|
|
|
12
12
|
isDirty?: boolean;
|
|
13
13
|
errors?: ValidationInfo;
|
|
14
14
|
error?: ValidationInfo[0];
|
|
15
|
+
setFieldRef?: (_: HTMLDivElement) => void;
|
|
16
|
+
fieldRef?: HTMLDivElement | null;
|
|
15
17
|
}
|
|
16
18
|
|
|
17
19
|
export type FormFieldRegisterer<FormState> = <N extends keyof FormState, V = FormState[N]>(
|
|
@@ -37,9 +39,9 @@ export function useForm<FormState extends Record<string, any>>(
|
|
|
37
39
|
onChange,
|
|
38
40
|
);
|
|
39
41
|
|
|
42
|
+
const fieldRefs = useRef(getRefsObject<FormState>(initialState));
|
|
40
43
|
const [isDirtyForm, { setTrue: markAsDirty, setFalse: markAsClean }] = useBool(false);
|
|
41
44
|
const dirtyFieldsMap = useRef<Record<string, boolean>>({});
|
|
42
|
-
|
|
43
45
|
const [fieldValidatorsMap, { isValid, errors }] = useFormValidator(formState, formValidator);
|
|
44
46
|
|
|
45
47
|
const field: FormFieldRegisterer<FormState> = useCallback(
|
|
@@ -51,6 +53,12 @@ export function useForm<FormState extends Record<string, any>>(
|
|
|
51
53
|
const fieldErrors: ValidationInfo = isDirty && fieldValidator ? fieldValidator(value) : [];
|
|
52
54
|
|
|
53
55
|
return {
|
|
56
|
+
setFieldRef: (_: HTMLDivElement) => {
|
|
57
|
+
if (fieldRefs.current) {
|
|
58
|
+
fieldRefs.current[fieldName] = _;
|
|
59
|
+
}
|
|
60
|
+
},
|
|
61
|
+
fieldRef: fieldRefs.current?.[fieldName],
|
|
54
62
|
value: format ? (format(value) as FormState[any]) : value,
|
|
55
63
|
isDirty,
|
|
56
64
|
errors: fieldValidator && fieldErrors, // TODO Костыль
|
|
@@ -88,7 +96,9 @@ export function useForm<FormState extends Record<string, any>>(
|
|
|
88
96
|
resetOnSubmit && reset();
|
|
89
97
|
onSubmit?.(formState, ev);
|
|
90
98
|
} else {
|
|
99
|
+
const errorFieldName = getErrorFieldName(formState, fieldValidatorsMap);
|
|
91
100
|
markAsDirty();
|
|
101
|
+
field(errorFieldName).fieldRef?.scrollIntoView({ behavior: 'smooth' });
|
|
92
102
|
}
|
|
93
103
|
},
|
|
94
104
|
[resetOnSubmit, formState, isValid, reset, onSubmit],
|
|
@@ -96,3 +106,22 @@ export function useForm<FormState extends Record<string, any>>(
|
|
|
96
106
|
|
|
97
107
|
return [formState, { errors, field, update, reset, onSubmit: handleSubmit }];
|
|
98
108
|
}
|
|
109
|
+
|
|
110
|
+
const getRefsObject = <FormState extends Record<string, any>>(initialState: FormState) =>
|
|
111
|
+
Object.keys(initialState).reduce(
|
|
112
|
+
(acc, key) => ({ ...acc, [key]: null }),
|
|
113
|
+
{} as Record<keyof FormState, HTMLDivElement | null>,
|
|
114
|
+
);
|
|
115
|
+
|
|
116
|
+
const getErrorFieldName = <FormState extends Record<string, any>>(
|
|
117
|
+
formState: FormState,
|
|
118
|
+
fieldValidatorsMap: FieldValidatorsMap<FormState> = {},
|
|
119
|
+
) => {
|
|
120
|
+
const [errorFieldName = ''] =
|
|
121
|
+
Object.entries(formState).find(([fieldName, value]) => {
|
|
122
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
123
|
+
return fieldValidatorsMap[fieldName]?.(value)?.length;
|
|
124
|
+
}) ?? [];
|
|
125
|
+
|
|
126
|
+
return errorFieldName;
|
|
127
|
+
};
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { JSX } from '@redneckz/uni-jsx';
|
|
2
|
+
import { useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
|
|
3
|
+
import type { VNode } from '../../model/VNode';
|
|
4
|
+
import { noop } from '../../utils/noop';
|
|
5
|
+
|
|
6
|
+
type RefWrapperProps = {
|
|
7
|
+
onFieldRef?: (_: HTMLDivElement) => void;
|
|
8
|
+
children?: VNode;
|
|
9
|
+
};
|
|
10
|
+
|
|
11
|
+
export const RefWrapper = JSX<RefWrapperProps>(({ onFieldRef = noop, children }) => {
|
|
12
|
+
const ref = useRef<HTMLDivElement | null>(null);
|
|
13
|
+
useEffect(() => {
|
|
14
|
+
if (ref.current) {
|
|
15
|
+
onFieldRef(ref.current);
|
|
16
|
+
}
|
|
17
|
+
}, []);
|
|
18
|
+
|
|
19
|
+
return <div ref={ref}>{children}</div>;
|
|
20
|
+
});
|
|
@@ -44,6 +44,7 @@ import { UltraPremiumField } from './Fields/UltraPremiumField';
|
|
|
44
44
|
import { VedField } from './Fields/VedField';
|
|
45
45
|
import { ConsentToReceiveMaterialsField } from './Fields/СonsentToReceiveMaterialsField';
|
|
46
46
|
import { getPremium } from './getPremium';
|
|
47
|
+
import { RefWrapper } from './RefWrapper';
|
|
47
48
|
import { shouldRenderField } from './shouldRenderField';
|
|
48
49
|
|
|
49
50
|
const PRODUCT_REF = {
|
|
@@ -119,8 +120,8 @@ export const getField =
|
|
|
119
120
|
const Component = fieldsRegister[String(input.name)];
|
|
120
121
|
|
|
121
122
|
return shouldRenderField({ input, field }) && Component ? (
|
|
122
|
-
<
|
|
123
|
+
<RefWrapper onFieldRef={field(input.name ?? '').setFieldRef} key={String(i)}>
|
|
123
124
|
<Component field={field} input={input} params={params} />
|
|
124
|
-
</
|
|
125
|
+
</RefWrapper>
|
|
125
126
|
) : null;
|
|
126
127
|
};
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@ import { type ControlProps } from '../../model/ControlProps';
|
|
|
4
4
|
import { type PreventableEvent } from '../../ui-kit/PreventableEvent';
|
|
5
5
|
import { type ValidationInfo } from '../../validation/validator';
|
|
6
6
|
import { type FieldOptions } from './FieldOptions';
|
|
7
|
-
import { type FormOptions } from './FormOptions';
|
|
7
|
+
import { type FieldValidatorsMap, type FormOptions } from './FormOptions';
|
|
8
8
|
import { useFormValidator } from './useFormValidator';
|
|
9
9
|
import { useNormalizedFormState } from './useNormalizedFormState';
|
|
10
10
|
|
|
@@ -12,6 +12,8 @@ export interface FieldProps<V> extends ControlProps<V> {
|
|
|
12
12
|
isDirty?: boolean;
|
|
13
13
|
errors?: ValidationInfo;
|
|
14
14
|
error?: ValidationInfo[0];
|
|
15
|
+
setFieldRef?: (_: HTMLDivElement) => void;
|
|
16
|
+
fieldRef?: HTMLDivElement | null;
|
|
15
17
|
}
|
|
16
18
|
|
|
17
19
|
export type FormFieldRegisterer<FormState> = <N extends keyof FormState, V = FormState[N]>(
|
|
@@ -37,9 +39,9 @@ export function useForm<FormState extends Record<string, any>>(
|
|
|
37
39
|
onChange,
|
|
38
40
|
);
|
|
39
41
|
|
|
42
|
+
const fieldRefs = useRef(getRefsObject<FormState>(initialState));
|
|
40
43
|
const [isDirtyForm, { setTrue: markAsDirty, setFalse: markAsClean }] = useBool(false);
|
|
41
44
|
const dirtyFieldsMap = useRef<Record<string, boolean>>({});
|
|
42
|
-
|
|
43
45
|
const [fieldValidatorsMap, { isValid, errors }] = useFormValidator(formState, formValidator);
|
|
44
46
|
|
|
45
47
|
const field: FormFieldRegisterer<FormState> = useCallback(
|
|
@@ -51,6 +53,12 @@ export function useForm<FormState extends Record<string, any>>(
|
|
|
51
53
|
const fieldErrors: ValidationInfo = isDirty && fieldValidator ? fieldValidator(value) : [];
|
|
52
54
|
|
|
53
55
|
return {
|
|
56
|
+
setFieldRef: (_: HTMLDivElement) => {
|
|
57
|
+
if (fieldRefs.current) {
|
|
58
|
+
fieldRefs.current[fieldName] = _;
|
|
59
|
+
}
|
|
60
|
+
},
|
|
61
|
+
fieldRef: fieldRefs.current?.[fieldName],
|
|
54
62
|
value: format ? (format(value) as FormState[any]) : value,
|
|
55
63
|
isDirty,
|
|
56
64
|
errors: fieldValidator && fieldErrors, // TODO Костыль
|
|
@@ -88,7 +96,9 @@ export function useForm<FormState extends Record<string, any>>(
|
|
|
88
96
|
resetOnSubmit && reset();
|
|
89
97
|
onSubmit?.(formState, ev);
|
|
90
98
|
} else {
|
|
99
|
+
const errorFieldName = getErrorFieldName(formState, fieldValidatorsMap);
|
|
91
100
|
markAsDirty();
|
|
101
|
+
field(errorFieldName).fieldRef?.scrollIntoView({ behavior: 'smooth' });
|
|
92
102
|
}
|
|
93
103
|
},
|
|
94
104
|
[resetOnSubmit, formState, isValid, reset, onSubmit],
|
|
@@ -96,3 +106,22 @@ export function useForm<FormState extends Record<string, any>>(
|
|
|
96
106
|
|
|
97
107
|
return [formState, { errors, field, update, reset, onSubmit: handleSubmit }];
|
|
98
108
|
}
|
|
109
|
+
|
|
110
|
+
const getRefsObject = <FormState extends Record<string, any>>(initialState: FormState) =>
|
|
111
|
+
Object.keys(initialState).reduce(
|
|
112
|
+
(acc, key) => ({ ...acc, [key]: null }),
|
|
113
|
+
{} as Record<keyof FormState, HTMLDivElement | null>,
|
|
114
|
+
);
|
|
115
|
+
|
|
116
|
+
const getErrorFieldName = <FormState extends Record<string, any>>(
|
|
117
|
+
formState: FormState,
|
|
118
|
+
fieldValidatorsMap: FieldValidatorsMap<FormState> = {},
|
|
119
|
+
) => {
|
|
120
|
+
const [errorFieldName = ''] =
|
|
121
|
+
Object.entries(formState).find(([fieldName, value]) => {
|
|
122
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
|
|
123
|
+
return fieldValidatorsMap[fieldName]?.(value)?.length;
|
|
124
|
+
}) ?? [];
|
|
125
|
+
|
|
126
|
+
return errorFieldName;
|
|
127
|
+
};
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { JSX } from '@redneckz/uni-jsx';
|
|
2
|
+
import { useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
|
|
3
|
+
import type { VNode } from '../../model/VNode';
|
|
4
|
+
import { noop } from '../../utils/noop';
|
|
5
|
+
|
|
6
|
+
type RefWrapperProps = {
|
|
7
|
+
onFieldRef?: (_: HTMLDivElement) => void;
|
|
8
|
+
children?: VNode;
|
|
9
|
+
};
|
|
10
|
+
|
|
11
|
+
export const RefWrapper = JSX<RefWrapperProps>(({ onFieldRef = noop, children }) => {
|
|
12
|
+
const ref = useRef<HTMLDivElement | null>(null);
|
|
13
|
+
useEffect(() => {
|
|
14
|
+
if (ref.current) {
|
|
15
|
+
onFieldRef(ref.current);
|
|
16
|
+
}
|
|
17
|
+
}, []);
|
|
18
|
+
|
|
19
|
+
return <div ref={ref}>{children}</div>;
|
|
20
|
+
});
|
|
@@ -44,6 +44,7 @@ import { UltraPremiumField } from './Fields/UltraPremiumField';
|
|
|
44
44
|
import { VedField } from './Fields/VedField';
|
|
45
45
|
import { ConsentToReceiveMaterialsField } from './Fields/СonsentToReceiveMaterialsField';
|
|
46
46
|
import { getPremium } from './getPremium';
|
|
47
|
+
import { RefWrapper } from './RefWrapper';
|
|
47
48
|
import { shouldRenderField } from './shouldRenderField';
|
|
48
49
|
|
|
49
50
|
const PRODUCT_REF = {
|
|
@@ -119,8 +120,8 @@ export const getField =
|
|
|
119
120
|
const Component = fieldsRegister[String(input.name)];
|
|
120
121
|
|
|
121
122
|
return shouldRenderField({ input, field }) && Component ? (
|
|
122
|
-
<
|
|
123
|
+
<RefWrapper onFieldRef={field(input.name ?? '').setFieldRef} key={String(i)}>
|
|
123
124
|
<Component field={field} input={input} params={params} />
|
|
124
|
-
</
|
|
125
|
+
</RefWrapper>
|
|
125
126
|
) : null;
|
|
126
127
|
};
|