@redneckz/wildless-cms-uni-blocks 0.14.691 → 0.14.693
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/api/RetailAPI/updateUserTask.d.ts +3 -1
- package/bundle/api/dadataHints/dadataHintsType.d.ts +7 -1
- package/bundle/bundle.umd.js +41 -24
- package/bundle/bundle.umd.min.js +1 -1
- package/bundle/ui-kit/FormField/Fields/AddressField.d.ts +18 -0
- package/bundle/ui-kit/FormField/Fields/CurrencyField.d.ts +5 -0
- package/dist/api/RetailAPI/updateUserTask.d.ts +3 -1
- package/dist/api/dadataHints/dadataHintsType.d.ts +7 -1
- package/dist/components/CreditCardForm/getCardData.js +1 -1
- package/dist/components/CreditCardForm/getCardData.js.map +1 -1
- package/dist/components/CreditCardForm/getFourthStepData.js +1 -1
- package/dist/components/CreditCardForm/getFourthStepData.js.map +1 -1
- package/dist/components/CreditForm/getThirdStepData.js +1 -1
- package/dist/components/CreditForm/getThirdStepData.js.map +1 -1
- package/dist/ui-kit/ConsentBkiDialog/ConsentBkiDialog.js +1 -1
- package/dist/ui-kit/ConsentBkiDialog/ConsentBkiDialog.js.map +1 -1
- package/dist/ui-kit/EsiaLoginDialog/EsiaLoginDialog.js +11 -1
- package/dist/ui-kit/EsiaLoginDialog/EsiaLoginDialog.js.map +1 -1
- package/dist/ui-kit/FormField/Fields/AddressField.d.ts +18 -0
- package/dist/ui-kit/FormField/Fields/AddressField.js +20 -18
- package/dist/ui-kit/FormField/Fields/AddressField.js.map +1 -1
- package/dist/ui-kit/FormField/Fields/CurrencyField.d.ts +5 -0
- package/dist/ui-kit/FormField/Fields/CurrencyField.js +8 -2
- package/dist/ui-kit/FormField/Fields/CurrencyField.js.map +1 -1
- package/dist/ui-kit/FormField/Fields/InnField.js +2 -0
- package/dist/ui-kit/FormField/Fields/InnField.js.map +1 -1
- package/lib/api/RetailAPI/updateUserTask.d.ts +3 -1
- package/lib/api/dadataHints/dadataHintsType.d.ts +7 -1
- package/lib/components/CreditCardForm/getCardData.js +1 -1
- package/lib/components/CreditCardForm/getCardData.js.map +1 -1
- package/lib/components/CreditCardForm/getFourthStepData.js +1 -1
- package/lib/components/CreditCardForm/getFourthStepData.js.map +1 -1
- package/lib/components/CreditForm/getThirdStepData.js +1 -1
- package/lib/components/CreditForm/getThirdStepData.js.map +1 -1
- package/lib/ui-kit/ConsentBkiDialog/ConsentBkiDialog.js +1 -1
- package/lib/ui-kit/ConsentBkiDialog/ConsentBkiDialog.js.map +1 -1
- package/lib/ui-kit/EsiaLoginDialog/EsiaLoginDialog.js +11 -1
- package/lib/ui-kit/EsiaLoginDialog/EsiaLoginDialog.js.map +1 -1
- package/lib/ui-kit/FormField/Fields/AddressField.d.ts +18 -0
- package/lib/ui-kit/FormField/Fields/AddressField.js +18 -17
- package/lib/ui-kit/FormField/Fields/AddressField.js.map +1 -1
- package/lib/ui-kit/FormField/Fields/CurrencyField.d.ts +5 -0
- package/lib/ui-kit/FormField/Fields/CurrencyField.js +7 -1
- package/lib/ui-kit/FormField/Fields/CurrencyField.js.map +1 -1
- package/lib/ui-kit/FormField/Fields/InnField.js +2 -0
- package/lib/ui-kit/FormField/Fields/InnField.js.map +1 -1
- package/mobile/bundle/api/RetailAPI/updateUserTask.d.ts +3 -1
- package/mobile/bundle/api/dadataHints/dadataHintsType.d.ts +7 -1
- package/mobile/bundle/bundle.umd.js +41 -24
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/bundle/ui-kit/FormField/Fields/AddressField.d.ts +18 -0
- package/mobile/bundle/ui-kit/FormField/Fields/CurrencyField.d.ts +5 -0
- package/mobile/dist/api/RetailAPI/updateUserTask.d.ts +3 -1
- package/mobile/dist/api/dadataHints/dadataHintsType.d.ts +7 -1
- package/mobile/dist/components/CreditCardForm/getCardData.js +1 -1
- package/mobile/dist/components/CreditCardForm/getCardData.js.map +1 -1
- package/mobile/dist/components/CreditCardForm/getFourthStepData.js +1 -1
- package/mobile/dist/components/CreditCardForm/getFourthStepData.js.map +1 -1
- package/mobile/dist/components/CreditForm/getThirdStepData.js +1 -1
- package/mobile/dist/components/CreditForm/getThirdStepData.js.map +1 -1
- package/mobile/dist/ui-kit/ConsentBkiDialog/ConsentBkiDialog.js +1 -1
- package/mobile/dist/ui-kit/ConsentBkiDialog/ConsentBkiDialog.js.map +1 -1
- package/mobile/dist/ui-kit/EsiaLoginDialog/EsiaLoginDialog.js +11 -1
- package/mobile/dist/ui-kit/EsiaLoginDialog/EsiaLoginDialog.js.map +1 -1
- package/mobile/dist/ui-kit/FormField/Fields/AddressField.d.ts +18 -0
- package/mobile/dist/ui-kit/FormField/Fields/AddressField.js +20 -18
- package/mobile/dist/ui-kit/FormField/Fields/AddressField.js.map +1 -1
- package/mobile/dist/ui-kit/FormField/Fields/CurrencyField.d.ts +5 -0
- package/mobile/dist/ui-kit/FormField/Fields/CurrencyField.js +8 -2
- package/mobile/dist/ui-kit/FormField/Fields/CurrencyField.js.map +1 -1
- package/mobile/dist/ui-kit/FormField/Fields/InnField.js +2 -0
- package/mobile/dist/ui-kit/FormField/Fields/InnField.js.map +1 -1
- package/mobile/lib/api/RetailAPI/updateUserTask.d.ts +3 -1
- package/mobile/lib/api/dadataHints/dadataHintsType.d.ts +7 -1
- package/mobile/lib/components/CreditCardForm/getCardData.js +1 -1
- package/mobile/lib/components/CreditCardForm/getCardData.js.map +1 -1
- package/mobile/lib/components/CreditCardForm/getFourthStepData.js +1 -1
- package/mobile/lib/components/CreditCardForm/getFourthStepData.js.map +1 -1
- package/mobile/lib/components/CreditForm/getThirdStepData.js +1 -1
- package/mobile/lib/components/CreditForm/getThirdStepData.js.map +1 -1
- package/mobile/lib/ui-kit/ConsentBkiDialog/ConsentBkiDialog.js +1 -1
- package/mobile/lib/ui-kit/ConsentBkiDialog/ConsentBkiDialog.js.map +1 -1
- package/mobile/lib/ui-kit/EsiaLoginDialog/EsiaLoginDialog.js +11 -1
- package/mobile/lib/ui-kit/EsiaLoginDialog/EsiaLoginDialog.js.map +1 -1
- package/mobile/lib/ui-kit/FormField/Fields/AddressField.d.ts +18 -0
- package/mobile/lib/ui-kit/FormField/Fields/AddressField.js +18 -17
- package/mobile/lib/ui-kit/FormField/Fields/AddressField.js.map +1 -1
- package/mobile/lib/ui-kit/FormField/Fields/CurrencyField.d.ts +5 -0
- package/mobile/lib/ui-kit/FormField/Fields/CurrencyField.js +7 -1
- package/mobile/lib/ui-kit/FormField/Fields/CurrencyField.js.map +1 -1
- package/mobile/lib/ui-kit/FormField/Fields/InnField.js +2 -0
- package/mobile/lib/ui-kit/FormField/Fields/InnField.js.map +1 -1
- package/mobile/src/api/RetailAPI/updateUserTask.ts +1 -1
- package/mobile/src/api/dadataHints/dadataHintsType.ts +8 -1
- package/mobile/src/components/CreditCardForm/getCardData.tsx +1 -1
- package/mobile/src/components/CreditCardForm/getFourthStepData.ts +1 -1
- package/mobile/src/components/CreditForm/getThirdStepData.ts +1 -1
- package/mobile/src/ui-kit/ConsentBkiDialog/ConsentBkiDialog.tsx +1 -1
- package/mobile/src/ui-kit/EsiaLoginDialog/EsiaLoginDialog.tsx +14 -2
- package/mobile/src/ui-kit/FormField/Fields/AddressField.tsx +19 -17
- package/mobile/src/ui-kit/FormField/Fields/CurrencyField.tsx +7 -1
- package/mobile/src/ui-kit/FormField/Fields/InnField.tsx +4 -0
- package/package.json +1 -1
- package/src/api/RetailAPI/updateUserTask.ts +1 -1
- package/src/api/dadataHints/dadataHintsType.ts +8 -1
- package/src/components/CreditCardForm/getCardData.tsx +1 -1
- package/src/components/CreditCardForm/getFourthStepData.ts +1 -1
- package/src/components/CreditForm/getThirdStepData.ts +1 -1
- package/src/ui-kit/ConsentBkiDialog/ConsentBkiDialog.tsx +1 -1
- package/src/ui-kit/EsiaLoginDialog/EsiaLoginDialog.tsx +14 -2
- package/src/ui-kit/FormField/Fields/AddressField.tsx +19 -17
- package/src/ui-kit/FormField/Fields/CurrencyField.tsx +7 -1
- package/src/ui-kit/FormField/Fields/InnField.tsx +4 -0
|
@@ -7,12 +7,13 @@ export interface DaDataSuggestion {
|
|
|
7
7
|
processedValue: string;
|
|
8
8
|
}
|
|
9
9
|
declare type DaDataGender = 'MALE' | 'FEMALE' | 'UNKNOWN';
|
|
10
|
+
declare type DaDataQC = '0' | '1';
|
|
10
11
|
interface DaDataFio {
|
|
11
12
|
surname: Nullable<string>;
|
|
12
13
|
name: Nullable<string>;
|
|
13
14
|
patronymic: Nullable<string>;
|
|
14
15
|
gender: DaDataGender;
|
|
15
|
-
qc:
|
|
16
|
+
qc: DaDataQC;
|
|
16
17
|
source: null;
|
|
17
18
|
}
|
|
18
19
|
interface DaDataEmail {
|
|
@@ -24,6 +25,10 @@ interface DaDataPassportFms {
|
|
|
24
25
|
name: string;
|
|
25
26
|
}
|
|
26
27
|
interface DaDataOrganization {
|
|
28
|
+
address: {
|
|
29
|
+
data: DaDataAddress;
|
|
30
|
+
value: string;
|
|
31
|
+
};
|
|
27
32
|
inn: string;
|
|
28
33
|
name: {
|
|
29
34
|
short_with_opf: string;
|
|
@@ -45,6 +50,7 @@ export interface DaDataAddress {
|
|
|
45
50
|
settlement_with_type: Nullable<string>;
|
|
46
51
|
street: Nullable<string>;
|
|
47
52
|
fias_code: string;
|
|
53
|
+
qc: DaDataQC;
|
|
48
54
|
qc_complete: Nullable<string>;
|
|
49
55
|
qc_house: Nullable<string>;
|
|
50
56
|
}
|
package/bundle/bundle.umd.js
CHANGED
|
@@ -1880,23 +1880,7 @@
|
|
|
1880
1880
|
const fieldName = input?.name || 'addressRegistration';
|
|
1881
1881
|
const fieldValue = field(fieldName).value;
|
|
1882
1882
|
const onDaDataChange = useCallback((item) => {
|
|
1883
|
-
field?.(fieldName)?.onChange?.(
|
|
1884
|
-
apartment: item?.data?.flat,
|
|
1885
|
-
city: item?.data?.city,
|
|
1886
|
-
district: item?.data?.area_with_type,
|
|
1887
|
-
fullAddress: item?.value,
|
|
1888
|
-
fiasCode: item?.data?.fias_id,
|
|
1889
|
-
house: item?.data?.house,
|
|
1890
|
-
locality: item?.data?.settlement_with_type,
|
|
1891
|
-
okatoRegionCode: item?.data?.okato,
|
|
1892
|
-
postcode: item?.data?.postal_code,
|
|
1893
|
-
region: item?.data?.region,
|
|
1894
|
-
regionCode: item?.data?.region_kladr_id ? item?.data?.region_kladr_id.substring(0, 2) : '',
|
|
1895
|
-
street: item?.data?.house,
|
|
1896
|
-
qc: item?.data?.qc,
|
|
1897
|
-
qcComplete: item?.data?.qc_complete,
|
|
1898
|
-
qcHouse: item?.data?.qc_house,
|
|
1899
|
-
});
|
|
1883
|
+
field?.(fieldName)?.onChange?.(getAddressFromDaDataItem(item));
|
|
1900
1884
|
}, []);
|
|
1901
1885
|
const onChange = useCallback((value) => {
|
|
1902
1886
|
field?.(fieldName)?.onChange?.({
|
|
@@ -1919,6 +1903,23 @@
|
|
|
1919
1903
|
}, []);
|
|
1920
1904
|
return (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field, fieldName), label: "\u0410\u0434\u0440\u0435\u0441", ...getValidation(field(fieldName), validatorObj[fieldName], input?.required), value: fieldValue.fullAddress, onChange: onChange, ...input, onDaDataChange: onDaDataChange }));
|
|
1921
1905
|
});
|
|
1906
|
+
const getAddressFromDaDataItem = (item) => ({
|
|
1907
|
+
apartment: item?.data?.flat,
|
|
1908
|
+
city: item?.data?.city,
|
|
1909
|
+
district: item?.data?.area_with_type,
|
|
1910
|
+
fullAddress: item?.value,
|
|
1911
|
+
fiasCode: item?.data?.fias_id,
|
|
1912
|
+
house: item?.data?.house,
|
|
1913
|
+
locality: item?.data?.settlement_with_type,
|
|
1914
|
+
okatoRegionCode: item?.data?.okato,
|
|
1915
|
+
postcode: item?.data?.postal_code,
|
|
1916
|
+
region: item?.data?.region,
|
|
1917
|
+
regionCode: item?.data?.region_kladr_id ? item?.data?.region_kladr_id.substring(0, 2) : '',
|
|
1918
|
+
street: item?.data?.house,
|
|
1919
|
+
qc: item?.data?.qc,
|
|
1920
|
+
qcComplete: item?.data?.qc_complete,
|
|
1921
|
+
qcHouse: item?.data?.qc_house,
|
|
1922
|
+
});
|
|
1922
1923
|
|
|
1923
1924
|
const SVG = JSX(({ className, viewBox, fill = 'none', width, height, paths, ...commonOptions }) => {
|
|
1924
1925
|
return (jsx("svg", { xmlns: "http://www.w3.org/2000/svg", className: className, viewBox: viewBox, fill: fill, width: width, height: height, children: paths.map(({ d, fill: pathFill, ...options }, i) => {
|
|
@@ -3421,7 +3422,13 @@
|
|
|
3421
3422
|
|
|
3422
3423
|
const RadioButtonGroupControl = JSX(({ className, label, onChange, error, ...rest }) => (jsxs("div", { className: style('shrink-0 w-full', className), children: [jsx(RadioButtonGroup, { label: getRequiredLabel({ label, errors: rest?.errors }), onChange: (_) => onChange && onChange(_), ...rest }), renderErrorText(error)] })));
|
|
3423
3424
|
|
|
3424
|
-
|
|
3425
|
+
var CurrencyCode;
|
|
3426
|
+
(function (CurrencyCode) {
|
|
3427
|
+
CurrencyCode["rub"] = "810";
|
|
3428
|
+
CurrencyCode["dollar"] = "840";
|
|
3429
|
+
CurrencyCode["euro"] = "978";
|
|
3430
|
+
})(CurrencyCode || (CurrencyCode = {}));
|
|
3431
|
+
const CURRENCY_TYPES = [{ id: CurrencyCode.rub, text: 'Рубль' }];
|
|
3425
3432
|
const CurrencyField = JSX(({ field, input }) => {
|
|
3426
3433
|
const { value, onChange } = field('currency');
|
|
3427
3434
|
return (jsx(RadioButtonGroupControl, { label: "\u0412\u0430\u043B\u044E\u0442\u0430", orientation: "horizontal", items: CURRENCY_TYPES, value: value, onChange: (_) => onChange?.(_), ...getValidation(field('currency'), validatorObj.currency, input?.required) }));
|
|
@@ -3534,6 +3541,7 @@
|
|
|
3534
3541
|
|
|
3535
3542
|
const InnField = JSX(({ field, input }) => {
|
|
3536
3543
|
const onDaDataChange = useCallback((item) => {
|
|
3544
|
+
field?.('organizationAddress')?.onChange?.(getAddressFromDaDataItem(item.data?.address));
|
|
3537
3545
|
field?.('organizationName')?.onChange?.(item.data?.name?.short_with_opf);
|
|
3538
3546
|
field?.('legalForm')?.onChange?.(item.data?.opf?.short);
|
|
3539
3547
|
}, []);
|
|
@@ -4450,7 +4458,7 @@
|
|
|
4450
4458
|
}
|
|
4451
4459
|
}, []);
|
|
4452
4460
|
const consentText = showRefuseContent ? refuseConsentText : defaultConsentText;
|
|
4453
|
-
return (jsx(Dialog, { className: "my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-lg py-0 px-5xl", onClose: onClose, children: jsxs("div", { className: "flex flex-col gap-xl items-center", children: [jsx("div", { role: "button", onClick: openDocument, children: jsx(Heading, { className: "text-center text-balance", headingType: "h2", title: consentText.title }) }), jsx(Paragraph, { align: "text-center", children: consentText.description }), jsx(RadioButtonGroup, { className: "whitespace-normal", orientation: "horizontal", items: ITEMS$1, value: confirmStatus, onChange: handleConfirmChange }), jsx(Button, { disabled: !confirmStatus, type: "button", onClick: handleSubmit, children: "\
|
|
4461
|
+
return (jsx(Dialog, { className: "my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-lg py-0 px-5xl", onClose: onClose, children: jsxs("div", { className: "flex flex-col gap-xl items-center", children: [jsx("div", { role: "button", onClick: openDocument, children: jsx(Heading, { className: "text-center text-balance", headingType: "h2", title: consentText.title }) }), jsx(Paragraph, { align: "text-center", children: consentText.description }), jsx(RadioButtonGroup, { className: "whitespace-normal", orientation: "horizontal", items: ITEMS$1, value: confirmStatus, onChange: handleConfirmChange }), jsx(Button, { disabled: !confirmStatus, type: "button", onClick: handleSubmit, children: "\u0414\u0430\u043B\u0435\u0435" })] }) }));
|
|
4454
4462
|
});
|
|
4455
4463
|
|
|
4456
4464
|
const useConsentBkiDialog = (onClose) => {
|
|
@@ -4501,6 +4509,7 @@
|
|
|
4501
4509
|
|
|
4502
4510
|
const EsiaLoginDialog = JSX(({ onClose }) => {
|
|
4503
4511
|
const navigator = locationNavigator();
|
|
4512
|
+
const [leadForm, setLeadForm] = useLocalStorage('leadForm');
|
|
4504
4513
|
const handleAuth = useCallback(async () => {
|
|
4505
4514
|
const resp = await getLink({
|
|
4506
4515
|
redirectUri: navigator.href,
|
|
@@ -4509,7 +4518,15 @@
|
|
|
4509
4518
|
navigator.assign(resp.link);
|
|
4510
4519
|
}
|
|
4511
4520
|
}, []);
|
|
4512
|
-
|
|
4521
|
+
const handleClose = useCallback(() => {
|
|
4522
|
+
if (leadForm !== null) {
|
|
4523
|
+
const leadFormCopy = { ...leadForm };
|
|
4524
|
+
Reflect.deleteProperty(leadFormCopy, 'esiaAccountTypeCd');
|
|
4525
|
+
setLeadForm(leadFormCopy);
|
|
4526
|
+
}
|
|
4527
|
+
onClose?.();
|
|
4528
|
+
}, []);
|
|
4529
|
+
return (jsx(Dialog, { className: "my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg", onClose: handleClose, children: jsxs("div", { className: "flex flex-col gap-lg items-center rounded-md", children: [jsxs("div", { className: "flex items-center justify-around w-full", children: [jsxs("ul", { className: "list-disc", children: [jsx("li", { children: "\u0412\u0435\u0440\u043E\u044F\u0442\u043D\u043E\u0441\u0442\u044C \u043E\u0434\u043E\u0431\u0440\u0435\u043D\u0438\u044F \u0432\u044B\u0448\u0435" }), jsx("li", { children: "\u0411\u0435\u0437 \u0441\u043F\u0440\u0430\u0432\u043E\u043A \u043E \u0434\u043E\u0445\u043E\u0434\u0430\u0445 \u0438 \u0442\u0440\u0443\u0434\u043E\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0435" }), jsx("li", { children: "\u0421 \u0437\u0430\u0449\u0438\u0442\u043E\u0439 \u0412\u0430\u0448\u0438\u0445 \u0434\u0430\u043D\u043D\u044B\u0445" })] }), jsx(Img, { image: { icon: 'GosUslugiIcon', iconVersion: 'normal' }, height: "70" })] }), jsxs("div", { className: "flex items-center justify-between w-full m-0", children: [jsx(Button, { type: "button", onClick: handleAuth, children: "\u0417\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0447\u0435\u0440\u0435\u0437 \u0413\u043E\u0441\u0443\u0441\u043B\u0443\u0433\u0438" }), jsx(Button, { type: "button", version: "secondary", onClick: handleClose, children: "\u041F\u0440\u043E\u043F\u0443\u0441\u0442\u0438\u0442\u044C" })] })] }) }));
|
|
4513
4530
|
});
|
|
4514
4531
|
|
|
4515
4532
|
const useEsiaLoginDialog = (nextStepLink) => {
|
|
@@ -6529,7 +6546,7 @@
|
|
|
6529
6546
|
const getCardData = (formData) => {
|
|
6530
6547
|
const { currency, paymentSystem, cardCategory, codeWord } = formData;
|
|
6531
6548
|
return {
|
|
6532
|
-
currencyCode: currency,
|
|
6549
|
+
currencyCode: currency ? { key: currency } : undefined,
|
|
6533
6550
|
paymentSystemTypeCd: paymentSystem,
|
|
6534
6551
|
classCard: cardCategory,
|
|
6535
6552
|
codeWord: codeWord,
|
|
@@ -6564,7 +6581,7 @@
|
|
|
6564
6581
|
rentalIncome,
|
|
6565
6582
|
retirementIncome,
|
|
6566
6583
|
}),
|
|
6567
|
-
snils: snils?.replaceAll(' ', ''),
|
|
6584
|
+
snils: snils?.replaceAll(' ', '').replaceAll('-', ''),
|
|
6568
6585
|
armyIdFlg,
|
|
6569
6586
|
};
|
|
6570
6587
|
};
|
|
@@ -7519,7 +7536,7 @@
|
|
|
7519
7536
|
rentalIncome,
|
|
7520
7537
|
retirementIncome,
|
|
7521
7538
|
}),
|
|
7522
|
-
snils: snils?.replaceAll(' ', ''),
|
|
7539
|
+
snils: snils?.replaceAll(' ', '').replaceAll('-', ''),
|
|
7523
7540
|
armyIdFlg,
|
|
7524
7541
|
};
|
|
7525
7542
|
};
|
|
@@ -10363,7 +10380,7 @@
|
|
|
10363
10380
|
slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
|
|
10364
10381
|
});
|
|
10365
10382
|
|
|
10366
|
-
const packageVersion = "0.14.
|
|
10383
|
+
const packageVersion = "0.14.692";
|
|
10367
10384
|
|
|
10368
10385
|
exports.Blocks = Blocks;
|
|
10369
10386
|
exports.ContentPage = ContentPage;
|