[Issue-28] Fix prefix last letter gets pushed out issue

nosir · Aug 20, 2016 · 51c5920 · 51c5920
1 parent 58e3a10
commit 51c5920
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 18 deletions.
diff --git a/bower.json b/bower.json
@@ -8,7 +8,7 @@
     "form",
     "input"
   ],
-  "version": "0.6.11",
+  "version": "0.6.12",
   "author": {
     "name": "Max Huang",
     "email": "[email protected]",

diff --git a/dist/cleave-angular.js b/dist/cleave-angular.js
@@ -152,7 +152,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;
@@ -338,10 +338,26 @@ 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,

diff --git a/dist/cleave-angular.min.js b/dist/cleave-angular.min.js
diff --git a/dist/cleave-react.js b/dist/cleave-react.js
@@ -254,7 +254,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        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;
@@ -792,10 +792,24 @@ return /******/ (function(modules) { // webpackBootstrap
 	    // for prefix: PRE
 	    // (PRE123, 3) -> 123
 	    // (PR123, 3) -> 23 this happens when user hits backspace in front of "PRE"
-	    getPrefixStrippedValue: function getPrefixStrippedValue(value, prefixLength) {
+	    getPrefixStrippedValue: function getPrefixStrippedValue(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 getFirstDiffIndex(prev, current) {
+	        var index = 0;
+
+	        while (prev.charAt(index) === current.charAt(index)) {
+	            if (prev.charAt(index++) === '') return -1;
+	        }return index;
+	    },
+
 	    getFormattedValue: function getFormattedValue(value, blocks, blocksLength, delimiter, delimiters) {
 	        var result = '',
 	            multipleDelimiters = delimiters.length > 0,

diff --git a/dist/cleave-react.min.js b/dist/cleave-react.min.js
diff --git a/dist/cleave.js b/dist/cleave.js
@@ -152,7 +152,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;
@@ -338,10 +338,26 @@ 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,

diff --git a/dist/cleave.min.js b/dist/cleave.min.js
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "form",
     "input"
   ],
-  "version": "0.6.11",
+  "version": "0.6.12",
   "author": {
     "name": "Max Huang",
     "url": "http://github.com/nosir",

diff --git a/src/Cleave.react.js b/src/Cleave.react.js
@@ -192,7 +192,7 @@ var Cleave = React.createClass({
         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
@@ -55,16 +55,20 @@ var Util = {
     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);
+
+            value = prefix + value.slice(diffIndex, diffIndex + 1) + value.slice(prefixLength + 1);
         }
+
         return value.slice(prefixLength);
     },
 
-    getFirstDiffIndex: function(prev, current) {
+    getFirstDiffIndex: function (prev, current) {
         var index = 0;
-        while (prev.charAt(index) === current.charAt(index)) 
+
+        while (prev.charAt(index) === current.charAt(index))
             if (prev.charAt(index++) === '')
                 return -1;
+
         return index;
     },