@tecsinapse/react-core 1.14.3 → 1.14.7
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 +44 -0
- package/dist/components/atoms/Input/InputElement/InputElement.js +14 -17
- package/dist/components/atoms/Input/InputElement/InputElement.js.map +1 -1
- package/dist/components/atoms/Input/hooks/useStringMask.js +1 -1
- package/dist/components/atoms/Input/hooks/useStringMask.js.map +1 -1
- package/package.json +2 -2
- package/src/components/atoms/Input/InputElement/InputElement.tsx +27 -29
- package/src/components/atoms/Input/hooks/useStringMask.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,50 @@
|
|
|
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.7](https://github.com/tecsinapse/design-system/compare/@tecsinapse/react-core@1.14.6...@tecsinapse/react-core@1.14.7) (2022-02-16)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* removing null check in InputElement value since it needs to be passed as parameter. ([b1af9ce](https://github.com/tecsinapse/design-system/commit/b1af9ceb2f0ef13efe0895db467bdbf61eda5f2a))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
## [1.14.6](https://github.com/tecsinapse/design-system/compare/@tecsinapse/react-core@1.14.5...@tecsinapse/react-core@1.14.6) (2022-02-16)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### Bug Fixes
|
|
21
|
+
|
|
22
|
+
* infinite loop caused by the useEffect. Updating values correctly when they change in the parent component. ([0355ed1](https://github.com/tecsinapse/design-system/commit/0355ed19cdd9e237d277df8c431f78602cfc214e))
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
## [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)
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
### Bug Fixes
|
|
32
|
+
|
|
33
|
+
* null check before toString() ([fe80132](https://github.com/tecsinapse/design-system/commit/fe80132a5a943faa4c65051a208cfb69a3bbbff1))
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
## [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)
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
### Bug Fixes
|
|
43
|
+
|
|
44
|
+
* mask update with useEffect ([c023198](https://github.com/tecsinapse/design-system/commit/c023198925a386acca327f676f4c7172cf2e57d8))
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
|
|
6
50
|
## [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)
|
|
7
51
|
|
|
8
52
|
**Note:** Version bump only for package @tecsinapse/react-core
|
|
@@ -31,47 +31,44 @@ const InputElement = _react2.default.forwardRef(({
|
|
|
31
31
|
...rest
|
|
32
32
|
}, ref) => {
|
|
33
33
|
const theme = (0, _react.useTheme)();
|
|
34
|
-
const [valueReinitialized, setValueReinitialized] = (0, _react2.useState)(false);
|
|
35
34
|
|
|
36
35
|
const _placeholderColor = placeholderTextColor || theme.font.color.dark;
|
|
37
36
|
|
|
38
|
-
const getInputHook =
|
|
37
|
+
const getInputHook = value => {
|
|
39
38
|
if (mask !== undefined) {
|
|
40
39
|
if (Array.isArray(mask) || typeof mask === 'function') {
|
|
41
|
-
return (0, _useStringMask.useStringMask)(mask, value
|
|
40
|
+
return (0, _useStringMask.useStringMask)(mask, value);
|
|
42
41
|
} else {
|
|
43
|
-
return (0, _useNumberMask.useNumberMask)(mask, value
|
|
42
|
+
return (0, _useNumberMask.useNumberMask)(mask, value);
|
|
44
43
|
}
|
|
45
44
|
} else {
|
|
46
45
|
return [undefined, undefined];
|
|
47
46
|
}
|
|
48
47
|
};
|
|
49
48
|
|
|
50
|
-
const [maskValue, setMaskValue] = getInputHook();
|
|
49
|
+
const [maskValue, setMaskValue] = getInputHook(value);
|
|
51
50
|
|
|
52
|
-
const _value = maskValue
|
|
51
|
+
const _value = maskValue === undefined ? value.toString() : maskValue.formatted ? maskValue.formatted : '';
|
|
53
52
|
|
|
54
|
-
|
|
53
|
+
(0, _react2.useEffect)(() => {
|
|
55
54
|
if (onChange) {
|
|
56
55
|
onChange(maskValue === null || maskValue === void 0 ? void 0 : maskValue.raw);
|
|
57
56
|
}
|
|
58
57
|
}, [maskValue]);
|
|
59
|
-
const onChangeValue = (0, _react2.useCallback)(
|
|
58
|
+
const onChangeValue = (0, _react2.useCallback)(value => {
|
|
60
59
|
if (maskValue !== undefined && setMaskValue !== undefined) {
|
|
61
|
-
|
|
62
|
-
onChangeMaskValue();
|
|
60
|
+
setMaskValue(value);
|
|
63
61
|
} else onChange && onChange(value);
|
|
64
62
|
}, [value]);
|
|
65
63
|
(0, _react2.useEffect)(() => {
|
|
66
|
-
if (
|
|
67
|
-
if (maskValue !== undefined &&
|
|
68
|
-
|
|
69
|
-
setValueReinitialized(true);
|
|
70
|
-
setMaskValue(value);
|
|
71
|
-
}
|
|
64
|
+
if (maskValue !== undefined && setMaskValue !== undefined && value !== undefined && typeof maskValue === 'object') {
|
|
65
|
+
if (maskValue.raw !== undefined && maskValue.raw.toString() !== value.toString()) {
|
|
66
|
+
onChangeValue(value);
|
|
72
67
|
}
|
|
68
|
+
} else if (maskValue === undefined && value !== undefined) {
|
|
69
|
+
onChangeValue(value);
|
|
73
70
|
}
|
|
74
|
-
}, [value
|
|
71
|
+
}, [value]);
|
|
75
72
|
return _react2.default.createElement(_styled.StyledInputElement, _extends({}, rest, {
|
|
76
73
|
ref: ref,
|
|
77
74
|
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","
|
|
1
|
+
{"version":3,"sources":["../../../../../src/components/atoms/Input/InputElement/InputElement.tsx"],"names":["InputElement","React","forwardRef","onChange","placeholder","value","disabled","placeholderTextColor","mask","rest","ref","theme","_placeholderColor","font","color","dark","getInputHook","undefined","Array","isArray","maskValue","setMaskValue","_value","toString","formatted","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;;AAEA,QAAMC,iBAAiB,GAAGL,oBAAoB,IAAII,KAAK,CAACE,IAAN,CAAWC,KAAX,CAAiBC,IAAnE;;AAEA,QAAMC,YAAY,GAAIX,KAAD,IAA4B;AAC/C,QAAIG,IAAI,KAAKS,SAAb,EAAwB;AACtB,UAAIC,KAAK,CAACC,OAAN,CAAcX,IAAd,KAAuB,OAAOA,IAAP,KAAgB,UAA3C,EAAuD;AACrD,eAAO,kCAAcA,IAAd,EAAoBH,KAApB,CAAP;AACD,OAFD,MAEO;AACL,eAAO,kCAAcG,IAAd,EAAoBH,KAApB,CAAP;AACD;AACF,KAND,MAMO;AACL,aAAO,CAACY,SAAD,EAAYA,SAAZ,CAAP;AACD;AACF,GAVD;;AAYA,QAAM,CAACG,SAAD,EAAYC,YAAZ,IAA4BL,YAAY,CAACX,KAAD,CAA9C;;AAEA,QAAMiB,MAAM,GACVF,SAAS,KAAKH,SAAd,GACIZ,KAAK,CAACkB,QAAN,EADJ,GAEIH,SAAS,CAACI,SAAV,GACAJ,SAAS,CAACI,SADV,GAEA,EALN;;AAOA,yBAAU,MAAM;AACd,QAAIrB,QAAJ,EAAc;AACZA,MAAAA,QAAQ,CAACiB,SAAD,aAACA,SAAD,uBAACA,SAAS,CAAEK,GAAZ,CAAR;AACD;AACF,GAJD,EAIG,CAACL,SAAD,CAJH;AAMA,QAAMM,aAAa,GAAG,yBACnBrB,KAAD,IAA4B;AAC1B,QAAIe,SAAS,KAAKH,SAAd,IAA2BI,YAAY,KAAKJ,SAAhD,EAA2D;AACzDI,MAAAA,YAAY,CAAChB,KAAD,CAAZ;AACD,KAFD,MAEOF,QAAQ,IAAIA,QAAQ,CAACE,KAAD,CAApB;AACR,GALmB,EAMpB,CAACA,KAAD,CANoB,CAAtB;AASA,yBAAU,MAAM;AAEd,QACEe,SAAS,KAAKH,SAAd,IACAI,YAAY,KAAKJ,SADjB,IAEAZ,KAAK,KAAKY,SAFV,IAGA,OAAOG,SAAP,KAAqB,QAJvB,EAKE;AAEA,UACEA,SAAS,CAACK,GAAV,KAAkBR,SAAlB,IACAG,SAAS,CAACK,GAAV,CAAcF,QAAd,OAA6BlB,KAAK,CAACkB,QAAN,EAF/B,EAGE;AACAG,QAAAA,aAAa,CAACrB,KAAD,CAAb;AACD;AACF,KAbD,MAaO,IAAIe,SAAS,KAAKH,SAAd,IAA2BZ,KAAK,KAAKY,SAAzC,EAAoD;AACzDS,MAAAA,aAAa,CAACrB,KAAD,CAAb;AACD;AACF,GAlBD,EAkBG,CAACA,KAAD,CAlBH;AAoBA,SACE,8BAAC,0BAAD,eACMI,IADN;AAEE,IAAA,GAAG,EAAEC,GAFP;AAGE,IAAA,YAAY,EAAEgB,aAHhB;AAIE,IAAA,KAAK,EAAEJ,MAJT;AAKE,IAAA,WAAW,EAAElB,WALf;AAME,IAAA,oBAAoB,EAAEQ,iBANxB;AAOE,IAAA,QAAQ,EAAEN,QAPZ;AAQE,IAAA,QAAQ,EAAE,CAACA;AARb,KADF;AAYD,CArFyC,CAA5C;;AAwFAN,YAAY,CAAC2B,WAAb,GAA2B,cAA3B;eAEe3B,Y","sourcesContent":["import { useTheme } from '@emotion/react';\nimport { ThemeProp } from '@tecsinapse/react-core';\nimport React, { FC, useCallback, useEffect } 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 const _placeholderColor = placeholderTextColor || theme.font.color.dark;\n\n const getInputHook = (value: string | number) => {\n if (mask !== undefined) {\n if (Array.isArray(mask) || typeof mask === 'function') {\n return useStringMask(mask, value);\n } else {\n return useNumberMask(mask, value);\n }\n } else {\n return [undefined, undefined];\n }\n };\n\n const [maskValue, setMaskValue] = getInputHook(value);\n\n const _value =\n maskValue === undefined\n ? value.toString()\n : maskValue.formatted\n ? maskValue.formatted\n : '';\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 /** Used to reinitialize maskValue when the value is updated in the parent component **/\n if (\n maskValue !== undefined &&\n setMaskValue !== undefined &&\n value !== undefined &&\n typeof maskValue === 'object'\n ) {\n /** Case there is a mask **/\n if (\n maskValue.raw !== undefined &&\n maskValue.raw.toString() !== value.toString()\n ) {\n onChangeValue(value);\n }\n } else if (maskValue === undefined && value !== undefined) {\n onChangeValue(value);\n }\n }, [value]);\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"}
|
|
@@ -96,7 +96,7 @@ const useStringMask = (mask, defaultValue) => {
|
|
|
96
96
|
const {
|
|
97
97
|
raw,
|
|
98
98
|
formatted
|
|
99
|
-
} = applyMask(formattedValue.toString());
|
|
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","toString","handleChangeValue","formattedValue"],"mappings":"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
|
|
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.7",
|
|
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": "c0e8b876f05f42ff61bef6040232a813d1811eab"
|
|
35
35
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { useTheme } from '@emotion/react';
|
|
2
2
|
import { ThemeProp } from '@tecsinapse/react-core';
|
|
3
|
-
import React, { FC, useCallback, useEffect
|
|
3
|
+
import React, { FC, useCallback, useEffect } from 'react';
|
|
4
4
|
import { StyleProp, TextInputProps, TextStyle } from 'react-native';
|
|
5
5
|
import { StyledInputElement } from '../styled';
|
|
6
6
|
import { MaskType, useStringMask } from '../hooks/useStringMask';
|
|
@@ -42,65 +42,63 @@ const InputElement: FC<InputElementProps> = React.forwardRef(
|
|
|
42
42
|
): JSX.Element => {
|
|
43
43
|
const theme = useTheme() as ThemeProp;
|
|
44
44
|
|
|
45
|
-
/** Check if value was reinitialized, without this state we can't total "erase" a value that was already reinitialized **/
|
|
46
|
-
const [valueReinitialized, setValueReinitialized] = useState<boolean>(
|
|
47
|
-
false
|
|
48
|
-
);
|
|
49
|
-
|
|
50
45
|
const _placeholderColor = placeholderTextColor || theme.font.color.dark;
|
|
51
46
|
|
|
52
|
-
const getInputHook = () => {
|
|
47
|
+
const getInputHook = (value: string | number) => {
|
|
53
48
|
if (mask !== undefined) {
|
|
54
49
|
if (Array.isArray(mask) || typeof mask === 'function') {
|
|
55
|
-
return useStringMask(mask, value
|
|
50
|
+
return useStringMask(mask, value);
|
|
56
51
|
} else {
|
|
57
|
-
return useNumberMask(mask, value
|
|
52
|
+
return useNumberMask(mask, value);
|
|
58
53
|
}
|
|
59
54
|
} else {
|
|
60
55
|
return [undefined, undefined];
|
|
61
56
|
}
|
|
62
57
|
};
|
|
63
58
|
|
|
64
|
-
const [maskValue, setMaskValue] = getInputHook();
|
|
59
|
+
const [maskValue, setMaskValue] = getInputHook(value);
|
|
65
60
|
|
|
66
61
|
const _value =
|
|
67
|
-
maskValue
|
|
68
|
-
?
|
|
69
|
-
:
|
|
62
|
+
maskValue === undefined
|
|
63
|
+
? value.toString()
|
|
64
|
+
: maskValue.formatted
|
|
65
|
+
? maskValue.formatted
|
|
66
|
+
: '';
|
|
70
67
|
|
|
71
|
-
|
|
68
|
+
useEffect(() => {
|
|
72
69
|
if (onChange) {
|
|
73
70
|
onChange(maskValue?.raw);
|
|
74
71
|
}
|
|
75
72
|
}, [maskValue]);
|
|
76
73
|
|
|
77
74
|
const onChangeValue = useCallback(
|
|
78
|
-
|
|
75
|
+
(value: string | number) => {
|
|
79
76
|
if (maskValue !== undefined && setMaskValue !== undefined) {
|
|
80
|
-
|
|
81
|
-
onChangeMaskValue();
|
|
77
|
+
setMaskValue(value);
|
|
82
78
|
} else onChange && onChange(value);
|
|
83
79
|
},
|
|
84
80
|
[value]
|
|
85
81
|
);
|
|
86
82
|
|
|
87
83
|
useEffect(() => {
|
|
88
|
-
|
|
89
|
-
|
|
84
|
+
/** Used to reinitialize maskValue when the value is updated in the parent component **/
|
|
85
|
+
if (
|
|
86
|
+
maskValue !== undefined &&
|
|
87
|
+
setMaskValue !== undefined &&
|
|
88
|
+
value !== undefined &&
|
|
89
|
+
typeof maskValue === 'object'
|
|
90
|
+
) {
|
|
91
|
+
/** Case there is a mask **/
|
|
90
92
|
if (
|
|
91
|
-
maskValue !== undefined &&
|
|
92
|
-
|
|
93
|
-
value !== undefined &&
|
|
94
|
-
typeof maskValue === 'object'
|
|
93
|
+
maskValue.raw !== undefined &&
|
|
94
|
+
maskValue.raw.toString() !== value.toString()
|
|
95
95
|
) {
|
|
96
|
-
|
|
97
|
-
if (maskValue.raw !== value.toString()) {
|
|
98
|
-
setValueReinitialized(true);
|
|
99
|
-
setMaskValue(value);
|
|
100
|
-
}
|
|
96
|
+
onChangeValue(value);
|
|
101
97
|
}
|
|
98
|
+
} else if (maskValue === undefined && value !== undefined) {
|
|
99
|
+
onChangeValue(value);
|
|
102
100
|
}
|
|
103
|
-
}, [value
|
|
101
|
+
}, [value]);
|
|
104
102
|
|
|
105
103
|
return (
|
|
106
104
|
<StyledInputElement
|
|
@@ -115,7 +115,7 @@ export const useStringMask = (
|
|
|
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,
|