Merge pull request #130 from benhurott/1.11.1

1.11.1
bhrott · Mar 5, 2019 · 5556de5 · 5556de5
2 parents a8403bd + b833232
commit 5556de5
Show file tree

Hide file tree

Showing 6 changed files with 9,649 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## [1.11.1] - 2019-03-05
+
+### Fixed
+
+- Remove characters in the middle of the mask (Thanks to [rsouthgate](https://github.com/rsouthgate) for the great contribution!)
+  - Fixes [#128](https://github.com/benhurott/react-native-masked-text/issues/128) and [#35](https://github.com/benhurott/react-native-masked-text/issues/35)
+
 ## [1.11.0] - 2019-02-23
 
 ### Added

diff --git a/__tests__/mask/custom.mask.test.js b/__tests__/mask/custom.mask.test.js
@@ -117,7 +117,7 @@ test('123 with mask 999 results 123 and raw value 123(type Number)', () => {
     var mask = new CustomMask()
     var options = {
         mask: '999',
-        getRawValue: function(maskedValue, settings) {
+        getRawValue: function (maskedValue, settings) {
             return Number(maskedValue)
         }
     }
@@ -137,7 +137,7 @@ test('mask with custom translation and match', () => {
     var options = {
         mask: '999&AAA',
         translation: {
-            '&': function(val) {
+            '&': function (val) {
                 return ['#', '.', ':'].indexOf(val) >= 0 ? val : null
             }
         }
@@ -154,13 +154,13 @@ test('mask with custom translation and not match', () => {
     var options = {
         mask: '999&AAA',
         translation: {
-            '&': function(val) {
-                return ['#', '.', ':'].indexOf(val) >= 0 ? val : ''
+            '&': function (val) {
+                return ['#', '.', ':'].indexOf(val) >= 0 ? val : '#'
             }
         }
     }
 
-    var expected = '123ABC'
+    var expected = '123#ABC'
     var received = mask.getValue('123|ABC', options)
 
     expect(received).toBe(expected)
@@ -171,7 +171,7 @@ test('mask with custom translation and optionals and matching', () => {
     var options = {
         mask: '999***AAA&',
         translation: {
-            '&': function(val) {
+            '&': function (val) {
                 return ['#', '.', ':'].indexOf(val) >= 0 ? val : null
             }
         }

diff --git a/dist/lib/masks/custom.mask.js b/dist/lib/masks/custom.mask.js
diff --git a/lib/masks/custom.mask.js b/lib/masks/custom.mask.js
@@ -2,16 +2,16 @@ import BaseMask from './_base.mask'
 
 function getDefaultTranslation() {
     return {
-        '9': function(val) {
+        '9': function (val) {
             return val.replace(/[^0-9]+/g, '')
         },
-        A: function(val) {
+        A: function (val) {
             return val.replace(/[^a-zA-Z]+/g, '')
         },
-        S: function(val) {
+        S: function (val) {
             return val.replace(/[^a-zA-Z0-9]+/g, '')
         },
-        '*': function(val) {
+        '*': function (val) {
             return val
         }
     }
@@ -50,14 +50,16 @@ function toPattern(value, mask, translation) {
 
         if (translationHandler) {
             const resolverValue = translationHandler(valueChar || '')
-
-            if (resolverValue !== null) {
-                result += resolverValue
-                valueCharIndex += 1
+            if (resolverValue === '') {
+                //valueChar replaced so don't add it to result, keep the mask at the same point and continue to next value char
+                valueCharIndex += 1;
+                continue;
+            } else if (resolverValue !== null) {
+                result += resolverValue;
+                valueCharIndex += 1;
             } else {
-                result += maskChar
+                result += maskChar;
             }
-
             maskCharIndex += 1
             continue
         }