@sb1/ffe-form-react 19.0.12 → 20.0.1
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/es/PhoneNumber.js +33 -10
- package/es/index.js +1 -1
- package/lib/PhoneNumber.js +32 -10
- package/package.json +2 -2
- package/types/InputGroup.d.ts +1 -1
- package/types/PhoneNumber.d.ts +8 -13
- package/types/index.d.ts +1 -1
package/es/PhoneNumber.js
CHANGED
|
@@ -1,4 +1,15 @@
|
|
|
1
|
-
|
|
1
|
+
var __assign = (this && this.__assign) || function () {
|
|
2
|
+
__assign = Object.assign || function(t) {
|
|
3
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
4
|
+
s = arguments[i];
|
|
5
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
6
|
+
t[p] = s[p];
|
|
7
|
+
}
|
|
8
|
+
return t;
|
|
9
|
+
};
|
|
10
|
+
return __assign.apply(this, arguments);
|
|
11
|
+
};
|
|
12
|
+
import React, { useRef, useImperativeHandle } from 'react';
|
|
2
13
|
import { v4 as uuid } from 'uuid';
|
|
3
14
|
import classNames from 'classnames';
|
|
4
15
|
import i18n from './i18n/i18n';
|
|
@@ -19,13 +30,25 @@ var getFieldMessage = function (countryCodeAndNumberFieldMessage, countryCodeFie
|
|
|
19
30
|
}
|
|
20
31
|
return fieldMessage;
|
|
21
32
|
};
|
|
22
|
-
export var PhoneNumber = function (_a) {
|
|
23
|
-
var _b;
|
|
24
|
-
var
|
|
33
|
+
export var PhoneNumber = React.forwardRef(function (_a, ref) {
|
|
34
|
+
var _b, _c;
|
|
35
|
+
var numberInputProps = _a.numberInputProps, countryCodeInputProps = _a.countryCodeInputProps, countryCodeFieldMessage = _a.countryCodeFieldMessage, numberFieldMessage = _a.numberFieldMessage, countryCodeAndNumberFieldMessage = _a.countryCodeAndNumberFieldMessage, className = _a.className, extraMargin = _a.extraMargin, isMobileNumber = _a.isMobileNumber, _d = _a.locale, locale = _d === void 0 ? 'nb' : _d;
|
|
36
|
+
var countryRef = useRef(null);
|
|
37
|
+
var numberRef = useRef(null);
|
|
38
|
+
useImperativeHandle(ref, function () { return ({
|
|
39
|
+
get country() {
|
|
40
|
+
return countryRef.current;
|
|
41
|
+
},
|
|
42
|
+
get number() {
|
|
43
|
+
return numberRef.current;
|
|
44
|
+
},
|
|
45
|
+
}); });
|
|
25
46
|
var fieldMessage = getFieldMessage(countryCodeAndNumberFieldMessage, countryCodeFieldMessage, numberFieldMessage);
|
|
26
47
|
var numberId = useRef(uuid()).current;
|
|
27
48
|
var countryCodeId = useRef(uuid()).current;
|
|
28
|
-
var fieldMessageId = useRef(React.isValidElement(fieldMessage)
|
|
49
|
+
var fieldMessageId = useRef(React.isValidElement(fieldMessage)
|
|
50
|
+
? (_b = fieldMessage === null || fieldMessage === void 0 ? void 0 : fieldMessage.props) === null || _b === void 0 ? void 0 : _b.id
|
|
51
|
+
: uuid()).current;
|
|
29
52
|
var supportedLocales = ['nb', 'nn', 'en'];
|
|
30
53
|
var text = i18n[supportedLocales.indexOf(locale) !== -1 ? locale : 'nb'];
|
|
31
54
|
return (React.createElement("div", { className: classNames('ffe-phone-number', 'ffe-input-group', { 'ffe-input-group--message': fieldMessage }, { 'ffe-input-group--no-extra-margin': !extraMargin }, className) },
|
|
@@ -34,23 +57,23 @@ export var PhoneNumber = function (_a) {
|
|
|
34
57
|
React.createElement("label", { className: "ffe-form-label", htmlFor: countryCodeId }, text.COUNTRY_CODE),
|
|
35
58
|
React.createElement("div", { className: "ffe-phone-number__input-group" },
|
|
36
59
|
React.createElement("span", { className: "ffe-phone-number__plus" }, "+"),
|
|
37
|
-
React.createElement("input", { id: countryCodeId, className: classNames('ffe-input-field', 'ffe-phone-number__country-code-input'), type: "tel",
|
|
60
|
+
React.createElement("input", __assign({ ref: countryRef, id: countryCodeId, value: (_c = countryCodeInputProps === null || countryCodeInputProps === void 0 ? void 0 : countryCodeInputProps.value) !== null && _c !== void 0 ? _c : '47', className: classNames('ffe-input-field', 'ffe-phone-number__country-code-input'), type: "tel", "aria-invalid": !!(countryCodeFieldMessage ||
|
|
38
61
|
countryCodeAndNumberFieldMessage), "aria-describedby": !!(countryCodeFieldMessage ||
|
|
39
62
|
countryCodeAndNumberFieldMessage)
|
|
40
63
|
? fieldMessageId
|
|
41
|
-
: undefined
|
|
64
|
+
: undefined }, countryCodeInputProps)))),
|
|
42
65
|
React.createElement("div", { className: "ffe-phone-number__number" },
|
|
43
66
|
React.createElement("label", { className: "ffe-form-label", htmlFor: numberId }, isMobileNumber
|
|
44
67
|
? text.MOBILE_NUMBER
|
|
45
68
|
: text.PHONE_NUMBER),
|
|
46
|
-
React.createElement("input", { id: numberId, type: "tel", className: classNames('ffe-input-field', 'ffe-phone-number__phone-input'),
|
|
69
|
+
React.createElement("input", __assign({ ref: numberRef, id: numberId, type: "tel", className: classNames('ffe-input-field', 'ffe-phone-number__phone-input'), "aria-invalid": !!(numberFieldMessage ||
|
|
47
70
|
countryCodeAndNumberFieldMessage), "aria-describedby": !!(numberFieldMessage ||
|
|
48
71
|
countryCodeAndNumberFieldMessage)
|
|
49
72
|
? fieldMessageId
|
|
50
|
-
: undefined
|
|
73
|
+
: undefined }, numberInputProps)))),
|
|
51
74
|
typeof fieldMessage === 'string' && (React.createElement(ErrorFieldMessage, { as: "p", id: fieldMessageId }, fieldMessage)),
|
|
52
75
|
React.isValidElement(fieldMessage) &&
|
|
53
76
|
React.cloneElement(fieldMessage, {
|
|
54
77
|
id: fieldMessageId,
|
|
55
78
|
})));
|
|
56
|
-
};
|
|
79
|
+
});
|
package/es/index.js
CHANGED
|
@@ -4,7 +4,7 @@ export { Input } from './Input';
|
|
|
4
4
|
export { InputTextLike } from './InputTextLike';
|
|
5
5
|
export { InputGroup } from './InputGroup';
|
|
6
6
|
export { Label } from './Label';
|
|
7
|
-
export { PhoneNumber } from './PhoneNumber';
|
|
7
|
+
export { PhoneNumber, } from './PhoneNumber';
|
|
8
8
|
export { RadioBlock } from './RadioBlock';
|
|
9
9
|
export { RadioButton } from './RadioButton';
|
|
10
10
|
export { RadioButtonInputGroup, } from './RadioButtonInputGroup';
|
package/lib/PhoneNumber.js
CHANGED
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
2
13
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
14
|
if (k2 === undefined) k2 = k;
|
|
4
15
|
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
@@ -48,13 +59,25 @@ var getFieldMessage = function (countryCodeAndNumberFieldMessage, countryCodeFie
|
|
|
48
59
|
}
|
|
49
60
|
return fieldMessage;
|
|
50
61
|
};
|
|
51
|
-
|
|
52
|
-
var _b;
|
|
53
|
-
var
|
|
62
|
+
exports.PhoneNumber = react_1.default.forwardRef(function (_a, ref) {
|
|
63
|
+
var _b, _c;
|
|
64
|
+
var numberInputProps = _a.numberInputProps, countryCodeInputProps = _a.countryCodeInputProps, countryCodeFieldMessage = _a.countryCodeFieldMessage, numberFieldMessage = _a.numberFieldMessage, countryCodeAndNumberFieldMessage = _a.countryCodeAndNumberFieldMessage, className = _a.className, extraMargin = _a.extraMargin, isMobileNumber = _a.isMobileNumber, _d = _a.locale, locale = _d === void 0 ? 'nb' : _d;
|
|
65
|
+
var countryRef = (0, react_1.useRef)(null);
|
|
66
|
+
var numberRef = (0, react_1.useRef)(null);
|
|
67
|
+
(0, react_1.useImperativeHandle)(ref, function () { return ({
|
|
68
|
+
get country() {
|
|
69
|
+
return countryRef.current;
|
|
70
|
+
},
|
|
71
|
+
get number() {
|
|
72
|
+
return numberRef.current;
|
|
73
|
+
},
|
|
74
|
+
}); });
|
|
54
75
|
var fieldMessage = getFieldMessage(countryCodeAndNumberFieldMessage, countryCodeFieldMessage, numberFieldMessage);
|
|
55
76
|
var numberId = (0, react_1.useRef)((0, uuid_1.v4)()).current;
|
|
56
77
|
var countryCodeId = (0, react_1.useRef)((0, uuid_1.v4)()).current;
|
|
57
|
-
var fieldMessageId = (0, react_1.useRef)(react_1.default.isValidElement(fieldMessage)
|
|
78
|
+
var fieldMessageId = (0, react_1.useRef)(react_1.default.isValidElement(fieldMessage)
|
|
79
|
+
? (_b = fieldMessage === null || fieldMessage === void 0 ? void 0 : fieldMessage.props) === null || _b === void 0 ? void 0 : _b.id
|
|
80
|
+
: (0, uuid_1.v4)()).current;
|
|
58
81
|
var supportedLocales = ['nb', 'nn', 'en'];
|
|
59
82
|
var text = i18n_1.default[supportedLocales.indexOf(locale) !== -1 ? locale : 'nb'];
|
|
60
83
|
return (react_1.default.createElement("div", { className: (0, classnames_1.default)('ffe-phone-number', 'ffe-input-group', { 'ffe-input-group--message': fieldMessage }, { 'ffe-input-group--no-extra-margin': !extraMargin }, className) },
|
|
@@ -63,24 +86,23 @@ var PhoneNumber = function (_a) {
|
|
|
63
86
|
react_1.default.createElement("label", { className: "ffe-form-label", htmlFor: countryCodeId }, text.COUNTRY_CODE),
|
|
64
87
|
react_1.default.createElement("div", { className: "ffe-phone-number__input-group" },
|
|
65
88
|
react_1.default.createElement("span", { className: "ffe-phone-number__plus" }, "+"),
|
|
66
|
-
react_1.default.createElement("input", { id: countryCodeId, className: (0, classnames_1.default)('ffe-input-field', 'ffe-phone-number__country-code-input'), type: "tel",
|
|
89
|
+
react_1.default.createElement("input", __assign({ ref: countryRef, id: countryCodeId, value: (_c = countryCodeInputProps === null || countryCodeInputProps === void 0 ? void 0 : countryCodeInputProps.value) !== null && _c !== void 0 ? _c : '47', className: (0, classnames_1.default)('ffe-input-field', 'ffe-phone-number__country-code-input'), type: "tel", "aria-invalid": !!(countryCodeFieldMessage ||
|
|
67
90
|
countryCodeAndNumberFieldMessage), "aria-describedby": !!(countryCodeFieldMessage ||
|
|
68
91
|
countryCodeAndNumberFieldMessage)
|
|
69
92
|
? fieldMessageId
|
|
70
|
-
: undefined
|
|
93
|
+
: undefined }, countryCodeInputProps)))),
|
|
71
94
|
react_1.default.createElement("div", { className: "ffe-phone-number__number" },
|
|
72
95
|
react_1.default.createElement("label", { className: "ffe-form-label", htmlFor: numberId }, isMobileNumber
|
|
73
96
|
? text.MOBILE_NUMBER
|
|
74
97
|
: text.PHONE_NUMBER),
|
|
75
|
-
react_1.default.createElement("input", { id: numberId, type: "tel", className: (0, classnames_1.default)('ffe-input-field', 'ffe-phone-number__phone-input'),
|
|
98
|
+
react_1.default.createElement("input", __assign({ ref: numberRef, id: numberId, type: "tel", className: (0, classnames_1.default)('ffe-input-field', 'ffe-phone-number__phone-input'), "aria-invalid": !!(numberFieldMessage ||
|
|
76
99
|
countryCodeAndNumberFieldMessage), "aria-describedby": !!(numberFieldMessage ||
|
|
77
100
|
countryCodeAndNumberFieldMessage)
|
|
78
101
|
? fieldMessageId
|
|
79
|
-
: undefined
|
|
102
|
+
: undefined }, numberInputProps)))),
|
|
80
103
|
typeof fieldMessage === 'string' && (react_1.default.createElement(message_1.ErrorFieldMessage, { as: "p", id: fieldMessageId }, fieldMessage)),
|
|
81
104
|
react_1.default.isValidElement(fieldMessage) &&
|
|
82
105
|
react_1.default.cloneElement(fieldMessage, {
|
|
83
106
|
id: fieldMessageId,
|
|
84
107
|
})));
|
|
85
|
-
};
|
|
86
|
-
exports.PhoneNumber = PhoneNumber;
|
|
108
|
+
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sb1/ffe-form-react",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "20.0.1",
|
|
4
4
|
"description": "React component for form elements in ffe",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "SpareBank 1",
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"publishConfig": {
|
|
46
46
|
"access": "public"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "93dd227b3321cf54c3a3acf4144c50dad248033f"
|
|
49
49
|
}
|
package/types/InputGroup.d.ts
CHANGED
|
@@ -20,7 +20,7 @@ export interface InputGroupProps extends Omit<React.ComponentPropsWithoutRef<'di
|
|
|
20
20
|
/** Use the ErrorFieldMessage component if you need more flexibility in how the content is rendered. */
|
|
21
21
|
fieldMessage?: string | React.ReactElement<{
|
|
22
22
|
id: string;
|
|
23
|
-
}
|
|
23
|
+
}> | null;
|
|
24
24
|
/** To just render a static, always visible tooltip, use this. */
|
|
25
25
|
description?: string;
|
|
26
26
|
/** Use the Label component if you need more flexibility in how the content is rendered. */
|
package/types/PhoneNumber.d.ts
CHANGED
|
@@ -1,13 +1,8 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
export interface PhoneNumberProps {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
onCountryCodeChange?: React.ChangeEventHandler<HTMLInputElement>;
|
|
6
|
-
onNumberChange?: React.ChangeEventHandler<HTMLInputElement>;
|
|
7
|
-
onCountryCodeBlur?: React.FocusEventHandler<HTMLInputElement>;
|
|
8
|
-
onNumberBlur?: React.FocusEventHandler<HTMLInputElement>;
|
|
3
|
+
numberInputProps?: React.ComponentPropsWithoutRef<'input'>;
|
|
4
|
+
countryCodeInputProps?: React.ComponentPropsWithoutRef<'input'>;
|
|
9
5
|
locale?: 'nn' | 'nb' | 'en';
|
|
10
|
-
disabled?: boolean;
|
|
11
6
|
/** String or ErrorFieldMessage component with message */
|
|
12
7
|
countryCodeFieldMessage?: string | React.ReactElement<{
|
|
13
8
|
id: string;
|
|
@@ -17,7 +12,7 @@ export interface PhoneNumberProps {
|
|
|
17
12
|
id: string;
|
|
18
13
|
}>;
|
|
19
14
|
/** String or ErrorFieldMessage component with message,
|
|
20
|
-
* this should
|
|
15
|
+
* this should be set when both countryCode and number is in an invalid state.
|
|
21
16
|
* If both countryCodeFieldMessage and numberFieldMessage is set and not this prop,
|
|
22
17
|
* the component will throw an Error.
|
|
23
18
|
*/
|
|
@@ -30,11 +25,11 @@ export interface PhoneNumberProps {
|
|
|
30
25
|
* space for one line of content, so keep messages short.
|
|
31
26
|
*/
|
|
32
27
|
extraMargin?: boolean;
|
|
33
|
-
/** Ref-setting function, or ref created by useRef, passed to the country code input element */
|
|
34
|
-
countryCodeRef?: React.Ref<HTMLInputElement>;
|
|
35
|
-
/** Ref-setting function, or ref created by useRef, passed to the number input element */
|
|
36
|
-
numberRef?: React.Ref<HTMLInputElement>;
|
|
37
28
|
/** If True label is changed from "Phone number" to "Mobile number" */
|
|
38
29
|
isMobileNumber?: boolean;
|
|
39
30
|
}
|
|
40
|
-
export
|
|
31
|
+
export type PhoneNumberHandle = {
|
|
32
|
+
readonly country: HTMLInputElement | null;
|
|
33
|
+
readonly number: HTMLInputElement | null;
|
|
34
|
+
};
|
|
35
|
+
export declare const PhoneNumber: React.ForwardRefExoticComponent<PhoneNumberProps & React.RefAttributes<PhoneNumberHandle>>;
|
package/types/index.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ export { Input, InputProps } from './Input';
|
|
|
4
4
|
export { InputTextLike, InputTextLikeProps } from './InputTextLike';
|
|
5
5
|
export { InputGroup, InputGroupProps } from './InputGroup';
|
|
6
6
|
export { Label, LabelProps } from './Label';
|
|
7
|
-
export { PhoneNumber, PhoneNumberProps } from './PhoneNumber';
|
|
7
|
+
export { PhoneNumber, PhoneNumberProps, PhoneNumberHandle, } from './PhoneNumber';
|
|
8
8
|
export { RadioBlock, RadioBlockProps } from './RadioBlock';
|
|
9
9
|
export { RadioButton, RadioButtonProps } from './RadioButton';
|
|
10
10
|
export { RadioButtonInputGroup, RadioButtonInputGroupProps, } from './RadioButtonInputGroup';
|