@redneckz/wildless-cms-uni-blocks 0.14.901 → 0.14.902
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 +10 -2
- package/bundle/bundle.umd.min.js +1 -1
- package/bundle/retail/validator/validators.d.ts +1 -0
- package/dist/retail/components/Fields/EmailField.js +10 -1
- package/dist/retail/components/Fields/EmailField.js.map +1 -1
- package/dist/retail/validator/validators.d.ts +1 -0
- package/dist/retail/validator/validators.js +2 -1
- package/dist/retail/validator/validators.js.map +1 -1
- package/lib/retail/components/Fields/EmailField.js +10 -1
- package/lib/retail/components/Fields/EmailField.js.map +1 -1
- package/lib/retail/validator/validators.d.ts +1 -0
- package/lib/retail/validator/validators.js +1 -0
- package/lib/retail/validator/validators.js.map +1 -1
- package/mobile/bundle/bundle.umd.js +10 -2
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/bundle/retail/validator/validators.d.ts +1 -0
- package/mobile/dist/retail/components/Fields/EmailField.js +10 -1
- package/mobile/dist/retail/components/Fields/EmailField.js.map +1 -1
- package/mobile/dist/retail/validator/validators.d.ts +1 -0
- package/mobile/dist/retail/validator/validators.js +2 -1
- package/mobile/dist/retail/validator/validators.js.map +1 -1
- package/mobile/lib/retail/components/Fields/EmailField.js +10 -1
- package/mobile/lib/retail/components/Fields/EmailField.js.map +1 -1
- package/mobile/lib/retail/validator/validators.d.ts +1 -0
- package/mobile/lib/retail/validator/validators.js +1 -0
- package/mobile/lib/retail/validator/validators.js.map +1 -1
- package/mobile/src/retail/components/Fields/EmailField.tsx +22 -8
- package/mobile/src/retail/validator/validators.ts +1 -0
- package/package.json +1 -1
- package/src/retail/components/Fields/EmailField.tsx +22 -8
- package/src/retail/validator/validators.ts +1 -0
|
@@ -5,6 +5,7 @@ export interface LimitedBirthdayValidationParams {
|
|
|
5
5
|
errorMessage: string;
|
|
6
6
|
}
|
|
7
7
|
export declare const retailCyrillicPattern: RegExp;
|
|
8
|
+
export declare const retailNotCyrillicPattern: RegExp;
|
|
8
9
|
export declare const addressDaDataValidator: () => import("../../validation/validator").Validator<Address>;
|
|
9
10
|
export declare const addressOrganizationValidator: () => import("../../validation/validator").Validator<Address>;
|
|
10
11
|
export declare const codeWordValidator: (errorMsg?: string) => import("../../validation/validator").Validator<any>;
|
|
@@ -2,6 +2,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
2
2
|
exports.EmailField = void 0;
|
|
3
3
|
const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
|
|
4
4
|
const uni_jsx_1 = require("@redneckz/uni-jsx");
|
|
5
|
+
const hooks_1 = require("@redneckz/uni-jsx/lib/hooks");
|
|
6
|
+
const validators_1 = require("../../validator/validators");
|
|
5
7
|
const DaDataInputControl_1 = require("../DaDataInputControl/DaDataInputControl");
|
|
6
|
-
exports.EmailField = (0, uni_jsx_1.JSX)(({ field, input }) =>
|
|
8
|
+
exports.EmailField = (0, uni_jsx_1.JSX)(({ field, input }) => {
|
|
9
|
+
const onChange = (0, hooks_1.useCallback)((value) => {
|
|
10
|
+
if (validators_1.retailNotCyrillicPattern.test(value) || value.length === 0) {
|
|
11
|
+
field('email')?.onChange?.(value);
|
|
12
|
+
}
|
|
13
|
+
}, [field]);
|
|
14
|
+
return ((0, jsx_runtime_1.jsx)(DaDataInputControl_1.DaDataInputControl, { label: "\u042D\u043B\u0435\u043A\u0442\u0440\u043E\u043D\u043D\u0430\u044F \u043F\u043E\u0447\u0442\u0430", maxLength: 50, ...field(input?.name ?? ''), ...input, onChange: onChange }));
|
|
15
|
+
});
|
|
7
16
|
//# sourceMappingURL=EmailField.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/EmailField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;
|
|
1
|
+
{"version":3,"file":"EmailField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/EmailField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAA0D;AAE1D,2DAAsE;AACtE,iFAA8E;AAEjE,QAAA,UAAU,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IACnE,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAC1B,CAAC,KAAa,EAAE,EAAE;QAChB,IAAI,qCAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9D,KAAK,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC;SACnC;IACH,CAAC,EACD,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,OAAO,CACL,uBAAC,uCAAkB,IACjB,KAAK,EAAC,mGAAmB,EACzB,SAAS,EAAE,EAAE,KACT,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,KACxB,KAAK,EACT,QAAQ,EAAE,QAAQ,GAClB,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -5,6 +5,7 @@ export interface LimitedBirthdayValidationParams {
|
|
|
5
5
|
errorMessage: string;
|
|
6
6
|
}
|
|
7
7
|
export declare const retailCyrillicPattern: RegExp;
|
|
8
|
+
export declare const retailNotCyrillicPattern: RegExp;
|
|
8
9
|
export declare const addressDaDataValidator: () => import("../../validation/validator").Validator<Address>;
|
|
9
10
|
export declare const addressOrganizationValidator: () => import("../../validation/validator").Validator<Address>;
|
|
10
11
|
export declare const codeWordValidator: (errorMsg?: string) => import("../../validation/validator").Validator<any>;
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
2
|
-
exports.validateDateFromBirth = exports.dateRegistrationValidator = exports.workBeginDateValidator = exports.generalSeniorityValidator = exports.snilsValidator = exports.notLaterDateValidator = exports.deliveryDateValidator = exports.passportValidator = exports.limitedBirthdayValidator = exports.lengthStringValidator = exports.jobNumberValidator = exports.nameRetailValidator = exports.codeWordValidator = exports.addressOrganizationValidator = exports.addressDaDataValidator = exports.retailCyrillicPattern = void 0;
|
|
2
|
+
exports.validateDateFromBirth = exports.dateRegistrationValidator = exports.workBeginDateValidator = exports.generalSeniorityValidator = exports.snilsValidator = exports.notLaterDateValidator = exports.deliveryDateValidator = exports.passportValidator = exports.limitedBirthdayValidator = exports.lengthStringValidator = exports.jobNumberValidator = exports.nameRetailValidator = exports.codeWordValidator = exports.addressOrganizationValidator = exports.addressDaDataValidator = exports.retailNotCyrillicPattern = exports.retailCyrillicPattern = void 0;
|
|
3
3
|
const isCyrilic_1 = require("../../utils/isCyrilic");
|
|
4
4
|
const validator_1 = require("../../validation/validator");
|
|
5
5
|
const ERROR_MESSAGE = 'Некорректно заполненное поле';
|
|
6
6
|
const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
|
|
7
7
|
exports.retailCyrillicPattern = /^[\u0400-\u04FF-\s]+$/u;
|
|
8
|
+
exports.retailNotCyrillicPattern = /^(?!\s*$)[^\p{Script=Cyrillic}]+$/u;
|
|
8
9
|
const addressDaDataValidate = (address) => Boolean(address.region && (address.city || address.locality) && address.house);
|
|
9
10
|
const addressDaDataValidator = () => (0, validator_1.validator)(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
|
|
10
11
|
exports.addressDaDataValidator = addressDaDataValidator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/retail/validator/validators.ts"],"names":[],"mappings":";;AAAA,qDAAmD;AACnD,0DAAuD;AAGvD,MAAM,aAAa,GAAG,8BAA8B,CAAC;AAErD,MAAM,qBAAqB,GAAG,oDAAoD,CAAC;AAQtE,QAAA,qBAAqB,GAAG,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/retail/validator/validators.ts"],"names":[],"mappings":";;AAAA,qDAAmD;AACnD,0DAAuD;AAGvD,MAAM,aAAa,GAAG,8BAA8B,CAAC;AAErD,MAAM,qBAAqB,GAAG,oDAAoD,CAAC;AAQtE,QAAA,qBAAqB,GAAG,wBAAwB,CAAC;AACjD,QAAA,wBAAwB,GAAG,oCAAoC,CAAC;AAE7E,MAAM,qBAAqB,GAAG,CAAC,OAAgB,EAAE,EAAE,CACjD,OAAO,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC;AAE1E,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,CAC7B,OAAO,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,CACjF,CAAC,qBAAqB,CAAC,CAAC;AAHd,QAAA,4BAA4B,gCAGd;AAEpB,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,IAAA,sBAAU,EAAC,CAAC,CAAC,CAAC,CACzF,QAAQ,IAAI,aAAa,CAC1B,CAAC;AAHS,QAAA,iBAAiB,qBAG1B;AAEG,MAAM,mBAAmB,GAAG,CAAC,QAAiB,EAAE,EAAE,CACvD,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,6BAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CACtF,QAAQ,IAAI,aAAa,CAC1B,CAAC;AAHS,QAAA,mBAAmB,uBAG5B;AAEG,MAAM,kBAAkB,GAAG,CAAC,QAAiB,EAAE,EAAE,CACtD,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,aAAa,CAAC,CAAC;AADnF,QAAA,kBAAkB,sBACiE;AAEzF,MAAM,qBAAqB,GAAG,CACnC,WAAmB,EACnB,QAAiB,EACjB,WAAqB,EACrB,EAAE,CACF,IAAA,qBAAS,EACP,CAAC,CAAC,EAAE,EAAE,CACJ,OAAO,CAAC,KAAK,QAAQ;IACrB,CAAC,CAAC,MAAM,IAAI,CAAC;IACb,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,WAAW,CAAC,CACrE,CAAC,QAAQ,IAAI,aAAa,CAAC,CAAC;AAVlB,QAAA,qBAAqB,yBAUH;AAE/B,MAAM,uBAAuB,GAC3B,CAAC,EAAE,MAAM,EAAE,MAAM,EAAmC,EAAE,EAAE,CACxD,CAAC,IAAW,EAAE,EAAE;IACd,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC;IAEzB,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IAC1F,MAAM,OAAO,GAAG,MAAM;QACpB,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;QAC3E,CAAC,CAAC,IAAI,CAAC;IAET,IAAI,CAAC,IAAI,IAAI,IAAI,GAAG,OAAO,EAAE;QAC3B,OAAO,KAAK,CAAC;KACd;IAED,IAAI,OAAO,IAAI,IAAI,GAAG,OAAO,EAAE;QAC7B,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEG,MAAM,wBAAwB,GAAG,CAAC,MAAuC,EAAE,EAAE,CAClF,IAAA,qBAAS,EAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;AADrD,QAAA,wBAAwB,4BAC6B;AAE3D,MAAM,iBAAiB,GAAG,CAAC,SAAgB,EAAE,EAAE,CACpD,IAAA,6BAAqB,EAAC,EAAE,EAAE,SAAS,CAAC,CAAC,8BAA8B,CAAC,CAAC;AAD1D,QAAA,iBAAiB,qBACyC;AAEhE,MAAM,qBAAqB,GAAG,CAAC,QAAgB,EAAE,EAAE,CACxD,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;AADtD,QAAA,qBAAqB,yBACiC;AAE5D,MAAM,qBAAqB,GAAG,CAAC,QAAgB,EAAE,EAAE,CACxD,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;AADtD,QAAA,qBAAqB,yBACiC;AAEnE,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE;IACtC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACrD,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,IAAI,MAAM,KAAK,aAAa,EAAE;QACpD,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC1B,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;SAClD;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,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KAC/C;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;AAEhF,MAAM,yBAAyB,GAAG,CAAC,iBAAyB,EAAE,EAAE,CACrE,IAAA,qBAAS,EACP,CAAC,CAAC,EAAE,EAAE,CACJ,OAAO,CAAC,KAAK,QAAQ;IACrB,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;IACvB,CAAC,CAAC,iBAAiB,IAAI,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,iBAAiB,CAAC,CAAC,CACjE,CAAC,8BAA8B,CAAC,CAAC;AANvB,QAAA,yBAAyB,6BAMF;AAE7B,MAAM,sBAAsB,GAAG,CAAC,SAAgB,EAAE,EAAE,CACzD,IAAA,6BAAqB,EAAC,EAAE,EAAE,SAAS,CAAC,CAAC,4CAA4C,CAAC,CAAC;AADxE,QAAA,sBAAsB,0BACkD;AAE9E,MAAM,yBAAyB,GAAG,CAAC,SAAgB,EAAE,EAAE,CAC5D,IAAA,6BAAqB,EAAC,CAAC,EAAE,SAAS,CAAC,CAAC,0BAA0B,CAAC,CAAC;AADrD,QAAA,yBAAyB,6BAC4B;AAE3D,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAE,SAAgB,EAAE,EAAE,CACrE,IAAA,qBAAS,EAAC,CAAC,CAAC,EAAE,EAAE;IACd,IAAI,CAAC,IAAI,SAAS,EAAE;QAClB,MAAM,WAAW,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG,IAAI,IAAI,CACtB,SAAS,EAAE,WAAW,EAAE,GAAG,GAAG,EAC9B,SAAS,EAAE,QAAQ,EAAE,EACrB,SAAS,EAAE,OAAO,EAAE,CACrB,CAAC,OAAO,EAAE,CAAC;QACZ,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAErC,OAAO,WAAW,IAAI,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC;KACzD;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC,CAAC;AAfQ,QAAA,qBAAqB,yBAe7B"}
|
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
|
|
2
2
|
import { JSX } from '@redneckz/uni-jsx';
|
|
3
|
+
import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
|
|
4
|
+
import { retailNotCyrillicPattern } from '../../validator/validators.js';
|
|
3
5
|
import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl.js';
|
|
4
|
-
export const EmailField = JSX(({ field, input }) =>
|
|
6
|
+
export const EmailField = JSX(({ field, input }) => {
|
|
7
|
+
const onChange = useCallback((value) => {
|
|
8
|
+
if (retailNotCyrillicPattern.test(value) || value.length === 0) {
|
|
9
|
+
field('email')?.onChange?.(value);
|
|
10
|
+
}
|
|
11
|
+
}, [field]);
|
|
12
|
+
return (_jsx(DaDataInputControl, { label: "\u042D\u043B\u0435\u043A\u0442\u0440\u043E\u043D\u043D\u0430\u044F \u043F\u043E\u0447\u0442\u0430", maxLength: 50, ...field(input?.name ?? ''), ...input, onChange: onChange }));
|
|
13
|
+
});
|
|
5
14
|
//# sourceMappingURL=EmailField.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EmailField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/EmailField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"EmailField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/EmailField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAE9E,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IACnE,MAAM,QAAQ,GAAG,WAAW,CAC1B,CAAC,KAAa,EAAE,EAAE;QAChB,IAAI,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9D,KAAK,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC;SACnC;IACH,CAAC,EACD,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,OAAO,CACL,KAAC,kBAAkB,IACjB,KAAK,EAAC,mGAAmB,EACzB,SAAS,EAAE,EAAE,KACT,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,KACxB,KAAK,EACT,QAAQ,EAAE,QAAQ,GAClB,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -5,6 +5,7 @@ export interface LimitedBirthdayValidationParams {
|
|
|
5
5
|
errorMessage: string;
|
|
6
6
|
}
|
|
7
7
|
export declare const retailCyrillicPattern: RegExp;
|
|
8
|
+
export declare const retailNotCyrillicPattern: RegExp;
|
|
8
9
|
export declare const addressDaDataValidator: () => import("../../validation/validator").Validator<Address>;
|
|
9
10
|
export declare const addressOrganizationValidator: () => import("../../validation/validator").Validator<Address>;
|
|
10
11
|
export declare const codeWordValidator: (errorMsg?: string) => import("../../validation/validator").Validator<any>;
|
|
@@ -3,6 +3,7 @@ import { validator } from '../../validation/validator.js';
|
|
|
3
3
|
const ERROR_MESSAGE = 'Некорректно заполненное поле';
|
|
4
4
|
const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
|
|
5
5
|
export const retailCyrillicPattern = /^[\u0400-\u04FF-\s]+$/u;
|
|
6
|
+
export const retailNotCyrillicPattern = /^(?!\s*$)[^\p{Script=Cyrillic}]+$/u;
|
|
6
7
|
const addressDaDataValidate = (address) => Boolean(address.region && (address.city || address.locality) && address.house);
|
|
7
8
|
export const addressDaDataValidator = () => validator(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
|
|
8
9
|
export const addressOrganizationValidator = () => validator((address) => Boolean(address.fiasCode && (address.city || address.locality) && address.house))(ADDRESS_ERROR_MESSAGE);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/retail/validator/validators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAGvD,MAAM,aAAa,GAAG,8BAA8B,CAAC;AAErD,MAAM,qBAAqB,GAAG,oDAAoD,CAAC;AAQnF,MAAM,CAAC,MAAM,qBAAqB,GAAG,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/retail/validator/validators.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,26 @@
|
|
|
1
1
|
import { JSX } from '@redneckz/uni-jsx';
|
|
2
|
+
import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
|
|
2
3
|
import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
|
|
4
|
+
import { retailNotCyrillicPattern } from '../../validator/validators';
|
|
3
5
|
import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
|
|
4
6
|
|
|
5
|
-
export const EmailField = JSX<CustomFieldProps>(({ field, input }) =>
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
7
|
+
export const EmailField = JSX<CustomFieldProps>(({ field, input }) => {
|
|
8
|
+
const onChange = useCallback(
|
|
9
|
+
(value: string) => {
|
|
10
|
+
if (retailNotCyrillicPattern.test(value) || value.length === 0) {
|
|
11
|
+
field('email')?.onChange?.(value);
|
|
12
|
+
}
|
|
13
|
+
},
|
|
14
|
+
[field],
|
|
15
|
+
);
|
|
16
|
+
|
|
17
|
+
return (
|
|
18
|
+
<DaDataInputControl
|
|
19
|
+
label="Электронная почта"
|
|
20
|
+
maxLength={50}
|
|
21
|
+
{...field(input?.name ?? '')}
|
|
22
|
+
{...input}
|
|
23
|
+
onChange={onChange}
|
|
24
|
+
/>
|
|
25
|
+
);
|
|
26
|
+
});
|
|
@@ -13,6 +13,7 @@ export interface LimitedBirthdayValidationParams {
|
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
export const retailCyrillicPattern = /^[\u0400-\u04FF-\s]+$/u;
|
|
16
|
+
export const retailNotCyrillicPattern = /^(?!\s*$)[^\p{Script=Cyrillic}]+$/u;
|
|
16
17
|
|
|
17
18
|
const addressDaDataValidate = (address: Address) =>
|
|
18
19
|
Boolean(address.region && (address.city || address.locality) && address.house);
|
package/package.json
CHANGED
|
@@ -1,12 +1,26 @@
|
|
|
1
1
|
import { JSX } from '@redneckz/uni-jsx';
|
|
2
|
+
import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
|
|
2
3
|
import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
|
|
4
|
+
import { retailNotCyrillicPattern } from '../../validator/validators';
|
|
3
5
|
import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
|
|
4
6
|
|
|
5
|
-
export const EmailField = JSX<CustomFieldProps>(({ field, input }) =>
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
7
|
+
export const EmailField = JSX<CustomFieldProps>(({ field, input }) => {
|
|
8
|
+
const onChange = useCallback(
|
|
9
|
+
(value: string) => {
|
|
10
|
+
if (retailNotCyrillicPattern.test(value) || value.length === 0) {
|
|
11
|
+
field('email')?.onChange?.(value);
|
|
12
|
+
}
|
|
13
|
+
},
|
|
14
|
+
[field],
|
|
15
|
+
);
|
|
16
|
+
|
|
17
|
+
return (
|
|
18
|
+
<DaDataInputControl
|
|
19
|
+
label="Электронная почта"
|
|
20
|
+
maxLength={50}
|
|
21
|
+
{...field(input?.name ?? '')}
|
|
22
|
+
{...input}
|
|
23
|
+
onChange={onChange}
|
|
24
|
+
/>
|
|
25
|
+
);
|
|
26
|
+
});
|
|
@@ -13,6 +13,7 @@ export interface LimitedBirthdayValidationParams {
|
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
export const retailCyrillicPattern = /^[\u0400-\u04FF-\s]+$/u;
|
|
16
|
+
export const retailNotCyrillicPattern = /^(?!\s*$)[^\p{Script=Cyrillic}]+$/u;
|
|
16
17
|
|
|
17
18
|
const addressDaDataValidate = (address: Address) =>
|
|
18
19
|
Boolean(address.region && (address.city || address.locality) && address.house);
|