@redneckz/wildless-cms-uni-blocks 0.14.674 → 0.14.675
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 +9 -5
- package/bundle/bundle.umd.min.js +1 -1
- package/dist/ui-kit/FormField/Fields/AddressFactField.js +1 -1
- package/dist/ui-kit/FormField/Fields/AddressFactField.js.map +1 -1
- package/dist/ui-kit/FormField/validators.js +3 -2
- package/dist/ui-kit/FormField/validators.js.map +1 -1
- package/dist/ui-kit/Input/InputControl.js +4 -1
- package/dist/ui-kit/Input/InputControl.js.map +1 -1
- package/lib/ui-kit/FormField/Fields/AddressFactField.js +1 -1
- package/lib/ui-kit/FormField/Fields/AddressFactField.js.map +1 -1
- package/lib/ui-kit/FormField/validators.js +3 -2
- package/lib/ui-kit/FormField/validators.js.map +1 -1
- package/lib/ui-kit/Input/InputControl.js +4 -1
- package/lib/ui-kit/Input/InputControl.js.map +1 -1
- package/mobile/bundle/bundle.umd.js +9 -5
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/dist/ui-kit/FormField/Fields/AddressFactField.js +1 -1
- package/mobile/dist/ui-kit/FormField/Fields/AddressFactField.js.map +1 -1
- package/mobile/dist/ui-kit/FormField/validators.js +3 -2
- package/mobile/dist/ui-kit/FormField/validators.js.map +1 -1
- package/mobile/dist/ui-kit/Input/InputControl.js +4 -1
- package/mobile/dist/ui-kit/Input/InputControl.js.map +1 -1
- package/mobile/lib/ui-kit/FormField/Fields/AddressFactField.js +1 -1
- package/mobile/lib/ui-kit/FormField/Fields/AddressFactField.js.map +1 -1
- package/mobile/lib/ui-kit/FormField/validators.js +3 -2
- package/mobile/lib/ui-kit/FormField/validators.js.map +1 -1
- package/mobile/lib/ui-kit/Input/InputControl.js +4 -1
- package/mobile/lib/ui-kit/Input/InputControl.js.map +1 -1
- package/mobile/src/ui-kit/FormField/Fields/AddressFactField.tsx +1 -1
- package/mobile/src/ui-kit/FormField/validators.ts +4 -3
- package/mobile/src/ui-kit/Input/InputControl.tsx +5 -2
- package/package.json +1 -1
- package/src/ui-kit/FormField/Fields/AddressFactField.tsx +1 -1
- package/src/ui-kit/FormField/validators.ts +4 -3
- package/src/ui-kit/Input/InputControl.tsx +5 -2
|
@@ -14,7 +14,7 @@ exports.AddressFactField = (0, uni_jsx_1.JSX)(({ field, input }) => {
|
|
|
14
14
|
if (value) {
|
|
15
15
|
field('addressFact')?.onChange?.(field('addressRegistration').value);
|
|
16
16
|
}
|
|
17
|
-
}, [value]);
|
|
17
|
+
}, [value, field('addressRegistration').value]);
|
|
18
18
|
const onDaDataChange = (0, hooks_1.useCallback)((item) => {
|
|
19
19
|
field?.(fieldName)?.onChange?.({
|
|
20
20
|
apartment: item?.data?.flat,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddressFactField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/AddressFactField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAqE;AAErE,2DAAwD;AAExD,8DAAqD;AACrD,oDAAiD;AAEpC,QAAA,gBAAgB,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IACzE,MAAM,SAAS,GAAG,aAAa,CAAC;IAChC,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC;IAC1C,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC;IAExC,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,KAAK,CAAC,CAAC;SACtE;IACH,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AddressFactField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/AddressFactField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAqE;AAErE,2DAAwD;AAExD,8DAAqD;AACrD,oDAAiD;AAEpC,QAAA,gBAAgB,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IACzE,MAAM,SAAS,GAAG,aAAa,CAAC;IAChC,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC;IAC1C,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC;IAExC,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,KAAK,CAAC,CAAC;SACtE;IACH,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAEhD,MAAM,cAAc,GAAG,IAAA,mBAAW,EAAC,CAAC,IAAsB,EAAE,EAAE;QAC5D,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;YAC7B,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAC3B,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YACtB,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;YACpC,WAAW,EAAE,IAAI,EAAE,KAAK;YACxB,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO;YAC7B,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK;YACxB,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,oBAAoB;YAC1C,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK;YAClC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW;YACjC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM;YAC1B,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;YAC1F,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK;YACzB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;YAClB,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW;YACnC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ;SAC9B,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC,CAAC,GAAW,EAAE,EAAE;QAC3C,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;YAC7B,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK;YACzB,WAAW,EAAE,GAAG;SACjB,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,uBAAC,2BAAY,IACX,KAAK,EAAC,gCAAO,EACb,QAAQ,EAAE,KAAK,KACX,IAAA,6BAAa,EAAC,KAAK,CAAC,SAAS,CAAC,EAAE,iCAAY,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,EAC7E,KAAK,EAAE,UAAU,CAAC,WAAW,EAC7B,QAAQ,EAAE,QAAQ,KACd,KAAK,EACT,cAAc,EAAE,cAAc,GAC9B,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -4,6 +4,7 @@ const pattern_1 = require("../../validation/pattern");
|
|
|
4
4
|
const required_1 = require("../../validation/required");
|
|
5
5
|
const validator_1 = require("../../validation/validator");
|
|
6
6
|
const ERROR_MESSAGE = 'Некорректно заполненное поле';
|
|
7
|
+
const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
|
|
7
8
|
const defaultValidator = (errorMsg) => (0, required_1.required)(errorMsg ?? ERROR_MESSAGE);
|
|
8
9
|
exports.defaultValidator = defaultValidator;
|
|
9
10
|
const defaultSelectValidator = (errorMsg) => (0, validator_1.validator)((_) => _?.key && _?.key !== '')(errorMsg ?? ERROR_MESSAGE);
|
|
@@ -46,9 +47,9 @@ const emailValidate = (email) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2,4}$/.test(email);
|
|
|
46
47
|
const emailValidator = (errorMsg) => (0, validator_1.validator)((_) => emailValidate(_))(errorMsg);
|
|
47
48
|
exports.emailValidator = emailValidator;
|
|
48
49
|
const addressDaDataValidate = (address) => Boolean(address.region && address.city && address.house);
|
|
49
|
-
const addressDaDataValidator = () => (0, validator_1.validator)(addressDaDataValidate)(
|
|
50
|
+
const addressDaDataValidator = () => (0, validator_1.validator)(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
|
|
50
51
|
exports.addressDaDataValidator = addressDaDataValidator;
|
|
51
|
-
const addressOrganizationValidator = () => (0, validator_1.validator)((address) => Boolean(address.fiasCode && address.city && address.house))(
|
|
52
|
+
const addressOrganizationValidator = () => (0, validator_1.validator)((address) => Boolean(address.fiasCode && address.city && address.house))(ADDRESS_ERROR_MESSAGE);
|
|
52
53
|
exports.addressOrganizationValidator = addressOrganizationValidator;
|
|
53
54
|
const codeWordValidator = (errorMsg) => (0, validator_1.validator)((_) => typeof _ === 'string' && _.length >= 3 && _.length <= 21 && isCyrillic(_))(errorMsg ?? ERROR_MESSAGE);
|
|
54
55
|
exports.codeWordValidator = codeWordValidator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/validators.ts"],"names":[],"mappings":";;AACA,sDAAmD;AACnD,wDAAqD;AACrD,0DAAuD;AAEvD,MAAM,aAAa,GAAG,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/validators.ts"],"names":[],"mappings":";;AACA,sDAAmD;AACnD,wDAAqD;AACrD,0DAAuD;AAEvD,MAAM,aAAa,GAAG,8BAA8B,CAAC;AAErD,MAAM,qBAAqB,GAAG,oDAAoD,CAAC;AAE5E,MAAM,gBAAgB,GAAG,CAAC,QAAiB,EAAE,EAAE,CAAC,IAAA,mBAAQ,EAAC,QAAQ,IAAI,aAAa,CAAC,CAAC;AAA9E,QAAA,gBAAgB,oBAA8D;AAEpF,MAAM,sBAAsB,GAAG,CAAC,QAAiB,EAAE,EAAE,CAC1D,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,QAAQ,IAAI,aAAa,CAAC,CAAC;AAD1D,QAAA,sBAAsB,0BACoC;AAEhE,MAAM,kBAAkB,GAAG,CAAC,QAAiB,EAAE,EAAE,CACtD,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CACtE,QAAQ,IAAI,aAAa,CAC1B,CAAC;AAHS,QAAA,kBAAkB,sBAG3B;AAEG,MAAM,aAAa,GAAG,CAAC,QAAiB,EAAE,EAAE,CACjD,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CACtE,QAAQ,IAAI,aAAa,CAC1B,CAAC;AAHS,QAAA,aAAa,iBAGtB;AAEG,MAAM,qBAAqB,GAAG,CAAC,WAAmB,EAAE,QAAiB,EAAE,EAAE,CAC9E,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,WAAW,CAAC,CACjF,QAAQ,IAAI,aAAa,CAC1B,CAAC;AAHS,QAAA,qBAAqB,yBAG9B;AAEG,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAE,EAAE,CACjD,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AADzD,QAAA,cAAc,kBAC2C;AAE/D,MAAM,eAAe,GAAG,CAAC,QAAgB,EAAE,EAAE,CAClD,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AADzD,QAAA,eAAe,mBAC0C;AAE/D,MAAM,YAAY,GAAG,CAAC,QAAgB,EAAE,EAAE,CAC/C,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,EAAE,IAAI,CAAC,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AAD/E,QAAA,YAAY,gBACmE;AAErF,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAE,EAAE,CACjD,IAAA,iBAAO,EAAC,wEAAwE,CAAC,CAAC,QAAQ,CAAC,CAAC;AADjF,QAAA,cAAc,kBACmE;AAEjF,QAAA,kBAAkB,GAAG,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,CAC7E,sBAAsB,CACvB,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE;IACtC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAClD,IAAI,GAAG,CAAC,MAAM,KAAK,EAAE,EAAE;QACrB,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC1B,QAAQ,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;SAC/C;QACD,IAAI,QAAQ,GAAG,GAAG,EAAE;YAClB,QAAQ,GAAG,QAAQ,GAAG,GAAG,CAAC;SAC3B;QACD,IAAI,QAAQ,KAAK,GAAG,IAAI,QAAQ,KAAK,GAAG,EAAE;YACxC,QAAQ,GAAG,CAAC,CAAC;SACd;QAED,OAAO,QAAQ,KAAK,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;KAC7C;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEK,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAE,EAAE,CAAC,IAAA,qBAAS,EAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,CAAC;AAA1E,QAAA,cAAc,kBAA4D;AAEvF,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,kCAAkC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAEjF,MAAM,cAAc,GAAG,CAAC,QAAgB,EAAE,EAAE,CACjD,IAAA,qBAAS,EAAC,CAAC,CAAS,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AAD1C,QAAA,cAAc,kBAC4B;AAEvD,MAAM,qBAAqB,GAAG,CAAC,OAAgB,EAAE,EAAE,CACjD,OAAO,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC;AAEpD,MAAM,sBAAsB,GAAG,GAAG,EAAE,CAAC,IAAA,qBAAS,EAAC,qBAAqB,CAAC,CAAC,qBAAqB,CAAC,CAAC;AAAvF,QAAA,sBAAsB,0BAAiE;AAE7F,MAAM,4BAA4B,GAAG,GAAG,EAAE,CAC/C,IAAA,qBAAS,EAAC,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CACzF,qBAAqB,CACtB,CAAC;AAHS,QAAA,4BAA4B,gCAGrC;AAEG,MAAM,iBAAiB,GAAG,CAAC,QAAiB,EAAE,EAAE,CACrD,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,EAAE,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CACzF,QAAQ,IAAI,aAAa,CAC1B,CAAC;AAHS,QAAA,iBAAiB,qBAG1B;AAEJ,MAAM,eAAe,GAAG,uBAAuB,CAAC;AAEhD,MAAM,UAAU,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC"}
|
|
@@ -14,7 +14,10 @@ const useInputPopup_1 = require("./useInputPopup");
|
|
|
14
14
|
exports.InputControl = (0, uni_jsx_1.JSX)(({ className, label, value = '', placeholder, error, errors, onChange = noop_1.noop, onDaDataChange, onBlur, isTextarea, type, name = '', daDataQueryPrefix, maxLength, dadata = false, disabled = false, }) => {
|
|
15
15
|
const [isOpen, { setFalse: close, setTrue: open }] = (0, useBool_1.useBool)();
|
|
16
16
|
const popupRef = (0, useOutsideClick_1.useOutsideClick)(close);
|
|
17
|
-
const handleChange = (0, hooks_1.useCallback)((v) =>
|
|
17
|
+
const handleChange = (0, hooks_1.useCallback)((v) => {
|
|
18
|
+
dadata && !isOpen && open();
|
|
19
|
+
maxLength ? v.length <= maxLength && onChange(v) : onChange(v);
|
|
20
|
+
}, [dadata, isOpen, onChange]);
|
|
18
21
|
const inputRef = (0, useInputPopup_1.useInputPopup)({
|
|
19
22
|
isOpen: isOpen && dadata,
|
|
20
23
|
name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InputControl.js","sourceRoot":"","sources":["../../../src/ui-kit/Input/InputControl.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAA0D;AAC1D,iEAA8D;AAC9D,iFAA8E;AAC9E,mEAAgE;AAChE,2CAAwC;AACxC,6CAA0C;AAC1C,mCAAgC;AAEhC,uDAAoD;AACpD,mDAAgD;AAEnC,QAAA,YAAY,GAAG,IAAA,aAAG,EAC7B,CAAC,EACC,SAAS,EACT,KAAK,EACL,KAAK,GAAG,EAAE,EACV,WAAW,EACX,KAAK,EACL,MAAM,EACN,QAAQ,GAAG,WAAI,EACf,cAAc,EACd,MAAM,EACN,UAAU,EACV,IAAI,EACJ,IAAI,GAAG,EAAE,EACT,iBAAiB,EACjB,SAAS,EACT,MAAM,GAAG,KAAK,EACd,QAAQ,GAAG,KAAK,GACjB,EAAE,EAAE;IACH,MAAM,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,GAAG,IAAA,iBAAO,GAAE,CAAC;IAC/D,MAAM,QAAQ,GAAG,IAAA,iCAAe,EAAiB,KAAK,CAAC,CAAC;IAExD,MAAM,YAAY,GAAG,IAAA,mBAAW,EAC9B,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,SAAS,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"InputControl.js","sourceRoot":"","sources":["../../../src/ui-kit/Input/InputControl.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAA0D;AAC1D,iEAA8D;AAC9D,iFAA8E;AAC9E,mEAAgE;AAChE,2CAAwC;AACxC,6CAA0C;AAC1C,mCAAgC;AAEhC,uDAAoD;AACpD,mDAAgD;AAEnC,QAAA,YAAY,GAAG,IAAA,aAAG,EAC7B,CAAC,EACC,SAAS,EACT,KAAK,EACL,KAAK,GAAG,EAAE,EACV,WAAW,EACX,KAAK,EACL,MAAM,EACN,QAAQ,GAAG,WAAI,EACf,cAAc,EACd,MAAM,EACN,UAAU,EACV,IAAI,EACJ,IAAI,GAAG,EAAE,EACT,iBAAiB,EACjB,SAAS,EACT,MAAM,GAAG,KAAK,EACd,QAAQ,GAAG,KAAK,GACjB,EAAE,EAAE;IACH,MAAM,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,GAAG,IAAA,iBAAO,GAAE,CAAC;IAC/D,MAAM,QAAQ,GAAG,IAAA,iCAAe,EAAiB,KAAK,CAAC,CAAC;IAExD,MAAM,YAAY,GAAG,IAAA,mBAAW,EAC9B,CAAC,CAAS,EAAE,EAAE;QACZ,MAAM,IAAI,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;QAC5B,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,SAAS,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACjE,CAAC,EACD,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAC3B,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAA,6BAAa,EAAC;QAC7B,MAAM,EAAE,MAAM,IAAI,MAAM;QACxB,IAAI;QACJ,KAAK;QACL,iBAAiB;QACjB,QAAQ;QACR,cAAc;KACf,CAAC,CAAC;IAEH,OAAO,CACL,iCACE,SAAS,EAAE,IAAA,aAAK,EAAC,iBAAiB,EAAE,SAAS,CAAC,EAC9C,GAAG,EAAE,QAAQ,EACb,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,IAAI,aAEb,gCAAK,GAAG,EAAE,QAAQ,YAChB,uBAAC,aAAK,IACJ,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,IAAI,IAAI,MAAM,gBACR,KAAK,EACjB,KAAK,EAAE,IAAA,mCAAgB,EAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAC1C,KAAK,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,EACtB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,GACvD,GACE,EACL,IAAA,iCAAe,EAAC,KAAK,CAAC,IACnB,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,WAAoB,EAAE,MAAiB,EAAE,KAAc,EAAE,EAAE,CACjF,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,WAAW,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC"}
|
|
@@ -12,7 +12,7 @@ export const AddressFactField = JSX(({ field, input }) => {
|
|
|
12
12
|
if (value) {
|
|
13
13
|
field('addressFact')?.onChange?.(field('addressRegistration').value);
|
|
14
14
|
}
|
|
15
|
-
}, [value]);
|
|
15
|
+
}, [value, field('addressRegistration').value]);
|
|
16
16
|
const onDaDataChange = useCallback((item) => {
|
|
17
17
|
field?.(fieldName)?.onChange?.({
|
|
18
18
|
apartment: item?.data?.flat,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddressFactField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/AddressFactField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IACzE,MAAM,SAAS,GAAG,aAAa,CAAC;IAChC,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC;IAC1C,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC;IAExC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,KAAK,CAAC,CAAC;SACtE;IACH,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AddressFactField.js","sourceRoot":"","sources":["../../../../src/ui-kit/FormField/Fields/AddressFactField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IACzE,MAAM,SAAS,GAAG,aAAa,CAAC;IAChC,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC;IAC1C,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC;IAExC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,KAAK,CAAC,CAAC;SACtE;IACH,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAEhD,MAAM,cAAc,GAAG,WAAW,CAAC,CAAC,IAAsB,EAAE,EAAE;QAC5D,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;YAC7B,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAC3B,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YACtB,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;YACpC,WAAW,EAAE,IAAI,EAAE,KAAK;YACxB,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO;YAC7B,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK;YACxB,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,oBAAoB;YAC1C,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK;YAClC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW;YACjC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM;YAC1B,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;YAC1F,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK;YACzB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;YAClB,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW;YACnC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ;SAC9B,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,GAAW,EAAE,EAAE;QAC3C,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;YAC7B,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK;YACzB,WAAW,EAAE,GAAG;SACjB,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,KAAC,YAAY,IACX,KAAK,EAAC,gCAAO,EACb,QAAQ,EAAE,KAAK,KACX,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,EAC7E,KAAK,EAAE,UAAU,CAAC,WAAW,EAC7B,QAAQ,EAAE,QAAQ,KACd,KAAK,EACT,cAAc,EAAE,cAAc,GAC9B,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { pattern } from '../../validation/pattern.js';
|
|
|
2
2
|
import { required } from '../../validation/required.js';
|
|
3
3
|
import { validator } from '../../validation/validator.js';
|
|
4
4
|
const ERROR_MESSAGE = 'Некорректно заполненное поле';
|
|
5
|
+
const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
|
|
5
6
|
export const defaultValidator = (errorMsg) => required(errorMsg ?? ERROR_MESSAGE);
|
|
6
7
|
export const defaultSelectValidator = (errorMsg) => validator((_) => _?.key && _?.key !== '')(errorMsg ?? ERROR_MESSAGE);
|
|
7
8
|
export const jobNumberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 0 && _.length <= 2)(errorMsg ?? ERROR_MESSAGE);
|
|
@@ -33,8 +34,8 @@ export const snilsValidator = (errorMsg) => validator(snilsValidate)(errorMsg);
|
|
|
33
34
|
const emailValidate = (email) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2,4}$/.test(email);
|
|
34
35
|
export const emailValidator = (errorMsg) => validator((_) => emailValidate(_))(errorMsg);
|
|
35
36
|
const addressDaDataValidate = (address) => Boolean(address.region && address.city && address.house);
|
|
36
|
-
export const addressDaDataValidator = () => validator(addressDaDataValidate)(
|
|
37
|
-
export const addressOrganizationValidator = () => validator((address) => Boolean(address.fiasCode && address.city && address.house))(
|
|
37
|
+
export const addressDaDataValidator = () => validator(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
|
|
38
|
+
export const addressOrganizationValidator = () => validator((address) => Boolean(address.fiasCode && address.city && address.house))(ADDRESS_ERROR_MESSAGE);
|
|
38
39
|
export const codeWordValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 3 && _.length <= 21 && isCyrillic(_))(errorMsg ?? ERROR_MESSAGE);
|
|
39
40
|
const cyrillicPattern = /^[\u0400-\u04FF\d]+$/u;
|
|
40
41
|
const isCyrillic = (_ = '') => cyrillicPattern.test(_);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/validators.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/ui-kit/FormField/validators.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,10 @@ import { useInputPopup } from './useInputPopup.js';
|
|
|
12
12
|
export const InputControl = JSX(({ className, label, value = '', placeholder, error, errors, onChange = noop, onDaDataChange, onBlur, isTextarea, type, name = '', daDataQueryPrefix, maxLength, dadata = false, disabled = false, }) => {
|
|
13
13
|
const [isOpen, { setFalse: close, setTrue: open }] = useBool();
|
|
14
14
|
const popupRef = useOutsideClick(close);
|
|
15
|
-
const handleChange = useCallback((v) =>
|
|
15
|
+
const handleChange = useCallback((v) => {
|
|
16
|
+
dadata && !isOpen && open();
|
|
17
|
+
maxLength ? v.length <= maxLength && onChange(v) : onChange(v);
|
|
18
|
+
}, [dadata, isOpen, onChange]);
|
|
16
19
|
const inputRef = useInputPopup({
|
|
17
20
|
isOpen: isOpen && dadata,
|
|
18
21
|
name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InputControl.js","sourceRoot":"","sources":["../../../src/ui-kit/Input/InputControl.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EACC,SAAS,EACT,KAAK,EACL,KAAK,GAAG,EAAE,EACV,WAAW,EACX,KAAK,EACL,MAAM,EACN,QAAQ,GAAG,IAAI,EACf,cAAc,EACd,MAAM,EACN,UAAU,EACV,IAAI,EACJ,IAAI,GAAG,EAAE,EACT,iBAAiB,EACjB,SAAS,EACT,MAAM,GAAG,KAAK,EACd,QAAQ,GAAG,KAAK,GACjB,EAAE,EAAE;IACH,MAAM,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC;IAC/D,MAAM,QAAQ,GAAG,eAAe,CAAiB,KAAK,CAAC,CAAC;IAExD,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,SAAS,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"InputControl.js","sourceRoot":"","sources":["../../../src/ui-kit/Input/InputControl.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAC7B,CAAC,EACC,SAAS,EACT,KAAK,EACL,KAAK,GAAG,EAAE,EACV,WAAW,EACX,KAAK,EACL,MAAM,EACN,QAAQ,GAAG,IAAI,EACf,cAAc,EACd,MAAM,EACN,UAAU,EACV,IAAI,EACJ,IAAI,GAAG,EAAE,EACT,iBAAiB,EACjB,SAAS,EACT,MAAM,GAAG,KAAK,EACd,QAAQ,GAAG,KAAK,GACjB,EAAE,EAAE;IACH,MAAM,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC;IAC/D,MAAM,QAAQ,GAAG,eAAe,CAAiB,KAAK,CAAC,CAAC;IAExD,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,CAAS,EAAE,EAAE;QACZ,MAAM,IAAI,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;QAC5B,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,SAAS,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACjE,CAAC,EACD,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAC3B,CAAC;IAEF,MAAM,QAAQ,GAAG,aAAa,CAAC;QAC7B,MAAM,EAAE,MAAM,IAAI,MAAM;QACxB,IAAI;QACJ,KAAK;QACL,iBAAiB;QACjB,QAAQ;QACR,cAAc;KACf,CAAC,CAAC;IAEH,OAAO,CACL,eACE,SAAS,EAAE,KAAK,CAAC,iBAAiB,EAAE,SAAS,CAAC,EAC9C,GAAG,EAAE,QAAQ,EACb,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,IAAI,aAEb,cAAK,GAAG,EAAE,QAAQ,YAChB,KAAC,KAAK,IACJ,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,IAAI,IAAI,MAAM,gBACR,KAAK,EACjB,KAAK,EAAE,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAC1C,KAAK,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,EACtB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,GACvD,GACE,EACL,eAAe,CAAC,KAAK,CAAC,IACnB,CACP,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,WAAoB,EAAE,MAAiB,EAAE,KAAc,EAAE,EAAE,CACjF,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,WAAW,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC"}
|
|
@@ -15,7 +15,7 @@ export const AddressFactField = JSX<CustomFieldProps>(({ field, input }) => {
|
|
|
15
15
|
if (value) {
|
|
16
16
|
field('addressFact')?.onChange?.(field('addressRegistration').value);
|
|
17
17
|
}
|
|
18
|
-
}, [value]);
|
|
18
|
+
}, [value, field('addressRegistration').value]);
|
|
19
19
|
|
|
20
20
|
const onDaDataChange = useCallback((item: DaDataSuggestion) => {
|
|
21
21
|
field?.(fieldName)?.onChange?.({
|
|
@@ -5,6 +5,8 @@ import { validator } from '../../validation/validator';
|
|
|
5
5
|
|
|
6
6
|
const ERROR_MESSAGE = 'Некорректно заполненное поле';
|
|
7
7
|
|
|
8
|
+
const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
|
|
9
|
+
|
|
8
10
|
export const defaultValidator = (errorMsg?: string) => required(errorMsg ?? ERROR_MESSAGE);
|
|
9
11
|
|
|
10
12
|
export const defaultSelectValidator = (errorMsg?: string) =>
|
|
@@ -71,12 +73,11 @@ export const emailValidator = (errorMsg: string) =>
|
|
|
71
73
|
const addressDaDataValidate = (address: Address) =>
|
|
72
74
|
Boolean(address.region && address.city && address.house);
|
|
73
75
|
|
|
74
|
-
export const addressDaDataValidator = () =>
|
|
75
|
-
validator(addressDaDataValidate)('Укажите регион, город/населенный пункт, улицу, дом, квартиру');
|
|
76
|
+
export const addressDaDataValidator = () => validator(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
|
|
76
77
|
|
|
77
78
|
export const addressOrganizationValidator = () =>
|
|
78
79
|
validator((address: Address) => Boolean(address.fiasCode && address.city && address.house))(
|
|
79
|
-
|
|
80
|
+
ADDRESS_ERROR_MESSAGE,
|
|
80
81
|
);
|
|
81
82
|
|
|
82
83
|
export const codeWordValidator = (errorMsg?: string) =>
|
|
@@ -33,8 +33,11 @@ export const InputControl = JSX<InputProps>(
|
|
|
33
33
|
const popupRef = useOutsideClick<HTMLDivElement>(close);
|
|
34
34
|
|
|
35
35
|
const handleChange = useCallback(
|
|
36
|
-
(v: string) =>
|
|
37
|
-
|
|
36
|
+
(v: string) => {
|
|
37
|
+
dadata && !isOpen && open();
|
|
38
|
+
maxLength ? v.length <= maxLength && onChange(v) : onChange(v);
|
|
39
|
+
},
|
|
40
|
+
[dadata, isOpen, onChange],
|
|
38
41
|
);
|
|
39
42
|
|
|
40
43
|
const inputRef = useInputPopup({
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@ export const AddressFactField = JSX<CustomFieldProps>(({ field, input }) => {
|
|
|
15
15
|
if (value) {
|
|
16
16
|
field('addressFact')?.onChange?.(field('addressRegistration').value);
|
|
17
17
|
}
|
|
18
|
-
}, [value]);
|
|
18
|
+
}, [value, field('addressRegistration').value]);
|
|
19
19
|
|
|
20
20
|
const onDaDataChange = useCallback((item: DaDataSuggestion) => {
|
|
21
21
|
field?.(fieldName)?.onChange?.({
|
|
@@ -5,6 +5,8 @@ import { validator } from '../../validation/validator';
|
|
|
5
5
|
|
|
6
6
|
const ERROR_MESSAGE = 'Некорректно заполненное поле';
|
|
7
7
|
|
|
8
|
+
const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
|
|
9
|
+
|
|
8
10
|
export const defaultValidator = (errorMsg?: string) => required(errorMsg ?? ERROR_MESSAGE);
|
|
9
11
|
|
|
10
12
|
export const defaultSelectValidator = (errorMsg?: string) =>
|
|
@@ -71,12 +73,11 @@ export const emailValidator = (errorMsg: string) =>
|
|
|
71
73
|
const addressDaDataValidate = (address: Address) =>
|
|
72
74
|
Boolean(address.region && address.city && address.house);
|
|
73
75
|
|
|
74
|
-
export const addressDaDataValidator = () =>
|
|
75
|
-
validator(addressDaDataValidate)('Укажите регион, город/населенный пункт, улицу, дом, квартиру');
|
|
76
|
+
export const addressDaDataValidator = () => validator(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
|
|
76
77
|
|
|
77
78
|
export const addressOrganizationValidator = () =>
|
|
78
79
|
validator((address: Address) => Boolean(address.fiasCode && address.city && address.house))(
|
|
79
|
-
|
|
80
|
+
ADDRESS_ERROR_MESSAGE,
|
|
80
81
|
);
|
|
81
82
|
|
|
82
83
|
export const codeWordValidator = (errorMsg?: string) =>
|
|
@@ -33,8 +33,11 @@ export const InputControl = JSX<InputProps>(
|
|
|
33
33
|
const popupRef = useOutsideClick<HTMLDivElement>(close);
|
|
34
34
|
|
|
35
35
|
const handleChange = useCallback(
|
|
36
|
-
(v: string) =>
|
|
37
|
-
|
|
36
|
+
(v: string) => {
|
|
37
|
+
dadata && !isOpen && open();
|
|
38
|
+
maxLength ? v.length <= maxLength && onChange(v) : onChange(v);
|
|
39
|
+
},
|
|
40
|
+
[dadata, isOpen, onChange],
|
|
38
41
|
);
|
|
39
42
|
|
|
40
43
|
const inputRef = useInputPopup({
|