Merge pull request #82 from cht8687/master

[bug-fix] Fix when typing into the prefix itself
nosir · Aug 20, 2016 · 58e3a10 · 58e3a10
2 parents afad6f0 + e0c570f
commit 58e3a10
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Cleave.js b/src/Cleave.js
@@ -150,7 +150,7 @@ Cleave.prototype = {
         value = Util.stripDelimiters(value, pps.delimiter, pps.delimiters);
 
         // strip prefix
-        value = Util.getPrefixStrippedValue(value, pps.prefixLength);
+        value = Util.getPrefixStrippedValue(value, pps.prefix, pps.prefixLength);
 
         // strip non-numeric characters
         value = pps.numericOnly ? Util.strip(value, /[^\d]/g) : value;

diff --git a/src/utils/Util.js b/src/utils/Util.js
@@ -52,10 +52,22 @@ var Util = {
     // for prefix: PRE
     // (PRE123, 3) -> 123
     // (PR123, 3) -> 23 this happens when user hits backspace in front of "PRE"
-    getPrefixStrippedValue: function (value, prefixLength) {
+    getPrefixStrippedValue: function (value, prefix, prefixLength) {
+        if (value.slice(0, prefixLength) !== prefix) {
+            var diffIndex = this.getFirstDiffIndex(prefix, value.slice(0, prefixLength));
+            value = prefix + value.slice(diffIndex, diffIndex+1) + value.slice(prefixLength+1);
+        }
         return value.slice(prefixLength);
     },
 
+    getFirstDiffIndex: function(prev, current) {
+        var index = 0;
+        while (prev.charAt(index) === current.charAt(index)) 
+            if (prev.charAt(index++) === '')
+                return -1;
+        return index;
+    },
+
     getFormattedValue: function (value, blocks, blocksLength, delimiter, delimiters) {
         var result = '',
             multipleDelimiters = delimiters.length > 0,