Merge pull request #174 from benhurott/dev-1.12.4

dev-1.12.4 to master
bhrott · Jul 21, 2019 · a9e1ef1 · a9e1ef1
2 parents 0b04ce4 + aa45529
commit a9e1ef1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## [1.12.4] - 2019-07-12
+
+### Fix
+
+- [#170](https://github.com/benhurott/react-native-masked-text/issues/170): fixing typing for includeRawValueInChangeText.
+    - thanks to [Sergei Butko](https://github.com/svbutko) for contribution.
+    - thanks to [Agustin G.](https://github.com/agustingabiola) for reporting.
+- [#173](https://github.com/benhurott/react-native-masked-text/issues/173): fixing initial value for money field.
+    - thanks to [Maksim Markelov](https://github.com/mmarkelov) for reporting.
+
 ## [1.12.3] - 2019-05-17
 
 ### Fix

diff --git a/dist/lib/base-text-component.js b/dist/lib/base-text-component.js
diff --git a/index.d.ts b/index.d.ts
@@ -48,9 +48,6 @@ export interface TextInputMaskOptionProp {
     validator?: (value: string, settings: TextInputMaskOptionProp) => boolean
     getRawValue?: (value: string, settings: TextInputMaskOptionProp) => any
     translation?: { [s: string]: (val: string) => string | null | undefined }
-
-    // Options
-    includeRawValueInChangeText?: boolean
 }
 
 // TextInputMask Props
@@ -62,6 +59,7 @@ export interface TextInputMaskProps extends Pick<TextInputProps, Exclude<keyof T
     refInput?: (ref: any) => void
     customTextInput?: any
     customTextInputProps?: Object
+    includeRawValueInChangeText?: boolean
 }
 
 // TextInputMask Component

diff --git a/lib/base-text-component.js b/lib/base-text-component.js
@@ -74,8 +74,13 @@ export default class BaseTextComponent extends PureComponent {
     }
 
     _getMaskedValue(value) {
+        const defaultValue = this._getDefaultValue(value)
+        if (defaultValue === '') {
+            return ''
+        }
+
         return this._maskHandler.getValue(
-            this._getDefaultValue(value),
+            defaultValue,
             this._getOptions());
     }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-native-masked-text",
-    "version": "1.12.3",
+    "version": "1.12.4",
     "description": "Text and TextInput with mask for React Native applications",
     "licenses": [
         {