@tecsinapse/react-core 1.14.1 → 1.14.5
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/CHANGELOG.md +41 -0
- package/dist/components/atoms/Input/InputElement/InputElement.js +15 -19
- package/dist/components/atoms/Input/InputElement/InputElement.js.map +1 -1
- package/dist/components/atoms/Input/hooks/useStringMask.js +2 -2
- package/dist/components/atoms/Input/hooks/useStringMask.js.map +1 -1
- package/package.json +2 -2
- package/src/components/atoms/Input/InputElement/InputElement.tsx +15 -28
- package/src/components/atoms/Input/hooks/useStringMask.ts +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,47 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [1.14.5](https://github.com/tecsinapse/design-system/compare/@tecsinapse/react-core@1.14.4...@tecsinapse/react-core@1.14.5) (2022-02-16)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* null check before toString() ([fe80132](https://github.com/tecsinapse/design-system/commit/fe80132a5a943faa4c65051a208cfb69a3bbbff1))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
## [1.14.4](https://github.com/tecsinapse/design-system/compare/@tecsinapse/react-core@1.14.3...@tecsinapse/react-core@1.14.4) (2022-02-16)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### Bug Fixes
|
|
21
|
+
|
|
22
|
+
* mask update with useEffect ([c023198](https://github.com/tecsinapse/design-system/commit/c023198925a386acca327f676f4c7172cf2e57d8))
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
## [1.14.3](https://github.com/tecsinapse/design-system/compare/@tecsinapse/react-core@1.14.2...@tecsinapse/react-core@1.14.3) (2022-02-16)
|
|
29
|
+
|
|
30
|
+
**Note:** Version bump only for package @tecsinapse/react-core
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
## [1.14.2](https://github.com/tecsinapse/design-system/compare/@tecsinapse/react-core@1.14.1...@tecsinapse/react-core@1.14.2) (2022-02-15)
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
### Bug Fixes
|
|
40
|
+
|
|
41
|
+
* Input initializan for string and no mask. ([78353ef](https://github.com/tecsinapse/design-system/commit/78353ef7b4d24216a1b99eab800f8d448ff21a34))
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
|
|
6
47
|
## [1.14.1](https://github.com/tecsinapse/design-system/compare/@tecsinapse/react-core@1.14.0...@tecsinapse/react-core@1.14.1) (2022-02-15)
|
|
7
48
|
|
|
8
49
|
|
|
@@ -37,44 +37,40 @@ const InputElement = _react2.default.forwardRef(({
|
|
|
37
37
|
|
|
38
38
|
const getInputHook = () => {
|
|
39
39
|
if (mask !== undefined) {
|
|
40
|
-
if (Array.isArray(mask) || typeof mask === 'function')
|
|
41
|
-
return (0,
|
|
40
|
+
if (Array.isArray(mask) || typeof mask === 'function') {
|
|
41
|
+
return (0, _useStringMask.useStringMask)(mask, value ?? '');
|
|
42
|
+
} else {
|
|
43
|
+
return (0, _useNumberMask.useNumberMask)(mask, value ?? 0);
|
|
42
44
|
}
|
|
43
45
|
} else {
|
|
44
|
-
return
|
|
46
|
+
return [undefined, undefined];
|
|
45
47
|
}
|
|
46
48
|
};
|
|
47
49
|
|
|
48
50
|
const [maskValue, setMaskValue] = getInputHook();
|
|
49
51
|
|
|
50
|
-
const _value =
|
|
52
|
+
const _value = maskValue !== undefined ? (maskValue === null || maskValue === void 0 ? void 0 : maskValue.formatted) ?? '' : (value === null || value === void 0 ? void 0 : value.toString()) ?? '';
|
|
51
53
|
|
|
52
54
|
(0, _react2.useEffect)(() => {
|
|
53
55
|
if (onChange) {
|
|
54
|
-
|
|
56
|
+
onChange(maskValue === null || maskValue === void 0 ? void 0 : maskValue.raw);
|
|
55
57
|
}
|
|
56
58
|
}, [maskValue]);
|
|
57
59
|
const onChangeValue = (0, _react2.useCallback)(value => {
|
|
58
|
-
setMaskValue
|
|
60
|
+
if (maskValue !== undefined && setMaskValue !== undefined) {
|
|
61
|
+
setMaskValue(value);
|
|
62
|
+
} else onChange && onChange(value);
|
|
59
63
|
}, [value]);
|
|
60
64
|
(0, _react2.useEffect)(() => {
|
|
61
65
|
if (!valueReinitialized) {
|
|
62
|
-
if (
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
if (maskValue.raw !== value) {
|
|
67
|
-
if ((Array.isArray(mask) || typeof mask === 'function') && (maskValue.raw === undefined || maskValue.raw === '')) {
|
|
68
|
-
setValueReinitialized(true);
|
|
69
|
-
setMaskValue(value);
|
|
70
|
-
} else if (typeof mask === 'object' && maskValue.raw === 0) {
|
|
71
|
-
setValueReinitialized(true);
|
|
72
|
-
setMaskValue(value);
|
|
73
|
-
}
|
|
66
|
+
if (maskValue !== undefined && setMaskValue !== undefined && value !== undefined && typeof maskValue === 'object') {
|
|
67
|
+
if (maskValue.raw !== (value === null || value === void 0 ? void 0 : value.toString())) {
|
|
68
|
+
setValueReinitialized(true);
|
|
69
|
+
setMaskValue(value);
|
|
74
70
|
}
|
|
75
71
|
}
|
|
76
72
|
}
|
|
77
|
-
}, [value, maskValue,
|
|
73
|
+
}, [value, maskValue, valueReinitialized]);
|
|
78
74
|
return _react2.default.createElement(_styled.StyledInputElement, _extends({}, rest, {
|
|
79
75
|
ref: ref,
|
|
80
76
|
onChangeText: onChangeValue,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/components/atoms/Input/InputElement/InputElement.tsx"],"names":["InputElement","React","forwardRef","onChange","placeholder","value","disabled","placeholderTextColor","mask","rest","ref","theme","valueReinitialized","setValueReinitialized","_placeholderColor","font","color","dark","getInputHook","undefined","Array","isArray","maskValue","setMaskValue","_value","formatted","toString","raw","onChangeValue","displayName"],"mappings":";;;;;;;AAAA;;AAEA;;AAEA;;AACA;;AACA;;;;;;;;AAuBA,MAAMA,YAAmC,GAAGC,gBAAMC,UAAN,CAC1C,CACE;AACEC,EAAAA,QADF;AAEEC,EAAAA,WAFF;AAGEC,EAAAA,KAHF;AAIEC,EAAAA,QAAQ,GAAG,KAJb;AAKEC,EAAAA,oBALF;AAMEC,EAAAA,IANF;AAOE,KAAGC;AAPL,CADF,EAUEC,GAVF,KAWkB;AAChB,QAAMC,KAAK,GAAG,sBAAd;AAGA,QAAM,CAACC,kBAAD,EAAqBC,qBAArB,IAA8C,sBAClD,KADkD,CAApD;;AAIA,QAAMC,iBAAiB,GAAGP,oBAAoB,IAAII,KAAK,CAACI,IAAN,CAAWC,KAAX,CAAiBC,IAAnE;;AAEA,QAAMC,YAAY,GAAG,MAAM;AACzB,QAAIV,IAAI,KAAKW,SAAb,EAAwB;AACtB,UAAIC,KAAK,CAACC,OAAN,CAAcb,IAAd,KAAuB,OAAOA,IAAP,KAAgB,UAA3C,
|
|
1
|
+
{"version":3,"sources":["../../../../../src/components/atoms/Input/InputElement/InputElement.tsx"],"names":["InputElement","React","forwardRef","onChange","placeholder","value","disabled","placeholderTextColor","mask","rest","ref","theme","valueReinitialized","setValueReinitialized","_placeholderColor","font","color","dark","getInputHook","undefined","Array","isArray","maskValue","setMaskValue","_value","formatted","toString","raw","onChangeValue","displayName"],"mappings":"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","sourcesContent":["import { useTheme } from '@emotion/react';\nimport { ThemeProp } from '@tecsinapse/react-core';\nimport React, { FC, useCallback, useEffect, useState } from 'react';\nimport { StyleProp, TextInputProps, TextStyle } from 'react-native';\nimport { StyledInputElement } from '../styled';\nimport { MaskType, useStringMask } from '../hooks/useStringMask';\nimport { CurrencyOptions, useNumberMask } from '../hooks/useNumberMask';\n\nexport interface InputElementProps\n extends Omit<TextInputProps, 'onChange' | 'value' | 'ref'> {\n style?: StyleProp<TextStyle>;\n value: string | number;\n placeholder?: string;\n disabled?: boolean;\n onChange?: (value: any) => void;\n /**\n To use mask for strings you have to pass a MaskType[] or ((value: string) => MaskType[])\n A MaskType can be a string, RegExp, or Array<RegExp>.\n In case we have a string, '9' represents digits, 'a' represents alphabet characters, and any other character represents fixed characters in the mask.\n For example a phone mask can be represented as ['(99) \\\\99999-9999'], or ['(99) ', '/[9]/', '9999-9999'], or ['(', /[0-9]/, /[0-9]/, ') ', '/[9]/', '9999-9999'] and many others.\n To use mask for numbers you have to pass a CurrencyOptions object\n A CurrencyOptions object contains symbol, separator, decimal, precision. For example {symbol: 'R$ ', separator: '.', decimal: ',', precision: 2,}.\n **/\n mask?: (MaskType[] | ((value: string) => MaskType[])) | CurrencyOptions;\n onFocus?: () => void;\n onBlur?: () => void;\n ref?: React.Ref<any>;\n}\n\nconst InputElement: FC<InputElementProps> = React.forwardRef(\n (\n {\n onChange,\n placeholder,\n value,\n disabled = false,\n placeholderTextColor,\n mask,\n ...rest\n },\n ref: React.Ref<any>\n ): JSX.Element => {\n const theme = useTheme() as ThemeProp;\n\n /** Check if value was reinitialized, without this state we can't total \"erase\" a value that was already reinitialized **/\n const [valueReinitialized, setValueReinitialized] = useState<boolean>(\n false\n );\n\n const _placeholderColor = placeholderTextColor || theme.font.color.dark;\n\n const getInputHook = () => {\n if (mask !== undefined) {\n if (Array.isArray(mask) || typeof mask === 'function') {\n return useStringMask(mask, value ?? '');\n } else {\n return useNumberMask(mask, value ?? 0);\n }\n } else {\n return [undefined, undefined];\n }\n };\n\n const [maskValue, setMaskValue] = getInputHook();\n\n const _value =\n maskValue !== undefined\n ? maskValue?.formatted ?? ''\n : value?.toString() ?? '';\n\n useEffect(() => {\n if (onChange) {\n onChange(maskValue?.raw);\n }\n }, [maskValue]);\n\n const onChangeValue = useCallback(\n (value: string | number) => {\n if (maskValue !== undefined && setMaskValue !== undefined) {\n setMaskValue(value);\n } else onChange && onChange(value);\n },\n [value]\n );\n\n useEffect(() => {\n if (!valueReinitialized) {\n /** Used to reinitialize maskValue with a value that was loaded after Input was rendered **/\n if (\n maskValue !== undefined &&\n setMaskValue !== undefined &&\n value !== undefined &&\n typeof maskValue === 'object'\n ) {\n /** Case there is a mask **/\n if (maskValue.raw !== value?.toString()) {\n setValueReinitialized(true);\n setMaskValue(value);\n }\n }\n }\n }, [value, maskValue, valueReinitialized]);\n\n return (\n <StyledInputElement\n {...rest}\n ref={ref}\n onChangeText={onChangeValue}\n value={_value}\n placeholder={placeholder}\n placeholderTextColor={_placeholderColor}\n disabled={disabled}\n editable={!disabled}\n />\n );\n }\n);\n\nInputElement.displayName = 'InputElement';\n\nexport default InputElement;\n"],"file":"InputElement.js"}
|
|
@@ -91,12 +91,12 @@ const useStringMask = (mask, defaultValue) => {
|
|
|
91
91
|
formatted
|
|
92
92
|
};
|
|
93
93
|
}, [mask]);
|
|
94
|
-
const [value, setValue] = (0, _react.useState)(applyMask(
|
|
94
|
+
const [value, setValue] = (0, _react.useState)(applyMask(defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.toString()));
|
|
95
95
|
const handleChangeValue = (0, _react.useCallback)(formattedValue => {
|
|
96
96
|
const {
|
|
97
97
|
raw,
|
|
98
98
|
formatted
|
|
99
|
-
} = applyMask(formattedValue);
|
|
99
|
+
} = applyMask(formattedValue === null || formattedValue === void 0 ? void 0 : formattedValue.toString());
|
|
100
100
|
setValue({
|
|
101
101
|
raw,
|
|
102
102
|
formatted
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/components/atoms/Input/hooks/useStringMask.ts"],"names":["mergeMask","value","mask","formatted","raw","iMask","iChars","length","maskChar","valueChar","rawValueChar","maskCharRegex","Array","isArray","matchRegex","RegExp","test","getMask","newValue","maskArray","regexArray","forEach","exp","push","i","useStringMask","defaultValue","applyMask","selectedMask","setValue","
|
|
1
|
+
{"version":3,"sources":["../../../../../src/components/atoms/Input/hooks/useStringMask.ts"],"names":["mergeMask","value","mask","formatted","raw","iMask","iChars","length","maskChar","valueChar","rawValueChar","maskCharRegex","Array","isArray","matchRegex","RegExp","test","getMask","newValue","maskArray","regexArray","forEach","exp","push","i","useStringMask","defaultValue","applyMask","selectedMask","setValue","toString","handleChangeValue","formattedValue"],"mappings":"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","sourcesContent":["import { useCallback, useState } from 'react';\n\nexport interface MaskValue {\n formatted?: string;\n raw?: string | number;\n}\n\nexport type MaskType = string | RegExp | Array<RegExp>;\n\n/**\n * TODO:\n * @param value\n * @param mask\n * @returns\n */\nexport const mergeMask = (value = '', mask: MaskType[]): MaskValue => {\n let formatted = '';\n let raw = '';\n let iMask = 0;\n let iChars = 0;\n\n while (!(iMask === mask.length || iChars === value.length)) {\n const maskChar = mask[iMask];\n const valueChar = value[iChars];\n\n if (maskChar === valueChar) {\n formatted += maskChar;\n iChars++;\n iMask++;\n continue;\n }\n\n const rawValueChar = value[iChars];\n\n if (typeof maskChar === 'object') {\n iChars++;\n\n const maskCharRegex = Array.isArray(maskChar) ? maskChar[0] : maskChar;\n const matchRegex = RegExp(maskCharRegex).test(valueChar);\n\n if (matchRegex) {\n formatted += valueChar;\n raw += rawValueChar;\n iMask++;\n }\n } else {\n formatted += maskChar;\n iMask++;\n }\n }\n\n return { raw, formatted };\n};\n\nexport const getMask = (\n mask: MaskType[] | ((value: string) => MaskType[]),\n newValue: string\n): MaskType[] => {\n let maskArray: MaskType[];\n const regexArray: MaskType[] = [];\n\n if (typeof mask === 'function') {\n maskArray = mask(newValue);\n } else {\n maskArray = mask;\n }\n\n maskArray.forEach(exp => {\n if (typeof exp !== 'string') {\n if (Array.isArray(exp)) regexArray.push(exp);\n else regexArray.push(exp);\n } else {\n for (let i = 0; i < exp.length; i++) {\n if (exp[i] === '\\\\') {\n regexArray.push(exp[i + 1]);\n i++;\n } else {\n if (exp[i] === '9') regexArray.push(/\\d/);\n else if (exp[i] === 'a') regexArray.push(/[a-zA-Z]/);\n else regexArray.push(exp[i]);\n }\n }\n }\n });\n\n return regexArray;\n};\n\n/**\n * TODO:\n * @param mask\n * @param defaultValue\n * @returns\n */\nexport const useStringMask = (\n mask: MaskType[] | ((value: string) => MaskType[]),\n defaultValue?: string | number\n): [MaskValue, (text: string | number) => void] => {\n const applyMask = useCallback(\n (value = ''): MaskValue => {\n const selectedMask = getMask(mask, value);\n const { formatted, raw } = mergeMask(value, selectedMask);\n\n return {\n raw,\n formatted,\n };\n },\n [mask]\n );\n\n const [value, setValue] = useState<MaskValue>(\n applyMask(defaultValue?.toString())\n );\n\n const handleChangeValue = useCallback(\n (formattedValue: string | number) => {\n const { raw, formatted } = applyMask(formattedValue?.toString());\n setValue({\n raw,\n formatted,\n });\n },\n [applyMask, setValue]\n );\n\n return [value, handleChangeValue];\n};\n"],"file":"useStringMask.js"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tecsinapse/react-core",
|
|
3
3
|
"description": "TecSinapse hybrid React components",
|
|
4
|
-
"version": "1.14.
|
|
4
|
+
"version": "1.14.5",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"main": "dist/index.js",
|
|
7
7
|
"types": "dist/index.d.ts",
|
|
@@ -31,5 +31,5 @@
|
|
|
31
31
|
"react-native": ">=0.64.0",
|
|
32
32
|
"react-native-vector-icons": ">=8.1.0"
|
|
33
33
|
},
|
|
34
|
-
"gitHead": "
|
|
34
|
+
"gitHead": "e97e9699151c6d0634f7aabab189533494be14cf"
|
|
35
35
|
}
|
|
@@ -51,33 +51,34 @@ const InputElement: FC<InputElementProps> = React.forwardRef(
|
|
|
51
51
|
|
|
52
52
|
const getInputHook = () => {
|
|
53
53
|
if (mask !== undefined) {
|
|
54
|
-
if (Array.isArray(mask) || typeof mask === 'function')
|
|
54
|
+
if (Array.isArray(mask) || typeof mask === 'function') {
|
|
55
55
|
return useStringMask(mask, value ?? '');
|
|
56
|
-
else {
|
|
57
|
-
return useNumberMask(mask, value ??
|
|
56
|
+
} else {
|
|
57
|
+
return useNumberMask(mask, value ?? 0);
|
|
58
58
|
}
|
|
59
59
|
} else {
|
|
60
|
-
return
|
|
60
|
+
return [undefined, undefined];
|
|
61
61
|
}
|
|
62
62
|
};
|
|
63
63
|
|
|
64
64
|
const [maskValue, setMaskValue] = getInputHook();
|
|
65
65
|
|
|
66
66
|
const _value =
|
|
67
|
-
|
|
67
|
+
maskValue !== undefined
|
|
68
68
|
? maskValue?.formatted ?? ''
|
|
69
|
-
:
|
|
69
|
+
: value?.toString() ?? '';
|
|
70
70
|
|
|
71
71
|
useEffect(() => {
|
|
72
72
|
if (onChange) {
|
|
73
|
-
|
|
74
|
-
else onChange(maskValue);
|
|
73
|
+
onChange(maskValue?.raw);
|
|
75
74
|
}
|
|
76
75
|
}, [maskValue]);
|
|
77
76
|
|
|
78
77
|
const onChangeValue = useCallback(
|
|
79
78
|
(value: string | number) => {
|
|
80
|
-
setMaskValue
|
|
79
|
+
if (maskValue !== undefined && setMaskValue !== undefined) {
|
|
80
|
+
setMaskValue(value);
|
|
81
|
+
} else onChange && onChange(value);
|
|
81
82
|
},
|
|
82
83
|
[value]
|
|
83
84
|
);
|
|
@@ -86,33 +87,19 @@ const InputElement: FC<InputElementProps> = React.forwardRef(
|
|
|
86
87
|
if (!valueReinitialized) {
|
|
87
88
|
/** Used to reinitialize maskValue with a value that was loaded after Input was rendered **/
|
|
88
89
|
if (
|
|
89
|
-
(maskValue === undefined || maskValue === '') &&
|
|
90
|
-
value !== undefined
|
|
91
|
-
) {
|
|
92
|
-
/** Case there is not a mask **/
|
|
93
|
-
setMaskValue(value);
|
|
94
|
-
setValueReinitialized(true);
|
|
95
|
-
} else if (
|
|
96
90
|
maskValue !== undefined &&
|
|
91
|
+
setMaskValue !== undefined &&
|
|
97
92
|
value !== undefined &&
|
|
98
93
|
typeof maskValue === 'object'
|
|
99
94
|
) {
|
|
100
95
|
/** Case there is a mask **/
|
|
101
|
-
if (maskValue.raw !== value) {
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
(maskValue.raw === undefined || maskValue.raw === '')
|
|
105
|
-
) {
|
|
106
|
-
setValueReinitialized(true);
|
|
107
|
-
setMaskValue(value);
|
|
108
|
-
} else if (typeof mask === 'object' && maskValue.raw === 0) {
|
|
109
|
-
setValueReinitialized(true);
|
|
110
|
-
setMaskValue(value);
|
|
111
|
-
}
|
|
96
|
+
if (maskValue.raw !== value?.toString()) {
|
|
97
|
+
setValueReinitialized(true);
|
|
98
|
+
setMaskValue(value);
|
|
112
99
|
}
|
|
113
100
|
}
|
|
114
101
|
}
|
|
115
|
-
}, [value, maskValue,
|
|
102
|
+
}, [value, maskValue, valueReinitialized]);
|
|
116
103
|
|
|
117
104
|
return (
|
|
118
105
|
<StyledInputElement
|
|
@@ -110,12 +110,12 @@ export const useStringMask = (
|
|
|
110
110
|
);
|
|
111
111
|
|
|
112
112
|
const [value, setValue] = useState<MaskValue>(
|
|
113
|
-
applyMask(
|
|
113
|
+
applyMask(defaultValue?.toString())
|
|
114
114
|
);
|
|
115
115
|
|
|
116
116
|
const handleChangeValue = useCallback(
|
|
117
117
|
(formattedValue: string | number) => {
|
|
118
|
-
const { raw, formatted } = applyMask(formattedValue);
|
|
118
|
+
const { raw, formatted } = applyMask(formattedValue?.toString());
|
|
119
119
|
setValue({
|
|
120
120
|
raw,
|
|
121
121
|
formatted,
|